From aa00074986140e57be1f56272311e84abd8566ac Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周六, 30 11月 2024 17:04:28 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Package_Gather/index.vue | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Package_Gather/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Package_Gather/index.vue
index 5a15001..37fdd0b 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Package_Gather/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Package_Gather/index.vue
@@ -52,6 +52,15 @@
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
+ <el-form-item label="鏄惁榻愬寘">
+ <el-select clearable="" v-model="queryParamsMes_Package_Gather.isQiBao" placeholder="璇烽�夋嫨鏄惁榻愬寘">
+ <el-option v-for="(item,index) in getEnumIsQiBaoData_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="showAdvanceQueryUIMes_Package_Gather">
<el-form-item label="绾哥闀�">
<el-input v-model="queryParamsMes_Package_Gather.info1" clearable="" placeholder="璇疯緭鍏ョ焊绠遍暱"/>
@@ -117,6 +126,15 @@
</el-form-item>
</el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
+ <el-form-item label="鏍囪">
+ <el-select clearable="" v-model="queryParamsMes_Package_Gather.upiFlag" placeholder="璇烽�夋嫨鏍囪">
+ <el-option v-for="(item,index) in getEnumUpiFlagData_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="6" :xl="6" class="mb10">
<el-form-item>
<el-button-group style="display: flex; align-items: center;">
@@ -158,6 +176,14 @@
<el-tag>{{ getEnumDesc(scope.row.upiStatus, getEnumUpiStatusData_Index)}}</el-tag>
</template>
</el-table-column>
+ <el-table-column prop="isQiBao" label="鏄惁榻愬寘" show-overflow-tooltip="">
+ <template #default="scope">
+ <el-tag v-if="scope.row.isQiBao"> 鏄� </el-tag>
+ <el-tag type="danger" v-else> 鍚� </el-tag>
+
+ </template>
+
+ </el-table-column>
<el-table-column prop="info1" label="绾哥闀�" show-overflow-tooltip="" />
<el-table-column prop="info2" label="绾哥瀹�" show-overflow-tooltip="" />
<el-table-column prop="info3" label="绾哥楂�" show-overflow-tooltip="" />
@@ -173,6 +199,11 @@
<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="upiFlag" label="鏍囪" show-overflow-tooltip="" >
+ <template #default="scope">
+ <el-tag>{{ getEnumDesc(scope.row.upiFlag, getEnumUpiFlagData_Index)}}</el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('mes_Package_Gather:update') || auth('mes_Package_Gather:delete')">
<template #default="scope">
<el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditMes_Package_Gather(scope.row)" v-auth="'mes_Package_Gather:update'"> 缂栬緫 </el-button>
@@ -222,6 +253,8 @@
const getEnumAreaCodeData_Index = ref<any>([]);
const getEnumUpiStatusData_Index = ref<any>([]);
+ const getEnumIsQiBaoData_Index = ref<any>([]);
+ const getEnumUpiFlagData_Index = ref<any>([]);
const { getEnumDesc } = commonFunction();
@@ -327,6 +360,8 @@
const functionMapMes_Package_Gather = {
getEnumAreaCodeData_Index,
getEnumUpiStatusData_Index,
+ getEnumIsQiBaoData_Index,
+ getEnumUpiFlagData_Index,
formatDate_T_Date,
formatDate_T_Time
};
@@ -353,6 +388,8 @@
onMounted(async () => {
getEnumAreaCodeData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('AreaCodeEnum')).data.result ?? [];
getEnumUpiStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiStatusEnum')).data.result ?? [];
+ getEnumIsQiBaoData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('TrueFalseEnum')).data.result ?? [];
+ getEnumUpiFlagData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiFlagEnum')).data.result ?? [];
});
handleQueryMes_Package_Gather();
--
Gitblit v1.9.3