From 870a9499eb65de0031ef8e8f70607e5dfb64b806 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 30 十一月 2023 09:30:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/views/stock/transfer/transferApplication/edit.vue | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/admin-web/src/views/stock/transfer/transferApplication/edit.vue b/admin-web/src/views/stock/transfer/transferApplication/edit.vue
index e09140b..94e6779 100644
--- a/admin-web/src/views/stock/transfer/transferApplication/edit.vue
+++ b/admin-web/src/views/stock/transfer/transferApplication/edit.vue
@@ -56,14 +56,10 @@
<el-form-item
label="鐗╁搧鍚嶇О"
:prop="`transferGoods[${goodsIndex}].baseGoodsTemplateId`"
- :rules="{
- required: true,
- message: '璇烽�夋嫨',
- trigger: 'change',
- }"
+ :rules="rules.baseGoodsTemplateId"
>
<el-select
- :value="goodsItem.baseGoodsTemplateId"
+ v-model="goodsItem.baseGoodsTemplateId"
placeholder="璇峰厛鎷╃墿鍝佸垎绫�"
filterable
:disabled="!goodsItem.baseCategoryId"
@@ -173,14 +169,13 @@
</win-md>
</template>
<script>
-import { transferAdd } from '@/api/stock/transfer';
-import { getCategorySelectTree, goodsModel, warehouseSelectNumber } from '@/api/baseSetting/finsystenant';
-import { getParentTenant, queryWarehouseGoods } from '@/api/stock/transfer';
+import {getParentTenant, queryWarehouseGoods, transferAdd} from '@/api/stock/transfer';
+import {getCategorySelectTree, goodsModel, warehouseSelectNumber} from '@/api/baseSetting/finsystenant';
import MyButton from '@/components/myButton/myButton';
import winMd from '@/components/win/win-md';
import upload from '@/components/upload/index';
-import { getUploadUrl } from '@/utils/base';
-import { mapGetters } from 'vuex';
+import {getUploadUrl} from '@/utils/base';
+import {mapGetters} from 'vuex';
export default {
components: { MyButton, winMd, upload },
@@ -191,6 +186,18 @@
},
},
data() {
+ // 鑷畾涔夋牎楠�
+ // 鐗╁搧閲嶅鏍￠獙
+ var checkGoodsTemplateId = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('璇烽�夋嫨'));
+ }
+ let temp = this.formData.transferGoods.filter((v) => v.baseGoodsTemplateId == value);
+ if (!temp || temp.length != 1) {
+ return callback(new Error('宸查�夎繃姝ょ墿鍝�'));
+ }
+ callback();
+ };
return {
loading: false,
agencyOptions: [], // 璋冩嫧鏈烘瀯
@@ -223,7 +230,7 @@
createTime: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
baseCategoryIds: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
- baseGoodsTemplateId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
+ baseGoodsTemplateId: [{ validator: checkGoodsTemplateId, trigger: ['blur', 'change'] }],
modelsIds: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
counts: [
{ required: true, message: '璇疯緭鍏�', trigger: 'change' },
@@ -265,8 +272,8 @@
this.agencyOptions = [res];
this.formData.outAgencyId = res.id;
this.formData.transferGoods.push(JSON.parse(JSON.stringify(this.goodsItem)));
- }else{
- this.$message.warning('鏃犱笂绾ф満鏋�')
+ } else {
+ this.$message.warning('鏃犱笂绾ф満鏋�');
}
});
},
@@ -344,13 +351,6 @@
// 鐗╁搧鍚嶇О鍒楄〃閫夋嫨
goodsTemplateChange(e, index) {
- let temp = this.formData.transferGoods.find((v) => v.baseGoodsTemplateId == e);
- if (temp) {
- this.$message.warning('宸查�夎繃姝ょ墿鍝�');
- return;
- } else {
- this.formData.transferGoods[index].baseGoodsTemplateId = e;
- }
this.formData.transferGoods[index].modelsOptions = [];
this.formData.transferGoods[index].modelsIds = [];
this.formData.transferGoods[index].models = [];
--
Gitblit v1.9.1