From 0e32c196e90704ef548735541f0d5495812d5028 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 21 七月 2022 11:26:03 +0800
Subject: [PATCH] 1.优化检验缺陷页面
---
src/views/scgl/sckbg.vue | 68 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 77bc27d..ce1b3ed 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -1,15 +1,15 @@
<template>
<div>
<div class="body" style="padding: 0;height: 100%" :style="{height:mainHeight+'px'}">
-
- <el-tabs ref="elTabs" type="border-card" @tab-click="tabClick">
+ <el-tabs ref="elTabs" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="鐢熶骇鍒楄〃">
<div style="margin-left: 10px;margin-top:10px;display: flex;justify-content: space-between">
<div style="display: flex;align-items: center">
- <div style="width: 70px">鎵爜锛�</div>
+ <div style="width: 90px">鎵弿鏉＄爜锛�</div>
+ <!-- oninput="value=value.replace(/[^0-9a-zA-Z;_]/g,'')"-->
+
<el-input
v-model="form.orderstepqrcode"
- oninput="value=value.replace(/[^0-9a-zA-Z;_]/g,'')"
name="produceCode"
style="width: 300px"
@keyup.enter.native="val=>enterNative(val,'produceCode')"
@@ -163,10 +163,9 @@
:value="item.code"
/>
</el-select>
- <div style="width: 70px;margin-left: 20px">鎵爜锛�</div>
+ <div style="width: 90px;margin-left: 20px">鎵弿鏉＄爜锛�</div>
<el-input
v-model="WXform.orderstepqrcode"
- oninput="value=value.replace(/[^0-9a-zA-Z;_]/g,'')"
name="WXproduceCode"
style="width: 300px"
@keyup.enter.native="val=>enterNative(val,'WXproduceCode')"
@@ -303,7 +302,6 @@
@pagination="getMesOrderStepSearch"
/>
</el-tab-pane>
-
</el-tabs>
</div>
@@ -366,6 +364,7 @@
<!--鑷埗寮�濮�-->
<el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" label="寮�宸ユ暟閲忥細">
<div style="width: 200px">{{ dialogForm.startqty }}</div>
+ <!-- <div style="width: 200px">{{ dialogForm.noreportqty }}</div>-->
</el-form-item>
<el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" prop="eqpcode" label="鐢熶骇璁惧锛�">
<el-select
@@ -416,6 +415,7 @@
</el-form-item>
<el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鎶ュ伐鏁伴噺锛�" prop="startqty">
<el-input v-model="dialogForm.startqty" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
+ <!-- <el-input v-model="dialogForm.noreportqty" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />-->
</el-form-item>
<el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嶈壇鏁伴噺锛�">
<el-input v-model="dialogForm.noputqty" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
@@ -649,8 +649,6 @@
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
import $ from 'jquery'
import {
MesOrderGroupSelectUser,
@@ -667,8 +665,8 @@
SavaMesOrderStepStart,
SavaMesOrderStepReport
} from '@/api/scgl'
-import { urlAddRandomNo, webapp_ws_ajax_run } from '@/utils/grwebapp'
-import { MesOrderPrintSearch1 } from '@/api/utils'
+import { urlAddRandomNo, webapp_urlprotocol_startup, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
+import { UserGroupDelete } from '@/api/jcsz'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -712,9 +710,8 @@
total: 10,
tableData: [],
WXform: { // 澶栧崗琛ㄥ崟
- // PO202206280001_4;Step01
orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
- prop: 'wo_code', // 鎺掑簭瀛楁
+ prop: 'wo_code', // 鎺掑簭瀛楁z
order: 'asc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
@@ -774,7 +771,6 @@
UserTotal: 0,
Userform: {},
userIsSave: false, // 姝や汉鍛樻槸鍚﹀彲淇濇寔
- // operation: '',
dialogFormRules: {
outuser: [
{ required: true, message: '璇烽�夋嫨鍙戞枡浜哄憳', trigger: ['blur', 'change'] }
@@ -806,8 +802,8 @@
startqty: [
{ required: true, message: '璇疯緭鍏ユ姤宸ユ暟閲�', trigger: ['blur', 'change'] }
]
- }
-
+ },
+ activeName: ''
}
},
created() {
@@ -821,6 +817,8 @@
this.$nextTick(() => {
$("input[name='produceCode']")[0].focus()
})
+ // webapp_urlprotocol_startup()
+ webapp_ws_autoupdate(true)
},
methods: {
async getMesOrderStepSearch() {
@@ -877,14 +875,14 @@
this.$nextTick(() => {
this.getMesOrderStepSearch()
$("input[name='produceCode']")[0].focus()
- // this.WXform.orderstepqrcode = ''
+ this.WXform.orderstepqrcode = ''
})
}
if (this.$refs.elTabs.currentName === '1') {
this.$nextTick(() => {
this.getMesOrderWxStepSearch()
$("input[name='WXproduceCode']")[0].focus()
- // this.form.orderstepqrcode = ''
+ this.form.orderstepqrcode = ''
})
}
},
@@ -897,12 +895,12 @@
// 鏀舵枡锛歝ode="200" count=3
// 璧板垪琛ㄥ舰寮� code="200" count=4
if (belong === 'produceCode') {
+ const orderstepqrcode = this.form.orderstepqrcode
const data = {
OperType: 'ZZ',
- orderstepqrcode: this.form.orderstepqrcode,
+ orderstepqrcode: orderstepqrcode,
SelectType: ''
}
- console.log(this.form.orderstepqrcode, 21)
const res = await MesOrderStepStart(data)
if (res.code === '200' && res.count === 0) {
await this.ZZstart(res.data)
@@ -912,9 +910,10 @@
}
}
if (belong === 'WXproduceCode') {
+ const orderstepqrcode = this.WXform.orderstepqrcode
const data = {
OperType: 'WX',
- orderstepqrcode: this.WXform.orderstepqrcode,
+ orderstepqrcode: orderstepqrcode,
SelectType: this.WXSelected// OUT銆両N
}
const res = await MesOrderStepStart(data)
@@ -950,7 +949,8 @@
this.dialogForm.planqty = obj.planqty
this.dialogForm.reportqty = obj.reportqty
this.dialogForm.noreportqty = obj.noreportqty
- this.dialogForm.startqty = obj.startqty
+ // this.dialogForm.startqty = obj.startqty
+ this.dialogForm.startqty = obj.noreportqty
})
await this.getMesOrderStepStartSelectEqp()
@@ -976,15 +976,18 @@
this.dialogForm.reportqty = obj.reportqty
this.dialogForm.noputqty = obj.noputqty
this.dialogForm.noreportqty = obj.noreportqty
- this.dialogForm.startqty = obj.startqty
+ // this.dialogForm.startqty = obj.startqty
+ this.dialogForm.startqty = obj.noreportqty
if (obj.nextstepname === null || obj.nextstepcode === '') {
this.dialogForm.nextstepname = obj.stepname
+ this.dialogForm.nextstepcode = obj.stepcode
} else {
this.dialogForm.nextstepname = obj.nextstepname
+ this.dialogForm.nextstepcode = obj.nextstepcode
}
- this.dialogForm.startqtySum = obj.startqty
+ this.dialogForm.startqtySum = obj.noreportqty
})
await this.getMesOrderStepStartSelectEqp()
@@ -1043,8 +1046,10 @@
this.dialogForm.stepcode = obj.stepcode
if (obj.nextstepname === null || obj.nextstepcode === '') {
this.dialogForm.nextstepname = obj.stepname
+ this.dialogForm.nextstepcode = obj.stepcode
} else {
this.dialogForm.nextstepname = obj.nextstepname
+ this.dialogForm.nextstepcode = obj.nextstepcode
}
this.dialogForm.noputqty = obj.noputqty
this.dialogForm.stepseq = obj.seq
@@ -1245,12 +1250,12 @@
inuser: this.dialogForm.inuser, // 鍙戞枡浜哄憳
taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
sqty: this.dialogForm.sqty, // 鏀舵枡鏁伴噺
- ngqty: this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
+ ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
}
SavaMesOrderStepIn(data).then(res => {
if (res.code === '200') {
- // this.WXprint()
+ this.WXprint()
this.$message.success('鏀舵枡鎴愬姛锛�')
this.dialogVisible = false
this.tabClick()
@@ -1272,7 +1277,6 @@
}
SavaMesOrderStepStart(data).then(res => {
if (res.code === '200') {
- // this.WXprint()
this.$message.success('寮�宸ユ垚鍔燂紒')
this.dialogVisible = false
this.tabClick()
@@ -1310,12 +1314,12 @@
startqty: this.dialogForm.reportqty, // 寮�宸ユ暟閲�
// reportqty: this.dialogForm.reportqty, // 鎶ュ伐鏁伴噺
reportqty: this.dialogForm.startqty, // 鎶ュ伐鏁伴噺
- ngqty: this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
+ ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
}
SavaMesOrderStepReport(data).then(res => {
if (res.code === '200') {
- // this.ZZprint()
+ this.ZZprint()
this.$message.success('鎶ュ伐鎴愬姛锛�')
this.dialogVisible = false
this.tabClick()
@@ -1336,7 +1340,8 @@
partname: this.dialogForm.partname, // 浜у搧鍚嶇О
next_stepname: this.dialogForm.nextstepname, // 涓嬮亾宸ュ簭
qty: this.dialogForm.startqty, // 鏁伴噺
- qrcode: this.form.orderstepqrcode// 浜岀淮鐮�
+ // qrcode: this.form.orderstepqrcode// 浜岀淮鐮�
+ qrcode: this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode // 浜岀淮鐮�
}
]
}
@@ -1359,7 +1364,8 @@
partname: this.dialogForm.partname, // 浜у搧鍚嶇О
next_stepname: this.dialogForm.nextstepname, // 涓嬮亾宸ュ簭
qty: this.dialogForm.sqty, // 鏁伴噺
- qrcode: this.WXform.orderstepqrcode// 浜岀淮鐮�
+ // qrcode: this.WXform.orderstepqrcode// 浜岀淮鐮�
+ qrcode: this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode// 浜岀淮鐮�
}
]
}
--
Gitblit v1.9.3