From 7aa0dadef89ed8edd25c527bcb164f3fe5960c59 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 08 五月 2024 14:56:49 +0800
Subject: [PATCH] 工单的工作站修改
---
src/views/quality/processconfiguration/index.vue | 25 +++++++++++++------------
vue.config.js | 4 ++--
src/views/product/workbench/workReportCard.vue | 4 ++--
src/views/plan/operationtask/operationtask-form.vue | 4 ++--
4 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/views/plan/operationtask/operationtask-form.vue b/src/views/plan/operationtask/operationtask-form.vue
index 515d65d..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="缁撴潫"
@@ -592,7 +592,7 @@
workCenter: [
{ required: true, message: '宸ヤ綔涓績涓嶈兘涓虹┖', trigger: 'change' }
],
- workstations: [
+ workstationId: [
{ required: true, message: '宸ヤ綔绔欎笉鑳戒负绌�', trigger: 'change' }
],
plannedQuantity: [
diff --git a/src/views/product/workbench/workReportCard.vue b/src/views/product/workbench/workReportCard.vue
index 7f02663..fcf2a04 100644
--- a/src/views/product/workbench/workReportCard.vue
+++ b/src/views/product/workbench/workReportCard.vue
@@ -126,10 +126,10 @@
<!-- <el-button class="tracking-out-revoke-btn" type="primary" icon="tracking-btn-out"
:disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" >浜ょ彮
</el-button> -->
- <!-- <el-button class="submit-out-btn" type="primary"
+ <el-button class="submit-out-btn" type="primary"
:disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="submitList()"
:loading="submitLoading">鎻愪氦
- </el-button> -->
+ </el-button>
<el-button class="batch-out-del-btn" type="primary"
:disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="deleteList()">鍒犻櫎
</el-button>
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index 6fff645..197b3f4 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -170,6 +170,18 @@
// render: { fun: this.addOrUpdateHandle }
}
},
+ {
+ minWidth: '120',
+ prop: 'state',
+ label: '鐘舵��',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'select',
+ formatter: this.formatInsState,
+ optList: () => {
+ return this.StateList
+ }
+ },
// 妫�楠岀紪鍙�
{
minWidth: '140',
@@ -264,18 +276,7 @@
searchInfoType: 'datetimerange',
formatter: this.formatDateTime,
},
- {
- minWidth: '120',
- prop: 'state',
- label: '鐘舵��',
- isTrue: true,
- isSearch: true,
- searchInfoType: 'select',
- formatter: this.formatInsState,
- optList: () => {
- return this.StateList
- }
- },
+
// {
// minWidth: '120',
// prop: '',
diff --git a/vue.config.js b/vue.config.js
index b413af0..545c796 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,8 +6,8 @@
// const url = 'https://ztms-mes.chinaztt.cn/'
- // const url = 'http://localhost:9999'
-const url = 'http://192.168.32.45:9999'
+const url = 'http://localhost:9999'
+//const url = 'http://192.168.32.45:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3