chenrui 1 anno fa
parent
commit
e1d10ee41d

+ 2 - 1
src/views/reportData/salesReturnsReport/list.vue

@@ -163,13 +163,13 @@ export default {
         endDate: getDate.getCurrMonthDays().endtime,
         salesReturnBillNo: '',
         goodFlag: undefined,
+        salesReturnType: undefined,
         subareaArea: {
           subareaSn: undefined,
           subareaAreaSn: undefined
         },
         warehouseSn: undefined,
         dealerSn: '',
-        salesReturnType: undefined,
         dealerProvinceSn: undefined,
         dealerCitySn: undefined,
         dealerCountySn: undefined
@@ -330,6 +330,7 @@ export default {
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
       this.queryParam.goodFlag = undefined
+      this.queryParam.salesReturnType = undefined
       this.$refs.subarea.clearData()
       if (this.advanced) {
         this.$refs.custList.resetForm()

+ 2 - 2
src/views/salesReturnManagement/salesReturn/list.vue

@@ -331,8 +331,8 @@ export default {
         { title: '客户采退申请单号', dataIndex: 'purchaseReturnApplyNo', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '7%', align: 'center' },
         { title: '客户名称', dataIndex: 'buyerName', width: '7%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '退货类别', dataIndex: 'goodFlagDictValue', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货类型', dataIndex: 'salesReturnTypeDictValue', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '退货类别', dataIndex: 'goodFlagDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '退货类型', dataIndex: 'salesReturnTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '申请退货数量', dataIndex: 'totalInitialQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓库实收数量', dataIndex: 'totalReceiveQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },