hzya
/
middleground_code_v2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改token

This commit is contained in:
hyt 2024-09-30 10:54:28 +08:00
parent 1f6c58eeba
commit 890ba114d0
7 changed files with 121 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/preload.js
View File

@ -16,6 +16,7 @@ All.prototype = {
setCookie(val) { //cookie设置[{key:value}]、获取key、清除['key1','key2'] setCookie(val) { //cookie设置[{key:value}]、获取key、清除['key1','key2']
for (var i = 0, len = val.length; i < len; i++) { for (var i = 0, len = val.length; i < len; i++) {
for (var key in val[i]) { for (var key in val[i]) {
console.log(key,'key123')
document.cookie = key + '=' + encodeURIComponent(val[i][key]) + "; path=/"; document.cookie = key + '=' + encodeURIComponent(val[i][key]) + "; path=/";
} }
} }
@ -32,8 +33,9 @@ All.prototype = {
}, },
clearCookie(name) { clearCookie(name) {
var myDate = new Date(); var myDate = new Date();
myDate.setTime(-1000); //设置时间 myDate.setTime(-1000); //设置时间
for (var i = 0, len = name.length; i < len; i++) { for (var i = 0, len = name.length; i < len; i++) {
console.log(name,'?')
document.cookie = "" + name[i] + "=''; path=/; expires=" + myDate.toGMTString(); document.cookie = "" + name[i] + "=''; path=/; expires=" + myDate.toGMTString();
} }
}, },
@ -47,7 +49,7 @@ All.prototype = {
}, },
toChecked(arr, elem, key = 'id') { toChecked(arr, elem, key = 'id') {
// eslint-disable-next-line no- // eslint-disable-next-line no-
var isIncludes = this.toggleClass(arr, elem, key); var isIncludes = this.toggleClass(arr, elem, key);
!isIncludes ? arr.push(elem) : this.removeEle(arr, elem, key); !isIncludes ? arr.push(elem) : this.removeEle(arr, elem, key);
}, },
@ -122,7 +124,7 @@ All.prototype = {
}) })
} }
return arr.join("或") return arr.join("或")
}, },
conditionStr(nodeConfig, index) { conditionStr(nodeConfig, index) {
var { conditionList, nodeUserList } = nodeConfig.conditionNodes[index]; var { conditionList, nodeUserList } = nodeConfig.conditionNodes[index];
if (conditionList.length == 0) { if (conditionList.length == 0) {
@ -162,11 +164,11 @@ All.prototype = {
return "发起人自选" return "发起人自选"
} }
} }
}, },
toggleStrClass(item, key) { toggleStrClass(item, key) {
let a = item.zdy1 ? item.zdy1.split(",") : [] let a = item.zdy1 ? item.zdy1.split(",") : []
return a.some(item => { return item == key }); return a.some(item => { return item == key });
}, },
} }
export default new All(); export default new All();

4
src/store/modules/user.js
View File

@ -65,15 +65,13 @@ const user = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
login(login_name, password) login(login_name, password)
.then((res) => { .then((res) => {
setToken(res.attribute.token); setToken(res.attribute['zt-token']);
setInfo(JSON.stringify(res.attribute.userInfo)); setInfo(JSON.stringify(res.attribute.userInfo));
commit("SET_TOKEN", res.attribute.token); commit("SET_TOKEN", res.attribute.token);
commit("SET_INFO", res.attribute.userInfo); commit("SET_INFO", res.attribute.userInfo);
resolve(); resolve();
}) })
.catch((error) => { .catch((error) => {
console.log(123)
//
commit("LogOut") commit("LogOut")
reject(error); reject(error);

15
src/utils/auth.js
View File

@ -3,7 +3,7 @@ import Cookies from 'js-cookie'
const TokenKey = 'zhongtai-Token' const TokenKey = 'zhongtai-Token'
const InfoKey = 'zhongtai-Info' const InfoKey = 'zhongtai-Info'
const CompanyId = 'Company-Id' const CompanyId = 'Company-Id'
const MenuNode = "Menu-Node" const MenuNode = 'Menu-Node'
export function getToken() { export function getToken() {
return Cookies.get(TokenKey) return Cookies.get(TokenKey)
@ -18,17 +18,17 @@ export function removeToken() {
} }
export function getInfo() { export function getInfo() {
localStorage.getItem(InfoKey) localStorage.getItem(InfoKey)
return Cookies.get(InfoKey) return Cookies.get(InfoKey)
} }
export function setInfo(info) { export function setInfo(info) {
localStorage.setItem(InfoKey,info) localStorage.setItem(InfoKey, info)
return Cookies.set(InfoKey, info) return Cookies.set(InfoKey, info)
} }
export function removeInfo() { export function removeInfo() {
localStorage.removeItem(InfoKey) localStorage.removeItem(InfoKey)
return Cookies.remove(InfoKey) return Cookies.remove(InfoKey)
} }
@ -43,14 +43,15 @@ export function setCompanyId(info) {
export function removeCompanyId() { export function removeCompanyId() {
return Cookies.remove(CompanyId) return Cookies.remove(CompanyId)
} }
export function getMenuNode() { export function getMenuNode() {
return Cookies.get(MenuNode); return Cookies.get(MenuNode)
} }
export function setMenuNode(info) { export function setMenuNode(info) {
return Cookies.set(MenuNode, info); return Cookies.set(MenuNode, info)
} }
export function removeMenuNode() { export function removeMenuNode() {
return Cookies.remove(MenuNode); return Cookies.remove(MenuNode)
} }

2
src/views/login.vue
View File

@ -256,7 +256,6 @@ export default {
Cookies.remove("rememberMe"); Cookies.remove("rememberMe");
Cookies.remove("automaticLogin"); Cookies.remove("automaticLogin");
} }
this.$store this.$store
.dispatch("Login", this.loginForm) .dispatch("Login", this.loginForm)
.then(() => { .then(() => {
@ -273,7 +272,6 @@ export default {
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
console.log(123, "123");
}); });
} }
}); });

52
src/views/systemReports/u8positiveReports/TOBreturnWarehouse.vue
View File

@ -5,49 +5,55 @@
<div class="search"> <div class="search">
<div class="datepickBox" style=""> <div class="datepickBox" style="">
<el-date-picker <el-date-picker
v-model="queryCriteria.businessDate_start" v-model="queryCriteria.businessdate_start"
type="date" type="date"
placeholder="出库日期-开始" placeholder="入库日期-开始"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</div> </div>
<div class="datepickBox" style=""> <div class="datepickBox" style="">
<el-date-picker <el-date-picker
v-model="queryCriteria.businessDate_end" v-model="queryCriteria.businessdate_end"
type="date" type="date"
placeholder="出库日期-结束" placeholder="入库日期-结束"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</div> </div>
<div class="datepickBox" style=""> <div class="datepickBox" style="">
<el-date-picker <el-date-picker
v-model="queryCriteria.successfulTradeDate_start" v-model="queryCriteria.refundedat_start"
type="date" type="date"
placeholder="交易成功开始时间" placeholder="退货完成范围-开始"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</div> </div>
<div class="datepickBox" style=""> <div class="datepickBox" style="">
<el-date-picker <el-date-picker
v-model="queryCriteria.successfulTradeDate_end" v-model="queryCriteria.refundedat_end"
type="date" type="date"
placeholder="交易成功结束时间" placeholder="退货完成范围-结束"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</div> </div>
<!-- TOB退货-库存-库存 --> <!-- TOB退货-库存-库存 -->
<div class="chunk"> <div class="chunk">
<el-input v-model="queryCriteria.newPushDate" placeholder="TOB库存推送时间"></el-input> <el-date-picker
</div> v-model="queryCriteria.newpushdate"
<div class="chunk"> type="date"
<el-input v-model="queryCriteria.newTransmitInfo" placeholder="TOB库存推送详情"></el-input> placeholder="TOB库存-推送时间"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</div> </div>
<!-- <div class="chunk">-->
<!-- <el-input v-model="queryCriteria.newtransmitinfo" placeholder="TOB库存推送详情"></el-input>-->
<!-- </div>-->
<div class="radio"> <div class="radio">
<el-select v-model="queryCriteria.newState" placeholder="TOB出库同步成功"> <el-select v-model="queryCriteria.newstate" placeholder="TOB出库同步成功">
<el-option <el-option
v-for="item in stateOptions" v-for="item in stateOptions"
:key="item.value" :key="item.value"
@ -58,20 +64,26 @@
</el-select> </el-select>
</div> </div>
<div class="chunk"> <div class="chunk">
<el-input v-model="queryCriteria.newSystemNumber" placeholder="TOB库存下游单号"></el-input> <el-input v-model="queryCriteria.newsystemnumber" placeholder="TOB库存下游单号"></el-input>
</div> </div>
<div class="chunk"> <div class="chunk">
<el-input v-model="queryCriteria.newSystemPrimary" placeholder="TOB库存下游主键"></el-input> <el-input v-model="queryCriteria.newsystemprimary" placeholder="TOB库存下游主键"></el-input>
</div> </div>
<!-- TOB退货-库存 - 确认收入 --> <!-- TOB退货-库存 - 确认收入 -->
<div class="chunk"> <div class="chunk">
<el-input v-model="queryCriteria.newPushDate2" placeholder="TOB确认收入推送时间"></el-input> <el-date-picker
v-model="queryCriteria.newpushdate2"
type="date"
placeholder="TOB确认收入推送时间"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</div> </div>
<div class="chunk"> <div class="chunk">
<el-input v-model="queryCriteria.newTransmitInfo2" placeholder="TOB确认收入推送详情"></el-input> <el-input v-model="queryCriteria.newtransmitinfo2" placeholder="TOB确认收入推送详情"></el-input>
</div> </div>
<div class="radio"> <div class="radio">
<el-select v-model="queryCriteria.newState2" placeholder="TOB确认收入-红-交易成功"> <el-select v-model="queryCriteria.newstate2" placeholder="TOB确认收入-红-交易成功">
<el-option <el-option
v-for="item in stateOptions" v-for="item in stateOptions"
:key="item.value" :key="item.value"
@ -82,10 +94,10 @@
</el-select> </el-select>
</div> </div>
<div class="chunk"> <div class="chunk">
<el-input v-model="queryCriteria.newSystemNumber2" placeholder="TOB确认收入下游单号"></el-input> <el-input v-model="queryCriteria.newsystemnumber2" placeholder="TOB确认收入下游单号"></el-input>
</div> </div>
<div class="chunk"> <div class="chunk">
<el-input v-model="queryCriteria.newSystemPrimary2" placeholder="TOB确认收入下游主键"></el-input> <el-input v-model="queryCriteria.newsystemprimary2" placeholder="TOB确认收入下游主键"></el-input>
</div> </div>
<div class="chunk"> <div class="chunk">
<el-input <el-input

120
src/views/systemReports/u8positiveReports/TOCreturnWarehouse.vue
View File

@ -5,56 +5,60 @@
<div class="search"> <div class="search">
<div class="datepickBox" style=""> <div class="datepickBox" style="">
<el-date-picker <el-date-picker
v-model="queryCriteria.businessDate_start" v-model="queryCriteria.businessdate_start"
type="date" type="date"
placeholder="出库日期-开始" placeholder="入库日期-开始"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</div> </div>
<div class="datepickBox" style=""> <div class="datepickBox" style="">
<el-date-picker <el-date-picker
v-model="queryCriteria.businessDate_end" v-model="queryCriteria.businessdate_end"
type="date" type="date"
placeholder="出库日期-结束" placeholder="入库日期-结束"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</div> </div>
<div class="datepickBox" style=""> <div class="datepickBox" style="">
<el-date-picker <el-date-picker
v-model="queryCriteria.successfulTradeDate_start" v-model="queryCriteria.refundedat_start"
type="date" type="date"
placeholder="交易成功开始时间" placeholder="退货完成范围-开始"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</div> </div>
<div class="datepickBox" style=""> <div class="datepickBox" style="">
<el-date-picker <el-date-picker
v-model="queryCriteria.successfulTradeDate_end" v-model="queryCriteria.refundedat_end"
type="date" type="date"
placeholder="交易成功结束时间" placeholder="退货完成范围-结束"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</div> </div>
<!-- TOC退货-库存 --> <!-- TOC退货-库存 -->
<div class="chunk"> <div class="chunk">
<el-input <el-date-picker
v-model="queryCriteria.newPushDate3" v-model="queryCriteria.newpushdate3"
placeholder="TOC库存推送时间" type="date"
></el-input> placeholder="TOC库存-推送时间"
</div> value-format="yyyy-MM-dd"
<div class="chunk"> >
<el-input </el-date-picker>
v-model="queryCriteria.newTransmitInfo3"
placeholder="TOC库存推送详情"
></el-input>
</div> </div>
<!-- <div class="chunk">-->
<!-- <el-input-->
<!-- v-model="queryCriteria.newTransmitInfo3"-->
<!-- placeholder="TOC库存推送详情"-->
<!-- ></el-input>-->
<!-- </div>-->
<div class="radio"> <div class="radio">
<el-select <el-select
v-model="queryCriteria.newState3" v-model="queryCriteria.newstate3"
placeholder="TOC出库同步成功" placeholder="TOC出库同步成功"
> >
<el-option <el-option
@ -68,32 +72,35 @@
</div> </div>
<div class="chunk"> <div class="chunk">
<el-input <el-input
v-model="queryCriteria.newSystemNumber3" v-model="queryCriteria.newsystemnumber3"
placeholder="TOC库存下游单号" placeholder="TOC库存下游单号"
></el-input> ></el-input>
</div> </div>
<div class="chunk"> <div class="chunk">
<el-input <el-input
v-model="queryCriteria.newSystemPrimary3" v-model="queryCriteria.newsystemprimary3"
placeholder="TOC库存下游主键" placeholder="TOC库存下游主键"
></el-input> ></el-input>
</div> </div>
<!-- TOC退货 - 确认收入 --> <!-- TOC退货 - 确认收入 -->
<div class="chunk"> <div class="chunk">
<el-input <el-date-picker
v-model="queryCriteria.newPushDate4" v-model="queryCriteria.newpushdate4"
placeholder="TOC确认收入推送时间" type="date"
></el-input> placeholder="TOC库存-推送时间"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</div> </div>
<div class="chunk"> <div class="chunk">
<el-input <el-input
v-model="queryCriteria.newTransmitInfo4" v-model="queryCriteria.newtransmitinfo4"
placeholder="TOC确认收入推送详情" placeholder="TOC确认收入推送详情"
></el-input> ></el-input>
</div> </div>
<div class="radio"> <div class="radio">
<el-select <el-select
v-model="queryCriteria.newState4" v-model="queryCriteria.newstate4"
placeholder="TOC确认收入-红-交易成功" placeholder="TOC确认收入-红-交易成功"
> >
<el-option <el-option
@ -107,20 +114,20 @@
</div> </div>
<div class="chunk"> <div class="chunk">
<el-input <el-input
v-model="queryCriteria.newSystemNumber4" v-model="queryCriteria.newsystemnumber4"
placeholder="TOC确认收入下游单号" placeholder="TOC确认收入下游单号"
></el-input> ></el-input>
</div> </div>
<div class="chunk"> <div class="chunk">
<el-input <el-input
v-model="queryCriteria.newSystemPrimary4" v-model="queryCriteria.newsystemprimary4"
placeholder="TOC确认收入下游主键" placeholder="TOC确认收入下游主键"
></el-input> ></el-input>
</div> </div>
<div class="chunk"> <div class="chunk">
<el-input <el-input
v-model="queryCriteria.headCode" v-model="queryCriteria.headCode"
placeholder="销售出库单号" placeholder="售后入库单号"
></el-input> ></el-input>
</div> </div>
</div> </div>
@ -306,62 +313,74 @@ export default {
width: 150, width: 150,
}, },
{ {
label: "TOB销售-库存-推送时间", label: "TOC退货-推送时间",
prop: "newpushdate", prop: "newpushdate3",
tooltip: true, tooltip: true,
width: 200, width: 200,
}, },
{ {
label: "TOB销售-库存-报错详情", label: "TOC退货-报错详情",
prop: "newtransmitinfo", prop: "newtransmitinfo3",
tooltip: true, tooltip: true,
width: 200, width: 200,
}, },
{ {
label: "TOB销售-库存-推送状态", label: "TOC退货-推送状态",
prop: "newstate", prop: "newstate3",
tooltip: true, tooltip: true,
width: 200, width: 200,
}, },
{ {
label: "TOB库存-下游单号", label: "TOC退货-下游系统单号",
prop: "newsystemnumber", prop: "newsystemnumber3",
tooltip: true, tooltip: true,
width: 200, width: 200,
}, },
{ {
label: "TOB库存-下游主键", label: "TOC退货-下游系统主键",
prop: "newsystemprimary", prop: "newsystemprimary3",
tooltip: true, tooltip: true,
width: 150, width: 150,
}, },
{ {
label: "TOB销售-确认收入-推送时间", label: "TOC退货确认收入-推送时间",
prop: "newpushdate2", prop: "newpushdate4",
tooltip: true, tooltip: true,
width: 150, width: 150,
}, },
{ {
label: "TOB确认收入-报错详情", label: "TOC退货确认收入-报错详情",
prop: "newtransmitinfo2", prop: "newtransmitinfo4",
tooltip: true, tooltip: true,
width: 150, width: 150,
}, },
{ {
label: "TOB销售-确认收入红-推送状态", label: "TOC退货确认收入-推送状态",
prop: "newstate2", prop: "newstate4",
tooltip: true, tooltip: true,
width: 150, width: 150,
}, },
{ {
label: "TOB确认收入红-下游单号", label: "TOC退货确认收入-下游系统单号",
prop: "newsystemnumber2", prop: "newsystemnumber4",
tooltip: true, tooltip: true,
width: 150, width: 150,
}, },
{ {
label: "TOB确认收入红-下游主键", label: "TOC退货确认收入-下游系统主键",
prop: "newsystemprimary2", prop: "newsystemprimary4",
tooltip: true,
width: 150,
},
{
label: "退货入库日期",
prop: "businessdate",
tooltip: true,
width: 150,
},
{
label: "退款完成日期",
prop: "refundedat",
tooltip: true, tooltip: true,
width: 150, width: 150,
}, },
@ -596,6 +615,7 @@ export default {
item.newstate = this.dist_state[item.newstate]; item.newstate = this.dist_state[item.newstate];
item.newstate2 = this.dist_state[item.newstate2]; item.newstate2 = this.dist_state[item.newstate2];
item.newstate3 = this.dist_state[item.newstate3]; item.newstate3 = this.dist_state[item.newstate3];
item.newstate4 = this.dist_state[item.newstate4];
}); });
this.mainTableData = this.dataDispose( this.mainTableData = this.dataDispose(
res.attribute.list, res.attribute.list,

5
vue.config.js
View File

@ -40,7 +40,7 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://hzya.ufyct.com:9067/`, // target: `http://hzya.ufyct.com:9067/`,
target: `http://ufidahz.com.cn:9067/`, // target: `http://ufidahz.com.cn:9067/`,
// target: `http://127.0.0.1:9081/`, // target: `http://127.0.0.1:9081/`,
// target: `http://192.168.2.78:9999`, // target: `http://192.168.2.78:9999`,
// target: `http://192.168.2.85:9999`, // target: `http://192.168.2.85:9999`,
@ -48,7 +48,8 @@ module.exports = {
// target: `http://192.168.2.78:10086`, // target: `http://192.168.2.78:10086`,
// target: `http://192.168.2.185:10086`, // target: `http://192.168.2.185:10086`,
// target: `http://192.168.2.83:9999`, // target: `http://192.168.2.83:9999`,
// target:'http://127.0.0.1:9999/', // target:'http://39.170.109.90:8081/',
target:'http://192.168.2.75:1024/',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "", ["^" + process.env.VUE_APP_BASE_API]: "",