From aa89a9747c151e54397426f6e92862105e6d0451 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 29 六月 2023 15:55:39 +0800
Subject: [PATCH] 1.项目优化
---
src/views/deviceManager/checkStandard.vue | 2 +-
src/views/deviceManager/maintainStandard.vue | 2 +-
src/views/produceManager/produceStartOrder.vue | 4 +++-
src/views/qualityManager/processCheck.vue | 7 ++++++-
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/views/deviceManager/checkStandard.vue b/src/views/deviceManager/checkStandard.vue
index f9caeb4..91bdbfe 100644
--- a/src/views/deviceManager/checkStandard.vue
+++ b/src/views/deviceManager/checkStandard.vue
@@ -184,7 +184,7 @@
</el-form>
</div>
<div>
- <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin: -20px 10px 20px 0" />璁惧鍏宠仈鐐规椤逛俊鎭細
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin: -20px 10px 20px 0" />鏍囧噯鍏宠仈鐐规椤逛俊鎭細
</div>
<div style="margin-bottom:10px">
<el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="addRow">鏂板</el-button>
diff --git a/src/views/deviceManager/maintainStandard.vue b/src/views/deviceManager/maintainStandard.vue
index 2e16bf9..67e76a9 100644
--- a/src/views/deviceManager/maintainStandard.vue
+++ b/src/views/deviceManager/maintainStandard.vue
@@ -162,7 +162,7 @@
</el-form>
</div>
<div>
- <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin: -20px 10px 20px 0" />璁惧鍏宠仈淇濆吇椤逛俊鎭細
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin: -20px 10px 20px 0" />鏍囧噯鍏宠仈淇濆吇椤逛俊鎭細
</div>
<div style="margin-bottom:10px">
<el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="addRow">鏂板</el-button>
diff --git a/src/views/produceManager/produceStartOrder.vue b/src/views/produceManager/produceStartOrder.vue
index 43ccf3e..ab1e97f 100644
--- a/src/views/produceManager/produceStartOrder.vue
+++ b/src/views/produceManager/produceStartOrder.vue
@@ -1769,7 +1769,8 @@
const data = {
OperType: 'ZZ',
orderstepqrcode: orderstepqrcode,
- SelectType: ''
+ SelectType: '',
+ stu_torgcode: getCookie('stu_torgcode')
}
const res = await MesOrderStepStart(data)
if (res.code === '200' && res.count === 0) {
@@ -1788,6 +1789,7 @@
const data = {
OperType: 'WX',
orderstepqrcode: orderstepqrcode,
+ stu_torgcode: getCookie('stu_torgcode'),
SelectType: this.WXSelected// OUT銆両N
}
const res = await MesOrderStepStart(data)
diff --git a/src/views/qualityManager/processCheck.vue b/src/views/qualityManager/processCheck.vue
index 5eda405..7820d4b 100644
--- a/src/views/qualityManager/processCheck.vue
+++ b/src/views/qualityManager/processCheck.vue
@@ -346,9 +346,13 @@
})
},
async enterNative() {
+ if (this.$store.state.settings.orgType !== 'W') {
+ return this.$message.info('褰撳墠瑙掕壊鏃犳璇ユ潈闄愶紒')
+ }
const data = {
orderstepqrcode: this.form.orderstepqrcode,
- checktype: this.form.checktype
+ checktype: this.form.checktype,
+ stu_torgcode: getCookie('stu_torgcode')
}
const { data: res } = await MesOrderStepCheckSearch(data)
this.form.wocode = res.labcont[0].wo_code
@@ -506,6 +510,7 @@
})
const data = {
+ stu_torgcode: getCookie('stu_torgcode'),
wocode: this.form.wocode,
partcode: this.form.partcode,
stepcode: this.form.stepcode,
--
Gitblit v1.9.3