From f1463714900c6c01e0e5bb1b1f8ad4777d2dce1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 12 Aug 2024 17:16:26 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E4=B8=8A=E6=9E=B6?=
 =?UTF-8?q?=E5=90=8E=E9=80=80=E8=B4=A7=E7=94=B3=E8=AF=B7=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?+=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/tableColumns/index.js         |  2 +-
 fe/PC/src/utils/tabsDesTions/index.js         |  2 +-
 .../purchaseReturn/returnRequest.vue          | 35 ++++++++++++++++++-
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 117a7a2c0..63f1ef8a8 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -2029,7 +2029,7 @@ export const productionReturnNote =  [
   { label: "任务单号", prop: 'jobNumber', width:orderWidth },
   { label: "备注", prop: 'remark' },
   { label: "操作员", prop: 'worker' },
-  { label: "退料时间", prop: 'returnTime', type: "dateTime" },
+  // { label: "退料时间", prop: 'returnTime', type: "dateTime" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
 ]
 
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index edf740210..dc00ff791 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -1329,7 +1329,7 @@ export const productionReturnNote =  [
   { label: "任务单号", prop: 'jobNumber' },
   { label: "备注", prop: 'remark' },
   { label: "操作员", prop: 'worker' },
-  { label: "退料时间", prop: 'returnTime', type: "dateTime" },
+  // { label: "退料时间", prop: 'returnTime', type: "dateTime" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
 ]
 
diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnRequest.vue b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnRequest.vue
index dd167463c..c77090921 100644
--- a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnRequest.vue
+++ b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnRequest.vue
@@ -55,12 +55,14 @@
   </div>
 </template>
 <script>
+import { getOneSupplierInfoByCode } from "@/api/wms-api"
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
 import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { mixins } from "@/mixins/mixins"
 import { requestData } from "@/utils/processButtonData"
+import {initPrintAllData} from "@/mixins/printMixin"
 export default {
   name: "PurchaseReturnRequest",
   mixins: [
@@ -94,13 +96,44 @@ export default {
         this.defaultFilterBtn(),//筛选
       ],
       DrawerButtonData: [
-        // ...requestData(this)
+        {
+          type: 'info',
+          icon: 'el-icon-printer',
+          label: '打印',
+          hide: false,
+          name: "print",
+          size: 'mini'
+        },
       ],
     };
   },
   mounted () {
     this.paging();
   },
+  methods: {
+    //抽屉常用按钮
+    async drawerbutton (val) {
+      // 打印
+      if(val == 'print'){
+        if((this.propsData.supplierCode) && (!this.propsData.supplierShortName)){
+          getOneSupplierInfoByCode(this.propsData.supplierCode).then(async res => {
+            if(res){
+              this.propsData.supplierShortName = res.shortName || res.name
+              this.tableDataDetails.supplierShortName = JSON.parse(JSON.stringify(this.propsData.supplierShortName));
+            }
+            let data = await initPrintAllData(this.tableDataDetails,'thd.rdlx','PurReturnReason');
+            this.Print(data)
+          }).catch(err => {
+              console.log(err)
+          })
+        }else{
+          this.tableDataDetails.supplierShortName = JSON.parse(JSON.stringify(this.propsData.supplierShortName));
+          let data = await initPrintAllData(this.tableDataDetails,'thd.rdlx','PurReturnReason');
+          this.Print(data)
+        }
+      }
+    },
+  }
 };
 </script>
 <style lang="scss" scoped>