#419 bug

Merged
lilei merged 3 commits from jianguan-web/develop_yh68 into jianguan-web/pre-release 4 hours ago

+ 6 - 0
src/api/salesNew.js

@@ -90,6 +90,12 @@ export const salesDetailBySn = (params) => {
     method: 'get'
   })
 }
+export const getSalesDetail = (params) => {
+  return axios({
+    url: `/sales/findBySn/${params.salesBillSn}`,
+    method: 'get'
+  })
+}
 // 查询客户名称
 export const salesDetailByNo = (params) => {
   return axios({

+ 8 - 3
src/store/modules/app.js

@@ -53,6 +53,14 @@ const app = {
     isShowCustomerSearch: false, // 客服查询权限
     interFaceList: [
       // 销售单编辑、下推、审核
+      {
+        a: 'sales/findBySn',
+        b: [
+          'sales/auditPass',
+          'sales/auditReject',
+          'sales/auditPush',
+        ]
+      },
       {
         a: 'sales/findBaseBySn',
         b: [
@@ -69,9 +77,6 @@ const app = {
           'sales/detail/addPromo',
           'sales/detail/updateBatch',
           'sales/detail/insertBatch',
-          'sales/auditPass',
-          'sales/auditReject',
-          'sales/auditPush',
           'sales/detail/cancelAll',
           'sales/detail/cancleOfBatch',
           'sales/detail/pushOfBatch',

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/activeStatisticsList.vue

@@ -275,7 +275,7 @@ export default {
               </div>
               <div style="position:absolute;right:0;">
                 {row.promotionRule.stackFlag == 1 ? <a-badge count="叠" numberStyle={{ backgroundColor: '#00aa00', marginLeft: '2px', zoom: '0.7' }}/> : ''}
-                {row.promotionRule.borrowFlag == 1 ? <a-badge count="累" numberStyle={{ backgroundColor: '#F5222D', marginLeft: '2px', zoom: '0.7' }} /> : ''}
+                {row.promotionRule.borrowFlag == 1 ? <a-badge count="累" numberStyle={{ backgroundColor: '#aa55ff', marginLeft: '2px', zoom: '0.7' }} /> : ''}
               </div>
             </div>)
           }

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -196,7 +196,7 @@ export default {
             {record.promotionFlag.indexOf('GATE') >= 0 ? <a-badge count="槛" numberStyle={{ backgroundColor: '#108ee9', zoom: '0.7' }}/> : ''}
             {record.promotionFlag.indexOf('REGULAR') >= 0 ? <a-badge count="正" numberStyle={{ backgroundColor: '#ff5500', zoom: '0.7' }}/> : ''}
             {record.promotionFlag.indexOf('DISCOUNT') >= 0 ? <a-badge count="特" numberStyle={{ backgroundColor: '#faad14', zoom: '0.7' }}/> : ''}
-            {record.borrowFlag == '1' ? <a-badge count="累" numberStyle={{ backgroundColor: '#00aaff', zoom: '0.7' }}/> : ''}
+            {record.borrowFlag == '1' ? <a-badge count="累" numberStyle={{ backgroundColor: '#aa55ff', zoom: '0.7' }}/> : ''}
             {(Number(record.stockQty || 0) < Number(record.unpushedQty || 0)) && _this.showStock && record.borrowFlag != '1' ? <a-badge count="缺" numberStyle={{ zoom: '0.7' }}/> : ''}
           </div>
         )

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

@@ -349,7 +349,7 @@ export default {
                 {row.promotionFlag.indexOf('GATE') >= 0 ? <a-badge count="槛" numberStyle={{ backgroundColor: '#108ee9', zoom: '0.7' }}/> : ''}
                 {row.promotionFlag.indexOf('REGULAR') >= 0 ? <a-badge count="正" numberStyle={{ backgroundColor: '#ff5500', zoom: '0.7' }}/> : ''}
                 {row.promotionFlag.indexOf('DISCOUNT') >= 0 ? <a-badge count="特" numberStyle={{ backgroundColor: '#faad14', zoom: '0.7' }}/> : ''}
-                {row.borrowFlag == '1' ? <a-badge count="累" numberStyle={{ backgroundColor: '#00aaff', zoom: '0.7' }}/> : ''}
+                {row.borrowFlag == '1' ? <a-badge count="累" numberStyle={{ backgroundColor: '#aa55ff', zoom: '0.7' }}/> : ''}
                 {Number(row.stockQty || 0) < Number(row.unpushedQty || 0) && row.borrowFlag != '1' ? <a-badge count="缺" numberStyle={{ zoom: '0.7' }}/> : ''}
               </div>
             )

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

@@ -413,7 +413,7 @@ import auditConfirmModal from './auditModal.vue'
 // 接口
 import {
   salesPromoQueryList,
-  salesDetailBySn,
+  getSalesDetail,
   salesDetailPrint,
   salesDetailExcel,
   salesDetailTypeExcel,
@@ -656,7 +656,7 @@ export default {
     // 详情
     getDetail () {
       this.spinning = true
-      salesDetailBySn({ salesBillSn: this.bizSn || this.$route.params.sn }).then(res => {
+      getSalesDetail({ salesBillSn: this.bizSn || this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.detailData = res.data || null
           this.detailData.totalDiscountAmount = Number(this.detailData.totalOrigAmount || 0) - Number(this.detailData.totalAmount || 0)