审核状态变更

src/components/ConstructionDetails/indexGY.vue

@@ -34,10 +34,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="['review','put'].includes(status)">
-                        {{ e.state == '0' ? "该施工信息审核未通过" : "" }}</h2>
-                      <h2 style="margin-left: 20%;font-weight: 700; color: #1ab394" v-if="['review','put'].includes(status)">
-                        {{ 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">
@@ -93,7 +90,7 @@
                       </el-checkbox>
                       <h2 style="margin-left: 20%;font-weight: 700;" v-if="['review','put'].includes(status)">
                         {{ e.state == '0' ? "该施工信息审核未通过" : "" }}</h2>
-                      <h2 style="margin-left: 20%;font-weight: 700; color: #1ab394" v-if="['review','put'].includes(status)">
+                      <h2 style="margin-right: 20%;font-weight: 700; color: #1ab394" v-if="['review','put'].includes(status)">
                         {{ e.state == 1 ? "该施工信息审核通过" : "" }}</h2>
                     </div>
                   </template>
@@ -211,7 +208,7 @@
                       </el-checkbox>
                       <h2 style="margin-left: 20%;font-weight: 700;" v-if="['review','put'].includes(status)">
                         {{ e.state == '0' ? "该施工信息审核未通过" : "" }}</h2>
-                      <h2 style="margin-left: 20%;font-weight: 700; color: #1ab394" v-if="['review','put'].includes(status)">
+                      <h2 style="margin-right: 20%;font-weight: 700; color: #1ab394" v-if="['review','put'].includes(status)">
                         {{ e.state == 1 ? "该施工信息审核通过" : "" }}</h2>
                     </div>
                   </template>

src/components/ConstructionDetails/indexPK.vue

@@ -32,10 +32,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="['review','put'].includes(status)">
-                      {{ e.state == '0' ? "该施工信息审核未通过" : "" }}</h2>
-                    <h2 style="margin-left: 20%;font-weight: 700; color: #1ab394" v-if="['review','put'].includes(status)">
-                      {{ 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/components/ConstructionDetails/indexSZ.vue

@@ -32,10 +32,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="['review','put'].includes(status)">
-                      {{ e.state == '0' ? "该施工信息审核未通过" : "" }}</h2>
-                    <h2 style="margin-left: 20%;font-weight: 700; color: #1ab394" v-if="['review','put'].includes(status)">
-                      {{ 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/engineeringCivil/index.vue

@@ -231,7 +231,7 @@
         >节点开关
         </el-button>
       </el-col>
-      <el-col :span="2.5" style="margin-left: 66%">
+      <el-col :span="2.5" style="margin-left: 60%">
         <el-button
           type="danger"
           plain
@@ -277,12 +277,14 @@
               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 == '1' && item.Type != '开栓')"
                     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' && item.Type != '开栓'"
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639;"></span>
-              <span slot="reference" v-if="item.state == '0' && item.Type == '开栓'"
-                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: yellow;"></span>
+              <span slot="reference" v-if="(item.state == '0' || item.state == '2') && item.Type == '开栓'"
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #ffff00;"></span>
+              <span slot="reference" v-if="item.state == '1' && item.Type == '开栓'"
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #6998e0;"></span>
             </el-popover>
           </div>
         </template>
@@ -1041,6 +1043,9 @@ export default {
             'zEngiineeringPhotoBoList',                // 照片
           ]
         },
+        {
+          name: '开栓'
+        },
         ///////////////////////////////////////////////室内工程//////////////////////////////////////////
         ///////////////////////////////////////////////庭院工程//////////////////////////////////////////
         {
@@ -2169,6 +2174,10 @@ export default {
         this.$message.warning("请选择工程分类")
         return
       }
+      if (this.queryParams1.enginClassification != 'indoor_engin') {
+        this.$message.warning("颜色导出只支持室内工程")
+        return
+      }
       this.download('zdsz/engineeringCivil/exportColor', {
         ...this.queryParams1
       }, `民用工程-${new Date().getTime()}.xlsx`)

src/views/zdsz/engineeringGY/index.vue

@@ -74,6 +74,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>
 
@@ -88,8 +96,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>
@@ -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>