From df1f2bf348bdac341684db961a5f7ddb2195531a Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期一, 15 一月 2024 14:05:35 +0800
Subject: [PATCH] 接收工单
---
jcdm-ui/src/views/main/bs/orderScheduling/index.vue | 223 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 198 insertions(+), 25 deletions(-)
diff --git a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
index f2bb687..fa8bbc9 100644
--- a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
+++ b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
@@ -2,9 +2,9 @@
<div class="app-container">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="璁㈠崟缂栧彿" prop="orderNumber">
+ <el-form-item label="璁㈠崟缂栧彿" prop="orderNo">
<el-input
- v-model="queryParams.orderNumber"
+ v-model="queryParams.orderNo"
placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"
clearable
@keyup.enter.native="handleQuery"
@@ -18,6 +18,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+
<el-form-item label="鏈哄瀷" prop="model">
<el-input
v-model="queryParams.model"
@@ -26,6 +27,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+
<el-form-item label="宸ユ椂" prop="workingHours">
<el-input
v-model="queryParams.workingHours"
@@ -42,6 +44,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+
<el-form-item label="鏄惁鎵撳嵃" prop="whetherOrPrint">
<el-input
v-model="queryParams.whetherOrPrint"
@@ -74,8 +77,66 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+
+<!-- <el-form-item label="棰勭暀瀛楁1" prop="spareField1">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.spareField1"-->
+<!-- placeholder="璇疯緭鍏ラ鐣欏瓧娈�1"-->
+<!-- clearable-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="棰勭暀瀛楁2" prop="spareField2">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.spareField2"-->
+<!-- placeholder="璇疯緭鍏ラ鐣欏瓧娈�2"-->
+<!-- clearable-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="棰勭暀瀛楁3" prop="spareField3">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.spareField3"-->
+<!-- placeholder="璇疯緭鍏ラ鐣欏瓧娈�3"-->
+<!-- clearable-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="棰勭暀瀛楁4" prop="spareField4">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.spareField4"-->
+<!-- placeholder="璇疯緭鍏ラ鐣欏瓧娈�4"-->
+<!-- clearable-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.createUser"-->
+<!-- placeholder="璇疯緭鍏ュ垱寤虹敤鎴�"-->
+<!-- clearable-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.updateUser"-->
+<!-- placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�"-->
+<!-- clearable-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="澶囨敞" prop="remarks">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.remarks"-->
+<!-- placeholder="璇疯緭鍏ュ娉�"-->
+<!-- clearable-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">楂樼骇鏌ヨ</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -130,36 +191,44 @@
<el-table border v-loading="loading" :data="orderSchedulingList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="璁㈠崟缂栧彿" align="center" prop="orderNumber">
+ <el-table-column label="ID" align="center" prop="id" />
+ <el-table-column label="璁㈠崟缂栧彿" align="center" prop="orderNo">
+
</el-table-column>
<el-table-column label="鍙戝姩鏈哄彿" align="center" prop="engineNo">
+
</el-table-column>
<el-table-column label="浜у搧绫诲瀷" align="center" prop="productType">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.productType"/>-->
-<!-- </template>-->
+
</el-table-column>
<el-table-column label="鏈哄瀷" align="center" prop="model">
+
</el-table-column>
<el-table-column label="鐢熶骇鐘舵��" align="center" prop="productionStatus">
+
</el-table-column>
<el-table-column label="宸ユ椂" align="center" prop="workingHours">
+
</el-table-column>
<el-table-column label="褰撳墠宸ヤ綅" align="center" prop="currentWorkstation">
+
</el-table-column>
<el-table-column label="璐ㄩ噺鐘舵��" align="center" prop="qualityStatus">
+
</el-table-column>
<el-table-column label="鏄惁鎵撳嵃" align="center" prop="whetherOrPrint">
+
</el-table-column>
<el-table-column label="10鎶ュ伐" align="center" prop="report10">
+
</el-table-column>
<el-table-column label="20鎶ュ伐" align="center" prop="report20">
</el-table-column>
- <el-table-column label="鍚堢涓婄嚎" align="center" prop="combinedBoxLaunch">
+ <el-table-column label="鍚堢涓婄嚎" align="center" prop="combinedBoxTime">
</el-table-column>
- <el-table-column label="鎬昏涓嬬嚎" align="center" prop="finalAssemblyOffline">
+ <el-table-column label="鎬昏涓嬬嚎" align="center" prop="finalAssemblyTime">
</el-table-column>
<el-table-column label="鎿嶄綔浜�" align="center" prop="operator">
@@ -168,6 +237,30 @@
<el-table-column label="鎿嶄綔鏃堕棿" align="center" prop="operateTime">
</el-table-column>
+<!-- <el-table-column label="鐘舵��" align="center" prop="status">-->
+
+<!-- </el-table-column>-->
+<!-- <el-table-column label="棰勭暀瀛楁1" align="center" prop="spareField1">-->
+
+<!-- </el-table-column>-->
+<!-- <el-table-column label="棰勭暀瀛楁2" align="center" prop="spareField2">-->
+
+<!-- </el-table-column>-->
+<!-- <el-table-column label="棰勭暀瀛楁3" align="center" prop="spareField3">-->
+
+<!-- </el-table-column>-->
+<!-- <el-table-column label="棰勭暀瀛楁4" align="center" prop="spareField4">-->
+
+<!-- </el-table-column>-->
+<!-- <el-table-column label="鍒涘缓鐢ㄦ埛" align="center" prop="createUser">-->
+
+<!-- </el-table-column>-->
+<!-- <el-table-column label="鏇存敼鐢ㄦ埛" align="center" prop="updateUser">-->
+
+<!-- </el-table-column>-->
+<!-- <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">
<template slot-scope="scope">
<el-button
@@ -208,20 +301,48 @@
{{titleName}}
</span>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="璁㈠崟缂栧彿" prop="orderNumber">
- <el-input v-model="form.orderNumber" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" />
+ <el-form-item label="璁㈠崟缂栧彿" prop="orderNo">
+ <el-input v-model="form.orderNo" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" />
</el-form-item>
<el-form-item label="鍙戝姩鏈哄彿" prop="engineNo">
<el-input v-model="form.engineNo" placeholder="璇疯緭鍏ュ彂鍔ㄦ満鍙�" />
</el-form-item>
+ <el-form-item label="浜у搧绫诲瀷" prop="productType">
+ <el-select v-model="form.productType" placeholder="璇烽�夋嫨浜у搧绫诲瀷">
+<!-- <el-option-->
+<!-- v-for="dict in dict.type.${dictType}"-->
+<!-- :key="dict.value"-->
+<!-- :label="dict.label"-->
+<!-- :value="dict.value"-->
+<!-- ></el-option>-->
+ </el-select>
+ </el-form-item>
<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="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-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="whetherOrPrint">
<el-input v-model="form.whetherOrPrint" placeholder="璇疯緭鍏ユ槸鍚︽墦鍗�" />
@@ -235,6 +356,36 @@
<el-form-item label="鎿嶄綔浜�" prop="operator">
<el-input v-model="form.operator" placeholder="璇疯緭鍏ユ搷浣滀汉" />
</el-form-item>
+ <el-form-item label="鐘舵��" prop="status">
+ <el-radio-group v-model="form.status">
+<!-- <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="棰勭暀瀛楁1" prop="spareField1">-->
+<!-- <el-input v-model="form.spareField1" placeholder="璇疯緭鍏ラ鐣欏瓧娈�1" />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="棰勭暀瀛楁2" prop="spareField2">-->
+<!-- <el-input v-model="form.spareField2" placeholder="璇疯緭鍏ラ鐣欏瓧娈�2" />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="棰勭暀瀛楁3" prop="spareField3">-->
+<!-- <el-input v-model="form.spareField3" placeholder="璇疯緭鍏ラ鐣欏瓧娈�3" />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="棰勭暀瀛楁4" prop="spareField4">-->
+<!-- <el-input v-model="form.spareField4" placeholder="璇疯緭鍏ラ鐣欏瓧娈�4" />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">-->
+<!-- <el-input v-model="form.createUser" placeholder="璇疯緭鍏ュ垱寤虹敤鎴�" />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">-->
+<!-- <el-input v-model="form.updateUser" placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�" />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="澶囨敞" prop="remarks">-->
+<!-- <el-input v-model="form.remarks" placeholder="璇疯緭鍏ュ娉�" />-->
+<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -274,7 +425,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- orderNumber: null,
+ orderNo: null,
engineNo: null,
productType: null,
model: null,
@@ -285,15 +436,26 @@
whetherOrPrint: null,
report10: null,
report20: null,
- combinedBoxLaunch: null,
- finalAssemblyOffline: null,
+ combinedBoxTime: null,
+ finalAssemblyTime: null,
operator: null,
- operateTime: null
+ operateTime: null,
+ status: null,
+ spareField1: null,
+ spareField2: null,
+ spareField3: null,
+ spareField4: null,
+ createUser: null,
+ updateUser: null,
+ remarks: null
},
// 琛ㄥ崟鍙傛暟
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
+ id: [
+ { required: true, message: "ID涓嶈兘涓虹┖", trigger: "blur" }
+ ],
}
};
},
@@ -318,7 +480,8 @@
// 琛ㄥ崟閲嶇疆
reset() {
this.form = {
- orderNumber: null,
+ id: null,
+ orderNo: null,
engineNo: null,
productType: null,
model: null,
@@ -329,10 +492,20 @@
whetherOrPrint: null,
report10: null,
report20: null,
- combinedBoxLaunch: null,
- finalAssemblyOffline: null,
+ combinedBoxTime: null,
+ finalAssemblyTime: null,
operator: null,
- operateTime: null
+ operateTime: null,
+ status: null,
+ spareField1: null,
+ spareField2: null,
+ spareField3: null,
+ spareField4: null,
+ createUser: null,
+ createTime: null,
+ updateUser: null,
+ updateTime: null,
+ remarks: null
};
this.resetForm("form");
},
@@ -348,7 +521,7 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- this.ids = selection.map(item => item.orderNumber)
+ this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
@@ -361,8 +534,8 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.reset();
- const orderNumber = row.orderNumber || this.ids
- getOrderScheduling(orderNumber).then(response => {
+ const id = row.id || this.ids
+ getOrderScheduling(id).then(response => {
this.form = response.data;
this.open = true;
this.titleName = "淇敼璁㈠崟鎺掍骇";
@@ -372,7 +545,7 @@
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
- if (this.form.orderNumber != null) {
+ if (this.form.id != null) {
updateOrderScheduling(this.form).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
@@ -390,9 +563,9 @@
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
- const orderNumbers = row.orderNumber || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎璁㈠崟鎺掍骇缂栧彿涓�"' + orderNumbers + '"鐨勬暟鎹」锛�').then(function() {
- return delOrderScheduling(orderNumbers);
+ const ids = row.id || this.ids;
+ this.$modal.confirm('鏄惁纭鍒犻櫎璁㈠崟鎺掍骇缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+ return delOrderScheduling(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
--
Gitblit v1.9.3