From 6d492dd82dcf8f14716851d23ea3953b64fbe5c9 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期五, 01 十二月 2023 11:25:19 +0800
Subject: [PATCH] feat: 部门物品 报废
---
admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
index a373d23..a9e5711 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
@@ -157,13 +157,12 @@
</el-table-column>
<el-table-column prop="counts" label="鎶ュ簾鍘熷洜" align="center">
<template slot-scope="{row,$index}">
-<!-- <el-form-item
- label-width="0"
- :prop="`goods.${goodsIndex}.models.${mIndex}.scrappedCode`"
- :rules="[{required: true, message: '璇烽�夋嫨', trigger: 'change'}]"
- >-->
<el-form-item
label-width="0"
+ :prop="`goods.${goodsIndex}.models.${mIndex}.scrappedCode`"
+ :rules="[
+ {validator: checkReason,scrappedCode:row.scrappedCode, trigger: ['blur', 'change']}
+ ]"
>
<el-select v-model="row.scrappedCode" placeholder="璇烽�夋嫨">
<el-option
@@ -254,7 +253,7 @@
data() {
// 鑷畾涔夋牎楠�
// 鐗╁搧閲嶅鏍￠獙
- var checkBusinessFormCode= (rule, value, callback) => {
+ var checkBusinessFormCode = (rule, value, callback) => {
if (!value) {
return callback(new Error('璇烽�夋嫨'));
}
@@ -280,6 +279,12 @@
if (rule.counts > rule.userUseCount) {
// this.$message.warning('鍒嗗彂鏁伴噺涓嶈兘澶т簬鍓╀綑鏁伴噺');
return callback(new Error('鎶ュ簾鏁伴噺涓嶈兘澶т簬鍦ㄧ敤鏁伴噺'));
+ }
+ callback();
+ },
+ checkReason: (rule, value, callback) => {
+ if (!rule.scrappedCode) {
+ return callback(new Error('璇烽�夋嫨鎶ュ簾鍘熷洜'));
}
callback();
},
@@ -327,7 +332,11 @@
message: '璇烽�夋嫨鐗╁搧',
trigger: 'change'
}],
- businessFormCode: [{required: true,message: '璇烽�夋嫨鍒嗗彂鍗�',trigger: 'change'}, {validator: checkBusinessFormCode, trigger: ['blur', 'change']}],
+ businessFormCode: [{
+ required: true,
+ message: '璇烽�夋嫨鍒嗗彂鍗�',
+ trigger: 'change'
+ }, {validator: checkBusinessFormCode, trigger: ['blur', 'change']}],
counts: [{required: true, message: '璇疯緭鍏�', trigger: 'change'}],
reason: [{required: true, message: '璇烽�夋嫨', trigger: 'change'}],
},
@@ -492,19 +501,28 @@
})
arr.push(item)
}
- console.log(arr)
this.formData.goods[this.fenfaSetting.goodsIdx].models = arr
this.formData.goods[this.fenfaSetting.goodsIdx].businessFormCode = this.curFenfa.businessFormCode
+ this.formData.goods[this.fenfaSetting.goodsIdx].transBusinessId = this.curFenfa.transBusinessId
}
this.fenfaSetting.show = false
})
},
// 鎻愪氦
handleSubmit() {
- console.log('this.formData', this.formData);
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
- return;
+ let params = JSON.parse(JSON.stringify(this.formData))
+ params.goods.map((g,gid)=>{
+ delete g.goodsOptions
+ let arr=[]
+ g.models.map(m=>{
+ arr=arr.concat(m)
+ })
+ g.models = arr
+ })
+ console.log('params', params);
+ return
outputAdd(this.formData)
.then((res) => {
this.$message.success('淇濆瓨鎴愬姛锛�');
--
Gitblit v1.9.1