Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
shidongli 2022-11-11 15:19:00 +08:00
commit bf4ef72566

View File

@ -71,18 +71,18 @@
</el-select>
</el-form-item>
<el-form-item label="居住小区" prop="communityAliasName">
<!-- <el-form-item label="居住小区" prop="communityAliasName">
<el-input
v-model="queryParams.communityAliasName"
placeholder="请输入居住小区"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="姓名" prop="patientName">
</el-form-item> -->
<el-form-item label="会员姓名" prop="patientName">
<el-input
v-model="queryParams.patientName"
placeholder="请输入姓名"
placeholder="请输入会员姓名"
clearable
@keyup.enter.native="handleQuery"
/>
@ -158,18 +158,18 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="姓名" align="center" prop="patientName" />
<el-table-column label="会员姓名" align="center" prop="patientName" />
<el-table-column
label="所属区域"
align="center"
prop="area"
width="300"
/>
<el-table-column
<!-- <el-table-column
label="居住小区"
align="center"
prop="communityAliasName"
/>
/> -->
<el-table-column label="身份证号" align="center" prop="cardNo" />
<el-table-column label="联系电话" align="center" prop="phone" />
<el-table-column label="居住地址" align="center" prop="address" />
@ -231,20 +231,16 @@
label-width="110px"
:inline="true"
>
<el-form-item label="姓名" prop="patientName">
<el-form-item label="客户姓名" prop="patientName">
<el-input
v-model="form.patientName"
placeholder="请输入姓名"
placeholder="请输入客户姓名"
maxlength="20"
:disabled="true"
/>
</el-form-item>
<!-- <el-form-item label="所属区域" prop="areaName">
<el-input v-model="form.areaName" placeholder="请输入所属区域" :disabled="true"/>
</el-form-item> -->
<el-form-item label="所属区域" prop="areaCode" :disabled="true">
<!-- <el-input v-model="form.province" placeholder="请输入姓名" :disabled="true"/> -->
<!-- <el-input v-model="form.city" placeholder="请输入姓名" :disabled="true" style="width:100px"/> -->
<!-- <input type="text"> -->
<el-select
v-model="form.province"
clearable
@ -318,14 +314,7 @@
:disabled="true"
/>
</el-form-item>
<el-form-item label="客户姓名" prop="patientName">
<el-input
v-model="form.patientName"
placeholder="请输入客户姓名"
maxlength="20"
:disabled="true"
/>
</el-form-item>
<el-form-item label="联系电话" prop="phone">
<el-input
v-model="form.phone"