【nev-pc】上架后退货申请更改+字段调整

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" },
 ]
 

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" },
 ]
 

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>