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 | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemret/returnNote/detail.vue b/admin-web/src/views/departmentitem/itemret/returnNote/detail.vue
index cff098e..292f2f1 100644
--- a/admin-web/src/views/departmentitem/itemret/returnNote/detail.vue
+++ b/admin-web/src/views/departmentitem/itemret/returnNote/detail.vue
@@ -1,5 +1,5 @@
<template>
- <win-lg class="stock-detail" title="閮ㄩ棬鐗╁搧閫�鍥炲崟璇︽儏" @close="close" :loading="loading">
+ <win-md class="stock-detail" title="閮ㄩ棬鐗╁搧閫�鍥炲崟璇︽儏" @close="close" :loading="loading">
<el-row :gutter="20">
<el-col :span="8">
<span>閫�鍥炲崟鍙凤細</span>
@@ -32,9 +32,9 @@
</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="8">
+ <el-col :span="7">
<span>鐗╁搧鍒嗙被锛�</span>
<span>{{ goodsItem.categoryName }}</span>
</el-col>
@@ -42,34 +42,40 @@
<span>鐗╁搧鍚嶇О锛�</span>
<span>{{ goodsItem.baseGoodsTemplateName }}</span>
</el-col>
- <el-col :span="4">
+ <el-col :span="3">
<span>绫诲埆锛�</span>
- <span>{{ goodsItem.classification }}绫�</span>
+ <span>{{ goodsItem.type }}绫�</span>
</el-col>
- <el-col :span="4">
+ <el-col :span="6">
<span>鍒嗗彂鍗曞彿锛�</span>
<span>{{ goodsItem.businessFormCode }}</span>
</el-col>
</el-row>
- <!-- <div v-for="(mItem,k) in goodsItem.models" :key="k">-->
- <div class="card3">
- <el-row v-if="goodsItem.models[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>{{ goodsItem.models[0].baseGoodsModelsName }}</span>
+ <span>{{ mItem.baseGoodsModelsName }}</span>
</el-col>
<el-col :span="4">
<span>鍗曚綅锛�</span>
- <span>{{ goodsItem.models[0].unit }}</span>
+ <span>{{ mItem.unit }}</span>
</el-col>
</el-row>
- <el-table :data="goodsItem.models" style="margin-top: 15px">
- <el-table-column prop="baseGoodsModelsName" label="瑙勬牸鍨嬪彿" align="center" v-if="!goodsItem.models[0].goodsUserName"/>
- <el-table-column prop="unit" label="鍗曚綅" align="center" v-if="!goodsItem.models[0].goodsUserName"/>
- <el-table-column prop="goodsUserName" label="浣跨敤浜�" align="center" v-if="goodsItem.models[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="center"/>
+ <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>
@@ -84,20 +90,20 @@
/>
</span>
</div>
- </win-lg>
+ </win-md>
</template>
<script>
-import {scrappedDetail} from '@/api/deptGoods/scrap';
-import winLg from '@/components/win/win-lg';
+import winMd from '@/components/win/win-md';
import * as DateFormatter from '@/utils/DateFormatter';
import {getDownUrl} from '@/utils/base';
import Viewer from 'viewerjs';
import 'viewerjs/dist/viewer.css';
+import {returnDetail} from "@/api/deptGoods/itemret";
let viewer = null;
export default {
- components: { winLg },
+ components: { winMd },
props: {
setting: {
type: Object,
@@ -133,7 +139,7 @@
}
},
created() {
- scrappedDetail({ id: this.setting.id }).then((res) => {
+ returnDetail({ id: this.setting.id }).then((res) => {
this.detail = res;
this.loading = false
this.fileList = this.detail.procureDoc ? JSON.parse(this.detail.procureDoc) : [];
@@ -164,12 +170,6 @@
index++;
}
}
- // this.fileList.forEach((f, i) => {
- // if (file.uid == f.uid) {
- // index = i
- // }
- // })
- // document.querySelector('#uploadPreviewImages').children[0].click()
viewer.view(index);
},
checkImg(name) {
--
Gitblit v1.9.1