| 
					
				 | 
			
			
				@@ -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] : '' 
			 |