|  | @@ -46,6 +46,7 @@
 | 
	
		
			
				|  |  |            size="small"
 | 
	
		
			
				|  |  |            @click="copyDoc"
 | 
	
		
			
				|  |  |            :loading="btnLoading"
 | 
	
		
			
				|  |  | +          v-if="false"
 | 
	
		
			
				|  |  |          >复制单据</el-button>
 | 
	
		
			
				|  |  |          <el-button
 | 
	
		
			
				|  |  |            type="primary"
 | 
	
	
		
			
				|  | @@ -384,8 +385,9 @@
 | 
	
		
			
				|  |  |  <script>
 | 
	
		
			
				|  |  |  import tableOption from "./config/customerContact.json";
 | 
	
		
			
				|  |  |  import goodsOption from "./config/commodity.json";
 | 
	
		
			
				|  |  | -import {getDeptLazyTree,
 | 
	
		
			
				|  |  | -  getGoods,} from "@/api/basicData/customerInquiry";
 | 
	
		
			
				|  |  | +// import {getDeptLazyTree,
 | 
	
		
			
				|  |  | +//   getGoods,} from "@/api/basicData/customerInquiry";
 | 
	
		
			
				|  |  | +import {getDeptLazyTree, getList as getGoods} from "@/api/basicData/commodityType";
 | 
	
		
			
				|  |  |  import {
 | 
	
		
			
				|  |  |    isDiscount,
 | 
	
		
			
				|  |  |    isPercentage,
 | 
	
	
		
			
				|  | @@ -796,7 +798,7 @@ export default {
 | 
	
		
			
				|  |  |      onLoad(page, params = {}) {
 | 
	
		
			
				|  |  |        let obj = this.deepClone(Object.assign(params, this.search));
 | 
	
		
			
				|  |  |        this.loading = true;
 | 
	
		
			
				|  |  | -      getGoods(page.currentPage, page.pageSize, this.treeDeptId, obj)
 | 
	
		
			
				|  |  | +      getGoods(page.currentPage, page.pageSize,obj, this.treeDeptId)
 | 
	
		
			
				|  |  |          .then(res => {
 | 
	
		
			
				|  |  |            const data = res.data.data;
 | 
	
		
			
				|  |  |            this.page.total = data.total;
 |