From aecdfb8c9f8c5f20dc9adb61adf0a9c1385b9f14 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 17 一月 2024 09:58:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/processInspect/processInspect-form.vue | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 7695830..d0d066d 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -27,6 +27,11 @@
<el-form-item label="杞﹂棿璁㈠崟鍙�" prop="moNo">
<el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
v-model="processInspectVo.moNo" placeholder="璇疯緭鍏ヨ溅闂磋鍗曞彿" autocomplete="off" >
+ <!-- <el-button
+ slot="append"
+ icon="el-icon-search"
+ :disabled="resultVal!=null"
+ @click="queryCode"></el-button> -->
<el-button
slot="append"
icon="el-icon-full-screen"
@@ -251,6 +256,7 @@
<el-button type="primary" @click="deviceCode = false">纭� 瀹�</el-button>
</span>
</el-dialog>
+ <processPart :paramObj="paramObj" :currshowlist.sync="workshop" />
</div>
</template>
@@ -263,15 +269,17 @@
updateProcessInsProduct,
updateProcessInspectsById,
} from '@/api/quality/processInspect'
+import processPart from '@/views/common/processinspect-part'
import { selectDevice } from '@/api/quality/processInspect'
import qrCodeApp from '@/views/common/qrCodeApp'
import { validatePositiveInteger } from '@/util/validate'
export default {
components:{
- qrCodeApp
+ qrCodeApp,processPart
},
data() {
return {
+ paramObj:{},
qrcode: false,
row: null,
proIndex: 0,
@@ -291,6 +299,7 @@
resultVal: null,
technologyList: [],
deviceList: [],
+ workshop:false,//杞﹂棿寮圭獥
hasChildren: true,
optionsSamplename: [],
// 娣诲姞鍒�
@@ -335,6 +344,14 @@
this.init()
},
methods: {
+ queryCode(){
+ console.log("llll");
+ this.workshop = true
+ console.log(this.workshop);
+ // this.paramObj = {
+ // code: this.dataForm.code
+ // }
+ },
cancelCodeDialog(){
this.qrcode = false
},
--
Gitblit v1.9.3