| 
					
				 | 
			
			
				@@ -68,7 +68,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <script> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { commonMixin } from '@/utils/mixin' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { hdExportExcel } from '@/libs/exportExcel' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import { salesParseProducts, salesFailExcel } from '@/api/salesDetail' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import { salesFailExcel } from '@/api/salesDetailNew' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   name: 'SalesChooseImportModal', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   mixins: [commonMixin], 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -105,7 +105,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { title: '数量', dataIndex: 'qtyText', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { title: '库存', dataIndex: 'stockQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { title: '单位', dataIndex: 'productEntity.unit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        { title: '备注', dataIndex: 'errorDesc', width: '20%', align: 'center', customRender: function (text) { return text || '--' } } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { title: '备注', dataIndex: 'importErrorMsgSet', width: '20%', align: 'center', customRender: function (text) { return text || '--' } } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       unLoadData: [], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       loading: false 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -113,29 +113,15 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   methods: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     getData () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      const _this = this 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.loading = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      const params = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        salesBillSn: this.paramsData.salesBillSn, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        path: this.paramsData.path, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        salesPromoSn: this.paramsData.salesPromoSn 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      salesParseProducts(params).then(res => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.loading = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (res.status == 200) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          if (res.data.okList && res.data.okList.length > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            res.data.okList.map((item, index) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              item.no = index + 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          if (res.data.failList && res.data.failList.length > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            res.data.failList.map((item, index) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              item.no = index + 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          _this.loadData = res.data.okList || [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          _this.unLoadData = res.data.failList || [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      const paramsData = JSON.parse(JSON.stringify(this.paramsData)) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.loadData = paramsData.rightList || [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.unLoadData = paramsData.errorList || [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.loadData.map((item, index) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        item.no = index + 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.unLoadData.map((item, index) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        item.no = index + 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        item.importErrorMsgSet = item.remarks.split(',') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 确认导入 
			 |