退押增加批量下载机收款单更改字段

src/api/engin_deposit/refund_list.js

@@ -32,3 +32,11 @@ export function getDepositManagExport(params) {
     params,
   });
 }
+// 下载押金管理附件
+export function getDepositManageDownZip(params) {
+  return request({
+    url: "/deposit-manage/downZip",
+    method: "get",
+    params,
+  });
+}

src/views/engin_deposit/components/refund_list-detail.vue

@@ -238,8 +238,18 @@
         </el-table>
       </div>
     </div>
-    <h3>工程资料</h3>
+
+    <h3 class="gdzl">工程资料</h3>
+    <el-button
+      class="batchDownload"
+      type="primary"
+      size="small"
+      @click="batchDownloadFn"
+      >批量下载</el-button
+    >
+
     <el-divider></el-divider>
+
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
@@ -465,11 +475,13 @@
 </template>
 
 <script>
+import { downloadFiles } from "@/utils/util";
 import IMAGEUPLOAD from "@/components/Common/image-upload.vue";
 import { mapGetters } from "vuex";
 import {
   getDepositManageDetail,
   getDepositManageExamine,
+  getDepositManageDownZip,
 } from "@/api/engin_deposit/refund_list";
 export default {
   props: {
@@ -484,6 +496,7 @@ export default {
   },
   data() {
     return {
+      imageURL: this.$imageUrl,
       title: "审批",
       imageURL: this.$imageUrl,
       listLoading: false, // 列表加载loading
@@ -501,9 +514,20 @@ export default {
     this.getData({ id: this.detailId });
   },
   methods: {
+    //批量下载
+    async batchDownloadFn() {
+      // let res = await getDepositManageDownZip({ parentId: this.detailId });
+      // console.log(res, 888999);
+      // // window.open(this.imageURL + "/deposit-manage/downZip");
+      // // console.log(res, 9999);
+      // if (res.data) {
+      //   window.open(this.imageURL + res.data);
+      // }
+      downloadFiles("/deposit-manage/downZip", { parentId: this.detailId });
+    },
     //下载
     downLoadFn(v) {
-      // window.open(this.imageURL + v + "?attname=新文件名.xlsx");
+      window.open(this.imageURL + v);
       // const url = this.imageURL + v;
       // const link = document.createElement("a");
       // link.style.display = "none";
@@ -588,6 +612,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.batchDownload {
+  float: right;
+  margin-top: 9px;
+}
+.gdzl {
+  display: inline-block;
+}
 .dateStyle {
   width: 100%;
 }

src/views/finance/receipt_list.vue

@@ -172,7 +172,7 @@
             <el-table-column
               align="center"
               label="往来单位"
-              prop="wlCompanyType"
+              prop="wlCompanyName"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>

src/views/setting/account.vue

@@ -136,6 +136,11 @@
             <el-option :label="item.name" :value="item.adminRoleId" v-for="(item, index) in roleList" :key="index"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="可用仓库" prop="">
+          <el-select v-model="AccountForm.role" placeholder="请选择可用仓库" style="width: 100%;" filterable>
+            <el-option :label="item.name" :value="item.adminRoleId" v-for="(item, index) in roleList" :key="index"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="部门" prop="department" v-show="roleObj.type === 0">
           <el-tree
             :data="departmentList"