Jcdm041-Mes.git

			@@ -86,7 +86,7 @@
			</el-form-item>
			<el-form-item label="操作时间" prop="operateTime">
			<el-date-picker
			v-model="queryParams.operateTime"
			v-model="queryParams.dateConditions"
			type="datetimerange"
			:picker-options="pickerOptions"
			value-format="yyyy-MM-dd HH:mm:ss"
			@@ -155,7 +155,9 @@

			</el-table-column>
			<el-table-column label="产品类型" align="center" prop="productType">

			<template slot-scope="scope">
			<dict-tag :options="dict.type.material_type" :value="scope.row.productType"/>
			</template>
			</el-table-column>
			<el-table-column label="机型" align="center" prop="model">

			@@ -368,7 +370,7 @@

			export default {
			name: "OrderScheduling",
			dicts: ['order_scheduling_produce_status','quality_status','print_status'],
			dicts: ['order_scheduling_produce_status','quality_status','print_status','material_type'],
			data() {
			return {
			// 遮罩层
			@@ -409,7 +411,7 @@
			combinedBoxTime: null,
			finalAssemblyTime: null,
			operator: null,
			operateTime: '',
			operateTime: null,
			status: null,
			spareField1: null,
			spareField2: null,
			@@ -417,7 +419,8 @@
			spareField4: null,
			createUser: null,
			updateUser: null,
			remarks: null
			remarks: null,
			dateConditions: [],
			},
			// 表单参数
			form: {},
			@@ -470,6 +473,7 @@
			/** 查询订单排产列表 */
			getList() {
			this.loading = true;
			console.log(this.queryParams)
			listOrderScheduling(this.queryParams).then(response => {
			this.orderSchedulingList = response.rows;
			this.total = response.total;