罗斌杰 2 years ago
parent
commit
b7f00a518c
  1. 6
      src/assets/css/global.css
  2. 10
      src/components/customerOrg/ContactPerson.vue
  3. 320
      src/components/customerOrg/customerOrgEdit.vue
  4. 2
      src/components/customerOrg/customerOrgRegister.vue
  5. 101
      src/components/customerOrg/customerOrgTree.vue
  6. 2
      src/components/patientRegister/MergeAsbitem.vue
  7. 17
      src/components/patientRegister/PatientRegisterEdit.vue
  8. 248
      src/components/patientRegister/PatientRegisterItem.vue
  9. 125
      src/components/patientRegister/PatientRegisterList.vue
  10. 43
      src/components/report/ElProgressOCX.vue
  11. 4
      src/components/report/PatientRegisterListNobtn.vue
  12. 1
      src/main.js
  13. 9
      src/store/index.js
  14. 4
      src/views/basic-dictionary/GuideType.vue
  15. 4
      src/views/doctorCheck/personnelBatch.vue

6
src/assets/css/global.css

@ -26,6 +26,12 @@
/* 表格行背景色样式 end */
/* 点击树结构项的选中颜色 */
.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
background-color: #409EFF;
}
.publicfontsize{
font-size: 18px;
}

10
src/components/customerOrg/ContactPerson.vue

@ -262,7 +262,11 @@ export default {
this.customerOrg.contactMethodList.splice(index, 1);
this.submit('form');
}).catch((err) => {
console.log(`deletapi:/api/app/contact-person/${this.personId}`,err);
if(err == 'cancel'){
this.$message.info("已取消删除");
}else{
this.$message.error("操作失败,原因:" + err);
}
});
},
@ -297,7 +301,7 @@ export default {
contactPersonId: this.personId,
});
});
return postapi("/api/app/contact-method/many", contactMethod);
if(contactMethod.length > 0) return postapi("/api/app/contact-method/many", contactMethod);
})
.then((res) => {
//console.log('api/app/contact-method/many')
@ -320,7 +324,7 @@ export default {
contactPersonId: this.personId,
});
});
return postapi("/api/app/contact-method/many", contactMethod);
if(contactMethod.length > 0) return postapi("/api/app/contact-method/many", contactMethod);
})
.then((res) => {
//console.log('api/app/contact-method/many')

320
src/components/customerOrg/customerOrgEdit.vue

@ -1,15 +1,14 @@
<template>
<div style="display:flex;">
<div> <!--overflow-y: scroll;height:200px;-->
<div style="display: flex">
<div>
<!--overflow-y: scroll;height:200px;-->
<el-form ref="form" :model="form" label-width="85px" :rules="rules" size="medium">
<el-row>
<el-col :span="8">
<el-form-item label="上级单位" prop="parentId">
<el-cascader v-model="form.parentId" :options="customerOrg.customerOrgTree" :props="{
checkStrictly: true,
expandTrigger: 'hover',
...customerOrg.treeprops,
}" :show-all-levels="false" clearable filterable disabled
<el-cascader v-model="form.parentId" :options="customerOrg.customerOrgTree"
:props="{checkStrictly: true,expandTrigger: 'hover',...customerOrg.treeprops,}"
:show-all-levels="false" clearable filterable disabled
:style="'width:' + Math.floor((window.pageWidth - 655) / 3) + 'px;'">
</el-cascader>
</el-form-item>
@ -26,19 +25,36 @@
</el-col>
<el-col :span="8">
<el-form-item label="体检中心" prop="organizationUnitId">
<el-select v-model="form.organizationUnitId" placeholder="请选择" filterable :disabled="peisid ? true:false"
:style="'width:' + Math.floor((window.pageWidth - 655) / 3) + 'px;'">
<el-option v-for="item in data.organizationdata" :key="item.id" :label="item.displayName"
:value="item.id" />
<el-select
v-model="form.organizationUnitId"
placeholder="请选择"
filterable
:disabled="peisid ? true : false"
:style="'width:' + Math.floor((window.pageWidth - 655) / 3) + 'px;'"
>
<el-option
v-for="item in data.organizationdata"
:key="item.id"
:label="item.displayName"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单位性质" prop="orgTypeId">
<el-select v-model="form.orgTypeId" placeholder="请选择" filterable
:style="'width:' + Math.floor((window.pageWidth - 655) / 3) + 'px;'">
<el-option v-for="item in data.customerOrgType" :key="item.id" :label="item.displayName"
:value="item.id" />
<el-select
v-model="form.orgTypeId"
placeholder="请选择"
filterable
:style="'width:' + Math.floor((window.pageWidth - 655) / 3) + 'px;'"
>
<el-option
v-for="item in data.customerOrgType"
:key="item.id"
:label="item.displayName"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
@ -86,7 +102,6 @@
<el-radio v-model="form.isActive" label="N">停用</el-radio>
-->
<el-checkbox v-model="form.isActiveBox" @change="changeBox('isActive')" />
</el-form-item>
</el-col>
</el-row>
@ -112,7 +127,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="地址" prop="address">
<el-input v-model="form.address" placeholder="请输入地址" maxlength="50" show-word-limit />
<el-input
v-model="form.address"
placeholder="请输入地址"
maxlength="50"
show-word-limit
/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -129,7 +149,13 @@
</el-col>
<el-col :span="7">
<el-form-item label="创建时间">
<el-date-picker v-model="form.creationTime" type="datetime" size="small" style="width: 100%" disabled />
<el-date-picker
v-model="form.creationTime"
type="datetime"
size="small"
style="width: 100%"
disabled
/>
</el-form-item>
</el-col>
<el-col :span="5">
@ -139,23 +165,34 @@
</el-col>
<el-col :span="7">
<el-form-item label="修改时间">
<el-date-picker v-model="form.lastModificationTime" type="datetime" size="small" style="width: 100%"
disabled />
<el-date-picker
v-model="form.lastModificationTime"
type="datetime"
size="small"
style="width: 100%"
disabled
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- 按钮区域 -->
<div style="width:110px;margin-left: 10px; margin-top: 3%">
<div style="width: 110px; margin-left: 10px; margin-top: 3%">
<div class="btnList">
<el-button type="primary" @click="add('form','')" class="btnClass">新增单位</el-button>
<el-button type="primary" @click="add('form', '')" class="btnClass"
>新增单位</el-button
>
</div>
<div class="btnList">
<el-button type="primary" @click="add('form','child')" class="btnClass">新增子单位</el-button>
<el-button type="primary" @click="add('form', 'child')" class="btnClass"
>新增子单位</el-button
>
</div>
<div class="btnList">
<el-button type="success" @click="onSubmit('form')" class="btnClass">保存</el-button>
<el-button type="success" @click="onSubmit('form')" class="btnClass"
>保存</el-button
>
</div>
<div class="btnList">
<el-button type="danger" @click="del('form')" class="btnClass">删除</el-button>
@ -166,12 +203,12 @@
<script>
import { mapState, mapMutations } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
import { tcdate, objCopy, deepCopy, arrayExistObj } from "../../utlis/proFunc";
import { getTreeNode, getTreePids} from "../../utlis/tree";
import { tcdate, objCopy, deepCopy, arrayExistObj } from "../../utlis/proFunc";
import { getTreeNode, getTreePids } from "../../utlis/tree";
export default {
components: {},
props: ['id'],
props: ["id"],
data() {
return {
isActiveBox: false,
@ -182,7 +219,7 @@ export default {
},
peisid: null,
form:{
form: {
id: "",
displayName: "",
shortName: "",
@ -201,16 +238,14 @@ export default {
isLockBox: false,
isActiveBox: true,
organizationUnitId: null,
creatorName:'',
creationTime:null,
lastModifierName:'',
lastModificationTime:null,
creatorName: "",
creationTime: null,
lastModifierName: "",
lastModificationTime: null,
}, //
rules: {
displayName: [
{ required: true, message: "请输入单位名称", trigger: "blur" },
],
displayName: [{ required: true, message: "请输入单位名称", trigger: "blur" }],
shortName: [{ required: true, message: "请输入单位简写", trigger: "blur" }],
organizationUnitId: [
{ required: true, message: "请输入体检中心", trigger: "blur" },
@ -222,8 +257,8 @@ export default {
},
created() {
this.peisid = window.sessionStorage.getItem('peisid');
if(!this.form.id){
this.peisid = window.sessionStorage.getItem("peisid");
if (!this.form.id) {
this.form.organizationUnitId = this.peisid;
}
},
@ -237,7 +272,6 @@ export default {
this.getOrgType();
this.getCustomerOrgRd(this.id);
},
computed: {
@ -248,42 +282,39 @@ export default {
changeBox(type) {
//
if(this.form[type + 'Box']){
this.form[type] = 'Y';
}else{
this.form[type] = 'N';
if (this.form[type + "Box"]) {
this.form[type] = "Y";
} else {
this.form[type] = "N";
}
},
//
getCustomerOrgRd(id) {
if(!id) return;
if (!id) return;
getapi(`/api/app/customer-org/${id}`).then((res) => {
if (res.code != -1) {
objCopy(res.data, this.form);
if (res.data.isActive == 'Y') {
if (res.data.isActive == "Y") {
this.form.isActiveBox = true;
} else {
this.form.isActiveBox = false;
}
if (res.data.isLock == 'Y') {
if (res.data.isLock == "Y") {
this.form.isLockBox = true;
} else {
this.form.isLockBox = false;
}
}
});
},
//
getoraniztion() {
getapi("/api/app/organization-units/organization-unit-by-is-peis").then(
(res) => {
this.data.organizationdata = res.data;
}
);
getapi("/api/app/organization-units/organization-unit-by-is-peis").then((res) => {
this.data.organizationdata = res.data;
});
},
//
@ -294,58 +325,79 @@ export default {
},
//()
getCustomerOrgTree(oprType,body) {
getCustomerOrgTree(oprType, body) {
// getapi("/api/app/customerorg/getbycodeall").then((res) => {
// //customerOrgTree = res.data;
// console.log("res.data", res.data);
// this.setData({ key: "customerOrg.customerOrgTree", value: res.data });
// tcdate(this.customerOrg.customerOrgTree);
// });
switch (oprType) {
case 'insert':
switch (oprType) {
case "insert":
let node = {
id: body.id,
displayName:body.displayName,
parentId:body.parentId
displayName: body.displayName,
parentId: body.parentId,
};
if (body.parentId) {
let pNode = getTreeNode(this.customerOrg.customerOrgTree,"treeChildren","id",body.parentId);
if (!pNode.treeChildren) this.$set(pNode, 'treeChildren', []);
//pNode.treeChildren = []
pNode.treeChildren.push(node);
} else {
this.customerOrg.customerOrgTree.push(node);
}
this.customerOrg.defaultExpandedKeys = []
if(body.parentId){
let pNode = getTreeNode(this.customerOrg.customerOrgTree, "treeChildren", "id", body.parentId)
if(pNode.treeChildren){
pNode.treeChildren.push(node)
}else{
pNode.treeChildren = [node]
}
}else{
this.customerOrg.customerOrgTree.push(node)
}
this.customerOrg.defaultExpandedKeys.push(body.parentId)
}
this.customerOrg.defaultExpandedKeys.push(body.id)
this.customerOrg.treeCurrentNodekey = body.id;
//console.log("this.customerOrg.treeCurrentNodekey",this.customerOrg.treeCurrentNodekey);
break;
// "id": "3a0c5101-a6a6-e48a-36ec-33e7567a99e6",
// "displayName": "",
// "parentId": null,
// "code": "00001",
// "treeChildren": [
case 'update':
let node2 = getTreeNode(this.customerOrg.customerOrgTree, "treeChildren", "id", body.id);
node2.displayName = body.displayName
// "id": "3a0c5101-a6a6-e48a-36ec-33e7567a99e6",
// "displayName": "",
// "parentId": null,
// "code": "00001",
// "treeChildren": [
case "update":
let node2 = getTreeNode(
this.customerOrg.customerOrgTree,
"treeChildren",
"id",
body.id
);
node2.displayName = body.displayName;
break;
case 'delete':
let lfind = -1
let pids = getTreePids(this.customerOrg.customerOrgTree,"treeChildren", 'parentId','id',body)
case "delete":
let lfind = -1;
let pids = getTreePids(
this.customerOrg.customerOrgTree,
"treeChildren",
"parentId",
"id",
body
);
//tree, childNodeName, pidName, idName, idVal getTreeNode(this.customerOrg.customerOrgTree, "treeChildren", "id", body);
//console.log('pids',pids,body)
if(!pids || pids.length < 1){
lfind = arrayExistObj(this.customerOrg.customerOrgTree, 'id', body)
if(lfind > - 1) this.customerOrg.customerOrgTree.splice(lfind,1)
}else{
let node3 = getTreeNode(this.customerOrg.customerOrgTree, "treeChildren", "id", pids[0]);
console.log('pids',pids,body)
if (!pids || pids.length < 2) {
lfind = arrayExistObj(this.customerOrg.customerOrgTree, "id", body);
if (lfind > -1) this.customerOrg.customerOrgTree.splice(lfind, 1);
} else {
let node3 = getTreeNode(
this.customerOrg.customerOrgTree,
"treeChildren",
"id",
pids[0]
);
//console.log('node3',node3)
lfind = arrayExistObj(node3.treeChildren, 'id', body)
if(lfind > - 1) node3.treeChildren.splice(lfind,1)
lfind = arrayExistObj(node3.treeChildren, "id", body);
if (lfind > -1) node3.treeChildren.splice(lfind, 1);
}
break;
default:
@ -393,75 +445,95 @@ export default {
//this.setData({ key: "customerOrg.customerOrgRd", value: res });
this.customerOrg.customerOrgId = res.data.id;
this.customerOrg.customerOrgRd = res.data;
this.getCustomerOrgTree('insert',res.data);
this.getCustomerOrgTree("insert", res.data);
}
});
} else {
//id
putapi(
`/api/app/customer-org/${this.customerOrg.customerOrgRd.id}`,
body
).then((res) => {
if (res.code == 1) {
this.$message.success("更新 操作成功");
let lbody = {id:this.customerOrg.customerOrgRd.id,...body}
this.getCustomerOrgTree('update',lbody);
putapi(`/api/app/customer-org/${this.customerOrg.customerOrgRd.id}`, body).then(
(res) => {
if (res.code == 1) {
this.$message.success("更新 操作成功");
let lbody = { id: this.customerOrg.customerOrgRd.id, ...body };
this.getCustomerOrgTree("update", lbody);
}
}
});
);
}
});
},
//
async add(formName,child) {
async add(formName, child) {
await this.$refs[formName].resetFields();
if (child) {
if (!this.customerOrg.customerOrgId) {
this.$message.info("请先选择单位")
return
this.$message.info("请先选择单位");
return;
}
this.customerOrg.customerOrgRd.id = '';
this.customerOrg.customerOrgRd = { id: "", isLock: "N", isActive: "Y", parentId: this.customerOrg.customerOrgId };
this.customerOrg.customerOrgRd.id = "";
this.customerOrg.customerOrgRd = {
id: "",
isLock: "N",
isActive: "Y",
parentId: this.customerOrg.customerOrgId,
};
} else {
this.customerOrg.customerOrgRd = { id: "", isLock: "N", isActive: "Y", parentId: null };
this.customerOrg.customerOrgRd = {
id: "",
isLock: "N",
isActive: "Y",
parentId: null,
};
}
objCopy(this.customerOrg.customerOrgRd,this.form)
objCopy(this.customerOrg.customerOrgRd, this.form);
this.customerOrg.customerOrgId = "";
},
//
del(formName) {
if(!this.customerOrg.customerOrgRd.id){
this.$message.warning("请先选中要删除的节点")
return
}
//
//let node = deepCopy(getTreeNode(this.customerOrg.customerOrgTree,"treeChildren","id",this.customerOrg.customerOrgRd.id));
this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
confirmButtonText: "是",
cancelButtonText: "否",
type: "warning",
}).then(() => {
//console.log('{patientRegisterIds}',{patientRegisterIds})
return deletapi(`/api/app/customer-org/${this.customerOrg.customerOrgRd.id}`);
}).then((res) => {
if(res.code != -1) {
this.$message.success("删除 操作成功");
this.getCustomerOrgTree('delete',this.customerOrg.customerOrgRd.id);
this.setData({ key: "customerOrg.customerOrgRd", value: { id: "" } });
this.$refs[formName].resetFields();
}
}).catch((err) => {
this.$message({
type: "info",
message: "已取消删除",
})
.then(() => {
//console.log('{patientRegisterIds}',{patientRegisterIds})
return deletapi(`/api/app/customer-org/${this.customerOrg.customerOrgRd.id}`);
})
.then((res) => {
if (res.code != -1) {
this.$message.success("删除 操作成功");
this.getCustomerOrgTree("delete", this.customerOrg.customerOrgRd.id);
this.customerOrg.customerOrgRegisterList = []
this.customerOrg.contactPersonList = []
this.customerOrg.contactMethodList = []
this.setData({ key: "customerOrg.customerOrgRd", value: { id: "" } });
this.$refs[formName].resetFields();
}
})
.catch((err) => {
if (err == "cancel") {
this.$message.info("已取消删除");
} else {
this.$message.error("操作失败,原因:" + err);
}
});
});
},
},
watch: {
'id'(newVal, oldVal) {
id(newVal, oldVal) {
console.log("watch getCustomerOrgRd newVal:", newVal, " oldVal:", oldVal);
if (newVal != oldVal && newVal != '') {
if (newVal != oldVal && newVal != "") {
this.getCustomerOrgRd(newVal);
}
},

2
src/components/customerOrg/customerOrgRegister.vue

@ -122,7 +122,7 @@ export default {
try {
let result = await getapi(`/api/app/customer-org/parent/${this.customerOrg.customerOrgId}`)
postapi(`/api/customerorgregister/createcustomerorgregister?CustomerOrgId=${result.data}`).then((res) => {
if (res.Code != -1) {
if (res.code != -1) {
this.getCustomerOrgRegisterList(result.data);
this.$message.success("操作成功!");
}

101
src/components/customerOrg/customerOrgTree.vue

@ -1,21 +1,30 @@
<template>
<el-tree :data="customerOrg.customerOrgTree" :props="customerOrg.treeprops" @node-click="treeclick" />
<el-tree :data="customerOrg.customerOrgTree" :props="customerOrg.treeprops"
node-key="id"
:default-expanded-keys="customerOrg.defaultExpandedKeys"
@node-click="treeclick" highlight-current ref="customerOrgTree"/>
</template>
<script>
import { mapState, mapMutations } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
import { tcdate, deepCopy } from "../../utlis/proFunc";
import { getTreePids} from "../../utlis/tree";
export default {
components: {},
data() {
return {};
return {
};
},
//<el-tree :data="$store.state.customerOrg.customerOrgTree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree>
computed: {
...mapState(["customerOrg", "window"]),
},
//
created() { },
created() {
},
//
mounted() {
@ -74,45 +83,65 @@ export default {
//
getContactPersonList(customerOrgId) {
getapi(
`/api/app/contact-person/in-customer-org-id/${customerOrgId}`
).then((res) => {
if(res.code != -1){
this.customerOrg.contactPersonList = res.data;
if (res.data.length > 0) {
this.getContactMethodList(res.data[0].id);
} else {
this.customerOrg.contactMethodList = [];
getapi(
`/api/app/contact-person/in-customer-org-id/${customerOrgId}`
).then((res) => {
if(res.code != -1){
this.customerOrg.contactPersonList = res.data;
if (res.data.length > 0) {
this.getContactMethodList(res.data[0].id);
} else {
this.customerOrg.contactMethodList = [];
}
}
}
});
},
});
},
//
//api/app/contact-method/in-contact-person-id?ContactPersonId=3a0c08ad-4304-138b-d9e6-a7338739dfc4' \
getContactMethodList(ContactPersonId) {
getapi("/api/app/contact-method/in-contact-person-id", {
ContactPersonId,
}).then((res) => {
if(res.code != -1){
this.customerOrg.contactMethodList = res.data;
//
//api/app/contact-method/in-contact-person-id?ContactPersonId=3a0c08ad-4304-138b-d9e6-a7338739dfc4' \
getContactMethodList(ContactPersonId) {
getapi("/api/app/contact-method/in-contact-person-id", {
ContactPersonId,
}).then((res) => {
if(res.code != -1){
this.customerOrg.contactMethodList = res.data;
}
});
},
//
treeclick(data) {
//this.$message.success(data.id + " " + data.displayName);// api/app/customer-org/3a0c0439-a5ca-8a63-b2b9-e0eb24cb58b1
this.customerOrg.customerOrgId = data.id;
this.getCustomerOrgRd(data.id);
//
let firstId = data.id //ID
if(data.parentId){
let pids = getTreePids(this.customerOrg.customerOrgTree,"treeChildren", 'parentId', 'id', data.id)
console.log('pids',pids)
firstId = pids[pids.length - 2]
}
});
this.getCustomerOrgRegisterList(firstId);
//
this.getContactPersonList(data.id);
},
},
//
treeclick(data) {
//this.$message.success(data.id + " " + data.displayName);// api/app/customer-org/3a0c0439-a5ca-8a63-b2b9-e0eb24cb58b1
this.customerOrg.customerOrgId = data.id;
this.getCustomerOrgRd(data.id);
//
if(!data.parentId){
this.getCustomerOrgRegisterList(data.id);
}
this.getContactPersonList(data.id);
watch: {
"customerOrg.treeCurrentNodekey"(newVal,oldVal){
//console.log('watch:customerOrg.treeCurrentNodekey',newVal,oldVal)
if(newVal && newVal != oldVal){
this.$nextTick(() => {
this.$refs['customerOrgTree'].setCurrentKey(newVal);
})
}
},
},
},
};
</script>
<style scoped></style>
<style scoped>
@import "../../assets/css/global.css";
</style>

2
src/components/patientRegister/MergeAsbitem.vue

@ -256,7 +256,7 @@ export default {
postapi("/api/app/registerasbitem/mergeregisterasbitem", body).then(
(res) => {
if (res.Code != -1) {
if (res.code != -1) {
this.$message.success("操作成功!");
this.getAsbItemList(this.id);
}

17
src/components/patientRegister/PatientRegisterEdit.vue

@ -44,12 +44,12 @@
<el-row>
<el-col :span="5">
<el-form-item label="姓名" prop="patientName">
<el-input v-model="form.patientName" @blur="query(form.patientName)"></el-input>
<el-input v-model="form.patientName" @blur="Query(form.patientName)"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="身份证号" prop="idNo">
<el-input v-model="form.idNo" @change="changeIdNo" @blur="query(form.idNo)"></el-input>
<el-input v-model="form.idNo" @change="changeIdNo" @blur="Query(form.idNo)"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
@ -838,7 +838,7 @@ export default {
this.$peisAPI.peopleIcCard().then(res => {
//console.log('peopleIcCard',res)
let lres = JSON.parse(res)
if (lres.Code && lres.Code.toLowerCase() == 'success') {
if (lres.code && lres.code.toLowerCase() == 'success') {
this.projPriv.idNos = lres
let idNos = parsIcCardtoLocal(this.projPriv.idNos, this.dict.sex, this.dict.nation)
this.form.patientName = idNos.Name
@ -923,7 +923,7 @@ export default {
},
//
query(param) {
Query(param) {
//
if (this.form.id || !param) return;
@ -1133,6 +1133,7 @@ export default {
this.$message.info("该信息尚未保存,不可执行此操作!");
return;
}
this.patientRegister.photo = '/pic/Photo.jpg'
this.patientRegister.patientRegisterId = '';
this.form.id = '';
this.form.patientId = '00000000-0000-0000-0000-000000000000';
@ -1183,7 +1184,7 @@ export default {
console.log(res)
//alert(res)
let lres = JSON.parse(res)
if (lres.Code && lres.Code.toLowerCase() == 'success') {
if (lres.code && lres.code.toLowerCase() == 'success') {
let uploadPhoto = {
patientRegisterId: this.form.id,
photo: lres.Photo,
@ -1191,7 +1192,7 @@ export default {
this.patientRegister.photo = `data:image/${lres.PhotoFormat};base64,${lres.Photo}`
return postapi(`/api/app/patient-register/up-load-img`, uploadPhoto)
} else {
this.$message.error("上传照片错误" + lres.Code)
this.$message.error("上传照片错误" + lres.code)
}
}).then(res => {
if (res.code == 1) {
@ -1302,13 +1303,13 @@ export default {
} catch (error) {
return;
}
if (res.Code != -1) {
if (res.code != -1) {
this.$message.info("发送检验申请成功!");
isPrintLisRequest = true;
}
//
if (res.Code == -1 && res.Message.indexOf('已申请') > -1) {
if (res.code == -1 && res.message.indexOf('已申请') > -1) {
isPrintLisRequest = true;
}

248
src/components/patientRegister/PatientRegisterItem.vue

@ -1,6 +1,6 @@
<template>
<div style="display: flex; margin-left: 10px; margin-top: 10px;">
<div style="width:230px;">
<div style="width:220px;">
<div>
<span>项目类别</span>
<el-cascader :options="dict.itemTypeTree" v-model="itemTypeIds" style="margin-left: 3px;width:160px;"
@ -10,10 +10,13 @@
</div>
<div class="mainareaBox">
<el-table :data="dict.asbItem"
:height="(window.pageHeight > 720 ? (window.pageHeight - 460) : 260)" @row-dblclick="dbClickChoosedAsb"
@selection-change="handleSelectionChange" size="small">
<el-table-column type="selection" align="center" />
<el-table-column prop="displayName" label="未选组合项目" width="120" />
:height="(window.pageHeight > 720 ? (window.pageHeight - 460) : 260)" @row-dblclick="dbClickChoosedAsb" highlight-current-row
@selection-change="handleSelectionChange" size="small" :row-class-name="handleRowClassName"
@row-click="chooseAsbItem">
<!--
<el-table-column type="selection" align="center" width="40" />
-->
<el-table-column prop="displayName" label="未选组合项目" />
<!--
<el-table-column prop="price" label="标准价格" width="70">
<template slot-scope="scope">
@ -32,11 +35,19 @@
<div style="width:100px;margin-top: 70px;">
<div class="btnList">
<el-button type="primary" @click="addAbs(asbItemChoosed)" style="width:90px;">添加 <i class="el-icon-right"></i>
<el-button type="primary" @click="addAbs(asbItemChoosed,'choosed')" style="width:90px;">添加 <i class="el-icon-arrow-right"></i>
</el-button>
</div>
<div class="btnList">
<el-button type="primary" @click="delAbs(patientRegisterAbsChoosed)" style="width:90px;">移除 <i class="el-icon-back"></i>
<el-button type="success" @click="addAbs(asbItemChoosed,'all')" style="width:90px;">全添加 <i class="el-icon-d-arrow-right"></i>
</el-button>
</div>
<div class="btnList">
<el-button type="warning" @click="delAbs(patientRegisterAbsChoosed,'choosed')" style="width:90px;"><i class="el-icon-arrow-left"> 移除</i>
</el-button>
</div>
<div class="btnList">
<el-button type="danger" @click="delAbs(patientRegisterAbsChoosed,'all')" style="width:90px;"><i class="el-icon-d-arrow-left"> 全移除</i>
</el-button>
</div>
<!-- 不显示保存当已选组合有修改时失去焦点自动保存
@ -72,11 +83,14 @@
</div>
</div>
<div class="mainareaBox">
<el-table :data="patientRegister.patientRegisterAbs"
<el-table :data="patientRegister.patientRegisterAbs" highlight-current-row
:height="(window.pageHeight > 720 ? (window.pageHeight - 460) : 260)" width="100%" :summary-method="getSummaries"
show-summary :row-class-name="tableRowClassName" @row-dblclick="removeAbs" @selection-change="selecteditems" size="small">
show-summary :row-class-name="tableRowClassName" @row-dblclick="removeAbs" @selection-change="selecteditems" size="small"
@row-click="removeAsbItem">
<!-- temporaryselection personnelUnit.nogroupselected-->
<!-- 取消勾选换成选中
<el-table-column type="selection" align="center"/>
-->
<el-table-column label="已选组合项目" width="120" prop="asbitemName" />
<el-table-column label="标准价格" prop="standardPrice" width="70" align="center" />
<el-table-column label="折扣" prop="discount" width="60">
@ -135,7 +149,7 @@
import moment from 'moment';
import { mapState, mapActions } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
import { arrayFilter, arrayReduce, arrayExistObj, dddw } from "../../utlis/proFunc";
import { arrayFilter, arrayReduce, arrayExistObj, dddw, deepCopy} from "../../utlis/proFunc";
export default {
props: ["patientRegisterForm","payTypeFlag"],
data() {
@ -143,24 +157,26 @@ export default {
itemType: [], //
itemTypeIds: '', //ID
asbItemChoosed: [], //
startPoint:-1,
//patientRegisterAbs:[], // vuex
patientRegisterAbsChoosed: [], //
PstartPoint:-1,
//patientRegisterAbsDel: [], //
patientRegisterAbsRd: {
id: null, //
asbitemId: null, // string($uuid)
asbitemName: '', //
patientRegisterId: null, //string($uuid)
standardPrice: 0, //number($double)
chargePrice: 0, // number($double)
payTypeFlag: "0", // string , 021
isCharge: "N", // string
//lisRequestId: null, // string($uuid)LISID
amount: 1, // integer($int32)
groupPackageId: null, // string($uuid) ID
}, //
// patientRegisterAbsRd: {
// id: null, //
// asbitemId: null, // string($uuid)
// asbitemName: '', //
// patientRegisterId: null, //string($uuid)
// standardPrice: 0, //number($double)
// chargePrice: 0, // number($double)
// payTypeFlag: "0", // string , 021
// isCharge: "N", // string
// //lisRequestId: null, // string($uuid)LISID
// amount: 1, // integer($int32)
// groupPackageId: null, // string($uuid) ID
// }, //
asbItemId: '',
discount: 100,
@ -194,13 +210,134 @@ export default {
tableRowClassName({row, rowIndex}){
//console.log(row)
if (row.groupPackageId) {
//console.log('row.groupPackageId',row.groupPackageId)
return 'purple-row'; //
}else{
if (row.choosed) {
return 'current-row';
} else {
if (row.groupPackageId) {
//console.log('row.groupPackageId',row.groupPackageId)
return 'purple-row'; //
}else{
return '';
}
}
},
handleRowClassName({ row, rowIndex }) {
// highLightBg 'selected'
//console.log(rowIndex, row)
//return row.highLightBg == 'selected' ? 'high-light-bg' : '';
if (row.choosed) {
return 'current-row';
} else {
return '';
}
}
},
//
chooseAsbItem(row){
this.dict.asbItem.forEach((e,index) => {
e.index = index;
return e
});
// shift
if (this.window.shift) {
//
this.dict.asbItem.forEach(e => {
e.choosed = false;
return e
});
if (this.startPoint == - 1) {
this.dict.asbItem[row.index].choosed = true;
this.startPoint = row.index;
return
}
if (this.startPoint > row.index) {
for (let i = row.index; i <= this.startPoint; i++) {
this.dict.asbItem[i].choosed = true
}
} else if (this.startPoint <= row.index) {
for (let i = this.startPoint; i <= row.index; i++) {
this.dict.asbItem[i].choosed = true
}
}
return
}
// ctrl
if (this.window.ctrl) {
console.log('this.window.ctrl',this.window.ctrl,this.dict.asbItem)
this.dict.asbItem[row.index].choosed = true;
this.startPoint = row.index;
return
}
// ctrl shift
//
//console.log('')
this.dict.asbItem.forEach(e => {
e.choosed = false;
return e
});
this.dict.asbItem[row.index].choosed = true;
this.startPoint = row.index;
},
//
removeAsbItem(row){
this.patientRegister.patientRegisterAbs.forEach((e,index) => {
e.index = index;
return e
});
// shift
if (this.window.shift) {
//
this.patientRegister.patientRegisterAbs.forEach(e => {
e.choosed = false;
return e
});
if (this.PstartPoint == - 1) {
this.patientRegister.patientRegisterAbs[row.index].choosed = true;
this.PstartPoint = row.index;
return
}
if (this.PstartPoint > row.index) {
for (let i = row.index; i <= this.PstartPoint; i++) {
this.patientRegister.patientRegisterAbs[i].choosed = true
}
} else if (this.PstartPoint <= row.index) {
for (let i = this.PstartPoint; i <= row.index; i++) {
this.patientRegister.patientRegisterAbs[i].choosed = true
}
}
return
}
// ctrl
if (this.window.ctrl) {
console.log('this.window.ctrl',this.window.ctrl,this.patientRegister.patientRegisterAbs)
this.patientRegister.patientRegisterAbs[row.index].choosed = true;
this.PstartPoint = row.index;
return
}
// ctrl shift
//
//console.log('')
this.patientRegister.patientRegisterAbs.forEach(e => {
e.choosed = false;
return e
});
this.patientRegister.patientRegisterAbs[row.index].choosed = true;
this.startPoint = row.index;
},
//
// [
// {
@ -238,11 +375,11 @@ export default {
async onSubmit(msg) {
let body = [], insBody = []
if (!this.patientRegisterForm.id) {
//alert("")
//this.$message.warning("")
return
}
if (this.patientRegister.patientRegisterAbs.length < 1) {
//alert("")
//this.$message.warning("")
return
}
for (let i = 0; i < this.patientRegister.patientRegisterAbs.length; i++) {
@ -319,13 +456,28 @@ export default {
//
///api/app/register-asbitem/many/3fa85f64-5717-4562-b3fc-2c963f66afa6'
async addAbs(asbItemChoosed) {
async addAbs(asbItemChoosed,oprType) {
let body = []
let checked = true
let payTypeFlag = '0' //
let lfind = -1
// start
if(oprType && oprType == 'all'){
asbItemChoosed = deepCopy(this.dict.asbItem)
}else if(oprType && oprType == 'choosed'){
asbItemChoosed = []
this.dict.asbItem.forEach(e =>{
if(e.choosed){
asbItemChoosed.push(e)
e.choosed = false
}
})
}
// end
if (asbItemChoosed.length < 1) {
alert("请选择要添加的组合项目")
this.$message.warning("请选择要添加的组合项目")
return
}
@ -340,7 +492,7 @@ export default {
if (this.patientRegisterForm.sexId == 'U') break //
if (asbItemChoosed[i].forSexId == 'A') continue
if (asbItemChoosed[i].forSexId != this.patientRegisterForm.sexId) {
alert(`所选项目:${asbItemChoosed[i].displayName},不适合当前人员性别`)
this.$message.warning(`所选项目:${asbItemChoosed[i].displayName},不适合当前人员性别`)
checked = false
break
}
@ -404,14 +556,28 @@ export default {
//
///api/app/register-asbitem/many?RegisterAsbitemIds=3fa85f64-5717-4562-b3fc-2c963f66afa6
delAbs(absForDel) {
delAbs(absForDel,oprType) {
let body = {}
let registerAsbitemIds = []
let chargeComplete = ''
let lfind = -1
// start
if(oprType && oprType == 'all'){
absForDel = deepCopy(this.patientRegister.patientRegisterAbs)
}else if(oprType && oprType == 'choosed'){
absForDel = []
this.patientRegister.patientRegisterAbs.forEach(e =>{
if(e.choosed){
absForDel.push(e)
e.choosed = false
}
})
}
// end
if (absForDel.length < 1) {
alert("请选择要移除的组合项目")
this.$message.warning("请选择要移除的组合项目")
return
}
@ -873,18 +1039,18 @@ export default {
::v-deep .el-table th.el-table__cell {
/*text-align: center;*/
padding-left: 1px;
padding-right: 1px;
padding-left: 2px;
padding-right: 2px;
}
::v-deep .el-table td.el-table__cell {
padding-left: 1px;
padding-right: 1px;
padding-left: 2px;
padding-right: 2px;
}
::v-deep .el-table .cell {
padding-left: 1px;
padding-right: 1px;
padding-left: 2px;
padding-right: 2px;
}
::v-deep input[type="number"]::-webkit-inner-spin-button,

125
src/components/patientRegister/PatientRegisterList.vue

@ -6,19 +6,20 @@
:height="window.pageHeight < 600 ? 172 : Math.floor((window.pageHeight - 342) * 2 / 3)" highlight-current-row
@row-click="rowClick" size="small" @selection-change="handleSelectionChange" @cell-contextmenu="onCellRightClick"
ref="info" :row-class-name="handleRowClassName" >
<el-table-column type="selection" width="40">
</el-table-column>
<el-table-column prop="completeFlag" label="体检进度">
<!-- 取消勾选改为选中
<el-table-column type="selection" width="40"/>
-->
<el-table-column prop="completeFlag" label="体检进度" align="center">
<template slot-scope="scope">
<div>{{ ldddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
</template>
</el-table-column>
<el-table-column prop="guidePrintTimes" label="打印" width="50">
<el-table-column prop="guidePrintTimes" label="打印" width="50" align="center">
<template slot-scope="scope">
<i class="el-icon-printer" v-if="scope.row.guidePrintTimes > 0" style="font-size: 24px;color: green;"></i>
</template>
</el-table-column>
<el-table-column prop="isLock" label="锁住">
<el-table-column prop="isLock" label="锁住" width="50" align="center">
<template slot-scope="scope">
<div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
</template>
@ -33,17 +34,17 @@
<div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
</template>
</el-table-column>
<el-table-column prop="patientName" label="姓名" />
<el-table-column prop="sexId" label="性别">
<el-table-column prop="patientName" label="姓名" width="80" align="center"/>
<el-table-column prop="sexId" label="性别" width="50" align="center">
<template slot-scope="scope">
<div>{{ ldddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
</template>
</el-table-column>
<el-table-column prop="age" label="年龄" />
<el-table-column prop="patientRegisterNo" label="条码号" width="150" />
<el-table-column prop="patientNo" label="档案号" />
<el-table-column prop="medicalTimes" label="体检次数"></el-table-column>
<el-table-column label="分组/套餐" width="150">
<el-table-column prop="age" label="年龄" width="50" align="center"/>
<el-table-column prop="patientRegisterNo" label="条码号" width="150" align="center"/>
<el-table-column prop="patientNo" label="档案号" align="center"/>
<el-table-column prop="medicalTimes" label="体检次数" width="80" align="center"></el-table-column>
<el-table-column label="分组/套餐" width="150" align="center">
<template slot-scope="scope">
<div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
{{ ldddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
@ -53,15 +54,15 @@
</div>
</template>
</el-table-column>
<el-table-column prop="nationId" label="民族">
<el-table-column prop="nationId" label="民族" width="50" align="center">
<template slot-scope="scope">
<div>
{{ ldddw(dict.nation, "nationId", scope.row.nationId, "displayName") }}
</div>
</template>
</el-table-column>
<el-table-column prop="idNo" label="身份证" width="150" />
<el-table-column prop="birthDate" label="出生日期" width="100">
<el-table-column prop="idNo" label="身份证" width="150" align="center"/>
<el-table-column prop="birthDate" label="出生日期" width="80" align="center">
<template slot-scope="scope">
<div v-if="scope.row.birthDate">
{{ lmoment(scope.row.birthDate, "yyyy-MM-DD") }}
@ -69,12 +70,12 @@
</template>
</el-table-column>
<el-table-column prop="email" label="邮箱" width="180" />
<el-table-column prop="mobileTelephone" label="手机" width="100" />
<el-table-column prop="mobileTelephone" label="手机" width="100" align="center"/>
<el-table-column prop="telephone" label="电话" width="100" />
<el-table-column prop="address" label="地址" width="300" />
<el-table-column prop="medicalCardNo" label="体检卡号" />
<el-table-column prop="jobCardNo" label="工卡号" />
<el-table-column prop="maritalStatusId" label="婚姻状况">
<el-table-column prop="maritalStatusId" label="婚姻状况" width="80" align="center">
<template slot-scope="scope">
<div>
{{ ldddw(dict.maritalStatus, "id", scope.row.maritalStatusId, "displayName") }}
@ -98,18 +99,18 @@
<el-table-column prop="jobPost" label="职务" />
<el-table-column prop="jobTitle" label="职称" />
<el-table-column prop="salesman" label="介绍人" />
<el-table-column prop="isVip" label="是否VIP">
<el-table-column prop="isVip" label="是否VIP" width="80" align="center">
<template slot-scope="scope">
<div>{{ scope.row.isVip == "Y" ? "是" : "否" }}</div>
</template>
</el-table-column>
<el-table-column prop="creatorName" label="登记人" />
<el-table-column prop="creationTime" label="登记日期" width="100">
<el-table-column prop="creatorName" label="登记人" align="center"/>
<el-table-column prop="creationTime" label="登记日期" width="90" align="center">
<template slot-scope="scope">
<div>{{ lmoment(scope.row.creationTime, "yyyy-MM-DD") }}</div>
</template>
</el-table-column>
<el-table-column prop="isUpload" label="是否上传">
<el-table-column prop="isUpload" label="是否上传" width="80" align="center">
<template slot-scope="scope">
<div>{{ scope.row.isUpload == "Y" ? "是" : "否" }}</div>
</template>
@ -163,9 +164,11 @@
<div class="listBtn">
<el-button type="" class="btnClass commonbutton" @click="openCamera" icon="el-icon-camera">拍照</el-button>
</div>
<!--
<div class="listBtn">
<el-button type="" class="btnClass commonbutton">健康档案</el-button>
</div>
-->
<div class="listBtn">
<el-button type="" class="btnClass commonbutton" @click="btnGroupBatch">调整分组</el-button>
</div>
@ -178,9 +181,11 @@
<div class="listBtn">
<el-button type="" class="btnClass commonbutton" @click="guidePrint('0001', true)">指引单预览</el-button>
</div>
<!--
<div class="listBtn">
<el-button type="" class="btnClass commonbutton" @click="rowSelected(patientRegister.prList)">选中</el-button>
</div>
-->
</div>
<!-- 体检人员登记 -->
@ -230,7 +235,7 @@
</span>
</el-dialog>
<!-- 批量调整分组 -->
<!-- 批量调整项目 -->
<el-dialog title="批量调整项目" :visible.sync="dialogAsbitem" width="600px" height="800" :append-to-body="true"
:close-on-click-modal="false">
<div>
@ -305,6 +310,12 @@
</span>
</el-dialog>
<!-- 通用进度条 -->
<el-dialog title="数据处理中……" :visible.sync="elProgress.display" width="600px" height="400"
:show-close="false" :close-on-click-modal="false" :append-to-body="true">
<ElProgressOCX />
</el-dialog>
</div>
</template>
<script>
@ -318,11 +329,15 @@ import PatientRegisterEdit from "../../components/patientRegister/PatientRegiste
import Camera from "../../components/patientRegister/Camera.vue";
import PatientRegisterAsbItem from "../../components/patientRegister/patientRegisterAsbItem.vue";
import ElProgressOCX from "../../components/report/ElProgressOCX.vue";
export default {
components: {
PatientRegisterEdit,
Camera,
PatientRegisterAsbItem,
ElProgressOCX,
},
data() {
return {
@ -374,7 +389,7 @@ export default {
this.quickAsb = this.dict.asbItemAll;
},
computed: {
...mapState(["window", "dict", "patientRegister", "customerOrg"]),
...mapState(["window", "dict","elProgress","patientRegister", "customerOrg"]),
},
methods: {
...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
@ -382,7 +397,7 @@ export default {
handleRowClassName({ row, rowIndex }) {
// highLightBg 'selected'
console.log(rowIndex, row)
//console.log(rowIndex, row)
//return row.highLightBg == 'selected' ? 'high-light-bg' : '';
if (row.choosed) {
return 'current-row';
@ -400,6 +415,10 @@ export default {
// (isPreview)
async guidePrint(ReportCode, isPreview) {
if(!this.$peisAPI) {
this.$message.info("此功能,需要在壳客户端才可运行!")
return
}
let token = localStorage.getItem('token');
let user = localStorage.getItem('user');
let toOutShell = {
@ -674,10 +693,8 @@ export default {
},
//
async query() {
async Query() {
this.patientRegister.prList = [];
let body = {}
console.log(`this.patientRegister.query`, this.patientRegister.query)
@ -748,7 +765,7 @@ export default {
//
onCellRightClick(row, column) {
this.rClickRow = { ...row }; //
this.rClickRow = { ...row }; //
this.rClickColumn = { ...column }; //
console.log(row, column.property);
},
@ -805,9 +822,16 @@ export default {
btnGroupBatch() {
let customerOrgId = this.patientRegister.query.customerOrgId;
if (!customerOrgId) {
alert("请选择单位或个人");
alert("请选择单位");
return;
}
// start
this.multipleSelection = []
this.patientRegister.prList.forEach(e => {
if(e.choosed) this.multipleSelection.push(e)
});
// end
if (this.multipleSelection.length < 1) {
this.$message.info("请勾选要操作的人员!");
return;
@ -831,6 +855,8 @@ export default {
return;
}
this.elProgress.display = true
this.elProgress.percentage = 0
for (let i = 0; i < this.multipleSelection.length; i++) {
groupBatch.patientRegisterId = this.multipleSelection[i].id;
try {
@ -838,10 +864,11 @@ export default {
} catch (error) {
console.log(error);
}
this.elProgress.percentage = Math.floor((i+1)*100/this.multipleSelection.length)
}
this.$message.success("操作成功!");
this.dialogGroup = false;
this.query();
this.Query();
},
@ -913,9 +940,17 @@ export default {
asbBatch() {
let customerOrgId = this.patientRegister.query.customerOrgId;
if (!customerOrgId) {
alert("请选择单位或个人");
alert("请选择单位");
return;
}
// start
this.multipleSelection = []
this.patientRegister.prList.forEach(e => {
if(e.choosed) this.multipleSelection.push(e)
});
// end
this.dialogAsbitem = true;
//
this.dict.asbItemQuick = [...this.dict.asbItemAll];
@ -950,6 +985,7 @@ export default {
});
},
//
async asbitemBatchHandle() {
let msg = '', body = {};
if (this.asbitemBatch.asbitemsTemp.length == 0) {
@ -982,12 +1018,14 @@ export default {
// }
// ]
// }
let createRegisterAsbitemDtos = [...this.asbitemBatch.asbitemsTemp];
let createRegisterAsbitemDtos = deepCopy(this.asbitemBatch.asbitemsTemp);
createRegisterAsbitemDtos.forEach(e => {
delete e.asbitemName;
return e;
});
this.elProgress.display = true
this.elProgress.percentage = 0
for (let i = 0; i < this.multipleSelection.length; i++) {
createRegisterAsbitemDtos.forEach(e => {
e.patientRegisterId = this.multipleSelection[i].id;
@ -1002,7 +1040,9 @@ export default {
} catch (error) {
console.log('批量增加项目错误,原因:', error);
}
this.elProgress.percentage = Math.floor((i+1)*100/this.multipleSelection.length)
}
} else {
// {
// isDeleteGroup: 'N',
@ -1015,6 +1055,8 @@ export default {
} else {
body.isDeleteGroup = 'N';
}
this.elProgress.display = true
this.elProgress.percentage = 0
for (let i = 0; i < this.multipleSelection.length; i++) {
this.asbitemBatch.asbitemsTemp.forEach(e => {
@ -1029,12 +1071,13 @@ export default {
} catch (error) {
console.log('批量删除项目错误,原因:', error);
}
this.elProgress.percentage = Math.floor((i+1)*100/this.multipleSelection.length)
}
}
this.$message.success("操作成功!");
this.dialogAsbitem = false;
this.query();
this.Query();
},
//
@ -1052,13 +1095,13 @@ export default {
} catch (error) {
return;
}
if (res.Code != -1) {
if (res.code != -1) {
this.$message.info("发送检验申请成功!");
isPrintLisRequest = true;
}
//
if (res.Code == -1 && res.Message.indexOf('已申请') > -1) {
if (res.code == -1 && res.message.indexOf('已申请') > -1) {
isPrintLisRequest = true;
}
@ -1082,7 +1125,10 @@ export default {
//
lisPrint(prId, ReportCode, isPreview) {
if(!this.$peisAPI) {
this.$message.info("此功能,需要在壳客户端才可运行!")
return
}
let token = localStorage.getItem('token');
let user = localStorage.getItem('user');
let toOutShell = {
@ -1141,7 +1187,10 @@ export default {
//pacs
pacsPrint(prId, ReportCode, isPreview) {
if(!this.$peisAPI) {
this.$message.info("此功能,需要在壳客户端才可运行!")
return
}
let token = localStorage.getItem('token');
let user = localStorage.getItem('user');
let toOutShell = {
@ -1205,7 +1254,7 @@ export default {
"patientRegister.query.times"(newVal, oldVal) {
if (newVal != oldVal) {
//alert('')
this.query();
this.Query();
}
},

43
src/components/report/ElProgressOCX.vue

@ -0,0 +1,43 @@
<template>
<div style="margin:60 30 100 30px; ">
<el-progress :text-inside="elProgress.textInside" :stroke-width="elProgress.strokeWidth" :percentage="elProgress.percentage" />
</div>
</template>
<script>
import { mapState } from "vuex";
export default {
data() {
return {
};
},
computed: {
...mapState(["elProgress"]),
},
created() {
},
mounted() {
},
methods: {
},
//
watch: {
"elProgress.percentage"(newVal, oldVal) {
if (newVal == 100) {
this.elProgress.display = false
}
},
},
};
</script>
<style lang="scss" scoped>
</style>

4
src/components/report/PatientRegisterListNobtn.vue

@ -801,13 +801,13 @@ export default {
} catch (error) {
return;
}
if (res.Code != -1) {
if (res.code != -1) {
this.$message.info("发送检验申请成功!");
isPrintLisRequest = true;
}
//
if (res.Code == -1 && res.Message.indexOf('已申请') > -1) {
if (res.code == -1 && res.message.indexOf('已申请') > -1) {
isPrintLisRequest = true;
}

1
src/main.js

@ -108,6 +108,7 @@ onResize();
// 监听keydown:获取键盘按住事件,code返回按住的键信息
window.addEventListener('keydown', code => {
console.log('keydown',code)
if (code.key == "Shift" && code.shiftKey) {
store.commit('setData', { key: 'window.shift', value: true });// 标记按住了shift键
}

9
src/store/index.js

@ -21,12 +21,21 @@ export default new Vuex.Store({
shift:false, //是否按下 shift键
ctrl:false, //是否按下 ctrl键
},
elProgress:{ //通用进度条相关参数
display:false, //是否显示
textInside:true,
strokeWidth:30,
percentage:0
},
customerOrg: {
//体检单位设置
customerOrgTree: [], //体检单位列表
defaultExpandedKeys:[], //当前选中树的节点
treeCurrentNodekey:'', //当前选中树的节点
treeprops: {
label: "displayName",
value: "id",
id: "id",
children: "treeChildren",
}, //树形组件的数据结构
customerOrgId: "", //当前单位ID(可根据此值是否为空,判断是新增还是编辑)

4
src/views/basic-dictionary/GuideType.vue

@ -813,8 +813,8 @@ export default {
type: "warning",
}).then(() => {
deletion(this.form.id).then((res) => {
if (res.Code == -1) {
// this.$message.warning(res.Message);
if (res.code == -1) {
// this.$message.warning(res.message);
} else {
console.log(res);
this.$message.success("删除成功");

4
src/views/doctorCheck/personnelBatch.vue

@ -307,8 +307,8 @@ export default {
cancelButtonText: "取消",
type: "warning",
}).then((res) => {
// let targettitle = res.Message;
this.$message.warning(res.Message);
// let targettitle = res.message;
this.$message.warning(res.message);
});
}
});

Loading…
Cancel
Save