From ed4da27a04e5c00dc2a457d9bdc92eacd38398a8 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 20 三月 2023 14:41:55 +0800
Subject: [PATCH] 1.流转二维码bug修改
---
src/views/scgl/gd.vue | 99 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 85 insertions(+), 14 deletions(-)
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 1f94596..9ba1ca8 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -93,7 +93,10 @@
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
<el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
@@ -746,7 +749,7 @@
<!-- <el-button v-waves v-if="operation==='add'" type="primary" @click="dialogVisibleConfirmPreview('add')">棰勮</el-button>-->
<el-button
- v-if="!sumbitBottonIsDisabled"
+ v-if="!submitBottonIsDisabled"
v-waves
type="primary"
:loading="$store.state.app.buttonIsDisabled"
@@ -755,7 +758,7 @@
>纭� 瀹�</el-button>
<el-button
- v-if="sumbitBottonIsDisabled"
+ v-if="submitBottonIsDisabled"
v-waves
type="primary"
disabled
@@ -1509,6 +1512,67 @@
</div>
<div
+ v-if="printSize===2"
+ style="display: flex;width: 220px;height: 130px;border: 1px solid #000;text-align: center;font-size: 12px"
+ >
+
+ <div style="width: 70px;display: flex;flex-direction: column;border-right: 1px solid #000">
+ <div
+ style="display: flex;height: 60%;border-bottom:1px solid #000;
+ justify-content: center;align-items: center;position: relative"
+ >
+ <div
+ id="qrCode2"
+ ref="qrCodeDiv2"
+ style="overflow-y: hidden;height:71%;position: absolute;left: 7px;"
+ />
+ </div>
+ <div
+ style="display: flex;height: 20%;justify-content: flex-start;border-bottom:1px solid #000;align-items: center"
+ >
+ <div style="margin-left: 3px; ">鏁伴噺:{{ qrForm.startqty }}</div>
+ </div>
+ <div style="display: flex;height: 20%;justify-content: flex-start;align-items: center;">
+ <div style="margin-left: 3px; ">鎿嶄綔:{{ qrForm.operator }}</div>
+
+ </div>
+ </div>
+
+ <div style="width:150px;display: flex;flex-direction: column">
+ <div
+ style="display: flex;height: 20%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center;text-align: left"
+ >
+ <div style="margin-left: 3px;">缂栧彿:{{ qrForm.wo_code }}</div>
+
+ </div>
+ <div
+ style="display: flex;height: 20%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center ;text-align: left"
+ >
+ <div style="margin-left: 3px;">浜у搧缂栫爜:{{ qrForm.partcode }}</div>
+
+ </div>
+ <div
+ style="display: flex;height: 20%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
+ >
+ <div style="margin-left: 3px;">浜у搧鍚嶇О:{{ qrForm.partname }}</div>
+
+ </div>
+ <div
+ style="display: flex;height: 20%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
+ >
+ <div style="margin-left: 3px;">涓嬮亾宸ュ簭:{{ qrForm.nextstepname }}</div>
+
+ </div>
+ <div style="display: flex;height: 20%;justify-content: flex-start;align-items: center;text-align: left">
+ <div style=" margin-left: 3px;">鏃堕棿: {{ qrForm.operatorTime }}</div>
+ <!-- <div>{{ qrForm.operatorTime?qrForm.operatorTime.substring(5):'' }}</div>-->
+ <!-- <div>{{ qrForm.operatorTime }}</div>-->
+ </div>
+
+ </div>
+
+ </div>
+ <div
v-if="printSize===5"
style="display: flex;width: 140px;height: 80px;border: 1px solid #000;text-align: center;font-size: 10px;"
>
@@ -1780,8 +1844,8 @@
routecode: '', // 宸ヨ壓璺嚎缂栫爜
wkshopcode: '', // 鐢熶骇杞﹂棿缂栫爜
- // planstartdate: '', // 璁″垝寮�濮嬫椂闂�
- // planenddate: '', // 璁″垝瀹屾垚鏃堕棿
+ planstartdate: '', // 璁″垝寮�濮嬫椂闂�
+ planenddate: '', // 璁″垝瀹屾垚鏃堕棿
orderlev: '', // 宸ュ崟绛夌骇
isAps: 'N', // 鏄惁鎺掔▼
bomId: '', // 鐗╂枡娓呭崟id
@@ -1940,10 +2004,11 @@
defaultroute_codeArr: '', // 榛樿宸ヨ壓璺嚎鏁扮粍
projectTableData: [], // 璁惧鍒楄〃
tableDataDetail: [], // 鐐瑰嚮宸ュ崟琛ㄧ殑琛� 鏄剧ず璇︾粏淇℃伅
- printSize: 1,
+ printSize: 0,
printSizeSelectArr: [// 瀹�*楂�
{ code: 0, name: '80*50' },
- { code: 1, name: '78*60' }
+ { code: 1, name: '78*60' },
+ { code: 2, name: '60*40' }
// { code: 2, name: '50*60' },
// { code: 3, name: '50*40' },
// { code: 4, name: '50*80' },
@@ -1954,7 +2019,7 @@
return time.getTime() < Date.now() - 8.64e7
}
},
- sumbitBottonIsDisabled: false
+ submitBottonIsDisabled: false
}
},
created() {
@@ -2090,7 +2155,7 @@
this.dialogForm.wkshopcode = ''
- this.sumbitBottonIsDisabled = false
+ this.submitBottonIsDisabled = false
},
// 宸ヨ壓璺嚎鍊兼敼鍙�
async routecodeChange(val) {
@@ -2103,7 +2168,7 @@
this.wkshopArr = res2
this.dialogForm.wkshopcode = ''
- this.sumbitBottonIsDisabled = false
+ this.submitBottonIsDisabled = false
},
// 鐢熶骇杞﹂棿鍊兼敼鍙樻椂
wkshopcodeChange(val) {
@@ -2116,7 +2181,7 @@
// console.log(res, 1)
}).catch(err => {
// console.log(err, 2)
- this.sumbitBottonIsDisabled = true
+ this.submitBottonIsDisabled = true
})
},
@@ -2281,7 +2346,7 @@
this.bomIdArr = []
this.$refs.dialogForm.clearValidate()
- this.sumbitBottonIsDisabled = false
+ this.submitBottonIsDisabled = false
},
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
@@ -2515,6 +2580,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 // 婊氬姩鏉′綅浜庢渶椤堕儴
})
}
})
@@ -2538,8 +2608,8 @@
bindQRCode2(text) {
new QRCode(this.$refs.qrCodeDiv2, {
text: text,
- width: 60,
- height: 60,
+ width: this.printSize !== 2 ? 60 : 55,
+ height: this.printSize !== 2 ? 60 : 55,
colorDark: '#000', // 浜岀淮鐮侀鑹�
colorLight: '#ffffff', // 浜岀淮鐮佽儗鏅壊
correctLevel: QRCode.CorrectLevel.L// 瀹归敊鐜囷紝L/M/H
@@ -2765,6 +2835,7 @@
<style lang="scss" scoped>
$main_color: #42b983;
+
.dialogVisibleRoute {
.myCheckboxGroup {
display: flex;
--
Gitblit v1.9.3