ERP_override.git

			@@ -38,7 +38,7 @@
			},
			mouseConfig:{selected: true},
			filterConfig: { //筛选配置项
			// remote: true
			// remote: true
			},
			customConfig: {
			storage: true
			@@ -82,14 +82,14 @@
			menuConfig:{
			body:{
			options:[
			[
			{ code: 'copyChecked', name: t('basicData.selectSame'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
			{ code: 'copyAll', name: t('basicData.sameAfterwards'), prefixIcon: 'vxe-icon-feedback', visible: true, disabled: false },
			{ code: 'clearChecked', name: t('basicData.clearSelection'), prefixIcon: 'vxe-icon-indicator', visible: true, disabled: false },
			{ code: 'computedSize', name: t('basicData.computedSize'), prefixIcon: 'vxe-icon-chart-line', visible: true, disabled: false },
			{ code: 'paste', name: t('basicData.paste'), prefixIcon: 'vxe-icon-paste', visible: true, disabled: false },
			{ code: 'sort', name: t('craft.sort'), prefixIcon: 'vxe-icon-sort-asc', visible: true, disabled: false },
			]
			[
			{ code: 'copyChecked', name: t('basicData.selectSame'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
			{ code: 'copyAll', name: t('basicData.sameAfterwards'), prefixIcon: 'vxe-icon-feedback', visible: true, disabled: false },
			{ code: 'clearChecked', name: t('basicData.clearSelection'), prefixIcon: 'vxe-icon-indicator', visible: true, disabled: false },
			{ code: 'computedSize', name: t('basicData.computedSize'), prefixIcon: 'vxe-icon-chart-line', visible: true, disabled: false },
			{ code: 'paste', name: t('basicData.paste'), prefixIcon: 'vxe-icon-paste', visible: true, disabled: false },
			{ code: 'sort', name: t('craft.sort'), prefixIcon: 'vxe-icon-sort-asc', visible: true, disabled: false },
			]
			]
			}
			},
			@@ -100,7 +100,7 @@
			{'code': 'review', 'name': t('basicData.review'),status: 'primary'},
			],
			// import: false,
			export: true,
			export: true,
			// print: true,
			zoom: true,
			custom: true
			@@ -161,16 +161,16 @@
			inputPattern:/^(-?\d{1,4}(\.\d{1,2})?\|-?0(\.\d{1,2})?)$/,
			inputErrorMessage: '-9999.99~9999.99',
			})
			.then(({ value }) => {
			const value1 = value*1
			$grid.getTableData().visibleData.forEach((item,index) =>{
			if(index>=result.start && index<=result.end){
			.then(({ value }) => {
			const value1 = value*1
			$grid.getTableData().visibleData.forEach((item,index) =>{
			if(index>=result.start && index<=result.end){

			item[result.cell] = item[result.cell]*1+value1
			}
			item[result.cell] = item[result.cell]*1+value1
			}

			})
			})
			})
			})

			break
			}
			@@ -236,19 +236,15 @@

			for (let i=0; i<uniqueArray.length; i++) {
			const sameOrderNumber = xGrid.value.getTableData().fullData.filter((item) =>
			parseInt(item.orderNumber) === i+1
			parseInt(item.orderNumber) === i+1
			)
			let widthList = []
			let arcList = []
			sameOrderNumber.forEach((item) =>{
			widthList.push(item.childWidth)
			arcList.push(item.arc)
			})
			sameOrderNumber.forEach((item) =>
			widthList.push(item.childWidth)
			)
			widthList = widthList.sort();
			arcList = arcList.sort();
			sameOrderNumber.forEach((item,index) =>{
			item.childWidth = widthList[index]
			item.arc = arcList[index]
			})

			}
			@@ -342,13 +338,13 @@
			trademarkAttr.value = {
			trademark:"3C",
			xImage:false,
			yImage:false,
			tag:true,
			tag2:true ,
			tag3:true,
			xMargin:30,
			yMargin:30,
			location:t('craft.lowLeft')
			yImage:false,
			tag:true,
			tag2:true ,
			tag3:true,
			xMargin:30,
			yMargin:30,
			location:t('craft.lowLeft')
			}
			if(row.icon!=null){
			trademarkAttr.value = JSON.parse(row.icon)