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 @@
+
+ 新建
+
导出
@@ -292,31 +301,16 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
- 编辑
-
-
- 详情
-
-
- 删除
+ {{ item.name }}
@@ -330,6 +324,7 @@
v-else
:info-id="infoId"
:button-type="buttonType"
+ :button-array="buttonArray"
@close="close"
/>
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 @@
+
+ 新建
+
导出
@@ -292,31 +301,16 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
- 编辑
-
-
- 详情
-
-
- 删除
+ {{ item.name }}
@@ -330,6 +324,7 @@
v-else
:info-id="infoId"
:button-type="buttonType"
+ :button-array="buttonArray"
@close="close"
/>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+ 基本信息
+
+
+
+ {{ item }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
+
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 @@
+
+ 新建
+
导出
@@ -292,31 +301,16 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
- 编辑
-
-
- 详情
-
-
- 删除
+ {{ item.name }}
@@ -330,6 +324,7 @@
v-else
:info-id="infoId"
:button-type="buttonType"
+ :button-array="buttonArray"
@close="close"
/>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+ 基本信息
+
+
+
+ {{ item }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
-
+
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 @@
+
+ 新建
+
导出
@@ -292,31 +301,16 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
- 编辑
-
-
- 详情
-
-
- 删除
+ {{ item.name }}
@@ -330,6 +324,7 @@
v-else
:info-id="infoId"
:button-type="buttonType"
+ :button-array="buttonArray"
@close="close"
/>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+ 基本信息
+
+
+
+ {{ item }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
-
+
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 @@
+
+ 新建
+
导出
@@ -292,31 +301,16 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
- 编辑
-
-
- 详情
-
-
- 删除
+ {{ item.name }}
@@ -330,6 +324,7 @@
v-else
:info-id="infoId"
:button-type="buttonType"
+ :button-array="buttonArray"
@close="close"
/>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+ 基本信息
+
+
+
+ {{ item }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,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/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 @@
+
+ 新建
+
导出
@@ -292,31 +301,16 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
- 编辑
-
-
- 详情
-
-
- 删除
+ {{ item.name }}
@@ -330,6 +324,7 @@
v-else
:info-id="infoId"
:button-type="buttonType"
+ :button-array="buttonArray"
@close="close"
/>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+ 基本信息
+
+
+
+ {{ item }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
基本信息
-
+
{{ buttonType === '详情' ? '导出' : '提交' }}
-
+
关闭
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +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 @@
+
+ 新建
+
导出
@@ -292,31 +301,16 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
- 编辑
-
-
- 详情
-
-
- 删除
+ {{ item.name }}
@@ -330,6 +324,7 @@
v-else
:info-id="infoId"
:button-type="buttonType"
+ :button-array="buttonArray"
@close="close"
/>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+ 基本信息
+
+
+
+ {{ item }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
基本信息
-
+
{{ buttonType === '详情' ? '导出' : '提交' }}
-
+
关闭
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +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/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 @@
+
+ 新建
+
导出
@@ -292,31 +301,16 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
- 编辑
-
-
- 详情
-
-
- 删除
+ {{ item.name }}
@@ -330,6 +324,7 @@
v-else
:info-id="infoId"
:button-type="buttonType"
+ :button-array="buttonArray"
@close="close"
/>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+ 基本信息
+
+
+
+ {{ item }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
基本信息
-
+
{{ buttonType === '详情' ? '导出' : '提交' }}
-
+
关闭
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +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/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 @@
+
+ 新建
+
导出
@@ -292,31 +301,16 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
- 编辑
-
-
- 详情
-
-
- 删除
+ {{ item.name }}
@@ -330,6 +324,7 @@
v-else
:info-id="infoId"
:button-type="buttonType"
+ :button-array="buttonArray"
@close="close"
/>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+ 基本信息
+
+
+
+ {{ item }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
基本信息
-
+
{{ buttonType === '详情' ? '导出' : '提交' }}
-
+
关闭
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +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/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 @@
+
+ 新建
+
导出
@@ -292,31 +301,16 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
- 编辑
-
-
- 详情
-
-
- 删除
+ {{ item.name }}
@@ -330,6 +324,7 @@
v-else
:info-id="infoId"
:button-type="buttonType"
+ :button-array="buttonArray"
@close="close"
/>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+ 基本信息
+
+
+
+ {{ item }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
基本信息
-
+
{{ buttonType === '详情' ? '导出' : '提交' }}
-
+
关闭
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +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 @@
+
+ 新建
+
导出
@@ -292,31 +301,16 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
- 编辑
-
-
- 详情
-
-
- 删除
+ {{ item.name }}
@@ -330,6 +324,7 @@
v-else
:info-id="infoId"
:button-type="buttonType"
+ :button-array="buttonArray"
@close="close"
/>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+ 基本信息
+
+
+
+ {{ item }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
基本信息
-
+
{{ buttonType === '详情' ? '导出' : '提交' }}
-
+
关闭
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+
+
+
+
+
+
+
+
+
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 @@
+
+ 新建
+
导出
@@ -292,31 +301,16 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
- 编辑
-
-
- 详情
-
-
- 删除
+ {{ item.name }}
@@ -330,6 +324,7 @@
v-else
:info-id="infoId"
:button-type="buttonType"
+ :button-array="buttonArray"
@close="close"
/>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+ 基本信息
+
+
+
+ {{ item }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
基本信息
-
+
{{ buttonType === '详情' ? '导出' : '提交' }}
-
+
关闭
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+
+
+
+
+
+
+ 培训计划
+
+
+
+ {{ 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/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 @@
+
+ 新建
+
导出
@@ -292,31 +301,16 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
- 编辑
-
-
- 详情
-
-
- 删除
+ {{ item.name }}
@@ -330,6 +324,7 @@
v-else
:info-id="infoId"
:button-type="buttonType"
+ :button-array="buttonArray"
@close="close"
/>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+ 基本信息
+
+
+
+ {{ item }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
基本信息
-
+
{{ buttonType === '详情' ? '导出' : '提交' }}
-
+
关闭
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+
+
+
+
+
+
+ 培训计划
+
+
+
+ {{ buttonType === '详情' ? '打印' : '提交' }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
diff --git a/src/views/measure/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
new file mode 100644
index 0000000..5a4b817
--- /dev/null
+++ b/src/views/measure/train/components/notPass.vue
@@ -0,0 +1,10 @@
+
+
+
+
+
+
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 @@
+
+ 新建
+
导出
@@ -292,31 +301,16 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
- 编辑
-
-
- 详情
-
-
- 删除
+ {{ item.name }}
@@ -330,6 +324,7 @@
v-else
:info-id="infoId"
:button-type="buttonType"
+ :button-array="buttonArray"
@close="close"
/>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+ 基本信息
+
+
+
+ {{ item }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
基本信息
-
+
{{ buttonType === '详情' ? '导出' : '提交' }}
-
+
关闭
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+
+
+
+
+
+
+ 培训计划
+
+
+
+ {{ buttonType === '详情' ? '打印' : '提交' }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
diff --git a/src/views/measure/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
new file mode 100644
index 0000000..5a4b817
--- /dev/null
+++ b/src/views/measure/train/components/notPass.vue
@@ -0,0 +1,10 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/passed.vue b/src/views/measure/train/components/passed.vue
new file mode 100644
index 0000000..31cd21c
--- /dev/null
+++ b/src/views/measure/train/components/passed.vue
@@ -0,0 +1,10 @@
+
+
+
+
+
+
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 @@
+
+ 新建
+
导出
@@ -292,31 +301,16 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
- 编辑
-
-
- 详情
-
-
- 删除
+ {{ item.name }}
@@ -330,6 +324,7 @@
v-else
:info-id="infoId"
:button-type="buttonType"
+ :button-array="buttonArray"
@close="close"
/>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+ 基本信息
+
+
+
+ {{ item }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
基本信息
-
+
{{ buttonType === '详情' ? '导出' : '提交' }}
-
+
关闭
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+
+
+
+
+
+
+ 培训计划
+
+
+
+ {{ buttonType === '详情' ? '打印' : '提交' }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
diff --git a/src/views/measure/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
new file mode 100644
index 0000000..5a4b817
--- /dev/null
+++ b/src/views/measure/train/components/notPass.vue
@@ -0,0 +1,10 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/passed.vue b/src/views/measure/train/components/passed.vue
new file mode 100644
index 0000000..31cd21c
--- /dev/null
+++ b/src/views/measure/train/components/passed.vue
@@ -0,0 +1,10 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 21be0d5..fe96e36 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -70,7 +70,7 @@
{
text: '培训时间',
value: 'trainTime',
- width: '120',
+ width: '180',
},
{
text: '主管部门',
@@ -90,12 +90,12 @@
{
text: '创建时间',
value: 'createTime',
- width: '120',
+ width: '180',
},
{
text: '备注',
value: 'remark',
- width: '80',
+ width: '100',
},
])
// 搜索
@@ -305,7 +305,7 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
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 @@
+
+ 新建
+
导出
@@ -292,31 +301,16 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
- 编辑
-
-
- 详情
-
-
- 删除
+ {{ item.name }}
@@ -330,6 +324,7 @@
v-else
:info-id="infoId"
:button-type="buttonType"
+ :button-array="buttonArray"
@close="close"
/>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+ 基本信息
+
+
+
+ {{ item }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
基本信息
-
+
{{ buttonType === '详情' ? '导出' : '提交' }}
-
+
关闭
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+
+
+
+
+
+
+ 培训计划
+
+
+
+ {{ buttonType === '详情' ? '打印' : '提交' }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
diff --git a/src/views/measure/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
new file mode 100644
index 0000000..5a4b817
--- /dev/null
+++ b/src/views/measure/train/components/notPass.vue
@@ -0,0 +1,10 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/passed.vue b/src/views/measure/train/components/passed.vue
new file mode 100644
index 0000000..31cd21c
--- /dev/null
+++ b/src/views/measure/train/components/passed.vue
@@ -0,0 +1,10 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 21be0d5..fe96e36 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -70,7 +70,7 @@
{
text: '培训时间',
value: 'trainTime',
- width: '120',
+ width: '180',
},
{
text: '主管部门',
@@ -90,12 +90,12 @@
{
text: '创建时间',
value: 'createTime',
- width: '120',
+ width: '180',
},
{
text: '备注',
value: 'remark',
- width: '80',
+ width: '100',
},
])
// 搜索
@@ -305,7 +305,7 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
{{ 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/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 @@
+
+ 新建
+
导出
@@ -292,31 +301,16 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
- 编辑
-
-
- 详情
-
-
- 删除
+ {{ item.name }}
@@ -330,6 +324,7 @@
v-else
:info-id="infoId"
:button-type="buttonType"
+ :button-array="buttonArray"
@close="close"
/>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+ 基本信息
+
+
+
+ {{ item }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
基本信息
-
+
{{ buttonType === '详情' ? '导出' : '提交' }}
-
+
关闭
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+
+
+
+
+
+
+ 培训计划
+
+
+
+ {{ buttonType === '详情' ? '打印' : '提交' }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
diff --git a/src/views/measure/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
new file mode 100644
index 0000000..5a4b817
--- /dev/null
+++ b/src/views/measure/train/components/notPass.vue
@@ -0,0 +1,10 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/passed.vue b/src/views/measure/train/components/passed.vue
new file mode 100644
index 0000000..31cd21c
--- /dev/null
+++ b/src/views/measure/train/components/passed.vue
@@ -0,0 +1,10 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 21be0d5..fe96e36 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -70,7 +70,7 @@
{
text: '培训时间',
value: 'trainTime',
- width: '120',
+ width: '180',
},
{
text: '主管部门',
@@ -90,12 +90,12 @@
{
text: '创建时间',
value: 'createTime',
- width: '120',
+ width: '180',
},
{
text: '备注',
value: 'remark',
- width: '80',
+ width: '100',
},
])
// 搜索
@@ -305,7 +305,7 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
{{ buttonType === '详情' ? '打印' : '提交' }}
-
+
关闭
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index e9e46f2..1a0b003 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -42,7 +42,7 @@
{
text: '记录编号',
value: 'logNo',
- width: '160',
+ width: '180',
},
{
text: '培训名称',
@@ -52,7 +52,7 @@
{
text: '培训时间',
value: 'trainTime',
- width: '120',
+ width: '180',
},
{
text: '培训地点',
@@ -62,17 +62,17 @@
{
text: '培训学时',
value: 'trainHour',
- width: '90',
+ width: '100',
},
{
text: '培训时间',
value: 'trainPerson',
- width: '120',
+ width: '180',
},
{
text: '培训人数',
value: 'trainNumber',
- width: '90',
+ width: '100',
},
{
text: '创建时间',
@@ -260,7 +260,7 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
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 @@
+
+ 新建
+
导出
@@ -292,31 +301,16 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
- 编辑
-
-
- 详情
-
-
- 删除
+ {{ item.name }}
@@ -330,6 +324,7 @@
v-else
:info-id="infoId"
:button-type="buttonType"
+ :button-array="buttonArray"
@close="close"
/>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+ 基本信息
+
+
+
+ {{ item }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
基本信息
-
+
{{ buttonType === '详情' ? '导出' : '提交' }}
-
+
关闭
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+
+
+
+
+
+
+ 培训计划
+
+
+
+ {{ buttonType === '详情' ? '打印' : '提交' }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
diff --git a/src/views/measure/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
new file mode 100644
index 0000000..5a4b817
--- /dev/null
+++ b/src/views/measure/train/components/notPass.vue
@@ -0,0 +1,10 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/passed.vue b/src/views/measure/train/components/passed.vue
new file mode 100644
index 0000000..31cd21c
--- /dev/null
+++ b/src/views/measure/train/components/passed.vue
@@ -0,0 +1,10 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 21be0d5..fe96e36 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -70,7 +70,7 @@
{
text: '培训时间',
value: 'trainTime',
- width: '120',
+ width: '180',
},
{
text: '主管部门',
@@ -90,12 +90,12 @@
{
text: '创建时间',
value: 'createTime',
- width: '120',
+ width: '180',
},
{
text: '备注',
value: 'remark',
- width: '80',
+ width: '100',
},
])
// 搜索
@@ -305,7 +305,7 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
{{ buttonType === '详情' ? '打印' : '提交' }}
-
+
关闭
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index e9e46f2..1a0b003 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -42,7 +42,7 @@
{
text: '记录编号',
value: 'logNo',
- width: '160',
+ width: '180',
},
{
text: '培训名称',
@@ -52,7 +52,7 @@
{
text: '培训时间',
value: 'trainTime',
- width: '120',
+ width: '180',
},
{
text: '培训地点',
@@ -62,17 +62,17 @@
{
text: '培训学时',
value: 'trainHour',
- width: '90',
+ width: '100',
},
{
text: '培训时间',
value: 'trainPerson',
- width: '120',
+ width: '180',
},
{
text: '培训人数',
value: 'trainNumber',
- width: '90',
+ width: '100',
},
{
text: '创建时间',
@@ -260,7 +260,7 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
{{ 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/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 @@
+
+ 新建
+
导出
@@ -292,31 +301,16 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
- 编辑
-
-
- 详情
-
-
- 删除
+ {{ item.name }}
@@ -330,6 +324,7 @@
v-else
:info-id="infoId"
:button-type="buttonType"
+ :button-array="buttonArray"
@close="close"
/>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+ 基本信息
+
+
+
+ {{ item }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
+
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
-
+
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
基本信息
-
+
{{ buttonType === '详情' ? '导出' : '提交' }}
-
+
关闭
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+
+
+
+
+
+
+ 培训计划
+
+
+
+ {{ buttonType === '详情' ? '打印' : '提交' }}
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 人员信息
+
+
+
+ 删除行
+
+
+ 增加行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成
+
+
+
+
+
diff --git a/src/views/measure/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
new file mode 100644
index 0000000..5a4b817
--- /dev/null
+++ b/src/views/measure/train/components/notPass.vue
@@ -0,0 +1,10 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/components/passed.vue b/src/views/measure/train/components/passed.vue
new file mode 100644
index 0000000..31cd21c
--- /dev/null
+++ b/src/views/measure/train/components/passed.vue
@@ -0,0 +1,10 @@
+
+
+
+
+
+
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 21be0d5..fe96e36 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -70,7 +70,7 @@
{
text: '培训时间',
value: 'trainTime',
- width: '120',
+ width: '180',
},
{
text: '主管部门',
@@ -90,12 +90,12 @@
{
text: '创建时间',
value: 'createTime',
- width: '120',
+ width: '180',
},
{
text: '备注',
value: 'remark',
- width: '80',
+ width: '100',
},
])
// 搜索
@@ -305,7 +305,7 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
{{ buttonType === '详情' ? '打印' : '提交' }}
-
+
关闭
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index e9e46f2..1a0b003 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -42,7 +42,7 @@
{
text: '记录编号',
value: 'logNo',
- width: '160',
+ width: '180',
},
{
text: '培训名称',
@@ -52,7 +52,7 @@
{
text: '培训时间',
value: 'trainTime',
- width: '120',
+ width: '180',
},
{
text: '培训地点',
@@ -62,17 +62,17 @@
{
text: '培训学时',
value: 'trainHour',
- width: '90',
+ width: '100',
},
{
text: '培训时间',
value: 'trainPerson',
- width: '120',
+ width: '180',
},
{
text: '培训人数',
value: 'trainNumber',
- width: '90',
+ width: '100',
},
{
text: '创建时间',
@@ -260,7 +260,7 @@
:list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
>
-
+
{{ buttonType === '详情' ? '打印' : '提交' }}
-
+
关闭
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index 3c8f0f4..abc147d 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -1,3 +1,55 @@
+
+
- 培训计划审批
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+