From 6748b620551df2a2f6a15f3a71f7e93ad03ed7a7 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 25 11月 2024 17:51:29 +0800
Subject: [PATCH] 2

---
 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/Dto/WmsConfigPrintOutput.cs |   27 
 LA24030_LuLiPackageLine_Web/src/views/main/WmsSystemConfig/wmsConfigPrint/index.vue                                  |   35 
 LA24030_LuLiPackageLine_Web/src/views/main/wmsConfigPrint/wmsConfigPrint/component/editDialog.vue                    |  187 +++++++
 LA24030_LuLiPackageLine_Web/src/views/main/WmsConfig/wmsConfigPrint/component/editDialog.vue                         |  187 +++++++
 LA24030_LuLiPackageLine_Web/src/views/main/WmsSystemConfig/wmsConfigPrint/component/editDialog.vue                   |   17 
 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/Dto/WmsConfigPrintInput.cs  |   29 
 LA24030_LuLiPackageLine_Web/src/api/main/WmsConfig/wmsConfigPrint.ts                                                 |   78 +++
 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs                                          |    3 
 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/WmsConfigPrintService.cs    |  180 +-----
 LA24030_LuLiPackageLine_Web/src/api/main/wmsConfigPrint/wmsConfigPrint.ts                                            |   78 +++
 LA24030_LuLiPackageLine_Print/打印模板文件/包装条码模板_二维码.btw                                                                  |    0 
 LA24030_LuLiPackageLine_Print/打印模板文件/打印实例.jpg                                                                        |    0 
 LA24030_LuLiPackageLine_Web/src/views/main/wmsConfigPrint/wmsConfigPrint/index.vue                                   |  280 +++++++++++
 LA24030_LuLiPackageLine_Web/src/views/main/WmsConfig/wmsConfigPrint/index.vue                                        |  280 +++++++++++
 14 files changed, 1,196 insertions(+), 185 deletions(-)

diff --git "a/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw" "b/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw"
index e8023e8..a028fb9 100644
--- "a/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw"
+++ "b/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw"
Binary files differ
diff --git "a/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\346\211\223\345\215\260\345\256\236\344\276\213.jpg" "b/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\346\211\223\345\215\260\345\256\236\344\276\213.jpg"
new file mode 100644
index 0000000..a681485
--- /dev/null
+++ "b/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\346\211\223\345\215\260\345\256\236\344\276\213.jpg"
Binary files differ
diff --git a/LA24030_LuLiPackageLine_Web/src/api/main/WmsConfig/wmsConfigPrint.ts b/LA24030_LuLiPackageLine_Web/src/api/main/WmsConfig/wmsConfigPrint.ts
new file mode 100644
index 0000000..df66bd9
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Web/src/api/main/WmsConfig/wmsConfigPrint.ts
@@ -0,0 +1,78 @@
+锘縤mport request from '/@/utils/request';
+enum Api {
+  AddWmsConfigPrint = '/api/wmsConfigPrint/add',
+  DeleteWmsConfigPrint = '/api/wmsConfigPrint/delete',
+  UpdateWmsConfigPrint = '/api/wmsConfigPrint/update',
+  PageWmsConfigPrint = '/api/wmsConfigPrint/page',
+  ListWmsConfigPrint = '/api/wmsConfigPrint/list',
+  DetailWmsConfigPrint = '/api/wmsConfigPrint/detail',
+  ImportExcelWmsConfigPrint = '/api/wmsConfigPrint/importExcel',
+  DownloadExcelTemplateWmsConfigPrint = '/api/wmsConfigPrint/downloadExcelTemplate',
+}
+
+// 澧炲姞鎵撳嵃閰嶇疆琛�
+export const addWmsConfigPrint = (params?: any) =>
+	request({
+		url: Api.AddWmsConfigPrint,
+		method: 'post',
+		data: params
+	});
+
+// 鍒犻櫎鎵撳嵃閰嶇疆琛�
+export const deleteWmsConfigPrint = (params?: any) => 
+	request({
+			url: Api.DeleteWmsConfigPrint,
+			method: 'post',
+			data: params
+		});
+
+// 缂栬緫鎵撳嵃閰嶇疆琛�
+export const updateWmsConfigPrint = (params?: any) => 
+	request({
+			url: Api.UpdateWmsConfigPrint,
+			method: 'post',
+			data: params
+		});
+
+// 瀵煎叆鎵撳嵃閰嶇疆琛�
+export const importExcelWmsConfigPrint = (params?: any) =>
+	request({
+		url: Api.ImportExcelWmsConfigPrint,
+		method: 'post',
+		data: params
+	});
+
+// 涓嬭浇瀵煎叆鎵撳嵃閰嶇疆琛ㄦā鏉�
+export const downloadExcelTemplateWmsConfigPrint = (params?: any) => 
+	request({
+			url: Api.DownloadExcelTemplateWmsConfigPrint,
+			method: 'get',
+			data: params,
+			responseType: 'blob'
+		});
+
+
+// 鍒嗛〉鏌ヨ鎵撳嵃閰嶇疆琛�
+export const pageWmsConfigPrint = (params?: any) => 
+	request({
+			url: Api.PageWmsConfigPrint,
+			method: 'post',
+			data: params
+		});
+
+// 涓嶅垎椤垫煡璇㈡墦鍗伴厤缃〃
+export const listWmsConfigPrint = (params?: any) => 
+	request({
+			url: Api.ListWmsConfigPrint,
+			method: 'get',
+			data: params
+		});
+
+// 璇︽儏鎵撳嵃閰嶇疆琛�
+export const detailWmsConfigPrint = (id: any) => 
+	request({
+			url: Api.DetailWmsConfigPrint,
+			method: 'get',
+			data: { id }
+		});
+
diff --git a/LA24030_LuLiPackageLine_Web/src/api/main/wmsConfigPrint/wmsConfigPrint.ts b/LA24030_LuLiPackageLine_Web/src/api/main/wmsConfigPrint/wmsConfigPrint.ts
new file mode 100644
index 0000000..df66bd9
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Web/src/api/main/wmsConfigPrint/wmsConfigPrint.ts
@@ -0,0 +1,78 @@
+锘縤mport request from '/@/utils/request';
+enum Api {
+  AddWmsConfigPrint = '/api/wmsConfigPrint/add',
+  DeleteWmsConfigPrint = '/api/wmsConfigPrint/delete',
+  UpdateWmsConfigPrint = '/api/wmsConfigPrint/update',
+  PageWmsConfigPrint = '/api/wmsConfigPrint/page',
+  ListWmsConfigPrint = '/api/wmsConfigPrint/list',
+  DetailWmsConfigPrint = '/api/wmsConfigPrint/detail',
+  ImportExcelWmsConfigPrint = '/api/wmsConfigPrint/importExcel',
+  DownloadExcelTemplateWmsConfigPrint = '/api/wmsConfigPrint/downloadExcelTemplate',
+}
+
+// 澧炲姞鎵撳嵃閰嶇疆琛�
+export const addWmsConfigPrint = (params?: any) =>
+	request({
+		url: Api.AddWmsConfigPrint,
+		method: 'post',
+		data: params
+	});
+
+// 鍒犻櫎鎵撳嵃閰嶇疆琛�
+export const deleteWmsConfigPrint = (params?: any) => 
+	request({
+			url: Api.DeleteWmsConfigPrint,
+			method: 'post',
+			data: params
+		});
+
+// 缂栬緫鎵撳嵃閰嶇疆琛�
+export const updateWmsConfigPrint = (params?: any) => 
+	request({
+			url: Api.UpdateWmsConfigPrint,
+			method: 'post',
+			data: params
+		});
+
+// 瀵煎叆鎵撳嵃閰嶇疆琛�
+export const importExcelWmsConfigPrint = (params?: any) =>
+	request({
+		url: Api.ImportExcelWmsConfigPrint,
+		method: 'post',
+		data: params
+	});
+
+// 涓嬭浇瀵煎叆鎵撳嵃閰嶇疆琛ㄦā鏉�
+export const downloadExcelTemplateWmsConfigPrint = (params?: any) => 
+	request({
+			url: Api.DownloadExcelTemplateWmsConfigPrint,
+			method: 'get',
+			data: params,
+			responseType: 'blob'
+		});
+
+
+// 鍒嗛〉鏌ヨ鎵撳嵃閰嶇疆琛�
+export const pageWmsConfigPrint = (params?: any) => 
+	request({
+			url: Api.PageWmsConfigPrint,
+			method: 'post',
+			data: params
+		});
+
+// 涓嶅垎椤垫煡璇㈡墦鍗伴厤缃〃
+export const listWmsConfigPrint = (params?: any) => 
+	request({
+			url: Api.ListWmsConfigPrint,
+			method: 'get',
+			data: params
+		});
+
+// 璇︽儏鎵撳嵃閰嶇疆琛�
+export const detailWmsConfigPrint = (id: any) => 
+	request({
+			url: Api.DetailWmsConfigPrint,
+			method: 'get',
+			data: { id }
+		});
+
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsConfig/wmsConfigPrint/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsConfig/wmsConfigPrint/component/editDialog.vue
new file mode 100644
index 0000000..e9c1001
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsConfig/wmsConfigPrint/component/editDialog.vue
@@ -0,0 +1,187 @@
+锘�<template>
+	<div class="wmsConfigPrint-container">
+		<el-dialog v-model="isShowDialog" :width="800" draggable="" :close-on-click-modal="false">
+			<template #header>
+				<div style="color: #fff">
+					<!--<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>-->
+					<span>{{ props.title }}</span>
+				</div>
+			</template>
+			<el-form :model="ruleForm" ref="ruleFormRef" label-width="auto" :rules="rules" v-loading="loading">
+				<el-row :gutter="35">
+					<el-form-item v-show="false">
+						<el-input v-model="ruleForm.id" />
+					</el-form-item>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="鎵撳嵃鍒嗙被" prop="printClassify">
+							<el-select clearable v-model="ruleForm.printClassify" placeholder="璇烽�夋嫨鎵撳嵃鍒嗙被">
+								<el-option v-for="(item,index) in  getEnumPrintClassifyData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
+								
+							</el-select>
+							
+						</el-form-item>
+						
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="鎵撳嵃鍒嗙被鍚�" prop="printClassifyName">
+							<el-input v-model="ruleForm.printClassifyName" placeholder="璇疯緭鍏ユ墦鍗板垎绫诲悕" maxlength="50" show-word-limit clearable />
+							
+						</el-form-item>
+						
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="鎵撳嵃妯℃澘鍚�" prop="printTemplate">
+							<el-input v-model="ruleForm.printTemplate" placeholder="璇疯緭鍏ユ墦鍗版ā鏉垮悕" maxlength="255" show-word-limit clearable />
+							
+						</el-form-item>
+						
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="鎵撳嵃妯℃澘鍦板潃" prop="printTemplateAddr">
+							<el-input v-model="ruleForm.printTemplateAddr" placeholder="璇疯緭鍏ユ墦鍗版ā鏉垮湴鍧�" maxlength="255" show-word-limit clearable />
+							
+						</el-form-item>
+						
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="鎵撳嵃鏈哄垪琛�" prop="printerList">
+							<el-input v-model="ruleForm.printerList" placeholder="璇疯緭鍏ユ墦鍗版満鍒楄〃" maxlength="500" show-word-limit clearable />
+							
+						</el-form-item>
+						
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="澶囨敞" prop="remark">
+							<el-input v-model="ruleForm.remark" placeholder="璇疯緭鍏ュ娉�" maxlength="255" show-word-limit clearable />
+							
+						</el-form-item>
+						
+					</el-col>
+				</el-row>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="cancel">鍙� 娑�</el-button>
+					<el-button type="primary" @click="submit" :disabled="disabled_btn">纭� 瀹�</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+<style scoped>
+:deep(.el-select),
+:deep(.el-input-number) {
+	width: 100%;
+}
+</style>
+<script lang="ts" setup>
+	import { ref,onMounted } from "vue";
+	import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
+	import { ElMessage } from "element-plus";
+	import type { FormRules } from "element-plus";
+	import { addWmsConfigPrint, updateWmsConfigPrint, detailWmsConfigPrint } from "/@/api/main/WmsConfig/wmsConfigPrint";
+	import { getAPI } from '/@/utils/axios-utils';
+	import { SysEnumApi } from '/@/api-services/api';
+
+	const getEnumPrintClassifyData = ref<any>([]);
+	//鐖剁骇浼犻�掓潵鐨勫弬鏁�
+	var props = defineProps({
+		title: {
+		type: String,
+		default: "",
+	},
+	});
+	//鐖剁骇浼犻�掓潵鐨勫嚱鏁帮紝鐢ㄤ簬鍥炶皟
+	const emit = defineEmits(["reloadTable"]);
+	const ruleFormRef = ref();
+	const isShowDialog = ref(false);
+	const loading = ref(false);
+	const disabled_btn = ref(false);
+	const ruleForm = ref<any>({});
+	//鑷娣诲姞鍏朵粬瑙勫垯
+	const rules = ref<FormRules>({
+		printClassify: [{required: true, message: '璇烽�夋嫨鎵撳嵃鍒嗙被锛�', trigger: 'change',},],
+		printClassifyName: [{required: true, message: '璇疯緭鍏ユ墦鍗板垎绫诲悕锛�', trigger: 'blur',},],
+		printTemplate: [{required: true, message: '璇疯緭鍏ユ墦鍗版ā鏉垮悕锛�', trigger: 'blur',},],
+		printTemplateAddr: [{required: true, message: '璇疯緭鍏ユ墦鍗版ā鏉垮湴鍧�锛�', trigger: 'blur',},],
+		printerList: [{required: true, message: '璇疯緭鍏ユ墦鍗版満鍒楄〃锛�', trigger: 'blur',},],
+		isDelete: [{required: true, message: '璇烽�夋嫨杞垹闄わ紒', trigger: 'change',},],
+	});
+
+	/*
+	 * 鎵撳紑寮圭獥
+	 * @param flag 鏍囪锛�1鏂板 2缂栬緫 3鏌ョ湅锛�
+	 * @param row  琛屾暟鎹�
+	 */
+	const openDialog = async (flag: number,row: any) => {
+		// ruleForm.value = JSON.parse(JSON.stringify(row));
+		// 鏀圭敤detail鑾峰彇鏈�鏂版暟鎹潵缂栬緫
+		let rowData = JSON.parse(JSON.stringify(row));
+		if (rowData.id)
+			ruleForm.value = (await detailWmsConfigPrint(rowData.id)).data.result;
+		else {
+		    ruleForm.value = rowData;
+		}
+		isShowDialog.value = true;
+	};
+
+	// 鍏抽棴寮圭獥
+	const closeDialog = () => {
+		emit("reloadTable");
+		isShowDialog.value = false;
+	};
+
+	// 鍙栨秷
+	const cancel = () => {
+		isShowDialog.value = false;
+	};
+
+	// 鎻愪氦
+	const submit = async () => {
+	    disabled_btn.value = true;
+		ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => {
+			if (isValid) {
+			    loading.value = true;
+				let values = ruleForm.value;
+				let ret={};
+				let title='鏂板';
+				if (ruleForm.value.id == undefined || ruleForm.value.id == null || ruleForm.value.id == "" || ruleForm.value.id == 0) {
+					ret = await addWmsConfigPrint(values);
+				} else {
+					title='缂栬緫';
+					ret = await updateWmsConfigPrint(values);
+				}
+				loading.value = false;
+				disabled_btn.value = false;
+				if(ret.data.type=="success"){
+					ElMessage.success(title+'鎴愬姛');
+					closeDialog();
+				}
+			} else {
+			    disabled_btn.value = false;
+				ElMessage({
+					message: `琛ㄥ崟鏈�${Object.keys(fields).length}澶勯獙璇佸け璐ワ紝璇蜂慨鏀瑰悗鍐嶆彁浜,
+					type: "error",
+				});
+			}
+		});
+	};
+
+	
+
+
+
+
+
+	// 椤甸潰鍔犺浇鏃�
+	onMounted(async () => {
+			getEnumPrintClassifyData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('PrintClassifyEnum')).data.result ?? [];
+	});
+
+	//灏嗗睘鎬ф垨鑰呭嚱鏁版毚闇茬粰鐖剁粍浠�
+	defineExpose({ openDialog });
+</script>
+
+
+
+
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsConfig/wmsConfigPrint/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsConfig/wmsConfigPrint/index.vue
new file mode 100644
index 0000000..c172ccb
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsConfig/wmsConfigPrint/index.vue
@@ -0,0 +1,280 @@
+锘�<template>
+  <div class="wmsConfigPrint-container">
+    <el-card shadow="hover" :body-style="{ paddingBottom: '0' }"> 
+      <el-form :model="queryParamsWmsConfigPrint" ref="queryForm" labelWidth="90">
+        <el-row>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
+            <el-form-item label="鍏抽敭瀛�">
+              <el-input v-model="queryParamsWmsConfigPrint.searchKey" clearable="" placeholder="鎵撳嵃鍒嗙被鍚�,鎵撳嵃妯℃澘鍚�,鎵撳嵃妯℃澘鍦板潃,鎵撳嵃鏈哄垪琛�,澶囨敞,鍒涘缓浜�,淇敼浜�"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsConfigPrint">
+            <el-form-item label="鎵撳嵃鍒嗙被">
+              <el-select clearable="" v-model="queryParamsWmsConfigPrint.printClassify" placeholder="璇烽�夋嫨鎵撳嵃鍒嗙被">
+                <el-option v-for="(item,index) in getEnumPrintClassifyData_Index" :key="index" :value="item.value" :label="`${item.describe}`" />
+                
+              </el-select>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsConfigPrint">
+            <el-form-item label="鎵撳嵃鍒嗙被鍚�">
+              <el-input v-model="queryParamsWmsConfigPrint.printClassifyName" clearable="" placeholder="璇疯緭鍏ユ墦鍗板垎绫诲悕"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsConfigPrint">
+            <el-form-item label="鎵撳嵃妯℃澘鍚�">
+              <el-input v-model="queryParamsWmsConfigPrint.printTemplate" clearable="" placeholder="璇疯緭鍏ユ墦鍗版ā鏉垮悕"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsConfigPrint">
+            <el-form-item label="鎵撳嵃妯℃澘鍦板潃">
+              <el-input v-model="queryParamsWmsConfigPrint.printTemplateAddr" clearable="" placeholder="璇疯緭鍏ユ墦鍗版ā鏉垮湴鍧�"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsConfigPrint">
+            <el-form-item label="鎵撳嵃鏈哄垪琛�">
+              <el-input v-model="queryParamsWmsConfigPrint.printerList" clearable="" placeholder="璇疯緭鍏ユ墦鍗版満鍒楄〃"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsConfigPrint">
+            <el-form-item label="澶囨敞">
+              <el-input v-model="queryParamsWmsConfigPrint.remark" clearable="" placeholder="璇疯緭鍏ュ娉�"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb10">
+            <el-form-item>
+              <el-button-group style="display: flex; align-items: center;">
+                <el-button type="primary"  icon="ele-Search" @click="handleQueryWmsConfigPrint" v-auth="'wmsConfigPrint:page'" :disabled="disabled_btnWmsConfigPrint"> 鏌ヨ </el-button>
+                      <el-button icon="ele-Refresh" @click="resetWmsConfigPrint"> 閲嶇疆 </el-button>
+                        <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUIWmsConfigPrint" v-if="!showAdvanceQueryUIWmsConfigPrint" style="margin-left:5px;"> 楂樼骇鏌ヨ </el-button>
+                        <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUIWmsConfigPrint" v-if="showAdvanceQueryUIWmsConfigPrint" style="margin-left:5px;"> 闅愯棌 </el-button>
+                <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddWmsConfigPrint" v-auth="'wmsConfigPrint:add'"> 鏂板 </el-button>
+                <el-button type="primary" style="margin-left:5px;" icon="ele-Download" @click="handleExportExcelWmsConfigPrint"  v-auth="'wmsConfigPrint:exportExcel'" > 瀵煎嚭 </el-button>
+              </el-button-group>
+            </el-form-item>
+            
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+    <el-card class="full-table" shadow="hover" style="margin-top: 5px">
+      <el-table
+                ref="tableRefWmsConfigPrint"
+				:data="tableDataWmsConfigPrint"
+				style="width: 100%"
+				v-loading="loadingWmsConfigPrint"
+				tooltip-effect="light"
+                				row-key="id"
+                @sort-change="sortChangeWmsConfigPrint"
+				border="">
+        <el-table-column type="index" label="搴忓彿" width="55" align="center"/>
+          <el-table-column prop="printClassify" label="鎵撳嵃鍒嗙被"  show-overflow-tooltip="" >
+            <template #default="scope">
+              <el-tag>{{ getEnumDesc(scope.row.printClassify, getEnumPrintClassifyData_Index)}}</el-tag>
+            </template>
+          </el-table-column>
+        <el-table-column prop="printClassifyName" label="鎵撳嵃鍒嗙被鍚�"  show-overflow-tooltip="" />
+        <el-table-column prop="printTemplate" label="鎵撳嵃妯℃澘鍚�"  show-overflow-tooltip="" />
+        <el-table-column prop="printTemplateAddr" label="鎵撳嵃妯℃澘鍦板潃"  show-overflow-tooltip="" />
+        <el-table-column prop="printerList" label="鎵撳嵃鏈哄垪琛�"  show-overflow-tooltip="" />
+        <el-table-column prop="remark" 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 label="鎿嶄綔" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('wmsConfigPrint:update') || auth('wmsConfigPrint:delete')">
+          <template #default="scope">
+            <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditWmsConfigPrint(scope.row)" v-auth="'wmsConfigPrint:update'"> 缂栬緫 </el-button>
+            <el-button icon="ele-Delete" size="small" text="" type="primary" @click="delWmsConfigPrint(scope.row)" v-auth="'wmsConfigPrint:delete'"> 鍒犻櫎 </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+				v-model:currentPage="tableParamsWmsConfigPrint.page"
+				v-model:page-size="tableParamsWmsConfigPrint.pageSize"
+				:total="tableParamsWmsConfigPrint.total"
+				:page-sizes="[10, 20, 50, 100, 200, 500]"
+				small=""
+				background=""
+				@size-change="handleSizeChangeWmsConfigPrint"
+				@current-change="handleCurrentChangeWmsConfigPrint"
+				layout="total, sizes, prev, pager, next, jumper"
+	/>
+      <printDialogWmsConfigPrint
+        ref="printDialogRefWmsConfigPrint"
+        :title="printWmsConfigPrintTitle"
+        @reloadTable="handleQueryWmsConfigPrint" />
+      <editDialogWmsConfigPrint
+        ref="editDialogRefWmsConfigPrint"
+        :title="editWmsConfigPrintTitle"
+        @reloadTable="handleQueryWmsConfigPrint"
+      />
+    </el-card>
+  </div>
+</template>
+
+<script lang="ts" setup="" name="wmsConfigPrint">
+  import { ref,onMounted } from "vue";
+  import { ElMessageBox, ElMessage } from "element-plus";
+  import { auth } from '/@/utils/authFunction';
+  import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
+  import { formatDate,formatDate_T_Date,formatDate_T_Time,defaultTimeRange } from '/@/utils/formatTime';
+  import { exportPageExcel } from '/@/utils/exportPageExcel' //寮曞叆瀵煎嚭鏂规硶
+
+
+  import printDialogWmsConfigPrint from '/@/views/system/print/component/hiprint/preview.vue'
+  import editDialogWmsConfigPrint from '/@/views/main/WmsConfig/wmsConfigPrint/component/editDialog.vue'
+  import { pageWmsConfigPrint, deleteWmsConfigPrint,importExcelWmsConfigPrint,downloadExcelTemplateWmsConfigPrint } from '/@/api/main/WmsConfig/wmsConfigPrint';
+	import { getAPI } from '/@/utils/axios-utils';
+	import { SysEnumApi } from '/@/api-services/api';
+  import commonFunction from '/@/utils/commonFunction';
+
+  const getEnumPrintClassifyData_Index = ref<any>([]);
+
+	const { getEnumDesc } = commonFunction();
+  
+  /***************************************************[鎵撳嵃閰嶇疆琛ㄦ搷浣淽寮�濮�***************************************************/
+  const showAdvanceQueryUIWmsConfigPrint = ref(false);
+  const tableRefWmsConfigPrint = ref(null);
+  const printDialogRefWmsConfigPrint = ref();
+  const editDialogRefWmsConfigPrint = ref();
+  const loadingWmsConfigPrint = ref(false);
+  const disabled_btnWmsConfigPrint = ref(false);
+  const tableDataWmsConfigPrint = ref<any>([]);
+  const queryParamsWmsConfigPrint = ref<any>({});
+  const tableParamsWmsConfigPrint = ref({
+    page: 1,
+    pageSize: 10,
+    total: 0,
+  });
+
+  const printWmsConfigPrintTitle = ref("");
+  const editWmsConfigPrintTitle = ref("");
+
+  // 鏀瑰彉楂樼骇鏌ヨ鐨勬帶浠舵樉绀虹姸鎬�
+  const changeAdvanceQueryUIWmsConfigPrint = () => {
+    showAdvanceQueryUIWmsConfigPrint.value = !showAdvanceQueryUIWmsConfigPrint.value;
+  }
+
+  // 鏌ヨ鎵撳嵃閰嶇疆琛�
+  const handleQueryWmsConfigPrint = async () => {
+    loadingWmsConfigPrint.value = true;
+    disabled_btnWmsConfigPrint.value = true;
+    var res = await pageWmsConfigPrint(Object.assign(queryParamsWmsConfigPrint.value, tableParamsWmsConfigPrint.value));
+    if(res.data.type=="success"){
+      tableDataWmsConfigPrint.value = res.data.result?.items ?? [];
+      tableParamsWmsConfigPrint.value.total = res.data.result?.total;
+    }
+    loadingWmsConfigPrint.value = false;
+    disabled_btnWmsConfigPrint.value = false;
+  };
+
+  // 閲嶇疆鎵撳嵃閰嶇疆琛ㄦ煡璇�
+  const resetWmsConfigPrint = async () => {
+    queryParamsWmsConfigPrint.value = {}
+  };
+
+  // 鎵撳嵃閰嶇疆琛ㄥ垪鎺掑簭
+  const sortChangeWmsConfigPrint = async (column: any) => {
+	queryParamsWmsConfigPrint.value.field = column.prop;
+	queryParamsWmsConfigPrint.value.order = column.order;
+	await handleQueryWmsConfigPrint();
+  };
+
+  // 鎵撳紑鏂板鎵撳嵃閰嶇疆琛ㄩ〉闈�
+  const openAddWmsConfigPrint = () => {
+    editWmsConfigPrintTitle.value = '娣诲姞鎵撳嵃閰嶇疆琛�';
+    editDialogRefWmsConfigPrint.value.openDialog(1,{});
+  };
+
+  // 鎵撳紑鎵撳嵃鎵撳嵃閰嶇疆琛ㄩ〉闈�
+  const openPrintWmsConfigPrint = async (row: any) => {
+    printWmsConfigPrintTitle.value = '鎵撳嵃鎵撳嵃閰嶇疆琛�';
+  }
+  
+  // 鎵撳紑缂栬緫鎵撳嵃閰嶇疆琛ㄩ〉闈�
+  const openEditWmsConfigPrint = (row: any) => {
+    editWmsConfigPrintTitle.value = '缂栬緫鎵撳嵃閰嶇疆琛�';
+    editDialogRefWmsConfigPrint.value.openDialog(2,row);
+  };
+
+  // 鍒犻櫎鎵撳嵃閰嶇疆琛�
+  const delWmsConfigPrint = (row: any) => {
+    ElMessageBox.confirm(`纭畾瑕佸垹闄ゅ悧?`, "鎻愮ず", {
+    confirmButtonText: "纭畾",
+    cancelButtonText: "鍙栨秷",
+    type: "warning",
+  })
+  .then(async () => {
+    loadingWmsConfigPrint.value = true;
+    var ret = await deleteWmsConfigPrint(row);
+    if(ret.data.type=="success"){
+        ElMessage.success("鍒犻櫎鎴愬姛");
+	}
+    loadingWmsConfigPrint.value = false;
+    handleQueryWmsConfigPrint();
+  })
+  .catch(() => {});
+  };
+
+  // 鏀瑰彉鎵撳嵃閰嶇疆琛ㄩ〉闈㈠閲�
+  const handleSizeChangeWmsConfigPrint = (val: number) => {
+    tableParamsWmsConfigPrint.value.pageSize = val;
+    handleQueryWmsConfigPrint();
+  };
+
+  // 鏀瑰彉鎵撳嵃閰嶇疆琛ㄩ〉鐮佸簭鍙�
+  const handleCurrentChangeWmsConfigPrint = (val: number) => {
+    tableParamsWmsConfigPrint.value.page = val;
+    handleQueryWmsConfigPrint();
+  };
+
+/***************************************************[鎵撳嵃閰嶇疆琛ㄦ搷浣淽缁撴潫***************************************************/
+/***************************************************[鎵撳嵃閰嶇疆琛ㄥ鍑篯寮�濮�***************************************************/
+//瀹氫箟褰撳墠椤甸潰鐨勬柟娉曠粍
+const functionMapWmsConfigPrint = {
+      getEnumPrintClassifyData_Index,
+      formatDate_T_Date,
+      formatDate_T_Time
+};
+//鐐瑰嚮瀵煎嚭鎸夐挳
+const handleExportExcelWmsConfigPrint = async (formData:Blob) => {
+    loadingWmsConfigPrint.value = true;
+    disabled_btnWmsConfigPrint.value = true;
+    var new_tableParamsWmsConfigPrint=JSON.parse(JSON.stringify(tableParamsWmsConfigPrint.value));
+    new_tableParamsWmsConfigPrint.page = 1;
+    new_tableParamsWmsConfigPrint.pageSize = 100000;
+    var res = await pageWmsConfigPrint(Object.assign(queryParamsWmsConfigPrint.value, new_tableParamsWmsConfigPrint));
+    if(res.data.type=="success"){
+      exportExcelWmsConfigPrint(res.data.result?.items ?? []);
+    }
+    loadingWmsConfigPrint.value = false;
+    disabled_btnWmsConfigPrint.value = false;
+};
+//瀵煎嚭
+const exportExcelWmsConfigPrint  = async (exportDataList:Array) => {
+  exportPageExcel(exportDataList, tableRefWmsConfigPrint,"鎵撳嵃閰嶇疆琛�",functionMapWmsConfigPrint);
+};
+/***************************************************[鎵撳嵃閰嶇疆琛ㄥ鍑篯缁撴潫***************************************************/
+  // 鎵撳嵃閰嶇疆琛ㄩ〉闈㈠姞杞芥椂
+  onMounted(async () => {
+    getEnumPrintClassifyData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('PrintClassifyEnum')).data.result ?? [];
+  });
+
+  handleQueryWmsConfigPrint();
+</script>
+<style scoped>
+:deep(.el-input),
+:deep(.el-select),
+:deep(.el-input-number) {
+	width: 100%;
+}
+</style>
+
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsSystemConfig/wmsConfigPrint/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsSystemConfig/wmsConfigPrint/component/editDialog.vue
index ee64fc4..20930e5 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsSystemConfig/wmsConfigPrint/component/editDialog.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsSystemConfig/wmsConfigPrint/component/editDialog.vue
@@ -23,6 +23,13 @@
 						
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="鎵撳嵃鍒嗙被鍚�" prop="printClassifyName">
+							<el-input v-model="ruleForm.printClassifyName" placeholder="璇疯緭鍏ユ墦鍗板垎绫诲悕" maxlength="50" show-word-limit clearable />
+							
+						</el-form-item>
+						
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="鎵撳嵃妯℃澘鍚�" prop="printTemplate">
 							<el-input v-model="ruleForm.printTemplate" placeholder="璇疯緭鍏ユ墦鍗版ā鏉垮悕" maxlength="255" show-word-limit clearable />
 							
@@ -37,11 +44,8 @@
 						
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="鎵撳嵃鏈哄垪琛�" prop="printerListList">
-							<el-select clearable v-model="ruleForm.printerListList" placeholder="璇烽�夋嫨鎵撳嵃鏈哄垪琛�" multiple >
-								<el-option v-for="(item,index) in dl('PrinterList')"  :key="index" :value="item.name" :label="`[${item.code}] ${item.name}`"></el-option>
-								
-							</el-select>
+						<el-form-item label="鎵撳嵃鏈哄垪琛�" prop="printerList">
+							<el-input v-model="ruleForm.printerList" placeholder="璇疯緭鍏ユ墦鍗版満鍒楄〃" maxlength="500" show-word-limit clearable />
 							
 						</el-form-item>
 						
@@ -97,9 +101,10 @@
 	//鑷娣诲姞鍏朵粬瑙勫垯
 	const rules = ref<FormRules>({
 		printClassify: [{required: true, message: '璇烽�夋嫨鎵撳嵃鍒嗙被锛�', trigger: 'change',},],
+		printClassifyName: [{required: true, message: '璇疯緭鍏ユ墦鍗板垎绫诲悕锛�', trigger: 'blur',},],
 		printTemplate: [{required: true, message: '璇疯緭鍏ユ墦鍗版ā鏉垮悕锛�', trigger: 'blur',},],
 		printTemplateAddr: [{required: true, message: '璇疯緭鍏ユ墦鍗版ā鏉垮湴鍧�锛�', trigger: 'blur',},],
-		printerList: [{required: true, message: '璇烽�夋嫨鎵撳嵃鏈哄垪琛紒', trigger: 'change',},],
+		printerList: [{required: true, message: '璇疯緭鍏ユ墦鍗版満鍒楄〃锛�', trigger: 'blur',},],
 		isDelete: [{required: true, message: '璇烽�夋嫨杞垹闄わ紒', trigger: 'change',},],
 	});
 
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsSystemConfig/wmsConfigPrint/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsSystemConfig/wmsConfigPrint/index.vue
index 9fcd5b1..fb2d9f0 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsSystemConfig/wmsConfigPrint/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsSystemConfig/wmsConfigPrint/index.vue
@@ -5,7 +5,7 @@
         <el-row>
           <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
             <el-form-item label="鍏抽敭瀛�">
-              <el-input v-model="queryParamsWmsConfigPrint.searchKey" clearable="" placeholder="鎵撳嵃妯℃澘鍚�,鎵撳嵃妯℃澘鍦板潃,鎵撳嵃鏈哄垪琛�,澶囨敞,鍒涘缓浜�,淇敼浜�"/>
+              <el-input v-model="queryParamsWmsConfigPrint.searchKey" clearable="" placeholder="鎵撳嵃鍒嗙被鍚�,鎵撳嵃妯℃澘鍚�,鎵撳嵃妯℃澘鍦板潃,鎵撳嵃鏈哄垪琛�,澶囨敞,鍒涘缓浜�,淇敼浜�"/>
               
             </el-form-item>
           </el-col>
@@ -15,6 +15,12 @@
                 <el-option v-for="(item,index) in getEnumPrintClassifyData_Index" :key="index" :value="item.value" :label="`${item.describe}`" />
                 
               </el-select>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsConfigPrint">
+            <el-form-item label="鎵撳嵃鍒嗙被鍚�">
+              <el-input v-model="queryParamsWmsConfigPrint.printClassifyName" clearable="" placeholder="璇疯緭鍏ユ墦鍗板垎绫诲悕"/>
               
             </el-form-item>
           </el-col>
@@ -30,21 +36,18 @@
               
             </el-form-item>
           </el-col>
-          <!-- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsConfigPrint">
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsConfigPrint">
             <el-form-item label="鎵撳嵃鏈哄垪琛�">
-              <el-select clearable="" v-model="queryParamsWmsConfigPrint.printerList" placeholder="璇烽�夋嫨鎵撳嵃鏈哄垪琛�">
-                <el-option v-for="(item,index) in dl('PrinterList')" :key="index" :value="item.code" :label="`[${item.code}] ${item.name}`" />
-                
-              </el-select>
+              <el-input v-model="queryParamsWmsConfigPrint.printerList" clearable="" placeholder="璇疯緭鍏ユ墦鍗版満鍒楄〃"/>
               
             </el-form-item>
-          </el-col> -->
-          <!-- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsConfigPrint">
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsConfigPrint">
             <el-form-item label="澶囨敞">
               <el-input v-model="queryParamsWmsConfigPrint.remark" clearable="" placeholder="璇疯緭鍏ュ娉�"/>
               
             </el-form-item>
-          </el-col> -->
+          </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb10">
             <el-form-item>
               <el-button-group style="display: flex; align-items: center;">
@@ -74,22 +77,18 @@
         <el-table-column type="index" label="搴忓彿" width="55" align="center"/>
           <el-table-column prop="printClassify" label="鎵撳嵃鍒嗙被"  show-overflow-tooltip="" >
             <template #default="scope">
-              {{ getEnumDesc(scope.row.printClassify, getEnumPrintClassifyData_Index)}}
+              <el-tag>{{ getEnumDesc(scope.row.printClassify, getEnumPrintClassifyData_Index)}}</el-tag>
             </template>
           </el-table-column>
+        <el-table-column prop="printClassifyName" label="鎵撳嵃鍒嗙被鍚�"  show-overflow-tooltip="" />
         <el-table-column prop="printTemplate" label="鎵撳嵃妯℃澘鍚�"  show-overflow-tooltip="" />
         <el-table-column prop="printTemplateAddr" label="鎵撳嵃妯℃澘鍦板潃"  show-overflow-tooltip="" />
         <el-table-column prop="printerList" label="鎵撳嵃鏈哄垪琛�"  show-overflow-tooltip="" />
-        <!-- <el-table-column prop="printerList" label="鎵撳嵃鏈哄垪琛�"  show-overflow-tooltip="" >
-            <template #default="scope">
-              <el-tag :type="diValue('PrinterList', scope.row.printerList)?.tagType"> {{diValue("PrinterList", scope.row.printerList)?.name}} </el-tag>
-            </template>
-          </el-table-column> -->
         <el-table-column prop="remark" label="澶囨敞"  show-overflow-tooltip="" />
-        <el-table-column prop="createUserName" label="鍒涘缓浜�"  show-overflow-tooltip="" />
          <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
-        <el-table-column prop="updateUserName" label="淇敼浜�"  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 label="鎿嶄綔" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('wmsConfigPrint:update') || auth('wmsConfigPrint:delete')">
           <template #default="scope">
             <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditWmsConfigPrint(scope.row)" v-auth="'wmsConfigPrint:update'"> 缂栬緫 </el-button>
@@ -125,7 +124,7 @@
   import { ref,onMounted } from "vue";
   import { ElMessageBox, ElMessage } from "element-plus";
   import { auth } from '/@/utils/authFunction';
-  import { getDictDataItemByValue as diValue, getDictDataList as dl } from '/@/utils/dict-utils';
+  import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
   import { formatDate,formatDate_T_Date,formatDate_T_Time,defaultTimeRange } from '/@/utils/formatTime';
   import { exportPageExcel } from '/@/utils/exportPageExcel' //寮曞叆瀵煎嚭鏂规硶
 
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/wmsConfigPrint/wmsConfigPrint/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/wmsConfigPrint/wmsConfigPrint/component/editDialog.vue
new file mode 100644
index 0000000..19428d0
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/wmsConfigPrint/wmsConfigPrint/component/editDialog.vue
@@ -0,0 +1,187 @@
+锘�<template>
+	<div class="wmsConfigPrint-container">
+		<el-dialog v-model="isShowDialog" :width="800" draggable="" :close-on-click-modal="false">
+			<template #header>
+				<div style="color: #fff">
+					<!--<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>-->
+					<span>{{ props.title }}</span>
+				</div>
+			</template>
+			<el-form :model="ruleForm" ref="ruleFormRef" label-width="auto" :rules="rules" v-loading="loading">
+				<el-row :gutter="35">
+					<el-form-item v-show="false">
+						<el-input v-model="ruleForm.id" />
+					</el-form-item>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="鎵撳嵃鍒嗙被" prop="printClassify">
+							<el-select clearable v-model="ruleForm.printClassify" placeholder="璇烽�夋嫨鎵撳嵃鍒嗙被">
+								<el-option v-for="(item,index) in  getEnumPrintClassifyData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
+								
+							</el-select>
+							
+						</el-form-item>
+						
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="鎵撳嵃鍒嗙被鍚�" prop="printClassifyName">
+							<el-input v-model="ruleForm.printClassifyName" placeholder="璇疯緭鍏ユ墦鍗板垎绫诲悕" maxlength="50" show-word-limit clearable />
+							
+						</el-form-item>
+						
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="鎵撳嵃妯℃澘鍚�" prop="printTemplate">
+							<el-input v-model="ruleForm.printTemplate" placeholder="璇疯緭鍏ユ墦鍗版ā鏉垮悕" maxlength="255" show-word-limit clearable />
+							
+						</el-form-item>
+						
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="鎵撳嵃妯℃澘鍦板潃" prop="printTemplateAddr">
+							<el-input v-model="ruleForm.printTemplateAddr" placeholder="璇疯緭鍏ユ墦鍗版ā鏉垮湴鍧�" maxlength="255" show-word-limit clearable />
+							
+						</el-form-item>
+						
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="鎵撳嵃鏈哄垪琛�" prop="printerList">
+							<el-input v-model="ruleForm.printerList" placeholder="璇疯緭鍏ユ墦鍗版満鍒楄〃" maxlength="500" show-word-limit clearable />
+							
+						</el-form-item>
+						
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="澶囨敞" prop="remark">
+							<el-input v-model="ruleForm.remark" placeholder="璇疯緭鍏ュ娉�" maxlength="255" show-word-limit clearable />
+							
+						</el-form-item>
+						
+					</el-col>
+				</el-row>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="cancel">鍙� 娑�</el-button>
+					<el-button type="primary" @click="submit" :disabled="disabled_btn">纭� 瀹�</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+<style scoped>
+:deep(.el-select),
+:deep(.el-input-number) {
+	width: 100%;
+}
+</style>
+<script lang="ts" setup>
+	import { ref,onMounted } from "vue";
+	import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
+	import { ElMessage } from "element-plus";
+	import type { FormRules } from "element-plus";
+	import { addWmsConfigPrint, updateWmsConfigPrint, detailWmsConfigPrint } from "/@/api/main/wmsConfigPrint/wmsConfigPrint";
+	import { getAPI } from '/@/utils/axios-utils';
+	import { SysEnumApi } from '/@/api-services/api';
+
+	const getEnumPrintClassifyData = ref<any>([]);
+	//鐖剁骇浼犻�掓潵鐨勫弬鏁�
+	var props = defineProps({
+		title: {
+		type: String,
+		default: "",
+	},
+	});
+	//鐖剁骇浼犻�掓潵鐨勫嚱鏁帮紝鐢ㄤ簬鍥炶皟
+	const emit = defineEmits(["reloadTable"]);
+	const ruleFormRef = ref();
+	const isShowDialog = ref(false);
+	const loading = ref(false);
+	const disabled_btn = ref(false);
+	const ruleForm = ref<any>({});
+	//鑷娣诲姞鍏朵粬瑙勫垯
+	const rules = ref<FormRules>({
+		printClassify: [{required: true, message: '璇烽�夋嫨鎵撳嵃鍒嗙被锛�', trigger: 'change',},],
+		printClassifyName: [{required: true, message: '璇疯緭鍏ユ墦鍗板垎绫诲悕锛�', trigger: 'blur',},],
+		printTemplate: [{required: true, message: '璇疯緭鍏ユ墦鍗版ā鏉垮悕锛�', trigger: 'blur',},],
+		printTemplateAddr: [{required: true, message: '璇疯緭鍏ユ墦鍗版ā鏉垮湴鍧�锛�', trigger: 'blur',},],
+		printerList: [{required: true, message: '璇疯緭鍏ユ墦鍗版満鍒楄〃锛�', trigger: 'blur',},],
+		isDelete: [{required: true, message: '璇烽�夋嫨杞垹闄わ紒', trigger: 'change',},],
+	});
+
+	/*
+	 * 鎵撳紑寮圭獥
+	 * @param flag 鏍囪锛�1鏂板 2缂栬緫 3鏌ョ湅锛�
+	 * @param row  琛屾暟鎹�
+	 */
+	const openDialog = async (flag: number,row: any) => {
+		// ruleForm.value = JSON.parse(JSON.stringify(row));
+		// 鏀圭敤detail鑾峰彇鏈�鏂版暟鎹潵缂栬緫
+		let rowData = JSON.parse(JSON.stringify(row));
+		if (rowData.id)
+			ruleForm.value = (await detailWmsConfigPrint(rowData.id)).data.result;
+		else {
+		    ruleForm.value = rowData;
+		}
+		isShowDialog.value = true;
+	};
+
+	// 鍏抽棴寮圭獥
+	const closeDialog = () => {
+		emit("reloadTable");
+		isShowDialog.value = false;
+	};
+
+	// 鍙栨秷
+	const cancel = () => {
+		isShowDialog.value = false;
+	};
+
+	// 鎻愪氦
+	const submit = async () => {
+	    disabled_btn.value = true;
+		ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => {
+			if (isValid) {
+			    loading.value = true;
+				let values = ruleForm.value;
+				let ret={};
+				let title='鏂板';
+				if (ruleForm.value.id == undefined || ruleForm.value.id == null || ruleForm.value.id == "" || ruleForm.value.id == 0) {
+					ret = await addWmsConfigPrint(values);
+				} else {
+					title='缂栬緫';
+					ret = await updateWmsConfigPrint(values);
+				}
+				loading.value = false;
+				disabled_btn.value = false;
+				if(ret.data.type=="success"){
+					ElMessage.success(title+'鎴愬姛');
+					closeDialog();
+				}
+			} else {
+			    disabled_btn.value = false;
+				ElMessage({
+					message: `琛ㄥ崟鏈�${Object.keys(fields).length}澶勯獙璇佸け璐ワ紝璇蜂慨鏀瑰悗鍐嶆彁浜,
+					type: "error",
+				});
+			}
+		});
+	};
+
+	
+
+
+
+
+
+	// 椤甸潰鍔犺浇鏃�
+	onMounted(async () => {
+			getEnumPrintClassifyData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('PrintClassifyEnum')).data.result ?? [];
+	});
+
+	//灏嗗睘鎬ф垨鑰呭嚱鏁版毚闇茬粰鐖剁粍浠�
+	defineExpose({ openDialog });
+</script>
+
+
+
+
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/wmsConfigPrint/wmsConfigPrint/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/wmsConfigPrint/wmsConfigPrint/index.vue
new file mode 100644
index 0000000..e3a67a7
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/wmsConfigPrint/wmsConfigPrint/index.vue
@@ -0,0 +1,280 @@
+锘�<template>
+  <div class="wmsConfigPrint-container">
+    <el-card shadow="hover" :body-style="{ paddingBottom: '0' }"> 
+      <el-form :model="queryParamsWmsConfigPrint" ref="queryForm" labelWidth="90">
+        <el-row>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
+            <el-form-item label="鍏抽敭瀛�">
+              <el-input v-model="queryParamsWmsConfigPrint.searchKey" clearable="" placeholder="鎵撳嵃鍒嗙被鍚�,鎵撳嵃妯℃澘鍚�,鎵撳嵃妯℃澘鍦板潃,鎵撳嵃鏈哄垪琛�,澶囨敞,鍒涘缓浜�,淇敼浜�"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsConfigPrint">
+            <el-form-item label="鎵撳嵃鍒嗙被">
+              <el-select clearable="" v-model="queryParamsWmsConfigPrint.printClassify" placeholder="璇烽�夋嫨鎵撳嵃鍒嗙被">
+                <el-option v-for="(item,index) in getEnumPrintClassifyData_Index" :key="index" :value="item.value" :label="`${item.describe}`" />
+                
+              </el-select>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsConfigPrint">
+            <el-form-item label="鎵撳嵃鍒嗙被鍚�">
+              <el-input v-model="queryParamsWmsConfigPrint.printClassifyName" clearable="" placeholder="璇疯緭鍏ユ墦鍗板垎绫诲悕"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsConfigPrint">
+            <el-form-item label="鎵撳嵃妯℃澘鍚�">
+              <el-input v-model="queryParamsWmsConfigPrint.printTemplate" clearable="" placeholder="璇疯緭鍏ユ墦鍗版ā鏉垮悕"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsConfigPrint">
+            <el-form-item label="鎵撳嵃妯℃澘鍦板潃">
+              <el-input v-model="queryParamsWmsConfigPrint.printTemplateAddr" clearable="" placeholder="璇疯緭鍏ユ墦鍗版ā鏉垮湴鍧�"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsConfigPrint">
+            <el-form-item label="鎵撳嵃鏈哄垪琛�">
+              <el-input v-model="queryParamsWmsConfigPrint.printerList" clearable="" placeholder="璇疯緭鍏ユ墦鍗版満鍒楄〃"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsConfigPrint">
+            <el-form-item label="澶囨敞">
+              <el-input v-model="queryParamsWmsConfigPrint.remark" clearable="" placeholder="璇疯緭鍏ュ娉�"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb10">
+            <el-form-item>
+              <el-button-group style="display: flex; align-items: center;">
+                <el-button type="primary"  icon="ele-Search" @click="handleQueryWmsConfigPrint" v-auth="'wmsConfigPrint:page'" :disabled="disabled_btnWmsConfigPrint"> 鏌ヨ </el-button>
+                      <el-button icon="ele-Refresh" @click="resetWmsConfigPrint"> 閲嶇疆 </el-button>
+                        <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUIWmsConfigPrint" v-if="!showAdvanceQueryUIWmsConfigPrint" style="margin-left:5px;"> 楂樼骇鏌ヨ </el-button>
+                        <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUIWmsConfigPrint" v-if="showAdvanceQueryUIWmsConfigPrint" style="margin-left:5px;"> 闅愯棌 </el-button>
+                <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddWmsConfigPrint" v-auth="'wmsConfigPrint:add'"> 鏂板 </el-button>
+                <el-button type="primary" style="margin-left:5px;" icon="ele-Download" @click="handleExportExcelWmsConfigPrint"  v-auth="'wmsConfigPrint:exportExcel'" > 瀵煎嚭 </el-button>
+              </el-button-group>
+            </el-form-item>
+            
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+    <el-card class="full-table" shadow="hover" style="margin-top: 5px">
+      <el-table
+                ref="tableRefWmsConfigPrint"
+				:data="tableDataWmsConfigPrint"
+				style="width: 100%"
+				v-loading="loadingWmsConfigPrint"
+				tooltip-effect="light"
+                				row-key="id"
+                @sort-change="sortChangeWmsConfigPrint"
+				border="">
+        <el-table-column type="index" label="搴忓彿" width="55" align="center"/>
+          <el-table-column prop="printClassify" label="鎵撳嵃鍒嗙被"  show-overflow-tooltip="" >
+            <template #default="scope">
+              <el-tag>{{ getEnumDesc(scope.row.printClassify, getEnumPrintClassifyData_Index)}}</el-tag>
+            </template>
+          </el-table-column>
+        <el-table-column prop="printClassifyName" label="鎵撳嵃鍒嗙被鍚�"  show-overflow-tooltip="" />
+        <el-table-column prop="printTemplate" label="鎵撳嵃妯℃澘鍚�"  show-overflow-tooltip="" />
+        <el-table-column prop="printTemplateAddr" label="鎵撳嵃妯℃澘鍦板潃"  show-overflow-tooltip="" />
+        <el-table-column prop="printerList" label="鎵撳嵃鏈哄垪琛�"  show-overflow-tooltip="" />
+        <el-table-column prop="remark" 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 label="鎿嶄綔" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('wmsConfigPrint:update') || auth('wmsConfigPrint:delete')">
+          <template #default="scope">
+            <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditWmsConfigPrint(scope.row)" v-auth="'wmsConfigPrint:update'"> 缂栬緫 </el-button>
+            <el-button icon="ele-Delete" size="small" text="" type="primary" @click="delWmsConfigPrint(scope.row)" v-auth="'wmsConfigPrint:delete'"> 鍒犻櫎 </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+				v-model:currentPage="tableParamsWmsConfigPrint.page"
+				v-model:page-size="tableParamsWmsConfigPrint.pageSize"
+				:total="tableParamsWmsConfigPrint.total"
+				:page-sizes="[10, 20, 50, 100, 200, 500]"
+				small=""
+				background=""
+				@size-change="handleSizeChangeWmsConfigPrint"
+				@current-change="handleCurrentChangeWmsConfigPrint"
+				layout="total, sizes, prev, pager, next, jumper"
+	/>
+      <printDialogWmsConfigPrint
+        ref="printDialogRefWmsConfigPrint"
+        :title="printWmsConfigPrintTitle"
+        @reloadTable="handleQueryWmsConfigPrint" />
+      <editDialogWmsConfigPrint
+        ref="editDialogRefWmsConfigPrint"
+        :title="editWmsConfigPrintTitle"
+        @reloadTable="handleQueryWmsConfigPrint"
+      />
+    </el-card>
+  </div>
+</template>
+
+<script lang="ts" setup="" name="wmsConfigPrint">
+  import { ref,onMounted } from "vue";
+  import { ElMessageBox, ElMessage } from "element-plus";
+  import { auth } from '/@/utils/authFunction';
+  import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
+  import { formatDate,formatDate_T_Date,formatDate_T_Time,defaultTimeRange } from '/@/utils/formatTime';
+  import { exportPageExcel } from '/@/utils/exportPageExcel' //寮曞叆瀵煎嚭鏂规硶
+
+
+  import printDialogWmsConfigPrint from '/@/views/system/print/component/hiprint/preview.vue'
+  import editDialogWmsConfigPrint from '/@/views/main/wmsConfigPrint/wmsConfigPrint/component/editDialog.vue'
+  import { pageWmsConfigPrint, deleteWmsConfigPrint,importExcelWmsConfigPrint,downloadExcelTemplateWmsConfigPrint } from '/@/api/main/wmsConfigPrint/wmsConfigPrint';
+	import { getAPI } from '/@/utils/axios-utils';
+	import { SysEnumApi } from '/@/api-services/api';
+  import commonFunction from '/@/utils/commonFunction';
+
+  const getEnumPrintClassifyData_Index = ref<any>([]);
+
+	const { getEnumDesc } = commonFunction();
+  
+  /***************************************************[鎵撳嵃閰嶇疆琛ㄦ搷浣淽寮�濮�***************************************************/
+  const showAdvanceQueryUIWmsConfigPrint = ref(false);
+  const tableRefWmsConfigPrint = ref(null);
+  const printDialogRefWmsConfigPrint = ref();
+  const editDialogRefWmsConfigPrint = ref();
+  const loadingWmsConfigPrint = ref(false);
+  const disabled_btnWmsConfigPrint = ref(false);
+  const tableDataWmsConfigPrint = ref<any>([]);
+  const queryParamsWmsConfigPrint = ref<any>({});
+  const tableParamsWmsConfigPrint = ref({
+    page: 1,
+    pageSize: 10,
+    total: 0,
+  });
+
+  const printWmsConfigPrintTitle = ref("");
+  const editWmsConfigPrintTitle = ref("");
+
+  // 鏀瑰彉楂樼骇鏌ヨ鐨勬帶浠舵樉绀虹姸鎬�
+  const changeAdvanceQueryUIWmsConfigPrint = () => {
+    showAdvanceQueryUIWmsConfigPrint.value = !showAdvanceQueryUIWmsConfigPrint.value;
+  }
+
+  // 鏌ヨ鎵撳嵃閰嶇疆琛�
+  const handleQueryWmsConfigPrint = async () => {
+    loadingWmsConfigPrint.value = true;
+    disabled_btnWmsConfigPrint.value = true;
+    var res = await pageWmsConfigPrint(Object.assign(queryParamsWmsConfigPrint.value, tableParamsWmsConfigPrint.value));
+    if(res.data.type=="success"){
+      tableDataWmsConfigPrint.value = res.data.result?.items ?? [];
+      tableParamsWmsConfigPrint.value.total = res.data.result?.total;
+    }
+    loadingWmsConfigPrint.value = false;
+    disabled_btnWmsConfigPrint.value = false;
+  };
+
+  // 閲嶇疆鎵撳嵃閰嶇疆琛ㄦ煡璇�
+  const resetWmsConfigPrint = async () => {
+    queryParamsWmsConfigPrint.value = {}
+  };
+
+  // 鎵撳嵃閰嶇疆琛ㄥ垪鎺掑簭
+  const sortChangeWmsConfigPrint = async (column: any) => {
+	queryParamsWmsConfigPrint.value.field = column.prop;
+	queryParamsWmsConfigPrint.value.order = column.order;
+	await handleQueryWmsConfigPrint();
+  };
+
+  // 鎵撳紑鏂板鎵撳嵃閰嶇疆琛ㄩ〉闈�
+  const openAddWmsConfigPrint = () => {
+    editWmsConfigPrintTitle.value = '娣诲姞鎵撳嵃閰嶇疆琛�';
+    editDialogRefWmsConfigPrint.value.openDialog(1,{});
+  };
+
+  // 鎵撳紑鎵撳嵃鎵撳嵃閰嶇疆琛ㄩ〉闈�
+  const openPrintWmsConfigPrint = async (row: any) => {
+    printWmsConfigPrintTitle.value = '鎵撳嵃鎵撳嵃閰嶇疆琛�';
+  }
+  
+  // 鎵撳紑缂栬緫鎵撳嵃閰嶇疆琛ㄩ〉闈�
+  const openEditWmsConfigPrint = (row: any) => {
+    editWmsConfigPrintTitle.value = '缂栬緫鎵撳嵃閰嶇疆琛�';
+    editDialogRefWmsConfigPrint.value.openDialog(2,row);
+  };
+
+  // 鍒犻櫎鎵撳嵃閰嶇疆琛�
+  const delWmsConfigPrint = (row: any) => {
+    ElMessageBox.confirm(`纭畾瑕佸垹闄ゅ悧?`, "鎻愮ず", {
+    confirmButtonText: "纭畾",
+    cancelButtonText: "鍙栨秷",
+    type: "warning",
+  })
+  .then(async () => {
+    loadingWmsConfigPrint.value = true;
+    var ret = await deleteWmsConfigPrint(row);
+    if(ret.data.type=="success"){
+        ElMessage.success("鍒犻櫎鎴愬姛");
+	}
+    loadingWmsConfigPrint.value = false;
+    handleQueryWmsConfigPrint();
+  })
+  .catch(() => {});
+  };
+
+  // 鏀瑰彉鎵撳嵃閰嶇疆琛ㄩ〉闈㈠閲�
+  const handleSizeChangeWmsConfigPrint = (val: number) => {
+    tableParamsWmsConfigPrint.value.pageSize = val;
+    handleQueryWmsConfigPrint();
+  };
+
+  // 鏀瑰彉鎵撳嵃閰嶇疆琛ㄩ〉鐮佸簭鍙�
+  const handleCurrentChangeWmsConfigPrint = (val: number) => {
+    tableParamsWmsConfigPrint.value.page = val;
+    handleQueryWmsConfigPrint();
+  };
+
+/***************************************************[鎵撳嵃閰嶇疆琛ㄦ搷浣淽缁撴潫***************************************************/
+/***************************************************[鎵撳嵃閰嶇疆琛ㄥ鍑篯寮�濮�***************************************************/
+//瀹氫箟褰撳墠椤甸潰鐨勬柟娉曠粍
+const functionMapWmsConfigPrint = {
+      getEnumPrintClassifyData_Index,
+      formatDate_T_Date,
+      formatDate_T_Time
+};
+//鐐瑰嚮瀵煎嚭鎸夐挳
+const handleExportExcelWmsConfigPrint = async (formData:Blob) => {
+    loadingWmsConfigPrint.value = true;
+    disabled_btnWmsConfigPrint.value = true;
+    var new_tableParamsWmsConfigPrint=JSON.parse(JSON.stringify(tableParamsWmsConfigPrint.value));
+    new_tableParamsWmsConfigPrint.page = 1;
+    new_tableParamsWmsConfigPrint.pageSize = 100000;
+    var res = await pageWmsConfigPrint(Object.assign(queryParamsWmsConfigPrint.value, new_tableParamsWmsConfigPrint));
+    if(res.data.type=="success"){
+      exportExcelWmsConfigPrint(res.data.result?.items ?? []);
+    }
+    loadingWmsConfigPrint.value = false;
+    disabled_btnWmsConfigPrint.value = false;
+};
+//瀵煎嚭
+const exportExcelWmsConfigPrint  = async (exportDataList:Array) => {
+  exportPageExcel(exportDataList, tableRefWmsConfigPrint,"鎵撳嵃閰嶇疆琛�",functionMapWmsConfigPrint);
+};
+/***************************************************[鎵撳嵃閰嶇疆琛ㄥ鍑篯缁撴潫***************************************************/
+  // 鎵撳嵃閰嶇疆琛ㄩ〉闈㈠姞杞芥椂
+  onMounted(async () => {
+    getEnumPrintClassifyData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('PrintClassifyEnum')).data.result ?? [];
+  });
+
+  handleQueryWmsConfigPrint();
+</script>
+<style scoped>
+:deep(.el-input),
+:deep(.el-select),
+:deep(.el-input-number) {
+	width: 100%;
+}
+</style>
+
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs
index 3345b4b..9655a48 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs
@@ -62,4 +62,7 @@
     public const string WmsStockSnapshotDetailsGroupName = "搴撳瓨蹇収绠$悊";
 
 
+
+
+
 }
\ No newline at end of file
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/Dto/WmsConfigPrintInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/Dto/WmsConfigPrintInput.cs
index ec7bdd9..db0223f 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/Dto/WmsConfigPrintInput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/Dto/WmsConfigPrintInput.cs
@@ -31,7 +31,7 @@
         /// <summary>
         /// 鎵撳嵃鏈哄垪琛�
         /// </summary>
-        public virtual List<string> PrinterListList { get; set; }
+        public virtual string PrinterList { get; set; }
         
         /// <summary>
         /// 澶囨敞
@@ -39,19 +39,9 @@
         public virtual string Remark { get; set; }
         
         /// <summary>
-        /// 鍒涘缓浜�
-        /// </summary>
-        public virtual string CreateUserName { get; set; }
-        
-        /// <summary>
         /// 鍒涘缓鏃堕棿
         /// </summary>
         public virtual DateTime? CreateTime { get; set; }
-        
-        /// <summary>
-        /// 淇敼浜�
-        /// </summary>
-        public virtual string UpdateUserName { get; set; }
         
         /// <summary>
         /// 淇敼鏃堕棿
@@ -64,9 +54,19 @@
         public virtual long? CreateUserId { get; set; }
         
         /// <summary>
+        /// 鍒涘缓浜�
+        /// </summary>
+        public virtual string CreateUserName { get; set; }
+        
+        /// <summary>
         /// 淇敼浜篒d
         /// </summary>
         public virtual long? UpdateUserId { get; set; }
+        
+        /// <summary>
+        /// 淇敼浜�
+        /// </summary>
+        public virtual string UpdateUserName { get; set; }
         
         /// <summary>
         /// 杞垹闄�
@@ -128,6 +128,11 @@
         [Required(ErrorMessage = "鎵撳嵃鍒嗙被涓嶈兘涓虹┖")]
         public override Admin.NET.Application.PrintClassifyEnum PrintClassify { get; set; }
         
+        /// <summary>
+        /// 鎵撳嵃鍒嗙被鍚�
+        /// </summary>
+        [Required(ErrorMessage = "鎵撳嵃鍒嗙被鍚嶄笉鑳戒负绌�")]
+        public override string PrintClassifyName { get; set; }
         
         /// <summary>
         /// 鎵撳嵃妯℃澘鍚�
@@ -145,7 +150,7 @@
         /// 鎵撳嵃鏈哄垪琛�
         /// </summary>
         [Required(ErrorMessage = "鎵撳嵃鏈哄垪琛ㄤ笉鑳戒负绌�")]
-        public override List<string> PrinterListList { get; set; }
+        public override string PrinterList { get; set; }
         
         /// <summary>
         /// 杞垹闄�
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/Dto/WmsConfigPrintOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/Dto/WmsConfigPrintOutput.cs
index e7a274c..180637c 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/Dto/WmsConfigPrintOutput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/Dto/WmsConfigPrintOutput.cs
@@ -34,31 +34,16 @@
     /// 鎵撳嵃鏈哄垪琛�
     /// </summary>
     public string PrinterList { get; set; }
-
-    /// <summary>
-    /// 鎵撳嵃鏈哄垪琛�
-    /// </summary>
-    public List<string> PrinterListList { get; set; }
-
+    
     /// <summary>
     /// 澶囨敞
     /// </summary>
     public string Remark { get; set; }
     
     /// <summary>
-    /// 鍒涘缓浜�
-    /// </summary>
-    public string CreateUserName { get; set; }
-    
-    /// <summary>
     /// 鍒涘缓鏃堕棿
     /// </summary>
     public DateTime? CreateTime { get; set; }
-    
-    /// <summary>
-    /// 淇敼浜�
-    /// </summary>
-    public string UpdateUserName { get; set; }
     
     /// <summary>
     /// 淇敼鏃堕棿
@@ -71,11 +56,21 @@
     public long? CreateUserId { get; set; }
     
     /// <summary>
+    /// 鍒涘缓浜�
+    /// </summary>
+    public string CreateUserName { get; set; }
+    
+    /// <summary>
     /// 淇敼浜篒d
     /// </summary>
     public long? UpdateUserId { get; set; }
     
     /// <summary>
+    /// 淇敼浜�
+    /// </summary>
+    public string UpdateUserName { get; set; }
+    
+    /// <summary>
     /// 杞垹闄�
     /// </summary>
     public bool IsDelete { get; set; }
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/WmsConfigPrintService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/WmsConfigPrintService.cs
index 7f060eb..cc600a3 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/WmsConfigPrintService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/WmsConfigPrintService.cs
@@ -4,8 +4,6 @@
 using System.Data;
 using System.Web;
 using System.Text;
-using NPOI.OpenXmlFormats.Dml;
-
 namespace Admin.NET.Application;
 /// <summary>
 /// 鎵撳嵃閰嶇疆琛ㄦ湇鍔�
@@ -30,16 +28,7 @@
     public async Task<SqlSugarPagedList<WmsConfigPrintOutput>> Page(WmsConfigPrintInput input)
     {
         var query = CommonPageFilter(input);
-        var list = await query.OrderBuilder(input, "", "Id").ToPagedListAsync(input.Page, input.PageSize);
-        foreach (var item in list.Items)
-        {
-            //鍗曠嫭澶勭悊鎸夐挳 銆怑ditby shaocx,2024-05-27銆�
-            if (!string.IsNullOrEmpty(item.PrinterList))
-            {
-                item.PrinterListList = item.PrinterList.Split(",").ToList();
-            }
-        }
-        return list;
+        return await query.OrderBuilder(input, "", "Id").ToPagedListAsync(input.Page, input.PageSize);
     }
 
     /// <summary>
@@ -53,16 +42,7 @@
     public async Task<List<WmsConfigPrintOutput>> List([FromQuery] WmsConfigPrintInput input)
     {
         var query = CommonPageFilter(input);
-        var list = await query.OrderBuilder(input, "", "Id").Select<WmsConfigPrintOutput>().ToListAsync();
-        foreach (var item in list)
-        {
-            //鍗曠嫭澶勭悊鎸夐挳 銆怑ditby shaocx,2024-05-27銆�
-            if (!string.IsNullOrEmpty(item.PrinterList))
-            {
-                item.PrinterListList = item.PrinterList.Split(",").ToList();
-            }
-        }
-        return list;
+        return await query.OrderBuilder(input, "", "Id").Select<WmsConfigPrintOutput>().ToListAsync();
     }
 
     /// <summary>
@@ -75,10 +55,7 @@
     [Description("WmsConfigPrint/Add")]
     public async Task<long> Add(AddWmsConfigPrintInput input)
     {
-
         var entity = input.Adapt<WmsConfigPrint>();
-        entity.PrintClassifyName = entity.PrintClassify.ToString();
-        entity.PrinterList = string.Join(",", input.PrinterListList);
 
         //閲嶅鎬ч獙璇�
         await CheckExist(entity);
@@ -113,11 +90,9 @@
     public async Task Update(UpdateWmsConfigPrintInput input)
     {
         var entity = input.Adapt<WmsConfigPrint>();
-        entity.PrintClassifyName = entity.PrintClassify.ToString();
-        entity.PrinterList = string.Join(",", input.PrinterListList);
 
         //閲嶅鎬ч獙璇�
-        await CheckExist(entity, true);
+        await CheckExist(entity,true);
 
         await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
     }
@@ -130,15 +105,9 @@
     [HttpGet]
     [ApiDescriptionSettings(Name = "Detail")]
     [Description("WmsConfigPrint/Detail")]
-    public async Task<WmsConfigPrintOutput> Detail([FromQuery] QueryByIdWmsConfigPrintInput input)
+    public async Task<WmsConfigPrint> Detail([FromQuery] QueryByIdWmsConfigPrintInput input)
     {
-        var obj= await _rep.GetFirstAsync(u => u.Id == input.Id);
-        var entity = obj.Adapt<WmsConfigPrintOutput>();
-        if (!string.IsNullOrEmpty(entity.PrinterList))
-        {
-            entity.PrinterListList = entity.PrinterList.Split(",").ToList();
-        }
-        return entity;
+        return await _rep.GetFirstAsync(u => u.Id == input.Id);
     }
 
 
@@ -172,107 +141,52 @@
             .WhereIF(!string.IsNullOrWhiteSpace(input.PrinterList), u => u.PrinterList.Contains(input.PrinterList.Trim()))
             .WhereIF(!string.IsNullOrWhiteSpace(input.Remark), u => u.Remark.Contains(input.Remark.Trim()))
             .Select<WmsConfigPrintOutput>();
-
         return query;
-    }
+       }
 
-    /// <summary>
-    /// 閲嶅鎬ч獙璇�
-    /// </summary>
-    /// <param name="input">楠岃瘉瀵硅薄</param>
-    /// <param name="isEdit">鏄惁鏄紪杈�</param>
-    /// <returns></returns>
-    private async Task CheckExist(WmsConfigPrint input, bool isEdit = false)
-    {
-
-
-
-        //娌℃湁閰嶇疆缁勫悎鏍¢獙锛屼笉闇�瑕侀獙閲�
-
-
-        bool isExistForSingle_PrintTemplate = false;
-        if (!isEdit)//鏂板
+        /// <summary>
+        /// 閲嶅鎬ч獙璇�
+        /// </summary>
+        /// <param name="input">楠岃瘉瀵硅薄</param>
+        /// <param name="isEdit">鏄惁鏄紪杈�</param>
+        /// <returns></returns>
+        private async Task CheckExist( WmsConfigPrint input,bool isEdit=false)
         {
-            //鏁版嵁鏄惁鍗曠嫭瀛樺湪閲嶅-鎵撳嵃妯℃澘鍚�
-            isExistForSingle_PrintTemplate = await _rep.AsQueryable().AnyAsync(u =>
-                            u.PrintTemplate.Equals(input.PrintTemplate));
+           
+
+
+            //娌℃湁閰嶇疆缁勫悎鏍¢獙锛屼笉闇�瑕侀獙閲�
+
+           
+            //娌℃湁閰嶇疆鍗曠嫭鏍¢獙锛屼笉闇�瑕侀獙閲�
+       }
+
+       /// <summary>
+        /// 鏍规嵁缁勫悎鏍¢獙鍜屽崟鐙牎楠岄獙璇佹暟鎹槸鍚﹀凡瀛樺湪-瀵煎叆鏃堕獙璇�
+        /// </summary>
+        /// <param name="inputs"></param>
+        /// <returns></returns>
+        private async Task CheckExisitForImport(List<WmsConfigPrint> inputs)
+        { 
+            if (inputs?.Count <= 0)
+            {
+                throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+            }
+            //鏍规嵁缁勫悎鏍¢獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�  
+                      
+
+
+
+
+
+
+          
+           //鏍规嵁鍗曠嫭鏍¢獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�  
+           
+           
+           
         }
-        else//缂栬緫 
-        {
-            //褰撳墠缂栬緫鏁版嵁浠ュ鏄惁鍗曠嫭瀛樺湪閲嶅-鎵撳嵃妯℃澘鍚�
-            isExistForSingle_PrintTemplate = await _rep.AsQueryable().AnyAsync(u =>
-                              u.Id != input.Id
-                              && u.PrintTemplate.Equals(input.PrintTemplate));
-        }
-        if (isExistForSingle_PrintTemplate) throw Oops.Oh($"楠岃瘉澶辫触,鎵撳嵃妯℃澘鍚峓" + input.PrintTemplate + "]宸插瓨鍦�");
-
-        bool isExistForSingle_PrintTemplateAddr = false;
-        if (!isEdit)//鏂板
-        {
-            //鏁版嵁鏄惁鍗曠嫭瀛樺湪閲嶅-鎵撳嵃妯℃澘鍦板潃
-            isExistForSingle_PrintTemplateAddr = await _rep.AsQueryable().AnyAsync(u =>
-                            u.PrintTemplateAddr.Equals(input.PrintTemplateAddr));
-        }
-        else//缂栬緫 
-        {
-            //褰撳墠缂栬緫鏁版嵁浠ュ鏄惁鍗曠嫭瀛樺湪閲嶅-鎵撳嵃妯℃澘鍦板潃
-            isExistForSingle_PrintTemplateAddr = await _rep.AsQueryable().AnyAsync(u =>
-                              u.Id != input.Id
-                              && u.PrintTemplateAddr.Equals(input.PrintTemplateAddr));
-        }
-        if (isExistForSingle_PrintTemplateAddr) throw Oops.Oh($"楠岃瘉澶辫触,鎵撳嵃妯℃澘鍦板潃[" + input.PrintTemplateAddr + "]宸插瓨鍦�");
-
-    }
-
-    /// <summary>
-    /// 鏍规嵁缁勫悎鏍¢獙鍜屽崟鐙牎楠岄獙璇佹暟鎹槸鍚﹀凡瀛樺湪-瀵煎叆鏃堕獙璇�
-    /// </summary>
-    /// <param name="inputs"></param>
-    /// <returns></returns>
-    private async Task CheckExisitForImport(List<WmsConfigPrint> inputs)
-    {
-        if (inputs?.Count <= 0)
-        {
-            throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
-        }
-        //鏍规嵁缁勫悎鏍¢獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�  
-
-
-
-
-
-
-
-
-        //鏍规嵁鍗曠嫭鏍¢獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�  
-        var existExcelItemForSingle_PrintTemplate = inputs.GroupBy(g => new { g.PrintTemplate }).Where(g => g.Count() > 1).ToList();
-        if (existExcelItemForSingle_PrintTemplate != null && existExcelItemForSingle_PrintTemplate.Count > 0)
-        {
-            var item = existExcelItemForSingle_PrintTemplate.First().ToList().First();
-            throw Oops.Oh($"楠岃瘉澶辫触,瀵煎叆鐨勮〃鏍间腑,鎵撳嵃妯℃澘鍚峓" + item.PrintTemplate + "]宸查噸澶嶅瓨鍦�");
-        }
-        var existExcelItemForSingle_PrintTemplateAddr = inputs.GroupBy(g => new { g.PrintTemplateAddr }).Where(g => g.Count() > 1).ToList();
-        if (existExcelItemForSingle_PrintTemplateAddr != null && existExcelItemForSingle_PrintTemplateAddr.Count > 0)
-        {
-            var item = existExcelItemForSingle_PrintTemplateAddr.First().ToList().First();
-            throw Oops.Oh($"楠岃瘉澶辫触,瀵煎叆鐨勮〃鏍间腑,鎵撳嵃妯℃澘鍦板潃[" + item.PrintTemplateAddr + "]宸查噸澶嶅瓨鍦�");
-        }
-
-        //鏍规嵁鍗曠嫭鏍¢獙楠岃瘉鏁版嵁搴撲腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
-        var existDBItemList = await _rep.GetListAsync(w =>
-                    inputs.Select(s => s.PrintTemplate).ToList().Contains(w.PrintTemplate) ||
-                    inputs.Select(s => s.PrintTemplateAddr).ToList().Contains(w.PrintTemplateAddr)
-   );
-        var db_ForSingle_PrintTemplate = existDBItemList.FirstOrDefault(g => inputs.Select(s => s.PrintTemplate).ToList().Contains(g.PrintTemplate));
-        if (db_ForSingle_PrintTemplate != null) throw Oops.Oh($"楠岃瘉澶辫触,绯荤粺涓�,鎵撳嵃妯℃澘鍚峓" + db_ForSingle_PrintTemplate.PrintTemplate + "]宸查噸澶嶅瓨鍦�");
-
-        var db_ForSingle_PrintTemplateAddr = existDBItemList.FirstOrDefault(g => inputs.Select(s => s.PrintTemplateAddr).ToList().Contains(g.PrintTemplateAddr));
-        if (db_ForSingle_PrintTemplateAddr != null) throw Oops.Oh($"楠岃瘉澶辫触,绯荤粺涓�,鎵撳嵃妯℃澘鍦板潃[" + db_ForSingle_PrintTemplateAddr.PrintTemplateAddr + "]宸查噸澶嶅瓨鍦�");
-
-
-
-    }
-    #endregion
+     #endregion
 
 }
 

--
Gitblit v1.9.3