- {{ pageData.configer }}
{
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;
diff --git a/src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue b/src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue
index ca8c3e4..cde58cc 100644
--- a/src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue
+++ b/src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue
@@ -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
diff --git a/src/views/securityManagement/examManagement/index.vue b/src/views/securityManagement/examManagement/index.vue
index 2005156..3f669da 100644
--- a/src/views/securityManagement/examManagement/index.vue
+++ b/src/views/securityManagement/examManagement/index.vue
@@ -64,7 +64,7 @@ const searchConfiger = ref([
]);
const pageData = reactive({
- tableData: [{}],
+ tableData: [],
keyCount: 0,
tableConfiger: {
rowHieght: 61,
diff --git a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue
index 165725c..1c75763 100644
--- a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue
+++ b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue
@@ -9,9 +9,9 @@
-
+
+
+
@@ -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");
diff --git a/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue
index 9d9440e..bbcd80e 100644
--- a/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue
+++ b/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue
@@ -81,7 +81,7 @@ const searchConfiger = ref([
]);
const pageData = reactive({
- tableData: [{}],
+ tableData: [],
keyCount: 0,
tableConfiger: {
rowHieght: 61,
diff --git a/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue b/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue
index d31e775..0577a4f 100644
--- a/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue
+++ b/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue
@@ -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 = '新增从业人员'
diff --git a/src/views/securityManagement/trainingManagement/personnelTraining/index.vue b/src/views/securityManagement/trainingManagement/personnelTraining/index.vue
index 72bd688..c8b07f5 100644
--- a/src/views/securityManagement/trainingManagement/personnelTraining/index.vue
+++ b/src/views/securityManagement/trainingManagement/personnelTraining/index.vue
@@ -87,7 +87,7 @@ const pageData = reactive({
},
total: 0,
pageConfiger: {
- sfcjpx: 0, // 是否参加培训
+ sfxxpx: '02', // 是否参加培训
pageSize: 20,
pageCurrent: 1
},
diff --git a/src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue b/src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue
index 8364786..a6b3f71 100644
--- a/src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue
+++ b/src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue
@@ -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");
diff --git a/src/views/securityManagement/trainingManagement/trainer/index.vue b/src/views/securityManagement/trainingManagement/trainer/index.vue
index 29f1024..34887b0 100644
--- a/src/views/securityManagement/trainingManagement/trainer/index.vue
+++ b/src/views/securityManagement/trainingManagement/trainer/index.vue
@@ -20,7 +20,7 @@