lilei 1 rok temu
rodzic
commit
a43d4f8ad1

+ 1 - 1
public/version.json

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

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

@@ -96,9 +96,9 @@ const warehouse = {
               return con.defaultFlag == 1 ? con.warehouseSn : ''
             })
             this.defaultVal = defaultWarehouseVal.warehouseSn
-            this.$emit('load', defaultWarehouseVal.warehouseSn)
+            this.$emit('load', defaultWarehouseVal.warehouseSn, this.warehouseData)
           } else {
-            this.$emit('load')
+            this.$emit('load', null, this.warehouseData)
           }
         } else {
           if (this.isPermission) {

+ 7 - 6
src/views/salesManagement/sendOutOrder/list.vue

@@ -63,9 +63,9 @@
                   <Area id="sendOut-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24" v-show="isShowWarehouse">
+              <a-col :md="6" :sm="24">
                 <a-form-model-item label="仓库">
-                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
+                  <chooseWarehouse ref="warehouse" @load="warehouseLoad" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
             </template>
@@ -91,7 +91,7 @@
           </a-row>
         </a-form>
         <!-- 操作按钮 -->
-        <div v-if="!isShowWarehouse">
+        <div v-if="isShowImport">
           <a-button type="primary" class="button-error" v-if="$hasPermissions('B_sendOutPlImport')" @click="openGuideModal=true">批量导入</a-button>
         </div>
       </div>
@@ -198,6 +198,7 @@ export default {
       },
       showTipModal: false,
       showSendGoodModal: false,
+      isShowImport: false,
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
@@ -219,9 +220,6 @@ export default {
     }
   },
   computed: {
-    isShowWarehouse () {
-      return this.$store.state.app.isWarehouse
-    },
     columns () {
       const _this = this
       const arr = [
@@ -262,6 +260,9 @@ export default {
       this.queryParam.sendBeginDate = date[0]
       this.queryParam.sendEndDate = date[1]
     },
+    warehouseLoad(def,data){
+      this.isShowImport = data.length == 1
+    },
     // 详情
     handleDetail (row, type) {
       this.showTipModal = true