From 440f4d1dbc63c302e59f304e589413019178046d Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 20 十二月 2023 14:55:09 +0800
Subject: [PATCH] modified: src/api/quality/Packaging_ledger.js modified: src/const/website.js modified: src/page/PackingLedgerDetails/index.vue modified: src/permission.js modified: src/views/quality/Packaging_ledger/index.vue modified: vue.config.js
---
src/page/PackingLedgerDetails/index.vue | 182 ++++++++++++--------------------------------
src/permission.js | 12 ++
vue.config.js | 7 -
src/api/quality/Packaging_ledger.js | 9 ++
src/const/website.js | 4
src/views/quality/Packaging_ledger/index.vue | 5
6 files changed, 75 insertions(+), 144 deletions(-)
diff --git a/src/api/quality/Packaging_ledger.js b/src/api/quality/Packaging_ledger.js
index edac84f..d58f894 100644
--- a/src/api/quality/Packaging_ledger.js
+++ b/src/api/quality/Packaging_ledger.js
@@ -18,12 +18,19 @@
export function list(query) {
return request({
- url: '/mes//qualityPackageBoxDetail/list',
+ url: '/mes/qualityPackageBoxDetail/list',
method: 'get',
params: query
})
}
+export function selById(query) {
+ return request({
+ url: '/mes/qualityPackageBox/selById',
+ method: 'get',
+ params: query
+ })
+}
export function customerpage(query) {
return request({
url: '/mes/customer/page',
diff --git a/src/const/website.js b/src/const/website.js
index 826ea08..04d97c7 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',"/pack"], // 閰嶇疆鏃犳潈闄愬彲浠ヨ闂殑椤甸潰
- whiteTagList: ['/login', '/404', '/401', '/lock',"/pack"], // 閰嶇疆涓嶆坊鍔爐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
index 41b65d1..70e5bfd 100644
--- a/src/page/PackingLedgerDetails/index.vue
+++ b/src/page/PackingLedgerDetails/index.vue
@@ -1,134 +1,49 @@
<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>
+ <el-card class="box-card" v-for="(el,item) in testStandardParams" >
+ <div>
+ <el-form :model="el" label-width="80px">
+ <el-form-item label="搴忓彿:">
+ {{ item + 1 }}
+ </el-form-item>
+ </el-form>
+ <el-form :model="el" label-width="80px">
+ <el-form-item label="浜у搧:">
+ {{ el.product }}
+ </el-form-item>
+ </el-form>
+ <el-form :model="el" label-width="80px">
+ <el-form-item label="浜у搧缂栧彿锛�">
+ {{ el.productNo }}
+ </el-form-item>
+ </el-form>
+ <el-form :model="el" label-width="80px">
+ <el-form-item label="鎵规鍙凤細">
+ {{ el.outBatchNo }}
+ </el-form-item>
+ </el-form>
+ <el-form :model="el" label-width="80px">
+ <el-form-item label="瑙勬牸鍨嬪彿锛�">
+ {{ el.specs }}
+ </el-form-item>
+ </el-form>
+ <el-form :model="el" label-width="80px">
+ <el-form-item label="鍗曚綅锛�">
+ {{ el.unit }}
+ </el-form-item>
+ </el-form>
+ <el-form :model="el" label-width="80px">
+ <el-form-item label="鏁伴噺锛�">
+ {{ el.number }}
+ </el-form-item>
+ </el-form>
</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> -->
+ </el-card>
</div>
</template>
<script>
-import {list} from '@/api/quality/Packaging_ledger'
+import {selById} from '@/api/quality/Packaging_ledger'
export default{
data(){
@@ -137,12 +52,13 @@
}
},
created() {
- this.chuaxun()
+ let aa = this.$route.query
+ console.log(this.$route.query,"id");
+ this.chuaxun(aa)
},
methods: {
- chuaxun(){
- list({packageBoxId:50}).then((res) =>{
- console.log(res,"1111111");
+ chuaxun(aa){
+ selById({id:aa.id}).then((res) =>{
this.testStandardParams = res.data.data
})
},
@@ -152,7 +68,11 @@
</script>
<style>
- .txt{
- font-size: 16px;
- }
+.box-card{
+ margin: 20px;
+ border-radius: 40px;
+}
+.inputDeep {
+
+}
</style>
\ No newline at end of file
diff --git a/src/permission.js b/src/permission.js
index d0e3c56..e4b0dc0 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -12,6 +12,7 @@
router.beforeEach((to, from, next) => {
NProgress.start();
const meta = to.meta || {};
+ const whiteList = ['/login', '/404', '/401', '/lock','/pack']
if (store.getters.access_token) {
if (store.getters.isLock && to.path !== '/lock') {
next({ path: '/lock' });
@@ -35,7 +36,15 @@
// 椤甸潰澶氬紑锛氳浇鍏ocalStorage鐨刟uth鍙傛暟 By Luxn
let auth = JSON.parse(localStorage.getItem("authorization") || "{}");
if ( meta.isAuth === false) {
- next();
+ //娌℃湁token鐨勬儏鍐�
+ if (whiteList.indexOf(to.path) !== -1) {
+ // 濡傛灉鍦ㄧ櫧鍚嶅崟鍐呭垯鐩存帴璺宠浆
+ next()
+ } else {
+ // 鍏朵綑椤甸潰閲嶅畾鍚戝埌鐧诲綍椤�
+ next('/login')
+ }
+ // next();
}else{
if (auth.date_time) {
let key = ["access_token", "refresh_token", "expires_in", "user_info", "language"];
@@ -57,7 +66,6 @@
}else{
next('/login');
}
-
}
}
})
diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index ecc41fc..c465c2d 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=str :size="110" :margin="1"></vueQr>
+ <vueQr :text=str+item.packageBoxId :size="110" :margin="1"></vueQr>
</el-col>
</el-row>
</el-card>
@@ -174,7 +174,7 @@
export default {
data(){
return {
- str:"http://192.168.2.213:8080/#/pack",
+ str:"http://192.168.2.213:8080/#/pack?id=",
qrData:[],
diaPrintTab: false,
multipleSelection: [],
@@ -349,6 +349,7 @@
},
handleSelectionChange(val){
this.multipleSelection = val
+ console.log(this.multipleSelection[0].id,"鏁版嵁");
let lastRow = val[val.length - 1]
this.handleCurrentChange(lastRow)
},
diff --git a/vue.config.js b/vue.config.js
index 8c628af..a0a6201 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,13 +7,8 @@
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