Merge branch 'zdsz3.0' of http://192.168.10.18:3000/sunwei/zdsz_vue into zdsz3.0

src/api/zdsz/enginee.js

@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import data from "@/views/system/dict/data.vue";
 
 // 查询小区集合
 export function getAreaList({district}) {
@@ -300,10 +301,11 @@ export function viewEngineeringInfrastructureSource({id,type}) {
 
 
 // 查询基建工程列表
-export function getEngineeringInfrastructure({enginName = ''}) {
+export function getEngineeringInfrastructure(data) {
     return request({
-        url: `/zdsz/engineeringInfrastructure/list?enginName=${enginName}`,
+        url: `/zdsz/engineeringInfrastructure/list`,
         method: 'get',
+      params:data
     })
 }
 

src/api/zdsz/engineeringIndustry.js

@@ -7,11 +7,12 @@ function getTypeFromUrl(url) {
   return params.get('type');
 }
 
-export function getEngineeIndustryList({enginName = '', enginType = ''}) {
-  const type = getTypeFromUrl(window.location.href);
+export function getEngineeIndustryList(sata) {
+  sata.type = getTypeFromUrl(window.location.href)
   return request({
-    url: `/zdsz/engineeringIndustry/list?type=${type}&enginName=${enginName}&enginType=${enginType}`,
+    url: `/zdsz/engineeringIndustry/list`,
     method: 'get',
+    params:sata
   })
 }
 

src/components/EngineePipe/index.vue

@@ -78,22 +78,22 @@
                 <el-input v-model="queryParams.constructSchedule" placeholder="请填写施工进度" maxlength="50" :disabled="title == '添加用料' "/>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="备注" prop="remark">
-                <el-input
-                  v-model="queryParams.remark"
-                  type="textarea"
-                  placeholder="请输入内容"
-                  maxlength="255"
-                  :disabled="title == '添加用料' "
-                />
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="12">-->
+<!--              <el-form-item label="备注" prop="remark">-->
+<!--                <el-input-->
+<!--                  v-model="queryParams.remark"-->
+<!--                  type="textarea"-->
+<!--                  placeholder="请输入内容"-->
+<!--                  maxlength="255"-->
+<!--                  :disabled="title == '添加用料' "-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
           </el-row>
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="文件" prop="" v-if="currentType=='put'">
-                <ObsFileUpload ref="obsFileUpload" :file-size="100" :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"  :value="queryParams.pics" :disabled="title == '添加用料' " 
+                <ObsFileUpload ref="obsFileUpload" :file-size="100" :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"  :value="queryParams.pics" :disabled="title == '添加用料' "
                 ></ObsFileUpload>
               </el-form-item>
               <el-form-item label="文件" prop="" v-if="currentType=='add'">
@@ -104,8 +104,8 @@
           </el-row>
           <el-form-item label="节点" style="width: 100%;margin-left: 0;" v-if="title!=='修改顶管信息' ">
             <el-checkbox-group v-model="currentCheckList">
-              <el-checkbox 
-                :label="item.label" 
+              <el-checkbox
+                :label="item.label"
                 v-for="item in checkList"
                 :key="item.label"
                 ></el-checkbox>
@@ -145,7 +145,7 @@ import {
   getEngineeList,                            // 查询工程列表
   addEnginee,                                // 新增工程
   getDictList, putEngineeringPipeJacking,
-  addEngineeringPipeJacking 
+  addEngineeringPipeJacking
 } from "@/api/zdsz/enginee"
 import EngineeNode from '@/components/EngineeNode/index'
 // 节点信息
@@ -317,7 +317,7 @@ export default {
             'zEngiineeringPhotoBoList',                // 照片
           ]
         }
-        
+
       ]
 
     };

src/views/zdsz/engineeringDangerous/index.vue

@@ -179,17 +179,17 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="作业基本信息" prop="basicInformation">
-              <el-input v-model="form.basicInformation" placeholder="请填写作业基本信息" maxlength="200"></el-input>
+              <el-input v-model="form.basicInformation" placeholder="请填写作业基本信息" maxlength="50"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="工程名称" prop="enginName">
-              <el-input v-model="form.enginName" placeholder="请填写作业基本信息" maxlength="200"></el-input>
+              <el-input v-model="form.enginName" placeholder="请填写作业基本信息" maxlength="50"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="工程地点" prop="enginAddre">
-              <el-input v-model="form.enginAddre" placeholder="请填写工程地点" maxlength="200"></el-input>
+              <el-input v-model="form.enginAddre" placeholder="请填写工程地点" maxlength="100"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -208,7 +208,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="现场负责人" prop="siteHead">
-              <el-input v-model="form.siteHead" placeholder="请填写现场负责人" maxlength="16"/>
+              <el-input v-model="form.siteHead" placeholder="请填写现场负责人" maxlength="50"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -220,34 +220,34 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="作业人员信息" prop="operatorInformation">
-              <el-input v-model="form.operatorInformation" placeholder="请填写作业人员信息" maxlength="200"/>
+              <el-input v-model="form.operatorInformation" placeholder="请填写作业人员信息" maxlength="50"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="监理旁站记录" prop="supervisionRecord">
-              <el-input v-model="form.supervisionRecord" placeholder="请填写监理旁站记录" maxlength="200"/>
+              <el-input v-model="form.supervisionRecord" placeholder="请填写监理旁站记录" maxlength="100"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="工作联系单" prop="workContactForm">
-              <el-input v-model="form.workContactForm" placeholder="请填写工作联系单" maxlength="200"/>
+              <el-input v-model="form.workContactForm" placeholder="请填写工作联系单" maxlength="100"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="巡线确认单" prop="linePatrolConfirmationForm">
-              <el-input v-model="form.linePatrolConfirmationForm" placeholder="请填写巡线确认单" maxlength="200"/>
+              <el-input v-model="form.linePatrolConfirmationForm" placeholder="请填写巡线确认单" maxlength="100"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="作业位置" prop="taskPosition">
-              <el-input v-model="form.taskPosition" placeholder="请填写作业位置" maxlength="200"/>
+              <el-input v-model="form.taskPosition" placeholder="请填写作业位置" maxlength="100"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="相关阀门位置" prop="valvePosition">
-              <el-input v-model="form.valvePosition" placeholder="请填写与作业相关阀门位置" maxlength="200"/>
+              <el-input v-model="form.valvePosition" placeholder="请填写与作业相关阀门位置" maxlength="100"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -266,29 +266,29 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="管径" prop="pipeDiameter">
-              <el-input v-model="form.pipeDiameter" placeholder="请填写管径" maxlength="200"></el-input>
+              <el-input v-model="form.pipeDiameter" placeholder="请填写管径" maxlength="50"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="管材" prop="tubularProduct">
-              <el-input v-model="form.tubularProduct" placeholder="请填写管材" maxlength="200"></el-input>
+              <el-input v-model="form.tubularProduct" placeholder="请填写管材" maxlength="50"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="管道压力" prop="pipePressure">
-              <el-input v-model="form.pipePressure" placeholder="请填写管道压力" maxlength="200"></el-input>
+              <el-input v-model="form.pipePressure" placeholder="请填写管道压力" maxlength="50"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="压力报告" prop="stressReport">
-              <el-input v-model="form.stressReport" placeholder="请填写压力报告" maxlength="200"/>
+              <el-input v-model="form.stressReport" placeholder="请填写压力报告" maxlength="100"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="气流方向" prop="gasSourceDirection">
-              <el-input v-model="form.gasSourceDirection" placeholder="请填写气流方向" maxlength="200"/>
+              <el-input v-model="form.gasSourceDirection" placeholder="请填写气流方向" maxlength="50"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -307,104 +307,110 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="管道支护" prop="pipelineSupport">
-              <el-input v-model="form.pipelineSupport" placeholder="请填写管道支护" maxlength="200"/>
+              <el-input v-model="form.pipelineSupport" placeholder="请填写管道支护" maxlength="50"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="检口" prop="inspectionPort">
-              <el-input v-model="form.inspectionPort" placeholder="请填写检口" maxlength="200"/>
+              <el-input v-model="form.inspectionPort" placeholder="请填写检口" maxlength="50"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="管道刷油" prop="pipelinePainting">
-              <el-input v-model="form.pipelinePainting" placeholder="请填写管道刷油" maxlength="200"/>
+              <el-input v-model="form.pipelinePainting" placeholder="请填写管道刷油" maxlength="50"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="管道防腐" prop="pipelineCorrosionProtection">
-              <el-input v-model="form.pipelineCorrosionProtection" placeholder="请填写管道防腐" maxlength="200"/>
+              <el-input v-model="form.pipelineCorrosionProtection" placeholder="请填写管道防腐" maxlength="50"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="其他管道情况" prop="otherPipelineConditionsWorkPit">
-              <el-input v-model="form.otherPipelineConditionsWorkPit" placeholder="请填写其他管道情况" maxlength="200"/>
+              <el-input v-model="form.otherPipelineConditionsWorkPit" placeholder="请填写其他管道情况" maxlength="100"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="保护井" prop="protectionWell">
-              <el-input v-model="form.protectionWell" placeholder="请填写保护井" maxlength="200"/>
+              <el-input v-model="form.protectionWell" placeholder="请填写保护井" maxlength="50"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="管件保护井砌筑" prop="pipeProtectionWelMasonry">
-              <el-input v-model="form.pipeProtectionWelMasonry" placeholder="请填写管件保护井砌筑" maxlength="200"/>
+              <el-input v-model="form.pipeProtectionWelMasonry" placeholder="请填写管件保护井砌筑" maxlength="50"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="砌筑阀门井" prop="masonryValveWell">
-              <el-input v-model="form.masonryValveWell" placeholder="请填写砌筑阀门井" maxlength="200"/>
+              <el-input v-model="form.masonryValveWell" placeholder="请填写砌筑阀门井" maxlength="50"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="作业坑(长)(米)" prop="hazardousWorkPitsLong">
-              <el-input v-model="form.hazardousWorkPitsLong" placeholder="请填写危险作业坑大小(长)" maxlength="11"/>
+              <el-input v-model="form.hazardousWorkPitsLong" placeholder="请填写危险作业坑大小(长)" maxlength="9"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="作业坑(宽)(米)" prop="hazardousWorkPitsWide">
-              <el-input v-model="form.hazardousWorkPitsWide" placeholder="请填写危险作业坑大小(宽)" maxlength="11"/>
+              <el-input v-model="form.hazardousWorkPitsWide" placeholder="请填写危险作业坑大小(宽)" maxlength="9"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="作业坑(深)(米)" prop="hazardousWorkPitsDeep">
-              <el-input v-model="form.hazardousWorkPitsDeep" placeholder="请填写危险作业坑大小(深)" maxlength="11"/>
+              <el-input v-model="form.hazardousWorkPitsDeep" placeholder="请填写危险作业坑大小(深)" maxlength="9"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="回填" prop="backfill">
-              <el-input v-model="form.backfill" placeholder="请填写回填" maxlength="200"/>
+              <el-input v-model="form.backfill" placeholder="请填写回填" maxlength="50"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="夯实" prop="tamp">
-              <el-input v-model="form.tamp" placeholder="请填写夯实" maxlength="200"/>
+              <el-input v-model="form.tamp" placeholder="请填写夯实" maxlength="50"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="平整场地" prop="levelingTheSite">
-              <el-input v-model="form.levelingTheSite" placeholder="请填写平整场地" maxlength="200"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="remark" style="width: 42.7%;">
-              <el-input
-                v-model="form.remark"
-                type="textarea"
-                placeholder="请输入内容"
-                class="remark_input"
-                maxlength="200"
-              />
+              <el-input v-model="form.levelingTheSite" placeholder="请填写平整场地" maxlength="50"/>
             </el-form-item>
           </el-col>
         </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="备注" prop="remark" style="width: 42.7%;">-->
+<!--              <el-input-->
+<!--                v-model="form.remark"-->
+<!--                type="textarea"-->
+<!--                placeholder="请输入内容"-->
+<!--                class="remark_input"-->
+<!--                maxlength="200"-->
+<!--              />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
         <el-row :gutter="20">
           <el-col :span="24">
-            <el-form-item label="附件" prop="">
+            <el-form-item label="附件" prop="files" v-if="form.id">
               <ObsFileUpload ref="obsFileUpload" :file-size="100"
                              :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"
                              :value="form.pics"
               ></ObsFileUpload>
             </el-form-item>
+            <el-form-item label="附件" prop="files" v-else>
+              <ObsFileUpload ref="obsFileUpload" :file-size="100"
+                             :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"
+                             :value="form.files"
+              ></ObsFileUpload>
+            </el-form-item>
           </el-col>
         </el-row>
       </el-form>

src/views/zdsz/engineeringIndustry/index.vue

@@ -7,7 +7,7 @@
 
 <template>
   <div class="app-container">
-    <el-form :model="searchParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
+    <el-form :model="searchParams" ref="searchParams" size="small" :inline="true" v-show="showSearch" label-width="110px">
       <el-form-item label="工程名称" prop="enginName">
         <el-input v-model="searchParams.enginName" placeholder="请输入建筑工程名称" maxlength="20"></el-input>
       </el-form-item>
@@ -189,13 +189,13 @@
         </el-form-item>
         <el-row :gutter="20">
           <el-col :span="24">
-            <el-form-item label="附件" prop="files" v-if="currentType==='put'" style="width: 100%">
+            <el-form-item label="附件" prop="files" v-if="queryParams.id" style="width: 100%">
               <ObsFileUpload ref="obsFileUpload" :file-size="100"
                              :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"
                              :value="form.pics" @removeFile="removeFile"
               ></ObsFileUpload>
             </el-form-item>
-            <el-form-item label="附件" prop="files" v-if="currentType==='add'" style="width: 100%">
+            <el-form-item label="附件" prop="files" v-else style="width: 100%">
               <ObsFileUpload ref="obsFileUpload" :file-size="100"
                              :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"
                              :value="form.files"
@@ -479,6 +479,8 @@ export default {
         ],
       },
       searchParams: {
+        pageSize:10,
+        pageNum:1,
         enginName: null,             // 工程名称
         enginClassification: null,   // 工程分类
       },
@@ -676,7 +678,7 @@ export default {
     /** 查询市政工程|工业工程列表 */
     getList(val) {
       this.loading = true;
-      getEngineeIndustryList(val || {}).then(res => {
+      getEngineeIndustryList(this.searchParams).then(res => {
         this.comprehensiveList = res.rows;
         this.total = res.total;
         this.loading = false;
@@ -704,12 +706,12 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList(this.searchParams);
+      this.searchParams.pageNum = 1;
+      this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm("searchParams");
       this.handleQuery();
     },
     // 多选框选中数据
@@ -751,6 +753,7 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.form.files = this.$refs.obsFileUpload.fileList;
+      console.log(this.form.files)
       if (this.form.files.length === 0) {
         this.$message.warning('必须上传附件!')
         return

src/views/zdsz/engineeringInfrastructure/index.vue

@@ -26,7 +26,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['zdsz:openbolt:add']"
+          v-hasPermi="['zdsz:engineeringInfrastructure:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -37,7 +37,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['zdsz:openbolt:edit']"
+          v-hasPermi="['zdsz:engineeringInfrastructure:edit']"
         >修改</el-button>
       </el-col>
 
@@ -49,19 +49,10 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['zdsz:openbolt:remove']"
+          v-hasPermi="['zdsz:engineeringInfrastructure:remove']"
         >删除</el-button>
       </el-col>
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="warning"-->
-      <!--          plain-->
-      <!--          icon="el-icon-download"-->
-      <!--          size="mini"-->
-      <!--          @click="handleExport"-->
-      <!--          v-hasPermi="['zdsz:openbolt:export']"-->
-      <!--        >导出</el-button>-->
-      <!--      </el-col>-->
+
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -75,25 +66,12 @@
       <el-table-column label="备注" align="center" prop="enginContent" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="400">
         <template slot-scope="scope">
-          <!-- <el-button
-            type="text"
-            icon="el-icon-edit"
-            size="mini"
-            @click="viewSource(scope.row)"
-          >审核</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['zdsz:comprehensive:edit']"
-          >修改</el-button> -->
             <el-button
               size="mini"
               type="text"
               icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
-              v-hasPermi="['zdsz:engineeringCivil:edit']"
+              v-hasPermi="['zdsz:engineeringInfrastructure:edit']"
               >修改工程信息
             </el-button>
 
@@ -102,7 +80,7 @@
               type="text"
               icon="el-icon-edit"
               @click="addNodeInfo(scope.row)"
-              v-hasPermi="['zdsz:engineeringCivil:edit']"
+              v-hasPermi="['zdsz:engineeringInfrastructure:add']"
               >填写节点信息
           </el-button>
           <el-button
@@ -110,14 +88,14 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['zdsz:comprehensive:remove']"
+            v-hasPermi="['zdsz:engineeringInfrastructure:remove']"
           >删除</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-circle-check"
             @click="viewSource(scope.row,'check')"
-            v-hasPermi="['zdsz:engineeringCivil:remove']"
+            v-hasPermi="['zdsz:engineeringInfrastructure:review']"
           >审核
           </el-button>
           <el-button
@@ -125,7 +103,7 @@
             type="text"
             icon="el-icon-time"
             @click="viewSource(scope.row)"
-            v-hasPermi="['zdsz:engineeringCivil:remove']"
+            v-hasPermi="['zdsz:engineeringInfrastructure:query']"
             >历史用料
           </el-button>
 <!--          <el-button-->
@@ -138,6 +116,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            v-hasPermi="['zdsz:engineeringInfrastructure:add']"
             @click="addMaterial(scope.row)"
           >添加用料
           </el-button>
@@ -158,13 +137,13 @@
     <el-dialog :title="title" ref="nodeForm" :visible.sync="open" append-to-body customClass="appendElDialog" @close="onClose">
       <el-form ref="form" :model="queryParams" :rules="rules" label-width="110px">
         <el-form-item label="工程名称" prop="enginName">
-          <el-input v-model="queryParams.enginName" placeholder="请输入工程名称"></el-input>
+          <el-input v-model="queryParams.enginName" placeholder="请输入工程名称" maxlength="50"></el-input>
         </el-form-item>
         <el-form-item label="工程地址" prop="enginAddre">
-          <el-input v-model="queryParams.enginAddre" placeholder="请输入工程地址"></el-input>
+          <el-input v-model="queryParams.enginAddre" placeholder="请输入工程地址" maxlength="100"></el-input>
         </el-form-item>
         <el-form-item label="建设单位" prop="constructUnit">
-          <el-input v-model="queryParams.constructUnit" placeholder="请输入建设单位"></el-input>
+          <el-input v-model="queryParams.constructUnit" placeholder="请输入建设单位" maxlength="100"></el-input>
         </el-form-item>
         <el-form-item label="开工时间" prop="startTime">
           <el-date-picker
@@ -183,19 +162,24 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="计划工期" prop="plannedDuration">
-          <el-input v-model="queryParams.plannedDuration" placeholder="请输入计划工期"></el-input>
+          <el-input v-model="queryParams.plannedDuration" placeholder="请输入计划工期" maxlength="50"></el-input>
         </el-form-item>
-        <el-form-item label="文件" prop="">
+        <el-form-item label="文件" prop="files" v-if="queryParams.id">
+          <ObsFileUpload ref="obsFileUpload" :file-size="100" :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"  :value="queryParams.pics" @input="filesUpload"
+          ></ObsFileUpload>
+        </el-form-item>
+        <el-form-item label="文件" prop="files" v-else>
           <ObsFileUpload ref="obsFileUpload" :file-size="100" :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"  :value="queryParams.files" @input="filesUpload"
           ></ObsFileUpload>
         </el-form-item>
-        
+
         <el-form-item label="工程内容" prop="enginContent">
           <el-input
             v-model="queryParams.enginContent"
             type="textarea"
             placeholder="请输入内容"
             class="remark_input"
+            maxlength="100"
             />
         </el-form-item>
         <el-form-item label="节点" style="width: 100%;margin-left: 0;" v-if="title!=='修改基建工程'">
@@ -220,7 +204,10 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <!-- <el-button :loading="buttonLoading" type="primary" @click="submitForm">确定</el-button> -->
-        <el-button :loading="buttonLoading" type="primary" @click="toNodeDetail">添加</el-button>
+        <el-button :loading="buttonLoading" type="primary" @click="toNodeDetail">
+          <span v-if="queryParams.id">修改</span>
+          <span v-else>添加</span>
+        </el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -454,7 +441,9 @@ export default {
       enginNodeStatus:null,
       currentCollapses:[],
       searchParams:{
-        enginName:''
+        pageSize:10,
+        pageNum:1,
+        enginName:null
       },
       // 按钮loading
       buttonLoading: false,
@@ -1021,9 +1010,9 @@ export default {
       });
     },
     /** 查询民用工程列表 */
-    getList(params = {}) {
+    getList() {
       this.loading = true;
-      getEngineeringInfrastructure(params).then(res => {
+      getEngineeringInfrastructure(this.searchParams).then(res => {
         console.log(res)
         this.comprehensiveList = res.rows;
         this.total = res.total;
@@ -1096,12 +1085,12 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList(this.searchParams);
+      this.searchParams.pageNum = 1;
+      this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm("searchForm");
       this.handleQuery();
     },
     // 多选框选中数据
@@ -1151,7 +1140,8 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      deleteEngineeringInfrastructure(row.id).then(res => {
+      const id = row.id || this.ids
+      deleteEngineeringInfrastructure(id).then(res => {
         if(res.code == 200){
           this.$modal.msgSuccess("删除成功");
           this.getList()

src/views/zdsz/engineeringPipeJacking/index.vue

@@ -74,7 +74,7 @@
                     type="text"
                     icon="el-icon-time"
                     @click="viewSource(scope.row)"
-                    v-hasPermi="['zdsz:engineeringCivil:remove']"
+                    v-hasPermi="['zdsz:engineeringPipeJacking:query']"
                   >历史用料
                   </el-button>
                 <el-button
@@ -89,13 +89,14 @@
                   type="text"
                   icon="el-icon-edit"
                   @click="addNodeInfo(scope.row)"
-                  v-hasPermi="['zdsz:engineeringCivil:edit']"
+                  v-hasPermi="['zdsz:engineeringPipeJacking:add']"
                 >填写节点信息
                 </el-button>
                 <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-edit"
+                  v-hasPermi="['zdsz:engineeringPipeJacking:add']"
                   @click="addMaterial(scope.row)"
                 >添加用料
                 </el-button>
@@ -505,7 +506,7 @@
                 });
                 this.$refs.ConstructionDetails.dialogVisible = false
                 this.updateParams = {}
-                
+
               }
             })
           },
@@ -541,7 +542,7 @@
                   "value": res.data[i].dictValue,
                 })
               }
-              
+
             })
           },
           // 新增物料