From a2bce22a3a4df5f4662c373e57c07fa4268aeee1 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期五, 13 六月 2025 09:02:52 +0800
Subject: [PATCH] 1.修改工单打印模板
---
src/styles/global.css | 54 +++++++++++++-------------
src/views/workOrder/workOrderList.vue | 39 ++++++++++++++-----
2 files changed, 56 insertions(+), 37 deletions(-)
diff --git a/src/styles/global.css b/src/styles/global.css
index 6f5c868..675bc78 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -179,37 +179,37 @@
瀹氫箟婊氬姩鏉￠珮瀹藉強鑳屾櫙
楂樺鍒嗗埆瀵瑰簲妯珫婊氬姩鏉＄殑灏哄
*/
-::-webkit-scrollbar {
- width: 7px;
- height: 7px;
- /*background-color: white;*/
- background-color: #f8f8fa;
-}
+/*::-webkit-scrollbar {*/
+/* width: 7px;*/
+/* height: 7px;*/
+/* !*background-color: white;*!*/
+/* background-color: #f8f8fa;*/
+/*}*/
-::-webkit-scrollbar-thumb {
- /*box-shadow: inset 0 0 0px white;*/
- box-shadow: inset 0 0 0px #f8f8fa;
- /*-webkit-box-shadow: inset 0 0 0px white;*/
- -webkit-box-shadow: inset 0 0 0px #f8f8fa;
- background-color: rgb(193, 193, 193);
- /*婊氬姩鏉＄殑鑳屾櫙棰滆壊*/
- border-radius: 20px;
-}
+/*::-webkit-scrollbar-thumb {*/
+/* !*box-shadow: inset 0 0 0px white;*!*/
+/* box-shadow: inset 0 0 0px #f8f8fa;*/
+/* !*-webkit-box-shadow: inset 0 0 0px white;*!*/
+/* -webkit-box-shadow: inset 0 0 0px #f8f8fa;*/
+/* background-color: rgb(193, 193, 193);*/
+/* !*婊氬姩鏉＄殑鑳屾櫙棰滆壊*!*/
+/* border-radius: 20px;*/
+/*}*/
-/*瑙ｅ喅琛ㄦ牸鍥哄畾鍒楁椂鐨勫帇鏍峰紡闂*/
-.el-table__fixed {
- height: calc(100% - 7px) !important;
-}
+/*!*瑙ｅ喅琛ㄦ牸鍥哄畾鍒楁椂鐨勫帇鏍峰紡闂*!*/
+/*.el-table__fixed {*/
+/* height: calc(100% - 7px) !important;*/
+/*}*/
-.el-table__fixed-right {
- height: calc(100% - 12px) !important;
-}
+/*.el-table__fixed-right {*/
+/* height: calc(100% - 12px) !important;*/
+/*}*/
-.el-table__fixed-right::before,
-.el-table__fixed::before {
- /*background-color: unset !important;*/
- background-color: #f8f8fa !important;
-}
+/*.el-table__fixed-right::before,*/
+/*.el-table__fixed::before {*/
+/* !*background-color: unset !important;*!*/
+/* background-color: #f8f8fa !important;*/
+/*}*/
/*scrollbar END*/
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index 4481ce8..ec1c5a3 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -1512,8 +1512,8 @@
:data="tableDataPrint[0]"
border
class="tableDataPrint"
- :header-cell-style="{ background: '#c0c0c0',textAlign:'center',color:'#000',borderColor:'#000',fontSize:'18px'}"
- :cell-style="{textAlign: 'center',color:'#000',borderColor:'#000',fontSize:'18px'}"
+ :header-cell-style="{ background: '#c0c0c0',textAlign:'center',color:'#000',borderColor:'#000',fontSize:'18px',padding:'2px 0'}"
+ :cell-style="{textAlign: 'center',color:'#000',borderColor:'#000',fontSize:'18px',padding:'5px 0'}"
style="width: 100%;margin-top: 20px;text-align: center;border-color: #000"
>
<el-table-column
@@ -1531,7 +1531,6 @@
align="center"
>
<template slot-scope="{row}">
-
<div :id="'qrCode'+row.seq" :ref="'qrCodeDiv'+row.seq" :key="'qrCodeDiv'+row.seq" class="tableColumn" />
</template>
</el-table-column>
@@ -1641,8 +1640,8 @@
:data="tableDataPrint[1]"
border
class="tableDataPrint"
- :header-cell-style="{ background: '#c0c0c0',textAlign:'center',color:'#000',borderColor:'#000',fontSize:'18px'}"
- :cell-style="{textAlign: 'center',color:'#000',borderColor:'#000',fontSize:'18px'}"
+ :header-cell-style="{ background: '#c0c0c0',textAlign:'center',color:'#000',borderColor:'#000',fontSize:'18px',padding:'2px 0'}"
+ :cell-style="{textAlign: 'center',color:'#000',borderColor:'#000',fontSize:'18px',padding:'5px 0'}"
style="width: 100%;margin-top: 20px;text-align: center;border-color: #000"
>
<el-table-column
@@ -3532,6 +3531,9 @@
this.dialogForm.mesqtyinit = row.plan_qty
+ this.dialogForm.paystartdate = row.plan_startdate
+ this.dialogForm.payenddate = row.plan_enddate
+
const data = {
sourceid: this.dialogForm.sourceorderid,
sourcewo: this.dialogForm.sourceorder,
@@ -3754,6 +3756,10 @@
return this.$message.info('姝ゅ伐鍗曠殑鏈�澶т慨鏀规暟鍊间负锛�' + this.dialogForm.mesmaxqty)
}
+ if (this.mesSetting.route && !this.dialogForm.routecode) {
+ return this.$message.error('璇烽�夋嫨宸ヨ壓璺嚎锛�')
+ }
+
const workListSub = []
this.stepTableData.forEach((i, j) => {
workListSub.push(
@@ -3781,6 +3787,8 @@
wkshopcode: this.dialogForm.wkshopcode,
woqty: this.dialogForm.mesqty, // 宸ュ崟鏁伴噺
deliverydate: this.dialogForm.deliverydate, // 浜や粯鏃堕棿
+ paystartdate: this.dialogForm.paystartdate,
+ payenddate: this.dialogForm.payenddate,
data_sources: this.dialogForm.data_sources, // 鏁版嵁鏉ユ簮
isstep: workListSub.length > 0 ? 'Y' : 'N', //
difference: this.dialogForm.mesqty - this.dialogForm.mesqtyinit, // 鏁版嵁宸��
@@ -3941,8 +3949,8 @@
if (size === 'big') {
new QRCode(this.$refs['qrCodeDiv0' + seq], {
text: text,
- width: size === 'big' ? 90 : 60,
- height: size === 'big' ? 90 : 60,
+ width: size === 'big' ? 90 : 45,
+ height: size === 'big' ? 90 : 45,
// colorDark: '#333333', // 浜岀淮鐮侀鑹�
colorDark: '#000', // 浜岀淮鐮侀鑹�
colorLight: '#ffffff', // 浜岀淮鐮佽儗鏅壊
@@ -3951,8 +3959,8 @@
} else {
new QRCode(this.$refs['qrCodeDiv' + seq], {
text: text,
- width: size === 'big' ? 90 : 60,
- height: size === 'big' ? 90 : 60,
+ width: size === 'big' ? 90 : 45,
+ height: size === 'big' ? 90 : 45,
// colorDark: '#333333', // 浜岀淮鐮侀鑹�
colorDark: '#000', // 浜岀淮鐮侀鑹�
colorLight: '#ffffff', // 浜岀淮鐮佽儗鏅壊
@@ -4544,7 +4552,18 @@
}
.formContent {
- width: 300px;
+ //width: 330px;
+ width: calc(50% - 10px);
+ display:flex;
+
+ ::v-deep .el-form-item__label {
+ float: left;
+ }
+
+ ::v-deep .el-form-item__content {
+ //float: left;
+ width: 240px;
+ }
}
</style>
--
Gitblit v1.9.3