oyq28 преди 3 години
родител
ревизия
464ce87ebc

+ 9 - 5
imcs-ui/src/views/zuihou/prepareProductMgr/bomMgr/components/Edit.vue

@@ -64,8 +64,10 @@
 	      		:label="item.fieldName+':'"
 	      		:prop="item.identifier"
 	      		:rules="{required: item.requireFlag=='1' ? true : false, message: $t('rules.require'), trigger: 'blur'}"
-	      	>
-	      		<el-select v-model="tenant[item.identifier]" :disabled="item.readonly == '1' ? true : false" :placeholder='$t("common.pleaseSelect")' filterable style="width: 100%;">
+	      	>			  
+			<el-select v-model="tenant[item.identifier]" 
+			 :disabled=" item.identifier == 'zone_id' ? zoneEdit:(item.readonly == '1' ? true : false)"
+			 :placeholder='$t("common.pleaseSelect")' filterable style="width: 100%;">
 				    <el-option
 				      v-for="(obj, index) in commList[item.identifier]"
 				      :key="index"
@@ -138,6 +140,7 @@ export default {
     	commList: {key: 1}, // 动态的数据对象,比如表单中的select、cascader、radio、checkbox等需要数据的控件
     	filedList: [], // 字段数据
       tenant: this.initTenant(),
+	  zoneEdit: true,
       screenWidth: 0,
       width: this.initWidth(),
       confirmDisabled: false,
@@ -198,6 +201,7 @@ export default {
     	}
       // 字典表
       this.dicts = dicts
+	  this.zoneEdit = this.type=='edit' ? false: true
     },
     close () {
       this.$emit('close')
@@ -303,9 +307,9 @@ export default {
     		if(res.isSuccess){
     			// 初始化,表单的数据
 				if(fieldObj.identifier=="meterial_id" || fieldObj.identifier=="tray_id"){
-				   //数据权限过滤	
-				   let role = this.$store.state.account.user.roles.indexOf('舱体')<0 ? "舱体" : (this.$store.state.account.user.roles.indexOf('框体')<0 ? "框体": null);
-                    if(role!=null){						
+				   //数据权限过滤
+                    let role =  this.$store.state.account.user.roles.indexOf('舱体')<0 && this.$store.state.account.user.roles.indexOf('框体')<0 ? null : (this.$store.state.account.user.roles.indexOf('舱体')<0? "舱体":"框体")
+					if(role!=null){						
 						res.data = res.data.filter(item=>{							
 							return item.name.indexOf(role) < 0;
 						}) 						

+ 1 - 0
imcs-ui/src/views/zuihou/prepareProductMgr/frockMgr/components/Edit.vue

@@ -14,6 +14,7 @@
         <el-select
           v-model="tenant.zoneId"
            :placeholder='$t("common.pleaseSelect")'
+           :disabled="this.type=='edit'"
           style="width: 50%"
         >
           <el-option

+ 1 - 0
imcs-ui/src/views/zuihou/prepareProductMgr/material/components/Edit.vue

@@ -14,6 +14,7 @@
         <el-select
           v-model="tenant.zoneId"
            :placeholder='$t("common.pleaseSelect")'
+		   :disabled="this.type=='edit'"
           style="width: 50%"
         >
           <el-option

+ 1 - 0
imcs-ui/src/views/zuihou/prepareProductMgr/trayMgr/components/Edit.vue

@@ -14,6 +14,7 @@
         <el-select
           v-model="tenant.zoneId"
            :placeholder='$t("common.pleaseSelect")'
+           :disabled="this.type=='edit'"
           style="width: 50%"
         >
           <el-option