From f7163108fef21286a2b447f1958ee3204d7854d0 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期六, 02 十二月 2023 11:39:44 +0800
Subject: [PATCH] feat: 部门物品报废 1、分发单选择增加校验 2、明细列表字段对接
---
admin-web/src/views/departmentitem/itemscr/scrapping/detail.vue | 101 +++++++++++++++++++++++---------------------------
1 files changed, 47 insertions(+), 54 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/detail.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/detail.vue
index ec9785e..4e8fbd7 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrapping/detail.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrapping/detail.vue
@@ -1,27 +1,27 @@
<template>
- <win-lg class="stock-detail" :title="setting.title" @close="close" :width="'800px'" :loading="loading">
+ <win-md class="stock-detail" title="閮ㄩ棬鐗╁搧鎶ュ簾鍗曡鎯�" @close="close" :loading="loading">
<el-row :gutter="20">
<el-col :span="8">
<span>鎶ュ簾鍗曞彿锛�</span>
- <span>SL2023001</span>
+ <span>{{detail.businessFormCode}}</span>
</el-col>
<el-col :span="8">
<span>鎵�灞炴満鏋勶細</span>
- <span>娌冲崡鐪侀偖鏀垮垎鍏徃</span>
+ <span>{{detail.agencyName}}</span>
</el-col>
<el-col :span="8">
<span>閮ㄩ棬锛�</span>
- <span>閲戣瀺涓氬姟閮�</span>
+ <span>{{detail.departmentName}}</span>
</el-col>
</el-row>
<el-row :gutter="20" style="margin-top: 20px">
<el-col :span="8">
<span>鎶ュ簾浜猴細</span>
- <span>寮犵埍鐢�</span>
+ <span>{{detail.operatorName}}</span>
</el-col>
<el-col :span="8">
<span>鎶ュ簾鏃堕棿锛�</span>
- <span>2023-08-08 10:23:12</span>
+ <span>{{detail.dealTime|formatTime}}</span>
</el-col>
</el-row>
<el-row :gutter="20" style="margin-top: 20px">
@@ -32,57 +32,43 @@
</div>
</el-col>
</el-row>
- <div class="goods-card" v-for="(goodsItem, goodsIndex) in detail.procureGoods" :key="goodsIndex">
+ <div class="goods-card" v-for="(goodsItem, goodsIndex) in detail.goods" :key="goodsIndex">
<el-row :gutter="20">
- <el-col :span="6">
+ <el-col :span="7">
<span>鐗╁搧鍒嗙被锛�</span>
- <span>{{ goodsItem.baseCategoryName }}</span>
+ <span>{{ goodsItem.categoryName }}</span>
</el-col>
- <el-col :span="6">
+ <el-col :span="8">
<span>鐗╁搧鍚嶇О锛�</span>
- <span>{{ goodsItem.goodsTemplateName }}</span>
+ <span>{{ goodsItem.baseGoodsTemplateName }}</span>
</el-col>
- <el-col :span="6">
- <span>鐗╁搧绫诲埆锛�</span>
- <span>{{ goodsItem.supplier }}</span>
+ <el-col :span="3">
+ <span>绫诲埆锛�</span>
+ <span>{{ goodsItem.classification }}绫�</span>
</el-col>
<el-col :span="6">
<span>鍒嗗彂鍗曞彿锛�</span>
- <span>{{ goodsItem.supplier }}</span>
+ <span>{{ goodsItem.businessFormCode }}</span>
</el-col>
</el-row>
- <div>
- <el-table :data="goodsItem.models" :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 label="浣跨敤浜�" align="center" v-if="goodsItem.type===1">
- <template slot-scope="scope">
- {{ scope.row.unit }}
- </template>
- </el-table-column>
- <el-table-column prop="price" label="鍐嶇敤鏁伴噺" align="center">
- <template slot-scope="scope">
- {{ scope.row.counts }}
- </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="counts" label="鎶ュ簾鍘熷洜" align="center">
- <template slot-scope="scope">
- {{ scope.row.price }}
- </template>
- </el-table-column>
+ <div class="card3" v-for="(mItem,k) in goodsItem.models" :key="k">
+ <el-row v-if="mItem[0].goodsUserName" :gutter="24" type="flex" align="middle">
+ <el-col :span="8">
+ <span>瑙勬牸鍨嬪彿锛�</span>
+ <span>{{ mItem[0].baseGoodsModelsName }}</span>
+ </el-col>
+ <el-col :span="4">
+ <span>鍗曚綅锛�</span>
+ <span>{{ mItem[0].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>
</div>
</div>
@@ -91,17 +77,17 @@
<img
v-if="checkImg(src.name)"
class="v-img"
- :src="src.url"
+ :src="getUrl(src.path)"
:alt="src.name"
style="width: 100px; height: 100px"
/>
</span>
</div>
- </win-lg>
+ </win-md>
</template>
<script>
-import {procureDetail} from '@/api/stock/procure/purchaseOrder';
-import winLg from '@/components/win/win-lg';
+import {scrappedDetail} from '@/api/deptGoods/scrap';
+import winMd from '@/components/win/win-md';
import * as DateFormatter from '@/utils/DateFormatter';
import {getDownUrl} from '@/utils/base';
import Viewer from 'viewerjs';
@@ -110,7 +96,7 @@
let viewer = null;
export default {
- components: { winLg },
+ components: { winMd },
props: {
setting: {
type: Object,
@@ -119,7 +105,7 @@
},
data() {
return {
- loading:false,
+ loading: true,
fileList: [],
detail: {
baseCategoryName: '',
@@ -146,8 +132,9 @@
}
},
created() {
- procureDetail({ id: this.setting.id }).then((res) => {
+ scrappedDetail({ id: this.setting.id }).then((res) => {
this.detail = res;
+ this.loading = false
this.fileList = this.detail.procureDoc ? JSON.parse(this.detail.procureDoc) : [];
this.$nextTick(() => {
this.initPreviewImg();
@@ -207,4 +194,10 @@
</script>
<style lang="scss" scoped>
//@import url(../../../../styles/store.scss);
+.card3 {
+ padding: 15px;
+ margin-top: 20px;
+ border-radius: 2px;
+ background: #ffffff;
+}
</style>
--
Gitblit v1.9.1