-
+
拍照
@@ -336,6 +344,43 @@
指引单预览
+
+
+ 全个人支付
+
+
+ 全单位支付
+
+
+ 全赠送
+
+
+ 收费
+
+
+
+
+
+
+
+ 查找： 条码号
+
+
+
+ 档案号
+
+
+
+ 姓名
+
+
+
+ 手机号
+
@@ -412,7 +457,7 @@ import { mapState } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
import mm from "../../utlis/mm";
-import { objCopy, setNull, dddw, parseID, birthdayToAge } from "../../utlis/proFunc";
+import { objCopy, setNull, dddw, parseID, birthdayToAge,deepCopy } from "../../utlis/proFunc";
import Camera from "./Camera.vue";
import PatientRegisterItem from "./PatientRegisterItem.vue";
import LisRequest from "./LisRequest.vue";
@@ -429,6 +474,7 @@ export default {
return {
apiurl: mm.apiurl,
brushTimes: 0,
+ payTypeFlag:'',
form: {
id: "", //id
patientId: "00000000-0000-0000-0000-000000000000", //档案号ID 选择了档案就传档案号，未选就传00000-0000...
@@ -472,6 +518,10 @@ export default {
creationTime: "",
lastModificationTime: "",
lastModifierId: null,
+ isVipBox: false, //vip客户
+ isNameHideBox: false, //隐藏姓名
+ isPhoneFollowBox: false, //电话随访
+ isLockBox: false, //是否锁住
}, //单位 记录 目前新增与更新是一致
defaultNull: [
@@ -509,6 +559,7 @@ export default {
//挂载完成
mounted() {
objCopy(this.formInitData, this.form);
+ this.initBox();
},
computed: {
@@ -598,12 +649,48 @@ export default {
return moment(new Date(date)).format(forMat);
},
+ changeBox(type) {
+ //赋值
+ if(this.form[type + 'Box']){
+ this.form[type] = 'Y';
+ }else{
+ this.form[type] = 'N';
+ }
+ },
+
+ initBox(){
+ if(this.form.isVip == 'Y'){
+ this.form.isVipBox = true;
+ }else{
+ this.form.isVipBox = false;
+ }
+
+ if(this.form.isNameHide == 'Y'){
+ this.form.isNameHideBox = true;
+ }else{
+ this.form.isNameHideBox = false;
+ }
+
+ if(this.form.isPhoneFollow == 'Y'){
+ this.form.isPhoneFollowBox = true;
+ }else{
+ this.form.isPhoneFollowBox = false;
+ }
+
+ if(this.form.isLock == 'Y'){
+ this.form.isLockBox = true;
+ }else{
+ this.form.isLockBox = false;
+ }
+
+ },
+
//提交
Onsubmit(formName, msgTip) {
this.$refs[formName].validate((valid) => {
if (valid) {
//赋值
- let body = { ...this.form };
+ let body = deepCopy(this.form);
delete body.id;
delete body.patientRegisterNo;
@@ -615,6 +702,10 @@ export default {
delete body.creationTime;
delete body.lastModificationTime;
delete body.lastModifierId;
+ delete body.isVipBox;
+ delete body.isNameHideBox;
+ delete body.isPhoneFollowBox;
+ delete body.isLockBox;
setNull(body, this.defaultNull);
@@ -877,7 +968,7 @@ export default {
// }
return postapi('/api/app/lisrequest/updatelisrequestisprint', { operateType: 1, patientRegisterId: this.form.id })
}
- })
+ })
.catch(err => {
this.$message.warning(err);
});
@@ -893,6 +984,12 @@ export default {
this.brushTimes++;
this.patientRegister.lisRequestVisble = true;
},
+
+ toCharge(patientRegisterNo){
+ this.patientRegister.patientRegisterRd.patientRegisterNo = patientRegisterNo;
+ this.$router.push({ path: "/charge" });
+ },
+
},
//监听事件
@@ -904,6 +1001,7 @@ export default {
if (newVal != oldVal) {
console.log('this.editTimes', this.editTimes)
objCopy(this.formInitData, this.form);
+ this.initBox();
//console.log('this.form',this.form)
}
},
@@ -921,11 +1019,13 @@ export default {
diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue
index 6616495..8975740 100644
--- a/src/components/patientRegister/PatientRegisterItem.vue
+++ b/src/components/patientRegister/PatientRegisterItem.vue
@@ -1,5 +1,5 @@
-
+
项目类别
@@ -10,7 +10,7 @@
@@ -60,12 +60,12 @@
总金额
-
-
@@ -73,7 +73,7 @@
@@ -92,7 +92,7 @@
-
@@ -137,7 +137,7 @@ import { mapState, mapActions } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
import { arrayFilter, arrayReduce, arrayExistObj, dddw } from "../../utlis/proFunc";
export default {
- props: ["patientRegisterForm"],
+ props: ["patientRegisterForm","payTypeFlag"],
data() {
return {
itemType: [], //项目类别
@@ -624,7 +624,8 @@ export default {
if (lfind > -1) {
this.addAbs([this.dict.asbItemQuick[lfind]])
}
- }
+ }
+
},
// quickChoosedAsb(v){
// let lfind = -1
@@ -799,6 +800,29 @@ export default {
this.onSubmit('');
}
},
+
+ //快速选择完后，重新将光标定位到 asbItemId
+ "asbItemId"(newVal, oldVal) {
+ if (newVal != oldVal && newVal != '') {
+ //重新定位光标
+ this.$nextTick(() => {
+ console.log("1this.$refs['asbItemId'].focus()");
+ this.$refs['asbItemId'].focus(); //total asbItemId
+ console.log("2this.$refs['asbItemId'].focus()");
+ });
+ }
+ },
+
+ //按钮更新支付方式
+ "payTypeFlag"(newVal, oldVal) {
+ if (newVal != oldVal && newVal != '') {
+ this.patientRegister.patientRegisterAbs.forEach(e =>{
+ e.payTypeFlag = newVal;
+ return e;
+ });
+ this.onSubmit('调整支付方式');
+ }
+ },
},
};
@@ -807,7 +831,7 @@ export default {
.mainareaBox {
border: 1px solid #000;
- height: v-bind("(window.pageHeight > 735 ? (window.pageHeight - 535) : 200) + 'px'");
+ height: v-bind("(window.pageHeight > 720 ? (window.pageHeight - 460) : 260) + 'px'");
margin-top: 5px;
}
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 698df20..4af3510 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -1018,7 +1018,8 @@ export default {
}
})
.then(res => {
- if (res.toLowerCase() == 'success') {
+ console.log('res',res);
+ if (res && res.toLowerCase() == 'success') {
//更新打印状态 /api/app/lisrequest/updatelisrequestisprint
// {
// "operateType": 0, 操作类型（1.按PatientRegisterId 2.按LisRequestId）
diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue
index 21039fc..8138ef6 100644
--- a/src/components/sumDoctorCheck/ButtonList.vue
+++ b/src/components/sumDoctorCheck/ButtonList.vue
@@ -256,6 +256,7 @@ export default {
preViewCanPrint: this.sumDoctorCheck.sumPREdit.isAudit,
Parameters: [
{ Name: 'printer', Value: user },
+ { Name: 'LTS', Value: 'Y' }, //Y、N
{ Name: 'hisLog', Value: 'pic/hisLog.jpg' },
{ Name: "peisReportFirstPage", Value: "pic/peisReportFirstPage.jpg" },
{ Name: "peisReportPageHeader", Value: "pic/peisReportPageHeader.jpg" },
diff --git a/src/views/charge/charge.vue b/src/views/charge/charge.vue
index 0e1e11d..dfdbb18 100644
--- a/src/views/charge/charge.vue
+++ b/src/views/charge/charge.vue
@@ -317,11 +317,17 @@ export default {
created() {
this.dictInit();
+ this.query.patientRegisterNo = this.patientRegister.patientRegisterRd.patientRegisterNo;
},
//挂载完成
mounted() {
- this.Query();
+ if(this.query.patientRegisterNo){
+ this.Query('patientRegisterNo');
+ }else{
+ this.Query();
+ }
+
},
computed: {