From 8b88172ca8801bf26a083098a09d637b11da9f01 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 18 一月 2024 13:03:30 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/plan/manufacturingorder/index.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index b9bfe77..71a087f 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -204,10 +204,10 @@
<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;">
@@ -601,7 +601,7 @@
return this.bomTypeDbOptions
}
},
-
+
{
minWidth: '120',
prop: 'manufactureAttr',
@@ -1142,7 +1142,7 @@
printable: 'printMOrder',//椤甸潰
type: "html",//鏂囨。绫诲瀷
maxWidth:450,
- targetStyles:['*'],
+ targetStyles:['*'],
style: `@page {
margin:0;
size: 360px 175px;
@@ -1167,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