Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue

@@ -119,6 +119,15 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:productputaway-job-main:export'}), // 导出
+  {
+      label: '待处理状态全部打印',
+      name: 'printAllPending',
+      hide: false,
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: ''
+  },
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -137,7 +146,10 @@ const buttonBaseClick = (val, item) => {
       getList()
     }
   } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if(val == 'printAllPending'){
+    // 单据打印
+    handleDocumentPrintAll()
+  }else { // 其他按钮
     console.log('其他按钮', item)
   }
 }
@@ -169,75 +181,7 @@ const butttondata = (row,$index) => {
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainJobExe') { // 执行
-    let aaa = {
+    // ProductputawayJobMainApi.executeProductputawayMain(aaa)
-    "id": "1809190000111838147",
-    "requestNumber": "REC4620231214-0004",
-    "supplierCode": null,
-    "fromWarehouseCode": "W1",
-    "toWarehouseCode": null,
-    "fromAreaCodes": "",
-    "toAreaCodes": "",
-    "fromAreaTypes": "WIP,RAW",
-    "toAreaTypes": "SEMI,FG",
-    "completetime": 1702545291000,
-    "requestTime": 1702524283000,
-    "requestDueTime": 1689562428000,
-    "status": "2",
-    "expiredTime": null,
-    "updateTime": 1702545291000,
-    "updater": "1",
-    "jobStageStatus": null,
-    "priority": null,
-    "priorityIncrement": null,
-    "departmentCode": "103",
-    "acceptUserId": "1",
-    "acceptTime": 1702552206000,
-    "completeUserId": null,
-    "number": "JOB2220231214-0007",
-    "businessType": "ProductPutaway",
-    "remark": "111100",
-    "createTime": 1702545291000,
-    "creator": "1",
-    "autoComplete": "FALSE",
-    "allowModifyLocation": "FALSE",
-    "allowModifyQty": "TRUE",
-    "allowBiggerQty": "TRUE",
-    "allowSmallerQty": "TRUE",
-    "allowModifyInventoryStatus": "TRUE",
-    "allowContinuousScanning": "TRUE",
-    "allowPartialComplete": "TRUE",
-    "allowModifyBatch": "FALSE",
-    "allowModifyPackingNumber": "FALSE",
-    "inInventoryStatuses": "OK",
-    "outInventoryStatuses": "OK",
-      subList: [
-      {
-    "id": "1809190001814017359",
-    "packingNumber": "12",
-    "containerNumber": "001",
-    "batch": "21",
-    "inventoryStatus": "OK",
-    "poNumber": null,
-    "poLine": "item01",
-    "fromLocationCode": "H03",
-    "toLocationCode": "L-R-001-002-1-02",
-    "itemCode": "item01",
-    "itemName": "物料01",
-    "itemDesc1": "",
-    "itemDesc2": "",
-    "projectCode": "xm01",
-    "qty": 3,
-    "uom": "EA",
-    "number": "JOB2220231214-0007",
-    "remark": "00",
-    "createTime": 1702545291000,
-    "creator": "1",
-    "fromOwnerCode": null,
-    "toOwnerCode": null
-}
-      ]
-    }
-    ProductputawayJobMainApi.executeProductputawayMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
     await ProductputawayJobMainApi.abandonProductputawayMain(row.masterId)
     getList()
@@ -268,6 +212,13 @@ const handleDocumentPrint = async (row) => {
   window.open(src.value+'&id='+row.masterId)
 }
 
+/**
+ * 待处理全部打印
+ */
+const handleDocumentPrintAll = async () => {
+  window.open(src.value+'&id=printAllPending')
+}
+
 /** 导出按钮操作 */
 const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {