From aef2a705884dbb25b24d23fc886c563327f4753e Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期一, 27 十一月 2023 17:34:07 +0800
Subject: [PATCH] feat:

---
 admin-web/src/views/stock/scrap/itemScrapping/edit.vue |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
index a4846ec..ea65c12 100644
--- a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
+++ b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
@@ -139,9 +139,9 @@
                 <el-select v-model="scope.row.scrappedCode" placeholder="璇烽�夋嫨">
                   <el-option
                     v-for="item in scrapReasonOptions"
-                    :key="item.dict_value"
+                    :key="item.dict_code"
                     :label="item.dict_label"
-                    :value="item.dict_value"
+                    :value="item.dict_code"
                   />
                 </el-select>
               </template>
@@ -241,7 +241,6 @@
         warehouseId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
         dealTime: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
         buyType: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
-
         uploadFiles: [{ required: true, message: '璇蜂笂浼�', trigger: 'change' }],
         baseCategoryIds: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
         baseGoodsTemplateId: [{ validator: checkGoodsTemplateId, trigger: ['blur', 'change'] }],
@@ -252,7 +251,6 @@
         title: '涓婁紶',
         max: 20, // 鏈�澶уぇ灏忥紝鍗曚綅M
         num: 10, // 鏀寔涓婁紶鍥剧墖涓暟
-        accept: '.jpg,.png', // 闄愬埗鏍煎紡
         tip: '', // 鎻愮ず 榛樿锛歚鍙兘涓婁紶${this.defaultSettings.num}涓�${this.defaultSettings.accept}鏂囦欢锛屼笖涓嶈秴杩�${this.defaultSettings.max}kb`
         uploadUrl: getUploadUrl(), // 涓婁紶璺緞
         multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
@@ -272,7 +270,7 @@
       this.getWarehouseList();
       this.getgoodsTemplate();
       this.getgoodsModel();
-      this.getCategoryTree();
+      await this.getCategoryTree();
       this.formData.scrappedGoodsInfo.push(JSON.parse(JSON.stringify(this.goodsItem)));
       this.formData.operatorId = this.userInfo.id;
       this.formData.operatorName = this.userInfo.userName;
@@ -291,7 +289,7 @@
 
     // 鑾峰彇鎶ュ簾浠撳簱鍒楄〃
     getWarehouseList() {
-      selectTenantWarehouse()
+      selectTenantWarehouse({ agencyId: this.userInfo.tenantId })
         .then((res) => {
           this.warehouses = res;
           if (this.warehouses.length && !this.formData.warehouseId) {
@@ -427,7 +425,6 @@
     handleSubmit() {
       this.$refs['ruleForm'].validate((valid) => {
         if (valid) {
-          console.log('this.formData', this.formData);
           scrappedAdd(this.formData)
             .then((res) => {
               this.$message.success('淇濆瓨鎴愬姛锛�');

--
Gitblit v1.9.1