DF22001YiQi.git

			@@ -19,8 +19,13 @@
			</a-form-item>
			</a-col>
			<a-col :md="colMd" :sm="colSm">
			<a-form-item label="工件ID">
			<a-form-item label="工件号">
			<a-input v-model="queryParam.workPieceID" allow-clear placeholder="请输入工件号" />
			</a-form-item>
			</a-col>
			<a-col :md="colMd" :sm="colSm">
			<a-form-item label="成品码">
			<a-input v-model="queryParam.oP80NewCode" allow-clear placeholder="请输入成品码" />
			</a-form-item>
			</a-col>
			<a-col :md="colMd" :sm="colSm">
			@@ -37,6 +42,11 @@
			</a-select>
			</a-form-item>
			</a-col>
			<a-col :md="colMd2" :sm="colSm2">
			<a-form-item :label="queryParam.selectModel == 1?'初始上线时间':'上线时间'">
			<a-range-picker style="width:100%" :show-time="{format:'HH:mm'}" v-model="queryParam.dates" format="YYYY-MM-DD HH:mm" />
			</a-form-item>
			</a-col>
			<template v-if="advanced">
			<a-col :md="colMd" :sm="colSm">
			<a-form-item label="工件状态" v-if="queryParam.selectModel == 1">
			@@ -90,16 +100,12 @@
			</a-form-item>
			</a-col>

			<a-col :md="colMd" :sm="colSm">
			<a-form-item :label="queryParam.selectModel == 1?'初始上线时间':'上线时间'">
			<a-range-picker style="width:100%" :show-time="{format:'HH:mm'}" v-model="queryParam.dates" format="YYYY-MM-DD HH:mm" />
			</a-form-item>
			</a-col>

			</template>
			<a-col :md="colMd" :sm="colSm">
			<span class="table-page-search-submitButtons">
			<a-button type="primary" @click="getData(1)">查询</a-button>
			<a-button style="margin-left: 8px" @click="() => (queryParam = { selectModel: 1 })">重置</a-button>
			<a-button style="margin-left: 8px" @click="resetQueryData">重置</a-button>
			<a @click="advanced = !advanced" style="margin-left: 8px">
			{{ advanced ? '收起' : '展开' }}
			<a-icon :type="advanced ? 'up' : 'down'" />
			@@ -145,7 +151,7 @@
			<script>
			// 工件加工追溯
			import { STable, XCard } from '@/components'
			import { downloadFile } from '@/utils/util'
			import { downloadFile,getThisWeekRange } from '@/utils/util'
			import moment from 'moment'
			import {
			workPieceInfoMachiningPage,
			@@ -167,6 +173,8 @@
			gutter: 36,
			colMd: 6,
			colSm: 18,
			colMd2: 10,
			colSm2: 24,
			labelCol: {
			xs: { span: 24 },
			sm: { span: 7 }
			@@ -177,7 +185,11 @@
			},
			advanced: false, // 高级搜索展开/关闭
			confirmLoading: false,
			queryParam: { selectModel: 1 },
			currentSelModel:1,//当前选择的维护
			queryParam: {
			selectModel: 1,
			dates:[]
			},
			pages: {
			current: 1,
			pageSize: 10,
			@@ -197,7 +209,7 @@
			customRender: (text, record, index) => `${index + 1}`
			},
			{
			title: '工件ID',
			title: '工件号',
			align: 'center',
			sorter: true,
			dataIndex: 'workPieceID'
			@@ -213,6 +225,12 @@
			align: 'center',
			sorter: true,
			dataIndex: 'qualityStateName'
			},
			{
			title: '成品码',
			align: 'center',
			sorter: true,
			dataIndex: 'oP80NewCode'
			},
			{
			title: '质量详情',
			@@ -254,7 +272,7 @@
			}
			},
			{
			title: '已加工时长',
			title: '加工时长',
			align: 'center',
			sorter: true,
			dataIndex: 'workPieceCurr'
			@@ -313,7 +331,10 @@
			watch: {
			'queryParam.selectModel': {
			handler(val, oldVal) {
			this.queryParam = { selectModel: val }
			var old_dates=this.queryParam.dates;
			this.queryParam = { selectModel: val,dates:[] }
			this.queryParam.dates = old_dates;
			this.currentSelModel=val;
			if (val == 1) {
			if (oldVal) {
			this.columns.splice(3, this.columns2.length)
			@@ -337,9 +358,19 @@
			{ name: '工件+工序', code: 2 }
			]
			this.QualityState = this.$options.filters['dictData']('quality_state')
			this.initData();
			this.getData()
			},
			methods: {
			initData(){
			this.queryParam.dates = [];
			this.queryParam.dates = getThisWeekRange();
			},
			//重置
			resetQueryData(){
			this.queryParam = { selectModel: this.currentSelModel,dates:[] }
			this.initData();
			},
			setDisabled() {
			this.data.forEach((item) => {
			if (item.operationTypeHand == 'SPC') {
			@@ -349,6 +380,7 @@
			item.workingProcedureCurrent == 'OP80'
			} else {
			item.disabled = item.workingProcedureCurrent == 'OP05' \|\| item.workingProcedureCurrent == 'OP50'
			\|\| item.workingProcedureCurrent == 'OP70'
			}
			})
			},