From fa3a13b43cdcd3bcc42abae4d9c0a67e48ebea41 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 12 十二月 2023 16:05:41 +0800
Subject: [PATCH] feat: bug修复 12536
---
admin-web/src/views/departmentitem/itemret/returnNote/index.vue | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemret/returnNote/index.vue b/admin-web/src/views/departmentitem/itemret/returnNote/index.vue
index 85cfa78..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.formOutputTemplateInfoList" :key="index" class="item">
- <div class="name">{{ just.goodsName }}</div>
+ <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.count }}</span>
- <span class="unit">{{ just.unit }}</span>
+ <span class="unit">{{ just.unit||'' }}</span>
</div>
</div>
</div>
@@ -72,7 +72,6 @@
</template>
<script>
-import {outputList} from '@/api/stock/accessStock';
import MyButton from '@/components/myButton/myButton';
import myImport from '@/views/components/myImport';
import edit from './edit';
@@ -80,6 +79,7 @@
import listPage from '@/views/mixins/listPage'
import {getUserDetail} from "@/utils/auth";
import SettingIplatform from "@/utils/settingIplatform";
+import {returnList} from "@/api/deptGoods/itemret";
export default {
name: 'index',
@@ -99,7 +99,7 @@
},
{
type: 'select',
- dataIndex: 'inAgencyId',
+ dataIndex: 'departmentId',
label: '鍒嗗彂閮ㄩ棬',
placeholder: '璇烽�夋嫨',
optionsConfig: {
@@ -124,6 +124,13 @@
},
},
{
+ type: 'text',
+ dataIndex: 'createName',
+ label: '鍒涘缓浜�',
+ placeholder: '璇疯緭鍏�',
+ defaultValue: '',
+ },
+ {
type: 'date-picker',
dataIndex: 'startTime',
label: '閫�鍥炴椂闂�',
@@ -138,10 +145,13 @@
],
};
},
+ created() {
+ this.fetchData()
+ },
methods: {
fetchData() {
this.loading = true;
- outputList({
+ returnList({
pageNum: this.pageNum,
pageSize: this.pageSize,
...this.filterFrom,
@@ -149,6 +159,8 @@
this.list = res.datas;
this.total = res.totalRows;
this.loading = false;
+ }).catch(()=>{
+ this.loading = false;
});
},
},
--
Gitblit v1.9.1