From 1f4c79169a0d3ef46f2430b61d4999e1be6261b3 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 06 五月 2024 14:59:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/manufacturingorder/index.vue | 79 +++++++++------------------------------
1 files changed, 18 insertions(+), 61 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index af81923..fd28335 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -204,36 +204,14 @@
<el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="28%" top="5vh">
<div style="width:100%;height: 400px;overflow-y: auto;">
<div class="dia_body">
- <el-checkbox
+ <el-checkbox
style="margin: 10px 5px;"
- :indeterminate="isIndeterminate"
- v-model="checkAll"
+ :indeterminate="isIndeterminate"
+ v-model="checkAll"
@change="handleCheckAllChange">鍏ㄩ��</el-checkbox>
<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>
@@ -451,6 +407,16 @@
// 鏍囬
column: [
{
+ minWidth: '120',
+ prop: 'moNo',
+ label: '杞﹂棿璁㈠崟鍙�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ render: { fun: this.addOrUpdateHandle }
+ },
+ {
minWidth: '140',
prop: 'state',
label: '鐘舵��',
@@ -591,16 +557,7 @@
return this.bomTypeDbOptions
}
},
- {
- minWidth: '120',
- prop: 'moNo',
- label: '杞﹂棿璁㈠崟鍙�',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- render: { fun: this.addOrUpdateHandle }
- },
+
{
minWidth: '120',
prop: 'manufactureAttr',
@@ -1141,10 +1098,10 @@
printable: 'printMOrder',//椤甸潰
type: "html",//鏂囨。绫诲瀷
maxWidth:450,
- targetStyles:['*'],
+ targetStyles:['*'],
style: `@page {
margin:0;
- size: 360px 175px;
+ size: 360px 175px landscape;
}
html{
zoom:100%;
@@ -1166,7 +1123,7 @@
console.log(data);
let index = Number(data.qtyRequired) + Number(data.scrapQty)
if(index>0){
- for(var i=1;i<= index;i++){
+ for(var i=index;i>= 1;i--){
let obj = {
orderNo: data.customerOrderNo,
cName: data.customerName,
--
Gitblit v1.9.3