Browse Source

出库仓库

chenrui 1 year ago
parent
commit
4753baa3ff

+ 7 - 4
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -102,7 +102,7 @@
 
           <a-dropdown>
             <a-menu slot="overlay" @click="handleMenuClick">
-              <a-menu-item key="3">
+              <a-menu-item key="3" :disabled="disablePromo">
                 全部出库仓库设置
               </a-menu-item>
               <a-menu-item key="0" :disabled="disablePromo">
@@ -286,7 +286,7 @@
       @close="closeGuideModel"
       @ok="hanldeImportOk" />
     <!-- 仓库设置 -->
-    <setWarehouse :show="openWarehouseModal" @ok="chooseWarehouseOk" @cancel="openWarehouseModal=false"></setWarehouse>
+    <setWarehouse :title="warehouseTit" :show="openWarehouseModal" @ok="chooseWarehouseOk" @cancel="openWarehouseModal=false"></setWarehouse>
     <!-- 换促销 -->
     <updateActiveModal ref="updateActive" :show="openUpActiveModal" @ok="upActiveOk" @cancel="openUpActiveModal=false"></updateActiveModal>
   </div>
@@ -590,7 +590,8 @@ export default {
         warehouseSn: sn,
         salesBillDetailSnList: snArr,
         salesBillSn: _this.salesBillSn,
-        salesPromoSn: _this.promo.salesPromoSn
+        salesPromoSn: _this.promo.salesPromoSn,
+        allFlag: _this.warehouseTit ? true : undefined
       }
       _this.setWarehouseInfo(ajax_data)
     },
@@ -618,7 +619,9 @@ export default {
       } else if (e.key == 1) { // 删除已选项
         this.handleBatchDel()
       } else if (e.key == 3) {
-        this.openWarehouseModal = true
+        _this.$refs.table.clearSelected()
+        _this.warehouseTit = '全部出库仓库设置'
+        _this.openWarehouseModal = true
       } else {
         this.handleBatchDelAll()
       }

+ 8 - 4
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -49,7 +49,7 @@
                 全部出库仓库设置
               </a-menu-item>
               <a-menu-item key="0">
-                仓库设置
+                部分仓库设置
               </a-menu-item>
               <a-menu-item key="1">
                 删除已选项
@@ -172,7 +172,7 @@
     <!-- 导入产品 -->
     <importGuideModal :openModal="openGuideModal" :params="{salesBillSn: salesBillSn}" @close="closeGuideModel" @ok="hanldeOk" />
     <!-- 仓库设置 -->
-    <setWarehouse :show="openWarehouseModal" @ok="chooseWarehouseOk" @cancel="openWarehouseModal=false"></setWarehouse>
+    <setWarehouse :show="openWarehouseModal" :title="warehouseTit" @ok="chooseWarehouseOk" @cancel="openWarehouseModal=false;warehouseTit = ''"></setWarehouse>
   </div>
 </template>
 
@@ -272,7 +272,8 @@ export default {
       rowSelectionInfo: null,
       warehouseDataList: [],
       countData: null,
-      isInster: false
+      isInster: false,
+      warehouseTit: ''
     }
   },
   computed: {
@@ -399,7 +400,8 @@ export default {
       const ajax_data = {
         warehouseSn: sn,
         salesBillDetailSnList: snArr,
-        salesBillSn: _this.salesBillSn
+        salesBillSn: _this.salesBillSn,
+        allFlag: _this.warehouseTit ? true : undefined
       }
       _this.setWarehouseInfo(ajax_data)
     },
@@ -432,6 +434,8 @@ export default {
       } else if (e.key == 1) { // 删除已选项
         this.handleBatchDel()
       } else if (e.key == 3) {
+        _this.$refs.table.clearSelected()
+        _this.warehouseTit = '全部出库仓库设置'
         _this.openWarehouseModal = true
       } else {
         this.handleBatchDelAll()

+ 5 - 2
src/views/salesManagement/salesQueryNew/comps/setWarehouse.vue

@@ -38,13 +38,16 @@ export default {
   mixins: [commonMixin],
   components: { VSelect, chooseWarehouse },
   props: {
-    show: [Boolean]
+    show: [Boolean],
+    title: {
+      type: String,
+      default: '批量设置出库仓库'
+    }
   },
   data () {
     return {
       opened: this.show,
       spinning: false,
-      title: '批量设置出库仓库',
       confirmLoading: false,
       formItemLayout: {
         labelCol: { span: 4 },

+ 1 - 1
src/views/salesManagement/salesQueryNew/detail.vue

@@ -59,7 +59,7 @@
             <a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
             <a-descriptions-item label="财务状态">{{ detailData&&detailData.financialStatusDictValue || '--' }}</a-descriptions-item>
             <a-descriptions-item label="改单时间" v-if="detailData.salesBillSource=='PURCHASE'">{{ detailData&&detailData.submitDate || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="最新提交时间" v-else>{{ detailData&&detailData.firstSubmitDate || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="最新提交时间" v-if="detailData&&detailData.salesBillSource=='SALES'&&detailData.firstSubmitDate">{{ detailData.firstSubmitDate }}</a-descriptions-item>
             <a-descriptions-item label="备注" :span="3">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
           </a-descriptions>
         </div>