diff --git a/src/plugins/preload.js b/src/plugins/preload.js index 1a88c9f..3d5a659 100644 --- a/src/plugins/preload.js +++ b/src/plugins/preload.js @@ -16,6 +16,7 @@ All.prototype = { setCookie(val) { //cookie设置[{key:value}]、获取key、清除['key1','key2'] for (var i = 0, len = val.length; i < len; i++) { for (var key in val[i]) { + console.log(key,'key123') document.cookie = key + '=' + encodeURIComponent(val[i][key]) + "; path=/"; } } @@ -32,8 +33,9 @@ All.prototype = { }, clearCookie(name) { var myDate = new Date(); - myDate.setTime(-1000); //设置时间 + myDate.setTime(-1000); //设置时间 for (var i = 0, len = name.length; i < len; i++) { + console.log(name,'?') document.cookie = "" + name[i] + "=''; path=/; expires=" + myDate.toGMTString(); } }, @@ -47,7 +49,7 @@ All.prototype = { }, toChecked(arr, elem, key = 'id') { // eslint-disable-next-line no- - + var isIncludes = this.toggleClass(arr, elem, key); !isIncludes ? arr.push(elem) : this.removeEle(arr, elem, key); }, @@ -122,7 +124,7 @@ All.prototype = { }) } return arr.join("或") - }, + }, conditionStr(nodeConfig, index) { var { conditionList, nodeUserList } = nodeConfig.conditionNodes[index]; if (conditionList.length == 0) { @@ -162,11 +164,11 @@ All.prototype = { return "发起人自选" } } - }, + }, toggleStrClass(item, key) { let a = item.zdy1 ? item.zdy1.split(",") : [] return a.some(item => { return item == key }); }, } -export default new All(); \ No newline at end of file +export default new All(); diff --git a/src/store/modules/user.js b/src/store/modules/user.js index c52e992..145c9b1 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -65,15 +65,13 @@ const user = { return new Promise((resolve, reject) => { login(login_name, password) .then((res) => { - setToken(res.attribute.token); + setToken(res.attribute['zt-token']); setInfo(JSON.stringify(res.attribute.userInfo)); commit("SET_TOKEN", res.attribute.token); commit("SET_INFO", res.attribute.userInfo); resolve(); }) .catch((error) => { - console.log(123) - // commit("LogOut") reject(error); diff --git a/src/utils/auth.js b/src/utils/auth.js index 969d9fe..9093ba4 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -3,7 +3,7 @@ import Cookies from 'js-cookie' const TokenKey = 'zhongtai-Token' const InfoKey = 'zhongtai-Info' const CompanyId = 'Company-Id' -const MenuNode = "Menu-Node" +const MenuNode = 'Menu-Node' export function getToken() { return Cookies.get(TokenKey) @@ -18,17 +18,17 @@ export function removeToken() { } export function getInfo() { - localStorage.getItem(InfoKey) + localStorage.getItem(InfoKey) return Cookies.get(InfoKey) } export function setInfo(info) { - localStorage.setItem(InfoKey,info) + localStorage.setItem(InfoKey, info) return Cookies.set(InfoKey, info) } export function removeInfo() { - localStorage.removeItem(InfoKey) + localStorage.removeItem(InfoKey) return Cookies.remove(InfoKey) } @@ -43,14 +43,15 @@ export function setCompanyId(info) { export function removeCompanyId() { return Cookies.remove(CompanyId) } + export function getMenuNode() { - return Cookies.get(MenuNode); + return Cookies.get(MenuNode) } export function setMenuNode(info) { - return Cookies.set(MenuNode, info); + return Cookies.set(MenuNode, info) } export function removeMenuNode() { - return Cookies.remove(MenuNode); + return Cookies.remove(MenuNode) } diff --git a/src/views/login.vue b/src/views/login.vue index 4371637..04fa858 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -256,7 +256,6 @@ export default { Cookies.remove("rememberMe"); Cookies.remove("automaticLogin"); } - this.$store .dispatch("Login", this.loginForm) .then(() => { @@ -273,7 +272,6 @@ export default { }) .catch(() => { this.loading = false; - console.log(123, "123"); }); } }); diff --git a/src/views/systemReports/u8positiveReports/TOBreturnWarehouse.vue b/src/views/systemReports/u8positiveReports/TOBreturnWarehouse.vue index 4423dad..5e329aa 100644 --- a/src/views/systemReports/u8positiveReports/TOBreturnWarehouse.vue +++ b/src/views/systemReports/u8positiveReports/TOBreturnWarehouse.vue @@ -5,49 +5,55 @@
- -
-
- + +
+ + +
- +
- +
- +
- + +
- +
- +
- +
- +
- -
-
- + + +
+ + + + + +
- + +
@@ -306,62 +313,74 @@ export default { width: 150, }, { - label: "TOB销售-库存-推送时间", - prop: "newpushdate", + label: "TOC退货-推送时间", + prop: "newpushdate3", tooltip: true, width: 200, }, { - label: "TOB销售-库存-报错详情", - prop: "newtransmitinfo", + label: "TOC退货-报错详情", + prop: "newtransmitinfo3", tooltip: true, width: 200, }, { - label: "TOB销售-库存-推送状态", - prop: "newstate", + label: "TOC退货-推送状态", + prop: "newstate3", tooltip: true, width: 200, }, { - label: "TOB库存-下游单号", - prop: "newsystemnumber", + label: "TOC退货-下游系统单号", + prop: "newsystemnumber3", tooltip: true, width: 200, }, { - label: "TOB库存-下游主键", - prop: "newsystemprimary", + label: "TOC退货-下游系统主键", + prop: "newsystemprimary3", tooltip: true, width: 150, }, { - label: "TOB销售-确认收入-推送时间", - prop: "newpushdate2", + label: "TOC退货确认收入-推送时间", + prop: "newpushdate4", tooltip: true, width: 150, }, { - label: "TOB确认收入-报错详情", - prop: "newtransmitinfo2", + label: "TOC退货确认收入-报错详情", + prop: "newtransmitinfo4", tooltip: true, width: 150, }, { - label: "TOB销售-确认收入红-推送状态", - prop: "newstate2", + label: "TOC退货确认收入-推送状态", + prop: "newstate4", tooltip: true, width: 150, }, { - label: "TOB确认收入红-下游单号", - prop: "newsystemnumber2", + label: "TOC退货确认收入-下游系统单号", + prop: "newsystemnumber4", tooltip: true, width: 150, }, { - label: "TOB确认收入红-下游主键", - prop: "newsystemprimary2", + label: "TOC退货确认收入-下游系统主键", + prop: "newsystemprimary4", + tooltip: true, + width: 150, + }, + { + label: "退货入库日期", + prop: "businessdate", + tooltip: true, + width: 150, + }, + { + label: "退款完成日期", + prop: "refundedat", tooltip: true, width: 150, }, @@ -596,6 +615,7 @@ export default { item.newstate = this.dist_state[item.newstate]; item.newstate2 = this.dist_state[item.newstate2]; item.newstate3 = this.dist_state[item.newstate3]; + item.newstate4 = this.dist_state[item.newstate4]; }); this.mainTableData = this.dataDispose( res.attribute.list, diff --git a/vue.config.js b/vue.config.js index 9139531..de2e721 100644 --- a/vue.config.js +++ b/vue.config.js @@ -40,7 +40,7 @@ module.exports = { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { // 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://192.168.2.78: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.185:10086`, // 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, pathRewrite: { ["^" + process.env.VUE_APP_BASE_API]: "",