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

src/api/wms/package/index.ts

@@ -176,3 +176,7 @@ export const getBalanceToPackageSelection = async (data: any) => {
 export const getPackageByBarbasic = async (relateNumber) => {
   return await request.get({ url: `/wms/package/getPackageByBarbasic?relateNumber=${relateNumber}`})
 }
+
+export const jasperExportAll = async(params: any) => {
+  return await request.download({url: `/wms/package/jasperExportAll`, params})
+}

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts

@@ -300,21 +300,12 @@ hiddenSearchHigh:true,
     isForm: false,
     search: {
       component: 'DatePicker',
+      value: dayjs().format('YYYY-MM'),
       componentProps: {
-        clearable:false,
-        type: 'month',
         valueFormat: 'YYYY-MM',
+        type: 'month',
       }
     },
-    // search: {
-    //   component: 'DatePicker',
-    //   value: [dayjs(),  dayjs().subtract(-3,'month')],
-    //   componentProps: {
-    //     valueFormat: 'YYYY-MM-DD',
-    //     type: 'daterange',
-    //     defaultTime: [new Date('1 '), new Date('1 ')]
-    //   }
-    // },
   },
   {
     label: '操作',

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts

@@ -206,21 +206,12 @@ hiddenSearchHigh:true,
     isForm: false,
     search: {
       component: 'DatePicker',
+      value: dayjs().format('YYYY-MM'),
       componentProps: {
-        clearable:false,
-        type: 'month',
         valueFormat: 'YYYY-MM',
+        type: 'month',
       }
     },
-    // search: {
-    //   value: [dayjs(),  dayjs().subtract(-3,'month')],
-    //   component: 'DatePicker',
-    //   componentProps: {
-    //     valueFormat: 'YYYY-MM-DD',
-    //     type: 'daterange',
-    //     defaultTime: [new Date('1 '), new Date('1 ')]
-    //   }
-    // },
   }
 ]))
 

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@@ -116,8 +116,13 @@
     fieldTableColumn="poLine"
     @detailOpenForm="detailOpenForm"
     @handleSubmitForm="handleDetailSubmitForm"
+    @detailBasicFormOnChange="detailBasicFormOnChange"
 
-  />
+  >
+    <template #boxQty="{row}" >
+      {{ Math.ceil(Number(row.planQty) / Number(row.purchaseStdQty))}}
+    </template>
+  </Detail>
   <!-- 导入 -->
   <ImportFormPlanCSV ref="importFormRef" url="/wms/purchase-plan-main/importCSV" :importTemplateData="importTemplateData" :announcements = "announcements"
     @success="importSuccess" :updateIsDisable="false" :appendIsDisable="true" :coverIsDisable="true" :mode="1" :coverIsShow="false" :appendIsShow="false"/>
@@ -1068,8 +1073,16 @@ const handleSelectionPublish = async ()=>{
 // 数字输入-改变事件
 const inputNumberChange = (field, index, row, val) => {
   console.log('inputNumberChange', field, index, row, val)
-  row.planQty = row.boxQty * row.purchaseStdQty
+  if (field == 'boxQty') {
+    row.planQty = row.boxQty * row.purchaseStdQty
+  }
 }
+const detailBasicFormOnChange =(field, val) => {
+  if (field == 'boxQty') {
+    detailRef.value.formRef.formRef.formModel.planQty = detailRef.value.formRef.formRef.formModel.boxQty * detailRef.value.formRef.formRef.formModel.purchaseStdQty
+  }
+}
+
   /** 初始化 **/
   onMounted(async () => {
     getList()

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -180,7 +180,9 @@
   <!-- 标签打印 -->
   <SearchTable width="905px" ref="searchTableRef" sureText="打印所选" @searchTableSuccess="searchTableSuccess1">
     <template #actionsOther>
-      <el-button type="primary" @click="printAllClick">打印全部</el-button>
+<!--      <el-button type="primary" @click="printAllClick">打印全部</el-button>-->
+      <el-button type="primary" :loading="printAllLoading" @click="handlePrintAllExport">打印全部</el-button>
+
     </template> 
   </SearchTable>
   <labelForm
@@ -1265,6 +1267,50 @@ const printAllClick = async () => {
   })
 
 }
+/** 导出明细按钮操作 */
+const printAllLoading = ref(false) // 导出的加载中
+
+const doHandlePrintAllExport = async (asnNumber) => {
+  try {
+    // 发起导出导出明细
+    printAllLoading.value = true
+    let params = {
+      pageNo: 1,
+      relateNumber: asnNumber,
+      pageSize: 99999999,
+    }
+    const excelTitle = ref(route.meta.title)
+    const data = await PackageApi.jasperExportAll(params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.pdf`)
+  } catch {
+  } finally {
+    printAllLoading.value = false
+  }
+}
+const handlePrintAllExport = async () => {
+  let res = await PackageApi.getLabelDetailPage({
+    moduleName: 'supplier',
+    recordNumber: printRow.value.number,
+    pageSize: 1000,
+    pageNo: 1,
+  })
+
+  await PackageApi.batchPrintingLablesForYT(res.list)
+    .then(res => {
+      let asnNumber
+      if(res.xdpLabel){
+        //协定品标签
+        asnNumber = res.xdpLabel;
+      }
+      if (res.cgLabel) {
+        //采购标签
+        asnNumber = res.cgLabel;
+      }
+      doHandlePrintAllExport(asnNumber);
+    }).catch(err => {
+      message.error(t('ts.创建标签失败'))
+    })
+}
 
 // 批量打印--供应商发货申请
 const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
@@ -1481,4 +1527,4 @@ onMounted(async () => {
     display: flex!important;
     opacity: 1;
   }
-</style>
+</style>