From 87f07e589fb1c8103513a5fcc8febe3b14f5535f Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期五, 01 十二月 2023 17:30:46 +0800
Subject: [PATCH] feat: 1、图片预览使用半路径 2、部门物品退回详情
---
admin-web/src/views/stock/scrap/itemScrapping/detail.vue | 50 ++++++++++++++++++--------------------------------
1 files changed, 18 insertions(+), 32 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..673d8d0 100644
--- a/admin-web/src/views/stock/scrap/itemScrapping/detail.vue
+++ b/admin-web/src/views/stock/scrap/itemScrapping/detail.vue
@@ -1,5 +1,5 @@
<template>
- <win-md class="stock-detail" :title="setting.title" @close="close" :width="'800px'">
+ <win-md class="stock-detail" :title="setting.title" @close="close" :width="'800px'" :loading="loading">
<el-row :gutter="20">
<el-col :span="8">
<span>鎶ュ簾鍗曞彿锛�</span>
@@ -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">
@@ -71,7 +55,7 @@
<img
v-if="checkImg(src.name)"
class="v-img"
- :src="src.url"
+ :src="getUrl(src.path)"
:alt="src.name"
style="width: 100px; height: 100px"
/>
@@ -80,13 +64,13 @@
</win-md>
</template>
<script>
-import { scrappedDetail } from '@/api/stock/scrap';
+import {scrappedDetail} from '@/api/stock/scrap';
import winMd from '@/components/win/win-md';
import * as DateFormatter from '@/utils/DateFormatter';
-import { getDownUrl } from '@/utils/base';
+import {getDownUrl} from '@/utils/base';
import Viewer from 'viewerjs';
import 'viewerjs/dist/viewer.css';
-import { getDicts } from '@/api/system/dict/data';
+import {getDicts} from '@/api/system/dict/data';
let viewer = null;
@@ -101,19 +85,20 @@
},
data() {
return {
+ loading: true,
scrapReasonOptions: [],
fileList: [],
detail: {
baseCategoryName: '',
businessFormCode: '',
goodsTemplateName: '',
- procureDoc: '',
+ uploadFiles: '',
agencyId: '',
agencyName: '',
states: '',
createName: '',
time: '',
- scrappedGoodsInfo: [],
+ scrappedGoods: [],
},
};
},
@@ -126,7 +111,8 @@
created() {
scrappedDetail({ id: this.setting.id }).then((res) => {
this.detail = res;
- this.fileList = this.detail.procureDoc ? JSON.parse(this.detail.procureDoc) : [];
+ this.loading = false
+ this.fileList = this.detail.uploadFiles ? JSON.parse(this.detail.uploadFiles) : [];
this.$nextTick(() => {
this.initPreviewImg();
});
--
Gitblit v1.9.1