From 9cf4b513cfc65d641d46be6ea424a9f45e4d48f7 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 12 十二月 2023 11:43:24 +0800
Subject: [PATCH] feat: bug修复 12564
---
admin-web/src/views/departmentitem/itemret/returnNote/edit.vue | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue b/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
index 1c245cc..7389571 100644
--- a/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
+++ b/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
@@ -124,17 +124,17 @@
</el-row>
<el-table :data="mItem" :stripe="true">
<!-- A绫诲晢鍝佹樉绀� -->
- <el-table-column width="100" prop="price" label="浣跨敤浜�" align="center" v-if="mItem[0].nowUserName">
+ <el-table-column prop="price" label="浣跨敤浜�" align="center" v-if="mItem[0].nowUserName">
<template slot-scope="scope">
{{ scope.row.nowUserName }}
</template>
</el-table-column>
- <el-table-column width="100" prop="price" label="鍒嗗彂鏁伴噺" align="center">
+ <el-table-column prop="price" label="鍒嗗彂鏁伴噺" align="center">
<template slot-scope="scope">
{{ scope.row.goodsNum }}
</template>
</el-table-column>
- <el-table-column width="100" prop="price" label="鍙��鏁伴噺" align="center">
+ <el-table-column prop="price" label="鍙��鏁伴噺" align="center">
<template slot-scope="scope">
{{ scope.row.userUseCount }}
</template>
@@ -149,6 +149,7 @@
]"
>
<el-input
+ clearable
type="number"
v-model.number="row.counts"
></el-input>
@@ -264,7 +265,7 @@
fenfaData: [],
formData: {
departmentId: '', // 閫�鍥為儴闂╥d
- dealTime: '', // 閫�鍥炴椂闂�
+ dealTime: DateFormatter.formatDate(new Date(), 'yyyyMMddhhmmss'), // 閫�鍥炴椂闂�
procureDoc: '',
goods: [],
},
@@ -471,14 +472,23 @@
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
let params = JSON.parse(JSON.stringify(this.formData))
- params.goods.map((g, gid) => {
+ params.goods.map(g => {
delete g.goodsOptions
let arr = []
g.models.map(m => {
- arr = arr.concat(m)
+ m.map(item=>{
+ if(item.counts&&item.counts>0){
+ arr.push(item)
+ }
+ })
})
g.models = arr
})
+ params.goods = params.goods.filter(g=>g.models.length>0)
+ if(params.goods.length===0){
+ this.$message.error('璇疯嚦灏戝～鍐欎竴涓��鍥炵墿鍝�');
+ return;
+ }
if (this.loading) return
this.loading = true
returnAdd(params)
--
Gitblit v1.9.1