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/itemdis/distribution/edit.vue | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue b/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue
index 0bf076a..48eb5fe 100644
--- a/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue
+++ b/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue
@@ -61,6 +61,7 @@
:options="categoryOptions"
:props="{ value: 'id',emitPath: false }"
:show-all-levels="false"
+ filterable
clearable
@change="categoryChange($event, goodsIndex)"
style="width: 100%"
@@ -101,8 +102,8 @@
<el-select
v-model="goodsItem.modelsIds"
multiple
- :placeholder="goodsItem.baseCategoryId?'璇烽�夋嫨瑙勬牸鍨嬪彿':'璇峰厛閫夋嫨鐗╁搧鍚嶇О'"
- :disabled="!goodsItem.baseCategoryId"
+ :placeholder="goodsItem.baseGoodsTemplateId?'璇烽�夋嫨瑙勬牸鍨嬪彿':'璇峰厛閫夋嫨鐗╁搧鍚嶇О'"
+ :disabled="!goodsItem.baseGoodsTemplateId"
@change="modelChange($event, goodsIndex)"
@remove-tag="modelRemoveTag($event, goodsIndex)"
style="width: 100%"
@@ -363,7 +364,6 @@
uploadUrl: getUploadUrl(), // 涓婁紶璺緞
multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
disabled: false, // 鏄惁绂佺敤
- type: 'picture', // text/picture
},
};
},
@@ -384,18 +384,12 @@
this.getgoodsModel();
},
- // 鑾峰彇鍏ュ簱浠撳簱鍒楄〃
+ // 鑾峰彇閮ㄩ棬鍒楄〃
getdeptmentList() {
departmentListAll({tenantId: this.userInfo.tenantId})
.then((res) => {
this.departmentOptions = res;
- if (!this.setting.id && res.length) {
- this.formData.transferGoods.push(JSON.parse(JSON.stringify(this.goodsItem)));
- }
- if (this.departmentOptions.length && !this.formData.warehouseId) {
- // 榛樿閫変腑绗竴涓粨搴�
- this.formData.warehouseId = this.departmentOptions[0].id;
- }
+ this.formData.transferGoods.push(JSON.parse(JSON.stringify(this.goodsItem)));
})
.catch((err) => {
console.log('err', err);
--
Gitblit v1.9.1