提交代码

src/api/zdsz/enginee.js

@@ -167,6 +167,12 @@ export function putEngineeringPipeJacking(data) {
       data
     })
 }
+export function downloadZip(type,name) {
+    return request({
+      url: `/zdsz/engineeringPipeJacking/downloadZip/${type}/${name}`,
+      method: 'get',
+    })
+}
 
 // 查看顶管工程历史
 export function detailEngineeringPipeJacking({id ,type}) {

src/views/zdsz/engineeringCivil/index.vue

@@ -1308,12 +1308,12 @@ export default {
         buildingId: [
           {required: true, message: "楼宇不能为空", trigger: "change"}
         ],
-        unitId: [
-          {required: true, message: "单元不能为空", trigger: "change"}
-        ],
-        houseId: [
-          {required: true, message: "房间不能为空", trigger: "change"}
-        ],
+        // unitId: [
+        //   {required: true, message: "单元不能为空", trigger: "change"}
+        // ],
+        // houseId: [
+        //   {required: true, message: "房间不能为空", trigger: "change"}
+        // ],
         enginType: [
           {required: true, message: "工程类型不能为空", trigger: "change"}
         ],

src/views/zdsz/engineeringIndustry/index.vue

@@ -105,13 +105,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"
@@ -558,6 +558,7 @@ export default {
     },
     //添加用料信息
     async addzEngineeringMaterBo(row) {
+      console.log("添加用料信息",row)
       this.zEngineeringNodeBo = { // 工程节点
         type: '', // 节点类型
         zEngineeringInfoBo: { // 施工信息
@@ -595,7 +596,8 @@ export default {
         if (this.zEngineeringMaterialBo[this.zEngineeringMaterialBo.length - 1]['number'] == '' || this.zEngineeringMaterialBo[this.zEngineeringMaterialBo.length - 1]['number'] == null) {
           valid = false;
         }
-        if (this.form.enginClassification != [] && this.form.enginClassification.length>0) {
+
+        if (typeof(this.form.enginClassification) != 'string' && this.form.enginClassification != [] && this.form.enginClassification.length>0) {
           this.form.enginClassification = this.form.enginClassification.join(',');
         }
         if (valid) {

src/views/zdsz/engineeringPipeJacking/index.vue

@@ -74,12 +74,6 @@
       <!--            <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300">
         <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"
@@ -128,6 +122,12 @@
             v-hasPermi="['zdsz:engineeringPipeJacking:remove']"
           >删除
           </el-button>
+          <el-button
+            type="text"
+            icon="el-icon-download"
+            size="mini"
+            @click="download(scope.row.enginName)"
+          >下载图片</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -312,7 +312,7 @@ import {
   detailEngineeringPipeJacking,              // 历史
   getDictList,
   engineeringCivilReview,
-  putEngineeringPipeJacking, CivilReview, insertReview
+  putEngineeringPipeJacking, CivilReview, insertReview, downloadZip
 } from "@/api/zdsz/enginee"
 import {getDicts} from "@/api/system/dict/data";
 
@@ -515,6 +515,9 @@ export default {
     this.getList();
   },
   methods: {
+    download(name){
+      downloadZip('顶管工程',name)
+    },
     // 填写节点信息
     updateNodeOption(zEngineeringInfoBoList) {
       delete this.updateParams.zEngineeringNodeBoList