lilei 2 年之前
父節點
當前提交
3143752fad

+ 2 - 1
src/views/common/chooseWarehouse.js

@@ -79,7 +79,8 @@ const warehouse = {
       ajaxName({}).then(res => {
         if (res.status == 200) {
           this.$store.state.app.isWarehouse = res.data && res.data.length > 1
-          this.$store.state.app.defWarehouse = res.data && res.data[0]
+          const defWarehouse = res.data.find(item => item.defaultFlag == 1)
+          this.$store.state.app.defWarehouse = this.isPermission ? res.data && res.data[0] : defWarehouse
           this.warehouseData = res.data || []
         } else {
           this.$store.state.app.isWarehouse = false

+ 5 - 0
src/views/salesReturnManagement/salesReturn/chooseCustomModal.vue

@@ -55,6 +55,7 @@
           <a-form-model-item label="退货仓库" prop="warehouseSn">
               <warehouse
                 v-model="form.warehouseSn"
+                disabled
                 id="chooseCustom-basicInfo-warehouseSn"
                 placeholder="请选择退货仓库"
               />
@@ -215,7 +216,11 @@ export default {
     show (newValue, oldValue) {
       this.opened = newValue
       if (newValue) {
+        this.form.warehouseSn = this.defWarehouse&&this.defWarehouse.warehouseSn
       }
+    },
+    defWarehouse(a,b){
+      this.form.warehouseSn = a&&a.warehouseSn
     }
   }
 }

+ 1 - 0
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -10,6 +10,7 @@
             退货仓库:<warehouse
                style="width:200px;"
                :allowClear="false"
+               disabled
                 v-model="ordeDetail.warehouseSn"
                 @change="updateWarehouse"
                 id="basicInfo-warehouseSn"