From 3f69b4dfc585c4dfbc3c07a6acf5cdd838033636 Mon Sep 17 00:00:00 2001
From: liuguocan <527956374@qq.com>
Date: 星期二, 28 十一月 2023 14:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/views/stock/scrap/itemScrapping/detail.vue | 38 +++++++++++---------------------------
1 files changed, 11 insertions(+), 27 deletions(-)
diff --git a/admin-web/src/views/stock/scrap/itemScrapping/detail.vue b/admin-web/src/views/stock/scrap/itemScrapping/detail.vue
index ca33631..938b3ad 100644
--- a/admin-web/src/views/stock/scrap/itemScrapping/detail.vue
+++ b/admin-web/src/views/stock/scrap/itemScrapping/detail.vue
@@ -32,38 +32,22 @@
</div>
</el-col>
</el-row>
- <div class="goods-card" v-for="(goodsItem, goodsIndex) in detail.scrappedGoodsInfo" :key="goodsIndex">
+ <div class="goods-card" v-for="(goodsItem, goodsIndex) in detail.scrappedGoods" :key="goodsIndex">
<el-row :gutter="20">
<el-col :span="8">
<span>鐗╁搧鍒嗙被锛�</span>
- <span>{{ goodsItem.baseCategoryName }}</span>
+ <span>{{ goodsItem.categoryName }}</span>
</el-col>
<el-col :span="8">
<span>鐗╁搧鍚嶇О锛�</span>
- <span>{{ goodsItem.goodsTemplateName }}</span>
+ <span>{{ goodsItem.goodsName }}</span>
</el-col>
</el-row>
- <el-table :data="goodsItem.scrappedGoodsInfo" :stripe="true" style="margin-top: 20px">
- <el-table-column prop="baseGoodsModelsName" label="瑙勬牸鍨嬪彿" align="center">
- <template slot-scope="scope">
- {{ scope.row.baseGoodsModelsName }}
- </template>
- </el-table-column>
- <el-table-column label="鍗曚綅" align="center">
- <template slot-scope="scope">
- {{ scope.row.unit }}
- </template>
- </el-table-column>
- <el-table-column prop="counts" label="鎶ュ簾鏁伴噺" align="center">
- <template slot-scope="scope">
- {{ scope.row.counts }}
- </template>
- </el-table-column>
- <el-table-column prop="scrappedCode" label="鎶ュ簾鍘熷洜" align="center">
- <template slot-scope="scope">
- {{ getDictName(scope.row.scrappedCode) }}
- </template>
- </el-table-column>
+ <el-table :data="goodsItem.models" :stripe="true" style="margin-top: 20px">
+ <el-table-column prop="baseGoodsModelsName" label="瑙勬牸鍨嬪彿" align="center"></el-table-column>
+ <el-table-column label="鍗曚綅" prop="unit" align="center"></el-table-column>
+ <el-table-column prop="counts" label="鎶ュ簾鏁伴噺" align="center"></el-table-column>
+ <el-table-column prop="scrappedName" label="鎶ュ簾鍘熷洜" align="center"></el-table-column>
</el-table>
</div>
<div id="uploadPreviewImages" style="display: none">
@@ -107,13 +91,13 @@
baseCategoryName: '',
businessFormCode: '',
goodsTemplateName: '',
- procureDoc: '',
+ uploadFiles: '',
agencyId: '',
agencyName: '',
states: '',
createName: '',
time: '',
- scrappedGoodsInfo: [],
+ scrappedGoods: [],
},
};
},
@@ -126,7 +110,7 @@
created() {
scrappedDetail({ id: this.setting.id }).then((res) => {
this.detail = res;
- this.fileList = this.detail.procureDoc ? JSON.parse(this.detail.procureDoc) : [];
+ this.fileList = this.detail.uploadFiles ? JSON.parse(this.detail.uploadFiles) : [];
this.$nextTick(() => {
this.initPreviewImg();
});
--
Gitblit v1.9.1