审核完善 && 用料完善

src/components/ConstructionDetails/index.vue

@@ -57,7 +57,7 @@
                       >
                       <!--                  :rules="{required: true, message: '请输入材质', trigger: 'blur'}"-->
                       <!--                  <el-input v-model="item.materialQuality" placeholder="请输入材质" style="width: 100%"/>-->
-                      <el-select  v-model="i.materialQuality" placeholder="请选择材质" style="width: 100%" @change="getEnginSpecificationsList(i, index)" :disabled="status == 'read-only' ">
+                      <el-select  v-model="i.materialQuality" placeholder="请选择材质" style="width: 100%" @change="getEnginSpecificationsList(i, index,idx)" :disabled="status == 'read-only' ">
                           <el-option
                           v-for="e in materialQualityList"
                           :key="e.id"
@@ -351,7 +351,15 @@ export default {
       } catch (error) {
         this.checkingInfo.engInfoId = null
       }
+      this.dialogVisible = false
+      this.checkingVisible = false
       this.$emit('checkWorking',this.checkingInfo)
+      this.checkingInfo = {
+        reviewStatus:'',               // 审核状态
+        reviewContent:'',              // 审核内容
+        engInfoId:'',                  // 节点Id
+        createTime:'',                 // 工程创建时间
+      }
     },
     // 查看单节点历史
     viewSource(e) {
@@ -402,8 +410,9 @@ export default {
       this.dialogVisible = true
     },
     // 获取材质规格
-    getEnginSpecificationsList(e,idx){
-      console.log(e)
+    getEnginSpecificationsList(e,idx,parentIndex){
+      // 重置规格
+      this.currentCollapses[parentIndex].zEngineeringMaterialBo[idx].specifications = ''
         getEnginSpecificationsList({materId:e.materialQuality}).then(res => {
             console.log('规格',res.data)
             this.specificationsList = res.data

src/views/zdsz/engineeringCivil/index.vue

@@ -192,7 +192,7 @@
             icon="el-icon-edit"
             @click="addNodeInfo(scope.row)"
             v-hasPermi="['zdsz:engineeringCivil:add']"
-          >修改施工信息
+          >填写施工信息
           </el-button>
           <el-button
             size="mini"
@@ -432,11 +432,11 @@
     <ConstructionDetails
       ref="ConstructionDetails"
       :currentCollapses="currentCollapses"
-      :zEngineeringNodeBo="zEngineeringNodeBo"
       :type="nodeDetailType"
       @updateNodeOption="updateNodeOption"
       @checkWorking="checkWorking"
       :status="status"
+      :zEngineeringNodeBo="zEngineeringNodeBo"
       enginType="民用工程"
     />
 
@@ -857,7 +857,6 @@ export default {
         completionStatus: undefined,
         enginClassification: undefined,
         imgUrl: undefined,
-        zEngineeringNodeBo:{},
         zEngineeringNodeBoList: {
           type: undefined,
           zEngineeringInfoBo: {
@@ -985,6 +984,9 @@ export default {
           label: '不通过'
         }
       ],
+      zEngineeringNodeBo:{
+
+      },
     };
   },
   created() {
@@ -1035,7 +1037,7 @@ export default {
         }
       })
     },
-    // 修改施工信息
+    // 填写施工信息
     updateNodeOption(zEngineeringInfoBoList) {
       delete this.updateParams.zEngineeringNodeBoList
       this.updateParams.zEngineeringNodeBo.zEngineeringInfoBoList = zEngineeringInfoBoList
@@ -1078,7 +1080,6 @@ export default {
         try {
           this.updateParams = res.data
           this.currentCollapses = res.data.zEngineeringNodeBo.zEngineeringInfoBoList
-          this.zEngineeringNodeBo=res.data.zEngineeringNodeBo
         } catch (error) {
           this.currentCollapses = [];
         }
@@ -1098,6 +1099,7 @@ export default {
             "value": res.data[i].dictValue,
           })
         }
+        this.zEngineeringNodeBo = e
         this.$refs.ConstructionDetails.open(dict, _, type)
         this.status = 'read-only'
       })
@@ -1376,7 +1378,6 @@ export default {
               type: 'success'
             });
             this.open = false
-            this.getList()
             console.log('选中节点集合', this.currentCheckList)
             this.currentCheckList = []
             // this.$emit('closeToSucceed')
@@ -1390,13 +1391,13 @@ export default {
               type: 'success'
             });
             this.open = false
-            this.getList()
             console.log('选中节点集合', this.currentCheckList)
             this.currentCheckList = []
             // this.$emit('closeToSucceed')
           }
         })
       }
+
       return
       getDictList({enginType: ['new_built', 'old_renovation']}).then(res => {
         this.nodeList = res.data
@@ -1439,7 +1440,7 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getEngineeringCivil(id).then(res => {
-
+        debugger
         that.loading = false;
         // let newData = res.data
         // // 手动调用行政区发生改变
@@ -1460,6 +1461,7 @@ export default {
             updateEngineeringCivil(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
+              debugger
               this.getList();
             }).finally(() => {
               this.buttonLoading = false;