From f17a9e02d642986df4a2b5600d731e706f9f010b Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 23 五月 2023 09:39:03 +0800
Subject: [PATCH] 1.递交
---
src/views/scgl/gd.vue | 57 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index e235e64..14b82e3 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -20,7 +20,7 @@
style="display: flex;justify-content: space-between"
>
<div class="elForm">
- <el-form-item label-width="70px" label="璁㈠崟鐘舵��" style=" display: flex;">
+ <el-form-item label-width="70px" label="宸ュ崟鐘舵��" style=" display: flex;">
<el-select
v-model="form.mesorderstus"
:popper-append-to-body="false"
@@ -37,7 +37,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="璁㈠崟缂栧彿" style=" display: flex;">
+ <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="form.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="婧愬崟鍗曞彿" style="display: flex;">
@@ -158,7 +158,7 @@
/>
<el-table-column
prop="status"
- label="璁㈠崟鐘舵��"
+ label="宸ュ崟鐘舵��"
sortable="custom"
width="110"
>
@@ -326,7 +326,7 @@
<!-- @click="check(row)"-->
<!-- />-->
<i
- class="el-icon-tickets"
+ class="el-icon-printer"
style="cursor: pointer;color: #42b983;margin-right: 15px"
@click="handlePrint(row.wo_code)"
/>
@@ -420,7 +420,7 @@
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="鎵撳嵃宸ュ簭" placement="top">
<i
- class="el-icon-tickets"
+ class="el-icon-printer"
style="cursor: pointer;color: #42b983;margin-right: 15px"
@click="supplementSmallClick(row)"
/>
@@ -449,7 +449,7 @@
label-width="110px"
>
<el-form-item
- label="璁㈠崟鐘舵��"
+ label="宸ュ崟鐘舵��"
prop="mesorderstus"
>
<el-select
@@ -843,7 +843,7 @@
size="mini"
/>
</el-form-item>
- <el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
+ <el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">
<el-select
v-model="sourceForm.erporderstus"
filterable
@@ -859,7 +859,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandDialog" label="璁㈠崟缂栧彿" style=" display: flex;">
+ <el-form-item v-show="isExpandDialog" label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="sourceForm.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item v-show="isExpandDialog" label="浜у搧缂栫爜" style=" display: flex;">
@@ -940,12 +940,12 @@
/>
<el-table-column
prop="status"
- label="璁㈠崟鐘舵��"
+ label="宸ュ崟鐘舵��"
sortable="custom"
width="110"
>
<template slot-scope="{row}">
- <div v-if="row.status==='NEW'">鏂拌鍗�</div>
+ <div v-if="row.status==='NEW'">鏂板伐鍗�</div>
<div v-if="row.status==='CREATING'">閮ㄥ垎涓嬭揪</div>
<div v-if="row.status==='CREATED'">鍏ㄩ儴涓嬭揪</div>
<div v-if="row.status==='CLOSED'">宸插叧闂�</div>
@@ -953,7 +953,7 @@
</el-table-column>
<el-table-column
prop="wo"
- label="璁㈠崟缂栧彿"
+ label="宸ュ崟缂栧彿"
sortable="custom"
min-width="150"
/>
@@ -982,7 +982,7 @@
</el-table-column>
<el-table-column
prop="qty"
- label="璁㈠崟鏁伴噺"
+ label="宸ュ崟鏁伴噺"
width="150"
sortable="custom"
/>
@@ -1220,15 +1220,15 @@
/>
</el-table>
- <div v-if="formApprove.m_po" style="display: flex;margin-top: 20px;align-content: center;height: 130px;line-height: 130px;">
- <div style="font-size: 18px;font-weight: bolder">婧愬崟鍗曞彿锛�</div>
- <div id="qrCodeSource" ref="qrCodeSource" style="width: 130px;height: 130px;overflow: hidden" />
- </div>
+ <!-- <div v-if="formApprove.m_po" style="display: flex;margin-top: 20px;align-content: center;height: 130px;line-height: 130px;">-->
+ <!-- <div style="font-size: 18px;font-weight: bolder">婧愬崟鍗曞彿锛�</div>-->
+ <!-- <div id="qrCodeSource" ref="qrCodeSource" style="width: 130px;height: 130px;overflow: hidden" />-->
+ <!-- </div>-->
- <div v-if="formApprove.m_po" style="margin-top: 5px;">
- <img src="../../assets/images/UP.png" alt="" style="margin-left: 107px;">
- <div style="font-size: 18px;font-weight: bolder;">鏍规嵁鍗曞彿鎵爜鍏ュ簱锛岀敤PDA鎵弿姝や簩缁寸爜</div>
- </div>
+ <!-- <div v-if="formApprove.m_po" style="margin-top: 5px;">-->
+ <!-- <img src="../../assets/images/UP.png" alt="" style="margin-left: 107px;">-->
+ <!-- <div style="font-size: 18px;font-weight: bolder;">鏍规嵁鍗曞彿鎵爜鍏ュ簱锛岀敤PDA鎵弿姝や簩缁寸爜</div>-->
+ <!-- </div>-->
</div>
<span slot="footer" class="dialog-footer">
@@ -1680,7 +1680,7 @@
operation: '',
dialogFormRules: {
mesorderstus: [
- { required: true, message: '璇烽�夋嫨璁㈠崟鐘舵��', trigger: ['blur', 'change'] }
+ { required: true, message: '璇烽�夋嫨宸ュ崟鐘舵��', trigger: ['blur', 'change'] }
],
partcode: [
{ required: true, message: '璇烽�夋嫨浜у搧淇℃伅', trigger: ['blur', 'change'] }
@@ -1782,8 +1782,8 @@
dialogVisibleSource: false,
sourceTableData: [],
sourceForm: {
- erporderstus: '', // 璁㈠崟鐘舵�佺爜
- erpordercode: '', // 璁㈠崟缂栧彿
+ erporderstus: '', // 宸ュ崟鐘舵�佺爜
+ erpordercode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
@@ -1880,7 +1880,7 @@
const { data: res1 } = await PartSelect()
this.partArr = res1
},
- // 璁㈠崟鐘舵�佹敼鍙樻椂
+ // 宸ュ崟鐘舵�佹敼鍙樻椂
erporderstusChange(val) {
this.form.mesorderstus = val
},
@@ -2359,6 +2359,11 @@
this.$nextTick(() => {
console.log(this.qrForm.qrvalue, 3333)
this.bindQRCode2(this.qrForm.qrvalue)
+
+ const div = document.getElementById('qrCode2')
+ // 杩欎箞澶氫唬鐮佸彧闇�瑕佽繖涓�鍙ュ疄鐜版垜浠墍闇�瑕佺殑鍔熻兘锛屽畾浣峝iv婊氬姩鏉′綅缃湪搴曢儴锛宻crollHeight璁＄畻鍑篸iv鐨勯珮搴︼紝鍐峴crollTop 璁剧疆婊氬姩鏉＄殑楂樺害涓哄灏�
+ div.scrollTop = div.scrollHeight // 婊氬姩鏉′綅浜庢渶搴曢儴
+ // div.scrollTop = 0 // 婊氬姩鏉′綅浜庢渶椤堕儴
})
}
})
@@ -2411,8 +2416,8 @@
}
const data = {
- erporderstus: this.sourceForm.erporderstus, // 璁㈠崟鐘舵�佺爜
- erpordercode: this.sourceForm.erpordercode, // 璁㈠崟缂栧彿
+ erporderstus: this.sourceForm.erporderstus, // 宸ュ崟鐘舵�佺爜
+ erpordercode: this.sourceForm.erpordercode, // 宸ュ崟缂栧彿
partcode: this.sourceForm.partcode, // 浜у搧缂栫爜
partname: this.sourceForm.partname, // 浜у搧鍚嶇О
partspec: this.sourceForm.partspec, // 浜у搧瑙勬牸
--
Gitblit v1.9.3