@@ -150,14 +150,14 @@
合计申请打款金额:{{item.amount}}元
- 打款前:总实际订单金额(元):{{item.extend.before_amount}},
- 总实际已支付金额(元):{{item.extend.purchaseOrder.has_paid_amount}},
- 总实际未支付金额(元):{{ ((item.extend.before_amount * 100 - item.extend.purchaseOrder.has_paid_amount * 100) / 100).toFixed(2) }}
+ 打款前:总实际订单金额(元):{{item.extend.before_amount}},
+ 总实际已支付金额(元):{{item.extend.purchaseOrder.has_paid_amount}},
+ 总实际未支付金额(元):{{ ((item.extend.before_amount * 100 - item.extend.purchaseOrder.has_paid_amount * 100) / 100).toFixed(2) }}
- 打款后:总实际订单金额(元):{{item.extend.purchaseOrder.total_amount}},
- 总实际已支付金额(元):{{ ((item.extend.purchaseOrder.has_paid_amount * 100 + item.amount * 100) / 100).toFixed(2) }},
- 总实际未支付金额(元):{{ ((item.extend.purchaseOrder.total_amount * 100 - item.extend.purchaseOrder.has_paid_amount * 100 - item.amount * 100) / 100).toFixed(2) }}
+ 打款后:总实际订单金额(元):{{item.extend.purchaseOrder.total_amount}},
+ 总实际已支付金额(元):{{ ((item.extend.purchaseOrder.has_paid_amount * 100 + item.amount * 100) / 100).toFixed(2) }},
+ 总实际未支付金额(元):{{ ((item.extend.purchaseOrder.total_amount * 100 - item.extend.purchaseOrder.has_paid_amount * 100 - item.amount * 100) / 100).toFixed(2) }}
@@ -396,6 +396,16 @@ export default {
padding: 15px;
line-height: 30px;
margin-bottom: 20px;
+ span{
+ font-weight: 600;
+ color: #f00;
+ }
+ }
+ .sumbox{
+ span{
+ font-weight: 600;
+ color: #f00;
+ }
}
.blue{
color: #1989fa;
diff --git a/src/components/approval/order.vue b/src/components/approval/order.vue
index 1b39e50..02a3bda 100644
--- a/src/components/approval/order.vue
+++ b/src/components/approval/order.vue
@@ -202,6 +202,7 @@ import { DeleteFilled, Search } from "@element-plus/icons"
import { reactive, toRefs, watch } from 'vue'
import { get, post } from '@/api/request'
import { ElMessage, ElMessageBox } from 'element-plus'
+import { useStore } from 'vuex'
export default {
components: { DeleteFilled, Search },
@@ -322,12 +323,20 @@ export default {
ElMessage({ type: 'success', message: '操作成功' })
closeDialog()
context.emit('refresh')
+ getWaitNum()
data.btnloading = false
}).catch(() => {
data.btnloading = false
})
}
+ const $store = useStore()
+ const getWaitNum = () => {
+ get(`/api/board/waitToBeDone`).then((res) => {
+ $store.dispatch('setWaitNum', res.waitApproval)
+ })
+ }
+
function clearForm() {
data.itemInfo = {}
data.feesList = []
@@ -510,7 +519,8 @@ export default {
removeFee,
openGoods,
blurInput,
- getSumData
+ getSumData,
+ getWaitNum
}
}
}
diff --git a/src/store/index.js b/src/store/index.js
index 650d1e5..7753146 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2,79 +2,16 @@ import { createStore } from 'vuex'
export default createStore({
state: {
- msgNum: 0,
- orderNum: 0,
- noticeNum: 0,
- workNum: 0,
- tousuNum: 0,
- annNum: 0,
- orderType: '',
- orderId: '',
- workId: '',
- msgDialog: false
+ watiNum: 0
},
mutations: {
- SET_MSGNUM: (state, num) => {
- state.msgNum = num
- },
- SET_ORDERNUM: (state, num) => {
- state.orderNum = num
- },
- SET_NOTICENUM: (state, num) => {
- state.noticeNum = num
- },
- SET_WORKNUM: (state, num) => {
- state.workNum = num
- },
- SET_TOUSUNUM: (state, num) => {
- state.tousuNum = num
- },
- SET_ORDERTYPE: (state, val) => {
- state.orderType = val
- },
- SET_ORDERID: (state, val) => {
- state.orderId = val
- },
- SET_WORKID: (state, val) => {
- state.workId = val
- },
- SET_MSGDIALOG: (state, flag) => {
- state.msgDialog = flag
- },
- SET_ANNNUM: (state, num) => {
- state.annNum = num
- },
+ SET_WAITNUM: (state, num) => {
+ state.watiNum = num
+ }
},
actions: {
- setMsgNum({ commit }, num) {
- commit('SET_MSGNUM', num)
- },
- setOrderNum({ commit }, num) {
- commit('SET_ORDERNUM', num)
- },
- setNoticeNum({ commit }, num) {
- commit('SET_NOTICENUM', num)
- },
- setWorkNum({ commit }, num) {
- commit('SET_WORKNUM', num)
- },
- setTousuNum({ commit }, num) {
- commit('SET_TOUSUNUM', num)
- },
- setOrderType({ commit }, val) {
- commit('SET_ORDERTYPE', val)
- },
- setOrderId({ commit }, val) {
- commit('SET_ORDERID', val)
- },
- setWorkId({ commit }, val) {
- commit('SET_WORKID', val)
- },
- setMsgDialog({ commit }, flag) {
- commit('SET_MSGDIALOG', flag)
- },
- setAnnNum({ commit }, num) {
- commit('SET_ANNNUM', num)
+ setWaitNum({ commit }, num) {
+ commit('SET_WAITNUM', num)
}
},
modules: {
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index ae6037e..5ef861d 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -13,13 +13,11 @@ import { get } from "@/api/request"
export default {
setup() {
const data = reactive({
- numTotal: {}
+ numTotal: 0
})
const fetchData = () => {
- // get(`/api/admin/home`).then((res) => {
- // data.numTotal = res.data
- // })
+
}
onMounted(() => {
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index 987c742..ae93528 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -75,6 +75,7 @@
import { useRouter } from 'vue-router'
import { get, post } from "@/api/request"
import { ElMessage } from 'element-plus'
+ import { useStore } from 'vuex'
export default {
components: {
@@ -160,14 +161,23 @@
})
}
+ const $store = useStore()
+ const getWaitNum = () => {
+ get(`/api/board/waitToBeDone`).then((res) => {
+ $store.dispatch('setWaitNum', res.waitApproval)
+ })
+ }
+
onMounted(async () => {
data.menuData = JSON.parse(localStorage.getItem('menusList'))
+ getWaitNum()
})
return {
...toRefs(data),
handleCommand,
- commitModify
+ commitModify,
+ getWaitNum
}
}
}
diff --git a/src/views/layout/menuTree.vue b/src/views/layout/menuTree.vue
index b45c48a..e0f8286 100644
--- a/src/views/layout/menuTree.vue
+++ b/src/views/layout/menuTree.vue
@@ -4,7 +4,10 @@
-
{{menu.title}}
+
+ {{menu.title}}
+ {{ watiNum }}
+
@@ -19,12 +22,30 @@
@@ -55,4 +76,14 @@ export default {
position: relative;
z-index: 10;
}
+ .tag{
+ background-color: #f00;
+ padding: 2px 4px;
+ line-height: normal;
+ color: #fff;
+ position: relative;
+ border-radius: 5px;
+ font-size: 12px;
+ margin: -9px 0 0 2px;
+ }
\ No newline at end of file
diff --git a/src/views/purchase/approval.vue b/src/views/purchase/approval.vue
index 31571d6..04b726b 100644
--- a/src/views/purchase/approval.vue
+++ b/src/views/purchase/approval.vue
@@ -5,6 +5,14 @@
ID:
供应商名称:
@@ -233,9 +241,16 @@ export default {
allGoodsList: [],
curId: 0,
current_instance_id: 0,
- showDetail: false
+ showDetail: false,
+ goodskuList: [],
})
+ function getGoodskuList() {
+ get(`/api/all/goods`).then((res) => {
+ data.goodskuList = res.data
+ })
+ }
+
function handleSearch() {
data.page = 1
fetchData()
@@ -347,6 +362,7 @@ export default {
getWarehouseList()
getSuppliersList()
getAllGoodsList()
+ getGoodskuList()
})
return {
@@ -366,7 +382,8 @@ export default {
toBalancePayment,
openLogs,
toInvoice,
- handleView
+ handleView,
+ getGoodskuList
}
}
}
diff --git a/src/views/purchase/otherfees.vue b/src/views/purchase/otherfees.vue
index 93d2a95..a991e67 100644
--- a/src/views/purchase/otherfees.vue
+++ b/src/views/purchase/otherfees.vue
@@ -57,9 +57,9 @@
-
+
diff --git a/src/views/purchase/waitapproval.vue b/src/views/purchase/waitapproval.vue
index 1c5458d..e718190 100644
--- a/src/views/purchase/waitapproval.vue
+++ b/src/views/purchase/waitapproval.vue
@@ -36,9 +36,9 @@
-
+
@@ -123,7 +123,7 @@ import { get, post } from "@/api/request"
import { Search, Plus, Edit, ZoomIn, Delete, Stamp } from '@element-plus/icons'
import { ElMessage } from 'element-plus'
import approvalDetail from '@/components/approval/detail.vue'
-
+import { useStore } from 'vuex'
export default {
components: {
Search, Plus, Edit, ZoomIn, Delete, Stamp, approvalDetail
@@ -210,6 +210,14 @@ export default {
ElMessage.success('审批成功')
data.showDialog = false
fetchData()
+ getWaitNum()
+ })
+ }
+
+ const $store = useStore()
+ const getWaitNum = () => {
+ get(`/api/board/waitToBeDone`).then((res) => {
+ $store.dispatch('setWaitNum', res.waitApproval)
})
}
@@ -224,7 +232,8 @@ export default {
handleSizeChange,
fetchData,
toApproval,
- commitApproval
+ commitApproval,
+ getWaitNum
}
}
}