ERP_override.git

			@@ -37,7 +37,7 @@
			ElMessage.success(t('workOrder.deleteOk'))
			router.push({path: '/main/processCard/SelectProcessCard', query: {random: Math.random()}})
			} else {
			ElMessage.warning('删除失败，检查流程卡是否已报工')
			ElMessage.warning(t('processCard.deleteNo'))
			}
			})

			@@ -54,7 +54,7 @@
			//定义变量
			const form = reactive({
			date1: '',
			getSelect:'不可排版'
			getSelect:t('processCard.composingNo')
			})


			@@ -100,7 +100,7 @@

			//获取七天前到当前时间
			function getNowTime() {
			const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
			const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 15)
			.toISOString()
			.replace('T', ' ')
			.slice(0, 10) //默认开始时间7天前
			@@ -230,7 +230,7 @@
			align: 'center',//文字居中
			stripe: true,//斑马纹
			rowConfig: {isCurrent: true, isHover: true, height: 30},//鼠标移动或选择高亮
			id: 'CustomerList',
			id: 'SelectProcessCard',
			showFooter: true,//显示脚
			printConfig: {},
			importConfig: {},
			@@ -258,6 +258,7 @@
			{title: t('basicData.operate'), width: 100, slots: {default: 'button_slot'}, fixed: "left"},
			{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
			{field: 'orderId', title: t('order.orderId'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
			{field: 'order.customerName', title: t('processCard.customerName'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
			{
			field: 'processId',
			width: 140,
			@@ -290,7 +291,7 @@

			toolbarConfig: {
			buttons: [
			{code: 'update', name: '排版', status: 'primary'},
			{code: 'update', name: t('processCard.composing'), status: 'primary'},
			],
			import: false,
			// export: true,
			@@ -318,9 +319,9 @@
			})

			const sexOptions = ref([
			{label: '已排版', value: '已排版'},
			{label: '可排版', value: '可排版'},
			{label: '不可排版', value: '不可排版'}
			{label: t('processCard.typesetter'), value: t('processCard.typesetter')},
			{label: t('processCard.composingOk'), value: t('processCard.composingOk')},
			{label: t('processCard.composingNo'), value: t('processCard.composingNo')}
			])

			//表格按钮
			@@ -334,7 +335,7 @@
			if ($table) {
			const selectRecords = $table.getCheckboxRecords()
			if (selectRecords.length == 0) {
			ElMessage.warning("请勾选需要的数据")
			ElMessage.warning(t('processCard.pleaseCheckTheRequiredData'))
			return;
			}

			@@ -345,14 +346,14 @@
			//修改排版状态
			request.post("/processCard/updateComposing", composingData.value).then((res) => {
			if (res.code == 200 && res.data === true) {
			ElMessage.success("修改成功")
			ElMessage.success(t('basicData.msg.saveSuccess'))
			router.push({
			path: '/main/processCard/SelectProcessCard',
			query: {random: Math.random()}
			})
			} else {

			ElMessage.warning('修改失败')
			ElMessage.warning(t('basicData.msg.saveFail'))

			}
			})
			@@ -368,7 +369,7 @@
			}
			const checkBoxConfig = {
			checkMethod: ({row}) => {
			if (row['layoutStatus'] === '可排版' \|\| row['layoutStatus'] === '已排版') {
			if (row['layoutStatus'] === t('processCard.composingOk') \|\| row['layoutStatus'] === t('processCard.typesetter')) {
			return row.disable
			} else {
			return !row.disable
			@@ -463,9 +464,9 @@

			<div v-for="(option, index) in column.filters" :key="index">
			<select v-model="option.data" @change="changeFilterEvent($event, option, $panel)" style="width: 100%">
			<option value="已排版" label="已排版"></option>
			<option value="可排版" label="可排版"></option>
			<option value="不可排版" label="不可排版"></option>
			<option :value="$t('processCard.typesetter')" :label="$t('processCard.typesetter')"></option>
			<option :value="$t('processCard.composingOk')" :label="$t('processCard.composingOk')"></option>
			<option :value="$t('processCard.composingNo')" :label="$t('processCard.composingNo')"></option>
			</select>
			</div>
			</div>