wang_xy 9 maanden geleden
bovenliggende
commit
e40590756e
2 gewijzigde bestanden met toevoegingen van 23 en 14 verwijderingen
  1. 6 2
      src/components/ConstructionDetails/index.vue
  2. 17 12
      src/views/zdsz/engineeringCivil/index.vue

+ 6 - 2
src/components/ConstructionDetails/index.vue

@@ -41,7 +41,7 @@
                         <h2 style="margin-left: 1%;font-weight: 700;">{{ e.updateInfoTime }}</h2>
                       </el-checkbox>
                       <h2 :style="'margin-left: 20%;font-weight: 700;'+ (e.state == '1'? 'color: #1ab394':'') ">
-                        {{ e.state == '0' ? "该施工信息审核未通过" : e.state == '1' ? "该施工信息审核通过" : "" }}</h2>
+                        {{ e.state == '0' ? "该施工信息审核未通过:" : e.state == '1' ? "该施工信息审核通过" : e.state == '3' ? "该施工信息照片一致":"" }}{{e.zEngineeringReviewBo.reviewContent}}</h2>
                     </div>
                   </template>
                   <div class="personInfo">
@@ -1003,7 +1003,7 @@
                         <h2 style="margin-left: 1%;font-weight: 700;">{{ e.updateInfoTime }}</h2>
                       </el-checkbox>
                       <h2 :style="'margin-left: 20%;font-weight: 700;'+ (e.state == '1'? 'color: #1ab394':'') ">
-                        {{ e.state == '0' ? "该施工信息审核未通过" : e.state == '1' ? "该施工信息审核通过" : "" }}</h2>
+                        {{ e.state == '0' ? "该施工信息审核未通过:" : e.state == '1' ? "该施工信息审核通过" : e.state == '3' ? "该施工信息照片一致":"" }}{{e.zEngineeringReviewBo.reviewContent}}</h2>
                     </div>
                   </template>
                   <div class="personInfo">
@@ -2013,6 +2013,10 @@ export default {
         {
           value: '0',
           label: '不通过'
+        },
+        {
+          value: '3',
+          label: '前后照片一致'
         }
       ],
       nodesource: '',// 审核状态option

+ 17 - 12
src/views/zdsz/engineeringCivil/index.vue

@@ -252,18 +252,6 @@
         >节点开关
         </el-button>
       </el-col>
-      <el-col :span="2.5" style="margin-left: 29%">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['zdsz:engineeringCivil: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: #c0c0c0;"></span>无数据
@@ -275,6 +263,18 @@
           style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639;"></span>不通过
         <span
           style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #5d5050;"></span>底腿未完工
+        <span
+          style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #500304;"></span>前后照片一致
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['zdsz:engineeringCivil:remove']"
+        >删除
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -326,6 +326,8 @@
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #5d5050;"></span>
               <span slot="reference" v-if="item.state == '0' && item.content!='暂未审核' && 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 == '3' && item.Type != '开栓'"
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #500304;"></span>
 
               <span slot="reference" v-if="(item.state == '0' || item.state == '2') && item.Type == '开栓'" @click="gotoOpenGas(scope.row)"
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #ffff00;"></span>
@@ -1352,6 +1354,9 @@ export default {
           value: '2',
           label: '未审核'
         },{
+          value: '3',
+          label: '照片一致'
+        },{
           value: '99',
           label: '无数据'
         }