maojiacai/ba_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://61.139.16.27:26684/maojiacai/ba_web

Browse Source
This commit is contained in:
Esacpe
2025-09-26 11:42:22 +08:00
parent afac62ec5f 17b462e737
commit b3afb8096c
18 changed files with 142 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/aboutTable/FormMessage.vue
View File

@ -46,7 +46,7 @@
<el-date-picker v-else-if="item.type === 'daterange'" v-model="searchObj[item.prop]" type="daterange"
unlink-panels :range-separator="item.rangeSeparator" :start-placeholder="item.startPlaceholder"
:end-placeholder="item.endPlaceholder" :shortcuts="item.shortcuts" value-format="YYYY-MM-DD" />
<el-date-picker v-else-if="item.type == 'datetime'" v-model="searchObj[item.prop]" type="datetime"
<el-date-picker v-else-if="item.type == 'datetime'" v-model="searchObj[item?.prop]" type="datetime"
value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择时间" />
<el-date-picker v-else-if="item.type === 'date'" v-model="searchObj[item.prop]" type="date"
:placeholder="item.placeholder" :shortcuts="item.shortcuts" value-format="YYYY-MM-DD">
@ -150,7 +150,7 @@ const handleNum = (val) => {
watch(() => props.modelValue, (newVal) => {
listQuery.value = newVal; //赋值
console.log(newVal,'===newVal');
}, { immediate: true, deep: true });
watch(() => listQuery.value, (newVal) => {

1
src/components/aboutTable/Pages.vue
View File

@ -8,7 +8,6 @@
-->
<template>
<div class="fenye" :style="{ top: tableHeight + 'px' }">
{{ pageData.configer }}
<el-pagination
:current-page="
pageData.configer.currentPage ||

21
src/views/login/oatuh_login.vue
View File

@ -3,25 +3,23 @@
<script setup>
import { ref, onMounted } from "vue";
import { useStore } from "vuex";
import { useRouter,useRoute } from "vue-router";
import {
setItem,
getItem,
removeItem
} from "@/utils/storage";
import { useRouter, useRoute } from "vue-router";
import { setItem, getItem, removeItem } from "@/utils/storage";
const loginDialog = ref(false);
const deptList = ref([]);
const url = ref("/");
const store = useStore();
const router = useRouter();
function redirectAuth() {
// 从路由参数中获取token
const route = useRoute();
let token = route.query.token || null;
url.value = route.query.url || "/";
if (token != null) {
token = token.replace(/\ +/g, "");
setItem("SSOTOKEN", token)
handleLogin({ token: token});
setItem("SSOTOKEN", token);
handleLogin({ token: token });
} else {
window.location.href = `http://155.240.22.188:9020`;
}
@ -29,14 +27,9 @@ function redirectAuth() {
const handleLogin = (e) => {
store.dispatch("user/oatuhLogin", e).then((res) => {
const FounderUrl = getItem("FounderUrl") || '/';
console.log(FounderUrl,"FounderUrl");
// 登录后操作
if (res.deptList.length === 1) {
// window.location.href = FounderUrl
removeItem("FounderUrl");
router.push(FounderUrl);
router.push(url.value);
} else {
deptList.value = [...res.deptList];
loginDialog.value = true;

13
src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue
View File

@ -56,6 +56,12 @@ const rules = {
const open = (row = {}, type = 'updata') => {
visible.value = true
disabled.value = false
const fieldsToSplit = ['kszp'];
fieldsToSplit.forEach(field => {
row[field] = typeof row[field] === 'string' ? row[field].split(',') : [];
});
formData.value = { ...row }
if (type === 'updata') {
title.value = '上传成绩'
@ -71,11 +77,14 @@ const handleClose = () => {
}
const handleSubmit = async () => {
let params = { ...formData.value }
params.kszp = params.kszp ? params.kszp.join(','):''
try {
loading.value = true
await FormRef.value.submit(async () => {
const { pxryid = "" } = formData.value
await qcckPost({ ...formData.value, pxryid }, `mosty/base/baxx/pxry/lrcj`)
const { pxryid = "" } = params
await qcckPost({ ...params, pxryid }, `mosty/base/baxx/pxry/lrcj`)
proxy.$message.success('上传成绩成功')
emits('refresh')
visible.value = false

2
src/views/securityManagement/examManagement/index.vue
View File

@ -64,7 +64,7 @@ const searchConfiger = ref([
]);
const pageData = reactive({
tableData: [{}],
tableData: [],
keyCount: 0,
tableConfiger: {
rowHieght: 61,

27
src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue
View File

@ -9,9 +9,9 @@
</div>
<div class="cntinfo">
<FormMessage ref="FormRef" :disabled="disabled" v-model="formData" :rules="rules" :formList="formList" :labelWidth='120'>
<!-- <template #xtCjsj>
<el-input v-model="formData.xtCjsj" placeholder="请输入申请时间" />
</template> -->
<template #xtCjsj>
<el-date-picker type="datetime" v-model="formData.xtCjsj" placeholder="请输入申请时间" />
</template>
</FormMessage>
</div>
</div>
@ -60,7 +60,7 @@ const formList = reactive([
],
[
{ label: "居住地址", prop: "jzdz", type: "input" },
{ label: "申请时间", prop: "xtCjsj", type: "date" },
{ label: "申请时间", prop: "xtCjsj", type: "slot" },
{ label: "岗位", prop: "gw", type: "select", options: D_BAXX_GWLX },
],
[
@ -131,6 +131,14 @@ const close = () => {
const open = (row = {}, type = 'add') => {
disabled.value = false
dialogVisible.value = true
const fieldsToSplit = ['ryzpzm', 'ryzpfm', 'tjbg', 'wfzzmjl'];
fieldsToSplit.forEach(field => {
row[field] = typeof row[field] === 'string'
? row[field].split(',')
: row[field];
});
formData.value = { ...row }
if (type === 'add') {
title.value = '新增申请人员'
@ -147,7 +155,16 @@ const save = () => {
FormRef.value.submit(() => {
loading.value = true;
const url = !formData.value?.id ? `/mosty-base/baxx/basq/add` : `/mosty-base/baxx/basq/edit`;
qcckPost(formData.value, url).then(() => {
const params = { ...formData.value }
const fieldsToSplit = ['ryzpzm', 'ryzpfm', 'tjbg', 'wfzzmjl'];
fieldsToSplit.forEach(field => {
params[field] = params[field]
? params[field].join(',')
: '';
});
qcckPost(params, url).then(() => {
loading.value = false;
proxy.$message.success("保存成功");
emits("refresh");

2
src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue
View File

@ -81,7 +81,7 @@ const searchConfiger = ref([
]);
const pageData = reactive({
tableData: [{}],
tableData: [],
keyCount: 0,
tableConfiger: {
rowHieght: 61,

10
src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue
View File

@ -89,8 +89,14 @@ const close = () => {
const open = (row = {}, type = 'add') => {
dialogVisible.value = true
disabled.value = false
row.tp = row.tp ? row.tp.split(','):[]
row.bazzp = row.bazzp ? row.bazzp.split(','):[]
const fieldsToSplit = ['tp', 'bazzp'];
fieldsToSplit.forEach(field => {
row[field] = typeof row[field] === 'string'
? row[field].split(',')
: row[field];
});
formData.value = { ...row }
if (type === 'add') {
title.value = '新增从业人员'

2
src/views/securityManagement/trainingManagement/personnelTraining/index.vue
View File

@ -87,7 +87,7 @@ const pageData = reactive({
},
total: 0,
pageConfiger: {
sfcjpx: 0, // 是否参加培训
sfxxpx: '02', // 是否参加培训
pageSize: 20,
pageCurrent: 1
},

18
src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue
View File

@ -99,6 +99,14 @@ const close = () => {
const open = (row = {}, type = 'add') => {
disabled.value = false
dialogVisible.value = true
const fieldsToSplit = ['sfzzm', 'sfzfm', 'tjbg', 'fzjlzm'];
fieldsToSplit.forEach(field => {
row[field] = typeof row[field] === 'string'
? row[field].split(',')
: [];
});
formData.value = { ...row }
if (type === 'add') {
title.value = '新增从业人员'
@ -111,10 +119,18 @@ const open = (row = {}, type = 'add') => {
}
const save = () => {
const params = { ...formData.value }
const fieldsToSplit = ['sfzzm', 'sfzfm', 'tjbg', 'fzjlzm'];
fieldsToSplit.forEach(field => {
params[field] = params[field]
? params[field].join(',')
: '';
});
FormRef.value.submit(() => {
loading.value = true;
const url = !formData.value?.id ? `/mosty-base/baxx/cyry/add` : `/mosty-base/baxx/cyry/edit`;
qcckPost(formData.value, url).then(() => {
qcckPost(params, url).then(() => {
loading.value = false;
proxy.$message.success("保存成功");
emits("refresh");

24
src/views/securityManagement/trainingManagement/trainer/index.vue
View File

@ -20,7 +20,7 @@
</template>
<!-- 操作 -->
<template #controls="{ row }">
<el-link type="success">提交培训</el-link>
<el-link type="success" @click="handleSubmitTraining(row)">提交培训</el-link>
<el-link type="danger" @click="handleDelete([row.id])">删除</el-link>
<el-link type="primary" @click="addEdit('view', row)">详情</el-link>
</template>
@ -73,7 +73,7 @@ const searchConfiger = ref([
]);
const pageData = reactive({
tableData: [{}],
tableData: [],
keyCount: 0,
tableConfiger: {
rowHieght: 61,
@ -119,7 +119,8 @@ const getList = async () => {
pageData.tableConfiger.loading = true;
const res = await qcckPost({
...pageData.pageConfiger,
...queryFrom.value
...queryFrom.value,
sfxxpx: '01'
}, `/mosty-base/baxx/pxry/page`)
if(res) {
@ -131,6 +132,23 @@ const getList = async () => {
}
}
// 提交培训
const handleSubmitTraining = async (row) => {
await proxy.$modal.confirm("是否确认提交该人员进行待培训？")
try {
await qcckPost({
...row,
sfxxpx: '02'
}, "/mosty-base/baxx/pxry/edit")
proxy.$modal.msgSuccess("提交培训成功");
await getList();
} catch (error) {
proxy.$modal.msgError("提交培训失败");
console.log(error)
}
};
// 删除
const handleDelete = async (ids) => {
await proxy.$modal.confirm("是否确认删除该培训人员？")

1
src/views/securityManagement/trainingManagement/trainingProject/components/prejectDetailsDialog.vue
View File

@ -51,7 +51,6 @@
import { ref, computed, reactive, getCurrentInstance } from 'vue'
import { qcckPost } from "@/api/qcckApi.js";
import MyTable from '@/components/aboutTable/MyTable.vue';
import Pages from "@/components/aboutTable/Pages.vue"
import Upload from "@/components/MyComponents/Upload/index.vue"
const { proxy } = getCurrentInstance()

1
src/views/securityManagement/trainingManagement/trainingProject/components/selectPersonnelDialog.vue
View File

@ -73,6 +73,7 @@ const pageData = reactive({
total: 0,
tableHeight: 300,
pageConfiger: {
sfxxpx: '02',
pageSize: 10,
pageCurrent: 1
},

56
src/views/securityManagement/trainingManagement/trainingProject/components/viewProjectDetailsDialog.vue
View File

@ -9,7 +9,9 @@
</div>
<div class="cntinfo">
<form-message ref="formRef" v-model="formData" :rules="rules" :formList="formList" label-width="120px">
<template #kskssj>
<el-date-picker v-model="formData.kskssj" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="考试时间" style="width: 100%;" />
</template>
</form-message>
<div class="table-title" @click="hanbleClickSelect">考试人员 <el-icon size="20px" style="top: 4px;" color="green"><CirclePlusFilled /></el-icon> </div>
<MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn"
@ -17,17 +19,17 @@
>
<!-- 操作 -->
<template #controls="{ row }">
<el-link type="warning" @click="addEdit('updata', row)">删除</el-link>
<el-link type="warning" @click="handleDelItem(row)">删除</el-link>
</template>
</MyTable>
</div>
<select-personnel-dialog ref="selectPersonnelRef" v-model="visible" @change="handleChange" />
<select-personnel-dialog ref="selectPersonnelRef" :default-select-keys="defaultSelectKeys" v-model="visible" @change="handleChange" />
</div>
</template>
<script setup>
import { ref, computed, reactive, getCurrentInstance } from 'vue'
import { ref, computed, reactive, getCurrentInstance, nextTick } from 'vue'
import { qcckPost } from "@/api/qcckApi.js";
import FormMessage from "@/components/aboutTable/FormMessage.vue";
import MyTable from '@/components/aboutTable/MyTable.vue';
@ -40,7 +42,6 @@ const loading = ref(false)
const disabled = ref(false)
const formRef = ref(null)
const visible = ref(false)
const viewAndUploadRef = ref(null)
const props = defineProps({
modelValue: {
@ -87,10 +88,14 @@ const pageData = reactive({
]
});
const defaultSelectKeys = computed(() => {
return pageData.tableData?.map(i => i.id)
})
const formList = reactive([
[
{ label: "培训项目名称", prop: "xmmc", type: "input" },
{ label: "考试时间", prop: "kskssj", type: "date"},
{ label: "考试时间", prop: "kskssj", type: "slot" },
],
[
{ label: "考试辖区", prop: "ksxq", type: "input" },
@ -112,25 +117,42 @@ const rules = {
const formData = ref({})
const close = () => {
formRef.value.reset()
pageData.tableData = []
dialogVisible.value = false
}
const open = (row = {}) => {
disabled.value = false
dialogVisible.value = true
formData.value = { ...row }
title.value = '保安考试申请'
nextTick(() => {
disabled.value = false
dialogVisible.value = true
formData.value = { ...row }
title.value = '保安考试申请'
})
}
const handleDelItem = (row) => {
const index = pageData.tableData.findIndex(item => item.id === row.id)
pageData.tableData.splice(index, 1)
}
const save = () => {
if (pageData.tableData.length === 0) return proxy.$message.warning('请选择考试人员')
const { ksdz, ksfs, kskssj, ksxq, id } = formData.value
formRef.value.submit(() => {
loading.value = true;
qcckPost(formData.value, `mosty-base/baxx/pxxm/sqks`).then(() => {
loading.value = false;
proxy.$message.success("申请考试成功");
emits("refresh");
close();
qcckPost({ ksdz, ksfs, kskssj, ksxq, id }, `mosty-base/baxx/pxxm/sqks`).then(() => {
qcckPost({
...formData.value,
ksryList: pageData.tableData,
kssj: `${formData.value?.jssj} 00:00:00`
}, `mosty-base/baxx/ksgl/add`).then(() => {
loading.value = false;
proxy.$message.success("申请考试成功");
emits("refresh");
close();
})
}).catch(() => {
loading.value = false;
})
@ -146,10 +168,6 @@ const handleChange = (val) => {
pageData.tableData = [...pageData.tableData, ...val]?.filter((i, index, arr) => arr?.findIndex(s => i?.id === s?.id) === index)
}
const addEdit = (type, row) => {
viewAndUploadRef.value?.open(row, type)
}
defineExpose({ open })
</script>

9
src/views/securityManagement/unitInformation/components/viewDetailsDialog.vue
View File

@ -114,6 +114,15 @@ const close = () => {
const open = (row = {}, type = 'add') => {
disabled.value = false
dialogVisible.value = true
// 统一处理所有需拆分的字段
const fieldsToSplit = ['cszp', 'frSfzZm', 'frSfzFm', 'fzrSfzZm', 'fzrSfzFm', 'yyzzzp', 'jyxkz'];
fieldsToSplit.forEach(field => {
row[field] = typeof row[field] === 'string'
? row[field].split(',')
: row[field];
});
formData.value = { ...row }
if (type === 'view') {
title.value = '查看详情'

2
src/views/securityManagement/unitInformation/index.vue
View File

@ -44,7 +44,7 @@ const detailsRef = ref(null);
const D_BZ_BXDLX = ref([]);
const pageData = reactive({
tableData: [{}],
tableData: [],
keyCount: 0,
tableConfiger: {
rowHieght: 61,