From 3f5692e426fccdc682571fb264494c0b39c6c953 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 21 九月 2026 13:27:38 +0800
Subject: [PATCH] 新疆——新聚lims 1.委托下单标签打印样式及展示字段修改 2.原始记录模板分页跳转bug修改
---
src/views/standard/model/index.vue | 9 ++-
src/views/business/productOrder/components/printDialog.vue | 131 +++++++++++++++++++++++--------------------
src/views/business/materialOrderComponents/materialOrder/printDialog.vue | 6 +-
3 files changed, 80 insertions(+), 66 deletions(-)
diff --git a/src/views/business/materialOrderComponents/materialOrder/printDialog.vue b/src/views/business/materialOrderComponents/materialOrder/printDialog.vue
index 2d39bd1..d80bf3c 100644
--- a/src/views/business/materialOrderComponents/materialOrder/printDialog.vue
+++ b/src/views/business/materialOrderComponents/materialOrder/printDialog.vue
@@ -12,7 +12,7 @@
<el-card class="box-card" v-for="(item, i) in barcodeData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;">
<el-checkbox :label="i" :key="i" style="position: relative;top:0;left:10px"><br></el-checkbox>
<div>
- <div class="titleH1" style="text-align: center; margin-bottom: 2px;font-size: 16px">妫�娴嬩腑蹇冩牱鍝佹爣璇嗗崱</div>
+ <div class="titleH1" style="text-align: center; margin-bottom: 2px;font-size: 16px">鏍峰搧鏍囪瘑鍗�</div>
<div style="text-align: center;">
<barcode :value="item.barcode" :height="34" :width="2" :displayValue="false"></barcode>
</div>
@@ -71,11 +71,11 @@
</el-row>
</span>
</el-dialog>
- <div class="el-dialog-body" style="overflow-y: auto;margin-top: 0;position: fixed;top: 20px;right: 10px;z-index: 99999;">
+ <div class="el-dialog-body" style="overflow-y: auto;margin-top: 0;position: fixed;top: -9999px;right: 10px;z-index: 99999;">
<div id="printOrder" class="printOrder" ref="printOrder">
<el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 0.29cm !important;font-weight: 700;page-break-after: always;color: #000;box-shadow: none;margin: 0 !important;padding: 0 !important;">
<div>
- <div class="titleH1" style="text-align: center;margin-bottom: 1px">妫�娴嬩腑蹇冩牱鍝佹爣璇嗗崱</div>
+ <div class="titleH1" style="text-align: center;margin-bottom: 1px">鏍峰搧鏍囪瘑鍗�</div>
<div style="text-align: center;">
<barcode :value="item.barcode" :height="22" :width="1.6" :displayValue="false"></barcode>
</div>
diff --git a/src/views/business/productOrder/components/printDialog.vue b/src/views/business/productOrder/components/printDialog.vue
index a85c32e..4125bdf 100644
--- a/src/views/business/productOrder/components/printDialog.vue
+++ b/src/views/business/productOrder/components/printDialog.vue
@@ -12,36 +12,44 @@
<el-card v-for="(item, i) in barcodeData" :key="i" class="box-card" style="margin-bottom: 15px; font-size: 16px !important;">
<el-checkbox :key="i" :label="i" style="position: relative;top:0;left:10px"><br></el-checkbox>
<div>
- <div class="titleH1" style="text-align: center; margin-bottom: 2px;font-size: 16px">妫�娴嬩腑蹇冩牱鍝佹爣璇嗗崱</div>
+ <div class="titleH1" style="text-align: center; margin-bottom: 2px;font-size: 16px">鏍峰搧鏍囪瘑鍗�</div>
<div style="text-align: center;">
<barcode :displayValue="false" :height="34" :value="item.barcode" :width="2"></barcode>
</div>
<div style="margin-left: 20px;text-align: left">
<div class="item">
- <span class="full-title">鏍峰搧鍚嶇О</span>:
- <span class="info">{{ item.sampleView }}</span>
+ <span class="full-title">濮旀墭缂栧彿</span>:
+ <span class="value-wrap">{{ item.entrustCode }}</span>
</div>
- <div class="item">
- <span class="full-title">鐢熶骇鍗曚綅</span>:
- <span class="info">{{ item.production }}</span>
+ <div class="item2 label-row">
+ <span class="label-col">
+ <span class="full-title">鏍峰搧鍚嶇О</span>:
+ <span class="value-wrap">{{ item.sampleView }}</span>
+ </span>
+ <span class="label-col">
+ <span class="full-title">鏍峰搧缂栧彿</span>:
+ <span class="value-wrap">{{ item.sampleCode }}</span>
+ </span>
</div>
- <div class="item2">
- <span class="full-title">瑙勬牸鍨嬪彿</span>:
- <span class="info">{{ item.sampleModel }}</span>
+ <div class="item label-row">
+ <span class="label-col">
+ <span class="full-title">閫佹牱鍗曚綅</span>:
+ <span class="value-wrap">{{ item.production }}</span>
+ </span>
+ <span class="label-col">
+ <span class="full-title">閫佹牱鏃ユ湡</span>:
+ <span class="value-wrap">{{ item.sendTime }}</span>
+ </span>
</div>
- <div class="item">
- <span class="full-title">閫佹牱鏃ユ湡</span>:
- <span class="info">{{ item.sendTime }}</span>
- </div>
- <div class="item">
- <span class="full-title">濮旀墭浜�</span>:
- <span class="info2">{{ item.prepareUser }}</span>
- <span class="full-title">妫�娴嬬紪鍙�</span>:
- <span class="info">{{ item.entrustCode }}</span>
- </div>
- <div class="item">
- <span class="full-title">鏍峰搧鏁伴噺</span>:
- <span class="info2">{{ item.testQuantity }}</span>
+ <div class="item label-row">
+ <span class="label-col">
+ <span class="full-title">閫佹牱浜�</span>:
+ <span class="value-wrap">{{ item.prepareUser }}</span>
+ </span>
+ <span class="label-col">
+ <span class="full-title">鏍峰搧鏁伴噺</span>:
+ <span class="value-wrap">{{ item.testQuantity }}</span>
+ </span>
</div>
<div style="font-weight: bold;display: flex;align-items: center;">
<span class="full-title">鏍峰搧鐘舵��</span>:
@@ -69,40 +77,48 @@
</el-row>
</span>
</el-dialog>
- <div class="el-dialog-body" style="overflow-y: auto;margin-top: 0;position: fixed;top: 20px;right: 10px;z-index: 99999;">
+ <div class="el-dialog-body" style="overflow-y: auto;margin-top: 0;position: fixed;top: -9999px;right: 10px;z-index: 99999;">
<div id="printOrder" ref="printOrder" class="printOrder">
<el-card v-for="(item, i) in checkDataList" :key="i" class="box-card" style="font-size: 0.29cm !important;font-weight: 700;page-break-after: always;color: #000;box-shadow: none;margin: 0 !important;padding: 0 !important;">
<div>
- <div class="titleH1" style="text-align: center;margin-bottom: 1px">妫�娴嬩腑蹇冩牱鍝佹爣璇嗗崱</div>
+ <div class="titleH1" style="text-align: center;margin-bottom: 1px">鏍峰搧鏍囪瘑鍗�</div>
<div style="text-align: center;">
<barcode :displayValue="false" :height="22" :value="item.barcode" :width="1.6"></barcode>
</div>
<div style="margin-left: 12px;text-align: left">
<div class="item">
- <span class="full-title4">鏍峰搧鍚嶇О:</span>
- <span class="info4">{{ item.sampleView }}</span>
+ <span class="full-title4">濮旀墭缂栧彿:</span>
+ <span class="value-wrap">{{ item.entrustCode }}</span>
</div>
- <div class="item">
- <span class="full-title2">鐢熶骇鍗曚綅</span>:
- <span class="info">{{ item.production }}</span>
+ <div class="item2 label-row">
+ <span class="label-col">
+ <span class="full-title4">鏍峰搧鍚嶇О:</span>
+ <span class="value-wrap">{{ item.sampleView }}</span>
+ </span>
+ <span class="label-col">
+ <span class="full-title4">鏍峰搧缂栧彿:</span>
+ <span class="value-wrap">{{ item.sampleCode }}</span>
+ </span>
</div>
- <div class="item2">
- <span class="full-title4">瑙勬牸鍨嬪彿:</span>
- <span class="info4">{{ item.sampleModel }}</span>
+ <div class="item label-row">
+ <span class="label-col">
+ <span class="full-title4">閫佹牱鍗曚綅:</span>
+ <span class="value-wrap">{{ item.production }}</span>
+ </span>
+ <span class="label-col">
+ <span class="full-title4">閫佹牱鏃ユ湡:</span>
+ <span class="value-wrap">{{ item.sendTime }}</span>
+ </span>
</div>
- <div class="item">
- <span class="full-title2">閫佹牱鏃ユ湡</span>:
- <span class="info">{{ item.sendTime }}</span>
- </div>
- <div class="item">
- <span class="full-title2">濮旀墭浜�</span>:
- <span class="info3">{{ item.prepareUser }}</span>
- <span class="full-title2">妫�娴嬬紪鍙�</span>:
- <span class="info">{{ item.entrustCode }}</span>
- </div>
- <div class="item">
- <span class="full-title2">鏍峰搧鏁伴噺</span>:
- <span class="info3">{{ item.testQuantity }}</span>
+ <div class="item label-row">
+ <span class="label-col">
+ <span class="full-title4">閫佹牱浜�:</span>
+ <span class="value-wrap">{{ item.prepareUser }}</span>
+ </span>
+ <span class="label-col">
+ <span class="full-title4">鏍峰搧鏁伴噺:</span>
+ <span class="value-wrap">{{ item.testQuantity }}</span>
+ </span>
</div>
<div>
<span class="full-title2">鏍峰搧鐘舵��</span>:
@@ -288,29 +304,24 @@
vertical-align: top;
}
-.info {
- margin-left: 2px;
+.label-row {
+ display: flex;
+ align-items: flex-start;
}
-.info2 {
- margin-left: 2px;
- margin-right: 30px;
- width: 80px;
- display: inline-block;
+.label-col {
+ flex: 1 1 0;
+ min-width: 0;
}
-.info3 {
- margin-left: 2px;
- margin-right: 8px;
- width: 44px;
- display: inline-block;
+.label-col + .label-col {
+ margin-left: 6px;
}
-.info4 {
- display: inline-block;
+.value-wrap {
margin-left: 2px;
white-space: normal;
- width: 260px;
+ word-break: break-all;
}
.checkboxInfo {
diff --git a/src/views/standard/model/index.vue b/src/views/standard/model/index.vue
index 5fa3ec2..dcdfef6 100644
--- a/src/views/standard/model/index.vue
+++ b/src/views/standard/model/index.vue
@@ -245,7 +245,7 @@
this.isShowCopyTem = false;
this.submitCopyInfoLoading = false;
this.$message.success("淇敼鎴愬姛");
- this.refreshTable("page");
+ this.getList();
})
.catch((err) => {
console.log("copyTemplate----", err);
@@ -258,7 +258,7 @@
this.isShowCopyTem = false;
this.submitCopyInfoLoading = false;
this.$message.success("澶嶅埗鎴愬姛");
- this.refreshTable("page");
+ this.getList();
})
.catch((err) => {
console.log("copyTemplate----", err);
@@ -286,7 +286,10 @@
.then(() => {
delStandardTemplate({ id: row.id }).then((res) => {
this.$message.success("鍒犻櫎鎴愬姛");
- this.refreshTable("page");
+ if (this.tableData.length === 1 && this.page.current > 1) {
+ this.page.current -= 1;
+ }
+ this.getList();
});
})
.catch(() => { });
--
Gitblit v1.9.3