lilei 2 일 전
부모
커밋
1cc13e6a6b
3개의 변경된 파일14개의 추가작업 그리고 15개의 파일을 삭제
  1. 1 1
      public/version.json
  2. 11 12
      src/views/salesManagement/salesReturn/list.vue
  3. 2 2
      vue.config.js

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1752821208585
+  "version": 1753079328928
 }

+ 11 - 12
src/views/salesManagement/salesReturn/list.vue

@@ -68,8 +68,10 @@
       <a-alert type="info" style="margin-bottom: 10px;">
         <div slot="message">
           退货总金额:<strong>{{ countData&&(countData.totalAmount || countData.totalAmount==0) ? toThousands(countData.totalAmount ): '--' }}</strong>;
-          折扣总金额:<strong>{{ countData&&(countData.discountAmount || countData.discountAmount==0) ? toThousands(countData.discountAmount ): '--' }}</strong>;
-          折后总金额:<strong>{{ countData&&(countData.discountedAmount || countData.discountedAmount==0) ? toThousands(countData.discountedAmount ): '--' }}</strong>;
+          <span v-if="showDiscount">
+            折扣总金额:<strong>{{ countData&&(countData.discountAmount || countData.discountAmount==0) ? toThousands(countData.discountAmount ): '--' }}</strong>;
+            折后总金额:<strong>{{ countData&&(countData.discountedAmount || countData.discountedAmount==0) ? toThousands(countData.discountedAmount ): '--' }}</strong>;
+          </span>
           总单数:<strong>{{ countData&&(countData.totalBillNumber || countData.totalBillNumber==0) ? countData.totalBillNumber : '--' }}</strong>;
           总款数:<strong>{{ countData&&(countData.totalCategory || countData.totalCategory==0) ? countData.totalCategory : '--' }}</strong>;
           总数量:<strong>{{ countData&&(countData.totalQty || countData.totalQty==0) ? countData.totalQty : '--' }}</strong>;
@@ -202,15 +204,9 @@ export default {
         })
       },
       colsArr: [// 需要显示的列
-        {
-          title: '折扣金额',
-          key: 'discountAmount',
-          disabled: false,
-          checked: false
-        },
         {
           title: '折后金额',
-          key: 'discountedAmount',
+          key: 'discount',
           disabled: false,
           checked: false
         }
@@ -228,8 +224,8 @@ export default {
         { title: '客户名称', dataIndex: 'buyerNameCurrent', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户关系', dataIndex: 'buyerRelationTypeDictValue', align: 'center', width: '9%', customRender: function (text) { return text || '--' } },
         { title: '退款总金额', dataIndex: 'totalAmount', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '折扣金额', dataIndex: 'discountAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '折后金额', dataIndex: 'discountedAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '折扣金额', cell: 'discount', dataIndex: 'discountAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '折后金额', cell: 'discount', dataIndex: 'discountedAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '总款数', dataIndex: 'totalCategory', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '是否抓单', dataIndex: 'grabFlag', width: '6%', align: 'center', customRender: function (text) { return ['否', '是'][text] } },
@@ -239,7 +235,10 @@ export default {
         { title: '付款', scopedSlots: { customRender: 'financial' }, width: '3%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '11%', align: 'center' }
       ]
-      return arr.filter(item => !_this.showCell.includes(item.dataIndex))
+      return arr.filter(item => !_this.showCell.includes(item.cell))
+    },
+    showDiscount () {
+      return !this.showCell.includes('discountedAmount')
     }
   },
   methods: {

+ 2 - 2
vue.config.js

@@ -209,8 +209,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.10/qpls-md',
-        // target: 'https://p.iscm.360arrow.com/qpls-md',
+        // target: 'http://192.168.2.10/qpls-md',
+        target: 'https://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,