DF22001YiQi.git

			@@ -32,6 +32,11 @@
			</a-form-item>
			</a-col>
			<a-col :md="colMd" :sm="colSm">
			<a-form-item label="备注">
			<a-input v-model="queryParam.remarks" allow-clear placeholder="请输入备注" />
			</a-form-item>
			</a-col>
			<a-col :md="colMd" :sm="colSm">
			<a-form-item label="工序">
			<a-select
			allow-clear
			@@ -40,6 +45,20 @@
			placeholder="请选择工序"
			>
			<a-select-option v-for="(item, index) in ProcessSelectData" :key="index" :value="item.code">
			{{ item.name }}
			</a-select-option>
			</a-select>
			</a-form-item>
			</a-col>
			<a-col :md="colMd" :sm="colSm">
			<a-form-item label="日志类型">
			<a-select
			allow-clear
			style="width: 100%"
			v-model="queryParam.pieceLogType"
			placeholder="请选择日志类型"
			>
			<a-select-option v-for="(item, index) in PieceLogType" :key="index" :value="item.code">
			{{ item.name }}
			</a-select-option>
			</a-select>
			@@ -162,6 +181,12 @@
			dataIndex: 'remarks'
			},
			{
			title: '日志类型',
			align: 'center',
			sorter: true,
			dataIndex: 'pieceLogTypeName'
			},
			{
			title: '创建人',
			align: 'center',
			sorter: true,
			@@ -181,6 +206,7 @@
			equitypeData: [],
			// 工序下拉框数据
			WorkPieceSelectData: [],
			PieceLogType:[],
			// 质量状态下拉框数据
			QualityStateSelectData: [],
			pages: {
			@@ -189,7 +215,7 @@
			total: 0,
			showTotal: (total, range) => `${range[0]}-${range[1]}共${total}条`,
			showSizeChanger: true,
			pageSizeOptions: ['10', '20', '30', '40','50','100','200','300','400','500'],
			pageSizeOptions: ['10', '20', '30', '40','50','100','200','300','400','500','1000'],
			onChange: this.getData,
			onShowSizeChange: this.showSizeChange
			}
			@@ -200,6 +226,7 @@
			this.initData();
			this.getData()
			this.ProcessSelectData = this.$options.filters['dictData']('process_type')
			this.PieceLogType = this.$options.filters['dictData']('PieceLogType')
			this.QualityStateSelectData = this.$options.filters['dictData']('quality_state')
			},
			methods: {

			@@ -15,6 +15,11 @@
			</a-form-item>
			</a-col>
			<a-col :md="colMd" :sm="colSm">
			<a-form-item label="出库人">
			<a-input v-model="queryParam.workPieceOutboundUserName" allow-clear placeholder="请输入出库人" />
			</a-form-item>
			</a-col>
			<a-col :md="colMd" :sm="colSm">
			<a-form-item label="出库时间">
			<a-range-picker style="width:100%" :show-time="{format:'HH:mm'}" v-model="queryParam.dates" format="YYYY-MM-DD HH:mm" />
			</a-form-item>
			@@ -108,36 +113,36 @@
			sorter: true,
			dataIndex: 'oP80NewCode'
			},
			{
			title: '阶段',
			align: 'center',
			sorter: true,
			dataIndex: 'unLineStageName'
			},
			{
			title: '小车码',
			align: 'center',
			sorter: true,
			dataIndex: 'carNo'
			},
			// {
			// title: '阶段',
			// align: 'center',
			// sorter: true,
			// dataIndex: 'unLineStageName'
			// },
			// {
			// title: '小车码',
			// align: 'center',
			// sorter: true,
			// dataIndex: 'carNo'
			// },
			{
			title: '工件号',
			align: 'center',
			sorter: true,
			dataIndex: 'workPieceID'
			},
			{
			title: '下线时间',
			align: 'center',
			sorter: true,
			dataIndex: 'workPieceUnLineTime'
			},
			{
			title: '下线人',
			align: 'center',
			sorter: true,
			dataIndex: 'workPieceUnLineUserName'
			},
			// {
			// title: '下线时间',
			// align: 'center',
			// sorter: true,
			// dataIndex: 'workPieceUnLineTime'
			// },
			// {
			// title: '下线人',
			// align: 'center',
			// sorter: true,
			// dataIndex: 'workPieceUnLineUserName'
			// },
			{
			title: '出库时间',
			align: 'center',

	yiqi_iwara-scada-web/src/views/main/WorkPieceLogYield/index.vue	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yiqi_iwara-scada-web/src/views/main/WorkPieceOutbound/index.vue	53 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史