From 5fcfed0c9e6dac85f680c705c9b20abad79e1324 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期二, 19 十二月 2023 17:33:05 +0800
Subject: [PATCH] modified: src/const/website.js new file: src/page/PackingLedgerDetails/index.vue modified: src/router/page/index.js modified: src/views/plan/manufacturingorder/index.vue modified: src/views/quality/Packaging_ledger/index.vue modified: vue.config.js
---
src/page/PackingLedgerDetails/index.vue | 158 +++++++++++++++++++++++++++++++++++++++
src/router/page/index.js | 10 ++
src/views/plan/manufacturingorder/index.vue | 26 +++---
vue.config.js | 8 -
src/const/website.js | 4
src/views/quality/Packaging_ledger/index.vue | 3
6 files changed, 189 insertions(+), 20 deletions(-)
diff --git a/src/const/website.js b/src/const/website.js
index 0fe5b87..826ea08 100644
--- a/src/const/website.js
+++ b/src/const/website.js
@@ -3,8 +3,8 @@
copyright: 'Copyright 漏 2021 chinaztt.com. All rights reserved.',
isFirstPage: true, // 閰嶇疆棣栭〉涓嶅彲鍏抽棴
key: 'ztt', // 閰嶇疆涓婚敭,鐩墠鐢ㄤ簬瀛樺偍
- whiteList: ['/login', '/404', '/401', '/lock'], // 閰嶇疆鏃犳潈闄愬彲浠ヨ闂殑椤甸潰
- whiteTagList: ['/login', '/404', '/401', '/lock'], // 閰嶇疆涓嶆坊鍔爐ags椤甸潰 锛�'/advanced-router/mutative-detail/*'鈥斺��*涓洪�氶厤绗︼級
+ whiteList: ['/login', '/404', '/401', '/lock',"/pack"], // 閰嶇疆鏃犳潈闄愬彲浠ヨ闂殑椤甸潰
+ whiteTagList: ['/login', '/404', '/401', '/lock',"/pack"], // 閰嶇疆涓嶆坊鍔爐ags椤甸潰 锛�'/advanced-router/mutative-detail/*'鈥斺��*涓洪�氶厤绗︼級
fistPage: {
label: '棣栭〉',
value: '/wel/index',
diff --git a/src/page/PackingLedgerDetails/index.vue b/src/page/PackingLedgerDetails/index.vue
new file mode 100644
index 0000000..41b65d1
--- /dev/null
+++ b/src/page/PackingLedgerDetails/index.vue
@@ -0,0 +1,158 @@
+<template>
+ <div >
+ <el-card class="box-card">
+ <div slot="header" class="clearfix">
+ <span>鍖呰璇︽儏</span>
+ </div>
+ <div>
+ <el-table
+ :data="testStandardParams"
+ highlight-current-row
+ height="700"
+ class="txt"
+ stripe
+ >
+ <el-table-column
+ type ="index"
+ label="搴忓彿"
+ align="center"
+ width="80"
+ />
+ <el-table-column
+ label="浜у搧"
+ prop="product"
+ show-overflow-tooltip
+ align="center"
+ />
+ <el-table-column
+ label="浜у搧缂栧彿"
+ prop="productNo"
+ show-overflow-tooltip
+ align="center"
+ >
+ </el-table-column>
+ <el-table-column
+ label="鎵规鍙�"
+ prop="outBatchNo"
+ show-overflow-tooltip
+ align="center"
+ >
+ </el-table-column>
+ <el-table-column
+ label="瑙勬牸鍨嬪彿"
+ prop="specs"
+ show-overflow-tooltip
+ align="center"
+ >
+ </el-table-column>
+ <el-table-column
+ label="鍗曚綅"
+ prop="unit"
+ show-overflow-tooltip
+ align="center"
+ >
+ </el-table-column>
+ <el-table-column
+ label="鏁伴噺"
+ prop="number"
+ align="center"
+ show-overflow-tooltip
+ width="80"
+ ></el-table-column>
+ </el-table>
+ </div>
+ </el-card>
+ <!-- <div style="padding:40px 180px;">
+ <div slot="header" class="clearfix">
+ <span>鍖呰鍙拌处璇︽儏</span>
+ </div>
+ <el-card>
+ <el-table
+ :data="testStandardParams"
+ highlight-current-row
+ height="700"
+ class="txt"
+ stripe
+ >
+ <el-table-column
+ type ="index"
+ label="搴忓彿"
+ align="center"
+ width="80"
+ />
+ <el-table-column
+ label="浜у搧"
+ prop="product"
+ show-overflow-tooltip
+ align="center"
+ />
+ <el-table-column
+ label="浜у搧缂栧彿"
+ prop="productNo"
+ show-overflow-tooltip
+ align="center"
+ >
+ </el-table-column>
+ <el-table-column
+ label="鎵规鍙�"
+ prop="outBatchNo"
+ show-overflow-tooltip
+ align="center"
+ >
+ </el-table-column>
+ <el-table-column
+ label="瑙勬牸鍨嬪彿"
+ prop="specs"
+ show-overflow-tooltip
+ align="center"
+ >
+ </el-table-column>
+ <el-table-column
+ label="鍗曚綅"
+ prop="unit"
+ show-overflow-tooltip
+ align="center"
+ >
+ </el-table-column>
+ <el-table-column
+ label="鏁伴噺"
+ prop="number"
+ align="center"
+ show-overflow-tooltip
+ width="80"
+ ></el-table-column>
+ </el-table>
+ </el-card>
+ </div> -->
+ </div>
+</template>
+
+<script>
+import {list} from '@/api/quality/Packaging_ledger'
+
+export default{
+ data(){
+ return{
+ testStandardParams:[]
+ }
+ },
+ created() {
+ this.chuaxun()
+ },
+ methods: {
+ chuaxun(){
+ list({packageBoxId:50}).then((res) =>{
+ console.log(res,"1111111");
+ this.testStandardParams = res.data.data
+ })
+ },
+ }
+}
+
+</script>
+
+<style>
+ .txt{
+ font-size: 16px;
+ }
+</style>
\ No newline at end of file
diff --git a/src/router/page/index.js b/src/router/page/index.js
index 18065ef..40c0f21 100644
--- a/src/router/page/index.js
+++ b/src/router/page/index.js
@@ -2,6 +2,16 @@
export default [
{
+ path: '/pack',
+ name: '鍖呰璇︽儏',
+ component: () => import(/* webpackChunkName: "page" */ '@/page/PackingLedgerDetails/index'),
+ meta: {
+ keepAlive: true,
+ isTab: false,
+ isAuth: false
+ }
+ },
+ {
path: '/thirdpartylogin',
name: '绗笁鏂圭櫥褰曢〉',
component: () =>
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index d760c3e..3301064 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -199,7 +199,7 @@
</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
@@ -232,27 +232,29 @@
<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>
</div>
diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index d37995d..ecc41fc 100644
--- a/src/views/quality/Packaging_ledger/index.vue
+++ b/src/views/quality/Packaging_ledger/index.vue
@@ -150,7 +150,7 @@
<el-row>
<el-col :span="10" :offset="3">鍖呰鍙拌处浜岀淮鐮侊細</el-col>
<el-col :span="10">
- <vueQr :text="JSON.stringify(item)" :size="110" :margin="1"></vueQr>
+ <vueQr :text=str :size="110" :margin="1"></vueQr>
</el-col>
</el-row>
</el-card>
@@ -174,6 +174,7 @@
export default {
data(){
return {
+ str:"http://192.168.2.213:8080/#/pack",
qrData:[],
diaPrintTab: false,
multipleSelection: [],
diff --git a/vue.config.js b/vue.config.js
index 87d2793..ba71dea 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,12 +4,10 @@
*/
-// const url = 'http://192.168.2.7: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.2.7:9999'
-//const url = 'http://192.168.32.45:9999'
+
// const url = 'http://192.168.0.23:9999'
// const url = 'http://localhost:9999'
--
Gitblit v1.9.3