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_Web/src/views/main/WmsSystemConfig/wmsConfigPrint/index.vue | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
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' //寮曞叆瀵煎嚭鏂规硶
--
Gitblit v1.9.3