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

src/components/ConstructionDetails/index.vue

@@ -35,8 +35,7 @@
                 <el-checkbox :label="e.id" @change="handleCheckedCitiesChange">
                   <h2 style="margin-left: 1%;font-weight: 700;">{{ e.updateTime }}</h2>
                 </el-checkbox>
-                <h2 style="margin-left: 20%;font-weight: 700;" v-if="e.state=='0'">  {{e.state=='0'?"该施工信息审核未通过":""}}</h2>
-                <h2 style="margin-left: 20%;font-weight: 700; color: #1ab394" v-if="e.state==1">  {{e.state==1?"该施工信息审核通过":""}}</h2>
+                <h2 :style="'margin-left: 20%;font-weight: 700;'+ (e.state == '1'? 'color: #1ab394':'') ">  {{e.state=='0'?"该施工信息审核未通过":e.state=='1'?"该施工信息审核通过":""}}</h2>
               </div>
             </template>
             <div class="personInfo">

src/views/zdsz/engineeringGasOpening/index.vue

@@ -203,7 +203,7 @@
           <el-col :span="4">
             <el-form-item label="行政区" prop="district">
               <el-select
-                  :disabled="title == '添加用料' "
+                  :disabled="title != '新增开栓施工' "
                   v-model="form.district"
                   placeholder="请选择行政区"
                   filterable
@@ -222,7 +222,7 @@
           <el-col :span="4">
             <el-form-item label="小区" prop="areaId">
               <el-select
-                  :disabled="title == '添加用料' "
+                  :disabled="title != '新增开栓施工' "
                   v-model="form.areaId"
                   filterable
                   placeholder="请选择小区"
@@ -241,7 +241,7 @@
           <el-col :span="4">
             <el-form-item label="楼栋" prop="buildingId">
               <el-select
-                  :disabled="title == '添加用料' "
+                  :disabled="title != '新增开栓施工' "
                   filterable
                   v-model="form.buildingId"
                   placeholder="请选择楼栋"
@@ -260,7 +260,7 @@
           <el-col :span="4">
             <el-form-item label="单元" prop="unitId">
               <el-select
-                  :disabled="title == '添加用料' "
+                  :disabled="title != '新增开栓施工' "
                   v-model="form.unitId"
                   filterable
                   placeholder="请选择单元"
@@ -279,7 +279,7 @@
           <el-col :span="4">
             <el-form-item label="房间" prop="houseId">
               <el-select
-                  :disabled="title == '添加用料' "
+                  :disabled="title != '新增开栓施工' "
                   v-model="form.houseId"
                   filterable
                   placeholder="请选择房间"

src/views/zdsz/engineeringIndustry/index.vue

@@ -64,6 +64,14 @@
         >删除
         </el-button>
       </el-col>
+      <el-col :span="2.5" style="float: right;">
+        <span
+          style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #e0c794;"></span>待审核
+        <span
+          style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>通过
+        <span
+          style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639;"></span>不通过
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -83,8 +91,8 @@
       <el-table-column label="用料比" align="center" prop="enginClassification" width="300px">
         <template slot-scope="scope">
           <div>
-            <span>PE{实际：{{scope.row.pesj}},预计：{{scope.row.pePreset}},占比：{{scope.row.peys == 0 ? 100:(scope.row.pesj / scope.row.pePreset * 100).toFixed(1)}}%}</span><br>
-            <span>钢材{实际：{{scope.row.gsj}},预计：{{scope.row.gcPreset}},占比：{{scope.row.gys == 0 ? 100:(scope.row.gsj / scope.row.gcPreset * 100).toFixed(1)}}%}</span>
+            <span>PE{实际：{{scope.row.pesj}},预计：{{scope.row.pePreset}},占比：{{scope.row.pePreset == 0||scope.row.pePreset == null ? 100:(scope.row.pesj / scope.row.pePreset * 100).toFixed(1)}}%}</span><br>
+            <span>钢材{实际：{{scope.row.gsj}},预计：{{scope.row.gcPreset}},占比：{{scope.row.gcPreset == 0||scope.row.pePreset == null ? 100:(scope.row.gsj / scope.row.gcPreset * 100).toFixed(1)}}%}</span>
           </div>
         </template>
       </el-table-column>

src/views/zdsz/engineeringInfrastructure/index.vue

@@ -52,7 +52,14 @@
           v-hasPermi="['zdsz:engineeringInfrastructure:remove']"
         >删除</el-button>
       </el-col>
-
+      <el-col :span="2.5" style="float: right;">
+        <span
+          style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #e0c794;"></span>待审核
+        <span
+          style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>通过
+        <span
+          style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639;"></span>不通过
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -72,9 +79,11 @@
               placement="top-start"
               trigger="hover"
               :content="item.Type">
-              <span slot="reference" v-if="(item.state == '1'||item.state == '2')"
+              <span slot="reference" v-if="item.state == '0' && item.content=='暂未审核'"
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #e0c794;"></span>
+              <span slot="reference" v-else-if="item.state == '1' "
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>
-              <span slot="reference" v-if="item.state == '0' "
+              <span slot="reference" v-else
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639;"></span>
             </el-popover>
           </div>

src/views/zdsz/engineeringPipeJacking/index.vue

@@ -43,6 +43,14 @@
         >删除
         </el-button>
       </el-col>
+      <el-col :span="2.5" style="float: right;">
+        <span
+              style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #e0c794;"></span>待审核
+        <span
+              style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>通过
+        <span
+              style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639;"></span>不通过
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -58,8 +66,8 @@
       <el-table-column label="用料比" align="center" prop="enginClassification" width="300px">
         <template slot-scope="scope">
           <div>
-            <span>PE{实际：{{scope.row.pesj}},预计：{{scope.row.pePreset}},占比：{{scope.row.peys == 0 ? 100:(scope.row.pesj / scope.row.pePreset * 100).toFixed(1)}}%}</span><br>
-            <span>钢材{实际：{{scope.row.gsj}},预计：{{scope.row.gcPreset}},占比：{{scope.row.gys == 0 ? 100:(scope.row.gsj / scope.row.gcPreset * 100).toFixed(1)}}%}</span>
+            <span>PE{实际：{{scope.row.pesj}},预计：{{scope.row.pePreset}},占比：{{scope.row.pePreset == 0||scope.row.pePreset == null ? 100:(scope.row.pesj / scope.row.pePreset * 100).toFixed(1)}}%}</span><br>
+            <span>钢材{实际：{{scope.row.gsj}},预计：{{scope.row.gcPreset}},占比：{{scope.row.gcPreset == 0||scope.row.pePreset == null ? 100:(scope.row.gsj / scope.row.gcPreset * 100).toFixed(1)}}%}</span>
           </div>
         </template>
       </el-table-column>
@@ -71,9 +79,11 @@
               placement="top-start"
               trigger="hover"
               :content="item.Type">
-              <span slot="reference" v-if="(item.state == '1'||item.state == '2')"
+             <span slot="reference" v-if="item.state == '0' && item.content=='暂未审核'"
+                   style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #e0c794;"></span>
+              <span slot="reference" v-else-if="item.state == '1' "
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>
-              <span slot="reference" v-if="item.state == '0' "
+              <span slot="reference" v-else
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639;"></span>
             </el-popover>
           </div>

src/views/zdsz/touchOperationEngineering/index.vue

@@ -80,6 +80,14 @@
         >导出
         </el-button>
       </el-col>
+      <el-col :span="2.5" style="float: right;">
+        <span
+          style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #e0c794;"></span>待审核
+        <span
+          style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>通过
+        <span
+          style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639;"></span>不通过
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -101,9 +109,11 @@
               placement="top-start"
               trigger="hover"
               :content="item.Type">
-              <span slot="reference" v-if="(item.state == '1'||item.state == '2')"
+              <span slot="reference" v-if="item.state == '0' && item.content=='暂未审核'"
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #e0c794;"></span>
+              <span slot="reference" v-else-if="item.state == '1' "
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>
-              <span slot="reference" v-if="item.state == '0' "
+              <span slot="reference" v-else
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639;"></span>
             </el-popover>
           </div>