Merge branch 'master' of http://61.139.16.27:26684/maojiacai/ba_web
This commit is contained in:
@ -8,7 +8,8 @@
|
||||
:limit="props.limit"
|
||||
:action="actionUrl"
|
||||
:list-type="props.showBtn ? '' : 'picture-card'"
|
||||
:file-list="fileList" show-file-list
|
||||
:file-list="fileList"
|
||||
show-file-list
|
||||
:on-exceed="handleExceed"
|
||||
:on-success="handlerSuccess"
|
||||
:before-upload="beforeImgUpload">
|
||||
@ -52,7 +53,7 @@
|
||||
|
||||
<script setup>
|
||||
import { COMPONENT_WIDTH } from "@/constant";
|
||||
import { ref, defineProps, defineEmits, computed, watch, onMounted } from "vue";
|
||||
import { ref, defineProps, defineEmits, computed, watch, onMounted, onUnmounted } from "vue";
|
||||
import { ElMessage } from "element-plus";
|
||||
import { useStore } from "vuex";
|
||||
const props = defineProps({
|
||||
@ -79,9 +80,30 @@ const props = defineProps({
|
||||
},
|
||||
isAll: {
|
||||
type: Boolean,
|
||||
default: false //所有类型都可以用这个接口,返回的是id
|
||||
default: true //所有类型都可以用这个接口,接口返回的是id
|
||||
}
|
||||
});
|
||||
const emits = defineEmits(["update:modelValue"]);
|
||||
const store = useStore();
|
||||
const dialogImageUrl = ref("");
|
||||
const dialogVisible = ref(false);
|
||||
const disabled = ref(false);
|
||||
const headers = ref({
|
||||
Authorization: store.getters.token
|
||||
});
|
||||
const fileList = ref([]);
|
||||
|
||||
watch(() => props.modelValue,(val) => {
|
||||
let arr = val ? (Array.isArray(val) ? val :[val]): [];
|
||||
if(arr.length == 0 ) return fileList.value = [];
|
||||
fileList.value = arr.map((el) => {
|
||||
if (Object.prototype.toString.call(el) === "[object Object]") {
|
||||
return props.isAll ? { url: `/mosty-base/minio/image/download/` + el.id, name: el.name } : { url:el,name:el.name};
|
||||
} else {
|
||||
return { url: `/mosty-base/minio/image/download/` + el };
|
||||
}
|
||||
});
|
||||
},{ immediate: true,deep:true });
|
||||
|
||||
const actionUrl = computed(() => {
|
||||
if (props.isAll) {
|
||||
@ -91,8 +113,6 @@ const actionUrl = computed(() => {
|
||||
}
|
||||
});
|
||||
|
||||
const emits = defineEmits(["update:modelValue", "handleChange"]);
|
||||
|
||||
//获取后缀
|
||||
const getSuffix = (fileName) => {
|
||||
let suffix = "";
|
||||
@ -134,43 +154,18 @@ const getSuffix = (fileName) => {
|
||||
//否则返回other
|
||||
return "OTHER";
|
||||
};
|
||||
const store = useStore();
|
||||
const dialogImageUrl = ref("");
|
||||
const dialogVisible = ref(false);
|
||||
const disabled = ref(false);
|
||||
const headers = ref({
|
||||
Authorization: store.getters.token
|
||||
});
|
||||
|
||||
const fileList = ref([]);
|
||||
watch(() => props.modelValue,(val) => {
|
||||
let arr = val ? (Array.isArray(val) ? val :[val]): [];
|
||||
if (arr.length > 0) {
|
||||
fileList.value = arr.map((el) => {
|
||||
if (Object.prototype.toString.call(el) === "[object Object]") {
|
||||
return { url: `/mosty-base/minio/image/download/` + el, name: el.name};
|
||||
} else {
|
||||
return { url: `/mosty-base/minio/image/download/` + el };
|
||||
}
|
||||
});
|
||||
}else{
|
||||
fileList.value = [];
|
||||
}
|
||||
},
|
||||
{ immediate: true }
|
||||
);
|
||||
|
||||
const handlerSuccess = (res, file) => {
|
||||
file.url = `/mosty-base/minio/image/download/` + res.data;
|
||||
// file.url = `/mosty-base/minio/image/download/` + res.data;
|
||||
file.id = res.data;
|
||||
fileList.value.push(file);
|
||||
let arr = props.modelValue ? props.modelValue : [];
|
||||
let arr = []
|
||||
if(props.isImg){
|
||||
arr.push(res.data);
|
||||
arr = fileList.value.map((el) => el.id)
|
||||
}else{
|
||||
arr.push({url:res.data,name:file.name});
|
||||
arr = fileList.value.map((el) => ({ id:el.id, name:el.name}))
|
||||
}
|
||||
emits("update:modelValue", arr);
|
||||
emits("handleChange", props.modelValue);
|
||||
};
|
||||
|
||||
const handleExceed = (files, fileList) => {
|
||||
@ -180,16 +175,10 @@ const handleExceed = (files, fileList) => {
|
||||
const beforeImgUpload = (file) => {
|
||||
if (props.isImg) {
|
||||
let isIMG = false;
|
||||
if (getSuffix(file.name) === "IMG") {
|
||||
isIMG = true;
|
||||
}
|
||||
if (getSuffix(file.name) === "IMG") isIMG = true;
|
||||
const isLt5M = file.size / 1024 / 1024 < 5;
|
||||
if (!isIMG) {
|
||||
ElMessage.error("上传图片只能是jpg/png/jpeg/bmp/gif格式!");
|
||||
}
|
||||
if (!isLt5M) {
|
||||
ElMessage.error("上传图片大小不能超过 5MB!");
|
||||
}
|
||||
if (!isIMG) ElMessage.error("上传图片只能是jpg/png/jpeg/bmp/gif格式!");
|
||||
if (!isLt5M) ElMessage.error("上传图片大小不能超过 5MB!");
|
||||
return isIMG && isLt5M;
|
||||
} else {
|
||||
return true;
|
||||
@ -205,14 +194,13 @@ const handleDownload = (file) => {
|
||||
};
|
||||
const handleRemove = (file) => {
|
||||
let index = fileList.value.findIndex(function (item) {
|
||||
return item.url === file.url;
|
||||
return item.id === file.id;
|
||||
});
|
||||
fileList.value.splice(index, 1);
|
||||
props.modelValue.splice(index, 1);
|
||||
emits("handleChange", props.modelValue);
|
||||
emits("update:modelValue", props.modelValue);
|
||||
};
|
||||
const propsModelValue = ref();
|
||||
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
||||
@ -9,8 +9,6 @@
|
||||
<!-- input表单 input lx:textarea || number-->
|
||||
<MOSTY.Other v-if="item.type == 'input'" :type="item.lx" :rows="item.rows || 4" width="100%" clearable
|
||||
v-model="listQuery[item.prop]" :placeholder="`请输入${item.label}`" :disabled="item.disabled" />
|
||||
<!-- <el-input v-model="listQuery[item.prop]" v-else-if="item.lx == 'textarea'" type="textarea" :rows="3"
|
||||
:placeholder="`请输入${item.label}`" :disabled="item.disabled" /> -->
|
||||
<!-- 数值 number-->
|
||||
<el-input-number v-else-if="item.type == 'number'" @change="handleNum" v-model="listQuery[item.prop]"
|
||||
style="width:100%" :min="item.min || 0" :max="item.max || 1000" />
|
||||
@ -31,7 +29,7 @@
|
||||
<MOSTY.Date v-else-if="item.type == 'date'" :type="item.lx ? item.lx : 'date'" width="100%" clearable
|
||||
v-model="listQuery[item.prop]" />
|
||||
<!-- 上传 upload limit:'限制张数'-->
|
||||
<MOSTY.Upload v-else-if="item.type == 'upload'" :isAll="item.isAll" :showBtn="item.showBtn" :isImg="item.isImg" :limit="item.limit" width="100%"
|
||||
<MOSTY.Upload v-else-if="item.type == 'upload'" :isAll="item.isAll" :key="item.prop" :showBtn="item.showBtn" :isImg="item.isImg" :limit="item.limit" width="100%"
|
||||
v-model="listQuery[item.prop]" />
|
||||
<!--选择checkbox -->
|
||||
<MOSTY.CheckBox v-else-if="item.type == 'checkbox'" width="100%" clearable v-model="listQuery[item.prop]"
|
||||
@ -48,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">
|
||||
@ -151,10 +149,13 @@ const handleNum = (val) => {
|
||||
|
||||
watch(() => props.modelValue, (newVal) => {
|
||||
listQuery.value = newVal; //赋值
|
||||
console.log(newVal,'===newVal');
|
||||
|
||||
}, { immediate: true, deep: true });
|
||||
|
||||
watch(() => listQuery.value, (newVal) => {
|
||||
emits('update:modelValue', newVal)
|
||||
console.log(newVal,'===newVal111');
|
||||
}, { immediate: true, deep: true });
|
||||
|
||||
defineExpose({ submit, reset });
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
-->
|
||||
<template>
|
||||
<div class="fenye" :style="{ top: tableHeight + 'px' }">
|
||||
{{ pageData.configer }}
|
||||
<el-pagination
|
||||
:current-page="
|
||||
pageData.configer.currentPage ||
|
||||
|
||||
@ -64,6 +64,7 @@ const init = (type, id,) => {
|
||||
|
||||
function getDateById (id) {
|
||||
qcckPost({},`/mosty-base/baxx/jxda/getInfo/${id}`).then((res) => {
|
||||
res.fj = res.fj ? res.fj.split(','):[]
|
||||
listQuery.value = res || {};
|
||||
})
|
||||
}
|
||||
|
||||
@ -41,7 +41,7 @@ const formData = ref({})
|
||||
|
||||
const formList = reactive([
|
||||
[
|
||||
{ label: "成绩", prop: "ksfs", type: "input" },
|
||||
{ label: "成绩", prop: "kscj", type: "input" },
|
||||
],
|
||||
[
|
||||
{ label: "卷面", prop: "kszp", type: "upload", limit: 3 },
|
||||
|
||||
@ -30,9 +30,9 @@
|
||||
</template>
|
||||
<!-- 操作 -->
|
||||
<template #controls="{ row }">
|
||||
<el-link v-if="!visible && row?.ksfs >= 60" @click="handleCertificate(row)">申请证件</el-link>
|
||||
<el-link v-if="!visible && row?.kscj >= 60" @click="handleCertificate(row)">申请证件</el-link>
|
||||
<template v-if="visible && row?.ksfs ==='01'">
|
||||
<el-link v-if="!row?.ksfs" type="primary" @click="addEdit('updata', row)">上传成绩</el-link>
|
||||
<el-link v-if="!row?.kscj" type="primary" @click="addEdit('updata', row)">上传成绩</el-link>
|
||||
<el-link v-else type="primary" @click="addEdit('view', row)">查看成绩</el-link>
|
||||
</template>
|
||||
</template>
|
||||
@ -97,9 +97,9 @@ const pageData = reactive({
|
||||
{ label: "姓名", prop: "xm" },
|
||||
{ label: "证件号码", prop: "sfzh" },
|
||||
{ label: "联系方式", prop: "lxdh" },
|
||||
{ label: "线上培训时间", prop: "xxpxsc", showSolt: true },
|
||||
{ label: "线下培训课程", prop: "xxpxkc" },
|
||||
{ label: "考试成绩", prop: "ksfs" },
|
||||
{ label: "线上培训时间", prop: "xspxsc", showSolt: true },
|
||||
{ label: "线下培训课程", prop: "xxpxsc" },
|
||||
{ label: "考试成绩", prop: "kscj" },
|
||||
]
|
||||
});
|
||||
|
||||
@ -112,13 +112,10 @@ const close = () => {
|
||||
// 根据项目id获取培训人员
|
||||
const getList = async ({ id = "" }, type = '') => {
|
||||
const res = await qcckPost({
|
||||
...pageData.pageConfiger,
|
||||
// sfcjpx: 1,
|
||||
// ksglid: id
|
||||
pxxmid: id
|
||||
}, `/mosty-base/baxx/ksry/list`)
|
||||
if (res) {
|
||||
pageData.tableData = res.records || [];
|
||||
pageData.total = res.total;
|
||||
pageData.tableData = res || [];
|
||||
if (!type) emits("refresh");
|
||||
}
|
||||
}
|
||||
|
||||
@ -73,7 +73,7 @@ const pageData = reactive({
|
||||
},
|
||||
total: 0,
|
||||
pageConfiger: {
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
pageCurrent: 1
|
||||
},
|
||||
controlsWidth: 180,
|
||||
@ -122,6 +122,15 @@ const getList = async () => {
|
||||
}
|
||||
}
|
||||
|
||||
const changeNo = (val) => {
|
||||
pageData.pageConfiger.pageNum = val;
|
||||
getList();
|
||||
};
|
||||
const changeSize = (val) => {
|
||||
pageData.pageConfiger.pageSize = val;
|
||||
getList();
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
tabHeightFn();
|
||||
getList();
|
||||
|
||||
@ -90,7 +90,7 @@ const pageData = reactive({
|
||||
},
|
||||
total: 0,
|
||||
pageConfiger: {
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
pageCurrent: 1
|
||||
},
|
||||
controlsWidth: 180,
|
||||
@ -157,6 +157,15 @@ const handleDelete = async (ids) => {
|
||||
}
|
||||
}
|
||||
|
||||
const changeNo = (val) => {
|
||||
pageData.pageConfiger.pageNum = val;
|
||||
getList();
|
||||
};
|
||||
const changeSize = (val) => {
|
||||
pageData.pageConfiger.pageSize = val;
|
||||
getList();
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
tabHeightFn();
|
||||
getList();
|
||||
|
||||
@ -18,10 +18,10 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, computed, reactive, getCurrentInstance } from 'vue'
|
||||
import { ref, reactive, getCurrentInstance } from 'vue'
|
||||
import { qcckPost } from "@/api/qcckApi.js";
|
||||
import FormMessage from '@/components/aboutTable/FormMessage.vue'
|
||||
|
||||
import * as rule from "@/utils/rules.js";
|
||||
const { proxy } = getCurrentInstance()
|
||||
const { D_BZ_WHCD, D_BAXX_GWLX } = proxy.$dict("D_BZ_WHCD", "D_BAXX_GWLX");
|
||||
const title = ref('新增从业人员')
|
||||
@ -35,18 +35,8 @@ const props = defineProps({
|
||||
default: false
|
||||
},
|
||||
})
|
||||
|
||||
const emits = defineEmits(['update:modelValue', 'refresh'])
|
||||
|
||||
const dialogVisible = computed({
|
||||
get() {
|
||||
return props.modelValue
|
||||
},
|
||||
set(val) {
|
||||
emits('update:modelValue', val)
|
||||
}
|
||||
})
|
||||
|
||||
const dialogVisible = ref(false)
|
||||
const formList = reactive([
|
||||
[
|
||||
{ label: "姓名", prop: "xm", type: "input" },
|
||||
@ -75,40 +65,8 @@ const formList = reactive([
|
||||
|
||||
const rules = {
|
||||
xm: [{ required: true, message: "请输入姓名", trigger: "change" }],
|
||||
sfzh: [
|
||||
{ required: true, message: "请输入证件号码", trigger: "change" },
|
||||
{
|
||||
validator: (rule, value, callback) => {
|
||||
if (!value) {
|
||||
callback()
|
||||
} else {
|
||||
const reg = /^(\d{15}|\d{17}[\dXx])$/;
|
||||
if (!reg.test(value)) {
|
||||
callback(new Error("请输入正确的身份证号码"))
|
||||
} else {
|
||||
callback()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
lxdh: [
|
||||
{ required: true, message: "请输入联系电话", trigger: "change" },
|
||||
{
|
||||
validator: (rule, value, callback) => {
|
||||
if (!value) {
|
||||
callback()
|
||||
} else {
|
||||
const reg = /^1[34578]\d{9}$/
|
||||
if (!reg.test(value)) {
|
||||
callback(new Error("请输入正确的手机号"))
|
||||
} else {
|
||||
callback()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
...rule.phoneRule({ validator: true,message: "请输入联系电话",require: true }, "lxdh"), // 是否必填 是否进行校验`
|
||||
...rule.identityCardRule({ validator: true,message: "请输入身份证号" ,require: true}, "sfzh"), // 是否必填 是否进行校验
|
||||
jzdz: [{ required: true, message: "请输入居住地址", trigger: "change" }],
|
||||
rzsj: [{ required: true, message: "请选择入职时间", trigger: "change" }],
|
||||
zgzbh: [{ required: true, message: "请输入资格证编号", trigger: "change" }],
|
||||
@ -124,12 +82,15 @@ const formData = ref({})
|
||||
|
||||
const close = () => {
|
||||
FormRef.value?.reset();
|
||||
formData.value = {}
|
||||
dialogVisible.value = false
|
||||
}
|
||||
|
||||
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(','):[]
|
||||
formData.value = { ...row }
|
||||
if (type === 'add') {
|
||||
title.value = '新增从业人员'
|
||||
@ -145,7 +106,10 @@ const save = () => {
|
||||
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(() => {
|
||||
let params = { ...formData.value }
|
||||
params.tp = params.tp ? params.tp.join(','):''
|
||||
params.bazzp =params.bazzp ? params.bazzp.join(','):''
|
||||
qcckPost(params, url).then(() => {
|
||||
loading.value = false;
|
||||
proxy.$message.success("保存成功");
|
||||
emits("refresh");
|
||||
|
||||
@ -80,7 +80,7 @@ const searchConfiger = ref([
|
||||
]);
|
||||
|
||||
const pageData = reactive({
|
||||
tableData: [{}],
|
||||
tableData: [],
|
||||
keyCount: 0,
|
||||
tableConfiger: {
|
||||
rowHieght: 61,
|
||||
@ -89,7 +89,7 @@ const pageData = reactive({
|
||||
},
|
||||
total: 0,
|
||||
pageConfiger: {
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
pageCurrent: 1
|
||||
},
|
||||
controlsWidth: 180,
|
||||
@ -167,6 +167,15 @@ const getList = async () => {
|
||||
}
|
||||
}
|
||||
|
||||
const changeNo = (val) => {
|
||||
pageData.pageConfiger.pageNum = val;
|
||||
getList();
|
||||
};
|
||||
const changeSize = (val) => {
|
||||
pageData.pageConfiger.pageSize = val;
|
||||
getList();
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
tabHeightFn();
|
||||
getList();
|
||||
|
||||
@ -87,8 +87,8 @@ const pageData = reactive({
|
||||
},
|
||||
total: 0,
|
||||
pageConfiger: {
|
||||
sfcjpx: 0, // 是否参加培训
|
||||
pageSize: 10,
|
||||
sfcjpx: 1, // 是否参加培训
|
||||
pageSize: 20,
|
||||
pageCurrent: 1
|
||||
},
|
||||
controlsWidth: 180,
|
||||
@ -152,6 +152,15 @@ const getList = async () => {
|
||||
}
|
||||
}
|
||||
|
||||
const changeNo = (val) => {
|
||||
pageData.pageConfiger.pageNum = val;
|
||||
getList();
|
||||
};
|
||||
const changeSize = (val) => {
|
||||
pageData.pageConfiger.pageSize = val;
|
||||
getList();
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
tabHeightFn();
|
||||
getList();
|
||||
|
||||
@ -69,14 +69,14 @@ const formList = reactive([
|
||||
{ label: "所属保安公司", prop: "ssbags", type: "select", options: D_BAXX_DWLX },
|
||||
],
|
||||
[
|
||||
{ label: "身份证正面", prop: "ryzpzm", type: "upload", limit: 1 },
|
||||
{ label: "身份证反面", prop: "ryzpfm", type: "upload", limit: 1 },
|
||||
{ label: "身份证正面", prop: "sfzzm", type: "upload", limit: 1 },
|
||||
{ label: "身份证反面", prop: "sfzfm", type: "upload", limit: 1 },
|
||||
],
|
||||
[
|
||||
{ label: "体检报告", prop: "tjbg", type: "upload", limit: 1 },
|
||||
],
|
||||
[
|
||||
{ label: "无犯罪记录证明", prop: "wfzjlzm", type: "upload", limit: 1 },
|
||||
{ label: "无犯罪记录证明", prop: "fzjlzm", type: "upload", limit: 1 },
|
||||
]
|
||||
])
|
||||
|
||||
|
||||
@ -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>
|
||||
@ -82,7 +82,7 @@ const pageData = reactive({
|
||||
},
|
||||
total: 0,
|
||||
pageConfiger: {
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
pageCurrent: 1
|
||||
},
|
||||
controlsWidth: 180,
|
||||
@ -119,7 +119,8 @@ const getList = async () => {
|
||||
pageData.tableConfiger.loading = true;
|
||||
const res = await qcckPost({
|
||||
...pageData.pageConfiger,
|
||||
...queryFrom.value
|
||||
...queryFrom.value,
|
||||
sfcjpx: 0
|
||||
}, `/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,
|
||||
sfcjpx: 1
|
||||
}, "/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("是否确认删除该培训人员?")
|
||||
@ -145,6 +163,15 @@ const handleDelete = async (ids) => {
|
||||
}
|
||||
};
|
||||
|
||||
const changeNo = (val) => {
|
||||
pageData.pageConfiger.pageNum = val;
|
||||
getList();
|
||||
};
|
||||
const changeSize = (val) => {
|
||||
pageData.pageConfiger.pageSize = val;
|
||||
getList();
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
tabHeightFn();
|
||||
getList();
|
||||
|
||||
@ -132,7 +132,7 @@ const pageData = reactive({
|
||||
{ label: "证件号码", prop: "sfzh" },
|
||||
{ label: "联系号码", prop: "lxdh" },
|
||||
{ label: "线上培训时长", prop: "pxsc", showSolt: true },
|
||||
{ label: "所属单位", prop: "lxdw" },
|
||||
{ label: "所属单位", prop: "ssbags" },
|
||||
]
|
||||
});
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
</el-descriptions>
|
||||
</template>
|
||||
|
||||
<div class="label">培训保安人员</div>
|
||||
<div class="label-title">培训保安人员</div>
|
||||
<MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn"
|
||||
:key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
|
||||
>
|
||||
@ -42,10 +42,6 @@
|
||||
<el-link type="warning" @click="addEdit('updata', row)">删除</el-link>
|
||||
</template>
|
||||
</MyTable>
|
||||
<Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
|
||||
...pageData.pageConfiger,
|
||||
total: pageData.total
|
||||
}" />
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@ -55,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()
|
||||
@ -138,14 +133,10 @@ const getbaInfo = async ({ id = '' }) => {
|
||||
// 根据项目id获取培训人员
|
||||
const getList = async ({ id = "" }) => {
|
||||
const res = await qcckPost({
|
||||
...pageData.pageConfiger,
|
||||
pxxmid: id
|
||||
}, `/mosty-base/baxx/pxry/page`)
|
||||
}, `/mosty-base/baxx/pxkc/pxryList`)
|
||||
if (res) {
|
||||
console.log(res);
|
||||
|
||||
pageData.tableData = res.records || [];
|
||||
pageData.total = res.total;
|
||||
pageData.tableData = res || [];
|
||||
}
|
||||
}
|
||||
|
||||
@ -154,7 +145,7 @@ const open = (row = {}, type = 'view') => {
|
||||
dialogVisible.value = true
|
||||
formData.value = { ...row }
|
||||
if (type === 'view') {
|
||||
title.value = '保安线下考试详情'
|
||||
title.value = '保安培训项目详情'
|
||||
visible.value = true
|
||||
getbaInfo(row)
|
||||
getPxkcList(row)
|
||||
@ -204,9 +195,13 @@ defineExpose({ open })
|
||||
}
|
||||
}
|
||||
|
||||
.label {
|
||||
.label-title {
|
||||
line-height: 40px;
|
||||
text-align: center;
|
||||
font-weight: bold;
|
||||
margin-top: 20px;
|
||||
color: #000;
|
||||
background: #f5f5f5;
|
||||
}
|
||||
|
||||
.cntinfo {
|
||||
|
||||
@ -14,6 +14,10 @@
|
||||
<span>{{ row.pxsc }}h</span>
|
||||
</template>
|
||||
</MyTable>
|
||||
<Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
|
||||
...pageData.pageConfiger,
|
||||
total: pageData.total
|
||||
}"></Pages>
|
||||
|
||||
<template #footer>
|
||||
<el-button @click="handleClose">取 消</el-button>
|
||||
@ -26,6 +30,7 @@
|
||||
<script setup>
|
||||
import { computed, ref, reactive, getCurrentInstance, watchEffect } from 'vue';
|
||||
import { qcckPost } from "@/api/qcckApi.js";
|
||||
import Pages from '@/components/aboutTable/Pages.vue';
|
||||
import MyTable from '@/components/aboutTable/MyTable.vue';
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
@ -68,6 +73,7 @@ const pageData = reactive({
|
||||
total: 0,
|
||||
tableHeight: 300,
|
||||
pageConfiger: {
|
||||
sfcjpx: 1,
|
||||
pageSize: 10,
|
||||
pageCurrent: 1
|
||||
},
|
||||
@ -84,7 +90,7 @@ watchEffect(() => {
|
||||
pageData.tableConfiger.defaultSelectKeys = props.defaultSelectKeys
|
||||
})
|
||||
|
||||
const open = async () => {
|
||||
const getList = async () => {
|
||||
pageData.tableConfiger.loading = true;
|
||||
|
||||
try {
|
||||
@ -95,13 +101,25 @@ const open = async () => {
|
||||
if (res) {
|
||||
pageData.tableData = res.records || []
|
||||
pageData.total = res.total
|
||||
visible.value = true
|
||||
}
|
||||
|
||||
} finally {
|
||||
pageData.tableConfiger.loading = false
|
||||
}
|
||||
}
|
||||
const open = async () => {
|
||||
await getList()
|
||||
visible.value = true
|
||||
}
|
||||
|
||||
const changeNo = (val) => {
|
||||
pageData.pageConfiger.pageNum = val;
|
||||
getList();
|
||||
};
|
||||
const changeSize = (val) => {
|
||||
pageData.pageConfiger.pageSize = val;
|
||||
getList();
|
||||
};
|
||||
|
||||
const handleClose = () => {
|
||||
selectList.value = []
|
||||
|
||||
@ -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>
|
||||
|
||||
|
||||
@ -80,7 +80,7 @@ const pageData = reactive({
|
||||
},
|
||||
total: 0,
|
||||
pageConfiger: {
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
pageCurrent: 1
|
||||
},
|
||||
controlsWidth: 180,
|
||||
@ -135,6 +135,15 @@ const getList = async () => {
|
||||
}
|
||||
}
|
||||
|
||||
const changeNo = (val) => {
|
||||
pageData.pageConfiger.pageNum = val;
|
||||
getList();
|
||||
};
|
||||
const changeSize = (val) => {
|
||||
pageData.pageConfiger.pageSize = val;
|
||||
getList();
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
tabHeightFn();
|
||||
getList();
|
||||
|
||||
@ -53,7 +53,7 @@ const pageData = reactive({
|
||||
},
|
||||
total: 0,
|
||||
pageConfiger: {
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
pageCurrent: 1
|
||||
},
|
||||
controlsWidth: 180,
|
||||
@ -95,6 +95,15 @@ const addEdit = (type, row) => {
|
||||
detailsRef.value.open(row, type);
|
||||
}
|
||||
|
||||
const changeNo = (val) => {
|
||||
pageData.pageConfiger.pageNum = val;
|
||||
getList();
|
||||
};
|
||||
const changeSize = (val) => {
|
||||
pageData.pageConfiger.pageSize = val;
|
||||
getList();
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
tabHeightFn();
|
||||
getList();
|
||||
|
||||
Reference in New Issue
Block a user