~admin/ERP_override.git

			@@ -25,7 +25,7 @@
			const xGrid = ref()
			let cellArea = ref()
			const shapeList = ref([
			{name:'普形',value:1}, {name:'异形',value:2}
			{label:'普形',value:'1'}, {label:'异形',value:'2'}
			])

			// 定义表头上传数据
			@@ -141,7 +141,7 @@
			title: t('order.shape'),
			editRender: { name: 'input'},
			filters:[{ data: '' }],
			slots: { filter: 'num1_filter',edit:'shape_edit' }, sortable: true,filterMethod:filterChanged},
			slots: { filter: 'num1_filter',edit:'shape_edit',default:'default_shape' }, sortable: true,filterMethod:filterChanged},
			{field: 'bendRadius',width:160, title: t('order.bendRadius'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
			{field: 'edgingType',width:160, title: t('order.edgingType'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
			{field: 'processingNote',width:200, title: t('order.processingNote'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
			@@ -466,6 +466,7 @@
			if(history.state.type=='copy'){
			xGrid.value.reloadData(res.data.orderDetails)
			}
			gridOptions.loading = false
			return
			}
			//取消工艺按钮禁用
			@@ -504,11 +505,9 @@
			item.otherColumns = JSON.parse(item.otherColumns)
			})
			otherMoney.value =res.data.orderOtherMoneyList

			//加载副表数据
			xGrid.value.reloadData(orderDetails)
			gridOptions.loading = false

			}else{
			ElMessage.error(res.msg)
			}
			@@ -937,10 +936,11 @@
			<vxe-button @click="importTemplate">{{$t('order.template')}}</vxe-button>
			<vxe-button @click="importEvent">{{$t('order.import')}}</vxe-button>
			</template>
			<template #default_shape="{ row }">
			<span>{{ row.shape=='1'?'普形':row.shape=='2'?'异形':null }}</span>
			</template>
			<template #shape_edit="{ row }">
			<vxe-select v-model="row.shape" transfer>
			<vxe-option v-for="item in shapeList" :key="item" :value="item.value" :label="item.name" />
			</vxe-select>
			<vxe-select v-model="row.shape" transfer :options="shapeList" placeholder=" "/>
			</template>

	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -27,9 +27,7 @@
			ElMessage.success(t('workOrder.deleteOk'))
			router.push({path: '/main/reportingWorks/SelectReportingWorks', query: {random:Math.random()}})
			} else {

			ElMessage.warning('删除失败，检查下工序是否已报工')

			}
			})
			break