From 5e610f4c9d9870b393720bc5fcc856e97bc2ea4b Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周三, 27 11月 2024 09:36:26 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine

---
 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/component/openAllprop.vue |  123 ++++++++++++++++++++---------------------
 1 files changed, 60 insertions(+), 63 deletions(-)

diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/component/openAllprop.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/component/openAllprop.vue
index 5113be7..ca29f88 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/component/openAllprop.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/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>
 
@@ -273,15 +273,14 @@
 					<el-form :model="detailForm">
 						<el-row>
 							<el-col :span="6">
-								<el-form-item label="鐗╂枡缂栧彿">
-									<el-input v-model="detailForm.materialCode" clearable placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" />
+								<el-form-item label="閮ㄤ欢鍚嶇О">
+									<el-input v-model="detailForm.detailName" clearable placeholder="璇疯緭鍏ラ儴浠跺悕绉�" />
 								</el-form-item>
 							</el-col>
 							<el-col :span="4">
 								<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" style="margin-left: 5px" icon="ele-Printer" @click="handleHtmlPrint"> 鎵撳嵃 </el-button>
 								</el-form-item>
 							</el-col>
 						</el-row>
@@ -294,38 +293,38 @@
 						<!-- <el-table-column prop="poId" label="PO鍗旾D" show-overflow-tooltip="" /> -->
 						<!-- <el-table-column prop="poNo" label="PO鍗曞彿" show-overflow-tooltip="" /> -->
 
-						<el-table-column prop="placeCode" label="搴撲綅缂栫爜"  show-overflow-tooltip="" />
-         <el-table-column prop="inTime" label="杩涘叆鏃堕棿" width="80" :formatter="formatDate_T_Date"  show-overflow-tooltip="" />
-        <el-table-column prop="upi" label="閮ㄤ欢鏉$爜"  show-overflow-tooltip="" />
-        <el-table-column prop="detailName" label="閮ㄤ欢鍚嶇О"  show-overflow-tooltip="" />
-        <el-table-column prop="planNo" label="鎵规"  show-overflow-tooltip="" />
-        <el-table-column prop="orderId" label="璁㈠崟鍙�"  show-overflow-tooltip="" />
-        <el-table-column prop="packageCode" label="鍖呰鍙�"  show-overflow-tooltip="" />
-        <el-table-column prop="length" label="闀�"  show-overflow-tooltip="" />
-        <el-table-column prop="width" label="瀹�"  show-overflow-tooltip="" />
-        <el-table-column prop="thk" label="鍘�"  show-overflow-tooltip="" />
-          <el-table-column prop="stockStatus" label="搴撳瓨鐘舵��"  show-overflow-tooltip="" >
-            <template #default="scope">
-              <el-tag>{{ getEnumDesc(scope.row.stockStatus, getEnumStockStatusData_Index)}}</el-tag>
-            </template>
-          </el-table-column>
-        <el-table-column prop="stockStatusName" label="搴撳瓨鐘舵�佸悕绉�"  show-overflow-tooltip="" />
-        <el-table-column prop="operReason" label="鎿嶄綔鍘熷洜"  show-overflow-tooltip="" />
-        <el-table-column prop="operUser" label="鎿嶄綔浜�"  show-overflow-tooltip="" />
-         <el-table-column prop="operTime" label="鎿嶄綔鏃堕棿" width="80" :formatter="formatDate_T_Date"  show-overflow-tooltip="" />
-          <el-table-column prop="lockStatus" label="閿佸畾鐘舵��"  show-overflow-tooltip="" >
-            <template #default="scope">
-              <el-tag>{{ getEnumDesc(scope.row.lockStatus, getEnumLockStatusData_Index)}}</el-tag>
-            </template>
-          </el-table-column>
-        <el-table-column prop="lockReason" label="閿佸畾鍘熷洜"  show-overflow-tooltip="" />
-        <el-table-column prop="lockUser" label="閿佸畾浜�"  show-overflow-tooltip="" />
-         <el-table-column prop="lockTime" label="閿佸畾鏃堕棿" width="80" :formatter="formatDate_T_Date"  show-overflow-tooltip="" />
-        <el-table-column prop="remarks" label="澶囨敞"  show-overflow-tooltip="" />
-         <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
-         <el-table-column prop="updateTime" label="淇敼鏃堕棿" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
-        <el-table-column prop="createUserName" label="鍒涘缓浜�"  show-overflow-tooltip="" />
-        <el-table-column prop="updateUserName" label="淇敼浜�"  show-overflow-tooltip="" />
+						<el-table-column prop="placeCode" label="搴撲綅缂栫爜" show-overflow-tooltip="" />
+						<el-table-column prop="inTime" label="杩涘叆鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
+						<el-table-column prop="upi" label="閮ㄤ欢鏉$爜" show-overflow-tooltip="" />
+						<el-table-column prop="detailName" label="閮ㄤ欢鍚嶇О" show-overflow-tooltip="" />
+						<el-table-column prop="planNo" label="鎵规" show-overflow-tooltip="" />
+						<el-table-column prop="orderId" label="璁㈠崟鍙�" show-overflow-tooltip="" />
+						<el-table-column prop="packageCode" label="鍖呰鍙�" show-overflow-tooltip="" />
+						<el-table-column prop="length" label="闀�" show-overflow-tooltip="" />
+						<el-table-column prop="width" label="瀹�" show-overflow-tooltip="" />
+						<el-table-column prop="thk" label="鍘�" show-overflow-tooltip="" />
+						<el-table-column prop="stockStatus" label="搴撳瓨鐘舵��" show-overflow-tooltip="">
+							<template #default="scope">
+								<el-tag>{{ getEnumDesc(scope.row.stockStatus, getEnumStockStatusData_Index) }}</el-tag>
+							</template>
+						</el-table-column>
+						<el-table-column prop="stockStatusName" label="搴撳瓨鐘舵�佸悕绉�" show-overflow-tooltip="" />
+						<el-table-column prop="operReason" label="鎿嶄綔鍘熷洜" show-overflow-tooltip="" />
+						<el-table-column prop="operUser" label="鎿嶄綔浜�" show-overflow-tooltip="" />
+						<el-table-column prop="operTime" label="鎿嶄綔鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
+						<el-table-column prop="lockStatus" label="閿佸畾鐘舵��" show-overflow-tooltip="">
+							<template #default="scope">
+								<el-tag>{{ getEnumDesc(scope.row.lockStatus, getEnumLockStatusData_Index) }}</el-tag>
+							</template>
+						</el-table-column>
+						<el-table-column prop="lockReason" label="閿佸畾鍘熷洜" show-overflow-tooltip="" />
+						<el-table-column prop="lockUser" label="閿佸畾浜�" show-overflow-tooltip="" />
+						<el-table-column prop="lockTime" label="閿佸畾鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
+						<el-table-column prop="remarks" label="澶囨敞" show-overflow-tooltip="" />
+						<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
+						<el-table-column prop="updateTime" label="淇敼鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
+						<el-table-column prop="createUserName" label="鍒涘缓浜�" show-overflow-tooltip="" />
+						<el-table-column prop="updateUserName" label="淇敼浜�" show-overflow-tooltip="" />
 					</el-table>
 					<Pagination :total="detailCount" v-model:page="detailForm.Page" v-model:limit="detailForm.PageSize" @pagination="getDetail" style="margin-top: 20px; text-align: center"></Pagination>
 
@@ -354,6 +353,9 @@
 		</el-dialog>
 
 		<printDialogTestStudent ref="printDialogRefTestStudent" :title="printTestStudentTitle" @reloadTable="handleQueryTestStudent" />
+
+		<!-- 鎵撳嵃 -->
+		<print-table-ckd ref="printTableRef"></print-table-ckd>
 	</div>
 </template>
 <script lang="ts" setup>
@@ -376,13 +378,13 @@
 import { pageBaseCustomer } from '/@/api/main/WmsBase/baseCustomer';
 import { listWmsOrderPurchaseDetails, pageWmsOrderPurchaseDetails } from '/@/api/main/WmsOrder/wmsOrderPurchaseDetails';
 import { formatDate, formatDate_T_Date, formatDate_T_Time, defaultTimeRange } from '/@/utils/formatTime';
+import printTableCkd from '/@/components/printTableCkd.vue';
 import commonFunction from '/@/utils/commonFunction';
 import { handleSlectDataWmsBusinessType } from '/@/utils/selectData';
 // 鎺ㄨ崘璁剧疆鎿嶄綔 width 涓� 200
 import { hiprint } from 'vue-plugin-hiprint';
 import { SysPrintApi } from '/@/api-services/api';
 import { SysPrint } from '/@/api-services/models';
-
 const moveType = 10; //绉诲姩绫诲瀷 鍏ュ簱
 const { proxy }: any = getCurrentInstance(); // 璁块棶瀹炰緥涓婁笅鏂� proxy鍚屾椂鏀寔寮�鍙� 绾夸笂鐜
 const getEnumOrderTypeData = ref<any>([]);
@@ -413,10 +415,8 @@
 const hexiao = computed(() => props.hexiao);
 const loading = ref(false);
 
-
-
 const getEnumStockStatusData_Index = ref<any>([]);
-  const getEnumLockStatusData_Index = ref<any>([]);
+const getEnumLockStatusData_Index = ref<any>([]);
 // 鐧诲綍鐢ㄦ埛id
 // const LoginUserID = computed(() => store.state.login.userInfo.id || localCache.getCache("LoginUserID"))
 
@@ -536,8 +536,6 @@
 //鍒楄〃鐨勬暟鎹潯鏁�
 const totalItems = ref<number>(0);
 
-
-
 // .inEnumOrderType
 
 //鑾峰彇PO鍗曞垪琛�
@@ -608,8 +606,8 @@
 // -------------------鑾峰彇PO鍗曚笅鐗╂枡璇︽儏-----------------------------------
 //鍏ュ簱鍗曚笅鐗╂枡璇︽儏璇锋眰
 const detailForm = ref({
-	poId: '',
-	materialCode: '',
+	packageCode: '',
+	detailName: '',
 	Page: 1,
 	PageSize: 10,
 });
@@ -620,7 +618,7 @@
 // const
 //鍗曞彿
 const purchaseNo = ref('');
-
+const IsPack = ref(false);
 //鎵撳紑鎶藉眽
 const openDrawer = async (type: number, scope: any = {}, entozhExcell?: any) => {
 	detailForm.value.Page = 1; //bug:鐐圭紪杈�-鍐嶇偣璇︽儏
@@ -630,14 +628,13 @@
 	}
 	drawerType.value = 'drawerAll';
 	drawerVisible.value = true;
-	//褰撳墠鍏ュ簱鍗曞彿id
-	detailForm.value.poId = scope.id;
 	//鍏ュ簱鍗�
 	purchaseNo.value = scope.packageCode;
+	IsPack.value = scope.isPack;
 	debugger;
-	detailForm.value.poId = scope.id;
+	detailForm.value.packageCode = scope.packageCode;
 	//鑾峰彇鐗╂枡鍒楄〃
-	if (detailForm.value.poId == '') {
+	if (detailForm.value.packageCode == '') {
 		drawerList.value = [];
 		detailCount.value = 0;
 		return;
@@ -646,14 +643,7 @@
 	getDetail();
 	//------------------鑾峰彇鐗╂枡鍒楄〃鐗╂枡鏄庣粏
 	getEnumStockStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('StockStatusEnum')).data.result ?? [];
-    getEnumLockStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('LockStatusEnum')).data.result ?? [];
-	// getBusinessTypeData_Index.value = await handleSlectDataWmsBusinessType(moveType); //涓嬫媺璇诲彇涓氬姟绫诲瀷鎺ュ彛 create  by liuwq
-
-	// getEnumDockData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('DockEnum')).data.result ?? [];
-
-	// getEnumPoDetailStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('OrderStatusEnum')).data.result ?? [];
-	// getEnumOrderTypeData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('OrderTypeEnum')).data.result ?? [];
-	//----------------鐗╂枡鏄庣粏
+	getEnumLockStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('LockStatusEnum')).data.result ?? [];
 	// 鏍规嵁鐘舵�佽浆涓枃 淇濈暀3浣嶅皬鏁�
 	let scopetrans = JSON.parse(JSON.stringify(scope));
 	// scopetrans.totalquantity = Number(scopetrans.totalquantity).toFixed(3);
@@ -668,10 +658,10 @@
 //鍏抽棴鎶藉眽
 const handleDrawerClose = () => {
 	detailForm.value = {
-		poId: '',
-		materialCode: '',
-		Page: 1,
-		PageSize: 10,
+		packageCode: '',
+	detailName: '',
+	Page: 1,
+	PageSize: 10,
 	};
 	deltailList.value = [];
 	detailCount.value = 0;
@@ -1129,6 +1119,13 @@
 	printDialogRefTestStudent.value.showDialog(new hiprint.PrintTemplate({ template: template }), row, template.panels[0].width);
 };
 
+// 鎵撳嵃
+let itemSubTitle = ref<any[]>([]);
+const handleHtmlPrint = () => {
+	var title = IsPack.value == true ? '榻愬寘娓呭崟' : '缂哄寘娓呭崟';
+	proxy.$refs['printTableRef'].printHd(title, itemSubTitle.value, drawerList.value); //deltailList
+};
+
 // 鏆撮湶鏂规硶
 defineExpose({ openDialog, openDrawer });
 </script>

--
Gitblit v1.9.3