Merge branch 'dev' into 'purchaseDev'

Dev

See merge request new-business/drp-web!411

src/api/business/purchase/catalogue.js

@@ -55,3 +55,12 @@ export function EXPORT(data) {
     data: data,
   });
 }
+// 采购需求单导出
+export function exportAll(data) {
+  return request({
+    url: `/pu/price/catalogue/export`,
+    method: 'post',
+    data: data,
+    responseType: 'blob'
+  })
+}

src/views/business/spd/bo/plan/add.vue

@@ -129,7 +129,7 @@
         <el-table
           :data="basicForm.mkBoPlanItemList" 
           fit
-          max-height="600"
+          height="460"
           style="font-size: 12px;"
           @selection-change="handleSelectionChange"
         >
@@ -227,14 +227,14 @@
 
     <div class="btn_group">
       <el-col :span="1.5">
-        <el-button type="primary" size="mini" plain @click="save" v-if="sonPageStu == 'add' || sonPageStu == 'edit'">保存</el-button>
+        <el-button size="mini" plain @click="back">返回</el-button>
       </el-col>
+
       <el-col :span="1.5" style="margin: 0 10px;">
-        <el-button size="mini" plain @click="back">返回</el-button>
+        <el-button type="primary" size="mini" plain @click="save" v-if="sonPageStu == 'add' || sonPageStu == 'edit'">保存</el-button>
       </el-col>
 
       <Refers ref="refer" @doSubmit="selectionsToInput" :single="true"/>
-
     </div>
   </div>
 </template>
@@ -708,9 +708,9 @@ export default {
 <style lang="scss" scoped>
 .btn_group {
   width: 100%;
-  margin: 20px 0;
+  margin: 20px -10px;
   display: flex;
-  justify-content: center;
+  justify-content: right;
 } 
 .btn_grooup {
   margin-bottom: 10px;

src/views/business/spd/bo/plan/index.vue

@@ -169,7 +169,7 @@
         <el-table 
         :data="tableList" 
         fit
-        max-height="550"
+        height="560"
         style="font-size: 12px;"
         @selection-change="handleSelectionChange"
         :row-class-name="tableRowClassName"

src/views/purchase/PurchaseDemandList/index.vue

@@ -592,6 +592,8 @@ export default {
             downloadElement.click(); // 点击下载
             document.body.removeChild(downloadElement); // 下载完成移除元素
             window.URL.revokeObjectURL(href); // 释放blob对象
+          }).catch(err => {
+            this.$modal.closeLoading();
           })
         }
       } else {
@@ -613,6 +615,8 @@ export default {
           downloadElement.click(); // 点击下载
           document.body.removeChild(downloadElement); // 下载完成移除元素
           window.URL.revokeObjectURL(href); // 释放blob对象
+        }).catch(err => {
+          this.$modal.closeLoading();
         })
       }
     },

src/views/purchase/catalogue/index.vue

@@ -1,7 +1,7 @@
 <script>
 import { dicts } from "./dicts";
 import useColumns from "./columns";
-import { LIST } from "@/api/business/purchase/catalogue";
+import { LIST, exportAll } from "@/api/business/purchase/catalogue";
 
 export default {
   name: "PuchaseCatalogue",
@@ -90,6 +90,29 @@ export default {
       const { open } = this.$refs.SeeButton;
       await open([prop]);
     },
+    // 导出全部
+    exportAll() {
+      this.$modal.loading("正在导出数据，请稍后...");
+      exportAll().then(res => {
+        this.$modal.closeLoading();
+        const blob = new Blob([res], {
+          type: "application/vnd.ms-excel;charset=UTF-8",
+        });// 创建一个类文件对象：Blob对象表示一个不可变的、原始数据的类文件对象
+        const downloadElement = document.createElement("a"); //创建a标签
+        const href = window.URL.createObjectURL(blob); // 创建下载的链接
+        // var temp = res.headers["content-disposition"]; 
+        // var fileName = decodeURIComponent(temp.split("filename=")[1]); // 中文需要转码 (前端乱码）
+        // var name = fileName.split(";")[0]; //切割成文件名
+        downloadElement.href = href;  //下载地址
+        downloadElement.download = '价格目录全部导出' + this.parseTime(new Date().getTime()) + ".xlsx"; 
+        document.body.appendChild(downloadElement);
+        downloadElement.click(); // 点击下载
+        document.body.removeChild(downloadElement); // 下载完成移除元素
+        window.URL.revokeObjectURL(href); // 释放blob对象
+      }).catch(err => {
+        this.$modal.closeLoading();
+      })
+    },
   },
 };
 </script>
@@ -150,6 +173,9 @@ export default {
           @success="useQuery(params, page)"
         ></exp-button>
       </el-button-group>
+      <el-button-group>
+        <el-button size="mini" @click="exportAll">全部导出</el-button>
+      </el-button-group>
     </div>
     <el-super-table
       v-model="tableData"

src/views/purchase/transferOrder/add.vue

@@ -1611,6 +1611,7 @@ export default {
       this.sonDisable = false;
       this.basicForm.id = "";
       this.basicForm.code = "";
+      this.basicForm.status = "0";
       this.basicForm.createByName = "";
       this.basicForm.createBy = "";
       this.basicForm.createTime = "";
@@ -1626,6 +1627,9 @@ export default {
       // 复制新增把id,编码,创建人置为空,子表去掉id
       if (this.basicForm.materialInfo.length !== 0) {
         this.basicForm.materialInfo.forEach((item) => {
+          if (item.allotDate) {
+            item.allotDate = new Date();
+          }
           if (item.deliveryCode) {
             item.deliveryCode = "";
           }