diff --git a/src/views/modules/eam/com_eam_object_add_update.vue b/src/views/modules/eam/com_eam_object_add_update.vue
index 8a9a685..41f000a 100644
--- a/src/views/modules/eam/com_eam_object_add_update.vue
+++ b/src/views/modules/eam/com_eam_object_add_update.vue
@@ -76,7 +76,7 @@
-
+
机台编号:
@@ -193,13 +193,6 @@ export default {
trigger: 'change'
}
],
- resourceType:[
- {
- required: true,
- message: ' ',
- trigger: 'change'
- }
- ],
deptType:[
{
required: true,
@@ -226,7 +219,7 @@ export default {
//打开页面
this.visible = true;
//判断是否是新增
- if(this.pageData.addFlag == 'Y'){
+ if(this.pageData.addFlag === 'Y'){
this.readOnlyFlag = false;
}else{
this.readOnlyFlag = true;
@@ -272,10 +265,10 @@ export default {
this.$message.success("分类不能为空!");
return false;
}
- if(this.pageData.resourceID == null || this.pageData.resourceID === ''){
- this.$message.success("机台不能为空!");
- return false;
- }
+ // if(this.pageData.resourceID == null || this.pageData.resourceID === ''){
+ // this.$message.success("机台不能为空!");
+ // return false;
+ // }
if(this.pageData.deptID == null || this.pageData.deptID === ''){
this.$message.success("所属部门不能为空!");
return false;
@@ -299,7 +292,6 @@ export default {
if (this.pageData.site == '通用设备'){
this.pageData.site = '4'
}
-
insertEamObject(this.pageData).then(({data}) => {
if(data.code == 200){
this.$message.success(data.msg);
diff --git a/src/views/modules/eam/com_eam_object_upload_file.vue b/src/views/modules/eam/com_eam_object_upload_file.vue
index baf8970..e776c24 100644
--- a/src/views/modules/eam/com_eam_object_upload_file.vue
+++ b/src/views/modules/eam/com_eam_object_upload_file.vue
@@ -4,7 +4,7 @@
-
+
diff --git a/src/views/modules/eam/eamPropertiesItem.vue b/src/views/modules/eam/eamPropertiesItem.vue
index 8011e41..7379df7 100644
--- a/src/views/modules/eam/eamPropertiesItem.vue
+++ b/src/views/modules/eam/eamPropertiesItem.vue
@@ -93,17 +93,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -115,6 +104,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
保存
关闭
@@ -265,6 +268,7 @@
itemRemark:'',
itemType:'A',
updateBy: this.$store.state.user.name,
+ imageFlag: ''
},
departmentList:[],
// 展示列集
@@ -405,6 +409,23 @@
status: true,
fixed: '',
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 101008,
+ serialNumber: '101008TableValueChooseFlag',
+ tableId: "101008Table",
+ tableName: "common",
+ columnProp: 'imageFlag',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '是否图片必填',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ },
{
userId: this.$store.state.user.name,
functionId: 101008,
@@ -613,7 +634,7 @@
},
addModal(){
- this.modalData={
+ this.modalData = {
flag:'1',
itemNo:'',
itemDesc:'',
@@ -626,9 +647,10 @@
itemRemark:'',
itemType:'A',
updateBy: this.$store.state.user.name,
+ imageFlag: ''
};
- this.modalDisableFlag=false;
- this.modalFlag=true;
+ this.modalDisableFlag = false;
+ this.modalFlag = true;
},
chooseModal(row){
this.chooseModalData.itemNo=row.itemNo;
@@ -640,22 +662,23 @@
this.chooseModalFlag=true;
},
updateModal(row){
- this.modalData={
- flag:'2',
- itemNo:row.itemNo,
- itemDesc:row.itemDesc,
- valueTypeDb:row.valueTypeDb,
- defaultValue:row.defaultValue,
- valueChooseFlag:row.valueChooseFlag,
- createdBy:this.$store.state.user.name,
- maxValue:row.maxValue,
- minValue:row.minValue,
- itemRemark:row.itemRemark,
- itemType:'A',
+ this.modalData = {
+ flag: '2',
+ itemNo: row.itemNo,
+ itemDesc: row.itemDesc,
+ valueTypeDb: row.valueTypeDb,
+ defaultValue: row.defaultValue,
+ valueChooseFlag: row.valueChooseFlag,
+ createdBy: this.$store.state.user.name,
+ maxValue: row.maxValue,
+ minValue: row.minValue,
+ itemRemark: row.itemRemark,
+ itemType: 'A',
updateBy: this.$store.state.user.name,
+ imageFlag: row.imageFlag
};
- this.modalDisableFlag=true;
- this.modalFlag=true;
+ this.modalDisableFlag = true;
+ this.modalFlag = true;
},
// 删除
deleteEamPropertiesItem (row) {
@@ -684,23 +707,32 @@
})
},
saveData(){
- if (this.modalData.itemNo == '' || this.modalData.itemNo == null) {
+ if (this.modalData.itemNo === '' || this.modalData.itemNo == null) {
this.$alert('请输入点检项目编码！', '错误', {
confirmButtonText: '确定'
})
return false
}
- if (this.modalData.itemDesc == '' || this.modalData.itemDesc == null) {
+ if (this.modalData.itemDesc === '' || this.modalData.itemDesc == null) {
this.$alert('请输入点检项目名称！', '错误', {
confirmButtonText: '确定'
})
return false
}
- if(this.modalData.flag=='1'){
+ let obj = document.getElementsByName('addWorkOrderRule');
+ let s = '';
+ for (let i = 0; i < obj.length; i++) {
+ if (obj[i].checked) {
+ s += obj[i].value + ',';
+ }
+ }
+ s = s.substring(0,s.length-1)
+ this.modalData.imageFlag = s
+ if(this.modalData.flag === '1'){
eamPropertiesItemSave(this.modalData).then(({data}) => {
if (data && data.code === '0') {
this.getDataList()
- this.modalFlag=false
+ this.modalFlag = false
this.$message({
message: '操作成功',
type: 'success',
@@ -718,7 +750,7 @@
eamPropertiesItemEdit(this.modalData).then(({data}) => {
if (data && data.code === '0') {
this.getDataList()
- this.modalFlag=false
+ this.modalFlag = false
this.$message({
message: '操作成功',
type: 'success',
diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue
index 32874cd..7066c3f 100644
--- a/src/views/modules/eam/eamWorkOrderForDefect.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect.vue
@@ -122,10 +122,10 @@
计划执行人员
-
+
-
+
diff --git a/src/views/modules/eam/eamWorkPlanForCheck.vue b/src/views/modules/eam/eamWorkPlanForCheck.vue
index 3ed9df0..3379cce 100644
--- a/src/views/modules/eam/eamWorkPlanForCheck.vue
+++ b/src/views/modules/eam/eamWorkPlanForCheck.vue
@@ -737,7 +737,7 @@
getObjList, // 获取设备的差异列表(快速新增)
addObject, // 添加设备
delObject, // 移除设备
- planObjectSearch, 查询该计划的设备
+ planObjectSearch, // 查询该计划的设备
} from "@/api/eam/eam.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
diff --git a/src/views/modules/eam/eam_device_list.vue b/src/views/modules/eam/eam_device_list.vue
index 11980ab..ee6f7a1 100644
--- a/src/views/modules/eam/eam_device_list.vue
+++ b/src/views/modules/eam/eam_device_list.vue
@@ -223,6 +223,7 @@
+
@@ -262,6 +263,7 @@
+
diff --git a/src/views/modules/qc/qcTemplate.vue b/src/views/modules/qc/qcTemplate.vue
index eba5f36..d77d02e 100644
--- a/src/views/modules/qc/qcTemplate.vue
+++ b/src/views/modules/qc/qcTemplate.vue
@@ -30,7 +30,7 @@
查询
新增
-
+
导入
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+