From c75a630f7b099dfe3e5030a2cc66e96560cb9561 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期五, 13 九月 2024 14:28:56 +0800
Subject: [PATCH] Merge branch 'master' into csc
---
Web/src/views/wcs/wcsPlc/index.vue | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/Web/src/views/wcs/wcsPlc/index.vue b/Web/src/views/wcs/wcsPlc/index.vue
index b41a6b3..a229481 100644
--- a/Web/src/views/wcs/wcsPlc/index.vue
+++ b/Web/src/views/wcs/wcsPlc/index.vue
@@ -35,6 +35,14 @@
</el-form-item>
</el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
+ <el-form-item label="鏄惁鍚敤">
+ <el-select clearable="" v-model="queryParams.enable" placeholder="璇烽�夋嫨鏄惁鍚敤">
+ <el-option v-for="(item, index) in dl('YesNoEnum')" :key="index" :value="item.value"
+ :label="`${item.name} (${item.code}) [${item.value}] `" />
+ </el-select>
+ </el-form-item>
+ </el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
<el-form-item>
<el-button-group style="display: flex; align-items: center;">
@@ -74,6 +82,12 @@
</el-table-column>
<el-table-column prop="wareHouseNo" label="浠撳簱鍙�" show-overflow-tooltip="" />
<el-table-column prop="text" label="鎻忚堪" show-overflow-tooltip="" />
+ <el-table-column prop="enable" label="鏄惁鍚敤" show-overflow-tooltip="">
+ <template #default="scope">
+ <el-tag :type="dv('YesNoEnum', scope.row.enable)?.tagType"> {{ dv('YesNoEnum',
+ scope.row.enable)?.name }}</el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="淇敼璁板綍" width="80" align="center" show-overflow-tooltip>
<template #default="scope">
<ModifyRecord :data="scope.row" />
--
Gitblit v1.8.0