From e01a2b8111b8d9204b8f322709a9233969e26294 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周四, 28 11月 2024 10:52:00 +0800
Subject: [PATCH] add
---
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue
index 407a34e..c995954 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue
@@ -258,11 +258,11 @@
</template>
</el-dialog>
<!-- 鍗曡鎯� -->
- <el-drawer v-model="drawerVisible" :title="`${detailForm.poId}鐗╂枡璇︽儏`" direction="rtl" size="80%" @close="handleDrawerClose">
+ <el-drawer v-model="drawerVisible" :title="`${detailForm.poId}璇︽儏`" direction="rtl" size="80%" @close="handleDrawerClose">
<template #title>
<div class="slot_title">
<div class="title_orderNo">{{ title }}</div>
- <div>鐗╂枡璇︽儏</div>
+ <div>璇︽儏</div>
</div>
</template>
@@ -281,7 +281,9 @@
<el-form-item label-width="20px">
<el-button type="primary" icon="el-icon-search" @click="getDetail">鏌ヨ</el-button>
- <el-button type="primary" icon="ele-Printer" @click="getPrint">鎵撳嵃</el-button>
+ <!-- <el-button type="primary" icon="ele-Printer" @click="getPrint">鎵撳嵃</el-button> -->
+
+ <el-button type="primary" style="margin-left: 5px" icon="ele-Printer" @click="handleHtmlPrint"> 鎵撳嵃 </el-button>
</el-form-item>
</el-col>
</el-row>
@@ -353,6 +355,9 @@
</template>
</el-dialog>
+ <!-- 鎵撳嵃 -->
+ <print-table-ckd ref="printTableRef"></print-table-ckd>
+
<printDialogTestStudent ref="printDialogRefTestStudent" :title="printTestStudentTitle" @reloadTable="handleQueryTestStudent" />
</div>
</template>
@@ -378,6 +383,7 @@
import { formatDate, formatDate_T_Date, formatDate_T_Time, defaultTimeRange } from '/@/utils/formatTime';
import commonFunction from '/@/utils/commonFunction';
import { handleSlectDataWmsBusinessType } from '/@/utils/selectData';
+import printTableCkd from '/@/components/printTableCkd.vue';
// 鎺ㄨ崘璁剧疆鎿嶄綔 width 涓� 200
import { hiprint } from 'vue-plugin-hiprint';
import { SysPrintApi } from '/@/api-services/api';
@@ -538,7 +544,6 @@
// const enumList: any = cache.getCache('enumList');
// console.log(enumList.inEnumOrderType);
-
//鑾峰彇PO鍗曞垪琛�
const getTabelData = () => {
//鍒ゆ柇鍒涘缓鏃堕棿鏄惁鏈夐�夋嫨
@@ -619,22 +624,22 @@
// const
//鍗曞彿
const purchaseNo = ref('');
-
+const IsKitting = ref(false);
//鎵撳紑鎶藉眽
const openDrawer = async (type: number, scope: any = {}, entozhExcell?: any) => {
detailForm.value.Page = 1; //bug:鐐圭紪杈�-鍐嶇偣璇︽儏
detailForm.value.PageSize = 10; //bug:鐐圭紪杈�-鍐嶇偣璇︽儏
- if (scope.packageCode) {
- title.value = `${scope.packageCode}`;
+ if (scope.orderId) {
+ title.value = `${scope.orderId}`;
}
drawerType.value = 'drawerAll';
drawerVisible.value = true;
//褰撳墠鍏ュ簱鍗曞彿id
detailForm.value.orderId = scope.orderId;
//鍏ュ簱鍗�
- purchaseNo.value = scope.packageCode;
+ purchaseNo.value = scope.orderId;
debugger;
- detailForm.value.packageCode = scope.packageCode;
+ detailForm.value.orderId = scope.orderId;
//鑾峰彇鐗╂枡鍒楄〃
if (detailForm.value.poId == '') {
drawerList.value = [];
@@ -646,7 +651,7 @@
//------------------鑾峰彇鐗╂枡鍒楄〃鐗╂枡鏄庣粏
getEnumStockStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('StockStatusEnum')).data.result ?? [];
getEnumLockStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('LockStatusEnum')).data.result ?? [];
-
+
//----------------鐗╂枡鏄庣粏
// 鏍规嵁鐘舵�佽浆涓枃 淇濈暀3浣嶅皬鏁�
let scopetrans = JSON.parse(JSON.stringify(scope));
@@ -1122,6 +1127,12 @@
};
printDialogRefTestStudent.value.showDialog(new hiprint.PrintTemplate({ template: template }), row, template.panels[0].width);
};
+// 鎵撳嵃
+let itemSubTitle = ref<any[]>([]);
+const handleHtmlPrint = () => {
+ var title = IsKitting.value == true ? '榻愬娓呭崟' : '缂哄娓呭崟';
+ proxy.$refs['printTableRef'].printHd(title, itemSubTitle.value, drawerList.value); //deltailList
+};
// 鏆撮湶鏂规硶
defineExpose({ openDialog, openDrawer });
--
Gitblit v1.9.3