From f75031d68076a00fdc4e2aa04bbb255452ff7f7f Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期六, 02 十二月 2023 13:35:45 +0800
Subject: [PATCH] fix: 物品退回接口对接
---
admin-web/src/views/departmentitem/itemret/returnNote/detail.vue | 33 ++++++++++------
admin-web/src/views/departmentitem/itemscr/scrapping/index.vue | 2 +
admin-web/src/views/departmentitem/itemret/retDetails/index.vue | 8 ++--
admin-web/src/views/departmentitem/itemret/returnNote/edit.vue | 6 +-
admin-web/src/views/departmentitem/itemret/returnNote/index.vue | 15 +++++--
5 files changed, 39 insertions(+), 25 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..9310e14 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: '',
@@ -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)};
},
},
],
diff --git a/admin-web/src/views/departmentitem/itemret/returnNote/detail.vue b/admin-web/src/views/departmentitem/itemret/returnNote/detail.vue
index 89a383d..292f2f1 100644
--- a/admin-web/src/views/departmentitem/itemret/returnNote/detail.vue
+++ b/admin-web/src/views/departmentitem/itemret/returnNote/detail.vue
@@ -32,7 +32,7 @@
</div>
</el-col>
</el-row>
- <div class="goods-card" v-for="(goodsItem, goodsIndex) in detail.goods" :key="goodsIndex">
+ <div class="goods-card" v-for="(goodsItem, goodsIndex) in detail.goodsTemplateInfoList" :key="goodsIndex">
<el-row :gutter="20">
<el-col :span="7">
<span>鐗╁搧鍒嗙被锛�</span>
@@ -44,31 +44,38 @@
</el-col>
<el-col :span="3">
<span>绫诲埆锛�</span>
- <span>{{ goodsItem.classification }}绫�</span>
+ <span>{{ goodsItem.type }}绫�</span>
</el-col>
<el-col :span="6">
<span>鍒嗗彂鍗曞彿锛�</span>
<span>{{ goodsItem.businessFormCode }}</span>
</el-col>
</el-row>
- <div class="card3" v-for="(mItem,k) in mItem" :key="k">
- <el-row v-if="mItem[0].goodsUserName" :gutter="24" type="flex" align="middle">
+ <div class="card3" v-for="(mItem,k) in goodsItem.modelInfoList" :key="k">
+ <el-row v-if="goodsItem.type==='A'" :gutter="24" type="flex" align="middle">
<el-col :span="8">
<span>瑙勬牸鍨嬪彿锛�</span>
- <span>{{ mItem[0].baseGoodsModelsName }}</span>
+ <span>{{ mItem.baseGoodsModelsName }}</span>
</el-col>
<el-col :span="4">
<span>鍗曚綅锛�</span>
- <span>{{ mItem[0].unit }}</span>
+ <span>{{ mItem.unit }}</span>
</el-col>
</el-row>
- <el-table :data="mItem" style="margin-top: 15px">
- <el-table-column prop="baseGoodsModelsName" label="瑙勬牸鍨嬪彿" align="left" v-if="!mItem[0].goodsUserName"/>
- <el-table-column prop="unit" label="鍗曚綅" align="center" v-if="!mItem[0].goodsUserName"/>
- <el-table-column prop="goodsUserName" label="浣跨敤浜�" align="left" v-if="mItem[0].goodsUserName"/>
- <el-table-column prop="useCount" label="鍦ㄧ敤鏁伴噺" align="center"/>
- <el-table-column prop="counts" label="鎶ュ簾鏁伴噺" align="center"/>
- <el-table-column prop="scrappedName" label="鎶ュ簾鍘熷洜" align="left"/>
+ <el-table :data="mItem.useInfoList" style="margin-top: 15px">
+ <el-table-column prop="baseGoodsModelsName" label="瑙勬牸鍨嬪彿" align="left" v-if="goodsItem.type!=='A'">
+ <template slot-scope="{row}">
+ {{mItem.baseGoodsModelsName}}
+ </template>
+ </el-table-column>
+ <el-table-column prop="unit" label="鍗曚綅" align="center" v-if="goodsItem.type!=='A'">
+ <template slot-scope="{row}">
+ {{mItem.unit}}
+ </template>
+ </el-table-column>
+ <el-table-column prop="useName" label="浣跨敤浜�" align="left" v-if="goodsItem.type==='A'"/>
+ <el-table-column prop="useUnm" label="鍦ㄧ敤鏁伴噺" align="center"/>
+ <el-table-column prop="returnNum" label="閫�鍥炴暟閲�" align="center"/>
</el-table>
</div>
</div>
diff --git a/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue b/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
index 1c245cc..28a1bf7 100644
--- a/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
+++ b/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
@@ -124,17 +124,17 @@
</el-row>
<el-table :data="mItem" :stripe="true">
<!-- A绫诲晢鍝佹樉绀� -->
- <el-table-column width="100" prop="price" label="浣跨敤浜�" align="center" v-if="mItem[0].nowUserName">
+ <el-table-column prop="price" label="浣跨敤浜�" align="center" v-if="mItem[0].nowUserName">
<template slot-scope="scope">
{{ scope.row.nowUserName }}
</template>
</el-table-column>
- <el-table-column width="100" prop="price" label="鍒嗗彂鏁伴噺" align="center">
+ <el-table-column prop="price" label="鍒嗗彂鏁伴噺" align="center">
<template slot-scope="scope">
{{ scope.row.goodsNum }}
</template>
</el-table-column>
- <el-table-column width="100" prop="price" label="鍙��鏁伴噺" align="center">
+ <el-table-column prop="price" label="鍙��鏁伴噺" align="center">
<template slot-scope="scope">
{{ scope.row.userUseCount }}
</template>
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;
});
},
},
diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue
index 1317463..77d7694 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue
@@ -169,6 +169,8 @@
this.list = res.datas;
this.total = res.totalRows;
this.loading = false;
+ }).catch(()=>{
+ this.loading = false;
});
},
},
--
Gitblit v1.9.1