修改民用调压柜

src/components/ConstructionDetails/index.vue

@@ -49,9 +49,11 @@
             </div>
             <hr>
             <!--带气封堵施工 start-->
-            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='pe' || engineType==='iron_air'">
+            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='pe' || engineType==='iron_air' || enginClassification == 'pressure_regulating'">
               <el-form :model="nodeInfo" class="nodeForm materialForm">
-                <el-row style="width: 100%;">
+                <el-row style="width: 100%;"
+                        v-show="enginClassification != 'pressure_regulating'"
+                >
                   <el-col :span="17">
                     <el-form-item
                         :class="'labelWidth'"
@@ -67,7 +69,9 @@
                     </el-form-item>
                     </el-col>
                 </el-row>
-                <el-row style="width: 100%;">
+                <el-row style="width: 100%;"
+                        v-show="enginClassification != 'pressure_regulating'"
+                >
                   <el-col :span="17">
                     <el-form-item
                         :class="'labelWidth'"
@@ -82,6 +86,7 @@
                 </el-row>
                 <el-form-item
                     style="width: 100%;"
+                    v-show="enginClassification != 'pressure_regulating'"
                     :class="'labelWidth'"
                     label="作业方式"
                     label-width="95px"
@@ -91,6 +96,7 @@
                   </div>
                 </el-form-item>
                 <el-form-item
+                  v-show="enginClassification != 'pressure_regulating'"
                     style="width: 100%;"
                     :class="'labelWidth'"
                     label="管道压力"
@@ -104,6 +110,7 @@
                     :class="'labelWidth'"
                     label="施工内容"
                     label-width="95px"
+                    v-if="enginClassification == 'pressure_regulating'"
                 >
                   <div class="block" style="display: inline-block; margin-right: 20px;">
                     <el-input type="textarea" :rows="3" v-model="e.remark" placeholder="请输入施工内容" style="width: 100%" :disabled="status == 'read-only'"> </el-input>
@@ -139,7 +146,7 @@
                       :prop="i.materialQuality"
                       :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                       :label="activeNames == '阀管' ? '灶具管厂家': '材质'"
-                      v-show="i.materialQuality != null || (enginClassification != null && !enginClassification.includes('调压柜'))"
+                      v-show="i.materialQuality != null || (enginClassification != null && !enginClassification.includes('pressure_regulating'))"
                       label-width="95px"
                       >
                       <el-select  v-model="i.materialQuality" placeholder="请选择材质" style="width: 100%" @change="getEnginSpecificationsList(i, index,idx)" :disabled="status == 'read-only' ">
@@ -155,7 +162,7 @@
                       :prop="i.specifications"
                       :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                       label="规格"
-                      v-show="i.materialQuality != null || (enginClassification != null && !enginClassification.includes('调压柜'))"
+                      v-show="i.materialQuality != null || (enginClassification != null && !enginClassification.includes('pressure_regulating'))"
                       label-width="95px"
 
                       >
@@ -175,11 +182,11 @@
                       </el-select>
                     </el-form-item>
                   <el-form-item
-                    v-if="currentDicts.some(item=>item.label==='底腿')||node==='调压柜安装'||(enginClassification != null && enginClassification.includes('调压柜'))"
+                    v-if="currentDicts.some(item=>item.label==='底腿')||(enginClassification != null && !enginClassification.includes('pressure_regulating'))"
                     :prop="i.remark + ''"
                     :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                     label="施工内容"
-                    v-show="currentDicts.some(item=>item.label==='底腿')||node==='调压柜安装'||(enginClassification != null && enginClassification.includes('调压柜'))"
+                    v-show="currentDicts.some(item=>item.label==='底腿')||node==='调压柜安装'||(enginClassification != null && enginClassification.includes('pressure_regulating'))"
                     label-width="95px"
                   >
                     <div class="block" style="display: inline-block; margin-right: 20px;">
@@ -224,7 +231,7 @@
                       :prop="i.number + ''"
                       :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                       label="数量"
-                      v-show="i.number != null || (enginClassification != null && !enginClassification.includes('调压柜'))"
+                      v-show="i.number != null || (enginClassification != null && !enginClassification.includes('pressure_regulating'))"
                       label-width="95px"
                       >
                       <div class="block" style="display: inline-block; margin-right: 20px;">
@@ -238,7 +245,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==='底腿')) && (enginClassification!='pressure_regulating'))"
                       >
                       <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>
@@ -338,8 +345,8 @@
               !(node==='pe')&&
               !(node=='回填')&&
               !(node=='trench_construction')&&
-              !(node=='underditch_construction')&&
-              !(node=='调压柜安装')"
+              !(node=='underditch_construction')
+           "
               >
                 <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">图片</h3>
                 <ObsImageUpload

src/components/EnginNodeInfo/indexGY.vue

@@ -18,6 +18,7 @@
           placeholder="请选择施工时间">
         </el-date-picker>
       </el-form-item>
+      <br>
       <el-form-item label="照片" prop="zEngiineeringPhotoBoList" class="obsImage" v-if="'回填、撤场' != name">
         <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.zEngiineeringPhotoBoList"
                         @input="getUrl"></ObsImageUpload>
@@ -42,10 +43,10 @@
           maxlength="255"
         />
       </el-form-item>
-      <div style="width: 25%;position: relative;left: 20.5%;top: -8px;" v-if="['焊接、防腐','架空管线','下管','沟下连头'].includes(name)">
+      <div style="width: 25%;position: relative;left: 10.5%;top: -8px;" v-if="['焊接、防腐','架空管线','下管','沟下连头'].includes(name)">
         <el-button @click="addMaterial()">新增用料信息</el-button>
       </div>
-      <el-row v-for="(item, index) in zEngineeringMaterialBo" v-if="['焊接、防腐','架空管线','下管','沟下连头'].includes(name)" :key="index" style="left: 13.5%;" :class="'rowStructure'">
+      <el-row v-for="(item, index) in zEngineeringMaterialBo" v-if="['焊接、防腐','架空管线','下管','沟下连头'].includes(name)" :key="index" style="left: 10.5%;" :class="'rowStructure'">
         <el-col :span="7">
           <el-form-item
             :prop="'zEngineeringMaterialBo.' + index + '.materialQuality'"
@@ -102,7 +103,7 @@
             删除
         </el-button>
       </el-row>
-      <el-row v-for="(item, index) in zEngineeringMaterialBo" v-if="['阀井'].includes(name)" :key="index" style="left: 13.5%;" :class="'rowStructure'">
+      <el-row v-for="(item, index) in zEngineeringMaterialBo" v-if="['阀井'].includes(name)" :key="index" style="left: 10.5%;" :class="'rowStructure'">
         <el-col :span="7">
           <el-form-item
             :prop="'zEngineeringMaterialBo.' + index + '.remark'"
@@ -230,7 +231,6 @@
       </el-form-item>
       <hr style="position: relative;left: 10%;">
     </el-form>
-
   </div>
 </template>
 

src/components/EnginNodeInfo/indexSZ.vue

@@ -9,15 +9,23 @@
     <!-- 节点表单 -->
     <el-form ref="fangxianForm" :model="nodeInfo" :rules="nodeRules" label-width="200px">
       <h2 style="margin-left: 16%;font-weight: 800;">{{ name }}</h2>
-      <el-form-item label="施工时间" prop="constructTime" :style=" 'margin-left: -27px' ">
-        <el-date-picker
-          :disabled="formType"
-          v-model="nodeInfo.constructTime"
-          value-format="yyyy-MM-dd hh:mm:ss"
-          type="datetime"
-          placeholder="请选择施工时间">
-        </el-date-picker>
-      </el-form-item>
+        <el-form-item label="施工时间" prop="constructTime">
+          <el-date-picker
+            :disabled="formType"
+            v-model="nodeInfo.constructTime"
+            value-format="yyyy-MM-dd hh:mm:ss"
+            type="datetime"
+            placeholder="请选择施工时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="施工内容" prop="remark">
+          <el-input
+            v-model="nodeInfo.remark"
+            type="textarea"
+            placeholder="请输入施工内容"
+            maxlength="255"
+          />
+        </el-form-item>
       <el-form-item label="照片" prop="zEngiineeringPhotoBoList" class="obsImage" v-if="'回填、撤场' != name">
         <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.zEngiineeringPhotoBoList"
                         @input="getUrl"></ObsImageUpload>
@@ -34,18 +42,11 @@
         <ObsImageUpload ref="obsImageUpload3" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.zEngiineeringPhotoBoListThree"
                         @input="getUrl3"></ObsImageUpload>
       </el-form-item>
-      <el-form-item label="施工内容" prop="remark">
-        <el-input
-          v-model="nodeInfo.remark"
-          type="textarea"
-          placeholder="请输入施工内容"
-          maxlength="255"
-        />
-      </el-form-item>
+
       <div style="width: 25%;position: relative;left: 20.5%;top: -8px;" v-if="['焊接、防腐','架空管线','下管','沟下连头'].includes(name)">
         <el-button @click="addMaterial()">新增用料信息</el-button>
       </div>
-      <el-row v-for="(item, index) in zEngineeringMaterialBo" v-if="['焊接、防腐','架空管线','下管','沟下连头'].includes(name)" :key="index" style="left: 13.5%;" :class="'rowStructure'">
+      <el-row v-for="(item, index) in zEngineeringMaterialBo" v-if="['焊接、防腐','架空管线','下管','沟下连头'].includes(name)" :key="index" style="left: 10.5%;" :class="'rowStructure'">
         <el-col :span="7">
           <el-form-item
             :prop="'zEngineeringMaterialBo.' + index + '.materialQuality'"
@@ -102,7 +103,7 @@
             删除
         </el-button>
       </el-row>
-      <el-row v-for="(item, index) in zEngineeringMaterialBo" v-if="['阀井'].includes(name)" :key="index" style="left: 13.5%;" :class="'rowStructure'">
+      <el-row v-for="(item, index) in zEngineeringMaterialBo" v-if="['阀井'].includes(name)" :key="index" style="left: 10.5%;" :class="'rowStructure'">
         <el-col :span="7">
           <el-form-item
             :prop="'zEngineeringMaterialBo.' + index + '.remark'"

src/views/zdsz/engineeringCivil/index.vue

@@ -522,7 +522,20 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <EnginNodeInfoTYG
+          v-if="title=='添加用料'"
+          v-for="(e,idx) in currentCheckList"
+          :key="idx"
+          :name="e"
+          :ref="'EnginNodeInfo'+idx"
+          :flag="'gy_tyg'"
+          :types="currentCheckList"
+          :currentContain="currentCheckList"
+          :enginType="'工业工程'"
+          :enginSort="queryParams.enginType"
+        />
         <EnginNodeInfo
+          v-else
           v-for="(e,idx) in currentCheckList"
           :key="idx"
           :name="e"
@@ -558,7 +571,6 @@
       :zEngineeringNodeBo="zEngineeringNodeBo"
       enginType="民用工程"
     />
-
     <!-- 批量审核 -->
     <el-dialog
       ref="checkingAllForm"
@@ -828,8 +840,10 @@ import {getUnits} from "@/api/zdsz/unit";
 import {getHouses} from "@/api/zdsz/house";
 import {getDicts} from "@/api/system/dict/data";
 import EnginNodeInfo from "@/components/EnginNodeInfo/index";
+import EnginNodeInfoTYG from "@/components/EnginNodeInfo/indexGY.vue";
 import EngineePipe from '@/components/EngineePipe'
 import ConstructionDetails from "@/components/ConstructionDetails/index.vue";
+import ConstructionDetailsGY from "@/components/ConstructionDetails/indexGY.vue";
 import {listAll} from "@/api/system/user";
 
 function formatDate(date) {
@@ -851,6 +865,8 @@ export default {
   components: {
     ConstructionDetails,
     EnginNodeInfo,
+    EnginNodeInfoTYG,
+    ConstructionDetailsGY,
     EngineePipe
   },
 
@@ -873,6 +889,7 @@ export default {
   data() {
     return {
       nodeDetailType: null,
+      enginClassification: null,
       currentCollapses: [],
       enginId: undefined,
       checkingsVisible: false,
@@ -1193,7 +1210,6 @@ export default {
       currentCheckList: [],
       enginType: '',
       enginClassificationinfo: '',
-      enginClassification: '',
       enginClassificationOption: [],
       enginTypeOption: [
         {
@@ -1561,6 +1577,9 @@ export default {
       this.status = 'put'
       let title = e.areaName + "-" + e.buildingName + "-" + e.unitName + "-" + e.houseName + " [" + (e.enginType == 'new_built' ? "新建" : '旧改') + "-" + e.enginClassificationName + "]"
       let val = e.enginType + "_" + e.enginClassification
+      if (e.enginClassification=='pressure_regulating'){
+        val = 'gy_tyg'
+      }
       getDicts(val).then(res => {
         let dict = []
         for (let i = 0; i < res.data.length; i++) {
@@ -1597,11 +1616,15 @@ export default {
     },
     // 查看历史
     viewSource(e, type = null) {
+      this.enginClassification = e.enginClassification
       console.log("viewSource(e, type = null)", e)
       let title = e.areaName + "-" + e.buildingName + "-" + e.unitName + "-" + e.houseName + " [" + (e.enginType == 'new_built' ? "新建" : '旧改') + "-" + e.enginClassificationName + "]"
       console.log("viewSource(e, type = null)", title)
       this.enginId = e.id
       let val = e.enginType + "_" + e.enginClassification
+      if (e.enginClassification=='pressure_regulating'){
+        val = 'gy_tyg'
+      }
       getDicts(val).then(res => {
         let dict = []
         for (let i = 0; i < res.data.length; i++) {
@@ -1611,7 +1634,6 @@ export default {
           })
         }
         this.zEngineeringNodeBo = e
-        console.log(this.zEngineeringNodeBo)
         this.$refs.ConstructionDetails.open(dict, _, type, '民用', title, this.zEngineeringNodeBo.enginClassification, this.enginType)
         this.status = 'read-only'
       })
@@ -1661,6 +1683,9 @@ export default {
         this.enginTypeHasChanged(newData.enginType)
         let val = newData.enginType + "_" + newData.enginClassification
         this.currentCheckList = []
+        if (newData.enginClassification=='pressure_regulating'){
+          val = 'gy_tyg'
+        }
         getDicts(val).then(res => {
           this.checkList = res.data
           console.log(this.checkList)
@@ -1684,6 +1709,9 @@ export default {
       )
         return
       let val = this.queryParams.enginType + "_" + this.queryParams.enginClassification
+      if (this.queryParams.enginClassification=='pressure_regulating'){
+        val = 'gy_tyg';
+      }
       getDicts(val).then(res => {
         this.checkList = res.data
       })
@@ -1695,6 +1723,9 @@ export default {
       )
         return
       let val = this.checkingForm.enginType + "_" + this.checkingForm.enginClassification
+      if (this.checkingForm.enginClassification=='pressure_regulating'){
+        val = 'gy_tyg';
+      }
       getDicts(val).then(res => {
         this.checkingAllList = res.data
       })
@@ -1706,6 +1737,9 @@ export default {
       )
         return
       let val = this.batchForm.enginType + "_" + this.batchForm.enginClassification
+      if (this.batchForm.enginClassification=='pressure_regulating'){
+        val = 'gy_tyg';
+      }
       getDicts(val).then(res => {
         this.checkingAllList = res.data
       })
@@ -1765,7 +1799,11 @@ export default {
       this.currentCheckList = []
       this.queryParams1.type = ''
       this.currentEnginTypeChangeOptions2 = []
-      getDicts(enginType && enginClassification || this.queryParams1.enginType + '_' + this.queryParams1.enginClassification).then(res => {
+      let params = enginType && enginClassification || this.queryParams1.enginType + '_' + this.queryParams1.enginClassification
+      if (this.queryParams1.enginClassification=='pressure_regulating'){
+        params = 'gy_tyg'
+      }
+      getDicts(params).then(res => {
         this.currentEnginTypeChangeOptions2 = res.data
       })
     },

src/views/zdsz/engineeringGY/index.vue

@@ -287,7 +287,7 @@
         <el-row v-if="title=='添加用料'">
           <el-col :span="24">
             <el-form-item label="环节">
-              <el-checkbox-group v-model="currentCheckList">
+              <el-checkbox-group v-model="currentCheckList" style="display: flex">
                 <el-checkbox
                   :label="item.dictValue"
                   v-for="item in nodeList"

src/views/zdsz/engineeringIndustry/index.vue

@@ -282,9 +282,8 @@
         </el-row>
 
         <el-row v-if="title=='添加用料'">
-          <el-col :span="24">
             <el-form-item label="环节">
-              <el-checkbox-group v-model="currentCheckList">
+              <el-checkbox-group v-model="currentCheckList" style="display: flex">
                 <el-checkbox
                   :label="item.dictValue"
                   v-for="item in nodeList"
@@ -293,7 +292,6 @@
                 ></el-checkbox>
               </el-checkbox-group>
             </el-form-item>
-          </el-col>
         </el-row>
         <EnginNodeInfo
           v-if="title=='添加用料'"