| 
					
				 | 
			
			
				@@ -181,7 +181,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         productCode: undefined, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         productName: undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      productType: [], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      productType: [], // 产品分类 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       rules: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         'time': [{ required: true, message: '请选择添加时间', trigger: 'change' }] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -221,20 +221,20 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _this.disabled = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _this.spinning = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            _this.$message.info('请选择添加时间') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            _this.$message.info('请选择查询时间') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             resolve(data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       totalData: null, //  合计 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      colsArr: [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      colsArr: [// 显示列表所需要的列 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           title: '销售退货(明细)', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           value: 'returnFlag', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           key: 'returnFlag', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           disabled: false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      showCols: [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      showCols: []// 选中显示的列 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   computed: { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -253,13 +253,6 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { title: '销售折扣金额', dataIndex: 'salesTotalDiscountAmount', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { title: '销售折后金额', dataIndex: 'salesTotalDiscountedAmount', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { title: '销售成本金额', dataIndex: 'salesTotalCost', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        // { slots: { title: 'salesReturnNum' }, dataIndex: 'salesReturnTotalQty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        // { title: '销售退货金额', dataIndex: 'salesReturnTotalAmount', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        // { title: '销售退货折扣金额', dataIndex: 'salesReturnTotalDiscountAmount', width: 120, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        // { title: '销售退货折后金额', dataIndex: 'salesReturnTotalDiscountedAmount', width: 120, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        // { title: '销售退货成本金额', dataIndex: 'salesReturnTotalCost', width: 120, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        // { title: '销售数量合计', dataIndex: 'totalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        // { title: '销售金额合计', dataIndex: 'totalAmount', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { title: '当前库存数量', dataIndex: 'stockTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { title: '当前库存金额', dataIndex: 'stockTotalCost', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { title: '操作', scopedSlots: { customRender: 'action' }, width: 120, align: 'center', fixed: 'right' } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -277,12 +270,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   methods: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    areaChange (val) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.provinceSn = val[0] ? val[0] : '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.citySn = val[1] ? val[1] : '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.districtSn = val[2] ? val[2] : '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    // 合计 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    // 统计 合计 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     getCount (params) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       salesBillRankCount(params).then(res => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (res.status == 200) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -298,22 +286,13 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.queryParam.beginDate = date[0] || '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.queryParam.endDate = date[1] || '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    custSatelliteChange (v, row) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      if (row && row.customerSn) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.queryParam.customerSn = row.customerSn 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.queryParam.customerName = row.customerName 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.queryParam.customerName = v 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.queryParam.customerSn = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     //  查询 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     handleSearch () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.$refs.ruleForm.validate(valid => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (valid) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           this.$refs.table.refresh(true) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          this.$message.error('添加时间不能为空!') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          this.$message.error('查询时间不能为空!') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           return false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -371,9 +350,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         sysFlag: row.sysFlag 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }).then(res => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (res.status == 200) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          if (res.data) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            this.$message.info('此产品已添加到购物车!') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          this.$message.success('添加购物车成功!') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.spinning = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }) 
			 |