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

Merge branch 'master' of http://git.excellentkk.cn/mkm/TaskSystem-admin

Browse Source
This commit is contained in:
weipengfei 2023-08-08 09:09:16 +08:00
commit ef71ce5e9b
6 changed files with 438 additions and 455 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/company.ts
View File

@ -33,6 +33,10 @@ export function sendMsgApi(params: any) {
return request.get({ url: '/company/postsms', params }) return request.get({ url: '/company/postsms', params })
} }
// 生成合同 // 生成合同
export function initiate_contract(params: any) {
return request.get({ url: '/company/initiate_contract', params })
}
// 发送合同
export function generateGontract(params: any) { export function generateGontract(params: any) {
return request.get({ url: '/company/Draftingcontracts', params }) return request.get({ url: '/company/Draftingcontracts', params })
} }

55
src/views/company/edit.vue
View File

@ -237,6 +237,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="性别" prop="sex"> <el-form-item label="性别" prop="sex">
<el-select <el-select
:disabled="isDisabled"
v-model="formData.sex" v-model="formData.sex"
placeholder="请选择性别" placeholder="请选择性别"
:style="{ width: '100%' }" :style="{ width: '100%' }"
@ -249,6 +250,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="身份证"> <el-form-item label="身份证">
<el-input <el-input
:disabled="isDisabled"
v-model="formData.id_card" v-model="formData.id_card"
placeholder="请输入生份证" placeholder="请输入生份证"
clearable clearable
@ -419,8 +421,7 @@
placeholder="请选择签约方" placeholder="请选择签约方"
clearable clearable
:style="{ width: '100%' }" :style="{ width: '100%' }"
@click="openCompany" :disabled="true"
:disabled="userStore.userInfo.root == 0 ? true : false"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -467,7 +468,7 @@
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col v-if="isshow" :span="24" class="el-card pt-6"> <!-- <el-col v-if="isshow" :span="24" class="el-card pt-6">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="合同上传" required> <el-form-item label="合同上传" required>
@ -486,7 +487,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col> -->
<el-col :span="24" class="el-card pt-6"> <el-col :span="24" class="el-card pt-6">
<el-form-item label prop="field139"> <el-form-item label prop="field139">
@ -494,7 +495,7 @@
>修改</el-button >修改</el-button
> >
<el-button <el-button
v-else v-if="isDisabled == false"
type="primary" type="primary"
:disabled="isDisabled" :disabled="isDisabled"
size="medium" size="medium"
@ -561,8 +562,12 @@ 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() const mode = ref()
isDisabled = route.query.read if (route.query.read) {
isEdit = route.query.edit isDisabled = route.query.read
}
if (route.query.edit) {
isEdit = route.query.edit
}
// 表单数据 // 表单数据
const formData = reactive({ const formData = reactive({
admin_id: '', admin_id: '',
@ -589,20 +594,7 @@ const formData = reactive({
master_position: '', master_position: '',
master_phone: '', master_phone: '',
master_email: '', master_email: '',
other_contacts: [ other_contacts: [],
// {
// name: "",
// position: "",
// phone: "",
// email: "",
// },
],
// area_manager: '',
// is_contract: '',
// account: '',
// password: '',
// deposit: '',
// deposit_time: '',
qualification: { qualification: {
business_license: '', business_license: '',
business_licenseB: '', business_licenseB: '',
@ -888,7 +880,7 @@ const getDetails = async () => {
id: route.query.id id: route.query.id
}) })
Object.keys(formData).forEach((key) => { Object.keys(formData).forEach((key) => {
const stringArr = ['province', 'city', 'area', 'street'] const stringArr = ['province', 'city', 'area', 'street', 'village', 'brigade']
if (data[key] != null && data[key] != undefined) { if (data[key] != null && data[key] != undefined) {
formData[key] = data[key] formData[key] = data[key]
if (key == 'qualification' && formData.qualification.bank_account) { if (key == 'qualification' && formData.qualification.bank_account) {
@ -916,12 +908,13 @@ const getDetails = async () => {
await getStreetList() await getStreetList()
await getVillageList() await getVillageList()
await getBrigadeList() await getBrigadeList()
formData['party_a_name'] = data.contract?.party_a_name formData['party_a_name'] = data.contract?.party_a_info.company_name
formData['file_image'] = data.contract?.file // formData['file_image'] = data.contract?.file
if (data.contract?.file) { // if (data.contract?.file) {
fileList.value[0].url = data.contract?.file // fileList.value[0].url = data.contract?.file
fileList.value[0].name = '合同文件' // fileList.value[0].name = '合同文件'
} // }
console.log(formData)
company_type_change(formData.company_type) company_type_change(formData.company_type)
} }
@ -1020,4 +1013,10 @@ defineExpose({
margin-left: 12px; margin-left: 12px;
} }
} }
.el-card {
margin-bottom: 10px;
}
.tit {
margin-top: 15px;
}
</style> </style>

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

@ -1,404 +1,390 @@
<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]" :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]"
v-model="queryParams.company_name" v-model="queryParams.company_name"
clearable clearable
placeholder="请输入公司名称" placeholder="请输入公司名称"
/> />
</el-form-item> </el-form-item>
<el-form-item label="区" prop="area" v-show="company_type_show"> <el-form-item label="区" prop="area" v-show="company_type_show">
<el-input <el-input
class="w-[280px]" class="w-[280px]"
v-model="queryParams.area" v-model="queryParams.area"
clearable clearable
placeholder="请输入区" placeholder="请输入区"
/> />
</el-form-item> </el-form-item>
<el-form-item label="镇" prop="street" v-show="company_type_show"> <el-form-item label="镇" prop="street" v-show="company_type_show">
<el-input <el-input
class="w-[280px]" class="w-[280px]"
v-model="queryParams.street" v-model="queryParams.street"
clearable clearable
placeholder="请输入镇" placeholder="请输入镇"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="公司类型" prop="company_type" v-show="company_type_show">
label="公司类型" <el-select
prop="company_type" v-model="queryParams.company_type"
v-show="company_type_show" placeholder="请选择公司类型"
> clearable
<el-select class="w-[280px]"
v-model="queryParams.company_type" >
placeholder="请选择公司类型" <el-option
clearable v-for="(item, index) in datas.dictTypeLists"
class="w-[280px]" :key="index"
> :label="item.name"
<el-option :value="item.id"
v-for="(item, index) in datas.dictTypeLists" ></el-option>
:key="index" </el-select>
:label="item.name" </el-form-item>
:value="item.id" <el-form-item label="片区经理" prop="area_manager">
></el-option> <el-input
</el-select> class="w-[280px]"
</el-form-item> v-model="queryParams.area_manager"
<el-form-item label="片区经理" prop="area_manager"> clearable
<el-input placeholder="请输入片区经理"
class="w-[280px]" />
v-model="queryParams.area_manager" </el-form-item>
clearable <el-form-item label="是否签约" prop="is_contract">
placeholder="请输入片区经理" <el-select
/> v-model="queryParams.is_contract"
</el-form-item> placeholder="是否签约"
<el-form-item label="是否签约" prop="is_contract"> clearable
<el-select class="w-[240px]"
v-model="queryParams.is_contract" >
placeholder="是否签约" <el-option label="已签约" value="1"></el-option>
clearable <el-option label="未签约" value="0"></el-option>
class="w-[240px]" </el-select>
> </el-form-item>
<el-option label="已签约" value="1"></el-option> <el-form-item>
<el-option label="未签约" value="0"></el-option> <el-button type="primary" @click="resetPage">查询</el-button>
</el-select> <el-button @click="resetParams">重置</el-button>
</el-form-item> </el-form-item>
<el-form-item> </el-form>
<el-button type="primary" @click="resetPage">查询</el-button> </el-card>
<el-button @click="resetParams">重置</el-button> <el-card class="!border-none" v-loading="pager.loading" shadow="never">
</el-form-item> <router-link
</el-form> v-perms="['company/add:edit']"
</el-card> :to="{
<el-card class="!border-none" v-loading="pager.loading" shadow="never"> path: getRoutePath('company/add:edit'),
<router-link query: {
v-perms="['company/add:edit']" flag: true
:to="{ }
path: getRoutePath('company/add:edit'), }"
query: { >
flag: true, <el-button type="primary" class="mb-4">
}, <template #icon>
}" <icon name="el-icon-Plus" />
> </template>
<el-button type="primary" class="mb-4"> 创建
<template #icon> </el-button>
<icon name="el-icon-Plus" /> </router-link>
</template> &nbsp; &nbsp;
创建 <router-link
</el-button> :to="{
</router-link> path: getRoutePath('company/add:edit'),
&nbsp; &nbsp; query: {
<router-link id: userStore.userInfo.company_id,
:to="{ read: true
path: getRoutePath('company/add:edit'), }
query: { }"
id: userStore.userInfo.company_id, >
read: true, <el-button type="primary" class="mb-4"> 我的公司 </el-button></router-link
}, >
}"
>
<el-button type="primary" class="mb-4">
我的公司
</el-button></router-link
>
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column <el-table-column label="id" prop="id" show-overflow-tooltip width="60" />
label="id" <el-table-column label="公司名称" prop="company_name" show-overflow-tooltip />
prop="id" <el-table-column label="公司类型" prop="company_type" show-overflow-tooltip />
show-overflow-tooltip <el-table-column label="区县" prop="area" show-overflow-tooltip />
width="60" <el-table-column label="乡镇" prop="street" show-overflow-tooltip />
/> <el-table-column label="主联系人" prop="master_name" show-overflow-tooltip />
<el-table-column <el-table-column label="联系方式" prop="master_phone" show-overflow-tooltip />
label="公司名称" <el-table-column label="片区经理" prop="area_manager" show-overflow-tooltip />
prop="company_name" <el-table-column label="是否签约" prop="is_contract" show-overflow-tooltip>
show-overflow-tooltip <template #default="{ row }">
/> <span v-if="row.is_contract == 1" style="color: #67c23a">已签约</span>
<el-table-column <span v-else style="color: #fe0000">未签约</span>
label="公司类型" </template></el-table-column
prop="company_type" >
show-overflow-tooltip <el-table-column label="操作" align="center" width="500" fixed="right">
/> <template #default="{ row }">
<el-table-column label="区县" prop="area" show-overflow-tooltip /> <div style="display: flex">
<el-table-column label="乡镇" prop="street" show-overflow-tooltip /> <el-button type="primary" link>
<el-table-column <router-link
label="主联系人" :to="{
prop="master_name" path: getRoutePath('auth.admin/lists'),
show-overflow-tooltip query: {
/> company_id: row.id,
<el-table-column read: true
label="联系方式" }
prop="master_phone" }"
show-overflow-tooltip >查看成员</router-link
/> >
<el-table-column </el-button>
label="片区经理" <el-button type="primary" link>
prop="area_manager" <router-link
show-overflow-tooltip :to="{
/> path: getRoutePath('company/subordinate/lists'),
<el-table-column query: {
label="是否签约" company_id: row.id,
prop="is_contract" read: true
show-overflow-tooltip }
> }"
<template #default="{ row }"> >下属公司</router-link
<span v-if="row.is_contract == 1" style="color: #67c23a" >
>已签约</span </el-button>
> <el-button v-perms="['company/add:edit']" type="primary" link>
<span v-else style="color: #fe0000">未签约</span> <router-link
</template></el-table-column :to="{
> path: getRoutePath('company/add:edit'),
<el-table-column query: {
label="操作" id: row.id,
align="center" read: true,
width="500" isshow: true
fixed="right" }
> }"
<template #default="{ row }"> >详情</router-link
<div style="display: flex"> >
<el-button type="primary" link> </el-button>
<router-link <el-button v-perms="['company/add:edit']" type="primary" link>
:to="{ <router-link
path: getRoutePath('auth.admin/lists'), :to="{
query: { path: getRoutePath('company/add:edit'),
company_id: row.id, query: {
read: true, id: row.id,
}, edit: true
}" }
>查看成员</router-link }"
> >编辑</router-link
</el-button> >
<el-button type="primary" link> </el-button>
<router-link <el-button
:to="{ v-perms="['company/delete']"
path: getRoutePath('company/subordinate/lists'), type="danger"
query: { link
company_id: row.id, @click="handleDelete(row.id)"
read: true, >删除</el-button
}, >
}" <el-button
>下属公司</router-link v-if="row.is_authentication == 0"
> v-perms="['company/authentication']"
</el-button> type="primary"
<el-button v-perms="['company/add:edit']" type="primary" link> link
<router-link @click="handleAuthentication(row.id)"
:to="{ >企业认证</el-button
path: getRoutePath('company/add:edit'), >
query: { <template v-if="row.is_contract == 0">
id: row.id, <el-button
read: true, v-perms="['company/initiate_contract']"
isshow:true, type="primary"
}, link
}" @click="ShowInitiateContractPop(row)"
>详情</router-link >生成合同</el-button
> >
</el-button> <el-button
<el-button v-perms="['company/add:edit']" type="primary" link> v-perms="['company/Draftingcontracts']"
<router-link type="primary"
:to="{ link
path: getRoutePath('company/add:edit'), @click="showCreateConctPop(row)"
query: { >发送合同</el-button
id: row.id, >
edit: true, <el-button
}, v-perms="['company/postsms']"
}" type="primary"
>编辑</router-link link
> @click=";(showPop = true), (contractId = row.id)"
</el-button> >发送短信</el-button
<el-button >
v-perms="['company/delete']" </template>
type="danger" </div>
link </template>
@click="handleDelete(row.id)" </el-table-column>
>删除</el-button </el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<el-dialog v-model="showInitiateContractPop" @close="offInitiateContractPop">
<h1>重要提醒</h1>
<div class="content">请确认信息是否有误</div>
<p class="btn_menu">
<el-button type="primary" size="large" @click="InitiateContract"
>确认创建</el-button
> >
<el-button <el-button type="info" size="large" @click="offPop">返回</el-button>
v-if="row.is_authentication == 0" </p>
v-perms="['company/authentication']" </el-dialog>
type="primary" <el-dialog v-model="showPop" @close="offPop">
link <h1>重要提醒</h1>
@click="handleAuthentication(row.id)" <div class="content" v-if="showConctactPop">
>企业认证</el-button 请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
</div>
<div class="content" v-else>
确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
</div>
<p class="btn_menu">
<el-button type="primary" size="large" v-if="showConctactPop" @click="creContct"
>确认创建</el-button
> >
<template v-if="row.is_contract == 0"> <el-button type="primary" size="large" v-else @click="sendMsg">确认</el-button>
<el-button <el-button type="info" size="large" @click="offPop">返回</el-button>
v-perms="['company/Draftingcontracts']" </p>
type="primary" </el-dialog>
link </div>
@click="showCreateConctPop(row)"
>生成合同</el-button
>
<el-button
v-perms="['company/postsms']"
type="primary"
link
@click="(showPop = true), (contractId = row.id)"
>发送短信</el-button
>
</template>
</div>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<el-dialog v-model="showPop" @close="offPop">
<h1>重要提醒</h1>
<div class="content" v-if="showConctactPop">
请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
</div>
<div class="content" v-else>
确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
</div>
<p class="btn_menu">
<el-button
type="primary"
size="large"
v-if="showConctactPop"
@click="creContct"
>确认创建</el-button
>
<el-button type="primary" size="large" v-else @click="sendMsg"
>确认</el-button
>
<el-button type="info" size="large" @click="offPop">返回</el-button>
</p>
</el-dialog>
</div>
</template> </template>
<script lang="ts" setup name="companyLists"> <script lang="ts" setup name="companyLists">
import { usePaging } from "@/hooks/usePaging"; import { usePaging } from '@/hooks/usePaging'
import { useDictData } from "@/hooks/useDictOptions"; import { useDictData } from '@/hooks/useDictOptions'
import useUserStore from "@/stores/modules/user"; import useUserStore from '@/stores/modules/user'
import { import {
apiCompanyLists, apiCompanyLists,
apiCompanyDelete, apiCompanyDelete,
generateGontract, generateGontract,
sendMsgApi, sendMsgApi,
authentication, authentication,
} from "@/api/company"; initiate_contract
import { timeFormat } from "@/utils/util"; } from '@/api/company'
import feedback from "@/utils/feedback"; import { timeFormat } from '@/utils/util'
import { dictDataLists } from "@/api/setting/dict"; import feedback from '@/utils/feedback'
import { getRoutePath } from "@/router"; import { dictDataLists } from '@/api/setting/dict'
import { getRoutePath } from '@/router'
const userStore = useUserStore(); const userStore = useUserStore()
console.log(userStore.userInfo.company_id); console.log(userStore.userInfo.company_id)
const route = useRoute(); const route = useRoute()
const company_type_show = ref(true); const company_type_show = ref(true)
// 创建合同与发送短信 // 创建合同与发送短信
//弹窗 //弹窗
const showPop = ref(false); const showPop = ref(false)
const showConctactPop = ref(false); const showConctactPop = ref(false)
const offPop = () => { const offPop = () => {
showPop.value = false; showPop.value = false
showConctactPop.value = false; showConctactPop.value = false
}; }
const InitiateContractPop = ref(false)
const showInitiateContractPop = ref(false)
const offInitiateContractPop = () => {
showPop.value = false
showConctactPop.value = false
}
// 创建合同的id // 创建合同的id
const contractId = ref(""); const contractId = ref('')
const ShowInitiateContractPop = (row) => {
;(InitiateContractPop.value = true),
(showInitiateContractPop.value = true),
(contractId.value = row.id)
}
const showCreateConctPop = (row) => { const showCreateConctPop = (row) => {
(showPop.value = true), ;(showPop.value = true), (showConctactPop.value = true), (contractId.value = row.id)
(showConctactPop.value = true), }
(contractId.value = row.id); const InitiateContract = () => {
}; initiate_contract({ id: contractId.value }).catch((res) => {
console.log(res)
})
offInitiateContractPop()
}
const creContct = () => { const creContct = () => {
generateGontract({ id: contractId.value }).catch((res)=>{ generateGontract({ id: contractId.value }).catch((res) => {
console.log(res); console.log(res)
}) })
offPop(); offPop()
}; }
const sendMsg = () => { const sendMsg = () => {
sendMsgApi({ id: contractId.value }); sendMsgApi({ id: contractId.value })
offPop(); offPop()
}; }
// 创建合同与发送短信结束 // 创建合同与发送短信结束
// 查询条件 // 查询条件
const queryParams = reactive({ const queryParams = reactive({
company_name: "", company_name: '',
area: "", area: '',
street: "", street: '',
company_type: "", company_type: '',
area_manager: "", area_manager: '',
// 是否签约 // 是否签约
is_contract: "", is_contract: ''
}); })
if (route.query.company_type) { if (route.query.company_type) {
company_type_show.value = false; company_type_show.value = false
queryParams["company_type"] = route.query.company_type?.toString() || ""; queryParams['company_type'] = route.query.company_type?.toString() || ''
} }
const datas = reactive({ const datas = reactive({
dictTypeLists: [], dictTypeLists: []
}); })
const getdictTypeLists = async () => { const getdictTypeLists = async () => {
const data = await dictDataLists({ type_id: 6 }); const data = await dictDataLists({ type_id: 6 })
datas["dictTypeLists"] = data["lists"]; datas['dictTypeLists'] = data['lists']
}; }
getdictTypeLists(); getdictTypeLists()
// 选中数据 // 选中数据
const selectData = ref<any[]>([]); const selectData = ref<any[]>([])
// 表格选择后回调事件 // 表格选择后回调事件
const handleSelectionChange = (val: any[]) => { const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id); selectData.value = val.map(({ id }) => id)
}; }
// 获取字典数据 // 获取字典数据
const { dictData } = useDictData(""); const { dictData } = useDictData('')
// 分页相关 // 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiCompanyLists, fetchFun: apiCompanyLists,
params: queryParams, params: queryParams
}); })
// 删除 // 删除
const handleDelete = async (id: number | any[]) => { const handleDelete = async (id: number | any[]) => {
await feedback.confirm("确定要删除？"); await feedback.confirm('确定要删除？')
await apiCompanyDelete({ id }); await apiCompanyDelete({ id })
getLists(); getLists()
}; }
const handleAuthentication = async (id: number | any[]) => { const handleAuthentication = async (id: number | any[]) => {
await feedback.confirm("确定要认证？"); await feedback.confirm('确定要认证？')
await authentication({ id }); await authentication({ id })
getLists(); getLists()
}; }
getLists(); getLists()
</script> </script>
<style lang="scss"> <style lang="scss">
.btn { .btn {
position: absolute; position: absolute;
} }
h1 { h1 {
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
font-size: 30px; font-size: 30px;
color: red; color: red;
margin-bottom: 10px; margin-bottom: 10px;
} }
.content { .content {
font-size: 20px; font-size: 20px;
} }
.info { .info {
color: red; color: red;
font-weight: bold; font-weight: bold;
font-size: 18px; font-size: 18px;
display: inline-block; display: inline-block;
margin: 0 5px; margin: 0 5px;
} }
.btn_menu { .btn_menu {
margin-top: 10vh; margin-top: 10vh;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
} }
</style> </style>

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

@ -22,7 +22,11 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="公司类型" prop="compeny"> <el-form-item label="公司类型" prop="compeny">
<el-select disabled v-model="compeny.company_type_name" placeholder="请输入公司类型"> <el-select
disabled
v-model="compeny.company_type_name"
placeholder="请输入公司类型"
>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="省" prop="province"> <el-form-item label="省" prop="province">
@ -30,12 +34,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="市" prop="city"> <el-form-item label="市" prop="city">
<el-select disabled v-model="compeny.city_name" placeholder="请选择市"> <el-select disabled v-model="compeny.city_name" placeholder="请选择市"> </el-select>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="区" prop="area"> <el-form-item label="区" prop="area">
<el-select disabled v-model="compeny.area_name" placeholder="请选择区"> <el-select disabled v-model="compeny.area_name" placeholder="请选择区"> </el-select>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="镇" prop="company_type_name"> <el-form-item label="镇" prop="company_type_name">
<el-select disabled v-model="compeny.street_name" placeholder="请选择镇"> <el-select disabled v-model="compeny.street_name" placeholder="请选择镇">
@ -73,9 +75,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">
<div class="company"> <div class="company">
<img :src="compenyimg.bank_account" /> <img :src="compenyimg.bank_account" />
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -96,10 +98,18 @@
<el-input disabled v-model="compenyB.company_name" placeholder="请输入公司名称" /> <el-input disabled v-model="compenyB.company_name" placeholder="请输入公司名称" />
</el-form-item> </el-form-item>
<el-form-item label="社会代码" prop="organization_code" required> <el-form-item label="社会代码" prop="organization_code" required>
<el-input disabled v-model="compenyB.organization_code" placeholder="请输入社会代码" /> <el-input
disabled
v-model="compenyB.organization_code"
placeholder="请输入社会代码"
/>
</el-form-item> </el-form-item>
<el-form-item label="公司类型" prop="company_type"> <el-form-item label="公司类型" prop="company_type">
<el-select disabled v-model="compenyB.company_type_name" placeholder="请输入社会类型"> <el-select
disabled
v-model="compenyB.company_type_name"
placeholder="请输入社会类型"
>
<el-option></el-option> <el-option></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -179,11 +189,7 @@
<el-input disabled v-model="persen.mobile" placeholder="请输入联系电话" /> <el-input disabled v-model="persen.mobile" placeholder="请输入联系电话" />
</el-form-item> </el-form-item>
<el-form-item label="身份证号"> <el-form-item label="身份证号">
<el-input <el-input v-model="persen.id" placeholder="请输入身份证号" disabled />
v-model="persen.id"
placeholder="请输入身份证号"
disabled
/>
</el-form-item> </el-form-item>
<el-form-item label="省" prop="province"> <el-form-item label="省" prop="province">
<el-select disabled v-model="persen.province_name" placeholder="请选择省"> <el-select disabled v-model="persen.province_name" placeholder="请选择省">
@ -267,7 +273,7 @@
</el-form-item> --> </el-form-item> -->
</el-form> </el-form>
</el-card> </el-card>
<el-card> <el-card v-if="basicdata.check_status == 1">
<el-form> <el-form>
<el-form-item label="合同上传" prop="field127"> <el-form-item label="合同上传" prop="field127">
<el-upload <el-upload
@ -289,7 +295,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import type { FormInstance, UploadProps, ElMessage, UploadUserFile } from 'element-plus' import type { FormInstance, UploadProps, ElMessage, UploadUserFile } from 'element-plus'
import { apiContractDetail } from '@/api/contract' import { apiContractDetail } from '@/api/contract'
import { ref, reactive, defineExpose ,computed} from 'vue' import { ref, reactive, defineExpose, computed } from 'vue'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
import { dictDataLists } from '@/api/setting/dict' import { dictDataLists } from '@/api/setting/dict'
import { upContact } from '@/api/consumer' import { upContact } from '@/api/consumer'
@ -315,7 +321,7 @@ const formData = reactive({
status_name: '' status_name: ''
}) })
const fileList = ref<UploadUserFile[]>([]) const fileList = ref<UploadUserFile[]>([])
const basicdata=ref({}) const basicdata = ref({})
const compeny = ref({}) const compeny = ref({})
const compenyimg = ref([]) const compenyimg = ref([])
const compenyB = ref([]) const compenyB = ref([])
@ -330,16 +336,18 @@ const userStore = useUserStore()
async function render() { async function render() {
// 传值赋值 // 传值赋值
const res = await apiContractDetail({ id: query.id }) const res = await apiContractDetail({ id: query.id })
compeny.value = res.party_a_info; compeny.value = res.party_a_info
basicdata.value=res basicdata.value = res
try { try {
    res.party_a_info.qualification.bank_account=JSON.parse(res.party_a_info.qualification.bank_account) res.party_a_info.qualification.bank_account = JSON.parse(
res.party_a_info.qualification.bank_account
)
compenyimg.value = res.party_a_info.qualification compenyimg.value = res.party_a_info.qualification
  } catch (error) {} } catch (error) {}
compenyimg.value = res.party_a_info.qualification compenyimg.value = res.party_a_info.qualification
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 = '女')
persen.value = res.party_b_info persen.value = res.party_b_info
persenimg.value = res.party_b_info.qualification persenimg.value = res.party_b_info.qualification
} }
@ -347,6 +355,8 @@ async function render() {
compenyB.value = res.party_b_info compenyB.value = res.party_b_info
compenyBimg.value = res.party_b_info.qualification compenyBimg.value = res.party_b_info.qualification
flag.value = false flag.value = false
} else {
compenyB.value.company_name = res.party_b_info.nickname
} }
} }
@ -364,9 +374,6 @@ onMounted(async () => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.btn_men {
text-align: right;
}
.frame { .frame {
.el-form-item { .el-form-item {
width: 40%; width: 40%;
@ -382,7 +389,7 @@ onMounted(async () => {
} }
} }
} }
.person_select{ .person_select {
.el-form-item { .el-form-item {
width: 30%; width: 30%;
.el-select { .el-select {
@ -394,30 +401,30 @@ onMounted(async () => {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
img { img {
width: 10rem; width: 10vw;
height: 8rem; height: 6.3vw;
} }
} }
.persenal { .persenal {
display: flex; display: flex;
align-items: center; align-items: center;
img { img {
width: 8rem; width: 10vw;
height: 10rem; height: 6.3vw;
} }
} }
.idcard { .idcard {
img { img {
width: 10rem; width: 10vw;
height: 10rem; height: 6.3vw;
} }
} }
.company_z{ .company_z {
.el-form-item{ .el-form-item {
width: 40%; width: 40%;
} }
} }
.el-card{ .el-card {
margin-top: 1px; margin-top: 10px;
} }
</style> </style>

53
src/views/contract/index.vue
View File

@ -56,24 +56,28 @@
</template> </template>
新增 新增
</el-button>--> </el-button>-->
<el-button <!-- <el-button
v-perms="['contract.contract/delete']" v-perms="['contract.contract/delete']"
:disabled="!selectData.length" :disabled="!selectData.length"
@click="handleDelete(selectData)" @click="handleDelete(selectData)"
>删除</el-button >删除</el-button
> > -->
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" /> <!-- <el-table-column type="selection" width="55" /> -->
<el-table-column label="id" prop="id" show-overflow-tooltip /> <el-table-column label="id" prop="id" show-overflow-tooltip />
<el-table-column label="公司" prop="company_name" show-overflow-tooltip /> <!-- <el-table-column label="公司" prop="company_name" show-overflow-tooltip /> -->
<el-table-column <el-table-column
label="合同类型" label="合同类型"
prop="contract_type_name" prop="contract_type_name"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip /> <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
<el-table-column label="甲方" prop="party_a_name" show-overflow-tooltip /> <el-table-column label="甲方" prop="party_a_name" show-overflow-tooltip>
<template #default="scope">
<span>{{ scope.row.party_a_info.company_name }}</span>
</template>
</el-table-column>
<el-table-column label="乙方" prop="party_b_name" show-overflow-tooltip /> <el-table-column label="乙方" prop="party_b_name" show-overflow-tooltip />
<el-table-column <el-table-column
@ -98,12 +102,11 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" width="180" fixed="right" align="center"> <el-table-column label="操作" width="180" fixed="right" align="center">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button type="primary" link>
v-perms="['contract.contract/delete']" <router-link
type="primary" :to="{ path: '/contract/detail', query: { id: row.id } }"
link >详情</router-link
> >
<router-link :to="{path:'/contract/detail', query: {id: row.id}}">详情</router-link>
</el-button> </el-button>
<!-- <el-button v-perms="['contract.contract/delete']" type="danger" link <!-- <el-button v-perms="['contract.contract/delete']" type="danger" link
@ -127,8 +130,7 @@ import { useDictData } from '@/hooks/useDictOptions'
import { apiContractLists, apiContractDelete, apiContractDetail } from '@/api/contract' import { apiContractLists, apiContractDelete, apiContractDetail } from '@/api/contract'
import { timeFormat } from '@/utils/util' import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback' import feedback from '@/utils/feedback'
const route = useRoute()
const editRef = shallowRef<InstanceType<typeof EditPopup>>() const editRef = shallowRef<InstanceType<typeof EditPopup>>()
// 是否显示编辑框 // 是否显示编辑框
@ -142,9 +144,12 @@ const queryParams = reactive({
status: '', status: '',
party_a: '', party_a: '',
party_b: '', party_b: '',
area_manager: '' area_manager: '',
type: ''
}) })
if (route.query.type) {
queryParams.type = route.query.type?.toString()
}
// 选中数据 // 选中数据
const selectData = ref<any[]>([]) const selectData = ref<any[]>([])
@ -174,25 +179,7 @@ const checkContcat = (id: number) => {
apiContractDetail({ id }).then((res) => { apiContractDetail({ id }).then((res) => {
res.file ? window.open(res.file) : feedback.msgError('暂无合同可以查看') res.file ? window.open(res.file) : feedback.msgError('暂无合同可以查看')
}) })
// window.open('https://www.zhihu.com/signin?next=%2F')
} }
// 添加
// const handleAdd = async () => {
// showEdit.value = true;
// await nextTick();
// editRef.value?.open("add");
// };
// // 编辑
// const handleEdit = async (data: any) => {
// showEdit.value = true;
// await nextTick();
// editRef.value?.open("edit");
// editRef.value?.setFormData(data);
// };
// 删除 // 删除
const handleDelete = async (id: number | any[]) => { const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除？') await feedback.confirm('确定要删除？')

6
src/views/permission/admin/index.vue
View File

@ -118,14 +118,14 @@
@click="handleDelete(row.id)" @click="handleDelete(row.id)"
>删除</el-button >删除</el-button
> >
<el-button <!-- <el-button
v-if="row.is_contract == 1" v-if="row.is_contract == 1"
v-perms="['auth.admin/abolition']" v-perms="['auth.admin/abolition']"
type="danger" type="danger"
link link
@click="handleAbolition(row.id)" @click="handleAbolition(row.id)"
>废除合同</el-button >废除合同</el-button
> > -->
<template v-if="row.company_id != 0 && row.is_contract == 0"> <template v-if="row.company_id != 0 && row.is_contract == 0">
<el-button <el-button
v-perms="['auth.admin/Draftingcontracts']" v-perms="['auth.admin/Draftingcontracts']"
@ -136,7 +136,7 @@
(showConctactPop = true), (showConctactPop = true),
(contractId = row.id) (contractId = row.id)
" "
>生成个人合同</el-button >生成合同</el-button
> >
<el-button <el-button
v-perms="['auth.admin/postsms']" v-perms="['auth.admin/postsms']"