|
|
|
@ -208,10 +208,10 @@ |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="3"> |
|
|
|
<el-form-item label="介绍人" prop="salesman"> |
|
|
|
<el-select v-model="form.salesman" placeholder="请选择" filterable clearable allow-create |
|
|
|
size="small"> |
|
|
|
<el-option v-for="item in dictSalesman" :key="item.id" :label="item.surname" :value="item.surname"/> |
|
|
|
<el-form-item label="介绍人" prop="salesman"> |
|
|
|
<el-select v-model="form.salesman" placeholder="请选择" filterable clearable allow-create size="small"> |
|
|
|
<el-option v-for="item in dictSalesman" :key="item.id" :label="item.surname" |
|
|
|
:value="item.surname" /> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
@ -568,12 +568,12 @@ |
|
|
|
class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowick" @row-dblclick="patientDblclick" |
|
|
|
ref="patientList"> |
|
|
|
<el-table-column type="index" width="30" align="center" /> |
|
|
|
<el-table-column prop="patientNo" label="档案号" min-width="80" align="center" sortable/> |
|
|
|
<el-table-column prop="customerOrgName" label="单位" min-width="180" show-overflow-tooltip sortable/> |
|
|
|
<el-table-column prop="patientNo" label="档案号" min-width="80" align="center" sortable /> |
|
|
|
<el-table-column prop="customerOrgName" label="单位" min-width="180" show-overflow-tooltip sortable /> |
|
|
|
<el-table-column prop="departmentName" label="部门" min-width="120" show-overflow-tooltip sortable> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<div> |
|
|
|
{{ scope.row.customerOrgName == scope.row.departmentName ? '':scope.row.departmentName }} |
|
|
|
{{ scope.row.customerOrgName == scope.row.departmentName ? '' : scope.row.departmentName }} |
|
|
|
</div> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
@ -584,8 +584,8 @@ |
|
|
|
</div> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="medicalTimes" label="次数" min-width="70" align="center" sortable/> |
|
|
|
<el-table-column prop="displayName" label="姓名" min-width="70" align="center" sortable/> |
|
|
|
<el-table-column prop="medicalTimes" label="次数" min-width="70" align="center" sortable /> |
|
|
|
<el-table-column prop="displayName" label="姓名" min-width="70" align="center" sortable /> |
|
|
|
<el-table-column prop="sexId" label="性别" min-width="50" align="center" sortable> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<div> |
|
|
|
@ -614,9 +614,9 @@ |
|
|
|
</div> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="idNo" label="身份证号" min-width="160" align="center" sortable/> |
|
|
|
<el-table-column prop="mobileTelephone" label="手机号" min-width="110" align="center" sortable/> |
|
|
|
<el-table-column prop="telephone" label="电话" min-width="120" align="center" sortable/> |
|
|
|
<el-table-column prop="idNo" label="身份证号" min-width="160" align="center" sortable /> |
|
|
|
<el-table-column prop="mobileTelephone" label="手机号" min-width="110" align="center" sortable /> |
|
|
|
<el-table-column prop="telephone" label="电话" min-width="120" align="center" sortable /> |
|
|
|
</el-table> |
|
|
|
<span slot="footer" class="dialog-footer"> |
|
|
|
<el-button class="commonbutton" @click="dialogVisible = false" style="width:90px;">取消</el-button> |
|
|
|
@ -1071,7 +1071,7 @@ export default { |
|
|
|
|
|
|
|
hc_warn_mode: '1', //0-仅提醒；1-提醒并决择；2-有互斥项目时不允许保存 |
|
|
|
|
|
|
|
dictSalesman:[] // |
|
|
|
dictSalesman: [] // |
|
|
|
}; |
|
|
|
}, |
|
|
|
|
|
|
|
@ -1321,9 +1321,9 @@ export default { |
|
|
|
}) |
|
|
|
|
|
|
|
// 业务员 {operatorTypes:["1","3"]} |
|
|
|
postapi('/api/identity/users/GetListByOperatorType',{operatorTypes:["0","1","2","3","4"]}) |
|
|
|
postapi('/api/identity/users/GetListByOperatorType', { operatorTypes: ["0", "1", "2", "3", "4"] }) |
|
|
|
.then(res => { |
|
|
|
if (res.code > -1) { |
|
|
|
if (res.code > -1) { |
|
|
|
this.dictSalesman = res.data |
|
|
|
} |
|
|
|
}) |
|
|
|
@ -1694,6 +1694,31 @@ export default { |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 新增/编辑读身份证的区分处理 |
|
|
|
readCardAfter(idNos) { |
|
|
|
return new Promise((resolve, reject) => { |
|
|
|
if (this.form.id) { |
|
|
|
resolve() |
|
|
|
} else { |
|
|
|
if ((this.form.patientName && this.form.patientName != idNos.Name) || (this.form.idNo && this.form.idNo != idNos.IDCode)) { |
|
|
|
this.$confirm("当前人员姓名和身份证号与读取身份证信息不一致, 是否以读取到身份证的信息更新当前人员?", "提示", { |
|
|
|
confirmButtonText: "是", |
|
|
|
cancelButtonText: " 否 ", |
|
|
|
type: "warning", |
|
|
|
}) |
|
|
|
.then(() => { |
|
|
|
resolve() |
|
|
|
}) |
|
|
|
.catch(err => { |
|
|
|
reject(err) |
|
|
|
}) |
|
|
|
} else { |
|
|
|
resolve() |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
//读取身份证信息 |
|
|
|
peopleIcCard() { |
|
|
|
if (!this.$peisAPI) { |
|
|
|
@ -1705,17 +1730,23 @@ export default { |
|
|
|
let lres = JSON.parse(res) |
|
|
|
if (lres.code >= -1) { |
|
|
|
let idNos = parsIcCardtoLocal(lres.data, this.dict.sex, this.dict.nation) |
|
|
|
this.form.patientName = idNos.Name |
|
|
|
this.form.birthDate = idNos.birthDate |
|
|
|
this.form.sexId = idNos.sexId |
|
|
|
this.form.age = idNos.age |
|
|
|
this.form.nationId = idNos.nationId |
|
|
|
this.form.idNo = idNos.IDCode |
|
|
|
this.form.address = idNos.Address |
|
|
|
this.peoplePhoto = 'data:image/bmp;base64,' + idNos.Photo |
|
|
|
// this.patientRegister.photo = 'data:image/bmp;base64,' + idNos.Photo |
|
|
|
// isNameContinue 身份证号查重后是否姓名查重 |
|
|
|
this.changeIdNo('N') // 触发身份证查询档案号（Y:身份证没查到，再按名字查，N：仅按身份证号查） |
|
|
|
|
|
|
|
// 如果是编辑状态，则加身份证与之前登记的人员信息相等提示 |
|
|
|
this.readCardAfter(idNos) |
|
|
|
.then(() => { |
|
|
|
this.form.patientName = idNos.Name |
|
|
|
this.form.birthDate = idNos.birthDate |
|
|
|
this.form.sexId = idNos.sexId |
|
|
|
this.form.age = idNos.age |
|
|
|
this.form.nationId = idNos.nationId |
|
|
|
this.form.idNo = idNos.IDCode |
|
|
|
this.form.address = idNos.Address |
|
|
|
this.peoplePhoto = 'data:image/bmp;base64,' + idNos.Photo |
|
|
|
// this.patientRegister.photo = 'data:image/bmp;base64,' + idNos.Photo |
|
|
|
// isNameContinue 身份证号查重后是否姓名查重 |
|
|
|
this.changeIdNo('N') // 触发身份证查询档案号（Y:身份证没查到，再按名字查，N：仅按身份证号查） |
|
|
|
}) |
|
|
|
|
|
|
|
} else { |
|
|
|
this.$message.error({ showClose: true, message: `${lres.message}` }) |
|
|
|
} |
|
|
|
@ -2059,7 +2090,7 @@ export default { |
|
|
|
this.$message.warning({ showClose: true, message: fields[Object.keys(fields)[0]][0].message }); |
|
|
|
return false |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 手机号非必填时，如有填手机号，也要再验证手机号是否合法 |
|
|
|
if (this.form['mobileTelephone']) { |
|
|
|
if (!isValidMobileNumber(this.form['mobileTelephone'])) { |
|
|
|
|
pengjun
4 months ago