From 51ec0fbe59a3c7768996072874ea6f0c2b91c060 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 21 十二月 2023 13:18:05 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/page/PackingLedgerDetails/index.vue | 78 +++++++++++++++++++
src/router/page/index.js | 10 ++
src/permission.js | 12 ++
vue.config.js | 9 -
src/views/plan/manufacturingorder/productorder-form.vue | 2
src/api/quality/Packaging_ledger.js | 9 ++
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 4 +
src/const/website.js | 4
src/views/quality/Packaging_ledger/index.vue | 4
src/views/plan/operationtask/operationtask-form.vue | 49 +++++++-----
src/views/quality/processInspect/processInspect-form.vue | 4 +
src/views/plan/manufacturingorder/index.vue | 51 +++++++++---
src/views/quality/teststandard/index.vue | 2
13 files changed, 189 insertions(+), 49 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 0fe5b87..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'], // 閰嶇疆鏃犳潈闄愬彲浠ヨ闂殑椤甸潰
- 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..70e5bfd
--- /dev/null
+++ b/src/page/PackingLedgerDetails/index.vue
@@ -0,0 +1,78 @@
+<template>
+ <div >
+ <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>
+ </div>
+</template>
+
+<script>
+import {selById} from '@/api/quality/Packaging_ledger'
+
+export default{
+ data(){
+ return{
+ testStandardParams:[]
+ }
+ },
+ created() {
+ let aa = this.$route.query
+ console.log(this.$route.query,"id");
+ this.chuaxun(aa)
+ },
+ methods: {
+ chuaxun(aa){
+ selById({id:aa.id}).then((res) =>{
+ this.testStandardParams = res.data.data
+ })
+ },
+ }
+}
+
+</script>
+
+<style>
+.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/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 0337ab1..af81923 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -201,7 +201,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
@@ -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>
diff --git a/src/views/plan/manufacturingorder/productorder-form.vue b/src/views/plan/manufacturingorder/productorder-form.vue
index affcd01..2bf8212 100644
--- a/src/views/plan/manufacturingorder/productorder-form.vue
+++ b/src/views/plan/manufacturingorder/productorder-form.vue
@@ -65,6 +65,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="闆朵欢" prop="partId">
+ <el-tooltip class="item" effect="dark" :content="partStr" >
<el-input v-model="partStr" placeholder="" readonly>
<el-button
v-if="!this.dataForm.id"
@@ -73,6 +74,7 @@
@click="openRoutingDialog()"
></el-button>
</el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
</el-row>
diff --git a/src/views/plan/operationtask/operationtask-form.vue b/src/views/plan/operationtask/operationtask-form.vue
index 02fb8dc..99e8f1b 100644
--- a/src/views/plan/operationtask/operationtask-form.vue
+++ b/src/views/plan/operationtask/operationtask-form.vue
@@ -145,7 +145,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="7">
+ <el-col :span="10">
<el-form-item label="宸ヤ綔涓績" prop="workCenter">
<el-select v-model="dataForm.workCenter" :disabled="!editable" filterable placeholder="璇烽�夋嫨宸ヤ綔涓績"
style="width:100%" @change="changeWorkCenter">
@@ -153,6 +153,16 @@
:key="index">
</el-option>
</el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="10">
+ <el-col :span="15">
+ <el-form-item label="璁″垝鏃堕棿" prop="localDateTimes">
+ <el-date-picker :class="tattimest ? 'sed' : ''" v-model="dataForm.localDateTimes"
+ type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮�" end-placeholder="缁撴潫"
+ value-format="yyyy-MM-dd HH:mm:ss" @change="selectChangedplannedDate">
+ </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -167,39 +177,36 @@
</el-col>
</el-row>
<el-row :gutter="10">
- <el-col :span="14">
- <el-form-item label="璁″垝鏃堕棿" prop="localDateTimes">
- <el-date-picker :class="tattimest ? 'sed' : ''" v-model="dataForm.localDateTimes"
- type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮�" end-placeholder="缁撴潫"
- value-format="yyyy-MM-dd HH:mm:ss" @change="selectChangedplannedDate">
- </el-date-picker>
- </el-form-item>
- </el-col>
<el-col :span="10">
<el-form-item label="璁″垝鏁伴噺" prop="plannedQuantity">
<el-input v-model="dataForm.plannedQuantity" :disabled="!editable" placeholder="璁″垝鏁伴噺"
style="width:calc(100% - 30px)"></el-input>
<span>{{ dataForm.unit }}</span>
</el-form-item>
- </el-col></el-row>
- <el-row :gutter="10">
- <el-col :span="12">
- <el-form-item label="闆朵欢" prop="partName">
- <el-input v-model="dataForm.partName" placeholder="闆朵欢" disabled></el-input>
- </el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="闆朵欢鍙�" prop="partNo">
- <el-input v-model="dataForm.partNo" placeholder="闆朵欢鍙�" disabled></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
+ <el-col :span="10">
<el-form-item label="宸ュ崟鎵�闇�鏃堕棿" prop="taskTheoreticalTime">
<el-input v-model="dataForm.taskTheoreticalTime" placeholder="宸ュ崟鎵�闇�鏃堕棿"
style="width:calc(100% - 30px)"></el-input>
<span>min</span>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row :gutter="10">
+ <el-col :span="12">
+ <el-form-item label="闆朵欢" prop="partName">
+ <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
+ <el-input v-model="dataForm.partName" placeholder="闆朵欢" disabled></el-input>
+ </el-tooltip>
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
+ <el-form-item label="闆朵欢鍙�" prop="partNo">
+ <el-tooltip class="item" effect="dark" :content="dataForm.partNo" >
+ <el-input v-model="dataForm.partNo" placeholder="闆朵欢鍙�" disabled></el-input>
+ </el-tooltip>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row :gutter="10">
<span style="float:right; margin-right:30px; margin-top: 55px">
diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index d37995d..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="JSON.stringify(item)" :size="110" :margin="1"></vueQr>
+ <vueQr :text=str+item.packageBoxId :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?id=",
qrData:[],
diaPrintTab: false,
multipleSelection: [],
@@ -348,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/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index a0a9cbd..dccb95c 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -48,12 +48,14 @@
</el-col>
<el-col :span="6">
<el-form-item label="浜у搧鍚嶇О锛�">
+ <el-tooltip class="item" effect="dark" :content="processInspectVo.material">
<el-select style="width: 100%" @change="changeOptionsSamplename" :disabled="processInspectVo.id != null"
v-model="processInspectVo.material" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
<el-option v-for="(item,index) in optionsSamplename" :key="index" :label="item.material"
:value="item.materialCode">
</el-option>
</el-select>
+ </el-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -63,7 +65,9 @@
</el-col>
<el-col :span="6">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
+ <el-tooltip class="item" effect="dark" :content="processInspectVo.specificationsModel">
<el-input disabled v-model="processInspectVo.specificationsModel" autocomplete="off" />
+ </el-tooltip>
</el-form-item>
</el-col>
</el-row>
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 505338e..443d28e 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -31,6 +31,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="浜у搧鍚嶇О锛�">
+ <el-tooltip class="item" effect="dark" :content="processInspectVo.material">
<el-select style="width: 100%" @change="changeOptionsSamplename"
:disabled="processInspectVo.id != null" v-model="processInspectVo.material"
size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
@@ -38,6 +39,7 @@
:label="item.material" :value="item.materialCode">
</el-option>
</el-select>
+ </el-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -50,8 +52,10 @@
<el-row>
<el-col :span="6">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
+ <el-tooltip class="item" effect="dark" :content="processInspectVo.specs">
<el-input disabled v-model="processInspectVo.specs"
autocomplete="off" />
+ </el-tooltip>
</el-form-item>
</el-col>
diff --git a/src/views/quality/teststandard/index.vue b/src/views/quality/teststandard/index.vue
index a8481fb..120c1c0 100644
--- a/src/views/quality/teststandard/index.vue
+++ b/src/views/quality/teststandard/index.vue
@@ -321,7 +321,7 @@
isShowQuery: false,
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: true,
+ isShow: false,
url: '/mes/testStandard/upload'
},
prelang: 'operation',
diff --git a/vue.config.js b/vue.config.js
index 6cc7723..ae3e477 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,15 +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'
+// const url = 'http://localhost:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3