From 0ff4be6c9cb9bc215acd4b4c78122da7e0d7140f Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期五, 01 十二月 2023 13:55:50 +0800
Subject: [PATCH] feat: 部门物品退回
---
admin-web/src/views/departmentitem/itemret/returnNote/detail.vue | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemret/returnNote/detail.vue b/admin-web/src/views/departmentitem/itemret/returnNote/detail.vue
index 914c6ae..0df75be 100644
--- a/admin-web/src/views/departmentitem/itemret/returnNote/detail.vue
+++ b/admin-web/src/views/departmentitem/itemret/returnNote/detail.vue
@@ -3,30 +3,30 @@
<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.departmentName}}</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">
<el-col class="img-row" :span="24">
- <span>鎶ュ簾鎵嬬画锛�</span>
+ <span>閫�鍥炴墜缁細</span>
<div class="img-box" v-for="(item, index) in fileList" :key="index" @click="handlePreview(item)">
<img class="img" :src="getUrl(item.path)" alt="" />
</div>
@@ -34,38 +34,48 @@
</el-row>
<div class="goods-card" v-for="(goodsItem, goodsIndex) in detail.procureGoods" :key="goodsIndex">
<el-row :gutter="20">
- <el-col :span="6">
+ <el-col :span="8">
<span>鐗╁搧鍒嗙被锛�</span>
<span>{{ goodsItem.baseCategoryName }}</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">
+ <el-col :span="4">
<span>鐗╁搧绫诲埆锛�</span>
- <span>{{ goodsItem.supplier }}</span>
+ <span>{{ goodsItem.modelName }}</span>
</el-col>
- <el-col :span="6">
+ <el-col :span="4">
<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">
+ <div v-for="(mItem, mIndex) in goodsItem.models" :key="mIndex">
+ <el-row :gutter="24" type="flex" align="middle" style="height: 50px">
+ <el-col :span="8">
+ <span>瑙勬牸鍨嬪彿锛�</span>
+ <span>{{ mItem[0].modelName }}</span>
+ </el-col>
+ <el-col :span="4">
+ <span>鍗曚綅锛�</span>
+ <span>{{ mItem[0].unit }}</span>
+ </el-col>
+ </el-row>
+ <el-table :data="mItem" :stripe="true" style="margin-top: 20px">
+ <el-table-column prop="baseGoodsModelsName" label="瑙勬牸鍨嬪彿" align="center" v-if="!mItem[0].nowUserName">
<template slot-scope="scope">
{{ scope.row.baseGoodsModelsName }}
</template>
</el-table-column>
- <el-table-column label="鍗曚綅" align="center">
+ <el-table-column label="鍗曚綅" align="center" v-if="!mItem[0].nowUserName">
<template slot-scope="scope">
{{ scope.row.unit }}
</template>
</el-table-column>
- <el-table-column label="浣跨敤浜�" align="center" v-if="goodsItem.type===1">
+ <el-table-column label="浣跨敤浜�" align="center" v-if="mItem[0].nowUserName">
<template slot-scope="scope">
- {{ scope.row.unit }}
+ {{ scope.row.nowUserName }}
</template>
</el-table-column>
<el-table-column prop="price" label="閫�鍥炴暟閲�" align="center">
@@ -73,9 +83,9 @@
{{ scope.row.counts }}
</template>
</el-table-column>
- <el-table-column prop="counts" label="鍐嶇敤鏁伴噺" align="center">
+ <el-table-column prop="counts" label="鍦ㄧ敤鏁伴噺" align="center">
<template slot-scope="scope">
- {{ scope.row.counts }}
+ {{ scope.row.userUseCount }}
</template>
</el-table-column>
</el-table>
--
Gitblit v1.9.1