This commit is contained in:
lcw
2026-01-15 12:16:53 +08:00
parent bf02efe72e
commit e45b864be3
11 changed files with 64 additions and 42 deletions

View File

@ -106,10 +106,10 @@ const keyid = (row) => {
const getListData = () => {
let params = {
...listQuery,
pxgsShzt: "1",//培训公司已通过
// pxgsShzt: "1",//培训公司已通过
sptz: "1",//已送培
ssbakk:userInfo.pxgs,
ssbakkId:userInfo.pxgsid,
sptzCompanyName:userInfo.pxgs,
sptzCompanyId:userInfo.pxgsid,
pxgsShzt:'1',//保安公司已通过
}

View File

@ -25,7 +25,7 @@
:class="{ 'status-pending': dataForm.pxgsShzt == 0, 'status-pass': dataForm.pxgsShzt == 1, 'status-reject': dataForm.pxgsShzt == 2 }">{{
dataForm.pxgsShzt == 0 ? '待审核' : dataForm.pxgsShzt == 1 ? '通过' : '驳回' }}</span>
</div>
<div v-if="dataForm.pxgsShsj == 2" class="reject-reason">
<div v-if="dataForm.pxgsShzt == 2" class="reject-reason">
<span class="reject-label">驳回原因</span>
<span>{{ dataForm.pxgsBhyy || '未审核' }}</span>
</div>
@ -40,7 +40,7 @@
:class="{ 'status-pending': dataForm.gonganShzt == 0, 'status-pass': dataForm.gonganShzt == 1, 'status-reject': dataForm.gonganShzt == 2 }">{{
dataForm.gonganShzt == 0 ? '待审核' : dataForm.gonganShzt == 1 ? '通过' : '驳回' }}</span>
</div>
<div v-if="dataForm.gonganShsj == 2" class="reject-reason">
<div v-if="dataForm.gonganShzt == 2" class="reject-reason">
<span class="reject-label">驳回原因</span>
<span>{{ dataForm.gonganBhyy || '未审核' }}</span>
</div>

View File

@ -162,9 +162,10 @@ const getList = () => {
const promes = {
...pageData.pageConfiger,
...queryFrom.value,
ssbakk:userInfo.pxgs,
ssbakkId:userInfo.pxgsid
ssbakk:userInfo.pxgs,
ssbakkId:userInfo.pxgsid,
}
qcckPost(promes,'/mosty-base/bans/njxx/page').then(res => {
pageData.tableData = res.records || [];
pageData.total = res.total;

View File

@ -81,7 +81,7 @@ const trainingCompany=ref()
const onBatchAudit = (val) => {
if (ids.value.length === 0) return ElMessage.warning("请选择要送培的人员");
proxy.$modal.confirm("是否确认送培?").then(() => {
let params = { ids:ids.value ,...val}
let params = { ids: ids.value, ...val }
qcckPost(params,'/mosty-base/bans/njxx/sendTraining').then(res=>{
ElMessage.success("送培成功");
emit('refresh');

View File

@ -6,12 +6,12 @@
</div>
<div class="cntinfo">
<!-- 标签 -->
<ul class="tag-box">
<li class="tag_item" :class="detail.pxgsShzt == 0 ? 'dsh_item' : detail.pxgsShzt == 1 ? 'tgg_item' : 'jtb_item'">
<!-- <ul class="tag-box">
<li class="tag_item" :class="detail.pxgsShzt == 0 ? 'dsh_item' : detail.pxgsShzt == 1 ? 'tgg_item' : 'jtb_item'"> -->
<!-- 0-待审核 1-通过 2-驳回 -->
{{ detail.pxgsShzt == 0 ? '待审核' : detail.pxgsShzt == 1 ? '通过' : '驳回' }}
<!-- {{ detail.pxgsShzt == 0 ? '待审核' : detail.pxgsShzt == 1 ? '通过' : '驳回' }}
</li>
</ul>
</ul> -->
<!-- 内容描述 -->
<el-descriptions class="desc" :column="3" border label-width="200px">
<el-descriptions-item label="保安公司名称">{{ detail.ssbakk }}</el-descriptions-item>
@ -97,7 +97,7 @@
<script setup>
import { ref, defineEmits } from 'vue';
const emit = defineEmits(["refresh"]);
const baseUrl = '/bagl/mosty-base/minio/image/download'
const baseUrl = '/bagl/mosty-base/minio/image/download/'
const props = defineProps({
dic: {
default: [[]], //二维数组

View File

@ -16,6 +16,7 @@
<script setup>
import { qcckPost } from "@/api/qcckApi.js";
import { ElMessage } from "element-plus";
import { ref, reactive, defineExpose, getCurrentInstance, defineEmits } from 'vue'
const visible = ref(false);
const dataList = ref()
@ -38,9 +39,13 @@ const init = () => {
})
}
const onBatchAudit = () => {
const data=dataList.value.find(item=>item.ssbakkId===dataValue.value)
emit('onBatchAudit', data)
const data = dataList.value.find(item => item.companyId === dataValue.value)
if (data) {
emit('onBatchAudit', data)
close()
} else {
ElMessage.warning("请选择培训公司")
}
}
const close = () => {
visible.value = false;

View File

@ -16,6 +16,9 @@
@chooseData="chooseData">
<template #sptz="{ row }">
<DictTag :value="row.sptz" :tag="false" :options="D_BA_SPZT" />
</template>
<template #whcd="{ row }">
<DictTag :value="row.whcd" :tag="false" :options="D_BZ_WHCD" />
</template>
<!-- 操作 -->
<template #controls="{ row }">
@ -96,7 +99,7 @@ const pageData = reactive({
{ label: "姓名", prop: "xm" },
{ label: "身份证号码", prop: "sfzhm",showOverflowTooltip: true },
{ label: "电话", prop: "dh" },
{ label: "文化程度", prop: "whcd" },
{ label: "文化程度", prop: "whcd", showSolt: true },
{ label: "证书编号", prop: "zsbh", showOverflowTooltip: true },
{ label: "服务行业", prop: "fwxymc" },
{ label: "入职时间", prop: "rzsj" },

View File

@ -6,12 +6,12 @@
</div>
<div class="cntinfo">
<!-- 标签 -->
<ul class="tag-box">
<li class="tag_item" :class="detail.pxgsShzt == 0 ? 'dsh_item' : detail.pxgsShzt == 1 ? 'tgg_item' : 'jtb_item'">
<!-- <ul class="tag-box">
<li class="tag_item" :class="detail.pxgsShzt == 0 ? 'dsh_item' : detail.pxgsShzt == 1 ? 'tgg_item' : 'jtb_item'"> -->
<!-- 0-待审核 1-通过 2-驳回 -->
{{ detail.pxgsShzt == 0 ? '待审核' : detail.pxgsShzt == 1 ? '通过' : '驳回' }}
<!-- {{ detail.pxgsShzt == 0 ? '待审核' : detail.pxgsShzt == 1 ? '通过' : '驳回' }}
</li>
</ul>
</ul> -->
<!-- 内容描述 -->
<el-descriptions class="desc" :column="3" border label-width="200px">
<el-descriptions-item label="保安公司名称">{{ detail.ssbakk }}</el-descriptions-item>
@ -100,7 +100,7 @@ import { ref, computed, defineEmits, getCurrentInstance,defineProps } from 'vue'
import { qcckPost } from "@/api/qcckApi.js";
const emit = defineEmits(["refresh"]);
const { proxy } = getCurrentInstance();
const baseUrl = '/bagl/mosty-base/minio/image/download'
const baseUrl = '/bagl/mosty-base/minio/image/download/'
const props = defineProps({
dic: {
default: [[]], //二维数组

View File

@ -48,7 +48,7 @@ import MyTable from "@/components/aboutTable/MyTable.vue";
import Pages from "@/components/aboutTable/Pages.vue";
import Search from "@/components/aboutTable/Search.vue";
import DetailForm from "./components/detailForm.vue";
import Steps from "./components/steps.vue";
import Steps from "@/components/steps.vue";
import ShForm from "./components/shForm.vue";
import {getItem} from '@/utils/storage.js'
import { qcckPost } from "@/api/qcckApi.js";
@ -133,9 +133,9 @@ const getList = () => {
const promes = {
...pageData.pageConfiger,
...queryFrom.value,
ssbakk:userInfo.pxgs,
ssbakkId:userInfo.pxgsid,
pxgsShzt:'1',//保安公司已通过
sptzCompanyName:userInfo.pxgs,
sptzCompanyId:userInfo.pxgsid,
// pxgsShzt:'1',//保安公司已通过
sptz:'1',//已送培
}
qcckPost(promes,'/mosty-base/bans/njxx/page').then((res) => {

View File

@ -111,7 +111,13 @@ const init = (type, row) => {
qcckPost({},'/mosty-base/bans/pxqd-item/getDetailInfo/'+row.id).then(res=>{
formData.value = { ...res }
delete formData.value.personAndNjxxList;
pageData.tableData = res.personAndNjxxList || [];
pageData.tableData = res.personAndNjxxList.map(item => {
return {
...item,
ssbakkId: item.bakkid,
ssbakk: item.bakkmc,
}
}) || [];
})
}
}
@ -120,7 +126,6 @@ const openPeoList = () => {
if(disabled.value) return;
shoewList.value = true;
}
// 删除
const deleteItem = (row) => {
pageData.tableData = pageData.tableData.filter(it=>it.id != row.id);
@ -133,8 +138,15 @@ const choosedList = (list) => {
}
const save = () => {
FormRef.value.submit((val) => {
let data = { pxqdItem:{ ...val } ,pxqdPersons:pageData.tableData }
FormRef.value.submit((val) => {
const tableData = pageData.tableData.map(item => {
return {
...item,
bakkid: item.ssbakkId,
bakkmc: item.ssbakk,
}
})
let data = { pxqdItem: { ...val }, pxqdPersons: tableData }
qcckPost(data,'/mosty-base/bans/pxqd-item/addWithPersons').then(res=>{
ElMessage.success('保存成功');
emit('refresh')

View File

@ -6,8 +6,9 @@ function resolve(dir) {
// const serverHost = "http://192.168.1.98:8006";//毛毛
// const serverHost = "http://192.168.1.32:8066";//波哥
// const serverHost = "http://192.168.0.231:8006"//线上
const serverHost = "http://47.108.232.77:9537";//波哥
// const serverHost = "http://47.108.232.77:9537";//波哥
// const serverHost = "http://127.0.0.1:8006"
const serverHost = 'https://lam.clcud.com:1443';
module.exports = {
publicPath: "./",
outputDir: "ab",
@ -39,7 +40,7 @@ module.exports = {
proxyReq.setHeader("Connection", "Keep-Alive"); //设置长连接
}
},
'/mosty-base': {
'/bagl/mosty-base': {
target: serverHost, // 后端服务器地址
changeOrigin: true, // 允许跨域
secure: false, // 如果是https需要设置为false