From 82939b6a5e629d50e6195aa36895a98d2662394a Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期一, 15 一月 2024 09:35:32 +0800
Subject: [PATCH] 更新机型序号和订单排产
---
jcdm-ui/src/views/main/bs/modelNumber/index.vue | 203 ++++++++++++++--------------
jcdm-ui/src/views/main/bs/orderScheduling/index.vue | 187 +++++++++++++-------------
2 files changed, 196 insertions(+), 194 deletions(-)
diff --git a/jcdm-ui/src/views/main/bs/modelNumber/index.vue b/jcdm-ui/src/views/main/bs/modelNumber/index.vue
index 03a57ce..9bbc76a 100644
--- a/jcdm-ui/src/views/main/bs/modelNumber/index.vue
+++ b/jcdm-ui/src/views/main/bs/modelNumber/index.vue
@@ -34,69 +34,70 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨鐘舵��" clearable>
+<!-- <el-form-item label="鐘舵��" prop="status">-->
+<!-- <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨鐘舵��" clearable>-->
- </el-select>
- </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-select>-->
+<!-- </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>
@@ -167,30 +168,30 @@
<el-table-column label="涓婃鐨勭紪鍙�" align="center" prop="lastNumber">
</el-table-column>
- <el-table-column label="鐘舵��" align="center" prop="status">
+<!-- <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="棰勭暀瀛楁1" align="center" prop="spareField1">-->
- </el-table-column>
- <el-table-column label="棰勭暀瀛楁2" align="center" prop="spareField2">
+<!-- </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="棰勭暀瀛楁3" align="center" prop="spareField3">-->
- </el-table-column>
- <el-table-column label="棰勭暀瀛楁4" align="center" prop="spareField4">
+<!-- </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="createUser">-->
- </el-table-column>
- <el-table-column label="鏇存敼鐢ㄦ埛" align="center" prop="updateUser">
+<!-- </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 label="澶囨敞" align="center" prop="remarks">-->
- </el-table-column>
+<!-- </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
@@ -243,32 +244,32 @@
<el-form-item label="涓婃鐨勭紪鍙�" prop="lastNumber">
<el-input v-model="form.lastNumber" placeholder="璇疯緭鍏ヤ笂娆＄殑缂栧彿" />
</el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-radio-group v-model="form.status">
+<!-- <el-form-item label="鐘舵��" prop="status">-->
+<!-- <el-radio-group v-model="form.status">-->
- </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-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>
diff --git a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
index 596b1c2..fa8bbc9 100644
--- a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
+++ b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
@@ -78,64 +78,65 @@
/>
</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 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>
@@ -236,30 +237,30 @@
<el-table-column label="鎿嶄綔鏃堕棿" align="center" prop="operateTime">
</el-table-column>
- <el-table-column label="鐘舵��" align="center" prop="status">
+<!-- <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="棰勭暀瀛楁1" align="center" prop="spareField1">-->
- </el-table-column>
- <el-table-column label="棰勭暀瀛楁2" align="center" prop="spareField2">
+<!-- </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="棰勭暀瀛楁3" align="center" prop="spareField3">-->
- </el-table-column>
- <el-table-column label="棰勭暀瀛楁4" align="center" prop="spareField4">
+<!-- </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="createUser">-->
- </el-table-column>
- <el-table-column label="鏇存敼鐢ㄦ埛" align="center" prop="updateUser">
+<!-- </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 label="澶囨敞" align="center" prop="remarks">-->
- </el-table-column>
+<!-- </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
@@ -364,27 +365,27 @@
<!-- >{{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-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>
--
Gitblit v1.9.3