-
-
+
年
月
日
@@ -72,13 +78,13 @@
+ @change="changestarttime" placeholder="选择日期" style="width:150px">
至
-
@@ -130,7 +136,11 @@ import {
import {
addsign
} from '@/api/manage/newSigning.js'
+import {
+ getById
+} from '@/api/manage/signRecord.js'
import { getAge } from "@/utils/age";
+import { obtainendtime } from "@/utils/obtainendtime";
import { getToken } from '@/utils/auth'
export default {
dicts: ['hardware_type'],
@@ -195,19 +205,36 @@ 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.signPackage.serviceEndTime = obtainendtime(this.signPackage.serviceStartTime, this.signPackage)
+ })
})
},
+ //选择开始时间
+ changestarttime(item) {
+ this.signPackage.serviceEndTime = obtainendtime(item, this.signPackage)
+ },
//续约
signupload() {
const files = this.$refs.upload.uploadFiles
@@ -235,7 +262,11 @@ export default {
cancelButtonText: '取消',
type: 'success'
}).then(() => {
- this.$router.go(-1);
+ this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
+ this.$router.push({
+ path: "/patient/signRecord",
+ });
+ })
}).catch(() => {
this.$modal.msgSuccess("签约成功");
});
@@ -256,7 +287,11 @@ export default {
},
handlePictureCardPreview(file) { },
goback() {
- this.$router.go(-1);
+ this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
+ this.$router.push({
+ path: "/patient/signRecord",
+ });
+ })
},
}
};
diff --git a/src/views/manage/newSigning/index.vue b/src/views/manage/newSigning/index.vue
index be4bcee..e377697 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 @@
-
-
+
@@ -131,6 +131,7 @@ import {
servicepackageinfo
} from '@/api/manage/signRecord.js'
import { getToken } from '@/utils/auth'
+import { obtainendtime } from "@/utils/obtainendtime";
export default {
dicts: ['hardware_type'],
name: "newSigning",
@@ -157,7 +158,7 @@ export default {
packagePaymentStatus: [
{ required: true, message: '缴费状态不能为空', trigger: 'change' }
],
- servicePackageld: [
+ servicePackageId: [
{ required: true, message: '请选择服务包', trigger: 'change' }
],
devices: {
@@ -190,14 +191,16 @@ 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}`
+ this.signPackage.serviceEndTime = obtainendtime(this.signPackage.serviceStartTime, item)
},
//签约
signupload() {
@@ -209,8 +212,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 +222,11 @@ export default {
cancelButtonText: '取消',
type: 'success'
}).then(() => {
- this.$router.go(-1);
+ this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
+ this.$router.push({
+ path: "/patient/signRecord",
+ });
+ })
}).catch(() => {
this.$modal.msgSuccess("签约成功");
});
@@ -250,7 +257,11 @@ export default {
handlePictureCardPreview(file) {
},
goback() {
- this.$router.go(-1);
+ this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
+ this.$router.push({
+ path: "/patient/signRecord",
+ });
+ })
},
}
};
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/propaganda/index.vue b/src/views/manage/propaganda/index.vue
index 7586a00..635759d 100644
--- a/src/views/manage/propaganda/index.vue
+++ b/src/views/manage/propaganda/index.vue
@@ -740,7 +740,7 @@ export default {
// 表单校验
rules: {
departmentId: [
- { required: true, message: "科室不能为空", trigger: "blur" }
+ { required: true, message: "科室名称不能为空", trigger: "blur" }
],
propagandaType: [
{ required: true, message: "宣教类型不能为空", trigger: "blur" }
@@ -1019,6 +1019,7 @@ export default {
propagandaStatus:null,
departmentName: null,
propagandaTitle: null,
+ departmentId:null,
propagandaType: null,
propagandaCode: null,
propagandaContent: null,
@@ -1242,4 +1243,4 @@ audio {
font-size: 16px;
}
}
-
\ No newline at end of file
+
diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue
index 245e7df..50edb23 100644
--- a/src/views/manage/signRecord/index.vue
+++ b/src/views/manage/signRecord/index.vue
@@ -411,25 +411,28 @@ export default {
this.getList();
},
handlenewsign(row) {
- this.$router.push({
- path: "/patient/newSigning",
- query: {
- departmentId: row.departmentId,
- patientName: row.patientName,
- patientPhone: row.patientPhone,
- visitMethod: row.visitMethod,
- signDiagnosis: row.signDiagnosis,
- visitSerialNumber: row.visitSerialNumber,
- hospitalAgencyName: row.hospitalAgencyName,
- inHospitalNumber: row.inHospitalNumber,
- departmentName: row.departmentName,
- paymentStatus: row.paymentStatus,
- sex: row.sex,
- age: row.birthDate ? getAge(row.birthDate) : '',
- patientId: row.id,
- createTime: row.createTime,
- },
- });
+ this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
+ this.$router.replace({
+ path: "/patient/newSigning",
+ query: {
+ departmentId: row.departmentId,
+ patientName: row.patientName,
+ patientPhone: row.patientPhone,
+ visitMethod: row.visitMethod,
+ 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.patientId,
+ createTime: row.createTime,
+ },
+ });
+ })
},
selectAgencyinfo() {
let query = {
@@ -500,19 +503,21 @@ export default {
},
//续约
handleContinue(row) {
- this.$router.push({
- path: "/patient/continueSigning",
- query: {
- patientSignRecordId: row.id,
- },
- });
+ this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
+ this.$router.replace({
+ path: "/patient/continueSigning",
+ query: {
+ patientSignRecordId: row.id,
+ },
+ });
+ })
},
/** 详情操作 */
handleAuthRole(row) {
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/system/addQuestionnaire/index.vue b/src/views/system/addQuestionnaire/index.vue
index 1427579..549a76f 100644
--- a/src/views/system/addQuestionnaire/index.vue
+++ b/src/views/system/addQuestionnaire/index.vue
@@ -1033,7 +1033,11 @@ export default {
cancelButtonText: '取消',
type: 'success'
}).then(() => {
- this.$router.go(-1);
+ this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
+ this.$router.push({
+ path: "/question/question",
+ });
+ })
}).catch(() => {
this.$modal.msgSuccess("编辑保存成功");
});
@@ -1045,7 +1049,11 @@ export default {
cancelButtonText: '取消',
type: 'success'
}).then(() => {
- this.$router.go(-1);
+ this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
+ this.$router.push({
+ path: "/question/question",
+ });
+ })
}).catch(() => {
this.$modal.msgSuccess("新增保存成功");
});
@@ -1108,7 +1116,11 @@ export default {
})
},
goback() {
- this.$router.go(-1);
+ this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
+ this.$router.push({
+ path: "/question/question",
+ });
+ })
},
}
};
diff --git a/src/views/system/question/index.vue b/src/views/system/question/index.vue
index ed52632..654733d 100644
--- a/src/views/system/question/index.vue
+++ b/src/views/system/question/index.vue
@@ -259,18 +259,22 @@ export default {
},
/** 新增按钮操作 */
handleAdd() {
- this.$router.push({
- path: "/question/addQuestionnaire",
- });
+ this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
+ this.$router.push({
+ path: "/question/addQuestionnaire",
+ });
+ })
},
/** 修改按钮操作 */
handleUpdate(row) {
- this.$router.push({
- path: "/question/addQuestionnaire",
- query: {
- id: row.id,
- },
- });
+ this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
+ this.$router.push({
+ path: "/question/addQuestionnaire",
+ query: {
+ id: row.id,
+ },
+ });
+ })
},
/** 删除按钮操作 */
handleDelete(row) {