#416 bug

Merged
lilei merged 5 commits from jianguan-web/develop_yh68 into jianguan-web/pre-release 1 day ago

+ 6 - 0
src/api/salesNew.js

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

+ 16 - 10
src/store/modules/app.js

@@ -52,12 +52,11 @@ const app = {
     isWarehouse: false, // 仓库管理权限
     isShowCustomerSearch: false, // 客服查询权限
     interFaceList: [
-      // 销售单,下推
+      // 销售单编辑
       {
-        a: 'sales/findBySn',
+        a: 'sales/findBaseBySn',
         b: [
           'sales/submit',
-          'dispatch/pushDown',
           'sales/detail/insert',
           'sales/detail/delete',
           'sales/detail/updateWarehouse',
@@ -68,19 +67,26 @@ const app = {
           'sales/detail/enablePromo',
           'sales/detail/changePromo',
           'sales/detail/addPromo',
+          'sales/detail/updateBatch',
+          'sales/detail/insertBatch',
+        ],
+        timeStr: ''
+      },
+      //审核,下推
+      {
+        a: 'sales/findBySn',
+        b:[
           'sales/auditPass',
           'sales/auditReject',
           'sales/auditPush',
-          'sales/detail/updateBatch',
-          'sales/detail/batchTransferOfPurchaseAmount',
-          'sales/detail/insertBatch',
-          'sales/detail/cancleOfBatch',
           'sales/detail/cancelAll',
+          'sales/detail/cancleOfBatch',
           'sales/detail/pushOfBatch',
           'dispatch/detail/deleteBatch',
-          'dispatch/detail/updateQty'
-        ],
-        timeStr: ''
+          'dispatch/detail/updateQty',
+          'dispatch/pushDown',
+          'sales/detail/batchTransferOfPurchaseAmount',
+        ]
       },
       // 销售退货
       {

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

@@ -196,6 +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' }}/> : ''}
             {(Number(record.stockQty || 0) < Number(record.unpushedQty || 0)) && _this.showStock && record.borrowFlag != '1' ? <a-badge count="缺" numberStyle={{ zoom: '0.7' }}/> : ''}
           </div>
         )

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

@@ -349,6 +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' }}/> : ''}
                 {Number(row.stockQty || 0) < Number(row.unpushedQty || 0) && row.borrowFlag != '1' ? <a-badge count="缺" numberStyle={{ zoom: '0.7' }}/> : ''}
               </div>
             )

+ 3 - 3
src/views/salesManagement/salesQueryNew/edit.vue

@@ -215,7 +215,7 @@ import discountSortModal from './discountSortModal.vue'
 import vaildPriceModal from './vaildPriceModal.vue'
 import { salesChangePromo } from '@/api/salesDetailNew'
 import {
-  salesDetailBySn,
+  salesDetailBaseBySn,
   salesPromoQueryCount,
   salesWriteSubmit,
   salesPromoQueryList,
@@ -520,7 +520,7 @@ export default {
     // 如果添加操作,不实时刷新列表,关闭后再刷新
     async refashTableData (type, action) {
       // 重新获取详情信息更新时间
-      const detail = await salesDetailBySn({ salesBillSn: this.$route.params.sn }).then(res => res.data)
+      const detail = await salesDetailBaseBySn({ salesBillSn: this.$route.params.sn }).then(res => res.data)
       if (detail) {
         this.detailData = detail
         this.detailData.totalDiscountAmount = Number(this.detailData.totalOrigAmount || 0) - Number(this.detailData.totalAmount || 0)
@@ -567,7 +567,7 @@ export default {
     //  销售单详情 flag: true 查询活动列表,false 不查
     async getOrderDetail (flag) {
       this.spinning = true
-      const detail = await salesDetailBySn({ salesBillSn: this.$route.params.sn }).then(res => res.data)
+      const detail = await salesDetailBaseBySn({ salesBillSn: this.$route.params.sn }).then(res => res.data)
       if (detail) {
         this.detailData = detail
         this.detailData.totalDiscountAmount = Number(this.detailData.totalOrigAmount || 0) - Number(this.detailData.totalAmount || 0)