From 2096ac6f7379d75001b610c2de1fa380abd09519 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 12 十二月 2023 16:13:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/views/departmentitem/itemret/returnNote/edit.vue | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 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..a07c354 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: [],
},
@@ -302,12 +303,11 @@
title: '涓婁紶',
max: 20, // 鏈�澶уぇ灏忥紝鍗曚綅M
num: 10, // 鏀寔涓婁紶鍥剧墖涓暟
- accept: '.jpg,.png', // 闄愬埗鏍煎紡
+ accept: '', // 闄愬埗鏍煎紡
tip: '', // 鎻愮ず 榛樿锛歚鍙兘涓婁紶${this.defaultSettings.num}涓�${this.defaultSettings.accept}鏂囦欢锛屼笖涓嶈秴杩�${this.defaultSettings.max}kb`
uploadUrl: getUploadUrl(), // 涓婁紶璺緞
multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
disabled: false, // 鏄惁绂佺敤
- type: 'picture', // text/picture
},
};
},
@@ -471,14 +471,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