From 0042dbfd410064ebfab00826f927ed73448db5ec Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 21 五月 2024 14:53:20 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master
---
src/views/plan/operationtask/operationtask-form.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/views/plan/operationtask/operationtask-form.vue b/src/views/plan/operationtask/operationtask-form.vue
index e57cdc9..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' },
@@ -688,7 +691,7 @@
const queryParamStation = Object.assign({
workCenter: this.dataForm.workCenter
})
-
+
getAllWorkstationList(queryParamStation).then((response) => {
const resData = response.data.data
if (resData && resData.length > 0) {
@@ -846,7 +849,7 @@
this.$refs.ganttIndex.init(this.dataForm.workCenter, 1)
})
}
- })
+ })
},
// 琛ㄥ崟鎻愪氦
dataFormSubmit() {
--
Gitblit v1.9.3