更改

src/views/gas/anjian/index.vue

@@ -373,18 +373,21 @@ export default {
     },
     /**楼宇下拉框*/
     getBuilding(areaId) {
+      this.form.areaName =  this.areaList.filter(item => item.id == areaId )[0].name
       getBuilding(areaId).then(response => {
         this.buildingList = response.data;
         this.getUnit(this.form.buildingId);
       });
     },
     getUnit(buildingId) {
+      this.form.buildingName =  this.buildingList.filter(item => item.id == buildingId )[0].name
       getUnit(buildingId).then(response => {
         this.unitList = response.data;
         this.getHouse(this.form.unitId);
       });
     },
     getHouse(unitId) {
+      this.form.unitName =  this.unitList.filter(item => item.id == unitId )[0].name
       getHouse(unitId).then(response => {
         this.houseList = response.data;
       });

src/views/gas/order/index.vue

@@ -225,6 +225,13 @@
                      v-hasPermi="['gas:order:edit']"
           >复审
           </el-button>
+          <el-button v-show="scope.row.anjianId != null && scope.row.anjianId != ''"
+                     size="mini"
+                     type="text"
+                     icon="el-icon-edit"
+                     @click="viewAnJian(scope.row)"
+          >安检开栓
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -468,6 +475,32 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="安检开栓" :visible.sync="anjianopen" width="500px" append-to-body>
+      <el-form ref="form" :model="anjianform" label-width="80px">
+        <el-form-item label="照片" prop="photoList">
+          <imageUpload v-model="anjianform.photoList"/>
+        </el-form-item>
+        <el-form-item label="职工" prop="userId">
+          <el-select v-model="anjianform.userId" filterable placeholder="请选择职工">
+            <el-option v-for="item in workerList" :key="item.id" :value="item.id" :label="item.name">{{
+                item.name
+              }}
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否合格" prop="whether">
+          <el-select v-model="anjianform.whether" filterable placeholder="请选择">
+            <el-option v-for="item in whetherList" :value="item.value" :label="item.label">{{item.label}}</el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="anjianform.remark" type="textarea" placeholder="请输入内容"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -565,7 +598,19 @@ export default {
           { required: true, message: '房屋不能为空', trigger: 'change' }
 
         ]
-      }
+      },
+      anjianopen:false,
+      anjianform:{},
+      whetherList:[
+        {
+          value: '是',
+          label: '是',
+        },
+        {
+          value: '否',
+          label: '否',
+        }
+      ],
     }
   },
   created() {
@@ -677,6 +722,7 @@ export default {
     cancel() {
       this.open = false
       this.open1 = false
+      this.anjianopen = false
       this.reset()
     },
     // 表单重置
@@ -745,9 +791,19 @@ export default {
         this.open = true
         this.title = '修改工程管理'
         this.getBuilding(this.form.areaId)
-
       })
     },
+    //安检查看
+    viewAnJian(row) {
+      this.reset();
+      this.getWorker();
+      const id = row.anjianId
+      getOrder(id).then(response => {
+        this.loading = false;
+        this.anjianform = response.data;
+        this.anjianopen = true;
+      });
+    },
     /** 复审按钮操作 */
     handleUpdate1(row) {
       this.loading = true

src/views/gas/weixiu/index.vue

@@ -373,18 +373,21 @@ export default {
     },
     /**楼宇下拉框*/
     getBuilding(areaId) {
+      this.form.areaName =  this.areaList.filter(item => item.id == areaId )[0].name
       getBuilding(areaId).then(response => {
         this.buildingList = response.data;
         this.getUnit(this.form.buildingId);
       });
     },
     getUnit(buildingId) {
+      this.form.buildingName =  this.buildingList.filter(item => item.id == buildingId )[0].name
       getUnit(buildingId).then(response => {
         this.unitList = response.data;
         this.getHouse(this.form.unitId);
       });
     },
     getHouse(unitId) {
+      this.form.unitName =  this.unitList.filter(item => item.id == unitId )[0].name
       getHouse(unitId).then(response => {
         this.houseList = response.data;
       });