Merge branch 'master' into wkz

pull/781/head
quu 2025-05-22 21:23:36 +09:00
commit 65c88a24ef
4 changed files with 93 additions and 92 deletions

View File

@ -7,30 +7,6 @@
:rules="formRules" :rules="formRules"
label-width="100px" label-width="100px"
> >
<el-row>
<el-col :span="12">
<el-form-item label="联系人姓名" prop="name">
<el-input v-model="formData.name" placeholder="请输入姓名" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="负责人" prop="ownerUserId">
<el-select
v-model="formData.ownerUserId"
:disabled="formType !== 'create'"
filterable
class="w-1/1"
>
<el-option
v-for="item in userOptions"
:key="item.id"
:label="item.nickname"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客户名称" prop="customerId"> <el-form-item label="客户名称" prop="customerId">
@ -58,6 +34,30 @@
</el-select> --> </el-select> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="联系人" prop="name">
<el-input v-model="formData.name" placeholder="请输入联系人" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="登记人" prop="ownerUserId">
<el-select
v-model="formData.ownerUserId"
:disabled="formType !== 'create'"
filterable
class="w-1/1"
>
<el-option
v-for="item in userOptions"
:key="item.id"
:label="item.nickname"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="手机" prop="mobile"> <el-form-item label="手机" prop="mobile">
<el-input v-model="formData.mobile" placeholder="请输入手机" /> <el-input v-model="formData.mobile" placeholder="请输入手机" />
@ -65,23 +65,24 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="电话" prop="telephone"> <el-form-item label="电话" prop="telephone">
<el-input v-model="formData.telephone" oninput = "value=value.replace(/[^\d]/g,'')" placeholder="请输入电话" /> <el-input v-model="formData.telephone" oninput = "value=value.replace(/[^\d]/g,'')" placeholder="请输入电话" />
</el-form-item> </el-form-item>
</el-col> </el-col>-->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="邮箱" prop="email"> <el-form-item label="邮箱" prop="email">
<el-input v-model="formData.email" placeholder="请输入邮箱" /> <el-input v-model="formData.email" placeholder="请输入邮箱" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="微信" prop="wechat"> <el-form-item label="微信" prop="wechat">
<el-input v-model="formData.wechat" placeholder="请输入微信" /> <el-input v-model="formData.wechat" placeholder="请输入微信" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="职位" prop="post"> <el-form-item label="职位" prop="post">
<el-input v-model="formData.post" placeholder="请输入职位" /> <el-input v-model="formData.post" placeholder="请输入职位" />
@ -127,7 +128,7 @@
</el-col> --> </el-col> -->
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="地址" prop="areaId"> <el-form-item label="地址" prop="areaId">
<el-cascader <el-cascader
v-model="formData.areaId" v-model="formData.areaId"
@ -139,15 +140,15 @@
placeholder="请选择城市" placeholder="请选择城市"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>-->
<el-col :span="12"> <el-col >
<el-form-item label="详细地址" prop="detailAddress"> <el-form-item label="家庭地址" prop="detailAddress">
<el-input v-model="formData.detailAddress" placeholder="请输入详细地址" /> <el-input v-model="formData.detailAddress" placeholder="请输入家庭地址" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="下次联系时间" prop="contactNextTime"> <el-form-item label="下次联系时间" prop="contactNextTime">
<el-date-picker <el-date-picker
v-model="formData.contactNextTime" v-model="formData.contactNextTime"
@ -157,8 +158,8 @@
class="!w-1/1" class="!w-1/1"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>-->
<el-col :span="12"> <el-col >
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="formData.remark" placeholder="请输入备注" /> <el-input type="textarea" v-model="formData.remark" placeholder="请输入备注" />
</el-form-item> </el-form-item>

View File

@ -33,7 +33,7 @@
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="电话" prop="telephone"> <!-- <el-form-item label="电话" prop="telephone">
<el-input <el-input
v-model="queryParams.telephone" v-model="queryParams.telephone"
class="!w-240px" class="!w-240px"
@ -41,7 +41,7 @@
placeholder="请输入电话" placeholder="请输入电话"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>-->
<!-- <el-form-item label="微信" prop="wechat"> <!-- <el-form-item label="微信" prop="wechat">
<el-input <el-input
v-model="queryParams.wechat" v-model="queryParams.wechat"
@ -73,7 +73,7 @@
<Icon class="mr-5px" icon="ep:plus" /> <Icon class="mr-5px" icon="ep:plus" />
新增 新增
</el-button> </el-button>
<el-button <!-- <el-button
v-hasPermi="['crm:contact:export']" v-hasPermi="['crm:contact:export']"
:loading="exportLoading" :loading="exportLoading"
plain plain
@ -82,7 +82,7 @@
> >
<Icon class="mr-5px" icon="ep:download" /> <Icon class="mr-5px" icon="ep:download" />
导出 导出
</el-button> </el-button>-->
</el-form-item> </el-form-item>
</el-form> </el-form>
</ContentWrap> </ContentWrap>

View File

@ -26,10 +26,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="线索拓展人" prop="developer"> <el-form-item label="拓展人" prop="developer">
<el-select <el-select
class="w-1/1" class="w-1/1"
placeholder="请选择线索拓展人" placeholder="请选择拓展人"
v-model="formData.developer" v-model="formData.developer"
filterable filterable
> >
@ -44,6 +44,19 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12">
<el-form-item label="客户来源" prop="source">
<el-select v-model="formData.source" filterable placeholder="请选择客户来源" class="w-1/1">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.CRM_CUSTOMER_SOURCE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="合作类型" prop="cooperationType"> <el-form-item label="合作类型" prop="cooperationType">
<el-select v-model="formData.cooperationType" filterable placeholder="请选择合作类型" class="w-1/1"> <el-select v-model="formData.cooperationType" filterable placeholder="请选择合作类型" class="w-1/1">
@ -68,6 +81,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="法人代表" prop="legalPersonName">
<el-input v-model="formData.legalPersonName" disabled placeholder="" />
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<!-- <el-col :span="12"> <!-- <el-col :span="12">
@ -86,18 +104,18 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-col :span="12"> <!-- <el-col :span="12">-->
<el-form-item label="协助人" prop=""> <!-- <el-form-item label="协助人" prop="">-->
<el-select v-model="formData.assist" collapse-tags collapse-tags-tooltip multiple filterable placeholder="请选择协助人" class="w-1/1"> <!-- <el-select v-model="formData.assist" collapse-tags collapse-tags-tooltip multiple filterable placeholder="请选择协助人" class="w-1/1">-->
<el-option <!-- <el-option-->
v-for="item in userOptions" <!-- v-for="item in userOptions"-->
:key="item.id" <!-- :key="item.id"-->
:label="item.nickname" <!-- :label="item.nickname"-->
:value="item.id" <!-- :value="item.id"-->
/> <!-- />-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<!-- <el-col :span="12">--> <!-- <el-col :span="12">-->
<!-- <el-form-item label="线索拓展人" prop="">--> <!-- <el-form-item label="线索拓展人" prop="">-->
<!-- <el-select v-model="formData.clueDeveloper" filterable placeholder="请选择线索拓展人" class="w-1/1">--> <!-- <el-select v-model="formData.clueDeveloper" filterable placeholder="请选择线索拓展人" class="w-1/1">-->
@ -110,19 +128,6 @@
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="12">
<el-form-item label="客户来源" prop="source">
<el-select v-model="formData.source" filterable placeholder="请选择客户来源" class="w-1/1">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.CRM_CUSTOMER_SOURCE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="手机号" prop="mobile"> <el-form-item label="手机号" prop="mobile">
<el-input v-model="formData.mobile" placeholder="请输入手机号" /> <el-input v-model="formData.mobile" placeholder="请输入手机号" />
@ -150,7 +155,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="客户级别" prop="level"> <el-form-item label="客户级别" prop="level">
<el-select v-model="formData.level" placeholder="请选择客户级别" > <el-select v-model="formData.level" placeholder="请选择客户级别" >
<el-option <el-option
@ -161,7 +166,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>-->
<!-- <el-row> <!-- <el-row>
<el-col :span="12"> <el-col :span="12">
@ -185,21 +190,16 @@
<el-input v-model="formData.serviceStatus" disabled placeholder="营业状态" /> <el-input v-model="formData.serviceStatus" disabled placeholder="营业状态" />
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-col :span="12">
<el-form-item label="法人代表" prop="legalPersonName">
<el-input v-model="formData.legalPersonName" disabled placeholder="" />
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="注册资本" prop="registerCapital"> <el-form-item label="注册资本" prop="registerCapital">
<el-input v-model="formData.registerCapital" disabled placeholder="" /> <el-input v-model="formData.registerCapital" disabled placeholder="" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="网站" prop=""> <el-form-item label="网站" prop="">
<el-input v-model="formData.website" placeholder="请输入网站" /> <el-input v-model="formData.website" placeholder="请输入网站" />
</el-form-item> </el-form-item>
</el-col> </el-col>-->
<!-- <el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="所属行业" prop="industryId"> <el-form-item label="所属行业" prop="industryId">
<el-select v-model="formData.industryId" placeholder="所属行业" disabled> <el-select v-model="formData.industryId" placeholder="所属行业" disabled>
@ -236,7 +236,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="地址" prop="areaId"> <el-form-item label="地址" prop="areaId">
<el-cascader <el-cascader
v-model="formData.areaId" v-model="formData.areaId"
@ -248,13 +248,13 @@
placeholder="请选择地址" placeholder="请选择地址"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>-->
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="详细地址" prop="detailAddress"> <el-form-item label="详细地址" prop="detailAddress">
<el-input v-model="formData.detailAddress" placeholder="请输入详细地址" /> <el-input v-model="formData.detailAddress" placeholder="请输入详细地址" />
</el-form-item> </el-form-item>
</el-col> </el-col>-->
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="下次联系时间" prop="contactNextTime"> <el-form-item label="下次联系时间" prop="contactNextTime">
<el-date-picker <el-date-picker
v-model="formData.contactNextTime" v-model="formData.contactNextTime"
@ -264,7 +264,7 @@
class="!w-1/1" class="!w-1/1"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>-->
</el-row> </el-row>

View File

@ -44,7 +44,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="客户级别" prop="level"> <!-- <el-form-item label="客户级别" prop="level">
<el-select <el-select
v-model="queryParams.level" v-model="queryParams.level"
class="!w-240px" class="!w-240px"
@ -58,8 +58,8 @@
:value="dict.value" :value="dict.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>-->
<el-form-item label="客户来源" prop="source"> <!-- <el-form-item label="客户来源" prop="source">
<el-select <el-select
v-model="queryParams.source" v-model="queryParams.source"
class="!w-240px" class="!w-240px"
@ -73,7 +73,7 @@
:value="dict.value" :value="dict.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>-->
<el-form-item> <el-form-item>
<el-button @click="handleQuery"> <el-button @click="handleQuery">
<Icon class="mr-5px" icon="ep:search" /> <Icon class="mr-5px" icon="ep:search" />
@ -87,11 +87,11 @@
<Icon class="mr-5px" icon="ep:plus" /> <Icon class="mr-5px" icon="ep:plus" />
新增 新增
</el-button> </el-button>
<el-button v-hasPermi="['crm:customer:import']" plain type="warning" @click="handleImport"> <!-- <el-button v-hasPermi="['crm:customer:import']" plain type="warning" @click="handleImport">
<Icon icon="ep:upload" /> <Icon icon="ep:upload" />
导入 导入
</el-button> </el-button>-->
<el-button <!-- <el-button
v-hasPermi="['crm:customer:export']" v-hasPermi="['crm:customer:export']"
:loading="exportLoading" :loading="exportLoading"
plain plain
@ -100,7 +100,7 @@
> >
<Icon class="mr-5px" icon="ep:download" /> <Icon class="mr-5px" icon="ep:download" />
导出 导出
</el-button> </el-button>-->
</el-form-item> </el-form-item>
</el-form> </el-form>
</ContentWrap> </ContentWrap>
@ -110,7 +110,7 @@
<el-tabs v-model="activeName" @tab-click="handleTabClick"> <el-tabs v-model="activeName" @tab-click="handleTabClick">
<el-tab-pane label="我负责的" name="1" /> <el-tab-pane label="我负责的" name="1" />
<el-tab-pane label="我参与的" name="2" /> <el-tab-pane label="我参与的" name="2" />
<!-- <el-tab-pane label="下属负责的" name="3" /> --> <el-tab-pane label="下属负责的" name="3" />
</el-tabs> </el-tabs>
<el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true"> <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
<el-table-column align="center" fixed="left" label="客户名称" prop="name" width="250"> <el-table-column align="center" fixed="left" label="客户名称" prop="name" width="250">