From c18b61164fa4d9dcbeaa471ba3043334c576b1bc Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 28 二月 2024 17:25:18 +0800
Subject: [PATCH] 主生产计划
---
src/views/plan/manufacturingorder/index.vue | 82 ++++++++++++++++++++++++++--------------
1 files changed, 53 insertions(+), 29 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 0337ab1..71a087f 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -201,13 +201,13 @@
</el-dialog>
</basic-container>
<!-- 鏍囩鎵撳嵃 -->
- <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px" top="5vh">
+ <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;">
@@ -234,26 +234,28 @@
<vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
</el-col>
</el-row> -->
- <div style="display: flex;">
+ <div>
+ <el-row style="font-size: 14px;padding-left: 20px;">
+ <el-col style="font-weight: bold;">{{ item.pName }}</el-col>
+ </el-row>
+ <div style="display: flex;">
<div>
- <el-col :span="8" :offset="2">
+ <el-col :span="8" :offset="4">
<vueQr :text="JSON.stringify(item.code)" :size="120" :margin="2"></vueQr>
</el-col>
</div>
- <div style="margin-left: 20px;width: 100%;">
- <el-row >
- <el-col style="font-weight: bold;"><span>鎵规鍙�: </span>{{ item.code.moNo2 }}</el-col>
+ <div style="margin-left: 50px;width: 100%;">
+ <el-row style="margin-top: 10px;">
+ <el-col style="font-weight: bold;font-size: 14px;"><span>鎵� 娆� 鍙�: </span>{{ item.code.moNo2 }}</el-col>
</el-row>
- <el-row style="margin-top: 5px;">
- <el-col style="font-weight: bold;"><span>璁㈠崟鍙�: </span>{{ item.orderNo }}</el-col>
+ <el-row style="margin-top: 9px;font-size: 14px;">
+ <el-col style="font-weight: bold;"><span>璁� 鍗� 鍙�: </span>{{ item.orderNo }}</el-col>
</el-row>
- <el-row style="margin-top: 5px;">
+ <el-row style="margin-top: 9px;font-size: 14px;">
<el-col style="font-weight: bold;"><span>瀹㈡埛鍚嶇О: </span>{{ item.cName }}</el-col>
</el-row>
- <el-row style="margin-top: 5px;">
- <el-col style="font-weight: bold;">{{ item.pName }}</el-col>
- </el-row>
</div>
+ </div>
</div>
</el-card>
</el-checkbox-group>
@@ -267,7 +269,7 @@
<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-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>
@@ -288,7 +290,28 @@
<el-col :span="10">
<vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
</el-col>
- </el-row>
+ </el-row> -->
+ <el-row style="font-size: 14px;padding-left: 20px;">
+ <el-col style="font-weight: bold;">{{ item.pName }}</el-col>
+ </el-row>
+ <div style="display: flex;">
+ <div>
+ <el-col :span="8" :offset="4">
+ <vueQr :text="JSON.stringify(item.code)" :size="120" :margin="2"></vueQr>
+ </el-col>
+ </div>
+ <div style="margin-left: 50px;width: 100%;">
+ <el-row style="margin-top: 10px;">
+ <el-col style="font-weight: bold;font-size: 14px;"><span>鎵� 娆� 鍙�: </span>{{ item.code.moNo2 }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 9px;font-size: 14px;">
+ <el-col style="font-weight: bold;"><span>璁� 鍗� 鍙�: </span>{{ item.orderNo }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 9px;font-size: 14px;">
+ <el-col style="font-weight: bold;"><span>瀹㈡埛鍚嶇О: </span>{{ item.cName }}</el-col>
+ </el-row>
+ </div>
+ </div>
</el-card>
</div>
</div>
@@ -427,6 +450,16 @@
data: [],
// 鏍囬
column: [
+ {
+ minWidth: '120',
+ prop: 'moNo',
+ label: '杞﹂棿璁㈠崟鍙�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ render: { fun: this.addOrUpdateHandle }
+ },
{
minWidth: '140',
prop: 'state',
@@ -568,16 +601,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',
@@ -1118,7 +1142,7 @@
printable: 'printMOrder',//椤甸潰
type: "html",//鏂囨。绫诲瀷
maxWidth:450,
- targetStyles:['*'],
+ targetStyles:['*'],
style: `@page {
margin:0;
size: 360px 175px;
@@ -1143,7 +1167,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