修改

src/api/manage/continueSigning.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+
+//续约界面查询签约详情
+export function getByRecordId(patientSignRecordId) {
+    return request({
+        url: `/manage/signRecord/getByRecordId/${patientSignRecordId}`,
+        method: 'get',
+    })
+}

src/views/manage/components/visitRecords.vue

@@ -20,7 +20,6 @@
                         </span>
                         <span style="margin-left: 10px;">
                             {{ item.createBy }}
-                            赵明
                         </span>
                     </div>
                     <el-tag v-if="item.visitType == 'BE_HOSPITALIZED'" class="type" size="mini">住院</el-tag>

src/views/manage/continueSigning/index.vue

@@ -1,69 +1,82 @@
 <template>
     <div class="app-container">
         <div class="interval">
-
+            <div class="package-item">
+                <div class="time">{{ list.signTime }}
+                </div>
+                <div class="name">
+                    {{ list.packageName }}
+                </div>
+                <el-tag v-if="list.serviceStatus == 'INTENTIONAL_SIGNING'" class="type" size="mini">意向签约</el-tag>
+                <el-tag v-if="list.serviceStatus == 'SERVICE_CENTER'" class="type" size="mini">服务中</el-tag>
+                <el-tag v-if="list.serviceStatus == 'SERVICE_END'" class="type" size="mini">服务结束</el-tag>
+            </div>
         </div>
         <div class="header">
             <div class="btns">
-                <el-button>取消</el-button>
+                <el-button @click="goback">取消</el-button>
                 <el-button type="primary" @click="signupload">签约</el-button>
             </div>
             <el-descriptions title="服务包续约详情" class="descriptions">
             </el-descriptions>
             <el-descriptions title="患者信息" style="padding:0 30px">
-                <el-descriptions-item label="患者姓名">{{ $route.query.patientName }}</el-descriptions-item>
+                <el-descriptions-item label="患者姓名">{{ list.patientName }}</el-descriptions-item>
-                <el-descriptions-item label="性别">{{ $route.query.sex }}</el-descriptions-item>
+                <el-descriptions-item label="性别">{{ list.sex == 'MALE' ? '男' : '' }}{{
-                <el-descriptions-item label="年龄">{{ $route.query.age }}</el-descriptions-item>
+                    list.sex == 'FEMALE' ? '女' : '' }}</el-descriptions-item>
-                <el-descriptions-item label="电话">{{ $route.query.patientPhone }}</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="就诊方式">{{
-                    $route.query.visitMethod == 'OUTPATIENT_SERVICE' ? '门诊' : $route.query.visitMethod == 'BE_IN_HOSPITAL' ?
+                    list.visitMethod == 'OUTPATIENT_SERVICE' ? '门诊' : list.visitMethod ==
-                    '住院' : ''
+                        'BE_IN_HOSPITAL' ?
+                        '住院' : ''
                 }}
                 </el-descriptions-item>
-                <el-descriptions-item label="诊断">{{ $route.query.mainDiagnosis }}</el-descriptions-item>
+                <el-descriptions-item label="诊断">{{ list.signDiagnosis }}</el-descriptions-item>
-                <el-descriptions-item label="住院/门诊号">{{ $route.query.admissionNumber }}{{ $route.query.outpatientNumber
+                <el-descriptions-item label="住院/门诊号">{{ list.inHospitalNumber }}</el-descriptions-item>
-                }}</el-descriptions-item>
+                <el-descriptions-item label="医院">{{ list.hospitalAgencyName }}</el-descriptions-item>
-                <el-descriptions-item label="医院">{{ $route.query.hospitalAgencyName }}</el-descriptions-item>
+                <el-descriptions-item label="科室">{{ list.departmentName }}</el-descriptions-item>
-                <el-descriptions-item label="科室">{{ $route.query.departmentName }}</el-descriptions-item>
+                <el-descriptions-item label="服务包缴费状态">{{ list.packagePaymentStatus == 'PAID' ? '已缴费' : '' }}
-                <el-descriptions-item label="服务包缴费状态">{{ $route.query.paymentStatus == 'PAID' ? '已缴费' : '' }}
+                    {{ list.packagePaymentStatus == 'UNPAID_FEES' ? '未缴费' : '' }}
-                    {{ $route.query.paymentStatus == 'UNPAID_FEES' ? '未缴费' : '' }}
                 </el-descriptions-item>
-                <!-- <el-descriptions-item label="出院/门诊时间">{{ $route.query.patientName }}</el-descriptions-item> -->
+                <!-- <el-descriptions-item label="出院/门诊时间">{{ list.patientName }}</el-descriptions-item> -->
-                <!-- <el-descriptions-item label="注册时间">{{ $route.query.patientName }}</el-descriptions-item> -->
+                <!-- <el-descriptions-item label="注册时间">{{ list.patientName }}</el-descriptions-item> -->
             </el-descriptions>
             <el-descriptions title="服务包信息" style="padding:20px 30px 10px" class="descriptions">
             </el-descriptions>
-            <el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-ruleForm" :inline="true"
+            <el-form :model="signPackage" :rules="rules" ref="signPackage" label-width="100px" class="demo-ruleForm"
-                style="padding-left:40px">
+                :inline="true" style="padding-left:40px">
                 <el-form-item label="选择服务包" prop="packageName">
-                    <el-input v-model="form.packageName" style="width:700px"></el-input>
+                    <el-input v-model="signPackage.packageName" style="width:300px"></el-input>
                 </el-form-item>
-                <el-form-item label="签约月数" prop="">
+            </el-form>
-                    <el-input v-model="form.packageName"></el-input>
+            <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">
+                    <el-input v-model="signPackage.serviceCycle" style="width:200px"></el-input>
                 </el-form-item>
                 <el-form-item label="服务时长" prop="packageName">
-                    <el-input v-model="form.packageName" style="width:150px"></el-input>
+                    <el-input v-model="signPackage.serviceStartTime" style="width:120px"></el-input>
                     至
-                    <el-input v-model="form.packageName" style="width:150px"></el-input>
+                    <el-input v-model="signPackage.serviceEndTime" style="width:120px"></el-input>
                 </el-form-item>
-                <el-form-item label="服务包价格" prop="">
+                <el-form-item label="服务包价格(元)" prop="" label-width="120px">
-                    <el-input v-model="form.packageName"></el-input>
+                    <el-input v-model="signPackage.packagePrice" style="width:200px"></el-input>
                 </el-form-item>
             </el-form>
             <el-descriptions title="硬件信息" style="padding:20px 30px 10px" class="descriptions">
             </el-descriptions>
             <el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-ruleForm" :inline="true"
                 style="padding-left:40px">
-                <div v-for="(item, index) in form.hardwarelist" :key="index">
+                <div v-for="(item, index) in form.devices" :key="index">
-                    <el-form-item label="硬件类型" :prop="`hardwarelist[${index}].hardwareType`"
+                    <el-form-item label="硬件类型" :prop="`devices[${index}].hardwareType`"
-                        :rules="rules.hardwarelist.hardwareType">
+                        :rules="rules.devices.hardwareType">
-                        <el-select v-model="item.hardwareType" placeholder="请选择硬件类型" clearable style="width:208px">
+                        <el-select v-model="item.hardwareType" placeholder="请选择硬件类型" clearable style="width:200px">
                             <el-option v-for="dict in dict.type.hardware_type" :key="dict.value" :label="dict.label"
                                 :value="dict.value" />
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="SN码" :prop="`hardwarelist[${index}].snCode`" :rules="rules.hardwarelist.snCode">
+                    <el-form-item label="SN码" :prop="`devices[${index}].snCode`" :rules="rules.devices.snCode">
-                        <el-input v-model="item.snCode" placeholder="请输入设备SN码"></el-input>
+                        <el-input v-model="item.snCode" placeholder="请输入设备SN码" style="width:200px"></el-input>
                     </el-form-item>
                     <el-form-item>
                         <el-button size="mini" @click="delhardware(index)">删除</el-button>
@@ -73,39 +86,51 @@
             </el-form>
             <el-descriptions title="知情同意书" style="padding:20px 30px 10px" class="descriptions">
             </el-descriptions>
-            <el-upload action="https://jsonplaceholder.typicode.com/posts/" list-type="picture-card"
+            <el-upload :action="upload.url" style="margin-left:70px" :data="upload.data" ref="upload"
-                style="margin-left:70px" :on-preview="handlePictureCardPreview" :on-remove="handleRemove">
+                :on-preview="handlePictureCardPreview" :on-remove="handleRemove" :headers="upload.headers"
+                :on-success="handleSuccess" :auto-upload="false" list-type="picture-card">
                 <i class="el-icon-plus"></i>
             </el-upload>
         </div>
     </div>
 </template>
-    
+
 <script>
+import {
+    getByRecordId
+} from '@/api/manage/continueSigning.js'
 import {
     addsign
 } from '@/api/manage/newSigning.js'
+import { getAge } from "@/utils/age";
+import { getToken } from '@/utils/auth'
 export default {
     dicts: ['hardware_type'],
     name: "newSigning",
     data() {
         return {
-            dialogImageUrl: '',
+            list: {},
-            dialogVisible: false,
+            signPackage: {
+                packageName: undefined
+            },
             form: {
-                packageName: undefined,
+                record: {
-                hardwarelist: [
+                    patientId: undefined,
+                    patientPhone: undefined,
+                },
+                devices: [
                     {
-                        snCode: '',
+                        snCode: undefined,
-                        hardwareType: '',
+                        hardwareType: undefined,
                     }
                 ],
+                informeds: []
             },
             rules: {
                 packageName: [
                     { required: true, message: '请选择服务包', trigger: 'change' }
                 ],
-                hardwarelist: {
+                devices: {
                     snCode: [
                         { required: true, message: '请输入SN码', trigger: 'change' }
                     ],
@@ -113,38 +138,83 @@ export default {
                         { required: true, message: '请选择硬件类型', trigger: 'change' }
                     ],
                 },
-            }
+            },
+            upload: {
+                data: {
+                    type: 'signInformedFileUrl'
+                },
+                headers: {
+                    Authorization: 'Bearer ' + getToken(),
+                },
+                url: process.env.VUE_APP_BASE_API + '/manage/file/uploadFile'
+            },
         };
     },
     created() {
+        this.info();
     },
     methods: {
-        //签约
+        //签约详情
+        info() {
+            getByRecordId(this.$route.query.patientSignRecordId).then(res => {
+                this.list = res.data
+                this.signPackage.packageName = this.list.packageName
+                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.patientId = this.list.patientId
+                this.form.record.patientPhone = this.list.patientPhone
+                this.list.age = this.list.birthDate ? getAge(this.list.birthDate) : ''
+            })
+        },
+        //续约
         signupload() {
+            this.$refs.upload.submit();
+        },
+        //文件上传完成
+        handleSuccess(response, file, fileList) {
+            this.form.informeds = []
+            fileList.forEach(e => {
+                this.form.informeds.push({
+                    informedFilePath: e.response.imgUrl,
+                })
+            })
+            this.form.signPackage = this.signPackage
             addsign(this.form).then(res => {
-
+                this.$confirm('签约成功, 是否返回上一页?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'success'
+                }).then(() => {
+                    this.$router.go(-1);
+                }).catch(() => {
+                    this.$modal.msgSuccess("签约成功");
+                });
             })
         },
         //新增硬件
         addhardware() {
-            this.form.hardwarelist.push({
+            this.form.devices.push({
                 snCode: '',
                 hardwareType: '',
             })
         },
         delhardware(index) {
-            this.form.hardwarelist.splice(index, 1);
+            this.form.devices.splice(index, 1);
         },
         handleRemove(file, fileList) {
             console.log(file, fileList);
         },
-        handlePictureCardPreview(file) {
+        handlePictureCardPreview(file) { },
-            this.dialogImageUrl = file.url;
+        goback() {
-            this.dialogVisible = true;
+            this.$router.go(-1);
-        }
+        },
     }
 };
 </script>
+
 <style lang="scss" scoped>
 .app-container {
     padding: 14px 0 0;
@@ -164,15 +234,47 @@ export default {
     }
 
     .interval {
-        width: 23%;
+        width: 20%;
         background-color: #fff;
         border-radius: 8px 0 0 8px;
         border-right: 1px solid #e5e5e5;
+
+        .package-item {
+            border-left: 2px solid #1890ff;
+            background-color: #D2E9FC;
+            width: 100%;
+            height: 120px;
+            position: relative;
+            padding: 25px 14px;
+
+            .type {
+                position: absolute;
+                right: 10px;
+                top: 20px;
+                font-size: 12px;
+            }
+
+            .name {
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                height: 40px;
+                line-height: 40px;
+                font-size: 18px;
+                font-weight: 600;
+            }
+
+            .time {
+                line-height: 20px;
+                height: 20px;
+                font-size: 14px;
+            }
+        }
     }
 
     .header {
         background-color: #fff;
-        width: 73%;
+        width: 78%;
         border-radius: 0 8px 8px 0;
         position: relative;
     }
@@ -189,5 +291,4 @@ export default {
         transform: translateY(-200%);
     }
 }
-</style>
+</style>
-    

src/views/manage/newSigning/index.vue

@@ -2,24 +2,25 @@
     <div class="app-container">
         <div class="header">
             <div class="btns">
-                <el-button>取消</el-button>
+                <el-button @click="goback">取消</el-button>
                 <el-button type="primary" @click="signupload">签约</el-button>
             </div>
             <el-descriptions title="签约详情" class="descriptions">
             </el-descriptions>
             <el-descriptions title="患者信息" style="padding:0 30px">
                 <el-descriptions-item label="患者姓名">{{ $route.query.patientName }}</el-descriptions-item>
-                <el-descriptions-item label="性别">{{ $route.query.sex }}</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.patientPhone }}</el-descriptions-item>
                 <el-descriptions-item label="就诊方式">{{
-                    $route.query.visitMethod == 'OUTPATIENT_SERVICE' ? '门诊' : $route.query.visitMethod == 'BE_IN_HOSPITAL' ?
+                    $route.query.visitMethod == 'OUTPATIENT_SERVICE' ? '门诊' : $route.query.visitMethod ==
-                    '住院' : ''
+                        'BE_IN_HOSPITAL' ?
+                        '住院' : ''
                 }}
                 </el-descriptions-item>
-                <el-descriptions-item label="诊断">{{ $route.query.mainDiagnosis }}</el-descriptions-item>
+                <el-descriptions-item label="诊断">{{ $route.query.reviewDiagnosis }}</el-descriptions-item>
-                <el-descriptions-item label="住院/门诊号">{{ $route.query.admissionNumber }}{{ $route.query.outpatientNumber
+                <el-descriptions-item label="住院/门诊号">{{ $route.query.inHospitalNumber }}</el-descriptions-item>
-                }}</el-descriptions-item>
                 <el-descriptions-item label="医院">{{ $route.query.hospitalAgencyName }}</el-descriptions-item>
                 <el-descriptions-item label="科室">{{ $route.query.departmentName }}</el-descriptions-item>
                 <el-descriptions-item label="服务包缴费状态">{{ $route.query.paymentStatus == 'PAID' ? '已缴费' : '' }}
@@ -30,25 +31,25 @@
             </el-descriptions>
             <el-descriptions title="服务包信息" style="padding:20px 30px 10px" class="descriptions">
             </el-descriptions>
-            <el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-ruleForm" :inline="true"
+            <el-form :model="signPackage" :rules="rules" ref="signPackage" label-width="100px" class="demo-ruleForm"
-                style="padding-left:40px">
+                :inline="true" style="padding-left:40px">
                 <el-form-item label="选择服务包" prop="packageName">
-                    <el-input v-model="form.packageName"></el-input>
+                    <el-input v-model="signPackage.packageName"></el-input>
                 </el-form-item>
             </el-form>
             <el-descriptions title="硬件信息" style="padding:20px 30px 10px" class="descriptions">
             </el-descriptions>
             <el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-ruleForm" :inline="true"
                 style="padding-left:40px">
-                <div v-for="(item, index) in form.hardwarelist" :key="index">
+                <div v-for="(item, index) in form.devices" :key="index">
-                    <el-form-item label="硬件类型" :prop="`hardwarelist[${index}].hardwareType`"
+                    <el-form-item label="硬件类型" :prop="`devices[${index}].hardwareType`"
-                        :rules="rules.hardwarelist.hardwareType">
+                        :rules="rules.devices.hardwareType">
                         <el-select v-model="item.hardwareType" placeholder="请选择硬件类型" clearable style="width:208px">
                             <el-option v-for="dict in dict.type.hardware_type" :key="dict.value" :label="dict.label"
                                 :value="dict.value" />
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="SN码" :prop="`hardwarelist[${index}].snCode`" :rules="rules.hardwarelist.snCode">
+                    <el-form-item label="SN码" :prop="`devices[${index}].snCode`" :rules="rules.devices.snCode">
                         <el-input v-model="item.snCode" placeholder="请输入设备SN码"></el-input>
                     </el-form-item>
                     <el-form-item>
@@ -59,39 +60,46 @@
             </el-form>
             <el-descriptions title="知情同意书" style="padding:20px 30px 10px" class="descriptions">
             </el-descriptions>
-            <el-upload action="https://jsonplaceholder.typicode.com/posts/" list-type="picture-card"
+            <el-upload :action="upload.url" list-type="picture-card" style="margin-left:70px" :data="upload.data"
-                style="margin-left:70px" :on-preview="handlePictureCardPreview" :on-remove="handleRemove">
+                ref="upload" :on-preview="handlePictureCardPreview" :on-remove="handleRemove" :headers="upload.headers"
+                :on-success="handleSuccess" :auto-upload="false">
                 <i class="el-icon-plus"></i>
             </el-upload>
         </div>
     </div>
 </template>
-    
+
 <script>
 import {
     addsign
 } from '@/api/manage/newSigning.js'
+import { getToken } from '@/utils/auth'
 export default {
     dicts: ['hardware_type'],
     name: "newSigning",
     data() {
         return {
-            dialogImageUrl: '',
+            signPackage: {
-            dialogVisible: false,
+                packageName: undefined
+            },
             form: {
-                packageName: undefined,
+                record: {
-                hardwarelist: [
+                    patientId: undefined,
+                    patientPhone: undefined,
+                },
+                devices: [
                     {
-                        snCode: '',
+                        snCode: undefined,
-                        hardwareType: '',
+                        hardwareType: undefined,
                     }
                 ],
+                informeds: []
             },
             rules: {
                 packageName: [
                     { required: true, message: '请选择服务包', trigger: 'change' }
                 ],
-                hardwarelist: {
+                devices: {
                     snCode: [
                         { required: true, message: '请输入SN码', trigger: 'change' }
                     ],
@@ -99,38 +107,71 @@ export default {
                         { required: true, message: '请选择硬件类型', trigger: 'change' }
                     ],
                 },
+            },
+            upload: {
+                data: {
+                    type: 'signInformedFileUrl'
+                },
+                headers: {
+                    Authorization: 'Bearer ' + getToken(),
+                },
+                url: process.env.VUE_APP_BASE_API + '/manage/file/uploadFile'
             }
         };
     },
     created() {
+        this.form.record.patientId = this.$route.query.patientId
+        this.form.record.patientName = this.$route.query.patientName
+        this.form.record.patientPhone = this.$route.query.patientPhone
     },
     methods: {
         //签约
         signupload() {
+            this.$refs.upload.submit();
+        },
+        //文件上传完成
+        handleSuccess(response, file, fileList) {
+            this.form.informeds = []
+            fileList.forEach(e => {
+                this.form.informeds.push({
+                    informedFilePath: e.response.imgUrl,
+                })
+            })
+            this.form.signPackage = this.signPackage
             addsign(this.form).then(res => {
-
+                this.$confirm('签约成功, 是否返回上一页?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'success'
+                }).then(() => {
+                    this.$router.go(-1);
+                }).catch(() => {
+                    this.$modal.msgSuccess("签约成功");
+                });
             })
         },
         //新增硬件
         addhardware() {
-            this.form.hardwarelist.push({
+            this.form.devices.push({
                 snCode: '',
                 hardwareType: '',
             })
         },
         delhardware(index) {
-            this.form.hardwarelist.splice(index, 1);
+            this.form.devices.splice(index, 1);
         },
         handleRemove(file, fileList) {
             console.log(file, fileList);
         },
         handlePictureCardPreview(file) {
-            this.dialogImageUrl = file.url;
+        },
-            this.dialogVisible = true;
+        goback() {
-        }
+            this.$router.go(-1);
+        },
     }
 };
 </script>
+
 <style lang="scss" scoped>
 .app-container {
     padding: 14px 0 0;
@@ -166,5 +207,4 @@ export default {
         transform: translateY(-200%);
     }
 }
-</style>
+</style>
-    

src/views/manage/signRecord/index.vue

@@ -113,7 +113,7 @@
       <el-table-column label="姓名" align="center" prop="patientName" />
       <el-table-column label="电话" align="center" prop="patientPhone" width="130" />
       <el-table-column label="就诊流水号" align="center" prop="visitSerialNumber" width="130" />
-      <el-table-column label="诊断" align="center" prop="mainDiagnosis" />
+      <el-table-column label="诊断" align="center" prop="signDiagnosis" />
       <el-table-column label="医院" align="center" prop="hospitalAgencyName" width="130" />
       <el-table-column label="院区" align="center" prop="campusAgencyName" />
       <el-table-column label="科室" align="center" prop="departmentName" />
@@ -128,12 +128,14 @@
       <el-table-column label="患者来源" align="center" prop="intentionalSource" v-else />
       <el-table-column label="签约时间" align="center" prop="signTime" width="180"
         v-if="queryParams.serviceStatus == 'SERVICE_CENTER'">
+
         <template slot-scope="scope">
           <span>{{ formatDate(scope.row.signTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="加入意向时间" align="center" prop="intentionalTime" width="180"
         v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'">
+
         <template slot-scope="scope">
           <span>{{ formatDate(scope.row.intentionalTime) }}</span>
         </template>
@@ -144,6 +146,7 @@
         <el-table-column label="开单医生" align="center" prop="billingDoctorName" />
         <el-table-column label="金额" align="center" prop="price" />
         <el-table-column label="缴费状态" align="center" prop="paymentStatus">
+
           <template slot-scope="scope">
             <span>{{ scope.row.paymentStatus == 'PAID' ? '已缴费' : '' }}
               {{ scope.row.paymentStatus == 'UNPAID_FEES' ? '未缴费' : '' }}
@@ -152,6 +155,7 @@
         </el-table-column>
       </div>
       <el-table-column label="签约时长" align="center" prop="serviceCycle">
+
         <template slot-scope="scope">
           <span>{{ scope.row.serviceCycle }}月</span>
         </template>
@@ -160,14 +164,26 @@
         prop="serviceStatus" >
       ，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END
         </el-table-column> -->
+      <el-table-column label="签约状态" align="center" prop="signStatus" v-if="queryParams.serviceStatus == 'SERVICE_END'">
+
+        <template slot-scope="scope">
+          {{ scope.row.signStatus == 'IN_SIGN' ? '在签' : '' }}
+          {{ scope.row.signStatus == 'IGNORE_SIGN' ? '忽略' : '' }}
+          {{ scope.row.signStatus == 'SEPARATE_SIGN' ? '取消签约' : '' }}
+          {{ scope.row.signStatus == 'CONTINUOUS_SIGN' ? '续约' : '' }}
+          {{ scope.row.signStatus == 'EXPIRE_SIGN' ? '过期' : '' }}
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160">
+
         <template slot-scope="scope">
           <el-button size="mini" type="text" @click="handlenewsign(scope.row)"
             v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'">签约</el-button>
           <el-button size="mini" type="text" @click="handleAuthRole(scope.row)"
             v-if="queryParams.serviceStatus == 'SERVICE_CENTER' || queryParams.serviceStatus == 'SERVICE_END'">详情</el-button>
-          <el-button size="mini" type="text" @click="handleDelete(scope.row)">取消签约</el-button>
+          <el-button size="mini" type="text" @click="handleDelete(scope.row)"
-          <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
+            v-if="queryParams.serviceStatus == 'SERVICE_CENTER'">取消签约</el-button>
+          <el-button size="mini" type="text" @click="handleContinue(scope.row)"
             v-if="queryParams.serviceStatus == 'SERVICE_CENTER' || queryParams.serviceStatus == 'SERVICE_END'">续约</el-button>
         </template>
       </el-table-column>
@@ -418,11 +434,10 @@ export default {
           patientName: row.patientName,
           patientPhone: row.patientPhone,
           visitMethod: row.visitMethod,
-          mainDiagnosis: row.mainDiagnosis,
+          signDiagnosis: row.signDiagnosis,
           visitSerialNumber: row.visitSerialNumber,
           hospitalAgencyName: row.hospitalAgencyName,
-          outpatientNumber: row.outpatientNumber,//门诊号
+          inHospitalNumber: row.inHospitalNumber,
-          admissionNumber: row.admissionNumber,//住院号
           departmentName: row.departmentName,
           paymentStatus: row.paymentStatus,
           sex: row.sex,
@@ -499,6 +514,15 @@ export default {
     cleardepartment() {
       this.queryParams.wardId = null
     },
+    //续约
+    handleContinue(row) {
+      this.$router.push({
+        path: "/patient/continueSigning",
+        query: {
+          patientSignRecordId: row.id,
+        },
+      });
+    },
     /** 详情操作 */
     handleAuthRole(row) {
       this.$router.push({
@@ -514,7 +538,7 @@ export default {
           address: row.address,
           patientSource: row.patientSource,
           createTime: row.createTime,
-          age: row.birthDate ? getAge(row.birthDate) : ''
+          age: row.birthDate ? getAge(row.birthDate) : '',
         },
       });
     },