diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue index c8465cc..cb6d856 100644 --- a/src/views/measure/bench/bench.vue +++ b/src/views/measure/bench/bench.vue @@ -5,6 +5,8 @@ import { listPageApi } from '@/api/measure/file' import Echarts from '@/components/echarts/index.vue' import EchartsPie from '@/components/echarts/pie.vue' +import useUserStore from '@/store/modules/user' +const { username } = useUserStore() const buttomTypes = ref([ { id: '1', text: '培训记录', url: '/train/trainLog' }, { id: '2', text: '证书到期提醒', url: '/person/remind' }, @@ -63,7 +65,7 @@ StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count)) }) const param = { - account: localStorage.getItem('login_username'), + account: username, } getTrainLogSStatistic(param).then((res) => { TrainLogSList.value = [ diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue index c8465cc..cb6d856 100644 --- a/src/views/measure/bench/bench.vue +++ b/src/views/measure/bench/bench.vue @@ -5,6 +5,8 @@ import { listPageApi } from '@/api/measure/file' import Echarts from '@/components/echarts/index.vue' import EchartsPie from '@/components/echarts/pie.vue' +import useUserStore from '@/store/modules/user' +const { username } = useUserStore() const buttomTypes = ref([ { id: '1', text: '培训记录', url: '/train/trainLog' }, { id: '2', text: '证书到期提醒', url: '/person/remind' }, @@ -63,7 +65,7 @@ StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count)) }) const param = { - account: localStorage.getItem('login_username'), + account: username, } getTrainLogSStatistic(param).then((res) => { TrainLogSList.value = [ diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue index 2e0c9b4..eaea4a5 100644 --- a/src/views/measure/price/priceAdd.vue +++ b/src/views/measure/price/priceAdd.vue @@ -154,10 +154,10 @@ 基本信息
- + {{ buttonType === '详情' ? '打印' : '提交' }} - + 关闭
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue index c8465cc..cb6d856 100644 --- a/src/views/measure/bench/bench.vue +++ b/src/views/measure/bench/bench.vue @@ -5,6 +5,8 @@ import { listPageApi } from '@/api/measure/file' import Echarts from '@/components/echarts/index.vue' import EchartsPie from '@/components/echarts/pie.vue' +import useUserStore from '@/store/modules/user' +const { username } = useUserStore() const buttomTypes = ref([ { id: '1', text: '培训记录', url: '/train/trainLog' }, { id: '2', text: '证书到期提醒', url: '/person/remind' }, @@ -63,7 +65,7 @@ StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count)) }) const param = { - account: localStorage.getItem('login_username'), + account: username, } getTrainLogSStatistic(param).then((res) => { TrainLogSList.value = [ diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue index 2e0c9b4..eaea4a5 100644 --- a/src/views/measure/price/priceAdd.vue +++ b/src/views/measure/price/priceAdd.vue @@ -154,10 +154,10 @@ 基本信息
- + {{ buttonType === '详情' ? '打印' : '提交' }} - + 关闭
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue index 7a5e9cd..d124307 100644 --- a/src/views/measure/source/components/all.vue +++ b/src/views/measure/source/components/all.vue @@ -1,8 +1,17 @@ diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue index c8465cc..cb6d856 100644 --- a/src/views/measure/bench/bench.vue +++ b/src/views/measure/bench/bench.vue @@ -5,6 +5,8 @@ import { listPageApi } from '@/api/measure/file' import Echarts from '@/components/echarts/index.vue' import EchartsPie from '@/components/echarts/pie.vue' +import useUserStore from '@/store/modules/user' +const { username } = useUserStore() const buttomTypes = ref([ { id: '1', text: '培训记录', url: '/train/trainLog' }, { id: '2', text: '证书到期提醒', url: '/person/remind' }, @@ -63,7 +65,7 @@ StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count)) }) const param = { - account: localStorage.getItem('login_username'), + account: username, } getTrainLogSStatistic(param).then((res) => { TrainLogSList.value = [ diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue index 2e0c9b4..eaea4a5 100644 --- a/src/views/measure/price/priceAdd.vue +++ b/src/views/measure/price/priceAdd.vue @@ -154,10 +154,10 @@ 基本信息
- + {{ buttonType === '详情' ? '打印' : '提交' }} - + 关闭
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue index 7a5e9cd..d124307 100644 --- a/src/views/measure/source/components/all.vue +++ b/src/views/measure/source/components/all.vue @@ -1,8 +1,17 @@ diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue index c3ebb16..8a7a8bc 100644 --- a/src/views/measure/source/components/approvalPending.vue +++ b/src/views/measure/source/components/approvalPending.vue @@ -1,8 +1,16 @@ diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue index c8465cc..cb6d856 100644 --- a/src/views/measure/bench/bench.vue +++ b/src/views/measure/bench/bench.vue @@ -5,6 +5,8 @@ import { listPageApi } from '@/api/measure/file' import Echarts from '@/components/echarts/index.vue' import EchartsPie from '@/components/echarts/pie.vue' +import useUserStore from '@/store/modules/user' +const { username } = useUserStore() const buttomTypes = ref([ { id: '1', text: '培训记录', url: '/train/trainLog' }, { id: '2', text: '证书到期提醒', url: '/person/remind' }, @@ -63,7 +65,7 @@ StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count)) }) const param = { - account: localStorage.getItem('login_username'), + account: username, } getTrainLogSStatistic(param).then((res) => { TrainLogSList.value = [ diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue index 2e0c9b4..eaea4a5 100644 --- a/src/views/measure/price/priceAdd.vue +++ b/src/views/measure/price/priceAdd.vue @@ -154,10 +154,10 @@ 基本信息
- + {{ buttonType === '详情' ? '打印' : '提交' }} - + 关闭
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue index 7a5e9cd..d124307 100644 --- a/src/views/measure/source/components/all.vue +++ b/src/views/measure/source/components/all.vue @@ -1,8 +1,17 @@ diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue index c3ebb16..8a7a8bc 100644 --- a/src/views/measure/source/components/approvalPending.vue +++ b/src/views/measure/source/components/approvalPending.vue @@ -1,8 +1,16 @@ diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue index 2ee9818..3b9657c 100644 --- a/src/views/measure/source/components/canceled.vue +++ b/src/views/measure/source/components/canceled.vue @@ -1,8 +1,15 @@ diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue index c8465cc..cb6d856 100644 --- a/src/views/measure/bench/bench.vue +++ b/src/views/measure/bench/bench.vue @@ -5,6 +5,8 @@ import { listPageApi } from '@/api/measure/file' import Echarts from '@/components/echarts/index.vue' import EchartsPie from '@/components/echarts/pie.vue' +import useUserStore from '@/store/modules/user' +const { username } = useUserStore() const buttomTypes = ref([ { id: '1', text: '培训记录', url: '/train/trainLog' }, { id: '2', text: '证书到期提醒', url: '/person/remind' }, @@ -63,7 +65,7 @@ StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count)) }) const param = { - account: localStorage.getItem('login_username'), + account: username, } getTrainLogSStatistic(param).then((res) => { TrainLogSList.value = [ diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue index 2e0c9b4..eaea4a5 100644 --- a/src/views/measure/price/priceAdd.vue +++ b/src/views/measure/price/priceAdd.vue @@ -154,10 +154,10 @@ 基本信息
- + {{ buttonType === '详情' ? '打印' : '提交' }} - + 关闭
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue index 7a5e9cd..d124307 100644 --- a/src/views/measure/source/components/all.vue +++ b/src/views/measure/source/components/all.vue @@ -1,8 +1,17 @@ diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue index c3ebb16..8a7a8bc 100644 --- a/src/views/measure/source/components/approvalPending.vue +++ b/src/views/measure/source/components/approvalPending.vue @@ -1,8 +1,16 @@ diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue index 2ee9818..3b9657c 100644 --- a/src/views/measure/source/components/canceled.vue +++ b/src/views/measure/source/components/canceled.vue @@ -1,8 +1,15 @@ diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue index cac05fc..43d7b75 100644 --- a/src/views/measure/source/components/draftBox.vue +++ b/src/views/measure/source/components/draftBox.vue @@ -1,8 +1,15 @@ diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue index c8465cc..cb6d856 100644 --- a/src/views/measure/bench/bench.vue +++ b/src/views/measure/bench/bench.vue @@ -5,6 +5,8 @@ import { listPageApi } from '@/api/measure/file' import Echarts from '@/components/echarts/index.vue' import EchartsPie from '@/components/echarts/pie.vue' +import useUserStore from '@/store/modules/user' +const { username } = useUserStore() const buttomTypes = ref([ { id: '1', text: '培训记录', url: '/train/trainLog' }, { id: '2', text: '证书到期提醒', url: '/person/remind' }, @@ -63,7 +65,7 @@ StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count)) }) const param = { - account: localStorage.getItem('login_username'), + account: username, } getTrainLogSStatistic(param).then((res) => { TrainLogSList.value = [ diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue index 2e0c9b4..eaea4a5 100644 --- a/src/views/measure/price/priceAdd.vue +++ b/src/views/measure/price/priceAdd.vue @@ -154,10 +154,10 @@ 基本信息
- + {{ buttonType === '详情' ? '打印' : '提交' }} - + 关闭
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue index 7a5e9cd..d124307 100644 --- a/src/views/measure/source/components/all.vue +++ b/src/views/measure/source/components/all.vue @@ -1,8 +1,17 @@ diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue index c3ebb16..8a7a8bc 100644 --- a/src/views/measure/source/components/approvalPending.vue +++ b/src/views/measure/source/components/approvalPending.vue @@ -1,8 +1,16 @@ diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue index 2ee9818..3b9657c 100644 --- a/src/views/measure/source/components/canceled.vue +++ b/src/views/measure/source/components/canceled.vue @@ -1,8 +1,15 @@ diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue index cac05fc..43d7b75 100644 --- a/src/views/measure/source/components/draftBox.vue +++ b/src/views/measure/source/components/draftBox.vue @@ -1,8 +1,15 @@ diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue index ec6232b..c13f95a 100644 --- a/src/views/measure/source/components/examineAndApprove.vue +++ b/src/views/measure/source/components/examineAndApprove.vue @@ -1,8 +1,17 @@ diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue index c8465cc..cb6d856 100644 --- a/src/views/measure/bench/bench.vue +++ b/src/views/measure/bench/bench.vue @@ -5,6 +5,8 @@ import { listPageApi } from '@/api/measure/file' import Echarts from '@/components/echarts/index.vue' import EchartsPie from '@/components/echarts/pie.vue' +import useUserStore from '@/store/modules/user' +const { username } = useUserStore() const buttomTypes = ref([ { id: '1', text: '培训记录', url: '/train/trainLog' }, { id: '2', text: '证书到期提醒', url: '/person/remind' }, @@ -63,7 +65,7 @@ StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count)) }) const param = { - account: localStorage.getItem('login_username'), + account: username, } getTrainLogSStatistic(param).then((res) => { TrainLogSList.value = [ diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue index 2e0c9b4..eaea4a5 100644 --- a/src/views/measure/price/priceAdd.vue +++ b/src/views/measure/price/priceAdd.vue @@ -154,10 +154,10 @@ 基本信息
- + {{ buttonType === '详情' ? '打印' : '提交' }} - + 关闭
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue index 7a5e9cd..d124307 100644 --- a/src/views/measure/source/components/all.vue +++ b/src/views/measure/source/components/all.vue @@ -1,8 +1,17 @@ diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue index c3ebb16..8a7a8bc 100644 --- a/src/views/measure/source/components/approvalPending.vue +++ b/src/views/measure/source/components/approvalPending.vue @@ -1,8 +1,16 @@ diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue index 2ee9818..3b9657c 100644 --- a/src/views/measure/source/components/canceled.vue +++ b/src/views/measure/source/components/canceled.vue @@ -1,8 +1,15 @@ diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue index cac05fc..43d7b75 100644 --- a/src/views/measure/source/components/draftBox.vue +++ b/src/views/measure/source/components/draftBox.vue @@ -1,8 +1,15 @@ diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue index ec6232b..c13f95a 100644 --- a/src/views/measure/source/components/examineAndApprove.vue +++ b/src/views/measure/source/components/examineAndApprove.vue @@ -1,8 +1,17 @@ diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue index e89a838..a9c9509 100644 --- a/src/views/measure/source/components/listPage.vue +++ b/src/views/measure/source/components/listPage.vue @@ -3,7 +3,7 @@ import type { Ref } from 'vue' import { ElLoading, ElMessage, ElMessageBox } from 'element-plus' import type { IlistQuery, IlistType } from '../list_interface' -import ListSourceAdd from '../listAdd.vue' +import ListSourceAdd from './listPageAdd.vue' import { getSoucreList, getSoucreListDelete } from '@/api/system/source' import { uploadApi } from '@/api/system/notice' import { exportExcel } from '@/utils/exportXlsx' @@ -12,6 +12,10 @@ type: String, default: '全部', }, + buttoms: { + type: Array, + default: () => [], + }, }) // 查询条件 const listQuery: Ref = ref({ @@ -70,6 +74,7 @@ }, ]) +const buttonArray = ref([]) // 选中的内容 const checkoutList = ref([]) // 文件上传input @@ -100,6 +105,7 @@ } // 点击编辑/详情 const handleEdit = (index: string, row: object, value: string) => { + buttonArray.value = ['同意', '驳回', '拒绝'] buttonType.value = value infoId.value = row.id show.value = false @@ -279,6 +285,9 @@