mkm/TaskSystem-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
jiangyouyi 2023-08-09 18:11:44 +08:00
parent 810e7026ae
commit 5652e66131
5 changed files with 65 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/company/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card class="!border-none mb-4" shadow="never"> <el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline> <el-form class="mb-[-16px] formdata" :model="queryParams" inline>
<el-form-item label="公司名称" prop="company_name"> <el-form-item label="公司名称" prop="company_name">
<el-input <el-input
class="w-[280px]" class="w-[280px]"
@ -150,7 +150,7 @@
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
width="500" width="510"
fixed="right" fixed="right"
> >
<template #default="{ row }"> <template #default="{ row }">
@ -567,4 +567,9 @@ h1 {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
} }
.formdata{
.el-form-item{
width: 20%;
}
}
</style> </style>

27
src/views/contract/contractDetil.vue
View File

@ -78,9 +78,9 @@
<img :src="compenyimg.business_licenseB" /> <img :src="compenyimg.business_licenseB" />
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="其他资质" prop="contract_no"> <el-form-item label="其他资质" prop="contract_no" required>
<div class="company"> <div class="company" v-for="(v,i) in compenyimg.bank_account" :key="i">
<img :src="compenyimg.bank_account" /> <img :src="v" />
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -156,17 +156,21 @@
:model="formData" :model="formData"
label-width="90px" label-width="90px"
:rules="formRules" :rules="formRules"
class="company_z"
> >
<el-form-item label="公司资质" prop="contract_type" required> <el-form-item label="公司资质" prop="contract_type" required>
<div class="company"> <div class="company">
<img :src="compenyimg.business_license" /> <img :src="compenyBimg.business_license" />
<img :src="compenyimg.business_licenseB" /> </div>
</el-form-item>
<el-form-item label-width="120px" label="开户许可证" prop="contract_no" required>
<div class="company">
<img :src="compenyBimg.business_licenseB" />
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="其他资质" prop="contract_no" required> <el-form-item label="其他资质" prop="contract_no" required>
<div class="company"> <div class="company" v-for="(v,i) in compenyBimg.bank_account" :key="i">
<img :src="compenyimg.bank_account" /> <img :src="v" />
<img :src="compenyimg.bank_account" />
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -351,8 +355,13 @@ async function render() {
res.party_a_info.qualification.bank_account res.party_a_info.qualification.bank_account
) )
compenyimg.value = res.party_a_info.qualification compenyimg.value = res.party_a_info.qualification
res.party_b_info.qualification.bank_account = JSON.parse(
res.party_b_info.qualification.bank_account
)
compenyBimg.value = res.party_b_info.qualification
} catch (error) {} } catch (error) {}
compenyimg.value = res.party_a_info.qualification compenyimg.value = res.party_a_info.qualification
console.log(compenyimg.value );
if (res.type == 2) { if (res.type == 2) {
show.value = false show.value = false
res.party_b_info.sex == 1 ? (res.party_b_info.sex = '男') : (res.party_b_info.sex = '女') res.party_b_info.sex == 1 ? (res.party_b_info.sex = '男') : (res.party_b_info.sex = '女')

150
src/views/task/edit.vue
View File

@ -4,141 +4,28 @@
ref="popupRef" ref="popupRef"
title="创建日程安排" title="创建日程安排"
:async="true" :async="true"
width="1000px" width="800px"
@confirm="handleSubmit" @confirm="handleSubmit"
@close="handleClose" @close="handleClose"
> >
<el-form class="formdata" ref="formRef" :model="formData" label-width="120px"> <el-form class="formdata" ref="formRef" :model="formData" label-width="120px">
<el-col class="pt-6 !border-none"> <el-form-item required label="时间日程范围">
<el-row> <el-date-picker
<el-col :span="16"> v-model="datetime"
<el-form-item label="任务主题" prop="title"> type="datetimerange"
<el-input range-separator="至"
v-model="formData.title" start-placeholder="开始时间"
placeholder="请输入任务主题" end-placeholder="结束时间"
clearable />
></el-input> </el-form-item>
</el-form-item> <el-form-item required label="日程内容">
</el-col> <el-input v-model="content"/>
<el-col :span="8"> </el-form-item>
<el-form-item label="优先级" prop="name"> <el-form-item required label="日程描述">
<el-select <el-input type="textarea" v-model="content"/>
v-model="formData.priority" </el-form-item>
placeholder="请输入优先级" </el-form>
>
<el-option
v-for="item in priorityList"
:key="item.value"
:value="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="工作类型" prop="icon">
<el-select v-model="formData.type" placeholder="请选择工作类型">
<el-option
v-for="item in taskTypeList"
:key="item.label"
:value="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="14">
<el-form-item
style="margin-left:50px;"
label="是否为修复BUG"
label-width="auto"
prop="icon"
>
<el-radio-group v-model="formData.is_bug">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="负责人" prop="icon">
<el-input
v-model="formData.director_name"
placeholder="请选择负责人"
clearable
@click="isMan = true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="协作人" prop="icon">
<el-input
v-model="formData.assist_admin_names"
placeholder="请选择协作人"
clearable
@click="isManTow = true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="审查人" prop="icon">
<el-input
v-model="formData.assist_check_names"
placeholder="请选择审查人"
clearable
@click="isManThe = true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="开始时间" prop="icon">
<el-date-picker
type="date"
placeholder="开始时间"
value-format="YYYY-MM-DD"
v-model="formData.start_time"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="结束时间" prop="icon">
<el-date-picker
type="date"
placeholder="预计结束时间"
value-format="YYYY-MM-DD"
v-model="formData.end_time"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="验收时间" prop="icon">
<el-date-picker
type="date"
placeholder="预计验收时间"
value-format="YYYY-MM-DD"
v-model="formData.check_time"
/>
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-form>
<el-dialog v-model="isMan" title="选择负责人" width="60%">
<DialogIndexMan @customEvent="customEvent" />
</el-dialog>
<el-dialog v-model="isManTow" title="选择协作人" width="60%">
<DialogIndexMan @customEvent="customEventMan" />
</el-dialog>
<el-dialog v-model="isManThe" title="选择审查人" width="60%">
<DialogIndexMan @customEvent="customEventManThe" />
</el-dialog>
</popup> </popup>
</div> </div>
</template> </template>
@ -164,6 +51,7 @@ const emit = defineEmits(["success", "close"]);
const formRef = shallowRef<FormInstance>(); const formRef = shallowRef<FormInstance>();
const popupRef = shallowRef<InstanceType<typeof Popup>>(); const popupRef = shallowRef<InstanceType<typeof Popup>>();
const mode = ref("add"); const mode = ref("add");
const datetime = ref(null);
// 弹窗标题 // 弹窗标题
// const popupTitle = computed(() => { // const popupTitle = computed(() => {

2
src/views/task/taskCalendar.vue
View File

@ -41,7 +41,6 @@
</el-card> </el-card>
<edit-popup <edit-popup
v-if="showEdit"
ref="editRef" ref="editRef"
:dict-data="dictData" :dict-data="dictData"
:dateValue="dateValue" :dateValue="dateValue"
@ -64,7 +63,6 @@ import { apiTaskList ,apiTaskDetails} from '@/api/task'
const dateValue = ref(new Date()); const dateValue = ref(new Date());
watch(() => dateValue,(newValue, oldValue) => { watch(() => dateValue,(newValue, oldValue) => {
showEdit.value = true;
editRef.value?.open("add"); editRef.value?.open("add");
initShowDate(timeFormat(newValue.value.getTime())); initShowDate(timeFormat(newValue.value.getTime()));
// console.log(taskList.value.find((item)=>item.start_time.split(' ')[0]==timeFormat(newValue.value.getTime()))); // console.log(taskList.value.find((item)=>item.start_time.split(' ')[0]==timeFormat(newValue.value.getTime())));

22
src/views/task_scheduling/index.vue
View File

@ -20,7 +20,14 @@
<el-input class="w-[280px]" v-model="queryParams.type" clearable placeholder="请输入下发公司类型" /> <el-input class="w-[280px]" v-model="queryParams.type" clearable placeholder="请输入下发公司类型" />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-input class="w-[280px]" v-model="queryParams.status" clearable placeholder="请输入状态" /> <el-select v-model="queryParams.status" clearable placeholder="请选择状态">
<el-option
v-for="item in statusdata"
:key="item.label"
:value="item.value"
:label="item.label"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button class="el-btn" type="primary" @click="resetPage">查询</el-button> <el-button class="el-btn" type="primary" @click="resetPage">查询</el-button>
@ -49,7 +56,11 @@
<el-table-column label="模板id" prop="template_id" show-overflow-tooltip /> <el-table-column label="模板id" prop="template_id" show-overflow-tooltip />
<el-table-column label="公司id" prop="company_id" show-overflow-tooltip /> <el-table-column label="公司id" prop="company_id" show-overflow-tooltip />
<el-table-column label="下发公司类型" prop="type" show-overflow-tooltip /> <el-table-column label="下发公司类型" prop="type" show-overflow-tooltip />
<el-table-column label="状态" prop="status" show-overflow-tooltip /> <el-table-column label="状态" prop="status" show-overflow-tooltip>
<template #default="{row}">
<span>{{row.status=="1"?"显示":"隐藏"}}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="120" fixed="right"> <el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
@ -102,6 +113,13 @@ const queryParams = reactive({
status: '' status: ''
}) })
const statusdata=reactive(
[
{value:"1",label:'显示'},
{value:"0",label:"隐藏"},
]
)
// 选中数据 // 选中数据
const selectData = ref<any[]>([]) const selectData = ref<any[]>([])