From 540f84fd0a7ecc758f003654edb5cab0684dca5f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 22 十二月 2023 16:01:15 +0800
Subject: [PATCH] 修改报工的投入
---
vue.config.js | 4 ++--
src/views/technology/routing/routing-form.vue | 2 +-
src/views/product/workbench/productInDialog.vue | 2 ++
src/views/plan/operationtask/operationtask-form.vue | 8 ++++----
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/views/plan/operationtask/operationtask-form.vue b/src/views/plan/operationtask/operationtask-form.vue
index 99e8f1b..35c8694 100644
--- a/src/views/plan/operationtask/operationtask-form.vue
+++ b/src/views/plan/operationtask/operationtask-form.vue
@@ -398,13 +398,13 @@
<!-- </el-table>-->
<!-- </el-card>-->
<!-- </el-tab-pane>-->
- <el-tab-pane label="宸ュ崟渚涘簲琛�" v-if="this.dataForm.id">
+ <!-- <el-tab-pane label="宸ュ崟渚涘簲琛�" v-if="this.dataForm.id">
<manufacturing-order :operationId="this.dataForm.id" ref="manufacturing"></manufacturing-order>
- </el-tab-pane>
- <el-tab-pane label="宸ュ崟鎵�闇�鐗╂枡" v-if="this.dataForm.id">
+ </el-tab-pane> -->
+ <!-- <el-tab-pane label="宸ュ崟鎵�闇�鐗╂枡" v-if="this.dataForm.id">
<operation-supply :operationId="this.dataForm.id" :routingOperationId="this.dataForm.moRoutingOperationId"
ref="manufacturing"></operation-supply>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
<span slot="footer" class="dialog-footer">
diff --git a/src/views/product/workbench/productInDialog.vue b/src/views/product/workbench/productInDialog.vue
index 15c4b15..c1e4507 100644
--- a/src/views/product/workbench/productInDialog.vue
+++ b/src/views/product/workbench/productInDialog.vue
@@ -115,6 +115,8 @@
var query = {}
this.workstationFeedList = []
if (this.workstationId && this.workstationId != null) {
+ let operationTaskId=JSON.parse(localStorage.getItem("OPERATION_TASK_ID"))
+ query.operationTaskId=operationTaskId
getWorkstationFeed(query, this.workstationId)
.then((response) => {
var data = response.data
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index 2ebb8ad..2f5c33a 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -62,7 +62,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="BOM" prop="bomId">
- <el-select style="width:100%" :disabled="dataForm.id != null" v-model="dataForm.bomId" placeholder="" filterable>
+ <el-select style="width:100%" v-model="dataForm.bomId" placeholder="" filterable>
<el-option
v-for="item in bomList"
:key="item.id"
diff --git a/vue.config.js b/vue.config.js
index ae3e477..2131d04 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,10 +4,10 @@
*/
-const url = 'http://192.168.2.7:9999'
+//const url = 'http://192.168.2.7:9999'
// const url = 'http://192.168.32.45:9999'
-// const url = 'http://localhost:9999'
+const url = 'http://localhost:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3