lilei 4 weeks ago
parent
commit
74e83de313

+ 10 - 4
src/views/salesManagement/salesQueryNew/detail.vue

@@ -528,7 +528,7 @@ export default {
         { label: '总金额', value: '10' },
         { label: '优惠金额', value: '11' }
       ]
-      this.colsValue = this.colsOptions.filter(item => item.value > 0 && item.value < 8).map(item => item.value)
+      this.colsValue = this.colsOptions.filter(item => item.value > 0 && item.value < 8 || item.value == 11).map(item => item.value)
     },
     // 确定选择经销商库存转单
     openDealerStockOk (val, data) {
@@ -773,8 +773,7 @@ export default {
           return
         }
         // 文字提示,可跳过继续提交
-        if (b.length || e.length) {
-          const textObj = b || e
+        if (b.length) {
           // 弹出确认提示信息,可跳过继续提交
           _this.$confirm({
             title: '提示',
@@ -784,7 +783,7 @@ export default {
             width: 600,
             content: <div style="padding-top:15px;">
               <ol>
-                {textObj.map(item => (
+                {b.map(item => (
                   <li style="padding:3px 0;">{item.message}</li>
                 ))}
               </ol>
@@ -798,6 +797,13 @@ export default {
           })
           return
         }
+        // 只有累计产品
+        if (e.length) {
+          _this.auditText = e[0].message
+          _this.visibleAudit = true
+          _this.spinning = false
+          return
+        }
         // 售价是否低于参考成本价
         if (d.length) {
           if (isBatch) { // 一键审核,弹框文字提示

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

@@ -300,7 +300,7 @@ export default {
         { label: '总金额', value: '10' },
         { label: '优惠金额', value: '11' }
       ]
-      this.colsValue = this.colsOptions.filter(item => item.value > 0 && item.value < 8).map(item => item.value)
+      this.colsValue = this.colsOptions.filter(item => item.value > 0 && item.value < 8 || item.value == 11).map(item => item.value)
     },
     // 查看参与规则明细
     showRuleDetail (sn) {