From 8be895639f0250ced67a4437e7ebf6854d054749 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 24 八月 2022 17:36:20 +0800
Subject: [PATCH] 1.修改小标签打印
---
src/views/scgl/gd.vue | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index e0e01c8..829dbfb 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -596,7 +596,7 @@
</span>
</el-dialog>
- <!-- 鎵撳嵃棰勮瀵硅瘽妗�-->
+ <!--鎵撳嵃棰勮瀵硅瘽妗� 澶ф爣绛�-->
<el-dialog
title=""
:visible.sync="dialogVisibleApprove"
@@ -741,50 +741,61 @@
title="棰勮"
:visible.sync="dialogVisible2"
width="1140"
+ top="10vh"
:close-on-click-modal="false"
@close="dialogVisible2Close"
>
<!-- 瑕佹墦鍗扮殑鍖哄煙 -->
<div id="printMe2" style="padding: 30px;">
<div
- style="display: flex;width: 250px;height: 150px;border: 1px solid #000;text-align: center;font-size: 10px;"
+ style="display: flex;width: 280px;height: 150px;border: 1px solid #000;text-align: center;font-size: 10px;"
>
- <div style="width: 60px;display: flex;flex-direction: column;border-right: 1px solid #000">
+ <div style="width: 90px;display: flex;flex-direction: column;border-right: 1px solid #000">
<div
- style="display: flex;height: 75%;border-bottom:1px solid #000;
+ style="display: flex;height: 90px;border-bottom:1px solid #000;
justify-content: center;align-items: center;position: relative"
>
- <div id="qrCode2" ref="qrCodeDiv2" style="overflow-y: hidden;height: 50px;position: absolute;left: 4px" />
+ <div id="qrCode2" ref="qrCodeDiv2" style="overflow-y: hidden;height:60px;position: absolute;left: 14px;" />
</div>
- <div style="display: flex;height: 25%;justify-content: flex-start;align-items: center">
- <div style="margin-left: 5px;width: 40px">鏁伴噺:</div>
+ <div style="display: flex;height: 30px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center">
+ <div style="margin-left: 5px;width: 28px">鏁伴噺:</div>
{{ qrForm.startqty }}
+ </div>
+ <div style="display: flex;height: 30px;justify-content: flex-start;align-items: center">
+ <div style="margin-left: 5px;width: 42px">澶勭悊浜�:</div>
+ {{ qrForm.operator }}
</div>
</div>
<div style="width:190px;display: flex;flex-direction: column">
<div
- style="display: flex;height: 25%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center;text-align: left"
+ style="display: flex;height: 20%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center;text-align: left"
>
<div style="width: 60px;margin-left: 5px;">宸ュ崟缂栧彿:</div>
<div>{{ qrForm.wo_code }}</div>
</div>
<div
- style="display: flex;height: 25%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center ;text-align: left"
+ style="display: flex;height: 20%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center ;text-align: left"
>
<div style="width: 60px;margin-left: 5px;">浜у搧缂栫爜:</div>
<div>{{ qrForm.partcode }}</div>
</div>
<div
- style="display: flex;height: 25%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
+ style="display: flex;height: 20%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
>
<div style="width:60px;margin-left: 5px;">浜у搧鍚嶇О:</div>
<div>{{ qrForm.partname }}</div>
</div>
- <div style="display: flex;height: 25%;justify-content: flex-start;align-items: center;text-align: left">
- <div style="width: 60px;margin-left: 5px;">涓嬮亾宸ュ簭:</div>
+ <div
+ style="display: flex;height: 20%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
+ >
+ <div style="width:60px;margin-left: 5px;">涓嬮亾宸ュ簭:</div>
<div>{{ qrForm.nextstepname }}</div>
+ </div>
+ <div style="display: flex;height: 20%;justify-content: flex-start;align-items: center;text-align: left">
+ <div style="width: 60px;margin-left: 5px;">澶勭悊鏃堕棿:</div>
+ <div>{{ qrForm.operatorTime }}</div>
</div>
</div>
@@ -812,7 +823,7 @@
SelectRouteStep
} from '@/api/scgl'
import { PartSelect } from '@/api/zzmx'
-import { handleDatetime } from '@/utils/global'
+import { handleDatetime, handleDatetime2 } from '@/utils/global'
import { getCookie } from '@/utils/auth'
import { MesOrderPrintSearch1, PrintOrder } from '@/api/utils'
import { urlAddRandomNo, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
@@ -990,7 +1001,9 @@
wo_code: '',
partcode: '',
partname: '',
- nextstepname: ''
+ nextstepname: '',
+ operator: '', // 鎿嶄綔浜�
+ operatorTime: ''// 鎿嶄綔鏃堕棿
}
}
},
@@ -1465,7 +1478,9 @@
wo_code: item.wo_code,
partcode: item.partcode,
partname: item.partname,
- nextstepname: item.seq === this.taskTableData.length ? item.stepname : this.taskTableData[item.seq].stepname
+ nextstepname: item.seq === this.taskTableData.length ? item.stepname : this.taskTableData[item.seq].stepname,
+ operator: getCookie('username'),
+ operatorTime: handleDatetime2(new Date())
}
this.$nextTick(() => {
console.log(this.qrForm.qrvalue, 3333)
@@ -1485,14 +1500,16 @@
this.qrForm.partcode = ''
this.qrForm.partname = ''
this.qrForm.nextstepname = ''
+ this.qrForm.operator = ''
+ this.qrForm.operatorTime = ''
// this.$refs.qrCodeDiv2 = ''
},
// 鐢熸垚浜岀淮鐮�
bindQRCode2(text) {
new QRCode(this.$refs.qrCodeDiv2, {
text: text,
- width: 50,
- height: 50,
+ width: 60,
+ height: 60,
colorDark: '#000', // 浜岀淮鐮侀鑹�
colorLight: '#ffffff', // 浜岀淮鐮佽儗鏅壊
correctLevel: QRCode.CorrectLevel.L// 瀹归敊鐜囷紝L/M/H
--
Gitblit v1.9.3