From 7c40b902af2ae09b353525f913056d66af12caf1 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 09 十二月 2023 17:02:43 +0800
Subject: [PATCH] feat: 1.新增人员机构错误 2.修改使用人时设置可用数量 3.重复预警 4.部门物品退回时设置调拨单信息 5.统计报表删除一列
---
admin-web/src/views/departmentitem/itemret/retDetails/index.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemret/retDetails/index.vue b/admin-web/src/views/departmentitem/itemret/retDetails/index.vue
index 008473b..4a6b193 100644
--- a/admin-web/src/views/departmentitem/itemret/retDetails/index.vue
+++ b/admin-web/src/views/departmentitem/itemret/retDetails/index.vue
@@ -50,7 +50,7 @@
placeholder: '璇烽�夋嫨',
defaultValue: '',
options: [],
- cascader: [{key: 'goodsModelId', queryKey: 'goodsTemplatesId'}],
+ cascader: [{key: 'baseGoodsModelsId', queryKey: 'goodsTemplatesId'}],
optionsConfig: {
label: 'goodsName',
value: 'id',
@@ -59,7 +59,7 @@
},
{
type: 'select',
- dataIndex: 'goodsModelId',
+ dataIndex: 'baseGoodsModelsId',
label: '瑙勬牸鍨嬪彿',
placeholder: '璇疯緭鍏�',
defaultValue: '',
@@ -85,7 +85,7 @@
},
{
type: 'text',
- dataIndex: 'operatorName',
+ dataIndex: 'createName',
label: '鍒涘缓浜�',
placeholder: '璇疯緭鍏�',
defaultValue: '',
@@ -150,7 +150,7 @@
},
},*/
{title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'left', minWidth: 130},
- {title: '鎶ュ簾鏁伴噺', field: 'counts', align: 'center'},
+ {title: '閫�鍥炴暟閲�', field: 'counts', align: 'center'},
/*{title: '鎵�灞炴満鏋�', field: 'tenantName', align: 'left', minWidth: 130},*/
{title: '閮ㄩ棬', field: 'departmentName', align: 'left', minWidth: 130},
{title: '鍒涘缓浜�', field: 'operatorName', align: 'center', width: 100},
@@ -158,7 +158,7 @@
title: '鎿嶄綔鏃堕棿', field: 'dealTime', align: 'center',
width: 160,
formatter: (row) => {
- return {value: DateFormatter.LongToDateTime(row.createTime)};
+ return {value: DateFormatter.LongToDateTime(row.dealTime)};
},
},
],
--
Gitblit v1.9.1