This commit is contained in:
zmj 2024-04-03 17:48:07 +08:00
parent d71edfed3b
commit 6d9813e77e
9 changed files with 391 additions and 15 deletions

View File

@ -199,7 +199,6 @@
<script lang="ts" setup name="projectPreSalesMembersEdit">
import { reactive } from 'vue'
import { getAdminsByAll, getAllDept, getAllJobs, getAdminsByDept, getAdminsByJob } from '@/api/common'
import type { PropType } from 'vue'
import { defineEmits } from "vue"
const leixin = ref('0')
const props = defineProps({

View File

@ -0,0 +1,366 @@
<template>
<div class="edit-popup">
<el-dialog v-model="dialogVisible" title="人员选择器" width="600px" :before-close="handleClose">
<div>
<el-radio-group v-model="isCollapse" style="margin-bottom: 20px">
<el-radio-button :label="1">全部人员</el-radio-button>
<el-radio-button :label="2">按部门筛选</el-radio-button>
<el-radio-button :label="3">按岗位筛选</el-radio-button>
<el-button class="ml-[200px]" v-show="isCollapse != 1 && (!isshow || !isshow1)"
@click="(isshow = true), (isshow1 = true)">返回</el-button>
</el-radio-group>
<div v-if="type == 1">
<div v-if="isCollapse == 1" style="margin-bottom: 20px">
<div style="margin-top: 20px">
<el-radio-group v-model="radionum">
<el-radio :label="item" v-for="(item, i) in uesrlist" :key="i" style="margin-bottom: 40px;">
<div class="radio-con">
<div class="radioa">
<img :src="item.avatar" alt="" />
</div>
<div class="radiob">
<div class="radiob_a">{{ item.name }}</div>
<div class="radiob_b">
<text v-if="item.org_name.length > 0">{{ item.org_name }}</text>
<text v-if="item.dept_name.length > 0">/{{ item.dept_name }}</text>
<text v-if="item.job_name.length > 0">/{{ item.job_name }}</text>
</div>
</div>
</div>
</el-radio><br />
</el-radio-group>
</div>
</div>
<div v-if="isCollapse == 2">
<!-- 返回上一级别 -->
<div v-if="isshow">
<div class="lad" v-for="(item, i) in deparmetlist" :key="i">
<div class="lad">{{ i }}</div>
<div class="flex " v-for="(items, k) in item" style="justify-content: space-between;"
@click="deparmetclck(items)">
<div>{{ items.name }}</div>
<div class="Collapsebj">{{ items.admin_num }}</div>
</div>
</div>
</div>
<div v-else>
<el-radio-group v-model="radionum">
<el-radio :label="item" v-for="(item, i) in deparmetlist1" :key="i"
style="margin-bottom: 20px;">
<div class="radio-con">
<div class="radioa">
<img :src="item.avatar" alt="" />
</div>
<div class="radiob">
<div class="radiob_a">{{ item.name }}</div>
<div class="radiob_b">
<text v-if="item.org_name.length > 0">{{ item.org_name }}</text>
<text v-if="item.dept_name.length > 0">/{{ item.dept_name }}</text>
<text v-if="item.job_name.length > 0">/{{ item.job_name }}</text>
</div>
</div>
</div>
</el-radio><br />
</el-radio-group>
</div>
</div>
<div v-if="isCollapse == 3">
<div class="lad " v-if="isshow1">
<div class="flex " v-for="(item, j) in jobslist" :key="j"
style="justify-content: space-between;" @click="gwclck(item)">
<div>{{ item.name }}</div>
<div class="Collapsebj">{{ item.admin_num }}</div>
</div>
</div>
<div v-else>
<el-radio-group v-model="radionum">
<el-radio :label="item" v-for="(item, i) in jobslist1" :key="i"
style="margin-bottom: 20px;">
<div class="radio-con">
<div class="radioa">
<img :src="item.avatar" alt="" />
</div>
<div class="radiob">
<div class="radiob_a">{{ item.name }}</div>
<div class="radiob_b">
<text v-if="item.org_name.length > 0">{{ item.org_name }}</text>
<text v-if="item.dept_name.length > 0">/{{ item.dept_name }}</text>
<text v-if="item.job_name.length > 0">/{{ item.job_name }}</text>
</div>
</div>
</div>
</el-radio><br />
</el-radio-group>
</div>
</div>
</div>
<div v-else>
<div v-if="isCollapse == 1" style="margin-bottom: 20px">
<div style="margin-top: 20px">
<el-checkbox-group v-model="radiolist">
<el-checkbox :label="item" v-for="(item, i) in uesrlist" :key="i"
style="margin-bottom: 20px;">
<div class="radio-con">
<div class="radioa">
<img :src="item.avatar" alt="" />
</div>
<div class="radiob">
<div class="radiob_a">{{ item.name }}</div>
<div class="radiob_b">
<text v-if="item.org_name.length > 0">{{ item.org_name }}</text>
<text v-if="item.dept_name.length > 0">/{{ item.dept_name }}</text>
<text v-if="item.job_name.length > 0">/{{ item.job_name }}</text>
</div>
</div>
</div>
</el-checkbox><br />
</el-checkbox-group>
</div>
</div>
<div v-if="isCollapse == 2">
<div v-if="isshow">
<div class="lad" v-for="(item, i) in deparmetlist" :key="i">
<div class="lad">{{ i }}</div>
<div class="flex " v-for="(items, k) in item" style="justify-content: space-between;"
@click="deparmetclck(items)">
<div>{{ items.name }}</div>
<div class="Collapsebj">{{ items.admin_num }}</div>
</div>
</div>
</div>
<div v-else>
<el-checkbox-group v-model="radiolist">
<el-checkbox :label="item" v-for="(item, i) in deparmetlist1" :key="i"
style="margin-bottom: 20px;">
<div class="radio-con">
<div class="radioa">
<img :src="item.avatar" alt="" />
</div>
<div class="radiob">
<div class="radiob_a">{{ item.name }}</div>
<div class="radiob_b">
<text v-if="item.org_name.length > 0">{{ item.org_name }}</text>
<text v-if="item.dept_name.length > 0">/{{ item.dept_name }}</text>
<text v-if="item.job_name.length > 0">/{{ item.job_name }}</text>
</div>
</div>
</div>
</el-checkbox><br />
</el-checkbox-group>
</div>
</div>
<div v-if="isCollapse == 3">
<div class="lad " v-if="isshow1">
<div class="flex " v-for="(item, j) in jobslist" :key="j"
style="justify-content: space-between;" @click="gwclck(item)">
<div>{{ item.name }}</div>
<div class="Collapsebj">{{ item.admin_num }}</div>
</div>
</div>
<div v-else>
<el-checkbox-group v-model="radiolist">
<el-checkbox :label="item" v-for="(item, i) in jobslist1" :key="i"
style="margin-bottom: 20px;">
<div class="radio-con">
<div class="radioa">
<img :src="item.avatar" alt="" />
</div>
<div class="radiob">
<div class="radiob_a">{{ item.name }}</div>
<div class="radiob_b">
<text v-if="item.org_name.length > 0">{{ item.org_name }}</text>
<text v-if="item.dept_name.length > 0">/{{ item.dept_name }}</text>
<text v-if="item.job_name.length > 0">/{{ item.job_name }}</text>
</div>
</div>
</div>
</el-checkbox><br />
</el-checkbox-group>
</div>
</div>
</div>
</div>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" @click="userclick" v-if="type == 1">确认</el-button>
<el-button type="primary" @click="userclick" v-else> {{ radiolist.length > 0 ? '已选' : '未选' }}
<text v-if="radiolist.length > 0">{{ radiolist.length }}</text></el-button>
</span>
</template>
</el-dialog>
</div>
</template>
<script lang="ts" setup name="projectPreSalesMembersEdit">
import { reactive } from 'vue'
import { getAdminsByAll, getAllDept, getAllJobs, getAdminsByDept, getAdminsByJob } from '@/api/common'
import { defineEmits } from "vue"
const leixin = ref('0')
const props = defineProps({
type: {
type: String || Number,//1: 2.
default: 1
}
})
const emits = defineEmits(['confirm'])
const dialogVisible = ref(false)
const isCollapse = ref(1);
const uesrlist = reactive([])
const deparmetlist = reactive({})
const deparmetlist1 = reactive([])
const jobslist = reactive({})
const jobslist1 = reactive([])
const isshow = ref(true);
const isshow1 = ref(true);
const radiolist = ref([])
const radionum = ref([])
//
const getlist = () => {
getAdminsByAll().then((res) => {
Object.assign(uesrlist, res)
})
}
//
const deparmet = () => {
getAllDept().then((res) => {
Object.assign(deparmetlist, res)
})
}
//
const deparmetclck = (item: { id: any }) => {
getAdminsByDept({ 'dept_id': item.id }).then((res) => {
if (res.length > 0) {
Object.assign(deparmetlist1, res)
isshow.value = false
}
})
}
//
const Jobs = () => {
getAllJobs().then((res) => {
Object.assign(jobslist, res)
})
}
//
const gwclck = (item: { id: any }) => {
getAdminsByJob({ 'job_id': item.id }).then((res) => {
if (res.length > 0) {
Object.assign(jobslist1, res)
isshow1.value = false
}
})
}
//
const open = (e: any) => {
getlist()
deparmet()
Jobs()
leixin.value = e
dialogVisible.value = true
}
//
const userclick = () => {
dialogVisible.value = false
if (props.type == 1) {
emits("confirm", radionum.value);
} else {
emits("confirm", radiolist.value);
}
}
defineExpose({
open,
userclick
})
</script>
<style lang="scss">
.userlist {
display: flex;
img {
width: 40px;
height: 40px;
border-radius: 50%;
}
text-align: center;
.userlist-con {
margin-right: 10px;
}
}
.user {
img {
width: 40px;
height: 40px;
border-radius: 50%;
}
}
.radio-con {
display: flex;
width: 500px;
align-items: center;
.radioa {
img {
margin-right: 20px;
width: 40px;
height: 40px;
border-radius: 50%;
}
}
.radiob {
.radiob_a {
margin-bottom: 10px;
margin-top: 3px;
}
.radiob_b {}
}
}
.lad {
padding: 10px 0;
border-bottom: 1px solid #f7f7f7;
div {
margin: 10px 0;
}
.Collapsebj {
background-color: #3e8ef7;
height: 20px;
width: 20px;
line-height: 20px;
text-align: center;
border-radius: 6px;
color: #f7f7f7;
}
}
</style>

View File

@ -76,7 +76,7 @@
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
<detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig" :column="2" />
<detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig" :column="3" />
</div>
</template>

View File

@ -36,8 +36,10 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="申请日期" prop="apply_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-form-item label="申请日期" prop="apply_date" :rules="[{ required: true, message: '不可为空', trigger: 'change' }, {
validator: chekcDate,
trigger: ['blur']
}]">
<el-date-picker class="flex-1 !flex" v-model="formData.apply_date" clearable type="date"
value-format="YYYY-MM-DD" placeholder="选择申请日期">
@ -260,6 +262,15 @@ const formData = reactive({
purchase_request_detail: [],
})
const chekcDate = (rule: any, value: any, callback: any) => {
if (new Date(formData.apply_date) < new Date(formData.arrival_date)) {
callback(new Error('申请日期不能早于希望到货日期'))
} else {
callback()
}
}
//
const formRules = reactive<any>({

View File

@ -1,7 +1,7 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-form ref="formRef" :model="formData" label-width="130px" :rules="formRules">
<el-row>
<el-col :span="8">
<el-form-item label="供应商名称" prop="supplier_id" @click="showDialog1 = true"

View File

@ -320,7 +320,7 @@ const handleClose = () => {
//
const totalAmout = computed(() => {
return Number(formData.cl_cost) + Number(formData.fb_cost) + Number(formData.rg_cost) + Number(formData.fy_cost) + Number(formData.jj_cost) || 0
return Number(formData.contract_amount) - (Number(formData.cl_cost) + Number(formData.fb_cost) + Number(formData.rg_cost) + Number(formData.fy_cost) + Number(formData.jj_cost) || 0)
})
@ -328,14 +328,14 @@ const totalAmout = computed(() => {
//
const calColumnRate = (index) => {
tableData.forEach((item, index) => {
item.rate = Number(formData[item.value] / totalAmout.value).toFixed(2) || "0.00%"
item.rate = Number(formData[item.value] / (Number(formData.contract_amount) - totalAmout.value)).toFixed(2) || "0.00%"
});
}
//
const project_rate = computed(() => {
let num = ((totalAmout.value / Number(formData.contract_amount)).toFixed(2))
return (isNaN(num) ? '0.00%' : num)
let num = ((totalAmout.value / Number(formData.contract_amount)).toFixed(2)) * 100 + "%"
return num
})
//

View File

@ -60,7 +60,7 @@
</el-radio-group>
</el-form-item>
</el-col> -->
<el-col :span="12">
<el-col :span="8">
<el-form-item label="回款责任人" prop="return_duty_id" @click="userclick">
<el-input v-model="return_name" readonly clearable placeholder="请输入回款责任人" />
</el-form-item>

View File

@ -73,11 +73,11 @@
<el-col :span="8">
<el-form-item label="工作电话" prop="work_phone" :rules="[{ validator: checkPhone, trigger: 'blur' }]">
<el-form-item label="工作电话" prop="work_phone">
<el-input v-model="formData.work_phone" clearable placeholder="请输入工作电话" />
</el-form-item></el-col>
<el-col :span="8">
<el-form-item label="移动电话" prop="mobile">
<el-form-item label="移动电话" prop="mobile" :rules="[{ validator: checkPhone, trigger: 'blur' }]">
<el-input v-model="formData.mobile" clearable placeholder="请输入移动电话" />
</el-form-item></el-col>
@ -93,7 +93,7 @@
<el-col :span="8">
<el-form-item label="邮编" prop="zip_code">
<el-input v-model="formData.zip_code" clearable placeholder="请输入邮编" />
<el-input v-model="formData.zip_code" clearable placeholder="请输入邮编" type="number" />
</el-form-item></el-col>
<el-col :span="8">
@ -113,7 +113,7 @@
<el-col :span="8">
<el-form-item label="证件号码" prop="idcard" :rules="[{ validator: IDcard, trigger: 'blur' }]">
<el-input v-model="formData.idcard" clearable placeholder="请输入证件号码" />
<el-input v-model="formData.idcard" clearable placeholder="请输入证件号码" type="number" />
</el-form-item></el-col>
<el-col :span="8">
<el-form-item label="备注" prop="remark">

View File

@ -19,7 +19,7 @@ export default defineConfig({
base: "/admin/",
server: {
host: "0.0.0.0",
port: 9000,
port: 8081,
open: true,
},
plugins: [