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

View File

@ -33,6 +33,10 @@ export function sendMsgApi(params: any) {
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) {
return request.get({ url: '/company/Draftingcontracts', params })
}

View File

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

View File

@ -26,11 +26,7 @@
placeholder="请输入镇"
/>
</el-form-item>
<el-form-item
label="公司类型"
prop="company_type"
v-show="company_type_show"
>
<el-form-item label="公司类型" prop="company_type" v-show="company_type_show">
<el-select
v-model="queryParams.company_type"
placeholder="请选择公司类型"
@ -76,8 +72,8 @@
:to="{
path: getRoutePath('company/add:edit'),
query: {
flag: true,
},
flag: true
}
}"
>
<el-button type="primary" class="mb-4">
@ -93,68 +89,30 @@
path: getRoutePath('company/add:edit'),
query: {
id: userStore.userInfo.company_id,
read: true,
},
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">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column
label="id"
prop="id"
show-overflow-tooltip
width="60"
/>
<el-table-column
label="公司名称"
prop="company_name"
show-overflow-tooltip
/>
<el-table-column
label="公司类型"
prop="company_type"
show-overflow-tooltip
/>
<el-table-column label="id" prop="id" show-overflow-tooltip width="60" />
<el-table-column label="公司名称" prop="company_name" show-overflow-tooltip />
<el-table-column label="公司类型" prop="company_type" show-overflow-tooltip />
<el-table-column label="区县" prop="area" show-overflow-tooltip />
<el-table-column label="乡镇" prop="street" show-overflow-tooltip />
<el-table-column
label="主联系人"
prop="master_name"
show-overflow-tooltip
/>
<el-table-column
label="联系方式"
prop="master_phone"
show-overflow-tooltip
/>
<el-table-column
label="片区经理"
prop="area_manager"
show-overflow-tooltip
/>
<el-table-column
label="是否签约"
prop="is_contract"
show-overflow-tooltip
>
<el-table-column label="主联系人" prop="master_name" show-overflow-tooltip />
<el-table-column label="联系方式" prop="master_phone" show-overflow-tooltip />
<el-table-column label="片区经理" prop="area_manager" show-overflow-tooltip />
<el-table-column label="是否签约" prop="is_contract" show-overflow-tooltip>
<template #default="{ row }">
<span v-if="row.is_contract == 1" style="color: #67c23a"
>已签约</span
>
<span v-if="row.is_contract == 1" style="color: #67c23a">已签约</span>
<span v-else style="color: #fe0000">未签约</span>
</template></el-table-column
>
<el-table-column
label="操作"
align="center"
width="500"
fixed="right"
>
<el-table-column label="操作" align="center" width="500" fixed="right">
<template #default="{ row }">
<div style="display: flex">
<el-button type="primary" link>
@ -163,8 +121,8 @@
path: getRoutePath('auth.admin/lists'),
query: {
company_id: row.id,
read: true,
},
read: true
}
}"
>查看成员</router-link
>
@ -175,8 +133,8 @@
path: getRoutePath('company/subordinate/lists'),
query: {
company_id: row.id,
read: true,
},
read: true
}
}"
>下属公司</router-link
>
@ -188,8 +146,8 @@
query: {
id: row.id,
read: true,
isshow:true,
},
isshow: true
}
}"
>详情</router-link
>
@ -200,8 +158,8 @@
path: getRoutePath('company/add:edit'),
query: {
id: row.id,
edit: true,
},
edit: true
}
}"
>编辑</router-link
>
@ -222,18 +180,25 @@
>企业认证</el-button
>
<template v-if="row.is_contract == 0">
<el-button
v-perms="['company/initiate_contract']"
type="primary"
link
@click="ShowInitiateContractPop(row)"
>生成合同</el-button
>
<el-button
v-perms="['company/Draftingcontracts']"
type="primary"
link
@click="showCreateConctPop(row)"
>生成合同</el-button
>发送合同</el-button
>
<el-button
v-perms="['company/postsms']"
type="primary"
link
@click="(showPop = true), (contractId = row.id)"
@click=";(showPop = true), (contractId = row.id)"
>发送短信</el-button
>
</template>
@ -246,6 +211,16 @@
<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 type="info" size="large" @click="offPop">返回</el-button>
</p>
</el-dialog>
<el-dialog v-model="showPop" @close="offPop">
<h1>重要提醒</h1>
<div class="content" v-if="showConctactPop">
@ -255,16 +230,10 @@
确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
</div>
<p class="btn_menu">
<el-button
type="primary"
size="large"
v-if="showConctactPop"
@click="creContct"
<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="primary" size="large" v-else @click="sendMsg">确认</el-button>
<el-button type="info" size="large" @click="offPop">返回</el-button>
</p>
</el-dialog>
@ -272,105 +241,122 @@
</template>
<script lang="ts" setup name="companyLists">
import { usePaging } from "@/hooks/usePaging";
import { useDictData } from "@/hooks/useDictOptions";
import useUserStore from "@/stores/modules/user";
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import useUserStore from '@/stores/modules/user'
import {
apiCompanyLists,
apiCompanyDelete,
generateGontract,
sendMsgApi,
authentication,
} from "@/api/company";
import { timeFormat } from "@/utils/util";
import feedback from "@/utils/feedback";
import { dictDataLists } from "@/api/setting/dict";
import { getRoutePath } from "@/router";
initiate_contract
} from '@/api/company'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import { dictDataLists } from '@/api/setting/dict'
import { getRoutePath } from '@/router'
const userStore = useUserStore();
console.log(userStore.userInfo.company_id);
const route = useRoute();
const company_type_show = ref(true);
const userStore = useUserStore()
console.log(userStore.userInfo.company_id)
const route = useRoute()
const company_type_show = ref(true)
//
//
const showPop = ref(false);
const showConctactPop = ref(false);
const showPop = ref(false)
const showConctactPop = ref(false)
const offPop = () => {
showPop.value = false;
showConctactPop.value = false;
};
showPop.value = false
showConctactPop.value = false
}
const InitiateContractPop = ref(false)
const showInitiateContractPop = ref(false)
const offInitiateContractPop = () => {
showPop.value = false
showConctactPop.value = false
}
// id
const contractId = ref("");
const contractId = ref('')
const ShowInitiateContractPop = (row) => {
;(InitiateContractPop.value = true),
(showInitiateContractPop.value = true),
(contractId.value = row.id)
}
const showCreateConctPop = (row) => {
(showPop.value = true),
(showConctactPop.value = true),
(contractId.value = row.id);
};
;(showPop.value = true), (showConctactPop.value = true), (contractId.value = row.id)
}
const InitiateContract = () => {
initiate_contract({ id: contractId.value }).catch((res) => {
console.log(res)
})
offInitiateContractPop()
}
const creContct = () => {
generateGontract({ id: contractId.value }).catch((res) => {
console.log(res);
console.log(res)
})
offPop();
};
offPop()
}
const sendMsg = () => {
sendMsgApi({ id: contractId.value });
offPop();
};
sendMsgApi({ id: contractId.value })
offPop()
}
//
//
const queryParams = reactive({
company_name: "",
area: "",
street: "",
company_type: "",
area_manager: "",
company_name: '',
area: '',
street: '',
company_type: '',
area_manager: '',
//
is_contract: "",
});
is_contract: ''
})
if (route.query.company_type) {
company_type_show.value = false;
queryParams["company_type"] = route.query.company_type?.toString() || "";
company_type_show.value = false
queryParams['company_type'] = route.query.company_type?.toString() || ''
}
const datas = reactive({
dictTypeLists: [],
});
dictTypeLists: []
})
const getdictTypeLists = async () => {
const data = await dictDataLists({ type_id: 6 });
datas["dictTypeLists"] = data["lists"];
};
getdictTypeLists();
const data = await dictDataLists({ type_id: 6 })
datas['dictTypeLists'] = data['lists']
}
getdictTypeLists()
//
const selectData = ref<any[]>([]);
const selectData = ref<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({
fetchFun: apiCompanyLists,
params: queryParams,
});
params: queryParams
})
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm("确定要删除?");
await apiCompanyDelete({ id });
getLists();
};
await feedback.confirm('确定要删除?')
await apiCompanyDelete({ id })
getLists()
}
const handleAuthentication = async (id: number | any[]) => {
await feedback.confirm("确定要认证?");
await authentication({ id });
getLists();
};
await feedback.confirm('确定要认证?')
await authentication({ id })
getLists()
}
getLists();
getLists()
</script>
<style lang="scss">
.btn {

View File

@ -22,7 +22,11 @@
/>
</el-form-item>
<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-form-item>
<el-form-item label="省" prop="province">
@ -30,12 +34,10 @@
</el-select>
</el-form-item>
<el-form-item label="市" prop="city">
<el-select disabled v-model="compeny.city_name" placeholder="请选择市">
</el-select>
<el-select disabled v-model="compeny.city_name" placeholder="请选择市"> </el-select>
</el-form-item>
<el-form-item label="区" prop="area">
<el-select disabled v-model="compeny.area_name" placeholder="请选择区">
</el-select>
<el-select disabled v-model="compeny.area_name" placeholder="请选择区"> </el-select>
</el-form-item>
<el-form-item label="镇" prop="company_type_name">
<el-select disabled v-model="compeny.street_name" placeholder="请选择镇">
@ -96,10 +98,18 @@
<el-input disabled v-model="compenyB.company_name" placeholder="请输入公司名称" />
</el-form-item>
<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 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-select>
</el-form-item>
@ -179,11 +189,7 @@
<el-input disabled v-model="persen.mobile" placeholder="请输入联系电话" />
</el-form-item>
<el-form-item label="身份证号">
<el-input
v-model="persen.id"
placeholder="请输入身份证号"
disabled
/>
<el-input v-model="persen.id" placeholder="请输入身份证号" disabled />
</el-form-item>
<el-form-item label="省" prop="province">
<el-select disabled v-model="persen.province_name" placeholder="请选择省">
@ -267,7 +273,7 @@
</el-form-item> -->
</el-form>
</el-card>
<el-card>
<el-card v-if="basicdata.check_status == 1">
<el-form>
<el-form-item label="合同上传" prop="field127">
<el-upload
@ -330,16 +336,18 @@ const userStore = useUserStore()
async function render() {
//
const res = await apiContractDetail({ id: query.id })
compeny.value = res.party_a_info;
compeny.value = res.party_a_info
basicdata.value = res
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
  } catch (error) {}
} catch (error) {}
compenyimg.value = res.party_a_info.qualification
if (res.type == 2) {
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
persenimg.value = res.party_b_info.qualification
}
@ -347,6 +355,8 @@ async function render() {
compenyB.value = res.party_b_info
compenyBimg.value = res.party_b_info.qualification
flag.value = false
} else {
compenyB.value.company_name = res.party_b_info.nickname
}
}
@ -364,9 +374,6 @@ onMounted(async () => {
</script>
<style lang="scss" scoped>
.btn_men {
text-align: right;
}
.frame {
.el-form-item {
width: 40%;
@ -394,22 +401,22 @@ onMounted(async () => {
display: flex;
justify-content: space-between;
img {
width: 10rem;
height: 8rem;
width: 10vw;
height: 6.3vw;
}
}
.persenal {
display: flex;
align-items: center;
img {
width: 8rem;
height: 10rem;
width: 10vw;
height: 6.3vw;
}
}
.idcard {
img {
width: 10rem;
height: 10rem;
width: 10vw;
height: 6.3vw;
}
}
.company_z {
@ -418,6 +425,6 @@ onMounted(async () => {
}
}
.el-card {
margin-top: 1px;
margin-top: 10px;
}
</style>

View File

@ -56,24 +56,28 @@
</template>
新增
</el-button>-->
<el-button
<!-- <el-button
v-perms="['contract.contract/delete']"
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>删除</el-button
>
> -->
<div class="mt-4">
<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="公司" prop="company_name" show-overflow-tooltip />
<!-- <el-table-column label="公司" prop="company_name" show-overflow-tooltip /> -->
<el-table-column
label="合同类型"
prop="contract_type_name"
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
@ -98,12 +102,11 @@
</el-table-column>
<el-table-column label="操作" width="180" fixed="right" align="center">
<template #default="{ row }">
<el-button
v-perms="['contract.contract/delete']"
type="primary"
link
<el-button type="primary" link>
<router-link
:to="{ path: '/contract/detail', query: { id: row.id } }"
>详情</router-link
>
<router-link :to="{path:'/contract/detail', query: {id: row.id}}">详情</router-link>
</el-button>
<!-- <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 { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
const route = useRoute()
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//
@ -142,9 +144,12 @@ const queryParams = reactive({
status: '',
party_a: '',
party_b: '',
area_manager: ''
area_manager: '',
type: ''
})
if (route.query.type) {
queryParams.type = route.query.type?.toString()
}
//
const selectData = ref<any[]>([])
@ -174,25 +179,7 @@ const checkContcat = (id: number) => {
apiContractDetail({ id }).then((res) => {
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[]) => {
await feedback.confirm('确定要删除?')

View File

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