From d19377e9c45a661b2e2bceac629af023cdb3e7b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Fri, 12 Jul 2024 17:29:45 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=B0=BA=E5=AF=B8=E5=8A=9F=E8=83=BD=E7=AD=89?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/commonTabel-drawer/index.vue   | 39 +++++++++
 fe/PC/src/mixins/drawerMixins.js              | 19 +++++
 fe/PC/src/utils/tableColumns/index.js         |  4 +-
 fe/PC/src/utils/tabsDesTions/index.js         |  4 +-
 .../deliver/FISDeliverNote-Query.vue          |  4 +
 .../recycledMaterials/materialsAdjustment.vue | 83 +++++++++++++------
 .../recycledMaterials/materialsReceipt.vue    | 44 ++++++----
 7 files changed, 152 insertions(+), 45 deletions(-)

diff --git a/fe/PC/src/components/commonTabel-drawer/index.vue b/fe/PC/src/components/commonTabel-drawer/index.vue
index d8288bd70..374bcd921 100644
--- a/fe/PC/src/components/commonTabel-drawer/index.vue
+++ b/fe/PC/src/components/commonTabel-drawer/index.vue
@@ -29,6 +29,24 @@
           @tableButtonClick="tableButtonClick"
         >
           <template>
+            <!-- 带下拉按钮方式（如选尺寸打印） -->
+            <el-dropdown 
+              v-for="(dropdownButton,key) in dropdownButtonData"
+              :key="key" 
+              @command="dropdownButtonHandle" 
+              :trigger="dropdownButton.trigger" 
+              v-if="dropdownButton.show"
+            >
+              <el-button size="mini" type="info" icon='el-icon-printer'>{{dropdownButton.fatherName}}</el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item
+                  v-for="(item,index) in dropdownButton.list"
+                  :key="index"
+                  :command="beforeHandleCommand(item,dropdownButton)"
+                >{{item.label}}</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+            <!-- 删除等折叠按钮 -->
             <el-dropdown
               trigger="click"
               @command="handleCommand"
@@ -207,6 +225,13 @@ export default {
         return {}
       }
     },
+    // 带下拉按钮方式（如选尺寸打印）
+    dropdownButtonData:{
+      type: Array,
+      default:() => {
+        return []
+      }
+    },
     propsData: {
       type: Object,
       default: () => {
@@ -354,6 +379,20 @@ export default {
     handleCommand (command) {
       this.$emit('handleCommand', command)
     },
+    // 带下拉按钮方式点击事件-点击参数处理,将父级数据同步处理（如选尺寸打印）
+    beforeHandleCommand(son,father){
+      for(let i in father){
+        if(i != 'list'){
+          son[i] = father[i]
+        }
+      }
+      return son
+    },
+    // 带下拉按钮方式点击事件（如选尺寸打印）
+    dropdownButtonHandle(item){
+      console.log(item)
+      this.$emit('dropdownButtonHandle', item)
+    },
     drawerShut () {
       this.$emit('drawerShut', false)
     },
diff --git a/fe/PC/src/mixins/drawerMixins.js b/fe/PC/src/mixins/drawerMixins.js
index 342c011bb..80991e5eb 100644
--- a/fe/PC/src/mixins/drawerMixins.js
+++ b/fe/PC/src/mixins/drawerMixins.js
@@ -16,6 +16,7 @@ import {
   open,
   CompleteJob
 } from '@/api/wms-job'
+import {initPrintAllData} from "@/mixins/printMixin"
 export const drawerMixins = {
   data() {
     return {
@@ -470,6 +471,24 @@ export const drawerMixins = {
         });
       }
     },
+    // 带下拉按钮方式点击事件（如选尺寸打印）
+    dropdownButtonHandle(val){
+      if(val.fatherProp == 'print'){
+        this.choosePrintHandle(val)
+      }
+    },
+    // 选尺寸打印
+    async choosePrintHandle(val){
+      let _printData = val.printData || this.tableDataDetails
+      let _rdlxName = val.rdlxName
+      if(!_printData || !_rdlxName)return
+      let _enumOption = val.enumOption || false
+      let _options = val.options || false
+      let _showDept = val.showDept || false
+      let _url = val.url || false
+      let data = await initPrintAllData(_printData,_rdlxName,_enumOption,_options,_showDept,_url);
+      this.Print(data)
+    },
     // 导出
     exportForDetailHandle(that,url,params){
       if (!that) { that = this }
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 053ff545c..378736a28 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -2674,9 +2674,9 @@ export const materialsAdjustment = [
     type: "name",
     width: orderWidth
   },
-  { label: "申请单号", prop: "requestNumber",width: orderWidth },
+  // { label: "申请单号", prop: "requestNumber",width: orderWidth },
   { label: "操作员", prop: "worker",},
-  { label: "任务单号", prop: "jobNumber" },
+  // { label: "任务单号", prop: "jobNumber" },
   { label: "备注", prop: 'remark' },
   { label: "生效日期", prop: 'activeDate', 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 6080d7e54..9beb5641e 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -1828,9 +1828,9 @@ export const recycledMaterialsAdjustmentApply =  [
 // 回收料调整记录 
 export const materialsAdjustment = [
   { label: "回收料调整记录单号", prop: "number" },
-  { label: "申请单号", prop: "requestNumber" },
+  // { label: "申请单号", prop: "requestNumber" },
   { label: "操作员", prop: "worker",},
-  { label: "任务单号", prop: "jobNumber" },
+  // { label: "任务单号", prop: "jobNumber" },
   { label: "备注", prop: 'remark' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "创建日期", prop: "creationTime",type: "dateTime" },
diff --git a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue
index b2372d9c7..ccfcb251b 100644
--- a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue
+++ b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue
@@ -123,6 +123,10 @@ export default {
               packingCode:"toPackingCode",
             }
           }
+          // 出货数量小计（qty汇总）
+          let _totalQty= 0
+          this.tableDataDetails.details.forEach(item=>{ _totalQty += Number(item.qty) })
+          this.tableDataDetails.details.forEach(item=>{item.totalQty = _totalQty})
           // let data = await initPrintAllData(this.tableDataDetails,'chdmxb.rdlx',false,_option);
           // todo:打印单据更改
           let data = await initPrintAllData(this.tableDataDetails,'fhd.rdlx',false,_option);
diff --git a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustment.vue b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustment.vue
index 320670faa..0d13b4f9f 100644
--- a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustment.vue
+++ b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustment.vue
@@ -40,6 +40,8 @@
       :MaxResultCount="MaxResultCountDetails"
       @alterResultCountDetails="alterResultCountDetails"
       @alertoldSkipCountDetails="alertoldSkipCountDetails"
+      :dropdownButtonData="dropdownButtonData"
+      @dropdownButtonHandle="dropdownButtonHandle"
     ></curren-Drawer>
   </div>
 </template>
@@ -70,42 +72,71 @@ export default {
         this.defaultFilterBtn(),//筛选
       ],
       DrawerButtonData: [
+        // {
+        //   type: 'info',
+        //   icon: 'el-icon-printer',
+        //   label: '打印',
+        //   hide: false,
+        //   name: "print",
+        //   size: 'mini'
+        // },
+      ],
+      // 选择尺寸打印
+      dropdownButtonData:[
         {
-          type: 'info',
-          icon: 'el-icon-printer',
-          label: '打印',
-          hide: false,
-          name: "print",
-          size: 'mini'
-        },
-      ]
+          show:true,
+          fatherName:'打印',
+          fatherProp:'print',
+          list:null
+        }
+      ],
     };
   },
   mounted() {
     this.paging();
   },
   methods: {
-    //抽屉常用按钮
-    async drawerbutton (val) {
-      // 打印
-      if(val == 'print'){
-        // 特殊字段处理
-        // todo:打印单据更改
-        let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails))
-        _propsData.details.forEach(item=>{
-          item.reasonStr = ""
-          item.recommendLot = item.recommendLot + " "
-        })
-        let _option = {
-          details:{
-            locationCode:"toLocationCode",
-            qty:"toQty",
-          }
+    inlineDialogCallback(){
+      let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails))
+      _propsData.details.forEach(item=>{
+        item.reasonStr = ""
+        item.recommendLot = item.recommendLot + " "
+      })
+      let _option = {
+        details:{
+          locationCode:"toLocationCode",
+          qty:"toQty",
         }
-        let data = await initPrintAllData(_propsData,'tzd.rdlx','AdjustmentReason',_option);
-        this.Print(data)
       }
+      let _list = [
+        {label:'A4',name:'A4',printData:_propsData,rdlxName:"tzd_A4.rdlx",enumOption:'AdjustmentReason',options:_option},
+        {label:'三联',name:'tree',printData:_propsData,rdlxName:"tzd.rdlx",enumOption:'AdjustmentReason',options:_option},
+      ]
+
+      this.$set(this.dropdownButtonData[0],"list",_list)
+      this.Loading.DrawerLoading = false
     },
+    //抽屉常用按钮
+    // async drawerbutton (val) {
+    //   // 打印
+    //   if(val == 'print'){
+    //     // 特殊字段处理
+    //     // todo:打印单据更改
+    //     let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails))
+    //     _propsData.details.forEach(item=>{
+    //       item.reasonStr = ""
+    //       item.recommendLot = item.recommendLot + " "
+    //     })
+    //     let _option = {
+    //       details:{
+    //         locationCode:"toLocationCode",
+    //         qty:"toQty",
+    //       }
+    //     }
+    //     let data = await initPrintAllData(_propsData,'tzd.rdlx','AdjustmentReason',_option);
+    //     this.Print(data)
+    //   }
+    // },
   },
 };
 </script>
diff --git a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsReceipt.vue b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsReceipt.vue
index a82c59baa..83eb880d4 100644
--- a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsReceipt.vue
+++ b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsReceipt.vue
@@ -40,6 +40,8 @@
       :MaxResultCount="MaxResultCountDetails"
       @alterResultCountDetails="alterResultCountDetails"
       @alertoldSkipCountDetails="alertoldSkipCountDetails"
+      :dropdownButtonData="dropdownButtonData"
+      @dropdownButtonHandle="dropdownButtonHandle"
     ></curren-Drawer>
   </div>
 </template>
@@ -70,15 +72,27 @@ export default {
         this.defaultFilterBtn(),//筛选
       ],
       DrawerButtonData: [
+        // {
+        //   type: 'info',
+        //   icon: 'el-icon-printer',
+        //   label: '打印',
+        //   hide: false,
+        //   name: "print",
+        //   size: 'mini'
+        // },
+      ],
+      // 选择尺寸打印
+      dropdownButtonData:[
         {
-          type: 'info',
-          icon: 'el-icon-printer',
-          label: '打印',
-          hide: false,
-          name: "print",
-          size: 'mini'
-        },
-      ]
+          show:true,
+          fatherName:'打印',
+          fatherProp:'print',
+          list:[
+            {label:'A4',name:'A4',rdlxName:"hslrkd_A4.rdlx",showDept:true},
+            {label:'三联',name:'tree',rdlxName:"hslrkd.rdlx",showDept:true},
+          ]
+        }
+      ],
     };
   },
   mounted() {
@@ -86,13 +100,13 @@ export default {
   },
   methods: {
     //抽屉常用按钮
-    async drawerbutton (val) {
-      // 打印
-      if(val == 'print'){
-        let data = await initPrintAllData(this.tableDataDetails,'hslrkd.rdlx',false,false,true);
-        this.Print(data)
-      }
-    },
+    // async drawerbutton (val) {
+    //   // 打印
+    //   if(val == 'print'){
+    //     let data = await initPrintAllData(this.tableDataDetails,'hslrkd.rdlx',false,false,true);
+    //     this.Print(data)
+    //   }
+    // },
   },
 };
 </script>