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

# Conflicts:
#	src/views/zdsz/engineeringIndustry/index.vue

src/api/zdsz/engineeringIndustry.js

@@ -57,6 +57,13 @@ export function QueryEngineeIndustry({id, type}) {
   })
 }
 
+export function QueryEngineeIndustrys({id, type}) {
+  return request({
+    url: `/zdsz/engineeringIndustry/query/${id}/${type}`,
+    method: 'get',
+  })
+}
+
 export function UpdateEngineeIndustry(data) {
   return request({
     url: '/zdsz/engineeringIndustry/updateNodeByBo',

src/components/ConstructionDetails/index.vue

@@ -139,7 +139,7 @@
                       :prop="i.materialQuality"
                       :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                       :label="activeNames == '阀管' ? '灶具管厂家': '材质'"
-                      v-show="i.materialQuality != null"
+                      v-show="i.materialQuality != null||(enginClassification != null && !enginClassification.includes('调压柜'))"
                       label-width="95px"
                       >
                       <el-select  v-model="i.materialQuality" placeholder="请选择材质" style="width: 100%" @change="getEnginSpecificationsList(i, index,idx)" :disabled="status == 'read-only' ">
@@ -155,7 +155,7 @@
                       :prop="i.specifications"
                       :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                       label="规格"
-                      v-show="i.specifications != null"
+                      v-show="i.specifications != null||(enginClassification != null && !enginClassification.includes('调压柜'))"
                       label-width="95px"
 
                       >
@@ -175,11 +175,11 @@
                       </el-select>
                     </el-form-item>
                   <el-form-item
-                    v-if="currentDicts.some(item=>item.label==='底腿')||node==='调压柜安装'"
+                    v-if="currentDicts.some(item=>item.label==='底腿')||node==='调压柜安装'||(enginClassification != null && enginClassification.includes('调压柜'))"
                     :prop="i.remark + ''"
                     :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                     label="施工内容"
-                    v-show="currentDicts.some(item=>item.label==='底腿')||node==='调压柜安装'"
+                    v-show="currentDicts.some(item=>item.label==='底腿')||node==='调压柜安装'||(enginClassification != null && enginClassification.includes('调压柜'))"
                     label-width="95px"
                   >
                     <div class="block" style="display: inline-block; margin-right: 20px;">
@@ -224,7 +224,7 @@
                       :prop="i.number + ''"
                       :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                       label="数量"
-                      v-show="i.number != null"
+                      v-show="i.number != null||(enginClassification != null && !enginClassification.includes('调压柜'))"
                       label-width="95px"
                       >
                       <div class="block" style="display: inline-block; margin-right: 20px;">
@@ -238,7 +238,7 @@
                       :prop="i.remark + ''"
                       :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                       label="描述"
-                      v-show="i.remark != null&&!currentDicts.some(item=>item.label==='底腿')"
+                      v-show="i.remark != null||!currentDicts.some(item=>item.label==='底腿')"
                       >
                       <div class="block" style="display: inline-block; margin-right: 20px;">
                         <el-input v-model="i.remark" placeholder="请输入描述" style="width: 100%"  maxlength="100" :disabled="status == 'read-only'"></el-input>
@@ -331,7 +331,7 @@
                 </el-input> -->
             </div>
             <!-- <el-form-item label="照片" prop="zEngiineeringPhotoBoList" class="obsImage"> -->
-              <div style="display: flex;width: 100%;height: 100%;" v-if="!(currentDicts.some(item=>item.label==='底腿'))&&!(node==='下沟')&&!(node=='回填')&&!(node=='trench_construction')&&!(node=='underditch_construction')&&!(engineType=='pe')&&!(engineType=='iron_air')&&!(node=='调压柜安装')">
+              <div style="display: flex;width: 100%;height: 100%;" v-if="!(currentDicts.some(item=>item.label==='底腿'))&&!(node==='下沟')&&!(node=='回填')&&!(node=='trench_construction')&&!(node=='underditch_construction')&&!(engineType=='pe')&&!(engineType=='iron_air')&&!(node=='调压柜安装')&&(enginClassification != null && !enginClassification.includes('调压柜'))">
                 <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">图片</h3>
                 <ObsImageUpload
                   :class=" status == 'read-only' ? 'obsImageUploads' : '' "
@@ -667,7 +667,7 @@
                 :disabled="status == 'read-only' "
               ></ObsImageUpload>
             </div>
-            <div style="display: flex;width: 100%;height: 100%;" v-if="node==='回填'||node==='调压柜安装'">
+            <div style="display: flex;width: 100%;height: 100%;" v-if="node==='回填'||node==='调压柜安装'||(enginClassification != null && enginClassification.includes('调压柜'))">
               <h3 style="width: 95px;font-weight: 600;text-align: center;text-indent: 25px;">石粉回填照片</h3>
               <ObsImageUpload
                 :class=" status == 'read-only' ? 'obsImageUploads' : '' "
@@ -751,7 +751,7 @@
                 :disabled="status == 'read-only' "
               ></ObsImageUpload>
             </div>
-            <div style="display: flex;width: 100%;height: 100%;" v-if="node==='调压柜安装'">
+            <div style="display: flex;width: 100%;height: 100%;" v-if="node==='调压柜安装'||(enginClassification != null && enginClassification.includes('调压柜'))">
               <h3 style="width: 95px;font-weight: 600;text-align: center;text-indent: 25px;">调压柜铭牌</h3>
               <ObsImageUpload
                 :class=" status == 'read-only' ? 'obsImageUploads' : '' "
@@ -763,7 +763,7 @@
                 :disabled="status == 'read-only' "
               ></ObsImageUpload>
             </div>
-            <div style="display: flex;width: 100%;height: 100%;" v-if="node==='调压柜安装'">
+            <div style="display: flex;width: 100%;height: 100%;" v-if="node==='调压柜安装'||(enginClassification != null && enginClassification.includes('调压柜'))">
               <h3 style="width: 95px;font-weight: 600;text-align: center;text-indent: 25px;">调压箱防雷接地</h3>
               <ObsImageUpload
                 :class=" status == 'read-only' ? 'obsImageUploads' : '' "
@@ -775,7 +775,7 @@
                 :disabled="status == 'read-only' "
               ></ObsImageUpload>
             </div>
-            <div style="display: flex;width: 100%;height: 100%;" v-if="node==='调压柜安装'">
+            <div style="display: flex;width: 100%;height: 100%;" v-if="node==='调压柜安装'||(enginClassification != null && enginClassification.includes('调压柜'))">
               <h3 style="width: 95px;font-weight: 600;text-align: center;text-indent: 25px;">调压箱底腿连接</h3>
               <ObsImageUpload
                 :class=" status == 'read-only' ? 'obsImageUploads' : '' "
@@ -787,7 +787,7 @@
                 :disabled="status == 'read-only' "
               ></ObsImageUpload>
             </div>
-            <div style="display: flex;width: 100%;height: 100%;" v-if="node==='调压柜安装'">
+            <div style="display: flex;width: 100%;height: 100%;" v-if="node==='调压柜安装'||(enginClassification != null && enginClassification.includes('调压柜'))">
               <h3 style="width: 95px;font-weight: 600;text-align: center;text-indent: 25px;">调压箱护栏及地面硬化(远景)</h3>
               <ObsImageUpload
                 :class=" status == 'read-only' ? 'obsImageUploads' : '' "
@@ -1064,6 +1064,7 @@ export default {
             this.checkingInfo.engInfoId = this.currentEnginId
             this.checkingInfo.delInfoIdList=this.delinfoidList
             this.checkingInfo.infoIdList= this.infoIdList
+            console.log('checkWorking',this.checkingInfo)
             this.$emit('checkWorking',this.checkingInfo)
             this.checkList=[]
           } catch (error) {

src/views/zdsz/engineeringIndustry/index.vue

@@ -87,28 +87,20 @@
       <el-table-column label="设计负责人" align="center" prop="designHead"/>
       <el-table-column label="监理负责人" align="center" prop="supervisionHead"/>
       <el-table-column label="监理单位" align="center" prop="supervisionUnit"/>
-      <el-table-column label="审核状态" align="center" prop="nodeReViewStateList" width="250">
-        <template slot-scope="scope">
-          <div style="text-align:center">
-            <el-popover
-              v-for="item in scope.row.nodeReViewStateList"
-              placement="top-start"
-              trigger="hover"
-              :content="item.Type">
-              <span slot="reference" v-if="(item.state == '1'||item.state == '2')"
-                    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' "
-                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639;"></span>
-            </el-popover>
-          </div>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
+            @click="viewSource(scope.row,'check')"
+            v-hasPermi="['zdsz:engineeringIndustry:edit']"
+          >审核
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['zdsz:engineeringIndustry:edit']"
           >修改
@@ -121,13 +113,13 @@
             @click="updateviewSource(scope.row)"
           >修改施工信息
           </el-button>
-<!--          <el-button type="text"-->
-<!--                     icon="el-icon-edit"-->
-<!--                     size="mini"-->
-<!--                     v-hasPermi="['zdsz:engineeringIndustry:add']"-->
-<!--                     @click="addzEngineeringMaterBo(scope.row)"-->
-<!--          >添加用料-->
-<!--          </el-button>-->
+          <el-button type="text"
+                     icon="el-icon-edit"
+                     size="mini"
+                     v-hasPermi="['zdsz:engineeringIndustry:add']"
+                     @click="addzEngineeringMaterBo(scope.row)"
+          >添加用料
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -353,13 +345,13 @@ import {
   EditEngineeEngineeIndustry,
   getEngineeIndustryList,
   putEngineeEngineeIndustry,
-  QueryEngineeIndustry, UpdateEngineeIndustry
+  QueryEngineeIndustry, QueryEngineeIndustrys, UpdateEngineeIndustry
 } from '@/api/zdsz/engineeringIndustry'
 import {getDicts} from "@/api/system/dict/data";
 import EngineePipe from '@/components/EngineePipe'
 import {validPhoneMobile} from '@/api/rules'
 import ConstructionDetails from '@/components/ConstructionDetails/index.vue'
-import {getEnginMaterialQualityList, engineeringCivilReview, insertReview} from '@/api/zdsz/enginee'
+import {getEnginMaterialQualityList, insertReview, engineeringCivilReview} from '@/api/zdsz/enginee'
 import {getEnginSpecificationsList} from '@/api/zdsz/enginSpecifications'
 
 export default {
@@ -525,6 +517,7 @@ export default {
     });
   },
   methods: {
+
     // 节点单项审核
     checkWorking(checkingInfo){
       console.log('checkingInfo===',checkingInfo)