冲突修复
This commit is contained in:
THK3121
commit
0e217c3647
@ -1,6 +1,11 @@
|
||||
<template>
|
||||
<div class="edit-popup">
|
||||
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
|
||||
<el-form
|
||||
ref="formRef"
|
||||
:model="formData"
|
||||
label-width="90px"
|
||||
:rules="formRules"
|
||||
>
|
||||
<!-- <div style="font-size: 1.2rem; margin: 10px 0">公司基本信息创建</div> -->
|
||||
<el-col :span="24" class="el-card pt-6">
|
||||
<div class="tit">公司基本信息创建</div>
|
||||
@ -8,65 +13,129 @@
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="公司名称" prop="company_name">
|
||||
<el-input v-model="formData.company_name" placeholder="请输入公司名称" clearable :disabled="isDisabled"
|
||||
:style="{ width: '100%' }"></el-input>
|
||||
<el-input
|
||||
v-model="formData.company_name"
|
||||
placeholder="请输入公司名称"
|
||||
clearable
|
||||
:disabled="isDisabled"
|
||||
:style="{ width: '100%' }"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="社会代码" prop="organization_code">
|
||||
<el-input :disabled="isDisabled" v-model="formData.organization_code" placeholder="请输入社会代码" clearable
|
||||
:style="{ width: '100%' }"></el-input>
|
||||
<el-input
|
||||
:disabled="isDisabled"
|
||||
v-model="formData.organization_code"
|
||||
placeholder="请输入社会代码"
|
||||
clearable
|
||||
:style="{ width: '100%' }"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="公司类型" prop="company_type">
|
||||
<el-select :disabled="isDisabled" v-model="formData.company_type" placeholder="请选择公司类型" clearable
|
||||
:style="{ width: '100%' }">
|
||||
<el-option v-for="(item, index) in datas.dictTypeLists" :key="index" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
<el-select
|
||||
:disabled="isDisabled"
|
||||
v-model="formData.company_type"
|
||||
placeholder="请选择公司类型"
|
||||
clearable
|
||||
:style="{ width: '100%' }"
|
||||
>
|
||||
<el-option
|
||||
v-for="(item, index) in datas.dictTypeLists"
|
||||
:key="index"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
<el-form-item label="省" prop="province">
|
||||
<el-select :disabled="isDisabled" v-model="formData.province" placeholder="请选择省" clearable
|
||||
@change="province_change" :style="{ width: '100%' }">
|
||||
<el-option v-for="(item, index) in datas.provinceOptions" :key="index" :label="item.province_name"
|
||||
:value="item.province_code"></el-option>
|
||||
<el-select
|
||||
:disabled="isDisabled"
|
||||
v-model="formData.province"
|
||||
placeholder="请选择省"
|
||||
clearable
|
||||
@change="province_change"
|
||||
:style="{ width: '100%' }"
|
||||
>
|
||||
<el-option
|
||||
v-for="(item, index) in datas.provinceOptions"
|
||||
:key="index"
|
||||
:label="item.province_name"
|
||||
:value="item.province_code"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
<el-form-item label="市" prop="city">
|
||||
<el-select :disabled="isDisabled" v-model="formData.city" placeholder="请选择市" clearable @change="city_change"
|
||||
:style="{ width: '100%' }">
|
||||
<el-option v-for="(item, index) in datas.cityOptions" :key="index" :label="item.city_name"
|
||||
:value="item.city_code"></el-option>
|
||||
<el-select
|
||||
:disabled="isDisabled"
|
||||
v-model="formData.city"
|
||||
placeholder="请选择市"
|
||||
clearable
|
||||
@change="city_change"
|
||||
:style="{ width: '100%' }"
|
||||
>
|
||||
<el-option
|
||||
v-for="(item, index) in datas.cityOptions"
|
||||
:key="index"
|
||||
:label="item.city_name"
|
||||
:value="item.city_code"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
<el-form-item label="区" prop="area">
|
||||
<el-select :disabled="isDisabled" v-model="formData.area" placeholder="请选择区" clearable @change="area_change"
|
||||
:style="{ width: '100%' }">
|
||||
<el-option v-for="(item, index) in datas.areaOptions" :key="index" :label="item.area_name"
|
||||
:value="item.area_code"></el-option>
|
||||
<el-select
|
||||
:disabled="isDisabled"
|
||||
v-model="formData.area"
|
||||
placeholder="请选择区"
|
||||
clearable
|
||||
@change="area_change"
|
||||
:style="{ width: '100%' }"
|
||||
>
|
||||
<el-option
|
||||
v-for="(item, index) in datas.areaOptions"
|
||||
:key="index"
|
||||
:label="item.area_name"
|
||||
:value="item.area_code"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
<el-form-item label="镇" prop="street">
|
||||
<el-select :disabled="isDisabled" v-model="formData.street" placeholder="请选择镇" clearable
|
||||
@change="street_change" :style="{ width: '100%' }">
|
||||
<el-option v-for="(item, index) in datas.streetOptions" :key="index" :label="item.street_name"
|
||||
:value="item.street_code"></el-option>
|
||||
<el-select
|
||||
:disabled="isDisabled"
|
||||
v-model="formData.street"
|
||||
placeholder="请选择镇"
|
||||
clearable
|
||||
@change="street_change"
|
||||
:style="{ width: '100%' }"
|
||||
>
|
||||
<el-option
|
||||
v-for="(item, index) in datas.streetOptions"
|
||||
:key="index"
|
||||
:label="item.street_name"
|
||||
:value="item.street_code"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="地址" prop="address">
|
||||
<el-input :disabled="isDisabled" v-model="formData.address" placeholder="请输入地址" clearable
|
||||
:style="{ width: '100%' }"></el-input>
|
||||
<el-input
|
||||
:disabled="isDisabled"
|
||||
v-model="formData.address"
|
||||
placeholder="请输入地址"
|
||||
clearable
|
||||
:style="{ width: '100%' }"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -77,38 +146,70 @@
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="姓名" prop="master_name">
|
||||
<el-input :disabled="isDisabled" v-model="formData.master_name" placeholder="请输入姓名" clearable
|
||||
:style="{ width: '100%' }"></el-input>
|
||||
<el-input
|
||||
:disabled="isDisabled"
|
||||
v-model="formData.master_name"
|
||||
placeholder="请输入姓名"
|
||||
clearable
|
||||
:style="{ width: '100%' }"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="职务" prop="master_position">
|
||||
<el-input :disabled="isDisabled" v-model="formData.master_position" placeholder="请输入职务" clearable
|
||||
:style="{ width: '100%' }"></el-input>
|
||||
<el-input
|
||||
:disabled="isDisabled"
|
||||
v-model="formData.master_position"
|
||||
placeholder="请输入职务"
|
||||
clearable
|
||||
:style="{ width: '100%' }"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="手机" prop="master_phone">
|
||||
<el-input :disabled="isDisabled" v-model="formData.master_phone" placeholder="请输入手机" clearable
|
||||
:style="{ width: '100%' }"></el-input>
|
||||
<el-input
|
||||
:disabled="isDisabled"
|
||||
v-model="formData.master_phone"
|
||||
placeholder="请输入手机"
|
||||
clearable
|
||||
:style="{ width: '100%' }"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="邮箱">
|
||||
<el-input :disabled="isDisabled" v-model="formData.master_email" placeholder="请输入邮箱" clearable
|
||||
:style="{ width: '100%' }"></el-input>
|
||||
<el-input
|
||||
:disabled="isDisabled"
|
||||
v-model="formData.master_email"
|
||||
placeholder="请输入邮箱"
|
||||
clearable
|
||||
:style="{ width: '100%' }"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="管理人员" prop="admin_name">
|
||||
<el-input :disabled="isDisabled" v-model="formData.admin_name" placeholder="设置当前公司管理人员" clearable
|
||||
:style="{ width: '100%' }" @click="isMan = true"></el-input>
|
||||
<el-input
|
||||
:disabled="isDisabled"
|
||||
v-model="formData.admin_name"
|
||||
placeholder="设置当前公司管理人员"
|
||||
clearable
|
||||
:style="{ width: '100%' }"
|
||||
@click="isMan = true"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="片区经理" prop="area_manager_name">
|
||||
<el-input :disabled="isDisabled" v-model="formData.area_manager_name" placeholder="选择片区经理" clearable
|
||||
:style="{ width: '100%' }" @click="isAreaManager = true"></el-input>
|
||||
<el-input
|
||||
:disabled="isDisabled"
|
||||
v-model="formData.area_manager_name"
|
||||
placeholder="选择片区经理"
|
||||
clearable
|
||||
:style="{ width: '100%' }"
|
||||
@click="isAreaManager = true"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -117,36 +218,65 @@
|
||||
<div class="tit">其他联系人</div>
|
||||
|
||||
<el-row>
|
||||
<template v-for="(item, index) in formData.other_contacts" :key="index">
|
||||
<template
|
||||
v-for="(item, index) in formData.other_contacts"
|
||||
:key="index"
|
||||
>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="姓名" prop="field120">
|
||||
<el-input :disabled="isDisabled" v-model="item.name" placeholder="请输入姓名" clearable
|
||||
:style="{ width: '100%' }"></el-input>
|
||||
<el-input
|
||||
:disabled="isDisabled"
|
||||
v-model="item.name"
|
||||
placeholder="请输入姓名"
|
||||
clearable
|
||||
:style="{ width: '100%' }"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="职务" prop="field121">
|
||||
<el-input :disabled="isDisabled" v-model="item.position" placeholder="请输入职务" clearable
|
||||
:style="{ width: '100%' }"></el-input>
|
||||
<el-input
|
||||
:disabled="isDisabled"
|
||||
v-model="item.position"
|
||||
placeholder="请输入职务"
|
||||
clearable
|
||||
:style="{ width: '100%' }"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="手机" prop="field122">
|
||||
<el-input :disabled="isDisabled" v-model="item.phone" placeholder="请输入手机" clearable
|
||||
:style="{ width: '100%' }"></el-input>
|
||||
<el-input
|
||||
:disabled="isDisabled"
|
||||
v-model="item.phone"
|
||||
placeholder="请输入手机"
|
||||
clearable
|
||||
:style="{ width: '100%' }"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="邮箱">
|
||||
<el-input :disabled="isDisabled" v-model="item.email" placeholder="请输入邮箱" clearable
|
||||
:style="{ width: '100%' }"></el-input>
|
||||
<el-input
|
||||
:disabled="isDisabled"
|
||||
v-model="item.email"
|
||||
placeholder="请输入邮箱"
|
||||
clearable
|
||||
:style="{ width: '100%' }"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</template>
|
||||
|
||||
<el-col :span="24">
|
||||
<el-form-item label prop="field126">
|
||||
<el-button type="primary" :disabled="isDisabled" size="medium" @click="other">其他联系人</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
:disabled="isDisabled"
|
||||
size="medium"
|
||||
@click="other"
|
||||
>其他联系人</el-button
|
||||
>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -158,20 +288,38 @@
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="公司资质" required>
|
||||
<el-upload :disabled="isDisabled" v-model="formData.qualification.business_license"
|
||||
class="avatar-uploader pl-3" :data="{ cid: 1 }" action="https://worker-task.lihaink.cn/api/upload/image"
|
||||
:show-file-list="false" :on-success="handleAvatarSuccess">
|
||||
<img v-if="formData.qualification.business_license" :src="formData.qualification.business_license"
|
||||
class="avatar" />
|
||||
<el-upload
|
||||
:disabled="isDisabled"
|
||||
v-model="formData.qualification.business_license"
|
||||
class="avatar-uploader pl-3"
|
||||
:data="{ cid: 1 }"
|
||||
action="https://worker-task.lihaink.cn/api/upload/image"
|
||||
:show-file-list="false"
|
||||
:on-success="handleAvatarSuccess"
|
||||
>
|
||||
<img
|
||||
v-if="formData.qualification.business_license"
|
||||
:src="formData.qualification.business_license"
|
||||
class="avatar"
|
||||
/>
|
||||
<el-icon v-else class="avatar-uploader-icon">
|
||||
<Plus />
|
||||
</el-icon>
|
||||
</el-upload>
|
||||
<el-upload :disabled="isDisabled" v-model="formData.qualification.business_licenseB"
|
||||
class="avatar-uploader pl-3" :data="{ cid: 1 }" action="https://worker-task.lihaink.cn/api/upload/image"
|
||||
:show-file-list="false" :on-success="handleAvatarSuccessB">
|
||||
<img v-if="formData.qualification.business_licenseB" :src="formData.qualification.business_licenseB"
|
||||
class="avatar" />
|
||||
<el-upload
|
||||
:disabled="isDisabled"
|
||||
v-model="formData.qualification.business_licenseB"
|
||||
class="avatar-uploader pl-3"
|
||||
:data="{ cid: 1 }"
|
||||
action="https://worker-task.lihaink.cn/api/upload/image"
|
||||
:show-file-list="false"
|
||||
:on-success="handleAvatarSuccessB"
|
||||
>
|
||||
<img
|
||||
v-if="formData.qualification.business_licenseB"
|
||||
:src="formData.qualification.business_licenseB"
|
||||
class="avatar"
|
||||
/>
|
||||
<el-icon v-else class="avatar-uploader-icon">
|
||||
<Plus />
|
||||
</el-icon>
|
||||
@ -180,20 +328,38 @@
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="其他资质" required>
|
||||
<el-upload :disabled="isDisabled" v-model="formData.qualification.bank_account" class="avatar-uploader pl-3"
|
||||
:data="{ cid: 1 }" action="https://worker-task.lihaink.cn/api/upload/image" :show-file-list="false"
|
||||
:on-success="handleAvatarSuccess_two">
|
||||
<img v-if="formData.qualification.bank_account" :src="formData.qualification.bank_account"
|
||||
class="avatar" />
|
||||
<el-upload
|
||||
:disabled="isDisabled"
|
||||
v-model="formData.qualification.bank_account"
|
||||
class="avatar-uploader pl-3"
|
||||
:data="{ cid: 1 }"
|
||||
action="https://worker-task.lihaink.cn/api/upload/image"
|
||||
:show-file-list="false"
|
||||
:on-success="handleAvatarSuccess_two"
|
||||
>
|
||||
<img
|
||||
v-if="formData.qualification.bank_account"
|
||||
:src="formData.qualification.bank_account"
|
||||
class="avatar"
|
||||
/>
|
||||
<el-icon v-else class="avatar-uploader-icon">
|
||||
<Plus />
|
||||
</el-icon>
|
||||
</el-upload>
|
||||
<el-upload :disabled="isDisabled" v-model="formData.qualification.bank_accountB"
|
||||
class="avatar-uploader pl-3" :data="{ cid: 1 }" action="https://worker-task.lihaink.cn/api/upload/image"
|
||||
:show-file-list="false" :on-success="handleAvatarSuccess_twoB">
|
||||
<img v-if="formData.qualification.bank_accountB" :src="formData.qualification.bank_accountB"
|
||||
class="avatar" />
|
||||
<el-upload
|
||||
:disabled="isDisabled"
|
||||
v-model="formData.qualification.bank_accountB"
|
||||
class="avatar-uploader pl-3"
|
||||
:data="{ cid: 1 }"
|
||||
action="https://worker-task.lihaink.cn/api/upload/image"
|
||||
:show-file-list="false"
|
||||
:on-success="handleAvatarSuccess_twoB"
|
||||
>
|
||||
<img
|
||||
v-if="formData.qualification.bank_accountB"
|
||||
:src="formData.qualification.bank_accountB"
|
||||
class="avatar"
|
||||
/>
|
||||
<el-icon v-else class="avatar-uploader-icon">
|
||||
<Plus />
|
||||
</el-icon>
|
||||
@ -209,30 +375,63 @@
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="签约方" prop="field130">
|
||||
<el-input v-model="formData.party_a_name" placeholder="请选择签约方" clearable :style="{ width: '100%' }"
|
||||
@click="openCompany" :disabled="userStore.userInfo.root == 0 ? true : false"></el-input>
|
||||
<el-input
|
||||
v-model="formData.party_a_name"
|
||||
placeholder="请选择签约方"
|
||||
clearable
|
||||
:style="{ width: '100%' }"
|
||||
@click="openCompany"
|
||||
:disabled="userStore.userInfo.root == 0 ? true : false"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label-width="100px" label="被签约公司" prop="field131">
|
||||
<el-input :disabled="true" v-model="formData.company_name" placeholder="请输入被签约公司" clearable
|
||||
:style="{ width: '100%' }"></el-input>
|
||||
<el-form-item
|
||||
label-width="100px"
|
||||
label="被签约公司"
|
||||
prop="field131"
|
||||
>
|
||||
<el-input
|
||||
:disabled="true"
|
||||
v-model="formData.company_name"
|
||||
placeholder="请输入被签约公司"
|
||||
clearable
|
||||
:style="{ width: '100%' }"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label-width="100px" label="合同类型" prop="contract_type">
|
||||
<el-select :disabled="isDisabled" v-model="formData.contract.contract_type" placeholder="请选择合同类型" clearable
|
||||
:style="{ width: '100%' }">
|
||||
<el-option v-for="(item, index) in datas.contract_type" :key="index" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
<el-form-item
|
||||
label-width="100px"
|
||||
label="合同类型"
|
||||
prop="contract_type"
|
||||
>
|
||||
<el-select
|
||||
:disabled="isDisabled"
|
||||
v-model="formData.contract.contract_type"
|
||||
placeholder="请选择合同类型"
|
||||
clearable
|
||||
:style="{ width: '100%' }"
|
||||
>
|
||||
<el-option
|
||||
v-for="(item, index) in datas.contract_type"
|
||||
:key="index"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="12">
|
||||
<el-form-item label-width="100px" label="合同编号" prop="field133">
|
||||
<el-input placeholder="系统自动生成" v-model="formData.contract.contract_no" clearable :style="{ width: '100%' }"
|
||||
:disabled="true"></el-input>
|
||||
<el-input
|
||||
placeholder="系统自动生成"
|
||||
v-model="formData.contract.contract_no"
|
||||
clearable
|
||||
:style="{ width: '100%' }"
|
||||
:disabled="true"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -241,10 +440,19 @@
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="合同上传" required>
|
||||
<el-upload :disabled="isDisabled" v-model:file-list="fileList" :headers="{ Token: userStore.token }"
|
||||
class="upload-demo" action="https://worker-task.lihaink.cn/adminapi/upload/file" multiple :limit="1"
|
||||
:on-success="handleAvatarSuccess_three">
|
||||
<el-button :disabled="isDisabled" type="primary">上传</el-button>
|
||||
<el-upload
|
||||
:disabled="isDisabled"
|
||||
v-model:file-list="fileList"
|
||||
:headers="{ Token: userStore.token }"
|
||||
class="upload-demo"
|
||||
action="https://worker-task.lihaink.cn/adminapi/upload/file"
|
||||
multiple
|
||||
:limit="1"
|
||||
:on-success="handleAvatarSuccess_three"
|
||||
>
|
||||
<el-button :disabled="isDisabled" type="primary"
|
||||
>上传</el-button
|
||||
>
|
||||
</el-upload>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@ -253,8 +461,17 @@
|
||||
|
||||
<el-col :span="24" class="el-card pt-6">
|
||||
<el-form-item label prop="field139">
|
||||
<el-button v-if="isEdit" type="primary" size="medium" @click="create">修改</el-button>
|
||||
<el-button v-else type="primary" :disabled="isDisabled" size="medium" @click="create">创建</el-button>
|
||||
<el-button v-if="isEdit" type="primary" size="medium" @click="create"
|
||||
>修改</el-button
|
||||
>
|
||||
<el-button
|
||||
v-else
|
||||
type="primary"
|
||||
:disabled="isDisabled"
|
||||
size="medium"
|
||||
@click="create"
|
||||
>创建</el-button
|
||||
>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-form>
|
||||
@ -629,9 +846,7 @@ defineExpose({
|
||||
.tit {
|
||||
font-size: 1.2rem;
|
||||
translate: 1vw -1vw;
|
||||
background-color: white;
|
||||
}
|
||||
|
||||
.avatar-uploader .el-upload {
|
||||
width: 10vw;
|
||||
height: 6.3vw;
|
||||
|
||||
@ -120,6 +120,7 @@ const handleClose = () => {
|
||||
emit("close");
|
||||
};
|
||||
|
||||
|
||||
defineExpose({
|
||||
open,
|
||||
setFormData,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user