From b4492efb227ea1bf9c7f26aeea192f23b75abd8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Thu, 20 Apr 2023 16:46:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E6=95=B0=E7=BB=84=E8=BD=AC?= =?UTF-8?q?=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/components/umyTable/index.vue | 2 +- fe/PC/src/utils/tableColumns/index.js | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fe/PC/src/components/umyTable/index.vue b/fe/PC/src/components/umyTable/index.vue index 5f427db67..e395c3a3c 100644 --- a/fe/PC/src/components/umyTable/index.vue +++ b/fe/PC/src/components/umyTable/index.vue @@ -310,7 +310,7 @@ v-if="item.type == 'name' || !item.type" @click="item.type == 'name' && inlineDialog(scope.row)" :class="{ spamHover: item.type == 'name' }" - >{{ scope.row[item.prop] }}{{ scope.row[item.prop] ? scope.row[item.prop] + "" : "" }} diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index d4d062d3d..0edc64fac 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -657,8 +657,10 @@ export const TransactionType = [ { label: "来源库存状态", prop: 'outInventoryStatuses', type: "filterList", filters: "inventoryStage" }, { label: "目标库存状态", prop: 'inInventoryStatuses', type: "filterList", filters: "inventoryStage" }, { label: "是否可用", prop: 'enabled', type: "filter", filters: "whetherOrNot" }, - { label: "入库库区列表", prop: 'inLocationAreas', type: "filterList", filters: "inventoryStage" }, - { label: "出库库区列表", prop: 'outLocationAreas', type: "filterList", filters: "inventoryStage" }, + // { label: "入库库区列表", prop: 'inLocationAreas', type: "filterList", filters: "inventoryStage" }, + // { label: "出库库区列表", prop: 'outLocationAreas', type: "filterList", filters: "inventoryStage" }, + { label: "入库库区列表", prop: 'inLocationAreas' }, + { label: "出库库区列表", prop: 'outLocationAreas' }, { label: "自动提交审批", prop: 'autoSubmitRequest', type: "filter", filters: "whetherOrNot" }, { label: "自动审批通过", prop: 'autoAgreeRequest', type: "filter", filters: "whetherOrNot" }, { label: "自动执行", prop: 'autoHandleRequest', type: "filter", filters: "whetherOrNot" },