diff --git a/src/api/manage/continueSigning.js b/src/api/manage/continueSigning.js
new file mode 100644
index 0000000..b101213
--- /dev/null
+++ b/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',
+    })
+}
diff --git a/src/api/manage/script.js b/src/api/manage/script.js
index 067a754..bb0e1f4 100644
--- a/src/api/manage/script.js
+++ b/src/api/manage/script.js
@@ -69,3 +69,12 @@ export function delScript(id) {
         method: 'delete'
     })
 }
+// 左侧科室
+export function listServicePackageNum(query) {
+    return request({
+        url: '/system/department/listServicePackageNum',
+        method: 'get',
+        params: query
+    })
+}
+
diff --git a/src/api/manage/servicepackage.js b/src/api/manage/servicepackage.js
new file mode 100644
index 0000000..0e1c4b5
--- /dev/null
+++ b/src/api/manage/servicepackage.js
@@ -0,0 +1,78 @@
+import request from '@/utils/request'
+
+// 查询服务包基础信息列表
+export function listServicepackage(query) {
+    return request({
+        url: '/manage/servicepackage/list',
+        method: 'get',
+        params: query
+    })
+}
+// 查询服务方式
+
+export function serviceWayList(query) {
+    return request({
+        url: '/manage/servicewaycontent/serviceWayList',
+        method: 'get',
+        params: query
+    })
+}
+// 查询服务内容
+export function serviccontent(id) {
+    return request({
+        url: `/manage/servicewaycontent/list?id=${id}`,
+        method: 'get',
+    })
+}
+// 发布
+
+
+export function editReleaseStatus(id,whetherRelease) {
+    return request({
+        url: `/manage/servicepackage/editReleaseStatus?id=${id}&whetherRelease=${whetherRelease}`,
+        method: 'put',
+    })
+}
+// 查询服务包基础信息详细
+export function getServicepackage(id) {
+    return request({
+        url: '/manage/servicepackage/' + id,
+        method: 'get'
+    })
+}
+
+// 新增服务包基础信息
+export function addServicepackage(data) {
+    return request({
+        url: '/manage/servicepackage/add',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改服务包基础信息
+export function updateServicepackage(data) {
+    return request({
+        url: '/manage/servicepackage/edit',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除服务包基础信息
+export function delServicepackage(id) {
+    return request({
+        url: '/manage/servicepackage/remove/' + id,
+        method: 'delete'
+    })
+}
+// 左侧列表
+export function listServicePackageNum(query) {
+    return request({
+        url: '/system/department/listServicePackageNum',
+        method: 'get',
+        params: query
+    })
+}
+
+
diff --git a/src/views/manage/components/signingRecords.vue b/src/views/manage/components/signingRecords.vue
index 3176a50..15b57c2 100644
--- a/src/views/manage/components/signingRecords.vue
+++ b/src/views/manage/components/signingRecords.vue
@@ -52,7 +52,6 @@
                 </el-descriptions>
                 <el-descriptions title="其他材料" style="margin-top: 20px;" class="descriptions">
                     <el-descriptions-item>
-
                     </el-descriptions-item>
                 </el-descriptions>
             </div>
diff --git a/src/views/manage/components/visitRecords.vue b/src/views/manage/components/visitRecords.vue
index 3735e3e..1c1c7ab 100644
--- a/src/views/manage/components/visitRecords.vue
+++ b/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>
diff --git a/src/views/manage/continueSigning/index.vue b/src/views/manage/continueSigning/index.vue
index 18da1fd..e7fba3a 100644
--- a/src/views/manage/continueSigning/index.vue
+++ b/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="性别">{{ $route.query.sex }}</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="患者姓名">{{ 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.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="住院/门诊号">{{ $route.query.admissionNumber }}{{ $route.query.outpatientNumber
-                }}</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' ? '已缴费' : '' }}
-                    {{ $route.query.paymentStatus == 'UNPAID_FEES' ? '未缴费' : '' }}
+                <el-descriptions-item label="诊断">{{ list.signDiagnosis }}</el-descriptions-item>
+                <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="出院/门诊时间">{{ $route.query.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-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"
-                style="padding-left:40px">
+            <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="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-input v-model="form.packageName"></el-input>
+            </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">
+                    <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-input v-model="form.packageName"></el-input>
+                <el-form-item label="服务包价格(元)" prop="" label-width="120px">
+                    <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">
-                    <el-form-item label="硬件类型" :prop="`hardwarelist[${index}].hardwareType`"
-                        :rules="rules.hardwarelist.hardwareType">
-                        <el-select v-model="item.hardwareType" placeholder="请选择硬件类型" clearable style="width:208px">
+                <div v-for="(item, index) in form.devices" :key="index">
+                    <el-form-item label="硬件类型" :prop="`devices[${index}].hardwareType`"
+                        :rules="rules.devices.hardwareType">
+                        <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-input v-model="item.snCode" placeholder="请输入设备SN码"></el-input>
+                    <el-form-item label="SN码" :prop="`devices[${index}].snCode`" :rules="rules.devices.snCode">
+                        <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"
-                style="margin-left:70px" :on-preview="handlePictureCardPreview" :on-remove="handleRemove">
+            <el-upload :action="upload.url" style="margin-left:70px" :data="upload.data" ref="upload"
+                :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: '',
-            dialogVisible: false,
+            list: {},
+            signPackage: {
+                packageName: undefined
+            },
             form: {
-                packageName: undefined,
-                hardwarelist: [
+                record: {
+                    patientId: undefined,
+                    patientPhone: undefined,
+                },
+                devices: [
                     {
-                        snCode: '',
-                        hardwareType: '',
+                        snCode: undefined,
+                        hardwareType: undefined,
                     }
                 ],
+                informeds: []
             },
             rules: {
                 packageName: [
                     { required: true, message: '请选择服务包', trigger: 'change' }
                 ],
-                hardwarelist: {
+                devices: {
                     snCode: [
                         { required: true, message: '请输入SN码', trigger: 'change' }
                     ],
@@ -113,38 +138,82 @@ 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 = this.list
+                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) {
-            this.dialogImageUrl = file.url;
-            this.dialogVisible = true;
-        }
+        handlePictureCardPreview(file) { },
+        goback() {
+            this.$router.go(-1);
+        },
     }
 };
 </script>
+
 <style lang="scss" scoped>
 .app-container {
     padding: 14px 0 0;
@@ -164,15 +233,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 +290,4 @@ export default {
         transform: translateY(-200%);
     }
 }
-</style>
-    
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/src/views/manage/newSigning/index.vue b/src/views/manage/newSigning/index.vue
index eb98c24..5919bee 100644
--- a/src/views/manage/newSigning/index.vue
+++ b/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.admissionNumber }}{{ $route.query.outpatientNumber
-                }}</el-descriptions-item>
+                <el-descriptions-item label="诊断">{{ $route.query.reviewDiagnosis }}</el-descriptions-item>
+                <el-descriptions-item label="住院/门诊号">{{ $route.query.inHospitalNumber }}</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"
-                style="padding-left:40px">
+            <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="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">
-                    <el-form-item label="硬件类型" :prop="`hardwarelist[${index}].hardwareType`"
-                        :rules="rules.hardwarelist.hardwareType">
+                <div v-for="(item, index) in form.devices" :key="index">
+                    <el-form-item label="硬件类型" :prop="`devices[${index}].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"
-                style="margin-left:70px" :on-preview="handlePictureCardPreview" :on-remove="handleRemove">
+            <el-upload :action="upload.url" list-type="picture-card" style="margin-left:70px" :data="upload.data"
+                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: '',
-            dialogVisible: false,
+            signPackage: {
+                packageName: undefined
+            },
             form: {
-                packageName: undefined,
-                hardwarelist: [
+                record: {
+                    patientId: undefined,
+                    patientPhone: undefined,
+                },
+                devices: [
                     {
-                        snCode: '',
-                        hardwareType: '',
+                        snCode: undefined,
+                        hardwareType: undefined,
                     }
                 ],
+                informeds: []
             },
             rules: {
                 packageName: [
                     { required: true, message: '请选择服务包', trigger: 'change' }
                 ],
-                hardwarelist: {
+                devices: {
                     snCode: [
                         { required: true, message: '请输入SN码', trigger: 'change' }
                     ],
@@ -99,38 +107,69 @@ 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 = this.$route.query
     },
     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 +205,4 @@ export default {
         transform: translateY(-200%);
     }
 }
-</style>
-    
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/src/views/manage/script/index.vue b/src/views/manage/script/index.vue
index d5a7e7c..b6294d0 100644
--- a/src/views/manage/script/index.vue
+++ b/src/views/manage/script/index.vue
@@ -561,8 +561,7 @@
 </template>
 
 <script>
-import { listScript, getScript, delScript, addScript, updateScript, departmentDisease, department, listDisease } from "@/api/manage/script";
-import { getDepartmentLis } from "@/api/operationInfo/operationInfo";
+import { listScript, getScript, delScript, addScript, updateScript, departmentDisease, department, listDisease,listServicePackageNum } from "@/api/manage/script";
 
 export default {
   name: "Script",
@@ -853,7 +852,7 @@ export default {
     // 左侧科室
     Departmentlist() {
       this.loading = true;
-      getDepartmentLis(this.querydepartmen).then(response => {
+      listServicePackageNum(this.querydepartmen).then(response => {
         this.DepartmentoList = response.data;
         // this.total = response.total;
      
diff --git a/src/views/manage/servicepackage/index.vue b/src/views/manage/servicepackage/index.vue
new file mode 100644
index 0000000..8d69b81
--- /dev/null
+++ b/src/views/manage/servicepackage/index.vue
@@ -0,0 +1,1435 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="90px"
+    >
+      <el-form-item label="病种名称" prop="diseaseTypeName">
+        <el-input
+          v-model="queryParams.diseaseTypeName"
+          placeholder="请输入病种名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="服务包名称" prop="packageName">
+        <el-input
+          v-model="queryParams.packageName"
+          placeholder="请输入服务包名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="服务包版本" prop="packageVersion">
+        <el-input
+          v-model="queryParams.packageVersion"
+          placeholder="请输入服务包版本"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否发布" prop="whetherRelease">
+        <el-select v-model="queryParams.whetherRelease" placeholder="请选择">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <!-- <el-input
+          v-model="queryParams.whetherRelease"
+          placeholder="请输入是否发布，0：否，1：是"
+          clearable
+          @keyup.enter.native="handleQuery"
+        /> -->
+      </el-form-item>
+      <el-form-item label="服务包价格" prop="packagePrice">
+        <el-input
+          v-model="queryParams.packagePrice"
+          placeholder="请输入服务包价格"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['manage:servicepackage:add']"
+          >新增服务包</el-button
+        >
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['manage:servicepackage:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['manage:servicepackage:remove']"
+          >删除</el-button
+        >
+      </el-col> -->
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['manage:servicepackage:export']"
+          >导出</el-button
+        >
+      </el-col> -->
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="5">
+        <div class="left" ref="box">
+          <div class="name">科室名称</div>
+          <div>
+            <el-input
+              v-model="name"
+              placeholder="请输入科室名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </div>
+          <div class="listitem">
+            <div
+              :class="itemname == null ? 'allactive' : 'all'"
+              @click="itemdata()"
+            >
+              全部
+            </div>
+            <span class="count">{{ count }}</span>
+          </div>
+          <div
+            class="listitem"
+            v-for="(item, index) in DepartmentoList"
+            :key="index"
+            @click="itemdata(item)"
+          >
+            <div :class="itemname == item.id ? 'allactive' : 'all'">
+              {{ item.departmentName }}
+            </div>
+            <span class="count">{{ item.countNum }}</span>
+          </div>
+        </div>
+      </el-col>
+      <el-col :span="19">
+        <el-table
+          v-loading="loading"
+          :data="servicepackageList"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column
+            label="服务包名称"
+            align="center"
+            prop="packageName"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="版本号"
+            align="center"
+            prop="packageVersion"
+          />
+          <el-table-column label="服务期限" align="center" prop="packageTermAndUnit" />
+          <el-table-column
+            label="服务包简介"
+            align="center"
+            prop="packageIntroduction"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column label="备注" align="center" prop="packageRemark" />
+          <el-table-column
+            label="是否发布"
+            align="center"
+            prop="whetherRelease"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.whetherRelease == "0" ? "否" : "" }}
+              {{ scope.row.whetherRelease == "1" ? "是" : "" }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="病种名称"
+            align="center"
+            prop="diseaseTypeName"
+          />
+          <el-table-column
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-s-open"
+                @click="copy(scope.row)"
+                >复制</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-s-promotion"
+                @click="release(scope.row)"
+                v-if="scope.row.whetherRelease==0"
+
+                >发布</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-notebook-2
+"
+                @click="detail(scope.row)"
+
+                >详情</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['manage:servicepackage:edit']"
+                >修改</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['manage:servicepackage:remove']"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改服务包基础信息对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1000px"
+      append-to-body
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="100px"
+        :inline="true"
+      >
+        <el-form-item label="科室名称" prop="departmentId">
+          <el-button
+            type=""
+            v-if="departmentName == '请选择科室'"
+            @click="clickinnerVisible()"
+            style="
+              width: 204px;
+              text-align: left;
+              height: 36px;
+              color: #c0c4cc;
+              overflow: hidden;
+            "
+            >{{ departmentName }}</el-button
+          >
+          <el-button
+            @click="clickinnerVisible()"
+            type=""
+            v-else
+            style="
+              width: 204px;
+              text-align: left;
+              height: 36px;
+              padding-left: -10px;
+              overflow: hidden;
+            "
+            >{{ departmentName }}</el-button
+          >
+        </el-form-item>
+        <el-form-item label="病种名称" prop="diseaseTypeName">
+          <el-button
+            type=""
+            v-if="diseaseTypeName == '请选择病种'"
+            @click="clickdisease()"
+            style="
+              width: 204px;
+              text-align: left;
+              height: 36px;
+              color: #c0c4cc;
+              overflow: hidden;
+            "
+            >{{ diseaseTypeName }}</el-button
+          >
+          <el-button
+            @click="clickdisease()"
+            type=""
+            v-else
+            style="
+              width: 204px;
+              text-align: left;
+              height: 36px;
+              padding-left: -10px;
+              overflow: hidden;
+            "
+            >{{ diseaseTypeName }}</el-button
+          >
+        </el-form-item>
+        <el-form-item label="服务包名称" prop="packageName">
+          <el-input v-model="form.packageName" placeholder="请输入服务包名称" />
+        </el-form-item>
+        <el-form-item
+          label="服务包简介"
+          prop="packageIntroduction"
+    
+        >
+          <el-input
+            v-model="form.packageIntroduction"
+            placeholder="请输入服务包简介"
+          />
+        </el-form-item>
+        <el-form-item label="服务包价格" prop="packagePrice">
+          <el-input
+            v-model="form.packagePrice"
+            placeholder="请输入服务包价格"
+            style="width: 204px"
+          >
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item
+          label="服务包版本"
+          prop="packageVersion"
+        
+        >
+          <el-input
+            v-model="form.packageVersion"
+            placeholder="请输入服务包版本"
+          />
+        </el-form-item>
+        <el-form-item
+          label="硬件类型"
+          prop="hardwareType"
+
+        >
+          <el-select
+            v-model="form.hardwareType"
+            placeholder="请选择"
+            style="width: 204px"
+          >
+            <el-option
+              v-for="item in optionstype"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="服务包期限" prop="packageTerm">
+          <el-input v-model="form.packageTerm" placeholder="请输入服务包期限">
+            <el-select
+              style="width: 100px"
+              slot="append"
+              v-model="form.packageTermUnit"
+              placeholder="请选择"
+              @change="$forceUpdate()"
+            >
+              <el-option
+                v-for="item in optionstime"
+                :key="item.value"
+                :label="item.label"
+                :value="item.label"
+              >
+              </el-option>
+            </el-select>
+          </el-input>
+        </el-form-item>
+        <br />
+        <div v-for="(aitem, index) in form.voList" :key="index">
+
+          <el-form-item
+              label="服务包内容"
+              :rules="rules.voList.serviceWayName"
+              :prop="`voList.${index}.serviceWayName`"
+            >
+            <el-select v-model="aitem.serviceWayName" placeholder="请选择服务方式" @change="changeway">
+ 
+              <el-option
+                v-for="item in optionsway"
+                :key="item.id"
+                :label="item.serviceWayName"
+                :value="item.serviceWayName"
+              >
+              </el-option>
+            </el-select>
+            <el-form-item
+              label=""
+              :rules="rules.voList.serviceContent"
+              :prop="`voList.${index}.serviceContent`"
+            >
+            <el-select v-model="aitem.serviceContent" placeholder="请选择服务内容"  @change="changcontent">
+
+              <el-option
+                v-for="item in optionscontent"
+                :key="item.id"
+                :label="item.serviceContent"
+                :value="item.serviceContent"
+              >
+              </el-option>
+            </el-select>
+            </el-form-item>
+            <el-form-item
+              label=""
+              :rules="rules.voList.serviceFrequencyText"
+              :prop="`voList.${index}.serviceFrequencyText`"
+            >
+            <el-select v-model="aitem.serviceFrequencyText" placeholder="请选择服务频次"> 
+              <el-option
+                v-for="item in optionsfrequency"
+                :key="item.id"
+                :label="item.serviceFrequencyText"
+                :value="item.serviceFrequencyText"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+            
+          </el-form-item>
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-circle-plus-outline"
+            style="margin-top: 2px; margin-left: 6px"
+            v-if="index == 0"
+            @click="addnurseClassifyitem"
+          ></el-button>
+          <!-- circle -->
+          <el-button
+            type="danger"
+            icon="el-icon-delete"
+            plain
+            style="margin-top: 2px; margin-left: 6px"
+            v-if="index != 0"
+            @click="delnurseClassifyitem(index)"
+          ></el-button>
+        </div>
+        <br />
+
+        <el-form-item label="服务包备注" prop="packageRemark">
+          <el-input
+          style="width:810px"
+            type="textarea"
+            v-model="form.packageRemark"
+            placeholder="请输入服务包备注"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormadd" v-if="title == '复制服务包基础信息'">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 科室弹框 -->
+    <el-dialog
+      title=""
+      :visible.sync="innerVisibleshow"
+      width="1000px"
+      append-to-body
+      :before-close="innerVisiblecancel"
+    >
+      <el-form
+        ref="queryForm"
+        :model="informationqueryParams"
+        :rules="rules"
+        label-width="80px"
+        :inline="true"
+      >
+        <el-form-item label="科室名称" prop="departmentName" label-width="120">
+          <el-input
+            v-model="informationqueryParams.departmentName"
+            placeholder="请输入科室名称"
+            clearable
+          />
+        </el-form-item>
+
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="informationInfoinfo"
+            >搜索</el-button
+          >
+          <el-button
+            icon="el-icon-refresh"
+            size="mini"
+            @click="addresetQuerylist"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+
+      <el-table
+        :data="infolist"
+        @cell-dblclick="nurseclick"
+        v-loading="loading"
+      >
+        <el-table-column label="请选择" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              style="width: 15px; height: 15px"
+              v-if="form.departmentId == scope.row.departmentCode"
+              circle
+              @click="nurseclick(scope.row)"
+            ></el-button>
+            <el-button
+              v-else
+              style="width: 15px; height: 15px"
+              circle
+              @click="nurseclick(scope.row)"
+            ></el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          property="departmentName"
+          label="科室名称"
+          align="center"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="totaldepartment > 0"
+        :total="totaldepartment"
+        :page.sync="informationqueryParams.pageNum"
+        :limit.sync="informationqueryParams.pageSize"
+        @pagination="informationInfoinfo"
+      />
+    </el-dialog>
+    <!-- 病种弹框 -->
+    <el-dialog
+      title=""
+      :visible.sync="diseaseshowst"
+      width="1000px"
+      append-to-body
+      :before-close="canceldiseases"
+    >
+      <el-form
+        ref="queryForm"
+        :model="querydisease"
+        :rules="rules"
+        label-width="80px"
+        :inline="true"
+      >
+        <el-form-item label="病种名称" prop="departmentName" label-width="120">
+          <el-input
+            v-model="querydisease.departmentName"
+            placeholder="请输入病种名称"
+            clearable
+          />
+        </el-form-item>
+
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="infodisease"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetdisease"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+
+      <el-table
+        :data="listdisease"
+        @cell-dblclick="nurseclickdisease"
+        v-loading="loading"
+      >
+        <el-table-column label="请选择" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              style="width: 15px; height: 15px"
+              v-if="form.diseaseTypeId == scope.row.diseaseTypeCode"
+              circle
+              @click="nurseclickdisease(scope.row)"
+            ></el-button>
+            <el-button
+              v-else
+              style="width: 15px; height: 15px"
+              circle
+              @click="nurseclickdisease(scope.row)"
+            ></el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          property="diseaseTypeName"
+          label="病种名称"
+          align="center"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="diseasetotal > 0"
+        :total="diseasetotal"
+        :page.sync="querydisease.pageNum"
+        :limit.sync="querydisease.pageSize"
+        @pagination="infodisease"
+      />
+    </el-dialog>
+    <!-- 详情弹框 -->
+    <el-dialog
+  title="详情"
+  :visible.sync="detailshow"
+  width="50%"
+  :before-close="handleClose">
+  <el-form
+        ref="form"
+        :model="formdetail"
+        label-width="150px"
+        :inline="true"
+      >
+      <el-form-item
+          label="病种名称:"
+          prop="packageVersion"
+        
+        >
+        <span>{{formdetail.diseaseTypeName}}</span>
+      </el-form-item>
+      <el-form-item
+          label="服务包名称:"
+          prop="packageVersion"
+        
+        >
+        <span>{{formdetail.packageName}}</span>
+      </el-form-item>
+      <el-form-item
+          label="价格:"
+          prop="packageVersion"
+        
+        >
+        <span>{{formdetail.packagePrice}}</span>
+      </el-form-item>
+      <el-form-item
+          label="服务期限:"
+          prop="packageVersion"
+        
+        >
+        <span>{{formdetail.packageTermAndUnit}}</span>
+      </el-form-item>
+      <el-form-item
+          label="硬件类型:"
+          prop="packageVersion"
+        
+        >
+        <span>{{formdetail.hardwareType=="BLOOD_PRESSURE"?'血压仪':''}}</span>
+        <span>{{formdetail.hardwareType=="GLUCOSE_METER"?'血糖仪':''}}</span>
+        <span>{{formdetail.hardwareType=="ELECTROCARDIOGRA"?'心电仪':''}}</span>
+      </el-form-item>
+
+  </el-form>
+  <el-table
+          v-loading="loading"
+          :data="datailList"
+        >
+        <el-table-column
+            label="序号"
+            type="index"
+          />
+          <el-table-column
+            label="服务方式"
+            align="center"
+            prop="serviceWayName"
+          />
+          <el-table-column
+            label="服务内容"
+            align="center"
+            prop="serviceContent"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column label="服务频次" align="center" prop="serviceFrequencyText" />
+        </el-table>
+  <span slot="footer" class="dialog-footer">
+    <el-button @click="detailshow = false">关闭</el-button>
+  </span>
+</el-dialog>
+ <!-- 发布弹框 -->
+ <el-dialog
+      title="提示"
+      :visible.sync="dialogexamine"
+      width="30%"
+      :before-close="handleClose"
+      center
+    >
+      <span style="font-size: 18px; margin-left: 55px">是否同意发布？</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="cancelamine">同意</el-button>
+        <el-button type="primary" @click="submitamine">不同意</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listServicepackage, getServicepackage, delServicepackage, addServicepackage, updateServicepackage,serviceWayList,serviccontent,editReleaseStatus,listServicePackageNum } from "@/api/manage/servicepackage";
+import { department, listDisease } from "@/api/manage/script";
+
+export default {
+  name: "Servicepackage",
+  data() {
+    return {
+      itemname: null,
+      departmentName: null,
+      diseaseTypeName: null,
+      name: '',
+      departmentId: null,
+      count: '',//全部
+      DepartmentoList: [],//左侧数组
+      // 左侧传值
+      querydepartmen: {
+        departmentName: "",
+        // pageNum: 1,
+        // pageSize: 10,
+
+      },
+
+
+      innerVisibleshow: false, //科室弹框
+      // 科室
+      informationqueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        departmentName: null,
+      },
+      infolist: [],
+      totaldepartment: 0,
+
+      diseaseshowst: false,//病种弹框
+      querydisease: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      listdisease: [],
+      diseasetotal: 0,
+      options: [{
+        value: '0',
+        label: '否'
+      }, {
+        value: '1',
+        label: '是'
+      },],
+      value1: '',
+      value2: '',
+      value3: '',
+      // 服务方式
+      optionsway: [],
+      // 服务内容
+
+      optionscontent: [],
+      // 服务频次
+      optionsfrequency: [
+        {  value: '',
+        label: ''}
+      ],
+
+      optionstype: [{
+        value: 'BLOOD_PRESSURE',
+        label: '血压仪'
+      }, {
+        value: 'GLUCOSE_METER',
+        label: '血糖仪'
+      }, {
+        value: 'ELECTROCARDIOGRA',
+        label: '心电仪'
+      },],
+      optionstime: [
+        {
+          value: 'year',
+          label: '年'
+        }, {
+          value: 'mouth',
+          label: '月'
+        }, {
+          value: 'day',
+          label: '日'
+        },
+      ],
+      value:'year',
+      detailshow:false,
+      datailList:[],
+      dialogexamine: false,//发布
+      examineid:null,//发布id
+      idd: 0,
+      select: '',
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 服务包基础信息表格数据
+      servicepackageList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        departmentId: null,
+        departmentName: null,
+        diseaseTypeId: null,
+        diseaseTypeName: null,
+        packageName: null,
+        packageIntroduction: null,
+        packageVersion: null,
+        packageTerm: null,
+        packageTermUnit: null,
+        packagePrice: null,
+        packageRemark: null,
+        hardwareType: null,
+        whetherRelease: null,
+      },
+      // 表单参数
+      form: {},
+      formdetail:{},
+      // 表单校验
+      rules: {
+        departmentId: [
+          { required: true, message: "所属科室id不能为空", trigger: "blur" }
+        ],
+        packageIntroduction:[
+        { required: true, message: "服务包简介不能为空", trigger: "blur" }
+        ],
+        packagePrice:[
+        { required: true, message: "服务包价格不能为空", trigger: "blur" }
+        ],
+        packageVersion:[
+        { required: true, message: "服务包版本不能为空", trigger: "blur" }
+        ],
+        // packageVersion:[
+        // ],
+        packageName:[
+        { required: true, message: "服务包名称不能为空", trigger: "blur" }
+        ],
+        packageTerm:[
+        { required: true, message: "服务包期限不能为空", trigger: "blur" }
+
+
+        ],
+        voList:{
+          serviceWayName: [
+            {
+              required: true,
+              message: "请选择服务方式",
+              trigger: "blur",
+            },
+          ],
+          serviceContent: [
+            {
+              required: true,
+              message: "请选择服务内容",
+              trigger: "blur",
+            },
+          ],
+          serviceFrequencyText: [
+            {
+              required: true,
+              message: "请选择服务频次",
+              trigger: "blur",
+            },
+          ]
+          
+          },
+        
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getlistcount();
+    this.Departmentlist();
+  },
+  methods: {
+    changepackageTermUnit(e){
+      
+this.$set(this.form,'packageTermUnit',e);
+      // this.form.packageTermUnit=e
+
+    },
+    // 详情
+    detail(row){
+      this.detailshow=true
+      getServicepackage(row.id).then(response => {
+        this.formdetail = response.data;
+        this.datailList=response.data.voList
+        this.datailList.forEach(el=>{
+        if(el.serviceFrequencyEnd){
+          el.serviceFrequencyText=el.serviceFrequencyStart+'~'+el.serviceFrequencyEnd
+      
+        }else{
+          el.serviceFrequencyText=el.serviceFrequencyText
+
+        }
+      })
+      console.log(this.datailList)
+
+      });
+    },
+    handleClose(){
+      this.detailshow=false
+    },
+
+        // 发布
+        release(row) {
+      this.examineid = row.id
+      this.dialogexamine = true
+    },
+    // 发布同意按钮
+
+    cancelamine() {
+      var propagandaStatus =1
+      editReleaseStatus(this.examineid,propagandaStatus).then(response => {
+        this.$message({
+          type: "success",
+          message: "发布成功"
+        });
+        this.getList()
+      });
+      this.dialogexamine = false
+
+    },
+    // 发布关闭按钮
+
+    handleClose() {
+      this.dialogexamine = false
+    },
+    // 发布不同意按钮
+
+    submitamine() {
+      var propagandaStatus =0
+
+      editReleaseStatus(this.examineid,propagandaStatus).then(response => {
+        this.$message({
+          type: "success",
+          message: "发布不通过"
+        });
+        this.getList()
+      });
+
+      this.dialogexamine = false
+    },
+        //添加时删除item
+        delnurseClassifyitem(index) {
+      this.form.voList.splice(index, 1);
+    },
+    //添加时新增item
+    addnurseClassifyitem() {
+      this.idd++;
+      var obj = {
+        serviceWayName: null,
+        serviceContent: null,
+        // serviceFrequencyText:"",
+        // serviceFrequencyStart: null,
+        // serviceFrequencyEnd:null,
+        idd: this.idd
+      };
+      if (this.form.voList.length == 5) {
+        this.$message.error("最多批量添加5条");
+      } else {
+        this.form.voList.push(obj);
+        console.log(this.form)
+      }
+    },
+    /** 查询服务包基础信息列表 */
+    getList() {
+      this.loading = true;
+      listServicepackage(this.queryParams).then(response => {
+        this.servicepackageList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    // 查询服务方式
+    getserviceWayList(){
+      serviceWayList().then(response => {
+        this.optionsway = response.data;
+
+      });
+    },
+    // 服务方式点击事件
+    changeway(e){
+      var id =null
+      id=this.optionsway.find(f => f.serviceWayName == e).id
+      serviccontent(id).then(response => {
+        this.optionscontent = response.rows;
+      });
+      console.log(e,'00000')
+    },
+    // 服务内容点击事件
+    changcontent(e){
+      var id =null
+      id=this.optionscontent.find(f => f.serviceContent == e).id
+      this.optionsfrequency=this.optionscontent.find(f=> f.id==id).serviceWayFrequencyList
+      console.log(this.optionsfrequency,'777777')
+      this.optionsfrequency.forEach(el=>{
+        if(el.serviceFrequencyType=="DIGIT"){
+					el.serviceFrequencyText=el.serviceFrequencyStart+'~'+el.serviceFrequencyEnd
+
+        }else if(el.serviceFrequencyType=="serviceFrequencyType"){
+      this.optionsfrequency=this.optionscontent.find(f=> f.id==e).serviceWayFrequencyList
+      console.log(this.optionsfrequency,'00000')
+
+        }
+      })
+    },
+    
+    // 左侧科室列表
+    Departmentlist() {
+      this.loading = true;
+      listServicePackageNum(this.querydepartmen).then(response => {
+        this.DepartmentoList = response.data;
+        this.loading = false;
+      });
+    },
+    // 左侧科室
+    itemdata(item) {
+      if (item) {
+        this.itemname = item.id
+        this.departmentName = item.departmentName
+        this.loading = true;
+        this.queryParams.departmentId = item.id
+        this.getList()
+      } else {
+        this.queryParams.departmentId = ''
+        this.itemname = null
+        this.getList()
+
+      }
+    },
+    // 获取总数
+    getlistcount() {
+      var qure = {
+        pageNum: 1,
+        pageSize: 10,
+
+      }
+      listServicepackage(qure).then(response => {
+        this.count = response.total;
+      });
+    },
+    // 点击科室
+    clickinnerVisible() {
+      this.innerVisibleshow = true;
+      if (this.itemname) {
+        this.informationqueryParams.departmentId = this.itemname
+
+      } else {
+        this.informationqueryParams.departmentId = null
+      }
+      this.informationInfoinfo();
+    },
+    // 科室列表
+    informationInfoinfo() {
+      department(this.informationqueryParams).then((response) => {
+        this.infolist = response.rows;
+        this.totaldepartment = response.total;
+        this.loading = false;
+      });
+      // this.informationqueryParams.page = 1;
+    },
+    // 科室名称重置
+    addresetQuerylist() {
+      this.informationqueryParams = {
+        pageNum: 1,
+        pageSize: 10,
+      };
+      this.informationInfoinfo();
+    },
+    innerVisiblecancel() {
+      this.innerVisibleshow = false;
+    },
+    // 科室名称圆点按钮
+    nurseclick(row) {
+      this.form.departmentId = row.departmentCode;
+      this.departmentName = row.departmentName;
+      this.innerVisibleshow = false;
+      // this.form.diseaseTypeId = null;
+      // this.diseaseTypeName = '请选择科室';
+    },
+
+    // 病种列表
+    infodisease() {
+      listDisease(this.querydisease).then((response) => {
+        this.listdisease = response.rows;
+        this.diseasetotal = response.total;
+        this.loading = false;
+      });
+    },
+    // 点击病种
+    clickdisease() {
+      if (this.departmentName == '请选择科室') {
+        this.$modal.msgError("请先选择科室");
+      } else {
+        console.log(this.form)
+        this.diseaseshowst = true;
+        this.querydisease.departmentId = this.form.departmentId
+        this.infodisease()
+      }
+    },
+    // 病种名称圆点按钮
+    nurseclickdisease(row) {
+      this.form.diseaseTypeId = row.diseaseTypeCode;
+      this.diseaseTypeName = row.diseaseTypeName;
+      this.diseaseshowst = false;
+    },
+    // 重置
+    resetdisease() {
+      querydisease = {
+        pageNum: 1,
+        pageSize: 10,
+      };
+      this.infodisease()
+    },
+
+    canceldiseases() {
+      this.diseaseshowst = false;
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        time: null,
+        id: null,
+        departmentId: null,
+        departmentName: null,
+        diseaseTypeId: null,
+        diseaseTypeName: null,
+        packageName: null,
+        packageIntroduction: null,
+        packageVersion: null,
+        packageTerm: null,
+        packageTermUnit: null,
+        packagePrice: null,
+        packageRemark: null,
+        hardwareType: null,
+        whetherRelease: 0,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+// 新增
+    handleAdd() {
+      this.reset();
+      this.getserviceWayList()
+      this.form = {
+        voList: [
+          {
+            serviceWayName: null,
+        serviceContent: null,
+        serviceFrequencyStart: null,
+        serviceFrequencyEnd:null,
+            idd: this.idd,
+          },
+        ],
+      };
+        console.log(this.form)
+
+
+      this.form.whetherRelease = 0
+      this.form.packageTermUnit='年'
+      if (this.itemname) {
+        this.form.departmentName = this.departmentName
+        this.form.departmentId = this.itemname
+      } else if (this.itemname == null) {
+        this.departmentName = "请选择科室"
+      }
+      else {
+        this.departmentName = "请选择科室"
+      }
+      this.diseaseTypeName = "请选择病种"
+
+      this.open = true;
+      this.title = "添加服务包基础信息";
+    },
+    // 修改
+    handleUpdate(row) {
+      const id = row.id || this.ids
+      getServicepackage(id).then(response => {
+        this.form = response.data;
+        this.form.voList.forEach(el=>{
+        if(!el.serviceFrequencyText){
+          el.serviceFrequencyText=el.serviceFrequencyStart+'~'+el.serviceFrequencyEnd
+      
+        }else{
+          el.serviceFrequencyText=el.serviceFrequencyText
+
+        }
+      })
+        this.diseaseTypeName = response.data.diseaseTypeName
+        this.departmentName = response.data.departmentName
+        this.open = true;
+        this.title = "修改服务包基础信息";
+      });
+    },
+    // 复制
+    copy(row){
+      const id = row.id || this.ids
+      getServicepackage(id).then(response => {
+        this.form = response.data;
+        this.form.voList.forEach(el=>{
+        if(!el.serviceFrequencyText){
+          el.serviceFrequencyText=el.serviceFrequencyStart+'~'+el.serviceFrequencyEnd
+      
+        }else{
+          el.serviceFrequencyText=el.serviceFrequencyText
+        }
+      })
+        this.diseaseTypeName = response.data.diseaseTypeName
+        this.departmentName = response.data.departmentName
+        this.open = true;
+        this.title = "复制服务包基础信息";
+      });
+    },
+    // 复制确定
+    submitFormadd(){
+      this.form.whetherRelease = 0
+      this.form.voList.forEach(e=>{
+        if(e.serviceFrequencyText.includes('~')){
+          const str = e.serviceFrequencyText; 
+        const parts = str.split('~'); 
+       e.serviceFrequencyStart = parts[0];
+       e.serviceFrequencyEnd = parts[1];
+       e.serviceFrequencyText=null
+        }else{
+          e.serviceFrequencyText=e.serviceFrequencyText
+        }
+      })
+      if (this.diseaseTypeName == "请选择病种") {
+              this.form.diseaseTypeName == null
+            } else {
+              this.form.diseaseTypeName = this.diseaseTypeName
+            }
+            if (this.itemname) {
+
+              this.form.departmentName = this.departmentName
+              this.form.departmentId = this.itemname
+
+            } else {
+              this.form.departmentName = this.departmentName
+
+            }
+            addServicepackage(this.form).then(response => {
+              this.$modal.msgSuccess("复制成功");
+              this.open = false;
+              this.getList();
+              this.getlistcount()
+            });
+
+    },
+// 提交
+    submitForm() {
+      console.log(this.form)
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if(this.form.voList){
+        this.form.voList.forEach(e=>{
+            if(e.serviceFrequencyText.includes('~')){
+          const str = e.serviceFrequencyText; 
+        const parts = str.split('~'); 
+       e.serviceFrequencyStart = parts[0];
+       e.serviceFrequencyEnd = parts[1];
+       e.serviceFrequencyText=null
+        }else{
+          e.serviceFrequencyText=e.serviceFrequencyText
+        }
+        if (this.form.id != null) {
+            this.form.departmentName = this.departmentName
+            this.form.diseaseTypeName = this.diseaseTypeName
+            updateServicepackage(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+              this.getlistcount()
+            });
+          } else {
+            if (this.diseaseTypeName == "请选择病种") {
+              this.form.diseaseTypeName == null
+            } else {
+              this.form.diseaseTypeName = this.diseaseTypeName
+            }
+            if (this.itemname) {
+
+              this.form.departmentName = this.departmentName
+              this.form.departmentId = this.itemname
+
+            } else {
+              this.form.departmentName = this.departmentName
+
+            }
+            addServicepackage(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+
+              this.open = false;
+              this.getList();
+              this.getlistcount()
+            });
+
+          }
+      })
+      }
+  
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除该服务包基础信息？').then(function () {
+        return delServicepackage(ids);
+      }).then(() => {
+        this.getList();
+        this.getlistcount()
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('manage/servicepackage/export', {
+        ...this.queryParams
+      }, `servicepackage_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
+<style lang="scss">
+::v-deep .el-input-group {
+  width: 204px !important;
+}
+.left {
+  height: 530px;
+  overflow: auto;
+  .name {
+    font-weight: 700;
+    margin-bottom: 10px;
+  }
+  .listitem {
+    width: 100%;
+    height: 50px;
+    border-bottom: 1px solid #dcdfe6;
+    .count {
+      display: inline-block;
+      position: relative;
+      // right: -172px;
+      left: 210px;
+      color: #a4a6aa;
+      top: -35px;
+      font-size: 13px;
+    }
+    .all {
+      height: 50px;
+      line-height: 50px;
+      padding-left: 13px;
+    }
+    .allactive {
+      background: #e8f4ff;
+      height: 50px;
+      line-height: 50px;
+      padding-left: 13px;
+      border-left: 3px solid #4d9de7;
+    }
+  }
+}
+</style>
diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue
index 7287040..b743400 100644
--- a/src/views/manage/signRecord/index.vue
+++ b/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,23 @@
         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 == 'SEPARATE_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="handleUpdate(scope.row)"
+          <el-button size="mini" type="text" @click="handleDelete(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>
@@ -371,8 +384,10 @@ export default {
       }).then(({ value }) => {
         const query = {
           id: row.id,
+          patientId: row.patientId,
           signStatus: 'SEPARATE_SIGN',
           separateReason: value,
+          serviceStatus: 'SERVICE_END',
         }
         updateSignStatus(query).then(res => {
           this.getList();
@@ -418,11 +433,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,//门诊号
-          admissionNumber: row.admissionNumber,//住院号
+          inHospitalNumber: row.inHospitalNumber,
           departmentName: row.departmentName,
           paymentStatus: row.paymentStatus,
           sex: row.sex,
@@ -499,6 +513,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 +537,7 @@ export default {
           address: row.address,
           patientSource: row.patientSource,
           createTime: row.createTime,
-          age: row.birthDate ? getAge(row.birthDate) : ''
+          age: row.birthDate ? getAge(row.birthDate) : '',
         },
       });
     },
diff --git a/src/views/operationInfo/operationInfo/index.vue b/src/views/operationInfo/operationInfo/index.vue
index 7b17555..0017b10 100644
--- a/src/views/operationInfo/operationInfo/index.vue
+++ b/src/views/operationInfo/operationInfo/index.vue
@@ -428,7 +428,7 @@ export default {
           this.open = true;
           this.title = "修改手术信息";
           if (this.title == "修改手术信息") {
-            this.disabled = true
+            // this.disabled = true
           }
         });
 
diff --git a/src/views/system/addQuestionnaire/index.vue b/src/views/system/addQuestionnaire/index.vue
index c5a2cc1..7e9d08d 100644
--- a/src/views/system/addQuestionnaire/index.vue
+++ b/src/views/system/addQuestionnaire/index.vue
@@ -19,7 +19,8 @@
                     <div class="typetitle">
                         组合题型
                     </div>
-                    <div class="texts" v-for="item in combinationQuestiontypes" :key="item.id" @click="addquestion(item)">
+                    <div class="texts" v-for="item in combinationQuestiontypes" :key="item.id"
+                        @click="addquestion(item)">
                         <img :src="item.src" alt="">
                         <div>{{ item.name }}</div>
                     </div>
@@ -36,11 +37,11 @@
                         <div class="questionnaire-title">
                             问卷标题:
                         </div>
-                        <input type="text" class="title-input">
+                        <input type="text" class="title-input" v-model="list.questionnaireName">
                         <div class="questionnaire-title" style="margin-top:30px">
                             问卷说明:
                         </div>
-                        <editor :min-height="160" class="editor" />
+                        <editor :min-height="160" class="editor" v-model="list.questionnaireDescription" />
                     </div>
                     <div class="addArea" v-if="questionlist.length == 0">
                         <div class="addtext">
@@ -51,25 +52,25 @@
                         <draggable v-model="questionlist">
                             <transition-group>
                                 <div class="questionitem" v-for="(item, index) in questionlist" :key="item.id">
-                                    <div v-if="item.questionname == '单选题'" class="item"
+                                    <div v-if="item.questionType == 'MULTIPLE_CHOICE'" class="item"
                                         @click.stop="selectquestion(item, index)">
                                         <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
                                         <img src="@/assets/system/gb.png" alt="" class="delicon"
                                             @click.stop="delquestion(item, index)">
-                                        <div class="questionname">
-                                            {{ index + 1 }}. {{ item.questionname }}
+                                        <div class="questionName">
+                                            {{ index + 1 }}. {{ item.title }}
                                         </div>
                                         <div class="title">
                                             <span>题目： </span>
-                                            <el-input placeholder="请输入题目" v-model="item.title" clearable>
+                                            <el-input placeholder="请输入题目" v-model="item.questionName" clearable>
                                             </el-input>
                                         </div>
                                         <div class="options">
                                             <span>选项： </span>
                                             <div>
-                                                <div v-for="(uitem, uindex) in item.options" :key="uindex"
-                                                    style="display:flex">
-                                                    <el-input placeholder="请输入内容" v-model="uitem.optionname" clearable>
+                                                <div v-for="(uitem, uindex) in item.questionSubjectOptionList"
+                                                    :key="uindex" style="display:flex;margin-bottom:10px">
+                                                    <el-input placeholder="请输入内容" v-model="uitem.optionName" clearable>
                                                     </el-input>
                                                     <el-button icon="el-icon-close" type="text"
                                                         style="color:red;margin-left:10px"
@@ -82,25 +83,25 @@
                                                 @click.stop="addoption(item)">添加选项</el-button>
                                         </div>
                                     </div>
-                                    <div v-if="item.questionname == '多选题'" class="item"
+                                    <div v-if="item.questionType == 'MULTIPLE_CHOICE_QUESTIONS'" class="item"
                                         @click.stop="selectquestion(item, index)">
                                         <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
                                         <img src="@/assets/system/gb.png" alt="" class="delicon"
                                             @click.stop="delquestion(item, index)">
-                                        <div class="questionname">
-                                            {{ index + 1 }}. {{ item.questionname }}
+                                        <div class="questionName">
+                                            {{ index + 1 }}. {{ item.title }}
                                         </div>
                                         <div class="title">
                                             <span>题目： </span>
-                                            <el-input placeholder="请输入题目" v-model="item.title" clearable>
+                                            <el-input placeholder="请输入题目" v-model="item.questionName" clearable>
                                             </el-input>
                                         </div>
                                         <div class="options">
                                             <span>选项： </span>
                                             <div>
-                                                <div v-for="(uitem, uindex) in item.options" :key="uindex"
-                                                    style="display:flex">
-                                                    <el-input placeholder="请输入内容" v-model="uitem.optionname" clearable>
+                                                <div v-for="(uitem, uindex) in item.questionSubjectOptionList"
+                                                    :key="uindex" style="display:flex;margin-bottom:10px">
+                                                    <el-input placeholder="请输入内容" v-model="uitem.optionName" clearable>
                                                     </el-input>
                                                     <el-button icon="el-icon-close" type="text"
                                                         style="color:red;margin-left:10px"
@@ -113,38 +114,38 @@
                                                 @click.stop="addoption(item)">添加选项</el-button>
                                         </div>
                                     </div>
-                                    <div v-if="item.questionname == '填空题'" class="item"
+                                    <div v-if="item.questionType == 'FILL_IN_THE_BLANKS'" class="item"
                                         @click.stop="selectquestion(item, index)">
                                         <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
                                         <img src="@/assets/system/gb.png" alt="" class="delicon"
                                             @click.stop="delquestion(item, index)">
-                                        <div class="questionname">
-                                            {{ index + 1 }}. {{ item.questionname }}
+                                        <div class="questionName">
+                                            {{ index + 1 }}. {{ item.title }}
                                         </div>
                                         <div class="title">
                                             <span>题目： </span>
-                                            <el-input placeholder="请输入题目" v-model="item.title" clearable>
+                                            <el-input placeholder="请输入题目" v-model="item.questionName" clearable>
                                             </el-input>
                                         </div>
                                         <div class="options" style="align-items:center">
                                             <span>回答： </span>
-                                            <el-input style="margin:0;width:300px" v-model="item.option" disabled
+                                            <el-input style="margin:0;width:300px" disabled
                                                 placeholder="填写问卷时,用户需要在此输入答案" />
                                         </div>
                                         <div class="more">
                                         </div>
                                     </div>
-                                    <div v-if="item.questionname == '打分题'" class="item"
+                                    <div v-if="item.questionType == 'SCORING_QUESTIONS'" class="item"
                                         @click.stop="selectquestion(item, index)">
                                         <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
                                         <img src="@/assets/system/gb.png" alt="" class="delicon"
                                             @click.stop="delquestion(item, index)">
-                                        <div class="questionname">
-                                            {{ index + 1 }}. {{ item.questionname }}
+                                        <div class="questionName">
+                                            {{ index + 1 }}. {{ item.title }}
                                         </div>
                                         <div class="title">
                                             <span>题目： </span>
-                                            <el-input placeholder="请输入题目" v-model="item.title" clearable>
+                                            <el-input placeholder="请输入题目" v-model="item.questionName" clearable>
                                             </el-input>
                                         </div>
                                         <div class="options">
@@ -160,42 +161,85 @@
                                         </div>
                                         <div class="more">
                                             <el-radio-group>
-                                                <el-radio :label="1" disabled v-if="optionNumber > 0">1</el-radio>
-                                                <el-radio :label="2" disabled v-if="optionNumber > 1">2</el-radio>
-                                                <el-radio :label="3" disabled v-if="optionNumber > 2">3</el-radio>
-                                                <el-radio :label="4" disabled v-if="optionNumber > 3">4</el-radio>
-                                                <el-radio :label="5" disabled v-if="optionNumber > 4">5</el-radio>
+                                                <el-radio :label="1" disabled v-if="item.optionNumber > 0">1</el-radio>
+                                                <el-radio :label="2" disabled v-if="item.optionNumber > 1">2</el-radio>
+                                                <el-radio :label="3" disabled v-if="item.optionNumber > 2">3</el-radio>
+                                                <el-radio :label="4" disabled v-if="item.optionNumber > 3">4</el-radio>
+                                                <el-radio :label="5" disabled v-if="item.optionNumber > 4">5</el-radio>
                                             </el-radio-group>
                                         </div>
                                     </div>
-                                    <div v-if="item.questionname == '组合单选题'" class="item">
+                                    <div v-if="item.questionType == 'COMBINATION_RADIO_SUBJECT'" class="item">
                                         <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
                                         <img src="@/assets/system/gb.png" alt="" class="delicon"
                                             @click.stop="delquestion(item, index)">
-                                        <div class="questionname">
-                                            {{ index + 1 }}. {{ item.questionname }}
+                                        <div class="questionName">
+                                            {{ index + 1 }}. {{ item.title }}
                                         </div>
                                         <div class="title" style="width:85%">
                                             <span>标题： </span>
-                                            <el-input placeholder="请输入标题" v-model="item.title" clearable>
+                                            <el-input placeholder="请输入标题" v-model="item.questionDescription" clearable>
                                             </el-input>
                                         </div>
                                         <div v-for="(aitem, aindex) in item.list" :key="aitem.id" class="combination"
                                             @click.stop="selectquestion(aitem, index, item, aindex)">
-                                            <div class="questionname" style="padding-top:0">
-                                                {{ aindex + 1 }}. {{ aitem.questionname }}
+                                            <div class="questionName" style="padding-top:0">
+                                                {{ aindex + 1 }}. {{ aitem.title }}
                                             </div>
                                             <div class="title">
                                                 <span>题目： </span>
-                                                <el-input placeholder="请输入题目" v-model="aitem.title" clearable>
+                                                <el-input placeholder="请输入题目" v-model="aitem.questionName" clearable>
                                                 </el-input>
                                             </div>
                                             <div class="options">
                                                 <span>选项： </span>
                                                 <div>
-                                                    <div v-for="(uitem, uindex) in aitem.options" :key="uindex"
-                                                        style="display:flex">
-                                                        <el-input placeholder="请输入内容" v-model="uitem.optionname" clearable>
+                                                    <div v-for="(uitem, uindex) in aitem.questionSubjectOptionList"
+                                                        :key="uindex" style="display:flex">
+                                                        <el-input placeholder="请输入内容" v-model="uitem.optionName"
+                                                            clearable>
+                                                        </el-input>
+                                                        <el-button icon="el-icon-close" type="text"
+                                                            style="color:red;margin:10px 0 0 10px"
+                                                            @click.stop="deloption(aitem, uitem, aindex, uindex)"></el-button>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="more">
+                                                <el-button size="medium" icon="el-icon-plus" type="text"
+                                                    @click.stop="addoption(aitem)">添加选项</el-button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div v-if="item.questionType == 'COMBINATION_MULTIPLE_SUBJECT'" class="item">
+                                        <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
+                                        <img src="@/assets/system/gb.png" alt="" class="delicon"
+                                            @click.stop="delquestion(item, index)">
+                                        <div class="questionName">
+                                            {{ index + 1 }}. {{ item.title }}
+                                        </div>
+                                        <div class="title" style="width:85%">
+                                            <span>标题： </span>
+                                            <el-input placeholder="请输入标题" v-model="item.questionDescription" clearable>
+                                            </el-input>
+                                        </div>
+                                        <div v-for="(aitem, aindex) in item.list" :key="aitem.id" class="combination"
+                                            @click.stop="selectquestion(aitem, index, item, aindex)">
+                                            <div class="questionName" style="padding-top:0">
+                                                {{ aindex + 1 }}. {{ aitem.title }}
+                                            </div>
+                                            <div class="title">
+                                                <span>题目： </span>
+                                                <el-input placeholder="请输入题目" v-model="aitem.questionName" clearable>
+                                                </el-input>
+                                            </div>
+                                            <div class="options">
+                                                <span>选项： </span>
+                                                <div>
+                                                    <div v-for="(uitem, uindex) in aitem.questionSubjectOptionList"
+                                                        :key="uindex" style="display:flex">
+                                                        <el-input placeholder="请输入内容" v-model="uitem.optionName"
+                                                            clearable>
                                                         </el-input>
                                                         <el-button icon="el-icon-close" type="text"
                                                             style="color:red;margin-left:10px"
@@ -209,67 +253,26 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div v-if="item.questionname == '组合多选题'" class="item">
+                                    <div v-if="item.questionType == 'COMBINATION_BLANKS_SUBJECT'" class="item">
                                         <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
                                         <img src="@/assets/system/gb.png" alt="" class="delicon"
                                             @click.stop="delquestion(item, index)">
-                                        <div class="questionname">
-                                            {{ index + 1 }}. {{ item.questionname }}
+                                        <div class="questionName">
+                                            {{ index + 1 }}. {{ item.title }}
                                         </div>
                                         <div class="title" style="width:85%">
                                             <span>标题： </span>
-                                            <el-input placeholder="请输入标题" v-model="item.title" clearable>
+                                            <el-input placeholder="请输入标题" v-model="item.questionDescription" clearable>
                                             </el-input>
                                         </div>
                                         <div v-for="(aitem, aindex) in item.list" :key="aitem.id" class="combination"
                                             @click.stop="selectquestion(aitem, index, item, aindex)">
-                                            <div class="questionname" style="padding-top:0">
-                                                {{ aindex + 1 }}. {{ aitem.questionname }}
+                                            <div class="questionName" style="padding-top:0">
+                                                {{ aindex + 1 }}. {{ aitem.title }}
                                             </div>
                                             <div class="title">
                                                 <span>题目： </span>
-                                                <el-input placeholder="请输入题目" v-model="aitem.title" clearable>
-                                                </el-input>
-                                            </div>
-                                            <div class="options">
-                                                <span>选项： </span>
-                                                <div>
-                                                    <div v-for="(uitem, uindex) in aitem.options" :key="uindex"
-                                                        style="display:flex">
-                                                        <el-input placeholder="请输入内容" v-model="uitem.optionname" clearable>
-                                                        </el-input>
-                                                        <el-button icon="el-icon-close" type="text"
-                                                            style="color:red;margin-left:10px"
-                                                            @click.stop="deloption(aitem, uitem, aindex, uindex)"></el-button>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="more">
-                                                <el-button size="medium" icon="el-icon-plus" type="text"
-                                                    @click.stop="addoption(aitem)">添加选项</el-button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div v-if="item.questionname == '组合填空题'" class="item">
-                                        <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
-                                        <img src="@/assets/system/gb.png" alt="" class="delicon"
-                                            @click.stop="delquestion(item, index)">
-                                        <div class="questionname">
-                                            {{ index + 1 }}. {{ item.questionname }}
-                                        </div>
-                                        <div class="title" style="width:85%">
-                                            <span>标题： </span>
-                                            <el-input placeholder="请输入标题" v-model="item.title" clearable>
-                                            </el-input>
-                                        </div>
-                                        <div v-for="(aitem, aindex) in item.list" :key="aitem.id" class="combination"
-                                            @click.stop="selectquestion(aitem, index, item, aindex)">
-                                            <div class="questionname" style="padding-top:0">
-                                                {{ aindex + 1 }}. {{ aitem.questionname }}
-                                            </div>
-                                            <div class="title">
-                                                <span>题目： </span>
-                                                <el-input placeholder="请输入题目" v-model="aitem.title" clearable>
+                                                <el-input placeholder="请输入题目" v-model="aitem.questionName" clearable>
                                                 </el-input>
                                             </div>
                                             <div class="options" style="align-items:center">
@@ -283,26 +286,26 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div v-if="item.questionname == '组合打分题'" class="item">
+                                    <div v-if="item.questionType == 'COMBINATION_SCORING_SUBJECT'" class="item">
                                         <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
                                         <img src="@/assets/system/gb.png" alt="" class="delicon"
                                             @click.stop="delquestion(item, index)">
-                                        <div class="questionname">
-                                            {{ index + 1 }}. {{ item.questionname }}
+                                        <div class="questionName">
+                                            {{ index + 1 }}. {{ item.title }}
                                         </div>
                                         <div class="title" style="width:85%">
                                             <span>标题： </span>
-                                            <el-input placeholder="请输入标题" v-model="item.title" clearable>
+                                            <el-input placeholder="请输入标题" v-model="item.questionDescription" clearable>
                                             </el-input>
                                         </div>
                                         <div v-for="(aitem, aindex) in item.list" :key="aitem.id" class="combination"
                                             @click.stop="selectquestion(aitem, index, item, aindex)">
-                                            <div class="questionname" style="padding-top:0">
-                                                {{ aindex + 1 }}. {{ aitem.questionname }}
+                                            <div class="questionName" style="padding-top:0">
+                                                {{ aindex + 1 }}. {{ aitem.title }}
                                             </div>
                                             <div class="title">
                                                 <span>题目： </span>
-                                                <el-input placeholder="请输入题目" v-model="aitem.title" clearable>
+                                                <el-input placeholder="请输入题目" v-model="aitem.questionName" clearable>
                                                 </el-input>
                                             </div>
                                             <div class="options">
@@ -318,47 +321,52 @@
                                             </div>
                                             <div class="more">
                                                 <el-radio-group>
-                                                    <el-radio :label="1" disabled v-if="aitem.optionNumber > 0">1</el-radio>
-                                                    <el-radio :label="2" disabled v-if="aitem.optionNumber > 1">2</el-radio>
-                                                    <el-radio :label="3" disabled v-if="aitem.optionNumber > 2">3</el-radio>
-                                                    <el-radio :label="4" disabled v-if="aitem.optionNumber > 3">4</el-radio>
-                                                    <el-radio :label="5" disabled v-if="aitem.optionNumber > 4">5</el-radio>
+                                                    <el-radio :label="1" disabled
+                                                        v-if="aitem.optionNumber > 0">1</el-radio>
+                                                    <el-radio :label="2" disabled
+                                                        v-if="aitem.optionNumber > 1">2</el-radio>
+                                                    <el-radio :label="3" disabled
+                                                        v-if="aitem.optionNumber > 2">3</el-radio>
+                                                    <el-radio :label="4" disabled
+                                                        v-if="aitem.optionNumber > 3">4</el-radio>
+                                                    <el-radio :label="5" disabled
+                                                        v-if="aitem.optionNumber > 4">5</el-radio>
                                                 </el-radio-group>
                                             </div>
                                         </div>
                                     </div>
-                                    <div v-if="item.questionname == '日期填空题'" class="item"
+                                    <div v-if="item.questionType == 'DATE_BLANKS_SUBJECT'" class="item"
                                         @click.stop="selectquestion(item, index)">
                                         <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
                                         <img src="@/assets/system/gb.png" alt="" class="delicon"
                                             @click.stop="delquestion(item, index)">
-                                        <div class="questionname">
-                                            {{ index + 1 }}. {{ item.questionname }}
+                                        <div class="questionName">
+                                            {{ index + 1 }}. {{ item.title }}
                                         </div>
                                         <div class="title">
                                             <span>题目： </span>
-                                            <el-input placeholder="请输入题目" v-model="item.title" clearable>
+                                            <el-input placeholder="请输入题目" v-model="item.questionName" clearable>
                                             </el-input>
                                         </div>
                                         <div class="options" style="align-items:center">
                                             <span>回答： </span>
-                                            <el-input style="" v-model="item.option" disabled prefix-icon="el-icon-date"
+                                            <el-input style="" disabled prefix-icon="el-icon-date"
                                                 placeholder="填写问卷时,用户在此选择日期" />
                                         </div>
                                         <div class="more">
                                         </div>
                                     </div>
-                                    <div v-if="item.questionname == '时间填空题'" class="item"
+                                    <div v-if="item.questionType == 'TIME_BLANKS_SUBJECT'" class="item"
                                         @click.stop="selectquestion(item, index)">
                                         <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
                                         <img src="@/assets/system/gb.png" alt="" class="delicon"
                                             @click.stop="delquestion(item, index)">
-                                        <div class="questionname">
-                                            {{ index + 1 }}. {{ item.questionname }}
+                                        <div class="questionName">
+                                            {{ index + 1 }}. {{ item.title }}
                                         </div>
                                         <div class="title">
                                             <span>题目： </span>
-                                            <el-input placeholder="请输入题目" v-model="item.title" clearable>
+                                            <el-input placeholder="请输入题目" v-model="item.questionName" clearable>
                                             </el-input>
                                         </div>
                                         <div class="options" style="align-items:center">
@@ -381,7 +389,7 @@
                     <div class="totalscore-title" style="font-size:14px">
                         Q{{ questionitem.index + 1 }}
                         <span
-                            v-if="questionitem.type == 'danxuans' || questionitem.type == 'duoxuans' || questionitem.type == 'tiankongs' || questionitem.type == 'duoxuans' || questionitem.type == 'dafens'">
+                            v-if="questionitem.questionType == 'COMBINATION_RADIO_SUBJECT' || questionitem.questionType == 'COMBINATION_MULTIPLE_SUBJECT' || questionitem.questionType == 'COMBINATION_BLANKS_SUBJECT' || questionitem.questionType == 'COMBINATION_SCORING_SUBJECT'">
                             - {{ questionitem.aindex + 1 }}
                         </span>: 整题分值设置
                     </div>
@@ -392,8 +400,8 @@
                     </div>
                     <div class="text" style="border:none">计分方式</div>
                     <div class="introduce">
-                        <el-select v-model="questionitem.scoringMethod" placeholder="请选择计分方式" clearable style="width:200px"
-                            disabled>
+                        <el-select v-model="questionitem.scoringMethod" placeholder="请选择计分方式" clearable
+                            style="width:200px" disabled>
                             <el-option v-for="dict in dict.type.scoring_method" :key="dict.value" :label="dict.label"
                                 :value="dict.value" />
                         </el-select>
@@ -401,9 +409,10 @@
                     <div v-if="questionitem.scoringMethod == 'NOT_UNIQUE_ANSWER' && questionitem.whetherScore">
                         <div class="text" style="border:none">各选项分值
                         </div>
-                        <div v-for="item in questionitem.options" :key="item.optionid" class="optionitem">
-                            <div class="optionname">
-                                {{ item.optionname }}
+                        <div v-for="item in questionitem.questionSubjectOptionList" :key="item.optionid"
+                            class="optionitem">
+                            <div class="optionName">
+                                {{ item.optionName }}
                             </div>
                             <el-input-number v-model="item.optionScore" :min="0" :max="100"
                                 :controls="false"></el-input-number>
@@ -415,9 +424,10 @@
                     <div v-if="questionitem.scoringMethod == 'UNIQUE_ANSWER' && questionitem.whetherScore">
                         <div class="text" style="border:none">本题答案及答案分值
                         </div>
-                        <div v-for="item in questionitem.options" :key="item.optionid" class="optionitem">
-                            <div class="optionname">
-                                <el-checkbox v-model="item.checked" :label="item.optionname"></el-checkbox>
+                        <div v-for="item in questionitem.questionSubjectOptionList" :key="item.optionid"
+                            class="optionitem">
+                            <div class="optionName">
+                                <el-checkbox v-model="item.checked" :label="item.optionName"></el-checkbox>
                             </div>
                             <el-input-number v-model="item.optionScore" :min="0" :max="100" :controls="false"
                                 :disabled="!item.checked"></el-input-number>
@@ -431,7 +441,9 @@
         </div>
     </div>
 </template>
+
 <script>
+import { getQuestion } from "@/api/system/question";
 import draggable from 'vuedraggable'
 export default {
     name: "addQuestionnaire",
@@ -445,60 +457,66 @@ export default {
             optionid: 99,
             otherQuestiontypes: [
                 {
-                    id: 'riqi',
+                    id: 'DATE_BLANKS_SUBJECT',
                     name: '日期填空题',
                     src: require('@/assets/system/riqi.png')
                 },
                 {
-                    id: 'shijian',
+                    id: 'TIME_BLANKS_SUBJECT',
                     name: '时间填空题',
                     src: require('@/assets/system/shijian.png')
                 },
             ],
             combinationQuestiontypes: [
                 {
-                    id: 'danxuans',
+                    id: 'COMBINATION_RADIO_SUBJECT',
                     name: '组合单选题',
                     src: require('@/assets/system/danxuans.png')
                 },
                 {
-                    id: 'duoxuans',
+                    id: 'COMBINATION_MULTIPLE_SUBJECT',
                     name: '组合多选题',
                     src: require('@/assets/system/duoxuans.png')
                 },
                 {
-                    id: 'tiankongs',
+                    id: 'COMBINATION_BLANKS_SUBJECT',
                     name: '组合填空题',
                     src: require('@/assets/system/tiankongs.png')
                 },
                 {
-                    id: 'dafens',
+                    id: 'COMBINATION_SCORING_SUBJECT',
                     name: '组合打分题',
                     src: require('@/assets/system/dafens.png')
                 },
             ],
             basicQuestiontypes: [
                 {
-                    id: 'danxuan',
+                    id: 'MULTIPLE_CHOICE',
                     name: '单选题',
                     src: require('@/assets/system/danxuan.png')
                 },
                 {
-                    id: 'duoxuan',
+                    id: 'MULTIPLE_CHOICE_QUESTIONS',
                     name: '多选题',
                     src: require('@/assets/system/duoxuan.png')
                 },
                 {
-                    id: 'tiankong',
+                    id: 'FILL_IN_THE_BLANKS',
                     name: '填空题',
                     src: require('@/assets/system/tiankong.png')
                 },
                 {
-                    id: 'dafen',
+                    id: 'SCORING_QUESTIONS',
                     name: '打分题',
                     src: require('@/assets/system/dafen.png')
                 },
             ],
+            list: {
+                questionnaireName: undefined,
+                questionnaireDescription: undefined,
+                questionnaireTotalScore: undefined,  //总分
+                questionSubjectList: [],
+            },
             //题目arr
             questionlist: [],
             //打分题选项
@@ -527,28 +545,74 @@ export default {
     watch: {
     },
     created() {
+        if(this.$route.query.id){
+            this.info();
+        }
     },
     methods: {
         addquestion(item) {
             this.id++
             if (this.questionlist.length > 0) {
-                if (this.questionlist[this.questionlist.length - 1].title == '') {
+                if (this.questionlist[this.questionlist.length - 1].questionName == '') {
                     return this.$message.error('请填写完在继续添加');
                 }
             }
-            if (item.id == 'danxuan') {
+            if (item.id == 'MULTIPLE_CHOICE') {
                 this.questionlist.push({
-                    type: 'danxuan',
-                    id: this.id,
-                    questionname: '单选题',
-                    title: '',
-                    options: [{
+                    questionType: 'MULTIPLE_CHOICE',
+                    id: this.id++,
+                    title: '单选题',
+                    questionName: '',
+                    questionNumber: '',
+                    //是否计分
+                    whetherScore: false,
+                    disabled: false,
+                    //计分方式
+                    scoringMethod: '',
+                    optionCount: 0, //选项个数
+                    questionSubjectOptionList: [{
                         optionid: ++this.optionid,
-                        optionname: '',
+                        optionName: '',
+                        optionAnswer: '',
+                        //题目名称
+                        questionName: '',
+                        //题目序号
+                        questionNumber: '',
                         optionScore: 0,
                     }, {
                         optionid: ++this.optionid,
-                        optionname: '',
+                        optionName: '',
+                        optionAnswer: '',
+                        //题目名称
+                        questionName: '',
+                        //题目序号
+                        questionNumber: '',
+                        optionScore: 0,
+                    }],
+                })
+            } else if (item.id == 'MULTIPLE_CHOICE_QUESTIONS') {
+                this.questionlist.push({
+                    questionType: 'MULTIPLE_CHOICE_QUESTIONS',
+                    id: this.id++,
+                    questionName: '',
+                    title: '多选题',
+                    questionSubjectOptionList: [{
+                        optionid: ++this.optionid,
+                        optionName: '',
+                        optionAnswer: '',
+                        //题目名称
+                        questionName: '',
+                        //题目序号
+                        questionNumber: '',
+                        optionScore: 0,
+                    }, {
+                        optionid: ++this.optionid,
+                        optionName: '',
+                        optionAnswer: '',
+                        //题目名称
+                        questionName: '',
+                        //题目序号
+                        questionNumber: '',
                         optionScore: 0,
                     }],
                     //是否计分
@@ -557,74 +621,132 @@ export default {
                     //计分方式
                     scoringMethod: '',
                 })
-            } else if (item.id == 'duoxuan') {
+            } else if (item.id == 'FILL_IN_THE_BLANKS') {
                 this.questionlist.push({
-                    type: 'duoxuan',
-                    id: this.id,
-                    questionname: '多选题',
-                    title: '',
-                    options: [{
-                        optionid: ++this.optionid,
-                        optionname: '',
-                        optionScore: 0,
-                        checked: false,
-                    }, {
-                        optionid: ++this.optionid,
-                        optionScore: 0,
-                        optionname: '',
-                        checked: false,
-                    }],
-                    //是否计分
-                    whetherScore: false,
-                    disabled: false,
-                    //计分方式
-                    scoringMethod: '',
-                })
-            } else if (item.id == 'tiankong') {
-                this.questionlist.push({
-                    type: 'tiankong',
-                    id: this.id,
-                    questionname: '填空题',
-                    title: '',
-                    option: '',
+                    questionType: 'FILL_IN_THE_BLANKS',
+                    id: this.id++,
+                    questionName: '',
+                    title: '填空题',
                     //是否计分
                     whetherScore: false,
                     disabled: true,
                 })
-            } else if (item.id == 'dafen') {
+            } else if (item.id == 'SCORING_QUESTIONS') {
                 this.questionlist.push({
-                    type: 'dafen',
-                    optionNumber: undefined,
+                    questionType: 'SCORING_QUESTIONS',
                     id: this.id,
-                    questionname: '打分题',
-                    title: '',
+                    questionName: '',
+                    title: '打分题',
                     //是否计分
                     whetherScore: false,
                     disabled: false,
                     //计分方式
                     scoringMethod: '',
-                    options: [],
+                    questionSubjectOptionList: [],
                 })
-            } else if (item.id == 'danxuans') {
+            } else if (item.id == 'COMBINATION_RADIO_SUBJECT') {
                 this.questionlist.push({
-                    title: '',
-                    questionname: '组合单选题',
-                    type: 'danxuans',
+                    title: '组合单选题',
+                    questionType: 'COMBINATION_RADIO_SUBJECT',
                     id: this.id++,
+                    questionDescription: '',
                     list: [
                         {
-                            type: 'danxuans',
+                            questionType: 'COMBINATION_RADIO_SUBJECT',
                             id: this.id++,
-                            questionname: '单选题',
-                            title: '',
-                            options: [{
+                            questionName: '',
+                            title: '单选题',
+                            //是否计分
+                            whetherScore: false,
+                            disabled: false,
+                            //计分方式
+                            scoringMethod: '',
+                            questionDescription: '',
+                            questionSubjectOptionList: [{
                                 optionid: ++this.optionid,
-                                optionname: '',
+                                //题目名称
+                                questionName: undefined,
+                                //题目序号
+                                questionNumber: undefined,
+                                optionAnswer: '',
+                                optionName: '',
                                 optionScore: 0,
                             }, {
                                 optionid: ++this.optionid,
-                                optionname: '',
+                                optionName: '',
+                                //题目名称
+                                questionName: undefined,
+                                //题目序号
+                                questionNumber: undefined,
                                 optionScore: 0,
+                                optionAnswer: '',
+                            }],
+                        }, {
+                            questionType: 'COMBINATION_RADIO_SUBJECT',
+                            id: this.id++,
+                            questionName: '',
+                            title: '单选题',
+                            //是否计分
+                            whetherScore: false,
+                            disabled: false,
+                            //计分方式
+                            scoringMethod: '',
+                            questionDescription: '',
+                            questionSubjectOptionList: [{
+                                optionid: ++this.optionid,
+                                optionName: '',
+                                optionAnswer: '',
+                                //题目名称
+                                questionName: undefined,
+                                //题目序号
+                                questionNumber: undefined,
+                                optionScore: 0,
+                            }, {
+                                optionid: ++this.optionid,
+                                optionName: '',
+                                optionScore: 0,
+                                optionAnswer: '',
+                                //题目名称
+                                questionName: undefined,
+                                //题目序号
+                                questionNumber: undefined,
+                            }],
+                        },
+                    ],
+                })
+            } else if (item.id == 'COMBINATION_MULTIPLE_SUBJECT') {
+                this.questionlist.push({
+                    title: '组合多选题',
+                    questionDescription: '',
+                    questionType: 'COMBINATION_MULTIPLE_SUBJECT',
+                    id: this.id++,
+                    list: [
+                        {
+                            questionType: 'COMBINATION_MULTIPLE_SUBJECT',
+                            id: this.id++,
+                            questionName: '',
+                            questionDescription: '',
+                            title: '多选题',
+                            questionSubjectOptionList: [{
+                                optionid: ++this.optionid,
+                                optionName: '',
+                                optionScore: 0,
+                                checked: false,
+                                optionAnswer: '',
+                                //题目名称
+                                questionName: undefined,
+                                //题目序号
+                                questionNumber: undefined,
+                            }, {
+                                optionid: ++this.optionid,
+                                optionScore: 0,
+                                optionName: '',
+                                checked: false,
+                                optionAnswer: '',
+                                //题目名称
+                                questionName: undefined,
+                                //题目序号
+                                questionNumber: undefined,
                             }],
                             //是否计分
                             whetherScore: false,
@@ -632,18 +754,31 @@ export default {
                             //计分方式
                             scoringMethod: '',
                         }, {
-                            type: 'danxuans',
+                            questionType: 'COMBINATION_MULTIPLE_SUBJECT',
                             id: this.id++,
-                            questionname: '单选题',
-                            title: '',
-                            options: [{
+                            questionName: '',
+                            questionDescription: '',
+                            title: '多选题',
+                            questionSubjectOptionList: [{
                                 optionid: ++this.optionid,
-                                optionname: '',
+                                optionName: '',
                                 optionScore: 0,
+                                checked: false,
+                                optionAnswer: '',
+                                //题目名称
+                                questionName: undefined,
+                                //题目序号
+                                questionNumber: undefined,
                             }, {
                                 optionid: ++this.optionid,
-                                optionname: '',
                                 optionScore: 0,
+                                optionName: '',
+                                checked: false,
+                                optionAnswer: '',
+                                //题目名称
+                                questionName: undefined,
+                                //题目序号
+                                questionNumber: undefined,
                             }],
                             //是否计分
                             whetherScore: false,
@@ -653,139 +788,91 @@ export default {
                         },
                     ],
                 })
-            } else if (item.id == 'duoxuans') {
+            } else if (item.id == 'COMBINATION_BLANKS_SUBJECT') {
                 this.questionlist.push({
-                    title: '',
-                    questionname: '组合多选题',
-                    type: 'duoxuans',
+                    title: '组合填空题',
+                    questionDescription: '',
+                    questionType: 'COMBINATION_BLANKS_SUBJECT',
                     id: this.id++,
                     list: [
                         {
-                            type: 'duoxuans',
+                            questionType: 'COMBINATION_BLANKS_SUBJECT',
                             id: this.id++,
-                            questionname: '多选题',
-                            title: '',
-                            options: [{
-                                optionid: ++this.optionid,
-                                optionname: '',
-                                optionScore: 0,
-                                checked: false,
-                            }, {
-                                optionid: ++this.optionid,
-                                optionScore: 0,
-                                optionname: '',
-                                checked: false,
-                            }],
-                            //是否计分
-                            whetherScore: false,
-                            disabled: false,
-                            //计分方式
-                            scoringMethod: '',
-                        }, {
-                            type: 'duoxuans',
-                            id: this.id++,
-                            questionname: '多选题',
-                            title: '',
-                            options: [{
-                                optionid: ++this.optionid,
-                                optionname: '',
-                                optionScore: 0,
-                                checked: false,
-                            }, {
-                                optionid: ++this.optionid,
-                                optionScore: 0,
-                                optionname: '',
-                                checked: false,
-                            }],
-                            //是否计分
-                            whetherScore: false,
-                            disabled: false,
-                            //计分方式
-                            scoringMethod: '',
-                        },
-                    ],
-                })
-            } else if (item.id == 'tiankongs') {
-                this.questionlist.push({
-                    title: '',
-                    questionname: '组合填空题',
-                    type: 'tiankongs',
-                    id: this.id++,
-                    list: [
-                        {
-                            type: 'tiankongs',
-                            id: this.id++,
-                            questionname: '填空题',
-                            title: '',
-                            option: '',
+                            questionDescription: '',
+                            questionName: '',
+                            title: '填空题',
                             //是否计分
                             whetherScore: false,
                             disabled: true,
                         }, {
-                            type: 'tiankongs',
+                            questionType: 'COMBINATION_BLANKS_SUBJECT',
+                            questionDescription: '',
                             id: this.id++,
-                            questionname: '填空题',
-                            title: '',
-                            option: '',
+                            questionName: '',
+                            title: '填空题',
                             //是否计分
                             whetherScore: false,
                             disabled: true,
                         },
                     ],
                 })
-            } else if (item.id == 'dafens') {
+            } else if (item.id == 'COMBINATION_SCORING_SUBJECT') {
                 this.questionlist.push({
-                    title: '',
-                    questionname: '组合打分题',
-                    type: 'dafens',
+                    title: '组合打分题',
+                    questionName: '',
+                    questionType: 'COMBINATION_SCORING_SUBJECT',
                     id: this.id++,
                     list: [
                         {
-                            type: 'dafens',
+                            questionType: 'COMBINATION_SCORING_SUBJECT',
                             id: this.id++,
-                            questionname: '打分题',
-                            optionNumber: undefined,
-                            title: '',
+                            questionName: '',
+                            questionDescription: '',
+                            optionNumber: '',
+                            title: '打分题',
                             //是否计分
                             whetherScore: false,
                             disabled: false,
                             //计分方式
                             scoringMethod: '',
-                            options: [],
+                            questionSubjectOptionList: [],
                         }, {
-                            type: 'dafens',
+                            questionType: 'COMBINATION_SCORING_SUBJECT',
                             id: this.id++,
-                            optionNumber: undefined,
-                            questionname: '打分题',
-                            title: '',
+                            questionDescription: '',
+                            optionNumber: '',
+                            questionName: '',
+                            title: '打分题',
                             //是否计分
                             whetherScore: false,
                             disabled: false,
                             //计分方式
                             scoringMethod: '',
-                            options: [],
+                            questionSubjectOptionList: [],
                         },
                     ],
                 })
-            } else if (item.id == 'riqi') {
+            } else if (item.id == 'DATE_BLANKS_SUBJECT') {
                 this.questionlist.push({
-                    type: 'riqi',
+                    questionType: 'DATE_BLANKS_SUBJECT',
                     id: this.id++,
-                    questionname: '日期填空题',
-                    title: '',
-                    option: '',
+                    questionName: '',
+                    questionNumber: '',
+                    title: '日期填空题',
                     //是否计分
                     whetherScore: false,
+                    optionCount: 0, //选项个数
                     disabled: true,
                 })
-            } else if (item.id == 'shijian') {
+            } else if (item.id == 'TIME_BLANKS_SUBJECT') {
                 this.questionlist.push({
-                    type: 'shijian',
+                    questionType: 'TIME_BLANKS_SUBJECT',
                     id: this.id++,
-                    questionname: '时间填空题',
-                    title: '',
-                    option: '',
+                    questionNumber: '',
+                    questionName: '',
+                    title: '时间填空题',
                     //是否计分
+                    optionCount: 0, //选项个数
                     whetherScore: false,
                     disabled: true,
                 })
@@ -793,7 +880,7 @@ export default {
             if (this.questionlist.length == 1) {
                 this.questionitem = this.questionlist[0]
                 this.questionitem.index = 0
-                if (item.id == 'danxuans' || item.id == 'duoxuans' || item.id == 'tiankongs' || item.id == 'dafens') {
+                if (item.id == 'COMBINATION_RADIO_SUBJECT' || item.id == 'COMBINATION_MULTIPLE_SUBJECT' || item.id == 'COMBINATION_BLANKS_SUBJECT' || item.id == 'COMBINATION_SCORING_SUBJECT') {
                     this.questionitem = this.questionlist[0].list[0]
                     this.questionitem.index = 0
                     this.questionitem.aindex = 0
@@ -803,54 +890,56 @@ export default {
         selectquestion(item, index, topitem, aindex) {
             this.questionitem = item
             this.questionitem.index = index
-            if (this.questionitem.type == 'danxuans' || this.questionitem.type == 'duoxuans' || this.questionitem.type == 'tiankongs' || this.questionitem.type == 'dafens') {
+            if (this.questionitem.questionType == 'COMBINATION_RADIO_SUBJECT' || this.questionitem.questionType == 'COMBINATION_MULTIPLE_SUBJECT' || this.questionitem.questionType == 'COMBINATION_BLANKS_SUBJECT' || this.questionitem.questionType == 'COMBINATION_SCORING_SUBJECT') {
                 this.questionitem.aindex = aindex
             }
         },
         delquestion(item, index) {
+            console.log(index)
             if (this.questionlist.length == 1) {
                 this.$message.error('请保留一条题目！');
                 return
             }
             if (this.questionitem.id == this.questionlist[index].id) {
                 this.questionlist.splice(index, 1)
-                let index = 0
+                let aindex = 0
                 this.questionlist.forEach(e => {
-                    e.index = index++
+                    e.index = aindex++
                 })
                 this.questionitem = this.questionlist[0]
                 this.questionitem.index = 0
             } else {
                 this.questionlist.splice(index, 1)
-                let index = 0
+                let aindex = 0
                 this.questionlist.forEach(e => {
-                    e.index = index++
+                    e.index = aindex++
                 })
             }
         },
         addoption(item) {
-            if (item.options.length == 6) {
+            if (item.questionSubjectOptionList.length == 6) {
                 return this.$message.error('多选最多为六个选项！');
             }
-            item.options.push({
+            item.questionSubjectOptionList.push({
                 optionid: ++this.optionid,
-                optionname: '',
+                optionName: '',
                 optionScore: 0,
+                optionAnswer: '',
                 checked: false,
             })
         },
         deloption(item, uitem, index, uindex) {
-            if (item.options.length > 2) {
-                item.options.splice(uindex, 1)
+            if (item.questionSubjectOptionList.length > 2) {
+                item.questionSubjectOptionList.splice(uindex, 1)
             } else {
                 this.$message.error('最少保留两条选项！');
             }
         },
         changeswitch(e) {
             if (e) {
-                if (this.questionitem.type == 'danxuan' || this.questionitem.type == 'dafen' || this.questionitem.type == 'dafens' || this.questionitem.type == 'danxuans') {
+                if (this.questionitem.questionType == 'MULTIPLE_CHOICE' || this.questionitem.questionType == 'SCORING_QUESTIONS' || this.questionitem.questionType == 'COMBINATION_SCORING_SUBJECT' || this.questionitem.questionType == 'COMBINATION_RADIO_SUBJECT') {
                     this.questionitem.scoringMethod = 'NOT_UNIQUE_ANSWER'
-                } else if (this.questionitem.type == 'duoxuan' || this.questionitem.type == 'duoxuans') {
+                } else if (this.questionitem.questionType == 'MULTIPLE_CHOICE_QUESTIONS' || this.questionitem.questionType == 'COMBINATION_MULTIPLE_SUBJECT') {
                     this.questionitem.scoringMethod = 'UNIQUE_ANSWER'
                 }
             } else {
@@ -858,23 +947,61 @@ export default {
             }
         },
         selectchange(e, item) {
-            item.options = []
+            item.questionSubjectOptionList = []
             for (var i = 0; i < e; i++) {
-                item.options.push({
+                item.questionSubjectOptionList.push({
                     optionid: ++this.optionid,
-                    optionname: i + 1,
+                    optionName: i + 1,
                     optionScore: 0,
                     checked: false,
+                    optionAnswer: '',
+                    //题目名称
+                    questionName: undefined,
+                    //题目序号
+                    questionNumber: undefined,
                 })
             }
         },
         //保存
         upload() {
-            console.log(this.questionlist)
+            this.list.questionSubjectList = []
+            this.questionlist.forEach((e, eindex) => {
+                e.questionNumber = eindex + 1
+                if (e.questionType == 'COMBINATION_RADIO_SUBJECT' || e.questionType == 'COMBINATION_MULTIPLE_SUBJECT' || e.questionType == 'COMBINATION_BLANKS_SUBJECT' || e.questionType == 'COMBINATION_SCORING_SUBJECT') {
+                    e.list.forEach((el, elindex) => {
+                        el.questionDescription = e.questionDescription
+                        el.questionNumber = (eindex + 1) + '.' + (elindex + 1)
+                        if (e.questionType != 'COMBINATION_BLANKS_SUBJECT') {
+                            el.questionSubjectOptionList.forEach(ele => {
+                                ele.optionAnswer = ele.optionName
+                                ele.questionName = el.questionName
+                                ele.questionNumber = el.questionNumber
+                            })
+                        }
+                        this.list.questionSubjectList.push(el)
+                    })
+                } else {
+                    if (e.questionType != 'DATE_BLANKS_SUBJECT' && e.questionType != 'TIME_BLANKS_SUBJECT' && e.questionType != 'FILL_IN_THE_BLANKS') {
+                        e.questionSubjectOptionList.forEach(el => {
+                            el.optionAnswer = el.optionName
+                            el.questionName = e.questionName
+                            el.questionNumber = e.questionNumber
+                        })
+                    }
+                    this.list.questionSubjectList.push(e)
+                }
+            })
+            console.log(this.list)
+        },
+        info() {
+            getQuestion(this.$route.query.id).then(res => {
+
+            })
         },
     }
 };
 </script>
+
 <style lang="scss" scoped>
 .app-container {
     padding: 14px 0 0;
@@ -986,7 +1113,7 @@ export default {
                         }
                     }
 
-                    .questionname {
+                    .questionName {
                         padding: 20px 0 0 20px;
                     }
                 }
@@ -1009,7 +1136,7 @@ export default {
                     justify-content: space-between;
                     font-size: 14px;
 
-                    .optionname {
+                    .optionName {
                         width: 50%;
                         white-space: nowrap;
                         text-overflow: ellipsis;
diff --git a/src/views/system/question/index.vue b/src/views/system/question/index.vue
index 2f4a858..a3aa82f 100644
--- a/src/views/system/question/index.vue
+++ b/src/views/system/question/index.vue
@@ -46,6 +46,7 @@
           </el-table-column>
           <el-table-column label="病种名称" align="center" prop="diseaseTypeName" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:question:edit']">编辑</el-button>
@@ -54,8 +55,8 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
       </el-col>
     </el-row>
   </div>
@@ -156,6 +157,12 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.$router.push({
+        path: "/question/addQuestionnaire",
+        query: {
+          id: row.id,
+        },
+      });
     },
     /** 删除按钮操作 */
     handleDelete(row) {