qinhouyu 1 سال پیش
والد
کامیت
d15b73e213

+ 8 - 2
src/components/EngineePipe/index.vue

@@ -279,8 +279,14 @@ export default {
       }
       this.queryParams.enginId = data.id
       this.queryParams.type = data.type
-      //带值
-      this.queryParams.enginName = sata.enginName?sata.enginName:'';
+      //带值(民用工程、工业工程、市政工程)
+      if (data.type=='民用工程'){
+        this.queryParams.enginAddre =
+          sata.district + ' - ' + sata.areaName + ' - ' + sata.buildingName + ' - ' + sata.unitName + ' - ' + sata.houseName;
+      }
+      if (['工业工程','市政工程'].includes(data.type)){
+        this.queryParams.enginName = sata.enginName;
+      }
       this.open = true
     },
     nodeCancel() {

+ 7 - 7
src/views/zdsz/engineeringDangerous/index.vue

@@ -147,13 +147,13 @@
             v-hasPermi="['zdsz:engineeringDangerous:remove']"
           >删除
           </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="addNewPipe(scope.row)"
-          >新增顶管工程
-          </el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="addNewPipe(scope.row)"-->
+<!--          >新增顶管工程-->
+<!--          </el-button>-->
           <!--          <el-button
                       type="text"
                       icon="el-icon-edit"

+ 12 - 12
src/views/zdsz/engineeringInfrastructure/index.vue

@@ -40,7 +40,7 @@
           v-hasPermi="['zdsz:openbolt:edit']"
         >修改</el-button>
       </el-col>
-        
+
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -96,7 +96,7 @@
               v-hasPermi="['zdsz:engineeringCivil:edit']"
               >修改工程信息
             </el-button>
-        
+
               <el-button
               size="mini"
               type="text"
@@ -128,12 +128,12 @@
             v-hasPermi="['zdsz:engineeringCivil:remove']"
             >历史用料
           </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="addNewPipe(scope.row)"
-          >新增顶管工程</el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="addNewPipe(scope.row)"-->
+<!--          >新增顶管工程</el-button>-->
           <el-button
             size="mini"
             type="text"
@@ -199,14 +199,14 @@
         </el-form-item>
         <el-form-item label="节点" style="width: 100%;margin-left: 0;" v-if="title!=='修改基建工程'">
           <el-checkbox-group v-model="currentCheckList" @change="console.log(currentCheckList)">
-            <el-checkbox 
-              :label="item.label" 
+            <el-checkbox
+              :label="item.label"
               v-for="item in checkList"
               :key="item.label"
               ></el-checkbox>
           </el-checkbox-group>
         </el-form-item>
-        <EnginNodeInfo 
+        <EnginNodeInfo
           v-for="(e,idx) in currentCheckList"
           :key="idx"
           :name="e"
@@ -798,7 +798,7 @@ export default {
         });
         this.$refs.ConstructionDetails.dialogVisible = false
         this.updateParams = {}
-        
+
       }
     })
   },