ERP_override.git

			@@ -15,7 +15,7 @@
			import downLoadFile from "@/hook/downLoadFile"
			import footSum from "@/hook/footSum"
			import {useI18n} from "vue-i18n"
			import {multiply} from '@/utils/decimal'
			import {multiply,multiplyAuto,divideAuto} from '@/utils/decimal'
			const { t } = useI18n()

			let dialogTableVisible = ref(false)
			@@ -23,10 +23,11 @@
			let errorAreaVisible = ref(false)
			let otherMoneyVisible = ref(false)
			let sizeCheckVisible = ref(false)
			let orderIdVisible = ref(false)
			const maxTableLen =ref(500)
			let errorArea = ref(0.4)
			const userStore = useUserInfoStore()
			const company = companyInfo()
			let errorArea = ref(company.errorArea)
			const router = useRouter()
			const route = useRoute()
			const xGrid = ref()
			@@ -34,6 +35,7 @@
			const shapeList = ref([
			{label:t('order.universalShape'),value:'1'}, {label:t('order.alien'),value:'2'}
			])
			const newOrderId = ref([])

			// 定义表头上传数据
			const titleUploadData = ref({
			@@ -112,7 +114,8 @@
			{ code: 'incrementalChecked', name: t('basicData.incrementalChecked'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
			{ code: 'errorArea', name: t('basicData.errorSettlementArea'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false },
			{ code: 'otherMoney', name: t('basicData.otherAmounts'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false },
			{ code: 'sizeCheck', name: t('basicData.sizeReview'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false }
			{ code: 'sizeCheck', name: t('basicData.sizeReview'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false },
			{ code: 'updateOrderId', name: '修改订单号', prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false }
			]
			]
			}
			@@ -131,7 +134,7 @@
			keyboardConfig:{
			isArrow: true,
			isDel: true,
			isEnter: true,
			//isEnter: true,
			isTab: true,
			isEdit: true,
			isChecked: true
			@@ -156,6 +159,7 @@
			{field: 'grossArea',width:160, title: t('order.trueGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
			{field: 'computeArea',width:180, title: t('order.computeArea'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
			{field: 'computeGrossArea',width:200, title: t('order.computeGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
			{field: 'monolithicPerimeter',width:200, title: t('order.perimeter'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
			{field: 'shape',width:120,
			title: t('order.shape'),
			editRender: { name: 'input'},
			@@ -320,9 +324,8 @@
			}

			const project = titleUploadData.value.project
			if(project === null \|\| project === undefined \|\| project === ''){
			ElMessage.error(t('order.msg.projectCheck'))
			return
			if(project === null \|\| project === undefined ){
			titleUploadData.value.project=''
			}
			const customer = titleUploadData.value.customerId
			if(customer === null \|\| customer === undefined \|\| customer === ''){
			@@ -358,13 +361,14 @@
			otherMoney:otherMoney.value,
			orderIdType:company.orderIdType,
			creator:userStore.user.userName,
			creatorId:userStore.user.userId
			creatorId:userStore.user.userId,
			newOrderId:newOrderId.value
			}
			const grossAreaList = $grid.getTableData().fullData.filter(
			item=>item.grossArea === 0
			)
			const errorAreaList = $grid.getTableData().fullData.filter(
			item=>item.widthitem.height/1000000 < errorArea.value1
			item=>(item.widthitem.height/1000000 < errorArea.value1)
			)
			if(grossAreaList.length>0){
			alert(t('order.msg.grossAreaIsNot0'))
			@@ -418,11 +422,6 @@
			return
			}

			const project = titleUploadData.value.project
			if(project === null \|\| project === undefined \|\| project === ''){
			ElMessage.error(t('order.msg.projectCheck'))
			return
			}
			const customer = titleUploadData.value.customerId
			if(customer === null \|\| customer === undefined \|\| customer === ''){
			ElMessage.error(t('order.msg.customerCheck'))
			@@ -445,7 +444,8 @@
			ElMessage.error(t('basicData.msg.checkoutLose'))
			return
			}

			titleUploadData.value.creatorId=userStore.user.userId
			titleUploadData.value.creator=userStore.user.userName
			let order ={
			title:titleUploadData.value,
			}
			@@ -617,6 +617,10 @@
			sizeCheckVisible.value=true
			break
			}
			case 'updateOrderId' :{
			orderIdVisible.value=true
			break
			}
			case 'incrementalAll' :{
			let result = toolbarButtonClickEvent()
			if(result){
			@@ -637,6 +641,9 @@
			dataList.forEach((item,index) =>{
			if(index>=result.start ){
			let newStr = subStr1.replace(reg, number);
			if(parseInt(newStr)>9){
			newStr=parseInt(newStr)
			}
			setNestedValue(item,result.cell,subStr2+newStr)
			number=number+1
			}
			@@ -667,6 +674,9 @@
			dataList.forEach((item,index) =>{
			if(index >= result.start && index <= result.end){
			let newStr = subStr1.replace(reg, number);
			if(parseInt(newStr)>9){
			newStr=parseInt(newStr)
			}
			setNestedValue(item,result.cell,subStr2+newStr)
			number=number+1
			}
			@@ -728,9 +738,14 @@

			//启用表格拖动选中
			addListener(xGrid.value,gridOptions)
			let productData = route.query.produceList
			if (!(typeof productData === 'undefined' \|\| productData == null \|\| productData === '' \|\| productData === '\n' \|\| productData === '\r')){
			xGrid.value.insertAt(JSON.parse(productData))
			}

			const str = route.query.orderId \|\| history.state.orderId
			if (typeof str === 'undefined' \|\| str === null \|\| str === '' \|\| str === '\n' \|\| str === '\r'){

			gridOptions.menuConfig.body.options[0][11].disabled = true
			gridOptions.loading = false
			return
			}
			@@ -738,6 +753,7 @@
			request.post(`/order/getOrderById/${str}`).then((res) => {
			if(res.code==200){
			titleUploadData.value = res.data.order
			newOrderId.value=titleUploadData.value.orderId
			if(history.state.orderId!=null){
			titleUploadData.value.orderId=''
			titleUploadData.value.id=null
			@@ -756,6 +772,10 @@

			if(history.state.type=='copy'){
			xGrid.value.reloadData(orderDetails)
			gridOptions.menuConfig.body.options[0][11].disabled = true
			}
			if(history.state.type=='copyTitle'){
			gridOptions.menuConfig.body.options[0][11].disabled = true
			}

			gridOptions.loading = false
			@@ -770,6 +790,7 @@
			//工艺审核后保存按钮禁用
			if(res.data.order.processReview === 2){
			gridOptions.toolbarConfig.buttons[4].disabled = true
			gridOptions.menuConfig.body.options[0][11].disabled = true


			}
			@@ -785,6 +806,7 @@
			gridOptions.toolbarConfig.buttons[2].code='reviews'
			gridOptions.toolbarConfig.buttons[2].name=t('basicData.cancelReview')
			gridOptions.toolbarConfig.buttons[3].disabled = false
			gridOptions.menuConfig.body.options[0][11].disabled = true

			const button = {'code': 'cancelOrder',
			status: 'primary',
			@@ -795,8 +817,11 @@
			gridOptions.toolbarConfig.buttons[2].disabled = true
			gridOptions.toolbarConfig.buttons[3].disabled = true
			gridOptions.toolbarConfig.buttons[4].disabled = true


			}
			}

			if(res.data.order.productionOrder !==0 ){
			gridOptions.toolbarConfig.buttons[2].disabled = true
			}
			@@ -881,9 +906,9 @@
			gridOptions.editRules[`otherColumns.${item.column}`] = [
			{
			validator ({ cellValue }) {
			const regex = /^(0(\.\d{1,2})?\|([1-9]\d{0,4})(\.\d{1,2})?\|99999(\.9{1,2})?)$/
			const regex = /^(0(\.\d{1,3})?\|([1-9]\d{0,4})(\.\d{1,3})?\|99999(\.9{1,3})?)$/
			if (cellValue && !regex.test(cellValue)) {
			return new Error(t('basicData.msg.range99999Dec2'))
			return new Error(t('basicData.msg.range99999Dec3'))
			}
			}
			}
			@@ -981,8 +1006,40 @@
			})
			}

			//修改订单号方法
			const updateOrderId = () => {
			let orderId ={
			oldOrderId:titleUploadData.value.orderId,
			newOrderId:newOrderId.value,
			orderIdType:company.orderIdType,
			creator:userStore.user.userName,
			}
			request.post(`/order/updateOrderId`,orderId).then((res) => {
			if(res.code==200 && res.data==="true"){
			ElMessage.success(t('basicData.msg.saveSuccess'))
			router.push({path:'/main/order/createOrder',query:{
			orderId:newOrderId.value,
			random:Math.random()}})
			}else if(res.data==="false1"){
			ElMessage.warning("输入订单号不能大于最大订单号")
			}else if(res.data==="false2"){
			ElMessage.warning("输入订单号已存在")
			}else if(res.data==="false3"){
			ElMessage.warning("输入订单号相同")
			}else if(res.data==="false4"){
			ElMessage.warning("输入订单号长度不符")
			}else if(res.data==="false5"){
			ElMessage.warning("请输入数字")
			}else if(res.data==="false6"){
			ElMessage.warning("不能修改第一个单子")
			}
			})
			}

			//更新金额重置
			const updateMoney = () => {
			titleUploadData.value.creatorId=userStore.user.userId
			titleUploadData.value.creator=userStore.user.userName
			const updateData = {
			order: titleUploadData.value,
			detail: xGrid.value.getTableData().fullData,
			@@ -1005,7 +1062,35 @@


			// 审核订单
			const reviewOrder = (state) => {
			const reviewOrder = async (state) => {
			let differentSize = null
			if(state===0){
			await request.post(`/order/selectDifferentSize/${titleUploadData.value.orderId}`).then(res =>{
			differentSize = res.data
			})
			}
			let orderGlassState = null
			if(differentSize===true){
			await ElMessageBox.confirm(
			t('order.msg.differentSize'),
			t('order.msg.warning'),
			{
			confirmButtonText: t('basicData.confirmButtonText'),
			cancelButtonText: t('basicData.cancelButtonText'),
			type: 'warning',
			}
			)
			.then(async () => {

			})
			.catch(async () => {
			orderGlassState = false
			})
			}
			if (orderGlassState===false){
			return
			}

			request.post(`/order/reviewOrderById/${titleUploadData.value.orderId}/${state}/${userStore.user.userId}/${userStore.user.userName}`).then(res =>{
			if(res.code==200){
			gridOptions.toolbarConfig.buttons[2].disabled = true
			@@ -1044,20 +1129,20 @@
			}

			const area = (row) => {
			return parseFloat((row.width * row.height/1000000).toFixed(company.decValue))
			return parseFloat(divideAuto(row.width * row.height,1000000,company.decValue))
			}
			const countArea = (row) => {
			const area = parseFloat((row.width * row.height/1000000).toFixed(company.decValue))
			const area = parseFloat(divideAuto(row.width * row.height,1000000,company.decValue))
			let areaSum = 0
			// 获取保留面积,
			const decValue = company.decValue
			switch (titleUploadData.value.calculateType){
			case 2:{
			areaSum = parseFloat((row.width * row.height * row.quantity/1000000).toFixed(decValue))
			areaSum = parseFloat(divideAuto(row.width * row.height* row.quantity,1000000,company.decValue))
			break
			}
			default :{
			areaSum = parseFloat((area * row.quantity).toFixed(decValue))
			areaSum = parseFloat(multiplyAuto(area ,row.quantity,company.decValue))
			break
			}
			}
			@@ -1109,7 +1194,7 @@
			const decValue = company.decValue

			if(titleUploadData.value.calculateType===1){
			item.computeGrossArea = parseFloat((item.computeArea*item.quantity).toFixed(decValue))
			item.computeGrossArea = parseFloat(multiplyAuto(item.computeArea,item.quantity,decValue))
			}else if(titleUploadData.value.calculateType===2){
			item.computeGrossArea = item.grossArea
			}
			@@ -1246,8 +1331,8 @@
			if( !isNaN(item.computeArea*1) && item.computeArea != null && trueArea < errorArea.value){

			item.computeArea = errorArea.value
			item.computeGrossArea = parseFloat((item.computeArea*item.quantity).toFixed(2))
			item.grossAmount=parseFloat((item.price * item.computeGrossArea).toFixed(2))
			item.computeGrossArea = parseFloat(multiply(item.computeArea,item.quantity))
			item.grossAmount=parseFloat(multiply(item.price , item.computeGrossArea))
			}
			})
			titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
			@@ -1276,11 +1361,11 @@

			if( !isNaN(item.computeArea*1) && item.computeArea != null ){
			if(titleUploadData.value.calculateType===3){
			item.grossAmount=parseFloat((item.price * item.quantity).toFixed(2))
			item.grossAmount=parseFloat(multiply(item.price , item.quantity))
			}else{
			item.grossArea = countArea(item)
			item.computeGrossArea = item.grossArea
			item.grossAmount=parseFloat((item.price * item.computeGrossArea).toFixed(2))
			item.grossAmount=parseFloat(multiply(item.price , item.computeGrossArea))
			}
			}
			})
			@@ -1301,13 +1386,45 @@
			}
			if(evnt.$event.keyCode === 13 ){
			const { rowIndex,row,column } = xGrid.value.getSelectedCell() \|\| xGrid.value.getEditRecord()
			let nextRowIndex = xGrid.value.getRowIndex(row) + 1;
			if (nextRowIndex < xGrid.value.getTableData().fullData.length) {
			let nextRowIndex = xGrid.value.getRowIndex(row) + 1


			switch (column.field){
			case 'width':
			xGrid.value.setSelectCell(row, 'height')
			break;
			case 'height':
			xGrid.value.setSelectCell(row, 'quantity')
			break;
			case 'quantity':
			if(nextRowIndex === length){
			xGrid.value.insertAt({}, xGrid.value.getTableData.length \|\| -1)
			}
			const nextRow = xGrid.value.getTableData().fullData[nextRowIndex]
			xGrid.value.setCurrentRow(nextRow)
			xGrid.value.scrollToRow(nextRow)
			xGrid.value.setSelectCell(nextRow, 'width')
			break;
			default:
			if(nextRowIndex === length){
			xGrid.value.insertAt({}, xGrid.value.getTableData.length \|\| -1)
			}
			const nextRow1 = xGrid.value.getTableData().fullData[nextRowIndex]
			xGrid.value.setCurrentRow(nextRow1)
			xGrid.value.scrollToRow(nextRow1)
			xGrid.value.setSelectCell(nextRow1, column.field)
			break;

			}



			/*if (nextRowIndex < xGrid.value.getTableData().fullData.length) {
			xGrid.value.setCurrentRow(xGrid.value.getTableData().fullData[nextRowIndex]);
			}
			if(rowIndex === length-1){
			xGrid.value.insertAt({}, xGrid.value.getTableData.length \|\| -1)
			}
			}*/

			}
			if(evnt.$event.keyCode === 38 ){
			@@ -1339,7 +1456,7 @@
			<div class="order-primary" style="background-color: white">
			<el-row>
			<el-col :span="2"><el-text>*{{$t('order.project')}}：</el-text></el-col>
			<el-col :span="2"><el-input v-model="titleUploadData.project"/></el-col>
			<el-col :span="2"><el-input v-model.trim="titleUploadData.project"/></el-col>
			<el-col :span="2"><el-text>*{{$t('order.customers')}}：</el-text></el-col>
			<el-col :span="2">
			<el-select v-model="titleUploadData.customerId"
			@@ -1482,6 +1599,7 @@
			<input type="text"
			v-model="option.data"
			@focus="inputFocus"
			@keyup.enter.native="$panel.confirmFilter()"
			@input="changeFilterEvent($event, option, $panel)"/>
			</div>
			</div>
			@@ -1524,6 +1642,16 @@
			</el-col>
			</el-row>
			</el-dialog>
			<el-dialog v-model="orderIdVisible" style="width: 300px;height:150px ">
			<el-row>
			<el-col :span="12">
			<el-input v-model="newOrderId"/>
			</el-col>
			<el-col :span="6">
			<el-button @click="updateOrderId">{{$t('basicData.confirmButtonText')}}</el-button>
			</el-col>
			</el-row>
			</el-dialog>
			<el-dialog v-model="otherMoneyVisible"
			:title="$t('basicData.otherAmounts')"
			:close-on-click-modal="false"