From 59e2283a10aee45e6a98e34b432ba345095116db Mon Sep 17 00:00:00 2001 From: wujian <14790700720@163.com> Date: 星期三, 10 七月 2024 16:36:42 +0800 Subject: [PATCH] add 选瓦 --- jcdm-ui/src/views/main/bs/orderScheduling/index.vue | 65 ++++++++++++++++++++++++++------ 1 files changed, 53 insertions(+), 12 deletions(-) diff --git a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue index 71fb81c..52ebbac 100644 --- a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue +++ b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue @@ -62,20 +62,33 @@ </el-form-item> <br/> <el-form-item label="鍚堢鎶ュ伐" prop="report10"> - <el-input + <el-select v-model="queryParams.report10" placeholder="璇疯緭鍏ュ悎绠辨姤宸�" clearable - @keyup.enter.native="handleQuery" - /> + @keyup.enter.native="handleQuery"> + <el-option + v-for="dict in dict.type.workreportingstatus" + :key="dict.value" + :label="dict.label" + :value="dict.value" + /> + </el-select> </el-form-item> <el-form-item label="鎬昏鎶ュ伐" prop="report20"> - <el-input + <el-select v-model="queryParams.report20" placeholder="璇疯緭鍏ユ�昏鎶ュ伐" clearable - @keyup.enter.native="handleQuery" - /> + @keyup.enter.native="handleQuery"> + + <el-option + v-for="dict in dict.type.workreportingstatus" + :key="dict.value" + :label="dict.label" + :value="dict.value" + /> + </el-select> </el-form-item> <el-form-item label="CVT鎶ュ伐" prop="report30"> <el-input @@ -195,31 +208,59 @@ </template> </el-table-column> <el-table-column label="鍚堢鎶ュ伐" align="center" prop="report10"> - + <template slot-scope="scope"> + <dict-tag :options="dict.type.workreportingstatus" :value="scope.row.report10"/> + </template> </el-table-column> + <el-table-column label="鎬昏鎶ュ伐" align="center" prop="report20"> - + <template slot-scope="scope"> + <dict-tag :options="dict.type.workreportingstatus" :value="scope.row.report20"/> + </template> </el-table-column> + <el-table-column label="CVT鎶ュ伐" align="center" prop="report30"> - </el-table-column> + + <el-table-column label="鎶ュ伐寮傚父" align="center" prop="report30"> + </el-table-column> + <el-table-column label="鍚堢涓婄嚎鏃堕棿" align="center" prop="boxClosingOnlineTime" width="160"> + <template slot-scope="scope"> + <span>{{ parseTime(scope.row.boxClosingOnlineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> + </template> </el-table-column> <el-table-column label="鍚堢涓嬬嚎鏃堕棿" align="center" prop="closingBoxOfflineTime" width="160"> + <template slot-scope="scope"> + <span>{{ parseTime(scope.row.closingBoxOfflineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> + </template> </el-table-column> <el-table-column label="鎬昏涓婄嚎鏃堕棿" align="center" prop="finalAssemblyLaunchTime" width="160"> + <template slot-scope="scope"> + <span>{{ parseTime(scope.row.finalAssemblyLaunchTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> + </template> </el-table-column> <el-table-column label="鎬昏涓嬬嚎鏃堕棿" align="center" prop="finalAssemblyOfflineTime" width="160"> + <template slot-scope="scope"> + <span>{{ parseTime(scope.row.finalAssemblyOfflineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> + </template> </el-table-column> <el-table-column label="CVT涓婄嚎鏃堕棿" align="center" prop="cvtLaunchTime" width="160"> + <template slot-scope="scope"> + <span>{{ parseTime(scope.row.cvtLaunchTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> + </template> </el-table-column> <el-table-column label="CVT涓嬬嚎鏃堕棿" align="center" prop="cvtOfflineTime" width="160"> - + <template slot-scope="scope"> + <span>{{ parseTime(scope.row.cvtOfflineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> + </template> </el-table-column> <el-table-column label="鎿嶄綔浜�" align="center" prop="operator"> </el-table-column> <el-table-column label="鎿嶄綔鏃堕棿" align="center" prop="operateTime" width="160"> - + <template slot-scope="scope"> + <span>{{ parseTime(scope.row.operateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> + </template> </el-table-column> </el-table> @@ -302,7 +343,7 @@ export default { name: "OrderScheduling", - dicts: ['order_scheduling_produce_status','quality_status','print_status','material_type'], + dicts: ['order_scheduling_produce_status','quality_status','print_status','material_type','workreportingstatus'], data() { return { // 閬僵灞� -- Gitblit v1.9.3