-
-
+
年
月
日
@@ -72,13 +78,13 @@
+ @change="changestarttime" placeholder="选择日期" style="width:150px">
至
-
@@ -130,6 +136,9 @@ import {
import {
addsign
} from '@/api/manage/newSigning.js'
+import {
+ getById
+} from '@/api/manage/signRecord.js'
import { getAge } from "@/utils/age";
import { getToken } from '@/utils/auth'
export default {
@@ -195,19 +204,72 @@ export default {
methods: {
//签约详情
info() {
+ let datetime = new Date();
+ let year = datetime.getFullYear();
+ let month = datetime.getMonth() + 1;
+ let day = datetime.getDate();
+ month >= 1 && month <= 9 ? (month = "0" + month) : "";
+ day >= 0 && day <= 9 ? (day = "0" + day) : "";
getByRecordId(this.$route.query.patientSignRecordId).then(res => {
this.list = res.data
- this.signPackage.packageName = this.list.packageName
- this.signPackage.packageId = this.list.servicePackageId
- this.signPackage.serviceCycle = this.list.serviceCycle
- this.signPackage.serviceStartTime = this.list.serviceStartTime
- this.signPackage.serviceEndTime = this.list.serviceEndTime
- this.signPackage.packagePrice = this.list.packagePrice
+ this.signPackage.packagePaymentStatus = res.data.packagePaymentStatus
+ // this.signPackage.packageName = this.list.packageName
+ // this.signPackage.packageId = this.list.servicePackageId
+ // this.signPackage.serviceCycle = this.list.serviceCycle
+ // this.signPackage.serviceStartTime = this.list.serviceStartTime
+ // this.signPackage.serviceEndTime = this.list.serviceEndTime
+ // this.signPackage.packagePrice = this.list.packagePrice
this.form.devices = this.list.signDevices
this.form.record = this.list
this.list.age = this.list.birthDate ? getAge(this.list.birthDate) : ''
+ getById(res.data.servicePackageId).then(resp => {
+ this.signPackage = { ...this.signPackage, ...resp.data }
+ this.signPackage.serviceStartTime = `${year}-${month}-${day}`
+ this.signPackage.servicePackageId = resp.data.id
+ this.obtainendtime(this.signPackage)
+ })
})
},
+ //获取endtime
+ obtainendtime(item) {
+ if (item.packageTermUnit == '年') {
+ const nextdate = new Date(this.signPackage.serviceStartTime);
+ nextdate.setFullYear(nextdate.getFullYear() + Number(item.packageTerm));
+ nextdate.setDate(nextdate.getDate() - 1);
+ let nextYear = nextdate.getFullYear();
+ let nextMonth = this.checkMonth(nextdate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1
+ let nextday = this.checkMonth(nextdate.getDate())
+ let nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05"
+ this.signPackage.serviceEndTime = nextDate
+ } else if (item.packageTermUnit == '月') {
+ const currentDate = new Date(this.signPackage.serviceStartTime);
+ currentDate.setMonth(currentDate.getMonth() + Number(item.packageTerm)); // 加一个月
+ currentDate.setDate(currentDate.getDate() - 1); // 减一天
+ let nextYear = currentDate.getFullYear();
+ let nextMonth = this.checkMonth(currentDate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1
+ let nextday = this.checkMonth(currentDate.getDate())
+ let nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05"
+ this.signPackage.serviceEndTime = nextDate
+ } else if (item.packageTermUnit == '日') {
+ let currentDate = new Date(this.signPackage.serviceStartTime)
+ currentDate = new Date(currentDate.setDate(currentDate.getDate() + Number(item.packageTerm)));
+ let nextYear = currentDate.getFullYear();
+ let nextMonth = this.checkMonth(currentDate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1
+ let nextday = this.checkMonth(currentDate.getDate())
+ let nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05"
+ this.signPackage.serviceEndTime = nextDate
+ }
+ },
+ checkMonth(i) {
+ if (i < 10) {
+ i = "0" + i;
+ }
+ return i;
+ },
+ //选择开始时间
+ changestarttime(item) {
+ this.obtainendtime(this.signPackage)
+ },
//续约
signupload() {
const files = this.$refs.upload.uploadFiles
diff --git a/src/views/manage/newSigning/index.vue b/src/views/manage/newSigning/index.vue
index be4bcee..521f960 100644
--- a/src/views/manage/newSigning/index.vue
+++ b/src/views/manage/newSigning/index.vue
@@ -11,7 +11,7 @@
{{ $route.query.patientName }}
{{ $route.query.sex == 'MALE' ? '男' : '' }}{{
$route.query.sex == 'FEMALE' ? '女' : '' }}
- {{ $route.query.age }}
+
{{ $route.query.patientPhone }}
{{
$route.query.visitMethod == 'OUTPATIENT_SERVICE' ? '门诊' : $route.query.visitMethod ==
@@ -38,8 +38,8 @@
-
-
+
@@ -157,7 +157,7 @@ export default {
packagePaymentStatus: [
{ required: true, message: '缴费状态不能为空', trigger: 'change' }
],
- servicePackageld: [
+ servicePackageId: [
{ required: true, message: '请选择服务包', trigger: 'change' }
],
devices: {
@@ -190,14 +190,48 @@ export default {
},
methods: {
tappackage(id) {
- this.signPackage = { ...this.signPackage, ...this.packagelist.find(e => e.id == id) }
- let currentDate = new Date();
- let year = currentDate.getFullYear();
- let month = currentDate.getMonth() + 1;
- let day = currentDate.getDate();
+ let item = this.packagelist.find(e => e.id == id)
+ this.signPackage = { ...this.signPackage, ...item }
+ let datetime = new Date();
+ let year = datetime.getFullYear();
+ let month = datetime.getMonth() + 1;
+ let day = datetime.getDate();
month >= 1 && month <= 9 ? (month = "0" + month) : "";
day >= 0 && day <= 9 ? (day = "0" + day) : "";
this.signPackage.serviceStartTime = `${year}-${month}-${day}`
+ if (item.packageTermUnit == '年') {
+ const nextdate = new Date(this.signPackage.serviceStartTime);
+ nextdate.setFullYear(nextdate.getFullYear() + Number(item.packageTerm));
+ nextdate.setDate(nextdate.getDate() - 1);
+ let nextYear = nextdate.getFullYear();
+ let nextMonth = this.checkMonth(nextdate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1
+ let nextday = this.checkMonth(nextdate.getDate())
+ let nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05"
+ this.signPackage.serviceEndTime = nextDate
+ } else if (item.packageTermUnit == '月') {
+ const currentDate = new Date(this.signPackage.serviceStartTime);
+ currentDate.setMonth(currentDate.getMonth() + Number(item.packageTerm)); // 加一个月
+ currentDate.setDate(currentDate.getDate() - 1); // 减一天
+ let nextYear = currentDate.getFullYear();
+ let nextMonth = this.checkMonth(currentDate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1
+ let nextday = this.checkMonth(currentDate.getDate())
+ let nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05"
+ this.signPackage.serviceEndTime = nextDate
+ } else if (item.packageTermUnit == '日') {
+ let currentDate = new Date(this.signPackage.serviceStartTime)
+ currentDate = new Date(currentDate.setDate(currentDate.getDate() + Number(item.packageTerm)));
+ let nextYear = currentDate.getFullYear();
+ let nextMonth = this.checkMonth(currentDate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1
+ let nextday = this.checkMonth(currentDate.getDate())
+ let nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05"
+ this.signPackage.serviceEndTime = nextDate
+ }
+ },
+ checkMonth(i) {
+ if (i < 10) {
+ i = "0" + i;
+ }
+ return i;
},
//签约
signupload() {
@@ -209,8 +243,8 @@ export default {
}
},
uploadsave() {
- if (this.signPackage.servicePackageld) {
- this.signPackage.packageName = this.packagelist.find(e => e.id == this.signPackage.servicePackageld).packageName
+ if (this.signPackage.servicePackageId) {
+ this.signPackage.packageName = this.packagelist.find(e => e.id == this.signPackage.servicePackageId).packageName
}
this.form.signPackage = this.signPackage
addsign(this.form).then(res => {
@@ -219,7 +253,10 @@ export default {
cancelButtonText: '取消',
type: 'success'
}).then(() => {
- this.$router.go(-1);
+ // this.$router.go(-1);
+ this.$router.push({
+ path: "/patient/signRecord",
+ });
}).catch(() => {
this.$modal.msgSuccess("签约成功");
});
diff --git a/src/views/manage/preHospitalized/index.vue b/src/views/manage/preHospitalized/index.vue
index 126194e..e849aae 100644
--- a/src/views/manage/preHospitalized/index.vue
+++ b/src/views/manage/preHospitalized/index.vue
@@ -477,7 +477,7 @@ export default {
this.$router.push({
path: "/patient/patientdetails",
query: {
- patientId: row.id,
+ patientId: row.patientId,
cardNo: row.cardNo,
patientName: row.patientName,
patientPhone: row.patientPhone,
diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue
index 245e7df..460167a 100644
--- a/src/views/manage/signRecord/index.vue
+++ b/src/views/manage/signRecord/index.vue
@@ -421,12 +421,13 @@ export default {
signDiagnosis: row.signDiagnosis,
visitSerialNumber: row.visitSerialNumber,
hospitalAgencyName: row.hospitalAgencyName,
+ hospitalAgencyId: row.hospitalAgencyId,
inHospitalNumber: row.inHospitalNumber,
departmentName: row.departmentName,
paymentStatus: row.paymentStatus,
sex: row.sex,
age: row.birthDate ? getAge(row.birthDate) : '',
- patientId: row.id,
+ patientId: row.patientId,
createTime: row.createTime,
},
});
@@ -512,7 +513,7 @@ export default {
this.$router.push({
path: "/patient/patientdetails",
query: {
- patientId: row.id,
+ patientId: row.patientId,
cardNo: row.cardNo,
patientName: row.patientName,
patientPhone: row.patientPhone,