Browse Source

Merge branch 'develop_yh23' of jianguan-web/jg-ocs-html into pre-release

李磊 1 năm trước cách đây
mục cha
commit
20590578ae

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.45",
+    "version": "2.2.49",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 8 - 2
src/views/allocationManagement/transferOut/basicInfoModal.vue

@@ -48,7 +48,9 @@
           <a-col :md="12" :sm="24" v-if="!isEdit">
             <a-form-model-item label="调出仓库" prop="warehouseSn">
               <warehouse
+                isPermission
                 v-model="form.warehouseSn"
+                ref="warehouse"
                 id="allocateBill-basicInfo-warehouseSn"
                 placeholder="请选择调出仓库"
               />
@@ -253,9 +255,13 @@ export default {
     // 调往对象名称经销商  change
     handleChange (value) {
       const ind = this.dealerData.findIndex(item => item.dealerSn == value)
-      console.log(this.dealerData[ind])
       this.form.targetName = this.dealerData[ind].dealerName
-      this.form.warehouseSn = this.dealerData[ind].defaultWarehouseSn
+      const wsn = this.dealerData[ind].defaultWarehouseSn
+      if(this.$refs.warehouse.hasWarehouse(wsn)){
+        this.form.warehouseSn = wsn
+      }else{
+        this.form.warehouseSn = undefined
+      }
     },
     //  保存
     handleSave () {

+ 3 - 0
src/views/common/chooseWarehouse.js

@@ -109,6 +109,9 @@ const warehouse = {
         }
       })
     },
+    hasWarehouse(){
+      return this.warehouseData.find(item => item.warehouseSn == sn)
+    },
     clearData () {
       this.handleChange([])
     }