修改

src/api/manage/newSigning.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 签约
+export function addsign(data) {
+    return request({
+        url: '/manage/signRecord/sign',
+        method: 'post',
+        data
+    })
+}

src/api/manage/signRecord.js

@@ -42,3 +42,12 @@ export function delSignRecord(id) {
         method: 'delete'
     })
 }
+
+//解约
+export function updateSignStatus(data) {
+    return request({
+        url: '/manage/signRecord/updateSignStatus',
+        method: 'post',
+        data: data
+    })
+}

src/views/manage/blacklist/index.vue

@@ -135,15 +135,14 @@
           </el-select>
         </el-form-item>
         <el-form-item label="补充说明" prop="supplementIllustrateId">
-          <el-select v-model="form.supplementIllustrateId" filterable placeholder="请输入异常原因" style="width:380px"
+          <el-select v-model="form.supplementIllustrateId" filterable placeholder="请输入异常原因" style="width:380px" clearable>
-            clearable>
             <el-option v-for="item in supplementIllustratelist" :key="item.id" :label="item.abnormalCauseValue"
               :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="功能限制" prop="functionLimitation">
-          <el-input v-model="form.functionLimitation" placeholder="请输入功能限制" />
+          <el-input v-model="form.functionLimitation" placeholder="终止所有服务" disabled />
         </el-form-item>
         <!-- <el-form-item label="来源" prop="blacklistSource">
           <el-select v-model="form.blacklistSource" placeholder="请选择来源">
@@ -281,7 +280,7 @@ export default {
         abnormalCauseValue: null,
         supplementIllustrateId: null,
         supplementIllustrateValue: null,
-        functionLimitation: null,
+        functionLimitation: '终止所有服务',
         blacklistSource: null,
         createBy: null,
         createTime: null,

src/views/manage/continueSigning/index.vue

@@ -0,0 +1,193 @@
+<template>
+    <div class="app-container">
+        <div class="interval">
+
+        </div>
+        <div class="header">
+            <div class="btns">
+                <el-button>取消</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="就诊方式">{{
+                    $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.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>
+                <!-- <el-descriptions-item label="出院/门诊时间">{{ $route.query.patientName }}</el-descriptions-item> -->
+                <!-- <el-descriptions-item label="注册时间">{{ $route.query.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-item label="选择服务包" prop="packageName">
+                    <el-input v-model="form.packageName" style="width:700px"></el-input>
+                </el-form-item>
+                <el-form-item label="签约月数" prop="">
+                    <el-input v-model="form.packageName"></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="form.packageName" style="width:150px"></el-input>
+                </el-form-item>
+                <el-form-item label="服务包价格" prop="">
+                    <el-input v-model="form.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">
+                        <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-input v-model="item.snCode" placeholder="请输入设备SN码"></el-input>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button size="mini" @click="delhardware(index)">删除</el-button>
+                    </el-form-item>
+                </div>
+                <el-button class="addbtn" type="primary" size="mini" @click="addhardware">新增硬件</el-button>
+            </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">
+                <i class="el-icon-plus"></i>
+            </el-upload>
+        </div>
+    </div>
+</template>
+    
+<script>
+import {
+    addsign
+} from '@/api/manage/newSigning.js'
+export default {
+    dicts: ['hardware_type'],
+    name: "newSigning",
+    data() {
+        return {
+            dialogImageUrl: '',
+            dialogVisible: false,
+            form: {
+                packageName: undefined,
+                hardwarelist: [
+                    {
+                        snCode: '',
+                        hardwareType: '',
+                    }
+                ],
+            },
+            rules: {
+                packageName: [
+                    { required: true, message: '请选择服务包', trigger: 'change' }
+                ],
+                hardwarelist: {
+                    snCode: [
+                        { required: true, message: '请输入SN码', trigger: 'change' }
+                    ],
+                    hardwareType: [
+                        { required: true, message: '请选择硬件类型', trigger: 'change' }
+                    ],
+                },
+            }
+        };
+    },
+    created() {
+    },
+    methods: {
+        //签约
+        signupload() {
+            addsign(this.form).then(res => {
+
+            })
+        },
+        //新增硬件
+        addhardware() {
+            this.form.hardwarelist.push({
+                snCode: '',
+                hardwareType: '',
+            })
+        },
+        delhardware(index) {
+            this.form.hardwarelist.splice(index, 1);
+        },
+        handleRemove(file, fileList) {
+            console.log(file, fileList);
+        },
+        handlePictureCardPreview(file) {
+            this.dialogImageUrl = file.url;
+            this.dialogVisible = true;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.app-container {
+    padding: 14px 0 0;
+    background-color: #F2F3F5 !important;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+
+    .descriptions {
+        padding: 20px 20px 10px;
+    }
+
+    .descriptions {
+        ::v-deep .el-descriptions-item__label.has-colon::after {
+            display: none;
+        }
+    }
+
+    .interval {
+        width: 23%;
+        background-color: #fff;
+        border-radius: 8px 0 0 8px;
+        border-right: 1px solid #e5e5e5;
+    }
+
+    .header {
+        background-color: #fff;
+        width: 73%;
+        border-radius: 0 8px 8px 0;
+        position: relative;
+    }
+
+    .btns {
+        position: absolute;
+        top: 30px;
+        right: 30px;
+    }
+
+    .addbtn {
+        margin-right: 100px;
+        float: right;
+        transform: translateY(-200%);
+    }
+}
+</style>
+    

src/views/manage/newSigning/index.vue

@@ -1,41 +1,133 @@
 <template>
     <div class="app-container">
         <div class="header">
+            <div class="btns">
+                <el-button>取消</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="患者姓名">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="患者姓名">{{ $route.query.patientName }}</el-descriptions-item>
-                <el-descriptions-item label="性别">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="性别">{{ $route.query.sex }}</el-descriptions-item>
-                <el-descriptions-item label="年龄">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="年龄">{{ $route.query.age }}</el-descriptions-item>
-                <el-descriptions-item label="电话">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="电话">{{ $route.query.patientPhone }}</el-descriptions-item>
-                <el-descriptions-item label="就诊方式">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="就诊方式">{{
-                <el-descriptions-item label="诊断">kooriookami</el-descriptions-item>
+                    $route.query.visitMethod == 'OUTPATIENT_SERVICE' ? '门诊' : $route.query.visitMethod == 'BE_IN_HOSPITAL' ?
-                <el-descriptions-item label="住院/门诊号">kooriookami</el-descriptions-item>
+                    '住院' : ''
-                <el-descriptions-item label="医院">kooriookami</el-descriptions-item>
+                }}
-                <el-descriptions-item label="科室">kooriookami</el-descriptions-item>
+                </el-descriptions-item>
-                <el-descriptions-item label="服务包缴费状态">18100000000</el-descriptions-item>
+                <el-descriptions-item label="诊断">{{ $route.query.mainDiagnosis }}</el-descriptions-item>
-                <el-descriptions-item label="出院/门诊时间">苏州市</el-descriptions-item>
+                <el-descriptions-item label="住院/门诊号">{{ $route.query.admissionNumber }}{{ $route.query.outpatientNumber
-                <el-descriptions-item label="注册时间"></el-descriptions-item>
+                }}</el-descriptions-item>
+                <el-descriptions-item label="医院">{{ $route.query.hospitalAgencyName }}</el-descriptions-item>
+                <el-descriptions-item label="科室">{{ $route.query.departmentName }}</el-descriptions-item>
+                <el-descriptions-item label="服务包缴费状态">{{ $route.query.paymentStatus == 'PAID' ? '已缴费' : '' }}
+                    {{ $route.query.paymentStatus == '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>
-            <el-descriptions title="服务包信息" style="padding:0 30px">
+            <el-descriptions title="服务包信息" style="padding:20px 30px 10px" class="descriptions">
-                <el-descriptions-item label="选择服务包"></el-descriptions-item>
             </el-descriptions>
+            <el-form :model="form" :rules="rules" ref="form" 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-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">
+                            <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>
+                    <el-form-item>
+                        <el-button size="mini" @click="delhardware(index)">删除</el-button>
+                    </el-form-item>
+                </div>
+                <el-button class="addbtn" type="primary" size="mini" @click="addhardware">新增硬件</el-button>
+            </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">
+                <i class="el-icon-plus"></i>
+            </el-upload>
         </div>
     </div>
 </template>
     
 <script>
-
+import {
+    addsign
+} from '@/api/manage/newSigning.js'
 export default {
+    dicts: ['hardware_type'],
     name: "newSigning",
     data() {
         return {
+            dialogImageUrl: '',
+            dialogVisible: false,
+            form: {
+                packageName: undefined,
+                hardwarelist: [
+                    {
+                        snCode: '',
+                        hardwareType: '',
+                    }
+                ],
+            },
+            rules: {
+                packageName: [
+                    { required: true, message: '请选择服务包', trigger: 'change' }
+                ],
+                hardwarelist: {
+                    snCode: [
+                        { required: true, message: '请输入SN码', trigger: 'change' }
+                    ],
+                    hardwareType: [
+                        { required: true, message: '请选择硬件类型', trigger: 'change' }
+                    ],
+                },
+            }
         };
     },
     created() {
     },
     methods: {
+        //签约
+        signupload() {
+            addsign(this.form).then(res => {
 
+            })
+        },
+        //新增硬件
+        addhardware() {
+            this.form.hardwarelist.push({
+                snCode: '',
+                hardwareType: '',
+            })
+        },
+        delhardware(index) {
+            this.form.hardwarelist.splice(index, 1);
+        },
+        handleRemove(file, fileList) {
+            console.log(file, fileList);
+        },
+        handlePictureCardPreview(file) {
+            this.dialogImageUrl = file.url;
+            this.dialogVisible = true;
+        }
     }
 };
 </script>
@@ -61,6 +153,18 @@ export default {
         margin: 0 auto;
         border-radius: 8px;
     }
+
+    .btns {
+        position: absolute;
+        top: 30px;
+        right: 30px;
+    }
+
+    .addbtn {
+        margin-right: 100px;
+        float: right;
+        transform: translateY(-200%);
+    }
 }
 </style>
     

src/views/manage/patientInfo/index.vue

@@ -70,7 +70,7 @@
       </el-form-item> -->
       <!-- ，微信小程序：WE_CHAT_APPLET，微信公众号：WE_CHAT_OFFICIAL_ACCOUNT，管理端：MANAGE_END -->
       <el-form-item label="患者来源" prop="patientSource">
-        <el-select v-model="queryParams.patientSource" placeholder="请选择就诊方式" clearable style="width:200px">
+        <el-select v-model="queryParams.patientSource" placeholder="请选择患者来源" clearable style="width:200px">
           <el-option v-for="dict in dict.type.patient_source" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>

src/views/manage/preHospitalized/index.vue

@@ -89,7 +89,7 @@
       </el-form-item> -->
       <!-- ，微信小程序：WE_CHAT_APPLET，微信公众号：WE_CHAT_OFFICIAL_ACCOUNT，管理端：MANAGE_END -->
       <!-- <el-form-item label="患者来源" prop="patientSource">
-        <el-select v-model="queryParams.patientSource" placeholder="请选择就诊方式" clearable style="width:200px">
+        <el-select v-model="queryParams.patientSource" placeholder="请选择患者来源" clearable style="width:200px">
           <el-option v-for="dict in dict.type.patient_source" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item> -->

src/views/manage/signRecord/index.vue

@@ -4,7 +4,7 @@
       <el-tab-pane label="意向签约" name="INTENTIONAL_SIGNING"></el-tab-pane>
       <el-tab-pane label="服务中" name="SERVICE_CENTER"></el-tab-pane>
       <el-tab-pane label="服务结束" name="SERVICE_END"></el-tab-pane>
-      <el-tab-pane label="待续签" name="WAIT_CONTINUOUS_SIGN"></el-tab-pane>
+      <!-- <el-tab-pane label="待续签" name="WAIT_CONTINUOUS_SIGN"></el-tab-pane> -->
     </el-tabs>
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="70px">
       <el-form-item label="加入意向时间" prop="intentionalTimeStart" label-width="110px"
@@ -23,11 +23,11 @@
           style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="提交时间" prop="submissionTimeStart" v-if="queryParams.serviceStatus == 'WAIT_CONTINUOUS_SIGN'">
+      <!-- <el-form-item label="提交时间" prop="submissionTimeStart" v-if="queryParams.serviceStatus == 'WAIT_CONTINUOUS_SIGN'">
         <el-date-picker v-model="submissionTime" type="daterange" range-separator="至" start-placeholder="开始日期"
           style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
         </el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="医院" prop="hospitalAgencyId">
         <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
           @clear="clearhospitalAgency" @change="changehospitalAgency">
@@ -164,12 +164,10 @@
         <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="handleDelete(scope.row)"
+          <el-button size="mini" type="text" @click="handleAuthRole(scope.row)"
-            v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'">忽略</el-button>
-          <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
             v-if="queryParams.serviceStatus == 'SERVICE_CENTER' || queryParams.serviceStatus == 'SERVICE_END'">详情</el-button>
           <el-button size="mini" type="text" @click="handleDelete(scope.row)"
-            v-if="queryParams.serviceStatus == 'SERVICE_CENTER'">取消签约</el-button>
+            v-if="queryParams.serviceStatus == 'SERVICE_CENTER'">解约</el-button>
           <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
             v-if="queryParams.serviceStatus == 'SERVICE_CENTER' || queryParams.serviceStatus == 'SERVICE_END'">续约</el-button>
         </template>
@@ -182,7 +180,7 @@
 
 <script>
 import { getAge } from "@/utils/age";
-import { listSignRecord, getSignRecord, delSignRecord, addSignRecord, updateSignRecord } from "@/api/manage/signRecord";
+import { listSignRecord, getSignRecord, delSignRecord, addSignRecord, updateSignRecord, updateSignStatus } from "@/api/manage/signRecord";
 import { selectAgencyList, getDepartmentList, subordinateAgencyList } from "@/api/manage/selectAgencyList";
 
 export default {
@@ -365,14 +363,14 @@ export default {
         this.form = response.data;
       });
     },
-    /** 删除按钮操作 */
+    /** 解约按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除签约记录编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认解约？').then(function () {
         return delSignRecord(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.$modal.msgSuccess("解约成功");
       }).catch(() => { });
     },
     /** 导出按钮操作 */
@@ -416,6 +414,8 @@ export default {
           mainDiagnosis: row.mainDiagnosis,
           visitSerialNumber: row.visitSerialNumber,
           hospitalAgencyName: row.hospitalAgencyName,
+          outpatientNumber: row.outpatientNumber,//门诊号
+          admissionNumber: row.admissionNumber,//住院号
           departmentName: row.departmentName,
           paymentStatus: row.paymentStatus,
           sex: row.sex,
@@ -492,6 +492,25 @@ export default {
     cleardepartment() {
       this.queryParams.wardId = null
     },
+    /** 详情操作 */
+    handleAuthRole(row) {
+      this.$router.push({
+        path: "/patient/patientdetails",
+        query: {
+          patientId: row.id,
+          cardNo: row.cardNo,
+          patientName: row.patientName,
+          patientPhone: row.patientPhone,
+          sex: row.sex,
+          birthDate: row.birthDate,
+          familyMemberPhone: row.familyMemberPhone,
+          address: row.address,
+          patientSource: row.patientSource,
+          createTime: row.createTime,
+          age: row.birthDate ? getAge(row.birthDate) : ''
+        },
+      });
+    },
   }
 };
 </script>