shentun
/
peisweb
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity
Browse Source

Merge branch 'master' of http://ver.wh613.com:3000/shentun/peisweb

master
mch 3 years ago
parent
f40e0e6935 a882e9b462
commit
2aaf44ba1f
10 changed files with 219 additions and 104 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/components/customerOrg/ContactPerson.vue
  2. 21
      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. 36
      src/components/patientRegister/PatientRegisterEdit.vue
  7. 11
      src/components/patientRegister/PatientRegisterList.vue
  8. 1
      src/store/index.js
  9. 12
      src/utlis/proFunc.js
  10. 222
      src/views/fee-settings/Item.vue

8
src/components/customerOrg/ContactPerson.vue
View File

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

21
src/components/customerOrg/customerOrgEdit.vue
View File

@ -15,12 +15,12 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单位名称" prop="displayName"> <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-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单位简称" prop="shortName"> <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-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -190,7 +190,7 @@
> >
</div> </div>
<div class="btnList"> <div class="btnList">
<el-button type="success" @click="onSubmit('form')" class="btnClass"
<el-button type="success" @click="btnSubmit('form')" class="btnClass"
>保存</el-button >保存</el-button
> >
</div> </div>
@ -406,7 +406,7 @@ export default {
}, },
//提交 //提交
onSubmit(formName) {
btnSubmit(formName) {
let body = {}; let body = {};
console.log("vuex data", this.customerOrg.customerOrgRd); console.log("vuex data", this.customerOrg.customerOrgRd);
this.$refs[formName].validate((valid, fields) => { this.$refs[formName].validate((valid, fields) => {
@ -446,6 +446,7 @@ export default {
this.customerOrg.customerOrgId = res.data.id; this.customerOrg.customerOrgId = res.data.id;
this.customerOrg.customerOrgRd = res.data; this.customerOrg.customerOrgRd = res.data;
this.getCustomerOrgTree("insert", res.data); this.getCustomerOrgTree("insert", res.data);
this.customerOrg.oprStatus = 'edit'
} }
}); });
} else { } else {
@ -456,6 +457,7 @@ export default {
this.$message.success("更新 操作成功"); this.$message.success("更新 操作成功");
let lbody = { id: this.customerOrg.customerOrgRd.id, ...body }; let lbody = { id: this.customerOrg.customerOrgRd.id, ...body };
this.getCustomerOrgTree("update", lbody); this.getCustomerOrgTree("update", lbody);
this.customerOrg.oprStatus = 'edit'
} }
} }
); );
@ -465,10 +467,16 @@ export default {
//新增弹框 //新增弹框
async add(formName, child) { async add(formName, child) {
await this.$refs[formName].resetFields(); await this.$refs[formName].resetFields();
//console.log('this.peisid',this.peisid)
if(!this.peisid || this.peisid == 'null'){
this.$message.warning("该用户未选归属体检中心，不能执行此操作！");
return
}
if (child) { if (child) {
if (!this.customerOrg.customerOrgId) { if (!this.customerOrg.customerOrgId) {
this.$message.info("请先选择单位");
this.$message.warning("请先选择上级单位");
this.customerOrg.oprStatus = ''
return; return;
} }
this.customerOrg.customerOrgRd.id = ""; this.customerOrg.customerOrgRd.id = "";
@ -486,6 +494,7 @@ export default {
parentId: null, parentId: null,
}; };
} }
this.customerOrg.oprStatus = 'add'
objCopy(this.customerOrg.customerOrgRd, this.form); objCopy(this.customerOrg.customerOrgRd, this.form);
this.customerOrg.customerOrgId = ""; this.customerOrg.customerOrgId = "";
@ -518,6 +527,8 @@ export default {
this.customerOrg.contactMethodList = [] this.customerOrg.contactMethodList = []
this.setData({ key: "customerOrg.customerOrgRd", value: { id: "" } }); this.setData({ key: "customerOrg.customerOrgRd", value: { id: "" } });
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
this.customerOrg.oprStatus = ''
this.customerOrg.customerOrgId = ''
} }
}) })
.catch((err) => { .catch((err) => {

2
src/components/customerOrg/customerOrgRegister.vue
View File

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

2
src/components/customerOrg/customerOrgTree.vue
View File

@ -119,9 +119,11 @@ export default {
//点击树节点 //点击树节点
treeclick(data) { treeclick(data) {
//this.$message.success(data.id + " 查询单位详情、体检次数、联系人等信息 " + data.displayName);// api/app/customer-org/3a0c0439-a5ca-8a63-b2b9-e0eb24cb58b1 //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.customerOrg.customerOrgId = data.id;
this.getCustomerOrgRd(data.id); this.getCustomerOrgRd(data.id);
//只有单位才有体检次数登记，部门无 //只有单位才有体检次数登记，部门无
let firstId = data.id //一级单位ID let firstId = data.id //一级单位ID
if(data.parentId){ if(data.parentId){

2
src/components/patientRegister/Camera.vue
View File

@ -165,7 +165,7 @@ export default {
this.videoHeight this.videoHeight
); );
// 获取图片base64链接，展示到界面中的也是这个url地址 // 获取图片base64链接，展示到界面中的也是这个url地址
this.imgSrc = this.thisCancas.toDataURL("image/png");
this.imgSrc = this.thisCancas.toDataURL("image/jpeg"); // jpeg 格式比 png 要小一些
console.log('this.imgSrc',this.imgSrc); console.log('this.imgSrc',this.imgSrc);
}, },
// 上传照相机图片 // 上传照相机图片

36
src/components/patientRegister/PatientRegisterEdit.vue
View File

@ -336,7 +336,7 @@
<el-button type="primary" class="btnClass" @click="rdCopy">复制新增</el-button> <el-button type="primary" class="btnClass" @click="rdCopy">复制新增</el-button>
</div> </div>
<div class="btn"> <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>
<div class="btn"> <div class="btn">
<el-button type="primary" class="btnClass" @click="lisRequest">检验单申请</el-button> <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 style="position: absolute;top:40px;left:160px;display: flex; flex-wrap: wrap; height:60px;">
<div class="query"> <div class="query">
<span>查找：&nbsp;&nbsp;条码号</span>
<span class="querySpan">查找：&nbsp;&nbsp;条码号</span>
<el-input placeholder="条码号" v-model="query.patientRegisterNo" size="small" <el-input placeholder="条码号" v-model="query.patientRegisterNo" size="small"
clearable style="width: 140px" @change="quickQuery('patientRegisterNo')"/> clearable style="width: 140px" @change="quickQuery('patientRegisterNo')"/>
</div> </div>
<div class="query"> <div class="query">
<span>档案号</span>
<span class="querySpan">档案号</span>
<el-input placeholder="档案号" v-model="query.patientNo" size="small" <el-input placeholder="档案号" v-model="query.patientNo" size="small"
clearable style="width: 100px" @change="quickQuery('patientNo')" /> clearable style="width: 100px" @change="quickQuery('patientNo')" />
</div> </div>
<div class="query"> <div class="query">
<span>姓名</span>
<span class="querySpan">姓名</span>
<el-input placeholder="姓名" v-model="query.patientName" size="small" <el-input placeholder="姓名" v-model="query.patientName" size="small"
clearable style="width: 80px" @change="quickQuery('patientName')" /> clearable style="width: 80px" @change="quickQuery('patientName')" />
</div> </div>
<div class="query"> <div class="query">
<span>手机号</span>
<span class="querySpan">手机号</span>
<el-input placeholder="预约手机号" v-model="query.tel" size="small" <el-input placeholder="预约手机号" v-model="query.tel" size="small"
clearable style="width: 120px" @change="quickQuery('tel')" /> clearable style="width: 120px" @change="quickQuery('tel')" />
</div> </div>
@ -623,7 +623,7 @@ import { mapState } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api"; import { getapi, postapi, putapi, deletapi } from "@/api/api";
import mm from "../../utlis/mm"; 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 Camera from "./Camera.vue";
import PatientRegisterItem from "./PatientRegisterItem.vue"; import PatientRegisterItem from "./PatientRegisterItem.vue";
import LisRequest from "./LisRequest.vue"; import LisRequest from "./LisRequest.vue";
@ -913,13 +913,13 @@ export default {
//分组改变时触发 //分组改变时触发
changeCustomerOrgGroupId() { changeCustomerOrgGroupId() {
this.patientRegister.customerOrgGroupChange++; this.patientRegister.customerOrgGroupChange++;
if (this.form.id) this.Onsubmit('form', false);
if (this.form.id) this.btnSubmit('form', false);
}, },
//套餐改变时触发 //套餐改变时触发
changeMedicalPackageId() { changeMedicalPackageId() {
this.patientRegister.medicalPackageChange++; 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) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
//赋值 //赋值
@ -1096,13 +1096,16 @@ export default {
objCopy(res.data, this.form); objCopy(res.data, this.form);
// this.patientRegister.prList.push(res.data); //列表添加记录 // 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 => { this.patientRegister.patientRegisterAbs.forEach(e => {
e.patientRegisterId = res.data.id; e.patientRegisterId = res.data.id;
return e; return e;
}); });
this.patientRegister.patientRegisterRd = res.data;
this.patientRegister.query.times++;
this.patientRegister.saveTimes++; this.patientRegister.saveTimes++;
} }
} }
@ -1115,7 +1118,11 @@ export default {
if (msgTip) this.$message.success("更新 操作成功"); if (msgTip) this.$message.success("更新 操作成功");
//一般读身份证照片时，会出现这种情况 //一般读身份证照片时，会出现这种情况
if (this.patientRegister.photo.indexOf("data:image") > -1) savePeoplePhoto(this.form.id, this.patientRegister.photo); 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++; //更新保存时，无需触发组合项目保存 //this.patientRegister.saveTimes++; //更新保存时，无需触发组合项目保存
} }
}); });
@ -1485,4 +1492,7 @@ export default {
.query { .query {
margin-left: 10px; margin-left: 10px;
} }
.querySpan {
margin-right: 2px;
}
</style> </style>

11
src/components/patientRegister/PatientRegisterList.vue
View File

@ -475,6 +475,7 @@ export default {
}, },
data() { data() {
return { return {
peisid:null,
startPoint: -1, // 多选起点 -1 表示选择 startPoint: -1, // 多选起点 -1 表示选择
endPoint: -1, // 多选终点 -1 表示选择 endPoint: -1, // 多选终点 -1 表示选择
@ -555,6 +556,9 @@ export default {
//挂载完成 //挂载完成
mounted() { mounted() {
this.quickAsb = this.dict.asbItemAll; this.quickAsb = this.dict.asbItemAll;
this.peisid = window.sessionStorage.getItem('peisid');
//初始化可以拖动的列 //初始化可以拖动的列
this.dropCol = this.columnDrop(this.dropCol); this.dropCol = this.columnDrop(this.dropCol);
}, },
@ -779,6 +783,11 @@ export default {
//体检次数 相关操作 //体检次数 相关操作
add() { add() {
if(!this.peisid || this.peisid == 'null'){
this.$message.warning("该用户未选归属体检中心，不能执行此操作！");
return
}
let customerOrgId = this.patientRegister.query.customerOrgId; let customerOrgId = this.patientRegister.query.customerOrgId;
if (!customerOrgId) { if (!customerOrgId) {
alert("请选择单位或个人"); alert("请选择单位或个人");
@ -896,7 +905,7 @@ export default {
//查询 //查询
async Query() { async Query() {
this.patientRegister.prList = []; this.patientRegister.prList = [];
let body = {};
let body = {maxResultCount:500};
console.log(`this.patientRegister.query`, this.patientRegister.query); console.log(`this.patientRegister.query`, this.patientRegister.query);
if (this.patientRegister.query.customerOrgFlag) { if (this.patientRegister.query.customerOrgFlag) {

1
src/store/index.js
View File

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

12
src/utlis/proFunc.js
View File

@ -15,13 +15,13 @@ function tcdate(date) {
}; };
exports.tcdate = tcdate; 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) { 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]];
} }
} }
} }

222
src/views/fee-settings/Item.vue
View File

@ -204,6 +204,7 @@
v-model="form.unitId" v-model="form.unitId"
placeholder="请选择" placeholder="请选择"
style="width: 100%" style="width: 100%"
filterable
> >
<el-option <el-option
v-for="item in unitId" v-for="item in unitId"
@ -213,6 +214,15 @@
> >
</el-option> </el-option>
</el-select> </el-select>
<!-- <el-autocomplete
class="inline-input"
v-model="unitIdName"
:fetch-suggestions="querySearch"
value-key="displayName"
placeholder="请输入内容"
@select="handleSelect"
>
</el-autocomplete> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
@ -253,7 +263,9 @@
<el-input <el-input
v-model="form.diagnosisFunction" v-model="form.diagnosisFunction"
:disabled="disableddiagnosisFunction" :disabled="disableddiagnosisFunction"
></el-input>
>
<el-button slot="append" icon="el-icon-more" v-if="isDiagnosisFunctionBox" @click="diagnosisFunctionBox=true"></el-button>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -283,9 +295,11 @@
<el-checkbox v-model="isCalculationItemBox" @change="changeBox('isCalculationItem')" /> <el-checkbox v-model="isCalculationItemBox" @change="changeBox('isCalculationItem')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="计算函数" prop=""> <el-form-item label="计算函数" prop="">
<el-input v-model="form.calculationFunction"></el-input>
<el-input v-model="form.calculationFunction" :disabled="true">
<el-button slot="append" icon="el-icon-more" v-if="isCalculationItemBox" @click="calculationFunctionBox=true"></el-button>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -293,7 +307,7 @@
<el-input v-model="form.inputCheck"></el-input> <el-input v-model="form.inputCheck"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item label="继续处理" prop="isContinueProcess"> <el-form-item label="继续处理" prop="isContinueProcess">
<el-checkbox v-model="isContinueProcessBox" @change="changeBox('isContinueProcess')" /> <el-checkbox v-model="isContinueProcessBox" @change="changeBox('isContinueProcess')" />
</el-form-item> </el-form-item>
@ -462,30 +476,32 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="诊断"> <el-table-column label="诊断">
<template> </template>
<template slot-scope="scope">
{{scope.row.diagnosisId}}
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div style="margin-top: 5px; margin-left: 15px"> <div style="margin-top: 5px; margin-left: 15px">
<el-button type="primary" @click="increase">添加1</el-button>
<el-button type="primary" @click="increase" style="width:100%;">添加</el-button>
<div style="margin-top: 5px"> <div style="margin-top: 5px">
<el-button type="primary" @click="resultediting">编辑</el-button>
<el-button type="primary" @click="resultediting" style="width:100%;">编辑</el-button>
</div> </div>
<div style="margin-top: 5px"> <div style="margin-top: 5px">
<el-button type="primary" @click="delemtdelite">删除</el-button>
<el-button type="primary" @click="delemtdelite" style="width:100%;">删除</el-button>
</div> </div>
<!-- <div style="margin-top: 5px"> <!-- <div style="margin-top: 5px">
<el-button type="primary" @click="templatecategory" <el-button type="primary" @click="templatecategory"
>模板类别</el-button >模板类别</el-button
> >
</div> --> </div> -->
<div style="margin-top: 5px">
<el-button type="primary" @click="diagnosticmatching"
>诊断匹配</el-button
<div style="margin-top: 5px;margin-bottom:14px;">
<el-button type="primary" @click="diagnosticmatching" style="width:100%;">诊断匹配</el-button
> >
</div> </div>
</div> </div>
</div> </div>
<el-divider></el-divider>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="rurestdialogVisible = false">取 消</el-button> <el-button @click="rurestdialogVisible = false">取 消</el-button>
<el-button type="primary" @click="rurestdialogVisible = false" <el-button type="primary" @click="rurestdialogVisible = false"
@ -522,7 +538,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="诊断编号"> <el-form-item label="诊断编号">
<el-select v-model="rusetform.diagnosisId" placeholder="请选择">
<el-select v-model="rusetform.diagnosisId" placeholder="请选择" filterable>
<el-option <el-option
v-for="item in diagnosisId" v-for="item in diagnosisId"
:key="item.id" :key="item.id"
@ -533,43 +549,22 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-col :span="4">
<el-form-item label="小结名称"> <el-form-item label="小结名称">
<el-select
v-model="rusetform.isNameIntoSummary"
placeholder="请选择"
>
<el-option
v-for="item in isNameIntoSummary"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<el-checkbox v-model="rusetform.isNameIntoSummary" true-label="Y" false-label="N"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-col :span="4">
<el-form-item label="进入小结"> <el-form-item label="进入小结">
<el-select
v-model="rusetform.isResultIntoSummary"
placeholder="请选择"
>
<el-option
v-for="item in isResultIntoSummary"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<el-checkbox v-model="rusetform.isResultIntoSummary" true-label="Y" false-label="N" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-col :span="9">
<el-form-item label="结果状态"> <el-form-item label="结果状态">
<el-select <el-select
v-model="rusetform.resultStatusId" v-model="rusetform.resultStatusId"
placeholder="请选择" placeholder="请选择"
filterable
> >
<el-option <el-option
v-for="item in resultStatusId" v-for="item in resultStatusId"
@ -583,6 +578,7 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-divider></el-divider>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="ruesttieledialogVisible = false">取 消</el-button> <el-button @click="ruesttieledialogVisible = false">取 消</el-button>
<el-button type="primary" @click="rusteronsubmit">确 定</el-button> <el-button type="primary" @click="rusteronsubmit">确 定</el-button>
@ -882,8 +878,48 @@
> >
</span> </span>
</el-dialog> </el-dialog>
<!-- -->
<!-- 诊断函数弹框 -->
<el-dialog
title="诊断函数设置"
:visible.sync="diagnosisFunctionBox"
width="50%"
:close-on-click-modal="false"
>
<el-form label-width="110px">
<el-row>
<el-col :span="24">
<el-form-item label="诊断函数">
<el-input type="textarea" v-model="diagnosisFunctionText"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="diagnosisFunctionBox = false,diagnosisFunctionText=''">取 消</el-button>
<el-button type="primary" @click="OnsubmitDiagnosis">确 定</el-button>
</span>
</el-dialog>
<!-- 计算函数弹框 -->
<el-dialog
title="计算函数设置"
:visible.sync="calculationFunctionBox"
width="50%"
:close-on-click-modal="false"
>
<el-form label-width="110px">
<el-row>
<el-col :span="24">
<el-form-item label="诊断函数">
<el-input type="textarea" v-model="calculationFunctionText"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="calculationFunctionBox = false,calculationFunctionText=''">取 消</el-button>
<el-button type="primary" @click="OnsubmitCalculation">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
@ -943,8 +979,8 @@ export default {
itemId: "", itemId: "",
result: "", result: "",
diagnosisId: "", diagnosisId: "",
isNameIntoSummary: "",
isResultIntoSummary: "",
isNameIntoSummary: "N",
isResultIntoSummary: "Y",
resultStatusId: "", resultStatusId: "",
simpleCode: "", simpleCode: "",
}, //项目结果模板需要的数据 }, //项目结果模板需要的数据
@ -1012,6 +1048,9 @@ export default {
isCalculationItemBox:false, isCalculationItemBox:false,
isContinueProcessBox:false, isContinueProcessBox:false,
isActiveBox:true, isActiveBox:true,
// unitIdName:"",
diagnosisFunctionBox:false,
calculationFunctionBox:false,
form: { form: {
displayName: "", displayName: "",
englishShortName: "", englishShortName: "",
@ -1030,7 +1069,7 @@ export default {
isContinueProcess: "", isContinueProcess: "",
resultTemplateTypeFlag: "", resultTemplateTypeFlag: "",
inputCheck: "", inputCheck: "",
isActive: "",
isActive: ""
}, },
referenceRangeTypeFlag: [ referenceRangeTypeFlag: [
@ -1234,6 +1273,14 @@ export default {
value: "4", value: "4",
label: "无", label: "无",
}, },
{
value: "5",
label: "(—)",
},
{
value: "6",
label: "­-",
},
], //默认结果 ], //默认结果
ssdate: [], ssdate: [],
fssubdex: "", fssubdex: "",
@ -1241,8 +1288,10 @@ export default {
scopediagnostic: [], //诊断范围下拉框 scopediagnostic: [], //诊断范围下拉框
reference: [], //参考范围 reference: [], //参考范围
resulttemp: [], // 结果模板 resulttemp: [], // 结果模板
disableddiagnosisFunction: false,
disableddiagnosisFunction: true,
curRow: {}, curRow: {},
diagnosisFunctionText:"",
calculationFunctionText:""
}; };
}, },
created() { created() {
@ -1486,19 +1535,21 @@ export default {
// this.result = res.data.items; // this.result = res.data.items;
this.resultStatusId = res.data.items; this.resultStatusId = res.data.items;
}); });
postapi("/api/app/diagnosis/getlistinfilter").then((res) => {
console.log(res);
this.diagnosisId = res.data.items;
// let diagnosisObj={
// itemTypeId:this.form.itemTypeId
// }
postapi("/api/app/diagnosis/getlistinsuggestion").then((res) => {
this.diagnosisId = res.data;
}); });
}, },
//结果模板添加 //结果模板添加
increase() { increase() {
this.addoredit(); this.addoredit();
this.ruesttiele = 1; this.ruesttiele = 1;
Object.assign(this.$data.rusetform, this.$options.data().rusetform)
this.rusetform.itemId = this.form.id; this.rusetform.itemId = this.form.id;
console.log(this.rusetform.id);
this.ruesttieledialogVisible = true; this.ruesttieledialogVisible = true;
// this.rusetform = {};
console.log(this.rusetform)
}, },
//获取项目类别列表 //获取项目类别列表
getmedicalconclusionlist() { getmedicalconclusionlist() {
@ -1580,13 +1631,14 @@ export default {
cb(tableDatas); cb(tableDatas);
}, },
resultlist() { resultlist() {
getapi("/api/app/item-result-template").then((res) => {
this.reusttableData = res.data.items;
console.log(res);
});
getapi(`/api/app/item-result-template/in-item-id/${this.form.id}`).then(
(res) => {
this.reusttableData = res.data;
}
);
}, },
resulttemplate() { resulttemplate() {
this.form = { ...this.curRow };
if (this.form.id == undefined) { if (this.form.id == undefined) {
this.$message.warning("请选择操作的数据"); this.$message.warning("请选择操作的数据");
} else { } else {
@ -1594,15 +1646,12 @@ export default {
getapi(`/api/app/item-result-template/in-item-id/${this.form.id}`).then( getapi(`/api/app/item-result-template/in-item-id/${this.form.id}`).then(
(res) => { (res) => {
this.reusttableData = res.data; this.reusttableData = res.data;
console.log("2222222222222222");
console.log(res);
} }
); );
//// 获取项目类别
getapi("/api/app/item-type/by-code-all").then((res) => {
this.resultitemtype = res.data;
console.log(res);
});
// // 获取项目类别
// getapi("/api/app/item-type/by-code-all").then((res) => {
// this.resultitemtype = res.data;
// });
} }
}, },
//取消排序 //取消排序
@ -1714,15 +1763,20 @@ export default {
if (this.form.id == undefined) { if (this.form.id == undefined) {
this.$message.warning("请选择操作的数据"); this.$message.warning("请选择操作的数据");
} else { } else {
this.$nextTick(()=>{
this.$refs.form.resetFields();
})
this.form.price = Number(this.form.price); this.form.price = Number(this.form.price);
this.addorgropdata(); this.addorgropdata();
this.title = 2; this.title = 2;
this.dialogVisible = true; this.dialogVisible = true;
if (this.$refs.form !== undefined){
this.$refs.form.resetFields()
}
posjrctid(this.form.id).then((res) => { posjrctid(this.form.id).then((res) => {
this.form = res.data; this.form = res.data;
// this.unitId.forEach((item)=>{
// if(res.data.unitId==item.id){
// this.unitIdName=item.displayName
// }
// })
if (res.data.isProduceSummary == 'Y') { if (res.data.isProduceSummary == 'Y') {
this.isProduceSummaryBox = true; this.isProduceSummaryBox = true;
} else { } else {
@ -1760,13 +1814,38 @@ export default {
//编辑弹框勾选重新赋值 //编辑弹框勾选重新赋值
changeBox(type) { changeBox(type) {
//赋值 //赋值
console.log(type)
if(this[type+'Box']){ if(this[type+'Box']){
this.form[type] = 'Y'; this.form[type] = 'Y';
}else{ }else{
this.form[type] = 'N'; this.form[type] = 'N';
} }
}, },
// querySearch(queryString, cb) {
// var restaurants = this.unitId;
// var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
// // 调用 callback 返回建议列表的数据
// cb(results);
// },
// createFilter(queryString) {
// return (restaurant) => {
// return (restaurant.displayName.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
// };
// },
// handleSelect(item) {
// this.form.unitId=item.id
// },
OnsubmitDiagnosis(){
this.form.diagnosisFunction=this.diagnosisFunctionText
this.diagnosisFunctionText=''
this.diagnosisFunctionBox=false
this.$message.success("设置诊断函数成功");
},
OnsubmitCalculation(){
this.form.calculationFunction=this.calculationFunctionText
this.calculationFunctionText=''
this.calculationFunctionBox=false
this.$message.success("设置计算函数成功");
},
//确定新增或者编辑 //确定新增或者编辑
Onsubmit() { Onsubmit() {
this.$refs.form.validate((v) => { this.$refs.form.validate((v) => {
@ -1793,19 +1872,19 @@ export default {
}, },
//新增弹框 //新增弹框
add() { add() {
this.$nextTick(()=>{
this.$refs.form.resetFields();
})
this.form.price = Number(this.form.price); this.form.price = Number(this.form.price);
this.title = 1; this.title = 1;
this.dialogVisible = true; this.dialogVisible = true;
this.form = {};
if (this.$refs.form !== undefined){
this.$refs.form.resetFields()
}
this.isProduceSummaryBox=true, this.isProduceSummaryBox=true,
this.isNameIntoSummaryBox=true, this.isNameIntoSummaryBox=true,
this.isDiagnosisFunctionBox=false, this.isDiagnosisFunctionBox=false,
this.isCalculationItemBox=false, this.isCalculationItemBox=false,
this.isContinueProcessBox=false, this.isContinueProcessBox=false,
this.isActiveBox=true, this.isActiveBox=true,
// this.unitIdName=""
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.refinput.focus(); this.$refs.refinput.focus();
}); });
@ -1896,4 +1975,7 @@ export default {
:deep .downText{ :deep .downText{
display: flex!important; display: flex!important;
} }
:deep .el-input-group__append {
padding: 0 11px;
}
</style> </style>
Write Preview
Loading…
Cancel
Save