ERP_override.git

			@@ -97,7 +97,8 @@

			let props = defineProps({
			orderId:null,
			row: {}
			row: {},
			processId:null//用于后端数据返回，结果筛选
			})
			const columns = [
			{field: 'order_number',fixed:"left", width: 90,title: t('order.OrderNum'),showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},

			@@ -85,6 +85,20 @@
			list:[],
			data:{}
			}
			this.selectReportingWorksFilter={
			list:ref([]),
			data:{
			order: {
			project: '',
			batch:''
			},
			orderGlassDetail: {
			completedArea:'',
			wornArea:''
			}
			}

			}
			this.selectProcessCardFilter={
			list:[],
			data:{

			@@ -1733,7 +1733,7 @@
			AND rw.this_process REGEXP #{teamOutputDTO.thisProcess}
			</if>
			<if test="teamOutputDTO.teamsGroupsName != null and teamOutputDTO.teamsGroupsName != ''">
			AND rw.teams_groups_name REGEXP #{teamOutputDTO.teamsGroupsName}
			and rw.teams_groups_name like concat('%', #{teamOutputDTO.teamsGroupsName}, '%')
			</if>
			<if test="teamOutputDTO.project != null and teamOutputDTO.project != ''">
			AND o.project REGEXP #{teamOutputDTO.project}
			@@ -1886,7 +1886,7 @@
			and rw.this_process regexp #{teamOutputDTO.thisProcess}
			</if>
			<if test="teamOutputDTO.teamsGroupsName != null and teamOutputDTO.teamsGroupsName != ''">
			and rw.teams_groups_name regexp #{teamOutputDTO.teamsGroupsName}
			and rw.teams_groups_name like concat('%', #{teamOutputDTO.teamsGroupsName}, '%')
			</if>
			<if test="teamOutputDTO.project != null and teamOutputDTO.project != ''">
			and o.project regexp #{teamOutputDTO.project}
			@@ -2570,7 +2570,7 @@
			AND rw.this_process REGEXP #{teamOutputDTO.thisProcess}
			</if>
			<if test="teamOutputDTO.teamsGroupsName != null and teamOutputDTO.teamsGroupsName != ''">
			AND rw.teams_groups_name REGEXP #{teamOutputDTO.teamsGroupsName}
			and rw.teams_groups_name like concat('%', #{teamOutputDTO.teamsGroupsName}, '%')
			</if>
			<if test="teamOutputDTO.project != null and teamOutputDTO.project != ''">
			AND o.project REGEXP #{teamOutputDTO.project}

			@@ -579,7 +579,7 @@
			and rw.device_name regexp #{reportingWork.deviceName}
			</if>
			<if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">
			and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}
			and rw.teams_groups_name like concat('%', #{reportingWork.teamsGroupsName}, '%')
			</if>
			GROUP BY rw.reporting_work_id
			ORDER BY rw.reporting_work_id desc

	north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/stores/sd/order/orderInfo.js	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/Report.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史