Browse Source

custerOrg SEO

master
pengjun 2 years ago
parent
commit
7db60363e4
  1. 8
      src/components/customerOrg/ContactPerson.vue
  2. 18
      src/components/customerOrg/customerOrgEdit.vue
  3. 2
      src/components/customerOrg/customerOrgRegister.vue
  4. 2
      src/components/customerOrg/customerOrgTree.vue
  5. 2
      src/components/patientRegister/Camera.vue
  6. 38
      src/components/patientRegister/PatientRegisterEdit.vue
  7. 2
      src/components/patientRegister/PatientRegisterList.vue
  8. 1
      src/store/index.js
  9. 12
      src/utlis/proFunc.js

8
src/components/customerOrg/ContactPerson.vue

@ -202,7 +202,7 @@ export default {
add() {
//this.$message.success(" addContactPerson");
if (!this.customerOrg.customerOrgId) {
alert("没有体检单位信息");
this.$message.warning("没有体检单位信息");
return;
}
this.form = { customerOrgId: this.customerOrg.customerOrgId };
@ -215,10 +215,10 @@ export default {
edit() {
//this.$message.success(" editContactPerson");
if (!this.customerOrg.customerOrgId) {
alert("没有体检单位信息");
this.$message.warning("没有体检单位信息");
return;
} else if (!this.personId) {
alert("请先选择要编辑的联系人");
this.$message.warning("请先选择要编辑的联系人");
return;
}
this.dialogContactPerson = true;
@ -229,7 +229,7 @@ export default {
del() {
//this.$message.success(" delContactPerson");
if (!this.personId) {
alert("请先选择要编辑的联系人");
this.$message.warning("请先选择要编辑的联系人");
return;
}

18
src/components/customerOrg/customerOrgEdit.vue

@ -15,12 +15,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="单位名称" prop="displayName">
<el-input v-model="form.displayName" placeholder="请输入单位名称" />
<el-input v-model="form.displayName" placeholder="请输入单位名称" :disabled="customerOrg.oprStatus ? false:true"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单位简称" prop="shortName">
<el-input v-model="form.shortName" placeholder="请输入单位简称" />
<el-input v-model="form.shortName" placeholder="请输入单位简称" :disabled="customerOrg.oprStatus ? false:true"/>
</el-form-item>
</el-col>
<el-col :span="8">
@ -190,7 +190,7 @@
>
</div>
<div class="btnList">
<el-button type="success" @click="onSubmit('form')" class="btnClass"
<el-button type="success" @click="btnSubmit('form')" class="btnClass"
>保存</el-button
>
</div>
@ -406,7 +406,7 @@ export default {
},
//
onSubmit(formName) {
btnSubmit(formName) {
let body = {};
console.log("vuex data", this.customerOrg.customerOrgRd);
this.$refs[formName].validate((valid, fields) => {
@ -446,6 +446,7 @@ export default {
this.customerOrg.customerOrgId = res.data.id;
this.customerOrg.customerOrgRd = res.data;
this.getCustomerOrgTree("insert", res.data);
this.customerOrg.oprStatus = 'edit'
}
});
} else {
@ -456,6 +457,7 @@ export default {
this.$message.success("更新 操作成功");
let lbody = { id: this.customerOrg.customerOrgRd.id, ...body };
this.getCustomerOrgTree("update", lbody);
this.customerOrg.oprStatus = 'edit'
}
}
);
@ -468,7 +470,8 @@ export default {
if (child) {
if (!this.customerOrg.customerOrgId) {
this.$message.info("请先选择单位");
this.$message.warning("请先选择上级单位");
this.customerOrg.oprStatus = ''
return;
}
this.customerOrg.customerOrgRd.id = "";
@ -486,6 +489,7 @@ export default {
parentId: null,
};
}
this.customerOrg.oprStatus = 'add'
objCopy(this.customerOrg.customerOrgRd, this.form);
this.customerOrg.customerOrgId = "";
@ -516,8 +520,10 @@ export default {
this.customerOrg.customerOrgRegisterList = []
this.customerOrg.contactPersonList = []
this.customerOrg.contactMethodList = []
this.setData({ key: "customerOrg.customerOrgRd", value: { id: "" } });
this.setData({ key: "customerOrg.customerOrgRd", value: { id: "" } });
this.$refs[formName].resetFields();
this.customerOrg.oprStatus = ''
this.customerOrg.customerOrgId = ''
}
})
.catch((err) => {

2
src/components/customerOrg/customerOrgRegister.vue

@ -98,7 +98,7 @@ export default {
setOrgRegisterState(IsComplete) {
if (!this.customerOrg.customerOrgId || !this.customerOrgRegisterId) {
console.log(this.customerOrg.customerOrgId, this.customerOrgRegisterId);
alert("请选中要操作的体检次数");
this.$message.warning("请选中要操作的体检次数");
return;
}
//console.log(`/api/app/customer-org-register/${this.customerOrgRegisterId}/state`)

2
src/components/customerOrg/customerOrgTree.vue

@ -119,9 +119,11 @@ export default {
//
treeclick(data) {
//this.$message.success(data.id + " " + data.displayName);// api/app/customer-org/3a0c0439-a5ca-8a63-b2b9-e0eb24cb58b1
this.customerOrg.oprStatus = 'edit'
this.customerOrg.customerOrgId = data.id;
this.getCustomerOrgRd(data.id);
//
let firstId = data.id //ID
if(data.parentId){

2
src/components/patientRegister/Camera.vue

@ -165,7 +165,7 @@ export default {
this.videoHeight
);
// base64url
this.imgSrc = this.thisCancas.toDataURL("image/png");
this.imgSrc = this.thisCancas.toDataURL("image/jpeg"); // jpeg png
console.log('this.imgSrc',this.imgSrc);
},
//

38
src/components/patientRegister/PatientRegisterEdit.vue

@ -336,7 +336,7 @@
<el-button type="primary" class="btnClass" @click="rdCopy">复制新增</el-button>
</div>
<div class="btn">
<el-button type="success" class="btnClass" @click="Onsubmit('form', true)">保存</el-button>
<el-button type="success" class="btnClass" @click="btnSubmit('form', true)">保存</el-button>
</div>
<div class="btn">
<el-button type="primary" class="btnClass" @click="lisRequest">检验单申请</el-button>
@ -375,22 +375,22 @@
<!--查询条件-->
<div style="position: absolute;top:40px;left:160px;display: flex; flex-wrap: wrap; height:60px;">
<div class="query">
<span>查找&nbsp;&nbsp;条码号</span>
<span class="querySpan">查找&nbsp;&nbsp;条码号</span>
<el-input placeholder="条码号" v-model="query.patientRegisterNo" size="small"
clearable style="width: 140px" @change="quickQuery('patientRegisterNo')"/>
</div>
<div class="query">
<span>档案号</span>
<span class="querySpan">档案号</span>
<el-input placeholder="档案号" v-model="query.patientNo" size="small"
clearable style="width: 100px" @change="quickQuery('patientNo')" />
</div>
<div class="query">
<span>姓名</span>
<span class="querySpan">姓名</span>
<el-input placeholder="姓名" v-model="query.patientName" size="small"
clearable style="width: 80px" @change="quickQuery('patientName')" />
</div>
<div class="query">
<span>手机号</span>
<span class="querySpan">手机号</span>
<el-input placeholder="预约手机号" v-model="query.tel" size="small"
clearable style="width: 120px" @change="quickQuery('tel')" />
</div>
@ -623,7 +623,7 @@ import { mapState } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
import mm from "../../utlis/mm";
import { objCopy, setNull, dddw, parseID, birthdayToAge, deepCopy, arrayFilter, parsIcCardtoLocal, photoParse, savePeoplePhoto } from "../../utlis/proFunc";
import { objCopy, setNull, dddw, parseID, birthdayToAge, deepCopy, arrayFilter, parsIcCardtoLocal, photoParse, savePeoplePhoto, arrayExistObj } from "../../utlis/proFunc";
import Camera from "./Camera.vue";
import PatientRegisterItem from "./PatientRegisterItem.vue";
import LisRequest from "./LisRequest.vue";
@ -913,13 +913,13 @@ export default {
//
changeCustomerOrgGroupId() {
this.patientRegister.customerOrgGroupChange++;
if (this.form.id) this.Onsubmit('form', false);
if (this.form.id) this.btnSubmit('form', false);
},
//
changeMedicalPackageId() {
this.patientRegister.medicalPackageChange++;
if (this.form.id) this.Onsubmit('form', false);
if (this.form.id) this.btnSubmit('form', false);
},
//
@ -1045,7 +1045,7 @@ export default {
},
//
Onsubmit(formName, msgTip) {
btnSubmit(formName, msgTip) {
this.$refs[formName].validate((valid) => {
if (valid) {
//
@ -1095,14 +1095,17 @@ export default {
objCopy(res.data, this.form);
// this.patientRegister.prList.push(res.data); //
this.patientRegister.patientRegisterId = res.data.id;
this.patientRegister.patientRegisterId = res.data.id;
this.patientRegister.patientRegisterRd = res.data;
//this.patientRegister.query.times++;
this.patientRegister.prList.push(res.data)
//
this.patientRegister.patientRegisterAbs.forEach(e => {
e.patientRegisterId = res.data.id;
return e;
});
this.patientRegister.patientRegisterRd = res.data;
this.patientRegister.query.times++;
this.patientRegister.saveTimes++;
}
}
@ -1115,7 +1118,11 @@ export default {
if (msgTip) this.$message.success("更新 操作成功");
//
if (this.patientRegister.photo.indexOf("data:image") > -1) savePeoplePhoto(this.form.id, this.patientRegister.photo);
this.patientRegister.query.times++;
//this.patientRegister.query.times++;
let lfind = arrayExistObj(this.patientRegister.prList, 'id', this.form.id)
if(lfind > - 1) objCopy(this.form,this.patientRegister.prList[lfind])
//this.patientRegister.saveTimes++; //
}
});
@ -1485,4 +1492,7 @@ export default {
.query {
margin-left: 10px;
}
.querySpan {
margin-right: 2px;
}
</style>

2
src/components/patientRegister/PatientRegisterList.vue

@ -896,7 +896,7 @@ export default {
//
async Query() {
this.patientRegister.prList = [];
let body = {};
let body = {maxResultCount:500};
console.log(`this.patientRegister.query`, this.patientRegister.query);
if (this.patientRegister.query.customerOrgFlag) {

1
src/store/index.js

@ -29,6 +29,7 @@ export default new Vuex.Store({
},
customerOrg: {
//体检单位设置
oprStatus:'',//空,add,edit 三种状态
customerOrgTree: [], //体检单位列表
defaultExpandedKeys:[], //当前选中树的节点
treeCurrentNodekey:'', //当前选中树的节点

12
src/utlis/proFunc.js

@ -15,13 +15,13 @@ function tcdate(date) {
};
exports.tcdate = tcdate;
//json 对像赋值 只从 from 对象 赋值 to 中有的 key 项 add by pengjun
function objCopy(from, to) {
if (from && to) {
let keys = Object.keys(to);
//json 对像赋值 只从 provide/提供 对象 赋值到 receive/接收 中有的 key 项 add by pengjun receive provide
function objCopy(provide, receive) {
if (provide && receive) {
let keys = Object.keys(receive);
for (let key in keys) {
if (from[keys[key]] !== undefined) {
to[keys[key]] = from[keys[key]];
if (provide[keys[key]] !== undefined) {
receive[keys[key]] = provide[keys[key]];
}
}
}

Loading…
Cancel
Save