From db407663e3024050ab3eb701f10ee00ddaf5f1ee Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 16 六月 2023 11:28:38 +0800
Subject: [PATCH] 1.制造模型引入车间概念
---
src/views/produceManager/workOrder.vue | 138 ++++++++++++++++++++++++++--------------------
1 files changed, 78 insertions(+), 60 deletions(-)
diff --git a/src/views/produceManager/workOrder.vue b/src/views/produceManager/workOrder.vue
index a9908d3..9773266 100644
--- a/src/views/produceManager/workOrder.vue
+++ b/src/views/produceManager/workOrder.vue
@@ -362,7 +362,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="total,prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes,jumper"
popper-class="select_bottom"
@pagination="getMesOrderSearch"
/>
@@ -587,15 +587,33 @@
<el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
</el-form-item>
<div style="display: flex">
+ <el-form-item label="鐢熶骇杞﹂棿" prop="wkshopcode">
+ <el-select
+ v-model="dialogForm.wkshopcode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ :disabled="dialogForm.partcode===''"
+ @change="val=>wkshopcodeChange(val,dialogForm.partcode)"
+ >
+ <el-option
+ v-for="item in wkshopArr"
+ :key="item.org_code"
+ :label="item.org_name"
+ :value="item.org_code"
+ />
+ </el-select>
+ </el-form-item>
<div style="display: flex;flex-wrap: nowrap">
<el-form-item label="宸ヨ壓璺嚎" prop="routecode">
<el-select
v-model="dialogForm.routecode"
filterable
- :disabled="dialogForm.partcode===''"
:popper-append-to-body="false"
style="width: 172px"
placeholder="璇烽�夋嫨"
+ :disabled="dialogForm.wkshopcode===''"
@change="routecodeChange"
>
<el-option
@@ -616,24 +634,6 @@
<!-- :disabled="dialogForm.routecode===''"-->
</div>
- <el-form-item label="鐢熶骇杞﹂棿" prop="wkshopcode">
- <el-select
- v-model="dialogForm.wkshopcode"
- filterable
- :popper-append-to-body="false"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- :disabled="dialogForm.routecode===''"
- @change="wkshopcodeChange"
- >
- <el-option
- v-for="item in wkshopArr"
- :key="item.org_code"
- :label="item.org_name"
- :value="item.org_code"
- />
- </el-select>
- </el-form-item>
</div>
<el-form-item label="鏄惁鎺掔▼" prop="isAps">
<el-radio-group v-model="dialogForm.isAps" style="width:200px" @change="changeIsAps">
@@ -2338,51 +2338,69 @@
},
// 浜у搧淇℃伅鍊兼敼鍙�
async partcodeChange(val) {
- const { data: res } = await PartSelectRoute({ partcode: val })
+ const { data: res } = await RouteSelectWkshop({ partcode: val })
+ this.wkshopArr = res
+
+ // this.dialogForm.wkshopcode=res.length === 1?res[0].org_code:''
+ if (res.length === 1) {
+ this.dialogForm.wkshopcode = res[0].org_code
+ await this.wkshopcodeChange(res[0].org_code, val)
+ } else {
+ this.dialogForm.wkshopcode = ''
+ }
+
+ // this.routeArr = res
+
+ // let flag = false
+ // this.routeArr.forEach(item => {
+ // if (item.code === item.default_route) {
+ // this.dialogForm.routecode = item.code
+ // // this.routecodeChange(this.dialogForm.routecode)
+ // this.wkshopcodeChange(this.dialogForm.routecode)
+ // flag = true
+ // }
+ // })
+ // if (!flag) {
+ // this.dialogForm.routecode = ''
+ // }
+ //
+ // this.dialogForm.wkshopcode = ''
+ //
+ // this.submitButtonIsDisabled = false
+ },
+ // 宸ヨ壓璺嚎鍊兼敼鍙�
+ async routecodeChange(partcode, routecode) {
+ // const data = {
+ // partcode,
+ // routecode
+ // }
+ },
+ // 鐢熶骇杞﹂棿鍊兼敼鍙樻椂
+ async wkshopcodeChange(wkshopcode, partcode) {
+ const data = {
+ partcode,
+ wkshopcode
+ }
+
+ const { data: res } = await PartSelectRoute(data)
this.routeArr = res
- let flag = false
- this.routeArr.forEach(item => {
- if (item.code === item.default_route) {
- this.dialogForm.routecode = item.code
- this.routecodeChange(this.dialogForm.routecode)
- flag = true
- }
- })
- if (!flag) {
+ if (res.length === 1) {
+ this.dialogForm.routecode = res[0].code
+ } else {
this.dialogForm.routecode = ''
}
- this.dialogForm.wkshopcode = ''
-
- this.submitButtonIsDisabled = false
- },
- // 宸ヨ壓璺嚎鍊兼敼鍙�
- async routecodeChange(val) {
- const data = {
- partcode: this.dialogForm.partcode,
- routecode: this.dialogForm.routecode
- }
- // 鑾峰彇鐢熶骇杞﹂棿鏁扮粍
- const { data: res2 } = await RouteSelectWkshop(data)
- this.wkshopArr = res2
- this.dialogForm.wkshopcode = ''
-
- this.submitButtonIsDisabled = false
- },
- // 鐢熶骇杞﹂棿鍊兼敼鍙樻椂
- wkshopcodeChange(val) {
- const data = {
- partcode: this.dialogForm.partcode,
- routecode: this.dialogForm.routecode,
- wkshopcode: val
- }
- SelectRouteOrWkshop(data).then((res) => {
- // console.log(res, 1)
- }).catch(err => {
- // console.log(err, 2)
- this.submitButtonIsDisabled = true
- })
+ // const data = {
+ // partcode: this.dialogForm.partcode,
+ // routecode: this.dialogForm.routecode,
+ // wkshopcode: val
+ // }
+ // SelectRouteOrWkshop(data).then((res) => {
+ //
+ // }).catch(err => {
+ // this.submitButtonIsDisabled = true
+ // })
},
// 鏄惁鎺掔▼鍊兼敼鍙樻椂
--
Gitblit v1.9.3