From 0a3b4bac16a4cf49deaddc6b4f3a2aeee90e9061 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 21 五月 2024 16:33:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/operationtask/operationtask-form.vue | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/views/plan/operationtask/operationtask-form.vue b/src/views/plan/operationtask/operationtask-form.vue
index 35c8694..b35837e 100644
--- a/src/views/plan/operationtask/operationtask-form.vue
+++ b/src/views/plan/operationtask/operationtask-form.vue
@@ -157,7 +157,7 @@
</el-col>
</el-row>
<el-row :gutter="10">
- <el-col :span="15">
+ <el-col :span="14">
<el-form-item label="璁″垝鏃堕棿" prop="localDateTimes">
<el-date-picker :class="tattimest ? 'sed' : ''" v-model="dataForm.localDateTimes"
type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮�" end-placeholder="缁撴潫"
@@ -521,7 +521,7 @@
},
data() {
return {
- routingList: [],
+ routingList: {},
routingOptions: [],
locationOptions: [],
workstationOption: [],
@@ -591,6 +591,9 @@
],
workCenter: [
{ required: true, message: '宸ヤ綔涓績涓嶈兘涓虹┖', trigger: 'change' }
+ ],
+ workstationId: [
+ { required: true, message: '宸ヤ綔绔欎笉鑳戒负绌�', trigger: 'change' }
],
plannedQuantity: [
{ required: true, message: '鎺ユ敹鏁伴噺涓嶈兘涓虹┖', trigger: 'blur' },
@@ -671,7 +674,7 @@
}
})
},
- changeWorkCenter() {
+ changeWorkCenter(opName) {
this.workstations = []
this.dataForm.workstationId = null
this.locationOptions = []
@@ -681,9 +684,9 @@
this.$refs.ganttIndex.init(this.workCenter)
})
- this.changeWorkCenterAction()
+ this.changeWorkCenterAction(opName)
},
- changeWorkCenterAction() {
+ changeWorkCenterAction(opName) {
if (this.dataForm.workCenter) {
const queryParamStation = Object.assign({
workCenter: this.dataForm.workCenter
@@ -692,6 +695,15 @@
getAllWorkstationList(queryParamStation).then((response) => {
const resData = response.data.data
if (resData && resData.length > 0) {
+ let obj = null
+ resData.forEach((ele)=>{
+ if(ele.name.indexOf(opName)>-1){
+ obj = ele
+ }
+ })
+ if(obj){
+ this.dataForm.workstationId = obj.id
+ }
this.workstations = resData
}
})
@@ -837,7 +849,7 @@
this.$refs.ganttIndex.init(this.dataForm.workCenter, 1)
})
}
- })
+ })
},
// 琛ㄥ崟鎻愪氦
dataFormSubmit() {
@@ -945,11 +957,10 @@
this.dataForm.operationName = routingOperation.operationName
this.dataForm.workCenter = routingOperation.workCenter
- this.changeWorkCenter()
+ this.changeWorkCenter(routingOperation.operationName)
this.dataForm.routingOperationId =
routingOperation.technologyRoutingOperationId
},
-
// 鏍规嵁宸ヤ綔绔欏垏鎹㈠簱浣�
selectLocationByWorkstation() {
this.locationOptions = []
--
Gitblit v1.9.3