diff --git a/src/api/system/specialDiseaseRoute.js b/src/api/system/specialDiseaseRoute.js index d11990c..f7c7faf 100644 --- a/src/api/system/specialDiseaseRoute.js +++ b/src/api/system/specialDiseaseRoute.js @@ -43,9 +43,9 @@ export function delSpecialDiseaseRoute(id) { }) } //科室 -export function selectDiseaseCount(departmentName, servicePackageId) { +export function selectDiseaseCount(departmentName, releaseStatus, servicePackageId) { return request({ - url: `/system/specialDiseaseRoute/departmentRouteCount?departmentName=${departmentName}&releaseStatus=PUBLISHED&servicePackageId=${servicePackageId}`, + url: `/system/specialDiseaseRoute/departmentRouteCount?departmentName=${departmentName}&releaseStatus=${releaseStatus}&servicePackageId=${servicePackageId}`, method: 'get', }) diff --git a/src/utils/obtainendtime.js b/src/utils/obtainendtime.js index b502b83..e4d3c71 100644 --- a/src/utils/obtainendtime.js +++ b/src/utils/obtainendtime.js @@ -2,7 +2,6 @@ function obtainendtime(starttime, item) { let currentDate = new Date(starttime) let nextDate - console.log(item) if (item.packageTermUnit == '年') { currentDate.setFullYear(currentDate.getFullYear() + Number(item.packageTerm)); currentDate.setDate(currentDate.getDate() - 1); diff --git a/src/views/manage/components/specialDiseaseRoute.vue b/src/views/manage/components/specialDiseaseRoute.vue index 4f35e0c..f853307 100644 --- a/src/views/manage/components/specialDiseaseRoute.vue +++ b/src/views/manage/components/specialDiseaseRoute.vue @@ -124,30 +124,27 @@ export default { }, created() { this.queryParams.servicePackageId = this.servicePackageId - this.handleselectId = this.routeId - this.handleselectName = this.routeName this.getList(); }, mounted() { + this.handleselectId = this.routeId + this.handleselectName = this.routeName }, watch: { departmentName(val) { this.infolists(); }, routeId(newValue, oldValue) { - if (newValue) { - this.handleselectId = newValue; - } + this.handleselectId = newValue; }, servicePackageId(newValue, oldValue) { if (newValue) { this.queryParams.servicePackageId = newValue; + this.getList(); } }, routeName(newValue, oldValue) { - if (newValue) { - this.handleselectName = newValue; - } + this.handleselectName = newValue; } }, methods: { @@ -169,7 +166,7 @@ export default { }, //科室 infolists() { - selectDiseaseCount(this.departmentName, this.queryParams.servicePackageId).then((res) => { + selectDiseaseCount(this.departmentName, 'PUBLISHED', this.queryParams.servicePackageId).then((res) => { this.DepartmentoList = res.data; }); }, diff --git a/src/views/manage/newSigning/index.vue b/src/views/manage/newSigning/index.vue index 88cbcc5..f275f3a 100644 --- a/src/views/manage/newSigning/index.vue +++ b/src/views/manage/newSigning/index.vue @@ -30,7 +30,7 @@ - + + :servicePackageId="signPackage.servicePackageId" :routeName="route.routeName" + :routeId="route.routeId"> @@ -236,6 +237,8 @@ export default { this.route.routeName = item.routeName }, tappackage(id) { + this.route.routeId = '' + this.route.routeName = '' let item = this.packagelist.find(e => e.id == id) this.signPackage = { ...this.signPackage, ...item } let datetime = new Date(); diff --git a/src/views/system/specialDiseaseRoute/index.vue b/src/views/system/specialDiseaseRoute/index.vue index 32b6414..14a2304 100644 --- a/src/views/system/specialDiseaseRoute/index.vue +++ b/src/views/system/specialDiseaseRoute/index.vue @@ -305,7 +305,7 @@ export default { }, //科室 infolists() { - selectDiseaseCount(this.departmentName).then((res) => { + selectDiseaseCount(this.departmentName, '', '').then((res) => { this.DepartmentoList = res.data; }); },