修改bug

src/api/zdsz/engineeringIndustry.js

@@ -49,7 +49,7 @@ export function DelEngineeEngineeIndustry(id) {
 
 export function QueryEngineeIndustry({id}) {
   return request({
-    url: `/zdsz/engineeringIndustry/${id}`,
+    url: `/zdsz/engineeringIndustry/${id}/1`,
     method: 'get',
   })
 }

src/components/EngineePipe/index.vue

@@ -410,6 +410,7 @@ export default {
         }})
     },
     toNodeDetail() {
+      console.log(this.queryParams)
       let nodeCollection = []
       // 收集节点信息
       this.currentCheckList.forEach((e, idx) => {
@@ -418,16 +419,16 @@ export default {
         nodeCollection.push(nodeItem)
       })
       this.queryParams.zEngineeringNodeBoList = nodeCollection
-      this.queryParams.zEngineeringNodeBoList[0].zEngineeringInfoBo.constructTime = this.queryParams.zEngineeringNodeBoList[0].constructTime
-      delete this.queryParams.zEngineeringNodeBoList[0].constructTime
+      // this.queryParams.zEngineeringNodeBoList[0].zEngineeringInfoBo.constructTime = this.queryParams.zEngineeringNodeBoList[0].constructTime
+      // delete this.queryParams.zEngineeringNodeBoList[0].constructTime
       if (this.enginNodeStatus == '修改') {
-        this.queryParams.files = this.$refs.obsFileUpload.fileList;
-        if (this.$refs.obsFileUpload.fileList==null||this.$refs.obsFileUpload.fileList.length===0){
-          this.$message.warning('必须上传文件!')
-          return
-        }
         this.$refs["form"].validate(valid => {
           if (valid) {
+            this.queryParams.files = this.$refs.obsFileUpload.fileList;
+            if (this.$refs.obsFileUpload.fileList==null||this.$refs.obsFileUpload.fileList.length===0){
+              this.$message.warning('必须上传文件!')
+              return
+            }
             if (this.queryParams.id != null) {
               putEngineeringPipeJacking(this.queryParams).then(response => {
                 this.$modal.msgSuccess("修改成功");
@@ -452,6 +453,11 @@ export default {
           }
         })
       } else {
+        this.queryParams.files = this.$refs.obsFileUpload.fileList;
+        if (this.$refs.obsFileUpload.fileList==null||this.$refs.obsFileUpload.fileList.length===0){
+          this.$message.warning('必须上传文件!')
+          return
+        }
         addEngineeringPipeJacking(this.queryParams).then(res => {
           if (res.code == 200) {
             this.$message({
@@ -495,13 +501,8 @@ export default {
     },
     // 表单重置
     reset() {
-      // this.$nextTick(() => {
-      //   this.$refs['form'].resetFields()
-      //   this.$refs['nodeForm'].resetFields()
-      // })
       this.resetForm("form");
       this.resetForm("nodeForm");
-      this.queryParams.files=[]
     },
     /** 提交按钮 */
     submitForm() {

src/views/zdsz/engineeringIndustry/index.vue

@@ -561,8 +561,22 @@ export default {
       })
     },
     //添加用料信息
-    addzEngineeringMaterBo(row) {
-
+    async addzEngineeringMaterBo(row) {
+      this.zEngineeringNodeBo={ // 工程节点
+        type: '', // 节点类型
+          zEngineeringInfoBo: { // 施工信息
+          constructUser: '', // 施工人
+            constructTime: '', // 施工时间
+            zEngiineeringPhotoBoList: [], // 图片列表
+            zEngineeringMaterialBo: [ // 用料对象
+            {
+              materialQuality: '', // 用料材质
+              specifications: '', // 用料规格
+              number: '' // 用料数量
+            },
+          ],
+        },
+      }
       const id = row.id
       putEngineeEngineeIndustry(id).then(response => {
         this.loading = false;

src/views/zdsz/openbolt/index.vue

@@ -100,16 +100,16 @@
       <el-table-column label="楼栋" align="center" prop="buildingName" />
       <el-table-column label="单元" align="center" prop="unitName" />
       <el-table-column label="房间" align="center" prop="houseName" />
-      <el-table-column label="安检是否合格" align="center" prop="isQualified">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.pass_check" :value="scope.row.isQualified"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="是否维修" align="center" prop="isMaintenance">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.is_repair" :value="scope.row.isMaintenance"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="安检是否合格" align="center" prop="isQualified">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.pass_check" :value="scope.row.isQualified"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="是否维修" align="center" prop="isMaintenance">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.is_repair" :value="scope.row.isMaintenance"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">

src/views/zdsz/opencheck/index.vue

@@ -105,11 +105,11 @@
           <dict-tag :options="dict.type.pass_check" :value="scope.row.isQualified"/>
         </template>
       </el-table-column>
-      <el-table-column label="是否维修" align="center" prop="isMaintenance">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.is_repair" :value="scope.row.isMaintenance"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="是否维修" align="center" prop="isMaintenance">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.is_repair" :value="scope.row.isMaintenance"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">

src/views/zdsz/openrepair/index.vue

@@ -100,11 +100,11 @@
       <el-table-column label="楼栋" align="center" prop="buildingName" />
       <el-table-column label="单元" align="center" prop="unitName" />
       <el-table-column label="房间" align="center" prop="houseName" />
-      <el-table-column label="安检是否合格" align="center" prop="isQualified">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.pass_check" :value="scope.row.isQualified"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="安检是否合格" align="center" prop="isQualified">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.pass_check" :value="scope.row.isQualified"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="是否维修" align="center" prop="isMaintenance">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.is_repair" :value="scope.row.isMaintenance"/>