Merge branch 'zdsz3.0' of http://192.168.10.18:3000/sunwei/zdsz_vue into zdsz3.0

src/components/ConstructionDetails/index.vue

@@ -29,7 +29,7 @@
             <template slot="title">
               <div style="display: flex;width: 100%;height: 100%;">
                 <div
-                  style="width: 3%;height: 29px;margin: auto 0;border-radius: 73%;background-color: rgb(0, 157, 217);box-shadow: 1px 1px #BFBFBF;">
+                  style="width: 15px;height: 15px;margin: auto 10px;border-radius: 73%;background-color: #a3d3ff;box-shadow: 1px 1px rgb(131 131 131 / 62%);">
                 </div>
                 <h2 style="margin-left: 1%;font-weight: 700;">{{ e.updateTime }}</h2>
               </div>
@@ -186,14 +186,14 @@
                   :disabled="status == 'read-only' "
                 ></ObsImageUpload>
               </div>
-              
+
             <!-- </el-form-item> -->
             <hr>
           </el-collapse-item>
         </el-collapse>
       </el-tab-pane>
-      <button class="check" @click="checkWorking" v-show="currentStatus == 'check' && reviewStatus && isChecking " style="width: 80px;border: none;">审核</button>
-      <button class="check" @click="updateNodeOption" style="width: 94px;border: none;cursor: pointer;" v-if="currentStatus != 'check' && status != 'read-only'  ">修改</button>
+      <el-button class="check" plain type="danger" @click="checkWorking" v-show="currentStatus == 'check' && reviewStatus && isChecking " style="width: 80px;">审核</el-button>
+      <el-button class="check" plain type="danger" @click="updateNodeOption" style="width: 94px;cursor: pointer;" v-if="currentStatus != 'check' && status != 'read-only'  ">修改</el-button>
     </el-tabs>
     </el-dialog>
     <!-- 审核 -->
@@ -354,7 +354,7 @@ export default {
     checkingSubmit(){
       console.log('nodebo',this.zEngineeringNodeBo)
       try {
-        console.log(this.currentCollapses[0])
+        console.log("this.zEngineeringNodeBo",this.zEngineeringNodeBo)
         this.checkingInfo.engInfoId = this.zEngineeringNodeBo.id
         this.$emit('checkWorking',this.checkingInfo)
       } catch (error) {
@@ -503,13 +503,13 @@ export default {
 
     ::v-deep .el-tabs__item {
       // width: 47%;
-      border: 1px solid #797979;
+      border: 1px solid #a3d3ff;
       border-radius: 5px;
     }
 
     ::v-deep .el-tabs__item.is-active {
-      background-color: #169BD5;
-      color: #fff;
+      background-color: #e8f4ff;
+      color: #1890ff;
     }
 
     ::v-deep .el-tabs__header {
@@ -528,8 +528,8 @@ export default {
       right: 22.1%;
       top: 13.1%;
       height: 4.6%;
-      background-color: #CC9900;
-      color: #fff;
+      //background-color: #CC9900;
+      //color: #fff;
     }
   }
 

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"
@@ -257,6 +257,7 @@
                 :disabled="title == '添加用料' "
                 v-model="queryParams.district"
                 placeholder="请选择行政区"
+                filterable
                 @change="districtHasChanged"
               >
                 <el-option
@@ -273,6 +274,7 @@
               <el-select
                 :disabled="title == '添加用料' "
                 v-model="queryParams.areaId"
+                filterable
                 placeholder="请选择小区"
                 @change="communityHasChanged"
               >
@@ -291,6 +293,7 @@
             <el-form-item label="楼栋" prop="buildingId">
               <el-select
                 :disabled="title == '添加用料' "
+                filterable
                 v-model="queryParams.buildingId"
                 placeholder="请选择楼栋"
                 @change="buildingHasChanged"
@@ -309,6 +312,7 @@
               <el-select
                 :disabled="title == '添加用料' "
                 v-model="queryParams.unitId"
+                filterable
                 placeholder="请选择单元"
                 @change="unitHasChanged"
               >
@@ -328,6 +332,7 @@
               <el-select
                 :disabled="title == '添加用料' "
                 v-model="queryParams.houseId"
+                filterable
                 placeholder="请选择房间"
               >
                 <el-option
@@ -1037,7 +1042,7 @@ export default {
         }
       })
     },
-    // 填写施工信息
+    // 修改施工信息
     updateNodeOption(zEngineeringInfoBoList) {
       delete this.updateParams.zEngineeringNodeBoList
       this.updateParams.zEngineeringNodeBo.zEngineeringInfoBoList = zEngineeringInfoBoList

src/views/zdsz/engineeringInfrastructure/index.vue

@@ -791,6 +791,7 @@ export default {
       try {
         this.updateParams = res.data
         this.currentCollapses = res.data.zEngineeringNodeBo.zEngineeringInfoBoList
+        this.zEngineeringNodeBo=res.data.zEngineeringNodeBo
       } catch (error) {
         this.currentCollapses = [];
       }