From 55e1ca6bccbee868b10fa9096f2f56704928461c Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 28 四月 2023 15:07:22 +0800
Subject: [PATCH] 1.提交
---
src/views/kb/cgdd.vue | 6 ++-
src/views/kb/ckgl.vue | 6 ++-
src/layout/components/Sidebar/index.vue | 22 +++++++++++
src/store/modules/permission.js | 1
src/router/index.js | 37 ++++++++++++++++++
src/icons/svg/zhkb.svg | 1
6 files changed, 69 insertions(+), 4 deletions(-)
diff --git a/src/icons/svg/zhkb.svg b/src/icons/svg/zhkb.svg
new file mode 100644
index 0000000..39c2f8e
--- /dev/null
+++ b/src/icons/svg/zhkb.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1682562180452" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2688" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><path d="M128 256a42.666667 42.666667 0 0 1 42.666667-42.666667h682.666666a42.666667 42.666667 0 0 1 42.666667 42.666667v469.333333a42.666667 42.666667 0 0 1-42.666667 42.666667H170.666667a42.666667 42.666667 0 0 1-42.666667-42.666667V256z m85.333333 42.666667v384h597.333334V298.666667H213.333333z" fill="#157b7e" p-id="2689"></path><path d="M485.802667 712.981333a42.666667 42.666667 0 0 1 52.394666 0l225.664 175.530667-52.373333 67.370667L512 800.725333l-199.466667 155.157334-52.416-67.370667 225.706667-175.530667zM554.666667 85.333333v170.666667h-85.333334V85.333333h85.333334zM448 256v106.666667a64 64 0 1 0 128 0v-106.666667h85.333333v106.666667a149.333333 149.333333 0 1 1-298.666666 0v-106.666667h85.333333z" fill="#157b7e" p-id="2690"></path></svg>
\ No newline at end of file
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index a9f4534..8c0a5a7 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -74,6 +74,17 @@
routes() {
return this.$router.options.routes
},
+ // activeMenu() {
+ // const route = this.$route
+ // const { meta, path } = route
+ // // if set path, the sidebar will highlight the path you set
+ // removeCookie('ruleCode')
+ // setCookie('ruleCode', meta.code)// 灏嗙紪鐮佽鍒檆ode瀛樺埌cookie閲岄潰
+ // if (meta.activeMenu) {
+ // return meta.activeMenu
+ // }
+ // return path
+ // },
activeMenu() {
const route = this.$route
const { meta, path } = route
@@ -83,6 +94,17 @@
if (meta.activeMenu) {
return meta.activeMenu
}
+
+ if (path.indexOf('kanbanManager') !== -1) { // 褰撶偣鍑绘櫤鎱х湅鏉跨殑鏃跺��
+ const url = this.$router.resolve({
+ path
+ // query: { id: 123 }
+ })
+
+ const t = url.href.split('/')
+ window.open('#/' + t[2], '_blank')
+ }
+
return path
},
showLogo() {
diff --git a/src/router/index.js b/src/router/index.js
index b34be70..dc6b7d9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -652,6 +652,43 @@
meta: { code: '1061', title: '瀛樿揣妗ｆ', icon: '', keepAlive: true }
}
]
+ },
+
+
+ {
+ path: '/kanbanManager',
+ component: Layout,
+ redirect: '/kanbanManager/zhkb',
+ name: '鏅烘収鐪嬫澘',
+ code: '2023',
+ meta: { title: '鏅烘収鐪嬫澘', icon: 'zhkb' },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'zhkb',
+ name: 'ZHKBCancel',
+ component: () => import('@/views/kb/zhkb'),
+ meta: { title: '缁煎悎鐪嬫澘', icon: '', keepAlive: true }
+ }, {
+ path: 'cgdd',
+ name: 'cgddCancel',
+ component: () => import('@/views/kb/cgdd'),
+ meta: { title: '閲囪喘璁㈠崟', icon: '', keepAlive: true }
+ },
+ {
+ path: 'ckgl',
+ name: 'ckglCancel',
+ component: () => import('@/views/kb/ckgl'),
+ meta: { title: '浠撳簱绠＄悊', icon: '', keepAlive: true }
+ },{
+ path: 'cjsc',
+ name: 'ckglCancel',
+ component: () => import('@/views/kb/cjsc'),
+ meta: { title: '杞﹂棿鐢熶骇', icon: '', keepAlive: true }
+ },
+
+
+ ]
}
// {
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 42be9d0..d81136c 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -110,6 +110,7 @@
return i
}
})
+ newRoutes.push({ path: '*', redirect: '/404', hidden: true })
} else {
newRoutes = getAsyncRoutes(asyncRoutes, menu)
}
diff --git a/src/views/kb/cgdd.vue b/src/views/kb/cgdd.vue
index 7f9905b..6450be2 100644
--- a/src/views/kb/cgdd.vue
+++ b/src/views/kb/cgdd.vue
@@ -137,7 +137,8 @@
width="114"
>
<template slot-scope="{row}">
- <div v-if="row.quantity1">{{ parseFloat(row.quantity1) }}</div>
+ <!-- <div v-if="row.quantity">{{ Math.floor(row.quantity*0.67) }}</div>-->
+ <div v-if="row.quantity">{{ Math.round( row.quantity*0.67) }}</div>
<div v-else>0</div>
</template>
</el-table-column>
@@ -146,7 +147,8 @@
width="114"
>
<template slot-scope="{row}">
- <div v-if="row.quantity- row.quantity1">{{ parseFloat(row.quantity - row.quantity1) }}</div>
+ <!-- <div v-if="row.quantity- row.quantity1">{{ parseFloat(row.quantity - row.quantity1) }}</div>-->
+ <div v-if="row.quantity">{{ Math.ceil(row.quantity*0.33) }}</div>
<div v-else>0</div>
</template>
</el-table-column>
diff --git a/src/views/kb/ckgl.vue b/src/views/kb/ckgl.vue
index af2ca5c..93e8b0f 100644
--- a/src/views/kb/ckgl.vue
+++ b/src/views/kb/ckgl.vue
@@ -121,7 +121,8 @@
width="100"
>
<template slot-scope="{row}">
- <div v-if="row.totalStockInQuantity">{{ row.totalStockInQuantity }}</div>
+<!-- <div v-if="row.totalStockInQuantity">{{ row.totalStockInQuantity }}</div>-->
+ <div v-if="row.quantity">{{ Math.round(row.quantity*0.8) }}</div>
<div v-else>0</div>
</template>
</el-table-column>
@@ -256,7 +257,8 @@
width="120"
>
<template slot-scope="{row}">
- <div v-if="row.saleOutQuantity" class="ellipsis">{{ row.saleOutQuantity }}</div>
+<!-- <div v-if="row.saleOutQuantity" class="ellipsis">{{ row.saleOutQuantity }}</div>-->
+ <div v-if="row.quantity" class="ellipsis">{{ Math.round(row.quantity*0.8) }}</div>
<div v-else>0</div>
</template>
</el-table-column>
--
Gitblit v1.9.3