修改

src/api/manage/signRecord.js

@@ -50,4 +50,13 @@ export function updateSignStatus(data) {
         method: 'post',
         data: data
     })
+}
+
+//服务包list
+export function servicepackageinfo(query) {
+    return request({
+        url: `/manage/servicepackage/getList`,
+        method: 'get',
+        params: query
+    })
 }

src/views/manage/continueSigning/index.vue

@@ -53,8 +53,8 @@
             </el-descriptions>
             <el-form :model="signPackage" :rules="rules" ref="signPackage" label-width="100px" class="demo-ruleForm"
                 :inline="true" style="padding-left:40px">
-                <el-form-item label="选择服务包" prop="packageId">
+                <el-form-item label="选择服务包" prop="packageName">
-                    <el-input v-model="signPackage.packageId"></el-input>
+                    <el-input v-model="signPackage.packageName" disabled></el-input>
                 </el-form-item>
             </el-form>
             <el-form :model="signPackage" :rules="rules" ref="signPackage" label-width="80px" class="demo-ruleForm"
@@ -78,7 +78,7 @@
                     <el-input v-model="signPackage.serviceEndTime" style="width:150px" disabled></el-input>
                 </el-form-item>
                 <el-form-item label="服务包价格(元)" prop="" label-width="120px">
-                    <el-input v-model="signPackage.packagePrice" style="width:100px"
+                    <el-input v-model="signPackage.packagePrice" style="width:150px"
                         oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+3)} if(value.length>7){value=value.slice(0,7)}"
                         min="0" placeholder="小数点后两位(元)"></el-input>
                 </el-form-item>
@@ -166,7 +166,7 @@ export default {
                 informeds: []
             },
             rules: {
-                packageId: [
+                packageName: [
                     { required: true, message: '请选择服务包', trigger: 'change' }
                 ],
                 devices: {
@@ -198,6 +198,7 @@ export default {
             getByRecordId(this.$route.query.patientSignRecordId).then(res => {
                 this.list = res.data
                 this.signPackage.packageName = this.list.packageName
+                this.signPackage.packageId = this.list.servicePackageId
                 this.signPackage.serviceCycle = this.list.serviceCycle
                 this.signPackage.serviceStartTime = this.list.serviceStartTime
                 this.signPackage.serviceEndTime = this.list.serviceEndTime
@@ -215,7 +216,6 @@ export default {
             } else {
                 this.uploadsave();
             }
-            console.log(this.signPackage)
         },
         //文件上传完成
         handleSuccess(response, file, fileList) {

src/views/manage/newSigning/index.vue

@@ -23,9 +23,6 @@
                 <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' ? '已缴费' : '' }}
-                    {{ $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>
@@ -41,8 +38,49 @@
             </el-descriptions>
             <el-form :model="signPackage" :rules="rules" ref="signPackage" label-width="100px" class="demo-ruleForm"
                 :inline="true" style="padding-left:40px">
-                <el-form-item label="选择服务包" prop="packageId">
+                <el-form-item label="选择服务包" prop="servicePackageld">
-                    <el-input v-model="signPackage.packageId"></el-input>
+                    <el-select v-model="signPackage.servicePackageld" filterable placeholder="请选择服务包" clearable
+                        @change="tappackage">
+                        <el-option v-for="item in packagelist" :key="item.id" :label="item.packageName"
+                            :value="item.id">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="服务包缴费状态" prop="packagePaymentStatus" label-width="130px">
+                    <el-select v-model="signPackage.packagePaymentStatus" filterable placeholder="请选择服务包" clearable>
+                        <el-option label="已缴费" value="PAID">
+                        </el-option>
+                        <el-option label="未缴费" value="UNPAID_FEES">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+            <el-form :model="signPackage" :rules="rules" ref="signPackage" label-width="80px" class="demo-ruleForm"
+                :inline="true" style="padding-left:40px">
+                <el-form-item label="签约期限" prop="" label-width="100px">
+                    <div>
+                        <el-input v-model="signPackage.packageTerm" style="width:130px" disabled
+                            placeholder="请输入签约周期"></el-input>
+                        <el-select v-model="signPackage.packageTermUnit" style="width:110px" placeholder="周期单位"
+                            disabled>
+                            <el-option label="年" value="年">年</el-option>
+                            <el-option label="月" value="月">月</el-option>
+                            <el-option label="日" value="日">日</el-option>
+                        </el-select>
+                    </div>
+                </el-form-item>
+                <el-form-item label="服务时长" prop="packageName">
+                    <el-date-picker v-model="signPackage.serviceStartTime" type="date" disabled placeholder="开始日期"
+                        style="width:150px">
+                    </el-date-picker>
+                    至
+                    <el-input v-model="signPackage.serviceEndTime" style="width:150px" disabled
+                        placeholder="结束日期"></el-input>
+                </el-form-item>
+                <el-form-item label="服务包价格(元)" prop="" label-width="120px">
+                    <el-input v-model="signPackage.packagePrice" style="width:150px" disabled
+                        oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+3)} if(value.length>7){value=value.slice(0,7)}"
+                        min="0" placeholder="小数点后两位(元)"></el-input>
                 </el-form-item>
             </el-form>
             <el-descriptions title="专病管理信息" style="padding:20px 30px 10px" class="descriptions">
@@ -89,6 +127,9 @@
 import {
     addsign
 } from '@/api/manage/newSigning.js'
+import {
+    servicepackageinfo
+} from '@/api/manage/signRecord.js'
 import { getToken } from '@/utils/auth'
 export default {
     dicts: ['hardware_type'],
@@ -96,7 +137,8 @@ export default {
     data() {
         return {
             signPackage: {
-                packageName: undefined
+                packageName: undefined,
+                packagePaymentStatus: '',
             },
             form: {
                 record: {
@@ -112,7 +154,10 @@ export default {
                 informeds: []
             },
             rules: {
-                packageId: [
+                packagePaymentStatus: [
+                    { required: true, message: '缴费状态不能为空', trigger: 'change' }
+                ],
+                servicePackageld: [
                     { required: true, message: '请选择服务包', trigger: 'change' }
                 ],
                 devices: {
@@ -132,25 +177,41 @@ export default {
                     Authorization: 'Bearer ' + getToken(),
                 },
                 url: process.env.VUE_APP_BASE_API + '/manage/file/uploadFile'
-            }
+            },
+            packagelist: [],
         };
     },
     created() {
         this.form.record = this.$route.query
+        this.signPackage.packagePaymentStatus = this.form.record.paymentStatus
+        servicepackageinfo({ departmentId: this.$route.query.departmentId }).then(res => {
+            this.packagelist = res.data
+        })
     },
     methods: {
+        tappackage(id) {
+            this.signPackage = { ...this.signPackage, ...this.packagelist.find(e => e.id == id) }
+            let currentDate = new Date();
+            let year = currentDate.getFullYear();
+            let month = currentDate.getMonth() + 1;
+            let day = currentDate.getDate();
+            month >= 1 && month <= 9 ? (month = "0" + month) : "";
+            day >= 0 && day <= 9 ? (day = "0" + day) : "";
+            this.signPackage.serviceStartTime = `${year}-${month}-${day}`
+        },
         //签约
         signupload() {
-            this.$refs.upload.submit();
+            const files = this.$refs.upload.uploadFiles
+            if (files.length > 0) {
+                this.$refs.upload.submit();
+            } else {
+                this.uploadsave();
+            }
         },
-        //文件上传完成
+        uploadsave() {
-        handleSuccess(response, file, fileList) {
+            if (this.signPackage.servicePackageld) {
-            this.form.informeds = []
+                this.signPackage.packageName = this.packagelist.find(e => e.id == this.signPackage.servicePackageld).packageName
-            fileList.forEach(e => {
+            }
-                this.form.informeds.push({
-                    informedFilePath: e.response.imgUrl,
-                })
-            })
             this.form.signPackage = this.signPackage
             addsign(this.form).then(res => {
                 this.$confirm('签约成功, 是否返回上一页?', '提示', {
@@ -164,6 +225,15 @@ export default {
                 });
             })
         },
+        //文件上传完成
+        handleSuccess(response, file, fileList) {
+            this.form.informeds = []
+            fileList.forEach(e => {
+                this.form.informeds.push({
+                    informedFilePath: e.response.imgUrl,
+                })
+            })
+        },
         //新增硬件
         addhardware() {
             this.form.devices.push({

src/views/manage/signRecord/index.vue

@@ -410,26 +410,11 @@ export default {
       this.queryParams.signTimeEnd = null
       this.getList();
     },
-    // 格式化日期格式如：2017-9-19 18:04:33
-    formatDate(value) {
-      if (!value) {
-        return
-      }
-      // 计算日期相关值
-      let time = new Date(value)
-      let Y = time.getFullYear();
-      let M = time.getMonth() + 1;
-      let D = time.getDate();
-      let h = time.getHours();
-      let m = time.getMinutes();
-      let s = time.getSeconds();
-      // 如果传递了type的话
-      return Y + '-' + (M < 10 ? '0' + M : M) + '-' + (D < 10 ? '0' + D : D) + ' ' + (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s);
-    },
     handlenewsign(row) {
       this.$router.push({
         path: "/patient/newSigning",
         query: {
+          departmentId: row.departmentId,
           patientName: row.patientName,
           patientPhone: row.patientPhone,
           visitMethod: row.visitMethod,
@@ -541,6 +526,22 @@ export default {
         },
       });
     },
+    // 格式化日期格式如：2017-9-19 18:04:33
+    formatDate(value) {
+      if (!value) {
+        return
+      }
+      // 计算日期相关值
+      let time = new Date(value)
+      let Y = time.getFullYear();
+      let M = time.getMonth() + 1;
+      let D = time.getDate();
+      let h = time.getHours();
+      let m = time.getMinutes();
+      let s = time.getSeconds();
+      // 如果传递了type的话
+      return Y + '-' + (M < 10 ? '0' + M : M) + '-' + (D < 10 ? '0' + D : D) + ' ' + (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s);
+    },
   }
 };
 </script>