Browse Source

品牌添加必填校验

付宇航 1 year ago
parent
commit
0f74540e37

+ 13 - 2
src/components/EnginNodeInfo/index.vue

@@ -176,11 +176,12 @@
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="7" v-show="materialComponList.includes('brand')">
+        <el-col :span="7" v-if="materialComponList.includes('brand')">
           <el-form-item
+            :prop="'zEngineeringMaterialBo.' + index + '.brand'"
             label-width="50px"
             label="品牌"
-            :rules="nodeRules.brand"
+            :rules="{ required: true, message: '请选择品牌', trigger: ['change','blur']} "
           >
             <!--                  :rules="{required: true, message: '请输入规格', trigger: 'blur'}"-->
             <!--                  <el-input v-model="item.specifications" placeholder="请输入规格" style="width: 100%"/>-->
@@ -264,6 +265,7 @@ export default {
 
   ],
   data(){
+    
     return {
       constructAccordingDrawingsOption:[
         {
@@ -365,6 +367,14 @@ export default {
     // this.addMaterial()
   },
   methods:{
+     validatePass (rule, value, callback){
+      console.log(rule, value, callback)
+      if (value.length < 3) {
+        callback(new Error("密码不能小于3位"));
+      } else {
+        callback();
+      }
+    },
     selectBlur(_,index,name) {
       this.zEngineeringMaterialBo[index][name] = [...arguments][0][0].target.value
     },
@@ -405,6 +415,7 @@ export default {
         materialBo[e] = null
       })
       this.zEngineeringMaterialBo.push(materialBo)
+      this.nodeInfo.zEngineeringMaterialBo.push(materialBo)
       // console.log('节点用料参数对象',this.zEngineeringMaterialBo)
     },
     addzEngineeringMaterialBo(option,params){

+ 13 - 7
src/views/zdsz/engineeringInfrastructure/index.vue

@@ -556,7 +556,7 @@ export default {
           { required: true, message: "工程内容不能为空", trigger: "blur" }
         ],
         files: [
-          { required: true, message: "至少上传一个文件", trigger: "blur" }
+          { required: false, message: "至少上传一个文件", trigger: "blur" }
         ],
 
       },
@@ -695,7 +695,8 @@ export default {
       zEngineeringNodeBo:{
 
       },
-      currentCheckingEnginList:[]
+      currentCheckingEnginList:[],
+      currentEnginName:null
 
     };
   },
@@ -709,8 +710,8 @@ export default {
   methods: {
     enginNodeStatusExecuted(item){
       try {
-        let flag
-        if(this.currentCheckingEnginList.filter(e => e.label == item.dictValue)[0].status == '1') return true
+        let flag  
+        if(this.currentCheckingEnginList.filter(e => e.label == item.label)[0].status == '1') return true
       } catch (error) {
         return false
       }
@@ -725,6 +726,9 @@ export default {
           message: '审核成功',
           type: 'success'
         });
+        setTimeout(() => {
+          this.viewNodeSource()
+        },1000)
       }
     })
   },
@@ -814,11 +818,13 @@ export default {
       }
     })
   },
-  viewNodeSource(e){
-    console.log(this.currentId)
+  viewNodeSource(e = null){
+    if(e){
+      this.currentEnginName = e
+    }
     viewEngineeringInfrastructureSource({
       id:this.currentId,
-      type:e
+      type:e || this.currentEnginName
     }).then(res => {
       this.createTime = res.data.createTime
       console.log(res)