| 
					
				 | 
			
			
				@@ -97,12 +97,11 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               </a-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 <a-form-item label="转费用报销单"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                  <v-select 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    v-model="queryParam.promoFlag" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    ref="cxFlag" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    code="FLAG" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    placeholder="请选择是否促销单" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    allowClear></v-select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  <a-select v-model="queryParam.expenseClainFlag" placeholder="请选择转费用报销单状态" allowClear> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    <a-select-option value="N">待转</a-select-option> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    <a-select-option value="Y">已转</a-select-option> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    <a-select-option value="ALL">全部</a-select-option> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  </a-select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 </a-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               </a-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </template> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -346,7 +345,8 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         shippingAddrProvinceSn: undefined, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         warehouseSn: undefined, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        promoFlag: undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        promoFlag: undefined, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        expenseClainFlag: undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       totalData: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         totalAmount: 0, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -368,9 +368,9 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.spinning = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         delete parameter.tableId 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         delete parameter.index 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(parameter.sortOrder){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          parameter["sortAlias"] = "sales_bill" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        }else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (parameter.sortOrder) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          parameter['sortAlias'] = 'sales_bill' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           delete parameter.sortField 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 查询总计 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -531,10 +531,10 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     async handleExpense (row) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       const _this = this 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       const hasExpense = await queryCreateBySalesBillSn({ salesBillSn: row.salesBillSn }).then(res => res.data || []) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      const showModalFlag = [hasExpense.exceed,hasExpense.balance,hasExpense.giftConvertAmount] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      const showModalFlag = [hasExpense.exceed, hasExpense.balance, hasExpense.giftConvertAmount] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       const showModal = 0 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       showModalFlag.map(item => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(item){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (item) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           showModal = showModal + 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -668,6 +668,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.queryParam.shippingAddrProvinceSn = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.queryParam.warehouseSn = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.queryParam.promoFlag = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.queryParam.expenseClainFlag = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       if (this.advanced) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.$refs.subarea.clearData() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 |