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_Order_Gather/index.vue | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/index.vue
index 3824935..66c4ede 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/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="queryParamsMes_Order_Gather.searchKey" clearable="" placeholder="鐢熶骇鍗曞彿,鎵规鍙�,璁㈠崟鍙�,鍒涘缓浜�,淇敼浜�"/>
+ <el-input v-model="queryParamsMes_Order_Gather.searchKey" clearable="" placeholder="鐢熶骇鍗曞彿,鎵规鍙�,璁㈠崟鍙�,涓嬬嚎浜�,鍒涘缓浜�,淇敼浜�"/>
</el-form-item>
</el-col>
@@ -33,6 +33,27 @@
<el-option v-for="(item,index) in getEnumIsKittingData_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_Order_Gather">
+ <el-form-item label="鏄惁涓嬬嚎">
+ <el-select clearable="" v-model="queryParamsMes_Order_Gather.isUnline" placeholder="璇烽�夋嫨鏄惁涓嬬嚎">
+ <el-option v-for="(item,index) in getEnumIsUnlineData_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_Order_Gather">
+ <el-form-item label="涓嬬嚎鏃堕棿">
+ <el-date-picker placeholder="璇烽�夋嫨涓嬬嚎鏃堕棿" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsMes_Order_Gather.unlineTimeRange" />
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="涓嬬嚎浜�">
+ <el-input v-model="queryParamsMes_Order_Gather.unlinePerson" clearable="" placeholder="璇疯緭鍏ヤ笅绾夸汉"/>
</el-form-item>
</el-col>
@@ -69,12 +90,6 @@
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
<el-form-item label="鏈壂鎻忓寘瑁呴潰绉�">
<el-input v-model="queryParamsMes_Order_Gather.noScanPackageArea" clearable="" placeholder="璇疯緭鍏ユ湭鎵弿鍖呰闈㈢Н"/>
-
- </el-form-item>
- </el-col>
- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
- <el-form-item label="鍒涘缓鏃堕棿">
- <el-date-picker placeholder="璇烽�夋嫨鍒涘缓鏃堕棿" value-format="YYYY/MM/DD HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsMes_Order_Gather.createTimeRange" />
</el-form-item>
</el-col>
@@ -116,6 +131,16 @@
</template>
</el-table-column>
+ <el-table-column prop="isUnline" label="鏄惁涓嬬嚎" show-overflow-tooltip="">
+ <template #default="scope">
+ <el-tag v-if="scope.row.isUnline"> 鏄� </el-tag>
+ <el-tag type="danger" v-else> 鍚� </el-tag>
+
+ </template>
+
+ </el-table-column>
+ <el-table-column prop="unlineTime" label="涓嬬嚎鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
+ <el-table-column prop="unlinePerson" label="涓嬬嚎浜�" show-overflow-tooltip="" />
<el-table-column prop="packageNum" label="鍖呮暟" show-overflow-tooltip="" />
<el-table-column prop="unLinePackageNum" label="宸蹭笅绾垮寘鏁�" show-overflow-tooltip="" />
<el-table-column prop="noUnLinePackageNum" label="鏈笅绾垮寘鏁�" show-overflow-tooltip="" />
@@ -174,6 +199,7 @@
import commonFunction from '/@/utils/commonFunction';
const getEnumIsKittingData_Index = ref<any>([]);
+ const getEnumIsUnlineData_Index = ref<any>([]);
/***************************************************[璁㈠崟鏁版嵁鎿嶄綔]寮�濮�***************************************************/
@@ -277,6 +303,7 @@
//瀹氫箟褰撳墠椤甸潰鐨勬柟娉曠粍
const functionMapMes_Order_Gather = {
getEnumIsKittingData_Index,
+ getEnumIsUnlineData_Index,
formatDate_T_Date,
formatDate_T_Time
};
@@ -302,6 +329,7 @@
// 璁㈠崟鏁版嵁椤甸潰鍔犺浇鏃�
onMounted(async () => {
getEnumIsKittingData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('TrueFalseEnum')).data.result ?? [];
+ getEnumIsUnlineData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('TrueFalseEnum')).data.result ?? [];
});
handleQueryMes_Order_Gather();
--
Gitblit v1.9.3