lilei 3 月之前
父節點
當前提交
8a690c7113

+ 13 - 3
src/api/salesDetailNew.js

@@ -61,13 +61,23 @@ export const updateWarehouse = (params) => {
   })
 }
 // 删除全部已选产品
-export const deleteAll = (params) => {
+export const deleteNormalAll = (params) => {
   return axios({
-    url: `/sales/detail/delete/all`,
+    url: `/sales/detail/delete/normalAll`,
     method: 'post',
     data: params,
     headers: {
-      'module': encodeURIComponent(params.salesPromoSn ? '全部删除(salesPromoSn:' + params.salesPromoSn + ')' : '全部删除')
+      'module':'正常产品全部删除'
+    }
+  })
+}
+export const deletePromoAll = (params) => {
+  return axios({
+    url: `/sales/detail/delete/promoAll`,
+    method: 'post',
+    data: params,
+    headers: {
+      'module':'活动产品全部删除'
     }
   })
 }

+ 3 - 3
src/views/salesManagement/salesQueryNew/comps/productActiveList.vue

@@ -167,7 +167,7 @@ import {
   salesDetailInsertBatchBorrow,
   salesDetailDel,
   salesDetailBatchDel,
-  deleteAll,
+  deletePromoAll,
   updateWarehouse
 } from '@/api/salesDetailNew'
 
@@ -769,11 +769,11 @@ export default {
       }
       this.$confirm({
         title: '提示',
-        content: '确认要删除全部已选产品吗?',
+        content: '确认要删除全部已选活动产品吗?',
         centered: true,
         onOk () {
           _this.spinning = true
-          deleteAll({ salesBillSn: _this.salesBillSn }).then(res => {
+          deletePromoAll({ salesBillSn: _this.salesBillSn }).then(res => {
             if (res.status == 200) {
               _this.searchProduct()
               _this.$emit('refash', 'promo', 'batchDel')

+ 2 - 2
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -211,7 +211,7 @@ import {
   salesDetailUpdateQty,
   salesDetailDel,
   salesDetailBatchDel,
-  deleteAll,
+  deleteNormalAll,
   updateWarehouse,
   salesDetaiCount,
   salesBatchInsert } from '@/api/salesDetailNew'
@@ -440,7 +440,7 @@ export default {
         centered: true,
         onOk () {
           _this.spinning = true
-          deleteAll({ salesBillSn: _this.salesBillSn }).then(res => {
+          deleteNormalAll({ salesBillSn: _this.salesBillSn }).then(res => {
             if (res.status == 200) {
               _this.resetSearchForm()
               // 触发事件给父级组件

+ 2 - 2
vue.config.js

@@ -107,9 +107,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.10/ocs-admin',
+        // target: 'http://192.168.2.10/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {