| 
					
				 | 
			
			
				@@ -995,6 +995,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </el-table-column> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <el-table-column 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           label="操作" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          fixed="right" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           align="center" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           class-name="small-padding fixed-width" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         > 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1100,6 +1101,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 <el-date-picker 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   v-model="TWareHouseFees.acceptDateList" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   size="small" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  unlink-panels 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   style="width: 100%" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   value-format="yyyy-MM-dd" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   :default-time="['00:00:00', '23:59:59']" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1228,6 +1230,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   end-placeholder="结束日期" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   value-format="yyyy-MM-dd" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   :default-time="['00:00:00', '23:59:59']" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  unlink-panels 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 > 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 </el-date-picker> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               </el-form-item> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2963,29 +2966,55 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     listTotal(param) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       const { columns, data } = param; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       const sums = []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      columns.forEach((column, index) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (index === 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          sums[index] = "合计"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if ( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          column.label == "金额" || 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          column.label == "对账金额" || 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          column.label == "本次金额" || 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          column.label == "费用金额" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        ) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          const values = data.map((item) => Number(item[column.property])); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          if (!values.every((value) => isNaN(value))) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            sums[index] = values.reduce((prev, curr) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              const value = Number(curr); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              if (!isNaN(value)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                return prev + curr; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                return prev; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      if (data.length>0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (!data[0].fSrcdc) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          columns.forEach((column, index) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (index === 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              sums[index] = "合计"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if ( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              column.label == "金额" || 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              column.label == "对账金额" || 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              column.label == "本次金额" || 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              column.label == "费用金额" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              const values = data.map((item) => Number(item[column.property])); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              if (!values.every((value) => isNaN(value))) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                sums[index] = values.reduce((prev, curr) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  const value = Number(curr); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  if (!isNaN(value)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    return prev + curr; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    return prev; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                }, 0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }, 0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          columns.forEach((column, index) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (index === 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              sums[index] = "合计"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if ( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              column.label == "金额" || 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              column.label == "对账金额" || 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              column.label == "本次金额" || 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              column.label == "费用金额" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              let number = 0 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              data.forEach(item => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if (item.fSrcdc == '收') { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  number = number + Number(item[column.property]) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  number = number - Number(item[column.property]) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              sums[index] = number 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       return sums; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     //财务主取消 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -3937,13 +3966,13 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     //导入重置按钮 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     resetQuery_s() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.TWareHouseFees = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        fCorpid: "", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        fToCorpid: "", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        fMblno: "", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        fStatementNo: "", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        fFeeid: "", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        timeExamine: "", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        timeInterval: "", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        fCorpid: null, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        fToCorpid: null, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        fMblno: null, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        fStatementNo: null, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        fFeeid: null, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        timeExamine: null, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        timeInterval: null, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         fDc: "D", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         fReconciliation: "0", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }; 
			 |