From d5da5dece1162b8d781e8fb9546c7f8798b880c9 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期五, 17 十一月 2023 15:37:38 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/plan/masterproductionschedule/index.vue | 4 ++--
src/views/plan/manufacturingorder/index.vue | 12 ++++++------
src/views/technology/operation/operation-form.vue | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 568bf63..0e1c7b3 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -824,12 +824,12 @@
],
toolbar: [],
operator: [
- {
- text: '鏌ョ湅搴撳瓨',
- type: 'text',
- size: 'small',
- fun: this.searchStock
- }
+ // {
+ // text: '鏌ョ湅搴撳瓨',
+ // type: 'text',
+ // size: 'small',
+ // fun: this.searchStock
+ // }
],
operatorConfig: {
fixed: 'right',
diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue
index aeb9cf5..927b1ff 100644
--- a/src/views/plan/masterproductionschedule/index.vue
+++ b/src/views/plan/masterproductionschedule/index.vue
@@ -771,8 +771,8 @@
return ''
},
// 鍒犻櫎
- deleteHandle(row) {
- this.$confirm('鏄惁纭鍒犻櫎ID涓�' + row.id, '鎻愮ず', {
+ deleteMainPlan(row) {
+ this.$confirm('鏄惁纭浣滃簾ID涓�' + row.id, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
closeOnClickModal: false,
diff --git a/src/views/technology/operation/operation-form.vue b/src/views/technology/operation/operation-form.vue
index 6f21354..282dcc6 100644
--- a/src/views/technology/operation/operation-form.vue
+++ b/src/views/technology/operation/operation-form.vue
@@ -592,8 +592,8 @@
// }
},
init() {
- this.operationId = this.dataForm.id
- this.fetchCapabilityForOperation()
+ // this.operationId = this.dataForm.id
+ // this.fetchCapabilityForOperation()
if (this.dataForm.id) {
getObj(this.dataForm.id).then((response) => {
this.dataForm = response.data.data
--
Gitblit v1.9.3