Sfoglia il codice sorgente

Merge branch 'develop_yh22' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh22

lilei 1 anno fa
parent
commit
6863ca95fa

+ 25 - 0
src/views/reportData/returnSlipReport/list.vue

@@ -55,6 +55,27 @@
                   <AreaList id="returnSlipReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="退货类别" prop="goodFlag">
+                  <v-select
+                    v-model="queryParam.goodFlag"
+                    ref="goodFlag"
+                    id="returnSchedule-goodFlag"
+                    code="GOOD_FLAG"
+                    placeholder="请选择退货类别"
+                    allowClear></v-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="退货类型">
+                  <v-select
+                    v-model="queryParam.salesReturnType"
+                    id="departUser-salesReturnType"
+                    code="SALES_RETURN_TYPE"
+                    placeholder="请选择退货类型"
+                    allowClear></v-select>
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="returnSlipReportList-refresh">查询</a-button>
@@ -154,6 +175,8 @@ export default {
           bizUserSn: undefined
         },
         dealerLevel: undefined,
+        salesReturnType: undefined,
+        goodFlag: undefined,
         salesReturnBillNo: ''
       },
       rules: {
@@ -272,6 +295,8 @@ export default {
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.dealerLevel = undefined
+      this.queryParam.salesReturnType = undefined
+      this.queryParam.goodFlag = undefined
       this.queryParam.salesReturnBillNo = ''
       this.$refs.custList.resetForm()
       this.totalData = null

+ 45 - 19
src/views/reportData/salesReturnDetailReport/list.vue

@@ -17,22 +17,22 @@
                 <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="退货单号">
                 <a-input id="salesReturnDetailList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品编码">
                 <a-input id="salesReturnDetailList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="产品名称">
+                <a-input id="salesReturnDetailList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+              </a-form-model-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品名称">
-                  <a-input id="salesReturnDetailList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户名称">
                   <a-input id="salesReturnDetailList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入客户名称"/>
@@ -76,12 +76,33 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="区域负责人">
-                    <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                  <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区">
-                    <AreaList id="salesReturnDetailList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
+                  <AreaList id="salesReturnDetailList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="退货类别" prop="goodFlag">
+                  <v-select
+                    v-model="queryParam.goodFlag"
+                    ref="goodFlag"
+                    id="returnSchedule-goodFlag"
+                    code="GOOD_FLAG"
+                    placeholder="请选择退货类别"
+                    allowClear></v-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="退货类型">
+                  <v-select
+                    v-model="queryParam.salesReturnType"
+                    id="departUser-salesReturnType"
+                    code="SALES_RETURN_TYPE"
+                    placeholder="请选择退货类型"
+                    allowClear></v-select>
                 </a-form-model-item>
               </a-col>
             </template>
@@ -180,13 +201,15 @@ export default {
         productName: '',
         dealerName: '',
         dealerLevel: undefined,
+        goodFlag: undefined,
+        salesReturnType: undefined,
         productBrandTypeSn: undefined,
         productBrandSn: undefined, //  产品品牌
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
         warehouseSn: undefined,
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined,
           subareaAreaSn: undefined,
           bizUserSn: undefined
@@ -239,7 +262,8 @@ export default {
         { title: '客户级别', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '直接绑定客户名称', dataIndex: 'directDealerName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '间接绑定客户名称', dataIndex: 'indirectDealerName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '退货类型', dataIndex: 'salesReturnTypeDictValue', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '退货类别', dataIndex: 'goodFlagDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '退货类型', dataIndex: 'salesReturnTypeDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货完成日期', dataIndex: 'salesReturnDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productBrandName', width: 130, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '二级分类', dataIndex: 'productTypeName2', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
@@ -251,7 +275,7 @@ export default {
         { title: '仓库实收数量', dataIndex: 'receiveQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'badQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '良品数量', dataIndex: 'goodQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '返库数量', dataIndex: 'backStockQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '返库数量', dataIndex: 'backStockQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
         // { title: '退货开单价', dataIndex: 'price', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '退货开单金额', dataIndex: 'totalPrice', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '退货实售价', dataIndex: 'realPrice', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -271,17 +295,17 @@ export default {
         arr.push({ title: '退货开单金额', dataIndex: 'totalPrice', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.push({ title: '退货实售价', dataIndex: 'realPrice', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.push({ title: '退货实售金额', dataIndex: 'totalRealAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      } 
-      if (this.$hasPermissions('M_salesReturnDetailReportList_cityPrice')) { 
+      }
+      if (this.$hasPermissions('M_salesReturnDetailReportList_cityPrice')) {
         arr.push({ title: '市级价金额', dataIndex: 'totalWholesalePrice2', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
-      if (this.$hasPermissions('M_salesReturnDetailReportList_salesPrice')) {   
+      if (this.$hasPermissions('M_salesReturnDetailReportList_salesPrice')) {
         arr.push({ title: '直接差价', dataIndex: 'directRebateAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.push({ title: '间接差价', dataIndex: 'indirectRebateAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.push({ title: '再入库单价', dataIndex: 'cost', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       arr.push({ title: '正常退货数量', dataIndex: 'normalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-      if (this.$hasPermissions('M_salesReturnDetailReportList_salesPrice')) {  //  价权限
+      if (this.$hasPermissions('M_salesReturnDetailReportList_salesPrice')) { //  价权限
         arr.push({ title: '正常退货金额', dataIndex: 'totalNormalPrice', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.push({ title: '正常再入库金额', dataIndex: 'totalNormalCost', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.push({ title: '正常退货入库差额', dataIndex: 'totalNormalBalance', width: 110, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
@@ -310,7 +334,7 @@ export default {
         if (valid) {
           _this.$refs.table.refresh(true)
         } else {
-          _this.$message.error("请选择退货完成日期")
+          _this.$message.error('请选择退货完成日期')
           return false
         }
       })
@@ -354,7 +378,7 @@ export default {
       this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
       this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
     },
-    subareaChange(val){
+    subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
@@ -384,6 +408,8 @@ export default {
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.goodFlag = undefined
+      this.queryParam.salesReturnType = undefined
       this.productType = []
       if (this.advanced) {
         this.$refs.subarea.clearData()
@@ -393,7 +419,7 @@ export default {
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()
     },
-    areaChange(val){
+    areaChange (val) {
       this.queryParam.dealerProvinceSn = val[0] ? val[0] : ''
       this.queryParam.dealerCitySn = val[1] ? val[1] : ''
       this.queryParam.dealerCountySn = val[2] ? val[2] : ''

+ 21 - 8
src/views/reportData/salesReturnsReport/list.vue

@@ -52,21 +52,31 @@
               <a-col :md="5" :sm="24">
                 <a-form-model-item label="退货类型">
                   <v-select
-                    v-model="queryParam.dealerLevel"
-                    ref="dealerLevel"
-                    id="salesReturnsReportList-dealerLevel"
-                    code="DEALER_LEVEL"
+                    v-model="queryParam.salesReturnType"
+                    id="departUser-salesReturnType"
+                    code="SALES_RETURN_TYPE"
                     placeholder="请选择退货类型"
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <a-col :md="7" :sm="24">
                 <a-form-model-item label="退货仓库">
                   <chooseWarehouse ref="warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="7" :sm="24">
+                <a-form-model-item label="退货类别" prop="goodFlag">
+                  <v-select
+                    v-model="queryParam.goodFlag"
+                    ref="goodFlag"
+                    id="returnSchedule-goodFlag"
+                    code="GOOD_FLAG"
+                    placeholder="请选择退货类别"
+                    allowClear></v-select>
+                </a-form-model-item>
+              </a-col>
             </template>
-            <a-col :md="7" :sm="24" style="margin-bottom: 10px;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button
                 type="primary"
                 class="button-info"
@@ -152,13 +162,14 @@ export default {
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
         salesReturnBillNo: '',
+        goodFlag: undefined,
         subareaArea: {
           subareaSn: undefined,
           subareaAreaSn: undefined
         },
         warehouseSn: undefined,
         dealerSn: '',
-        dealerLevel: undefined,
+        salesReturnType: undefined,
         dealerProvinceSn: undefined,
         dealerCitySn: undefined,
         dealerCountySn: undefined
@@ -199,7 +210,8 @@ export default {
         { title: '退货完成日期', dataIndex: 'salesReturnDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'dealerName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货类型', dataIndex: 'returnType', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '退货类别', dataIndex: 'goodFlagDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '退货类型', dataIndex: 'salesReturnTypeDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '直接绑定客户名称', dataIndex: 'directDealerName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '间接绑定客户名称', dataIndex: 'indirectDealerName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '退货数量', dataIndex: 'totalQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -317,6 +329,7 @@ export default {
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
+      this.queryParam.goodFlag = undefined
       this.$refs.subarea.clearData()
       if (this.advanced) {
         this.$refs.custList.resetForm()

+ 28 - 1
src/views/salesReturnManagement/returnConfirmation/list.vue

@@ -48,6 +48,27 @@
                   <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="退货类别" prop="goodFlag">
+                  <v-select
+                    v-model="queryParam.goodFlag"
+                    ref="goodFlag"
+                    id="returnSchedule-goodFlag"
+                    code="GOOD_FLAG"
+                    placeholder="请选择退货类别"
+                    allowClear></v-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="退货类型">
+                  <v-select
+                    v-model="queryParam.salesReturnType"
+                    id="departUser-salesReturnType"
+                    code="SALES_RETURN_TYPE"
+                    placeholder="请选择退货类型"
+                    allowClear></v-select>
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="returnConfirmationList-refresh">查询</a-button>
@@ -118,7 +139,9 @@ export default {
         buyerSn: undefined,
         salesReturnBillSource: undefined,
         billStatus: undefined, //  状态
-        warehouseSn: undefined //  仓库
+        warehouseSn: undefined, //  仓库
+        goodFlag: undefined,
+        salesReturnType: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       advanced: true,
@@ -153,6 +176,8 @@ export default {
         { title: '单据来源', dataIndex: 'salesReturnBillSourceDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '15%', align: 'center' },
         { title: '客户名称', dataIndex: 'buyerName', align: 'center', width: '15%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { 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: 'warehouseName', align: 'center', width: '15%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '申请退货数量', dataIndex: 'totalInitialQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓库实收数量', dataIndex: 'totalReceiveQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -186,6 +211,8 @@ export default {
       this.queryParam.salesReturnBillSource = undefined
       this.queryParam.billStatus = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.goodFlag = undefined
+      this.queryParam.salesReturnType = undefined
       this.$refs.dealerSubareaScopeList.resetForm()
       this.$refs.table.refresh(true)
     },

+ 34 - 19
src/views/salesReturnManagement/salesReturn/list.vue

@@ -20,6 +20,27 @@
                 <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesReturn-buyerSn" @change="custChange" />
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="退货类别" prop="goodFlag">
+                <v-select
+                  v-model="queryParam.goodFlag"
+                  ref="goodFlag"
+                  id="returnSchedule-goodFlag"
+                  code="GOOD_FLAG"
+                  placeholder="请选择退货类别"
+                  allowClear></v-select>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="退货类型">
+                <v-select
+                  v-model="queryParam.salesReturnType"
+                  id="departUser-salesReturnType"
+                  code="SALES_RETURN_TYPE"
+                  placeholder="请选择退货类型"
+                  allowClear></v-select>
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="总部销退单号">
                 <a-input id="salesReturn-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
@@ -42,17 +63,6 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="退货类别">
-                  <v-select
-                    v-model="queryParam.goodFlag"
-                    ref="goodFlag"
-                    id="salesReturn-goodFlag"
-                    code="GOOD_FLAG"
-                    placeholder="请选择退货类别"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="是否同步给客户">
                   <v-select
@@ -82,8 +92,8 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
-                    <Area id="salesReturn-provinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
-                  </a-form-model-item>
+                  <Area id="salesReturn-provinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
+                </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="退货仓库">
@@ -116,7 +126,7 @@
             良品数量:{{ countData&&countData.totalGoodQty||0 }};
             返库数量:{{ countData&&countData.totalBackStockQty||0 }};
             <span v-if="$hasPermissions('M_salesReturnList_salesPrice')">
-            实际退货金额:{{ countData&&countData.totalAmount?toThousands(countData.totalAmount):0 }};
+              实际退货金额:{{ countData&&countData.totalAmount?toThousands(countData.totalAmount):0 }};
             </span>
           </div>
         </a-alert>
@@ -273,13 +283,15 @@ export default {
         syncFlag: undefined, // 是否同步给客户
         billStatus: undefined, // 业务状态
         goodFlag: undefined,
+        salesReturnType: undefined,
         warehouseSn: undefined, // 仓库
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined,
           subareaAreaSn: undefined
         },
         shippingAddrProvinceSn: undefined,
         salesReturnBillSource: undefined
+
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -320,6 +332,7 @@ export default {
         { 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: '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 : '--') } },
@@ -329,8 +342,8 @@ export default {
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
-      if(this.$hasPermissions('M_salesReturnList_salesPrice')){
-        arr.splice(13,0,{ title: '实际退货金额', dataIndex: 'totalAmount', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+      if (this.$hasPermissions('M_salesReturnList_salesPrice')) {
+        arr.splice(13, 0, { title: '实际退货金额', dataIndex: 'totalAmount', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr
     }
@@ -380,7 +393,7 @@ export default {
       }
     },
     // 取消
-    handleCansel(row){
+    handleCansel (row) {
       const _this = this
       this.$confirm({
         title: '提示',
@@ -441,7 +454,7 @@ export default {
         this.spinning = false
       })
     },
-    subareaChange(val){
+    subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
@@ -465,6 +478,8 @@ export default {
       this.queryParam.salesReturnBillSource = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.goodFlag = undefined
+      this.queryParam.salesReturnType = undefined
       if (this.advanced) {
         this.$refs.subarea.clearData()
       }