From 6a074bb08783744bcc2de2220ecef4ab56c5fa2b Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期四, 25 一月 2024 10:58:58 +0800
Subject: [PATCH] 更新配瓦规则设置新增查询功能实现
---
jcdm-ui/src/views/main/bs/orderScheduling/index.vue | 74 ++++++++++++++++++++++++-------------
1 files changed, 48 insertions(+), 26 deletions(-)
diff --git a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
index ee787eb..c3ff07b 100644
--- a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
+++ b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
@@ -60,6 +60,7 @@
:value="dict.value"/>
</el-select>
</el-form-item>
+ <br/>
<el-form-item label="鍚堢鎶ュ伐" prop="report10">
<el-input
v-model="queryParams.report10"
@@ -84,9 +85,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+ <br/>
<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"
@@ -192,12 +194,24 @@
<el-table-column label="CVT鎶ュ伐" align="center" prop="report30">
</el-table-column>
- <el-table-column label="鍚堢涓婄嚎" align="center" prop="combinedBoxTime">
-
+ <el-table-column label="鍚堢涓婄嚎鏃堕棿" align="center" prop="boxClosingOnlineTime" width="160">
</el-table-column>
- <el-table-column label="鎬昏涓嬬嚎" align="center" prop="finalAssemblyTime">
-
+ <el-table-column label="鍚堢涓嬬嚎鏃堕棿" align="center" prop="closingBoxOfflineTime" width="160">
</el-table-column>
+ <el-table-column label="鎬昏涓婄嚎鏃堕棿" align="center" prop="finalAssemblyLaunchTime" width="160">
+ </el-table-column>
+ <el-table-column label="鎬昏涓嬬嚎鏃堕棿" align="center" prop="finalAssemblyOfflineTime" width="160">
+ </el-table-column>
+ <el-table-column label="CVT涓婄嚎鏃堕棿" align="center" prop="cvtLaunchTime" width="160">
+ </el-table-column>
+ <el-table-column label="CVT涓嬬嚎鏃堕棿" align="center" prop="cvtOfflineTime" width="160">
+ </el-table-column>
+<!-- <el-table-column label="鍚堢涓婄嚎" align="center" prop="combinedBoxTime">-->
+
+<!-- </el-table-column>-->
+<!-- <el-table-column label="鎬昏涓嬬嚎" align="center" prop="finalAssemblyTime">-->
+
+<!-- </el-table-column>-->
<el-table-column label="鎿嶄綔浜�" align="center" prop="operator">
</el-table-column>
@@ -228,7 +242,7 @@
<!-- <el-table-column label="澶囨敞" align="center" prop="remarks">-->
<!-- </el-table-column>-->
- <el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+<!-- <el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
@@ -249,7 +263,7 @@
v-hasPermi="['bs:orderScheduling:remove']"
>鍒犻櫎</el-button>
</template>
- </el-table-column>
+ </el-table-column>-->
</el-table>
</el-card>
@@ -262,12 +276,12 @@
/>
<!-- 娣诲姞鎴栦慨鏀硅鍗曟帓浜у璇濇 -->
- <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="500px" append-to-body>
+ <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="700px" append-to-body>
<span slot="title">
<i class="el-icon-s-order"></i>
{{titleName}}
</span>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form ref="form" inline :model="form" :rules="rules" label-width="80px">
<el-form-item label="璁㈠崟缂栧彿" prop="orderNo">
<el-input v-model="form.orderNo" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" />
</el-form-item>
@@ -287,33 +301,34 @@
<el-form-item label="鏈哄瀷" prop="model">
<el-input v-model="form.model" placeholder="璇疯緭鍏ユ満鍨�" />
</el-form-item>
- <el-form-item label="鐢熶骇鐘舵��" prop="productionStatus">
- <el-radio-group v-model="form.productionStatus">
-<!-- <el-radio-->
-<!-- v-for="dict in dict.type.${dictType}"-->
-<!-- :key="dict.value"-->
-<!-- :label="dict.value"-->
-<!-- >{{dict.label}}</el-radio>-->
- </el-radio-group>
- </el-form-item>
+<!-- <el-form-item label="鐢熶骇鐘舵��" prop="productionStatus">-->
+<!-- <el-radio-group v-model="form.productionStatus">-->
+<!--<!– <el-radio–>-->
+<!--<!– v-for="dict in dict.type.${dictType}"–>-->
+<!--<!– :key="dict.value"–>-->
+<!--<!– :label="dict.value"–>-->
+<!--<!– >{{dict.label}}</el-radio>–>-->
+<!-- </el-radio-group>-->
+<!-- </el-form-item>-->
<el-form-item label="宸ユ椂" prop="workingHours">
<el-input v-model="form.workingHours" placeholder="璇疯緭鍏ュ伐鏃�" />
</el-form-item>
<el-form-item label="褰撳墠宸ヤ綅" prop="currentWorkstation">
<el-input v-model="form.currentWorkstation" placeholder="璇疯緭鍏ュ綋鍓嶅伐浣�" />
</el-form-item>
- <el-form-item label="璐ㄩ噺鐘舵��" prop="qualityStatus">
- <el-radio-group v-model="form.qualityStatus">
+<!-- <el-form-item label="璐ㄩ噺鐘舵��" prop="qualityStatus">-->
+<!-- <el-radio-group v-model="form.qualityStatus">-->
<!-- <el-radio-->
<!-- v-for="dict in dict.type.${dictType}"-->
<!-- :key="dict.value"-->
<!-- :label="dict.value"-->
<!-- >{{dict.label}}</el-radio>-->
- </el-radio-group>
- </el-form-item>
+<!-- </el-radio-group>-->
+<!-- </el-form-item>-->
<el-form-item label="鏄惁鎵撳嵃" prop="whetherOrPrint">
<el-input v-model="form.whetherOrPrint" placeholder="璇疯緭鍏ユ槸鍚︽墦鍗�" />
</el-form-item>
+
<el-form-item label="鍚堢鎶ュ伐" prop="report10">
<el-input v-model="form.report10" placeholder="璇疯緭鍏ュ悎绠辨姤宸�" />
</el-form-item>
@@ -411,7 +426,7 @@
combinedBoxTime: null,
finalAssemblyTime: null,
operator: null,
- operateTime: '',
+ operateTime: null,
status: null,
spareField1: null,
spareField2: null,
@@ -419,7 +434,8 @@
spareField4: null,
createUser: null,
updateUser: null,
- remarks: null
+ remarks: null,
+ dateConditions: [],
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -472,6 +488,7 @@
/** 鏌ヨ璁㈠崟鎺掍骇鍒楄〃 */
getList() {
this.loading = true;
+ console.log(this.queryParams)
listOrderScheduling(this.queryParams).then(response => {
this.orderSchedulingList = response.rows;
this.total = response.total;
@@ -512,7 +529,13 @@
updateUser: null,
updateTime: null,
remarks: null,
- report30: null
+ report30: null,
+ boxClosingOnlineTime: null,
+ closingBoxOfflineTime: null,
+ finalAssemblyLaunchTime: null,
+ finalAssemblyOfflineTime: null,
+ cvtLaunchTime: null,
+ cvtOfflineTime: null
};
this.resetForm("form");
},
@@ -520,7 +543,6 @@
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
- this.$modal.msgSuccess(this.queryParams.operateTime);
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
--
Gitblit v1.9.3