lilei пре 1 година
родитељ
комит
e4db812a4a

+ 3 - 2
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -644,6 +644,7 @@
             salesDetailDel({ salesBillDetailSn: row.salesBillDetailSn, salesBillSn: _this.salesBillSn, salesPromoSn: _this.promo.salesPromoSn }).then(res => {
               if (res.status == 200) {
                 _this.resetSearchForm(true)
+                _this.$emit('insterOk','promo')
                 _this.$message.success(res.message)
               }
               _this.delLoading = false
@@ -705,8 +706,8 @@
         }
         salesDetailInsert(params).then(res => {
           if (res.status == 200) {
-            this.resetSearchForm()
             this.$message.success('产品添加成功', 2.5)
+            this.resetSearchForm()
             this.$emit('insterOk','promo')
           }
           this.spinning = false
@@ -741,8 +742,8 @@
         
         salesBatchInsert(params).then(res => {
           if (res.status == 200) {
-            this.resetSearchForm()
             this.$message.success('产品导入成功', 2.5)
+            this.resetSearchForm()
             this.$emit('insterOk','promo')
           }
         })

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

@@ -165,10 +165,10 @@
       </template>
     </s-table>
 
-      <!-- 导入产品 -->
-      <importGuideModal :openModal="openGuideModal" :params="{salesBillSn: salesBillSn}" @close="closeGuideModel" @ok="hanldeOk" />
-      <!-- 仓库设置 -->
-      <setWarehouse :show="openWarehouseModal" @ok="chooseWarehouseOk" @cancel="openWarehouseModal=false"></setWarehouse>
+    <!-- 导入产品 -->
+    <importGuideModal :openModal="openGuideModal" :params="{salesBillSn: salesBillSn}" @close="closeGuideModel" @ok="hanldeOk" />
+    <!-- 仓库设置 -->
+    <setWarehouse :show="openWarehouseModal" @ok="chooseWarehouseOk" @cancel="openWarehouseModal=false"></setWarehouse>
   </div>
 </template>
 
@@ -478,8 +478,8 @@
             _this.spinning = true
             salesDetailDel({ salesBillDetailSn: row.salesBillDetailSn, salesBillSn: _this.salesBillSn }).then(res => {
               if (res.status == 200) {
-                _this.resetSearchForm(true)
                 _this.$message.success(res.message)
+                _this.resetSearchForm()
                 _this.$emit('insterOk','normal')
               }
               _this.delLoading = false
@@ -519,8 +519,8 @@
           warehouseSn: row.warehouseSn
         }).then(res => {
           if (res.status == 200) {
-            this.resetSearchForm()
             this.$message.success('产品添加成功', 2.5)
+            this.resetSearchForm()
             this.$emit('insterOk','normal')
           }
           this.spinning = false
@@ -542,8 +542,9 @@
        
         salesBatchInsert(params).then(res => {
           if (res.status == 200) {
-            this.$refs.table.refresh(true)
-            this.getOrderDetail(false)
+            this.$message.success('产品导入成功', 2.5)
+            this.resetSearchForm()
+            this.$emit('insterOk','normal')
           }
         })
       },

+ 0 - 1
src/views/salesManagement/salesQueryNew/edit.vue

@@ -276,7 +276,6 @@ export default {
           this.$refs['productList-' + item.promoRuleSn][0].resetSearchForm()
         })
       }
-      
       this.getOrderDetail()
     },
     // 新增产品