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/itemret/returnNote/edit.vue | 28 +++++++++-------------------
1 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue b/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
index 7042a05..3969f68 100644
--- a/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
+++ b/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
@@ -231,18 +231,6 @@
},
},
data() {
- // 鑷畾涔夋牎楠�
- // 鐗╁搧閲嶅鏍￠獙
- var checkBusinessFormCode = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇烽�夋嫨'));
- }
- let temp = this.formData.goods.filter((v) => v.businessFormCode == value);
- if (!temp || temp.length != 1) {
- return callback(new Error('宸查�夎繃姝ゅ垎鍙戝崟'));
- }
- callback();
- };
return {
checkCounts: (rule, value, callback) => {
if (!rule.counts) {
@@ -306,11 +294,7 @@
message: '璇烽�夋嫨鐗╁搧',
trigger: 'change'
}],
- businessFormCode: [{
- required: true,
- message: '璇烽�夋嫨鍒嗗彂鍗�',
- trigger: 'change'
- }, {validator: checkBusinessFormCode, trigger: ['blur', 'change']}],
+ businessFormCode: [{required: true, message: '璇烽�夋嫨鍒嗗彂鍗�', trigger: 'change'}],
counts: [{required: true, message: '璇疯緭鍏�', trigger: 'change'}],
reason: [{required: true, message: '璇烽�夋嫨', trigger: 'change'}],
},
@@ -411,9 +395,8 @@
// 鐗╁搧鍚嶇О鍒楄〃閫夋嫨
goodsTemplateChange(e, index) {
this.formData.goods[index].models = [];
-
+ this.formData.goods[index].businessFormCode = '';
this.formData.goods[index].goodsTemplateName = this.getGoodsTemplateName(e);
-
},
showFenFa(index) {
this.loading = true
@@ -457,6 +440,13 @@
this.$message.error('璇烽�夋嫨鍒嗗彂鍗�');
return
}
+ let bIdx = this.formData.goods.findIndex((v) => v.businessFormCode == this.curFenfa.businessFormCode);
+ let gIdx = this.formData.goods.findIndex((v) => v.baseGoodsTemplateId == this.fenfaSetting.baseGoodsTemplateId);
+
+ if (gIdx !== -1 && gIdx !== this.fenfaSetting.goodsIdx && bIdx !== -1 && bIdx !== this.fenfaSetting.goodsIdx) {
+ this.$message.error('鍚屼竴涓墿鍝佷笉鑳介�夋嫨鐩稿悓鐨勫垎鍙戝崟');
+ return;
+ }
getGoodsUseInfoByFfOrderAndGoodId({
transBusinessId: this.curFenfa.transBusinessId,
baseGoodsTemplateId: this.fenfaSetting.baseGoodsTemplateId
--
Gitblit v1.9.1