| src/permission.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/workOrder/workOrderList.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/permission.js
@@ -33,28 +33,33 @@ next() } else { try { // 拉取info // const info = await store.dispatch('user/getInfo') if (whiteList.indexOf(to.path) !== -1) { // in the free login whitelist, go directly next() } else { // 拉取info // const info = await store.dispatch('user/getInfo') // jwt解密获取用户编码 const jwt = decode(localStorage.getItem('token')) localStorage.setItem('usercode', jwt.usercode) localStorage.setItem('username', jwt.username) localStorage.setItem('torg_name', jwt.storg_name) localStorage.setItem('torg_code', jwt.storg_code) localStorage.setItem('mesSetting', jwt.mesSetting) // jwt解密获取用户编码 const jwt = decode(localStorage.getItem('token')) localStorage.setItem('usercode', jwt.usercode) localStorage.setItem('username', jwt.username) localStorage.setItem('torg_name', jwt.storg_name) localStorage.setItem('torg_code', jwt.storg_code) localStorage.setItem('mesSetting', jwt.mesSetting) // 拉取菜单信息表 const menu = await store.dispatch('user/getMenu') // 生成可访问的路由表 await store.dispatch('permission/generateRoutes', menu) // 动态添加可访问路由表 router.addRoutes(store.getters.addRouters) // 拉取菜单信息表 const menu = await store.dispatch('user/getMenu') // 生成可访问的路由表 await store.dispatch('permission/generateRoutes', menu) // 动态添加可访问路由表 router.addRoutes(store.getters.addRouters) // hack方法 确保addRoutes已完成 next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 next({ ...to, replace: true }) // next() // next() } } catch (error) { // remove token and go to login page to re-login await store.dispatch('user/resetToken') src/views/workOrder/workOrderList.vue
@@ -505,6 +505,7 @@ <div class="elTableDiv"> <el-table ref="tableDataRef2" :data="tableDataDetail" border height="210px" @@ -3004,7 +3005,9 @@ // do something with the new and old value of stepSelectedValue console.log(val, 1) console.log(this.stepTableData, 3) const arr = JSON.parse(JSON.stringify(this.stepTableData)) console.log(arr, 33, this.dialogForm.mesqty) const arrStepcode = arr.map(i => i.stepcode) this.stepTableData = [] val.forEach(i => { @@ -3119,7 +3122,8 @@ if (i.stepdata.length > 0) { i.stepdata.forEach(j => { j.ratio = parseFloat(j.ratio) > 0 ? parseFloat(j.ratio) : 0 j.sumqty = Math.round(parseFloat(i.canupdate_qty) * (1 + (parseFloat(j.ratio) > 0 ? parseFloat(j.ratio) / 100 : 0))) // j.sumqty = Math.round(parseFloat(i.canupdate_qty) * (1 + (parseFloat(j.ratio) > 0 ? parseFloat(j.ratio) / 100 : 0))) j.sumqty = Math.round(parseFloat(this.formData3[index].mesqty) * (1 + (parseFloat(j.ratio) > 0 ? parseFloat(j.ratio) / 100 : 0))) }) this.formData3[index].stepTableData = i.stepdata this.formData3[index].stepSelectedValue = i.stepdata.map(j => j.stepcode) @@ -3700,7 +3704,8 @@ stepname: i.stepname, stepprice: i.stepprice, ratio: parseFloat(i.ratio) > 0 ? parseFloat(i.ratio) : 0, sumqty: Math.round(parseFloat(res.canupdate_qty) * (1 + (parseFloat(i.ratio) > 0 ? parseFloat(i.ratio) / 100 : 0))) // sumqty: Math.round(parseFloat(res.canupdate_qty) * (1 + (parseFloat(i.ratio) > 0 ? parseFloat(i.ratio) / 100 : 0))) sumqty: Math.round(parseFloat(this.dialogForm.mesqty) * (1 + (parseFloat(i.ratio) > 0 ? parseFloat(i.ratio) / 100 : 0))) } ) }) @@ -3734,7 +3739,8 @@ stepname: i.stepname, stepprice: i.stepprice, ratio: parseFloat(i.ratio) > 0 ? parseFloat(i.ratio) : 0, sumqty: Math.round(parseFloat(res.canupdate_qty) * (1 + (parseFloat(i.ratio) > 0 ? parseFloat(i.ratio) / 100 : 0))) // sumqty: Math.round(parseFloat(res.canupdate_qty) * (1 + (parseFloat(i.ratio) > 0 ? parseFloat(i.ratio) / 100 : 0))) sumqty: Math.round(parseFloat(this.dialogForm.mesqty) * (1 + (parseFloat(i.ratio) > 0 ? parseFloat(i.ratio) / 100 : 0))) } ) }) @@ -4009,6 +4015,7 @@ } this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367 this.$refs.tableDataRef.doLayout() this.$refs.tableDataRef2.doLayout() }) }, // 工艺路线放大镜点击 @@ -4552,6 +4559,7 @@ this.$nextTick(() => { this.$refs.tableDataRef.doLayout() this.$refs.tableDataRef2.doLayout() }) return sums }