From 0a3b4bac16a4cf49deaddc6b4f3a2aeee90e9061 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 21 五月 2024 16:33:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/manufacturingorder/index.vue | 52 ++++------------------------------------------------
1 files changed, 4 insertions(+), 48 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 71a087f..e3a8654 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -100,14 +100,14 @@
>鍒锋柊ifs杞﹂棿璁㈠崟鍙�
</el-button> -->
- <el-button
+ <!-- <el-button
v-if="permissions.manufacturingorder_export"
@click="exportExcel"
type="primary"
style="margin-left:10px;"
:loading="loadingExcel"
>瀵煎嚭
- </el-button>
+ </el-button> -->
<el-button
v-if="permissions.manufacturingorder_label_print"
@click="labelPrint"
@@ -212,28 +212,6 @@
<el-checkbox-group @change="changePrintCode()" v-model="checkIndexList">
<el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;">
<el-checkbox :label="i" :key="i" style="position: relative;top:-20px;left:5px"><br></el-checkbox>
- <!-- <el-row>
- <el-col :span="10" :offset="3">鎵规鍙�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" :offset="3">璁㈠崟鍙凤細</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.orderNo }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" :offset="3">瀹㈡埛鍚嶇О锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.cName }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" :offset="3">闆朵欢鍚嶇О锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.pName }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" :offset="3">杞﹂棿璁㈠崟浜岀淮鐮侊細</el-col>
- <el-col :span="10">
- <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
- </el-col>
- </el-row> -->
<div>
<el-row style="font-size: 14px;padding-left: 20px;">
<el-col style="font-weight: bold;">{{ item.pName }}</el-col>
@@ -268,29 +246,7 @@
</el-dialog>
<div class="el-dialog__body" style="width:448.8px;overflow-y: auto;position: absolute;top:9999px;margin-top: 0;">
<div id="printMOrder">
- <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="margin-top-top:0px;margin-bottom:10px;font-size: 16px !important;">
- <!-- <el-row style="font-size:12px;">
- <el-col :span="10" :offset="3">鎵规鍙�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
- </el-row>
- <el-row style="font-size:12px;">
- <el-col :span="10" :offset="3">璁㈠崟鍙凤細</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.orderNo }}</el-col>
- </el-row>
- <el-row style="font-size:12px;">
- <el-col :span="10" :offset="3">瀹㈡埛鍚嶇О锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.cName }}</el-col>
- </el-row>
- <el-row style="font-size:12px;">
- <el-col :span="10" :offset="3">闆朵欢鍚嶇О锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.pName }}</el-col>
- </el-row>
- <el-row style="font-size:12px;">
- <el-col :span="10" :offset="3">璁㈠崟浜岀淮鐮侊細</el-col>
- <el-col :span="10">
- <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
- </el-col>
- </el-row> -->
+ <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="margin-top-top:0px;margin-bottom:10px;font-size: 10px !important;page-break-before:always;page-break-after: always;">
<el-row style="font-size: 14px;padding-left: 20px;">
<el-col style="font-weight: bold;">{{ item.pName }}</el-col>
</el-row>
@@ -1145,7 +1101,7 @@
targetStyles:['*'],
style: `@page {
margin:0;
- size: 360px 175px;
+ size: 360px 175px landscape;
}
html{
zoom:100%;
--
Gitblit v1.9.3