From 4325565ac6a3028f1071602e067b41e5932faa79 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期二, 02 一月 2024 16:05:52 +0800
Subject: [PATCH] 1、增加登录系统日志 2、修改上传文件，名称判断错误问题 3、修改单据新增时，仓库判断问题
---
admin-web/src/views/departmentitem/itemret/returnNote/index.vue | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemret/returnNote/index.vue b/admin-web/src/views/departmentitem/itemret/returnNote/index.vue
index f76134e..c327b00 100644
--- a/admin-web/src/views/departmentitem/itemret/returnNote/index.vue
+++ b/admin-web/src/views/departmentitem/itemret/returnNote/index.vue
@@ -34,13 +34,13 @@
</div>
</div>
<div class="card-end">
- <div v-for="(just, index) in item.goods" :key="index" class="item">
+ <div v-for="(just, index) in item.goodsTemplateInfoList" :key="index" class="item">
<div class="name">{{ just.baseGoodsTemplateName }}</div>
<div class="value-box">
<div class="value-box-item">
<span class="label">鏁伴噺锛�</span>
- <span class="value">{{ just.totalCount }}</span>
- <span class="unit">{{ just.unit }}</span>
+ <span class="value">{{ just.count }}</span>
+ <span class="unit">{{ just.unit||'' }}</span>
</div>
</div>
</div>
@@ -99,7 +99,7 @@
},
{
type: 'select',
- dataIndex: 'inAgencyId',
+ dataIndex: 'departmentId',
label: '鍒嗗彂閮ㄩ棬',
placeholder: '璇烽�夋嫨',
optionsConfig: {
@@ -125,7 +125,7 @@
},
{
type: 'text',
- dataIndex: 'operatorName',
+ dataIndex: 'createName',
label: '鍒涘缓浜�',
placeholder: '璇疯緭鍏�',
defaultValue: '',
@@ -145,6 +145,9 @@
],
};
},
+ created() {
+ this.fetchData()
+ },
methods: {
fetchData() {
this.loading = true;
@@ -156,6 +159,8 @@
this.list = res.datas;
this.total = res.totalRows;
this.loading = false;
+ }).catch(()=>{
+ this.loading = false;
});
},
},
--
Gitblit v1.9.1