Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

src/api/zdsz/engineeringGasOpening.js

@@ -60,7 +60,7 @@ export function QueryEngineeGasOpening({id, type}) {
 export function UpdateEngineeGasOpening(data) {
   console.log("UpdateEngineeGasOpening=",data)
   return request({
-    url: '/zdsz/engineeringGasOpening/updateNodeByBo',
+    url: '/zdsz/engineeringGasOpening',
     method: 'put',
     data
   })

src/components/ObsVideoUpload/index.vue

@@ -167,7 +167,6 @@ export default {
       //debugger
       video.setAttribute('src', file.url);
       video.addEventListener('canplay', () =>  {
-        debugger
           canvas.getContext('2d').drawImage(video, 0, 0, canvas.width, canvas.height);
           let b64 = canvas.toDataURL('image/png');
           let videoUrl = file.url;

src/views/zdsz/engineeringCivil/index.vue

@@ -2054,7 +2054,6 @@ export default {
             updateEngineeringCivil(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
-              debugger
               this.getList();
             }).finally(() => {
               this.buttonLoading = false;
@@ -2089,7 +2088,6 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      debugger
       if (this.queryParams1.district == undefined || this.queryParams1.district == null || this.queryParams1.district == '') {
         this.$message.warning("请选择行政区")
         return

src/views/zdsz/engineeringGasOpening/index.vue

@@ -131,11 +131,11 @@
       <el-table-column label="单元名称" align="center" prop="unitName"/>
       <el-table-column label="房间名称" align="center" prop="houseName"/>
 <!--      <el-table-column label="燃气表号" align="center" prop="gasMeterNumber"/>-->
-      <!--<el-table-column label="工程类型" align="center" prop="enginType">-->
-        <!--<template slot-scope="scope">-->
-          <!--<span>{{ parseDict(scope.row.enginType, 'air_wall_node') }}</span>-->
-        <!--</template>-->
-      <!--</el-table-column>-->
+      <el-table-column label="审核是否合格" align="center" prop="isQualified" >
+        <template slot-scope="scope">
+          <el-tag slot="reference" v-for="item in stateArray" v-if="item.value==scope.row.state">{{item.label}}</el-tag>
+        </template>
+      </el-table-column>
       <!--<el-table-column label="工程分类" align="center" prop="enginClassification"/>-->
       <!--<el-table-column label="现场负责人" align="center" prop="sceneHead"/>-->
       <!--<el-table-column label="设计负责人" align="center" prop="designHead"/>-->
@@ -154,6 +154,15 @@
           <el-button
             size="mini"
             type="text"
+            icon="el-icon-view"
+            @click="handleUpdate(scope.row)"
+            v-if="scope.row.state != '1'"
+            v-hasPermi="['zdsz:engineeringIndustry:update']"
+          >审核
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['zdsz:engineeringIndustry:remove']"
@@ -172,11 +181,23 @@
     />
     <!-- 添加或修改开栓工程对话框 -->
     <el-dialog :title="title" :visible.sync="open" append-to-body customClass="appendElDialog">
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px" style="height: 100%">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px" style="height: 100%;overflow: hidden;overflow-y: auto;">
         <el-row>
           <el-col :span="12">
             <h1>基础信息</h1>
           </el-col>
+          <el-col :span="12" v-if="buttonShow">
+            <el-form-item label-width="180px" label="审核是否合格" >
+              <el-radio-group v-model="form.state" style="width: 220px">
+                <el-radio
+                  v-for="dict in stateArray"
+                  :key="dict.value"
+                  :label="dict.value"
+                  v-if="dict.value != '0'"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="4">
@@ -560,16 +581,11 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <div style="width: 25%; float: right">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm" v-if="buttonLoading">提交</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-        <br/>
-        <br/>
-        <br/>
-        <br/>
-        <br/>
       </el-form>
+      <div style="width: 25%; float: right;margin-top:2%" >
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm" v-if="!buttonLoading">提交</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -622,12 +638,19 @@ export default {
       })
     }
     return {
+      stateArray:[
+        {label:'未审核',value:'2'},
+        {label:'审核通过',value:'1'},
+        {label:'审核未通过',value:'0'},
+      ],
+
       communityOptions: [],        // 小区集合
       buildingOptions: [],         // 楼栋集合
       unitOptions: [],             // 单元集合
       houseOptions: [],            // 房间集合
       // 按钮loading
       buttonLoading: false,
+      buttonShow: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -665,6 +688,7 @@ export default {
       MaterVisible: false, // 用料信息dialog
       // 表单参数
       form: {
+        isQualified:'',
         gasCylinderPic: [], // 燃气立杠图片
         pressureTestPic: [], // 气密测试图片
         gasMeterPic: [], // 燃气表图片
@@ -1203,6 +1227,7 @@ export default {
       for (let formKey in this.form) {
         this.form[formKey] = null
       }
+      this.isQualified='';
       this.form.gasCylinderPic = [] // 燃气立杠图片
       this.form.pressureTestPic = [] // 气密测试图片
       this.form.gasMeterPic = [] // 燃气表图片
@@ -1245,7 +1270,8 @@ export default {
       this.title = "新增开栓施工";
       this.currentType = 'add'
       this.open = true;
-      this.buttonLoading=true;
+      this.buttonLoading=false;
+      this.buttonShow=false;
     },
     removeFile(val) {
       console.log(val)
@@ -1254,21 +1280,21 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.buttonLoading=true;
+      this.buttonLoading=false;
+      this.buttonShow=true;
       this.gc = false
       this.loading = true;
       this.reset();
       const id = row.id || this.ids
       putEngineeGasOpening(id).then(response => {
         this.loading = false;
+        let newData = response.data
+        this.districtHasChanged(newData.district)
+        this.communityHasChanged(newData.areaId)
+        this.buildingHasChanged(newData.buildingId, newData.areaId)
+        this.unitHasChanged(newData.unitId)
         this.form = response.data;
-        if (response.data.zEngineeringNodeBoList !== undefined && response.data.zEngineeringNodeBoList.length > 0) {
-          this.zEngineeringNodeBo = response.data.zEngineeringNodeBoList[0]
-          if (response.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList !== undefined && response.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList.length > 0) {
-            this.zEngineeringNodeBo.zEngineeringInfoBo = response.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList[0]
-          }
-        }
-        this.title = "修改开栓施工";
+        this.title = "审核";
         this.currentType = 'put'
         this.open = true;
       });
@@ -1276,7 +1302,8 @@ export default {
 
     /** 修改按钮操作 */
     handleview(row) {
-      this.buttonLoading=false;
+      this.buttonLoading=true;
+      this.buttonShow=false;
       this.gc = false
       this.loading = true;
       this.reset();
@@ -1329,7 +1356,7 @@ export default {
               this.getList();
             })
           } else {
-            UpdateEngineeGasOpening(this.form).then(res => {
+            EditEngineeGasOpening(this.form).then(res => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.nodeDetailVisible = false
@@ -1370,7 +1397,7 @@ export default {
 
 ::v-deep .appendElDialog {
   width: 70%;
-  /*height: 500px;*/
+  height: 820px;
 
 
   .el-dialog__body {

src/views/zdsz/engineeringIndustry/index.vue

@@ -874,10 +874,9 @@ export default {
             this.zEngineeringNodeBo.zEngineeringInfoBo = response.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList[0]
           }
         }
-        if(this.form.enginClassification){
+        if(this.form.enginClassification != null){
           this.form.enginClassification = this.form.enginClassification.split(",");
         }
-
         this.title = (this.form.type === '1' ? "修改工业工程" : "修改市政工程");
         this.currentType = 'put'
         this.open = true;