盘点问题

taiwan-tingli
Your Name 4 years ago
parent 660de42bdc
commit 9bef504cb7

@ -30,7 +30,7 @@ button::-moz-focus-inner,
[type='submit']::-moz-focus-inner {border-style: none;} [type='submit']::-moz-focus-inner {border-style: none;}
fieldset {border: 0;} fieldset {border: 0;}
legend {color: inherit;} legend {color: inherit;}
mark {background-color: #feffe6;} mark {background-color: color(~`colorPalette("@{text-color}", 1)`);}
::selection {color: #fff;background: @primary-color;} ::selection {color: #fff;background: @primary-color;}
.anticon {color: inherit;} .anticon {color: inherit;}
html {--antd-wave-shadow-color: @primary-color;} html {--antd-wave-shadow-color: @primary-color;}
@ -1383,7 +1383,7 @@ tr.ant-table-expanded-row:hover {background: #fbfbfb;}
.ant-tag-volcano-inverse {color: #fff;background: #fa541c;border-color: #fa541c;} .ant-tag-volcano-inverse {color: #fff;background: #fa541c;border-color: #fa541c;}
.ant-tag-orange {color: #fa8c16;background: #fff7e6;border-color: #ffd591;} .ant-tag-orange {color: #fa8c16;background: #fff7e6;border-color: #ffd591;}
.ant-tag-orange-inverse {color: #fff;background: #fa8c16;border-color: #fa8c16;} .ant-tag-orange-inverse {color: #fff;background: #fa8c16;border-color: #fa8c16;}
.ant-tag-yellow {color: #fadb14;background: #feffe6;border-color: #fffb8f;} .ant-tag-yellow {color: #fadb14;background: color(~`colorPalette("@{text-color}", 1)`);border-color: #fffb8f;}
.ant-tag-yellow-inverse {color: #fff;background: #fadb14;border-color: #fadb14;} .ant-tag-yellow-inverse {color: #fff;background: #fadb14;border-color: #fadb14;}
.ant-tag-gold {color: #faad14;background: #fffbe6;border-color: #ffe58f;} .ant-tag-gold {color: #faad14;background: #fffbe6;border-color: #ffe58f;}
.ant-tag-gold-inverse {color: #fff;background: #faad14;border-color: #faad14;} .ant-tag-gold-inverse {color: #fff;background: #faad14;border-color: #faad14;}

@ -1,10 +1,10 @@
<template> <template>
<div class="wrap"> <div class="wrap">
<!-- 面包屑下标题 --> <!-- 面包屑下标题 -->
<router-view :exclude="['checkManage','realTimeMonitoring']" class="table"></router-view>
<!-- <keep-alive>
</keep-alive> --> <keep-alive include="checkManage" exclude="realTimeMonitoring,videoWall,cameraManage,cameraManageModel">
<router-view class="table" />
</keep-alive>
<!-- footer --> <!-- footer -->
<div class="wrap-footer bg-white"> <div class="wrap-footer bg-white">

@ -1,6 +1,6 @@
<template> <template>
<div class="subsection"> <div class="subsection">
<a-layout style="width: 900px"> <a-layout style="width: 1500px">
<a-layout style="width: 100%;height: 310px"> <a-layout style="width: 100%;height: 310px">
<a-layout-sider width="110px"> <a-layout-sider width="110px">
<a-tabs default-active-key="1" tab-position="left" @change="changeTabLeft" v-if="total.row > nums.row"> <a-tabs default-active-key="1" tab-position="left" @change="changeTabLeft" v-if="total.row > nums.row">
@ -82,7 +82,6 @@ export default {
} }
}, },
nums: { nums: {
// 20 10
type: Object, type: Object,
default: () => { default: () => {
return { return {

@ -181,6 +181,10 @@ export default {
label:'扫描条码号', label:'扫描条码号',
key: 'code' key: 'code'
}, },
{
label:'盘点时间',
key: 'exportTime'
},
], ],
statusMap: {0:"未盘点",1:"盘点异常",2:"核对正确",3:"核对正确"} statusMap: {0:"未盘点",1:"盘点异常",2:"核对正确",3:"核对正确"}
@ -190,7 +194,12 @@ export default {
beforeRouteLeave(to ,form, next) { beforeRouteLeave(to ,form, next) {
// created // created
this.$destroy(); this.$destroy();
//next(); if (to.name == 'checkManage') {
to.meta.isUseCache = true;
}else{
to.meta.isUseCache = false;
}
next();
}, },
created() { created() {
this.imgUrl = imgUrl this.imgUrl = imgUrl

@ -111,9 +111,15 @@ export default {
created(){ created(){
}, },
// activated() { activated() {
// this.request(); if(!this.$route.meta.isUseCache){
// }, console.log("$route.meta.isUseCache false")
//
this.request();//
}else{
console.log("$route.meta.isUseCache true")
}
},
// beforeRouteLeave(to, form, next) { // beforeRouteLeave(to, form, next) {
// this.timer && clearInterval(this.timer); // this.timer && clearInterval(this.timer);
// next(); // next();

Loading…
Cancel
Save