From 8d0532d911852084a07c8b600da0da35d2987955 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期一, 04 十二月 2023 09:13:07 +0800
Subject: [PATCH] 项目

---
 web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
index 41032b9..7b4f338 100644
--- a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
@@ -8,7 +8,7 @@
       </div>
       <div style="border: 1px solid rgba(0,0,0,.2);width: 99%">
         <div style="border-bottom: 1px solid rgba(0,0,0,.2);" class="warehouseContentWidth">
-        <el-form-item  class="marginTopAndMarginBottom" label="椤圭洰缂栧彿" style="width: 49%">
+        <el-form-item   class="marginTopAndMarginBottom" label="椤圭洰缂栧彿" style="width: 49%">
           <el-input v-model="dataForm.project.code" placeholder="璇疯緭鍏ラ」鐩紪鍙�"></el-input>
         </el-form-item>
         <el-form-item  class="marginTopAndMarginBottom" label="椤圭洰鍚嶇О" style="width: 49%">
@@ -142,7 +142,7 @@
             </el-table>
             <div class="el-border-top">
               <el-form-item label="瀹℃牳缁撴灉" style="width: 99%">
-                <zt-dict v-model="dataForm.configItemWarehouse.cmAuditResults" placeholder="瀹℃牳缁撴灉" dict="is_pass" :radio="true"
+                <zt-dict :disabled="getRoleName.indexOf('CM瑙掕壊')===-1" v-model="dataForm.configItemWarehouse.cmAuditResults" placeholder="瀹℃牳缁撴灉" dict="is_pass" :radio="true"
                          clearable></zt-dict>
               </el-form-item>
               <el-form-item label="瀹℃牳浜猴細" style="width: 48%">
@@ -177,7 +177,7 @@
           </div>
           <div style="width: calc(100% - 120px)" class="el-border-left">
             <el-form-item class="el-CMTextarea" style="width: 100%;padding: 5px">
-              <el-input  type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�" v-model="dataForm.configItemWarehouse.projectCmOperations"></el-input>
+              <el-input v-if="getRoleName.indexOf('CM瑙掕壊')>=0" type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�" v-model="dataForm.configItemWarehouse.projectCmOperations"></el-input>
             </el-form-item>
             <el-form-item label-width="80%" label="鎿嶄綔浜猴細" style="width: 65%">
               <span>{{dataForm.configItemWarehouse.operator}}</span>
@@ -207,9 +207,9 @@
     data() {
       return {
         disabled:true,
+        stepMarker: '',
+        title: '鏌ョ湅',
         dataForm: {
-          stepMarker: '',
-          title: '鏌ョ湅',
           id: '',
           configItemWarehouse:{
             id:"",
@@ -238,11 +238,13 @@
           cmAuditList:[],
           configItemList:[],
           qaAuditList:[],
+          flowInfoDto: {}
         }
       }
     },
     computed:{
       getRoleName(){
+        console.log(this.$store.state.user.roleName,'this.$store.state.user.roleName')
         return this.$store.state.user.roleName || ''
       },
     },
@@ -259,8 +261,6 @@
         }
         if(row.projectId){
           this.dataForm.projectId =row.projectId
-        } else {
-          this.dataForm.projectId=row.bizId
         }
         this.getInfo()
         if (!this.dataForm.disabled) {
@@ -292,6 +292,15 @@
           ...this.dataForm,
           ...res.data
         }
+        if(this.dataForm.project === null){
+          this.dataForm.project={}
+        }
+        if(this.dataForm.configItemWarehouse === null){
+          this.dataForm.circulatOrder={}
+        }
+        if(this.dataForm.flowInfoDto === null){
+          this.dataForm.flowInfoDto={}
+        }
         console.log(this.dataForm,"getInfo this.dataForm")
       },
       // 琛ㄥ崟鎻愪氦

--
Gitblit v1.9.1