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 | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/detail.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/detail.vue
index 8ae2184..4e8fbd7 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrapping/detail.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrapping/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>
@@ -34,7 +34,7 @@
</el-row>
<div class="goods-card" v-for="(goodsItem, goodsIndex) in detail.goods" :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,33 @@
<span>鐗╁搧鍚嶇О锛�</span>
<span>{{ goodsItem.baseGoodsTemplateName }}</span>
</el-col>
- <el-col :span="4">
+ <el-col :span="3">
<span>绫诲埆锛�</span>
<span>{{ goodsItem.classification }}绫�</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.models" :key="k">
+ <el-row v-if="mItem[0].goodsUserName" :gutter="24" type="flex" align="middle">
<el-col :span="8">
<span>瑙勬牸鍨嬪彿锛�</span>
- <span>{{ goodsItem.models[0].baseGoodsModelsName }}</span>
+ <span>{{ mItem[0].baseGoodsModelsName }}</span>
</el-col>
<el-col :span="4">
<span>鍗曚綅锛�</span>
- <span>{{ goodsItem.models[0].unit }}</span>
+ <span>{{ mItem[0].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 :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="center"/>
+ <el-table-column prop="scrappedName" label="鎶ュ簾鍘熷洜" align="left"/>
</el-table>
</div>
</div>
@@ -84,11 +83,11 @@
/>
</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';
@@ -97,7 +96,7 @@
let viewer = null;
export default {
- components: { winLg },
+ components: { winMd },
props: {
setting: {
type: Object,
--
Gitblit v1.9.1