From e39205c81bc743a143ad4445bd37945184e8fe17 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 19 十二月 2023 10:16:20 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/plan/manufacturingorder/index.vue | 29 +++++++++++++++++++++++++----
vue.config.js | 4 +++-
2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index ec2c361..d760c3e 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -210,7 +210,7 @@
<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-row>
<el-col :span="10" :offset="3">鎵规鍙�</el-col>
<el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
</el-row>
@@ -231,7 +231,28 @@
<el-col :span="10">
<vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
</el-col>
- </el-row>
+ </el-row> -->
+ <div style="display: flex;">
+ <div>
+ <el-col :span="8" :offset="2">
+ <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>
+ </el-row>
+ <el-row style="margin-top: 5px;">
+ <el-col style="font-weight: bold;"><span>璁㈠崟鍙�: </span>{{ item.orderNo }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 5px;">
+ <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>
</el-card>
</el-checkbox-group>
</div>
@@ -241,9 +262,9 @@
<el-button type="primary" @click="printFun">鎵� 鍗�</el-button>
</span>
</el-dialog>
- <div class="el-dialog__body" style="width:448.8px;overflow-y: auto;position: absolute;top:9999px;padding: 0;">
+ <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="padding-top:0px;margin-bottom:10px;font-size: 16px !important;">
+ <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>
diff --git a/vue.config.js b/vue.config.js
index f14c50a..87d2793 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,11 +6,13 @@
// const url = 'http://192.168.2.7:9999'
// const url = 'http://192.168.32.45:9999'
+// const url = 'http://192.168.2.7:9999'
+const url = 'http://192.168.32.45:9999'
//const url = 'http://192.168.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'
-const url = 'http://localhost:9999'
+// const url = 'http://localhost:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3