修改

src/api/manage/signRecord.js

@@ -59,4 +59,12 @@ export function servicepackageinfo(query) {
         method: 'get',
         params: query
     })
-}
+}
+
+// 获取服务包基础信息
+export function getById(id) {
+    return request({
+        url: `/manage/servicepackage/getById/${id}`,
+        method: 'get',
+    })
+}

src/views/manage/continueSigning/index.vue

@@ -23,7 +23,7 @@
                 <el-descriptions-item label="患者姓名">{{ list.patientName }}</el-descriptions-item>
                 <el-descriptions-item label="性别">{{ list.sex == 'MALE' ? '男' : '' }}{{
                     list.sex == 'FEMALE' ? '女' : '' }}</el-descriptions-item>
-                <el-descriptions-item label="年龄">{{ list.age }}</el-descriptions-item>
+                <!-- <el-descriptions-item label="年龄">{{ list.age }}</el-descriptions-item> -->
                 <el-descriptions-item label="电话">{{ list.patientPhone }}</el-descriptions-item>
                 <el-descriptions-item label="就诊方式">{{
                     list.visitMethod == 'OUTPATIENT_SERVICE' ? '门诊' : list.visitMethod ==
@@ -35,9 +35,6 @@
                 <el-descriptions-item label="住院/门诊号">{{ list.inHospitalNumber }}</el-descriptions-item>
                 <el-descriptions-item label="医院">{{ list.hospitalAgencyName }}</el-descriptions-item>
                 <el-descriptions-item label="科室">{{ list.departmentName }}</el-descriptions-item>
-                <el-descriptions-item label="服务包缴费状态">{{ list.packagePaymentStatus == 'PAID' ? '已缴费' : '' }}
-                    {{ list.packagePaymentStatus == 'UNPAID_FEES' ? '未缴费' : '' }}
-                </el-descriptions-item>
                 <!-- <el-descriptions-item label="出院/门诊时间">{{ list.patientName }}</el-descriptions-item> -->
                 <!-- <el-descriptions-item label="注册时间">{{ list.patientName }}</el-descriptions-item> -->
             </el-descriptions>
@@ -56,14 +53,23 @@
                 <el-form-item label="选择服务包" prop="packageName">
                     <el-input v-model="signPackage.packageName" disabled></el-input>
                 </el-form-item>
+                <el-form-item label="服务包缴费状态" prop="packagePaymentStatus" label-width="130px">
+                    <el-select v-model="signPackage.packagePaymentStatus" filterable placeholder="请选择服务包" clearable>
+                        <el-option label="已缴费" value="PAID">
+                        </el-option>
+                        <el-option label="未缴费" value="UNPAID_FEES">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
             </el-form>
             <el-form :model="signPackage" :rules="rules" ref="signPackage" label-width="80px" class="demo-ruleForm"
                 :inline="true" style="padding-left:40px">
                 <el-form-item label="签约期限" prop="" label-width="100px">
                     <div>
-                        <el-input v-model="signPackage.packageTerm" style="width:130px"
+                        <el-input v-model="signPackage.packageTerm" style="width:130px" disabled
                             placeholder="请输入签约周期"></el-input>
-                        <el-select v-model="signPackage.packageTermUnit" style="width:110px" placeholder="周期单位">
+                        <el-select v-model="signPackage.packageTermUnit" style="width:110px" placeholder="周期单位"
+                            disabled>
                             <el-option label="年" value="年">年</el-option>
                             <el-option label="月" value="月">月</el-option>
                             <el-option label="日" value="日">日</el-option>
@@ -72,13 +78,13 @@
                 </el-form-item>
                 <el-form-item label="服务时长" prop="packageName">
                     <el-date-picker v-model="signPackage.serviceStartTime" :picker-options="pickerOptions" type="date"
-                        placeholder="选择日期" style="width:150px">
+                        @change="changestarttime" placeholder="选择日期" style="width:150px">
                     </el-date-picker>
                     至
                     <el-input v-model="signPackage.serviceEndTime" style="width:150px" disabled></el-input>
                 </el-form-item>
                 <el-form-item label="服务包价格(元)" prop="" label-width="120px">
-                    <el-input v-model="signPackage.packagePrice" style="width:150px"
+                    <el-input v-model="signPackage.packagePrice" style="width:150px" disabled
                         oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+3)} if(value.length>7){value=value.slice(0,7)}"
                         min="0" placeholder="小数点后两位(元)"></el-input>
                 </el-form-item>
@@ -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

src/views/manage/newSigning/index.vue

@@ -11,7 +11,7 @@
                 <el-descriptions-item label="患者姓名">{{ $route.query.patientName }}</el-descriptions-item>
                 <el-descriptions-item label="性别">{{ $route.query.sex == 'MALE' ? '男' : '' }}{{
                     $route.query.sex == 'FEMALE' ? '女' : '' }}</el-descriptions-item>
-                <el-descriptions-item label="年龄">{{ $route.query.age }}</el-descriptions-item>
+                <!-- <el-descriptions-item label="年龄">{{ $route.query.age }}</el-descriptions-item> -->
                 <el-descriptions-item label="电话">{{ $route.query.patientPhone }}</el-descriptions-item>
                 <el-descriptions-item label="就诊方式">{{
                     $route.query.visitMethod == 'OUTPATIENT_SERVICE' ? '门诊' : $route.query.visitMethod ==
@@ -38,8 +38,8 @@
             </el-descriptions>
             <el-form :model="signPackage" :rules="rules" ref="signPackage" label-width="100px" class="demo-ruleForm"
                 :inline="true" style="padding-left:40px">
-                <el-form-item label="选择服务包" prop="servicePackageld">
-                    <el-select v-model="signPackage.servicePackageld" filterable placeholder="请选择服务包" clearable
+                <el-form-item label="选择服务包" prop="servicePackageId">
+                    <el-select v-model="signPackage.servicePackageId" filterable placeholder="请选择服务包" clearable
                         @change="tappackage">
                         <el-option v-for="item in packagelist" :key="item.id" :label="item.packageName"
                             :value="item.id">
@@ -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("签约成功");
                 });

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,

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,