修改

src/views/manage/components/signingRecords.vue

@@ -24,13 +24,15 @@
                 <el-descriptions title="签约信息" style="margin-top: 40px;">
                     <el-descriptions-item label="服务包">{{ ByRecord.packageName }}</el-descriptions-item>
                     <el-descriptions-item label="服务包缴费状态">{{
-                        ByRecord.packagePaymentStatus == 'PAID' ? '已缴费' : ByRecord.packagePaymentStatus == 'UNPAID_FEES' ?
+                ByRecord.packagePaymentStatus == 'PAID' ? '已缴费' : ByRecord.packagePaymentStatus == 'UNPAID_FEES'
-                        '未缴费' : ''
+                    ?
-                    }}</el-descriptions-item>
+                    '未缴费' : ''
+            }}</el-descriptions-item>
                     <el-descriptions-item label="到期时间">{{ ByRecord.serviceEndTime }}</el-descriptions-item>
                     <el-descriptions-item label="服务包价格">{{ ByRecord.packagePrice }}</el-descriptions-item>
                     <el-descriptions-item label="服务时间">{{ ByRecord.serviceStartTime }}</el-descriptions-item>
-                    <el-descriptions-item label="服务周期">{{ ByRecord.serviceCycle }}月</el-descriptions-item>
+                    <el-descriptions-item label="服务周期">{{ ByRecord.packageTerm }}{{ ByRecord.packageTermUnit }}
+                    </el-descriptions-item>
                     <el-descriptions-item label="签约时间">{{ ByRecord.signTime }}</el-descriptions-item>
                 </el-descriptions>
                 <el-descriptions title="硬件信息" style="margin-top: 20px;" class="descriptions">
@@ -175,5 +177,4 @@ export default {
         }
     }
 }
-</style>
+</style>
-  

src/views/system/editorialSpecialization/index.vue

@@ -8,7 +8,7 @@
                 <!-- <el-button type="primary">发布</el-button> -->
             </el-form-item>
         </el-form>
-        <el-form ref="form" :inline="true" :model="form" label-width="80px" :rules="rules">
+        <el-form ref="form" :inline="true" :model="form" label-width="100px" :rules="rules">
             <el-form-item label="路径名称" prop="routeName">
                 <el-input v-model="form.routeName" style="width:160px"></el-input>
             </el-form-item>
@@ -26,6 +26,14 @@
                 <el-button type="primary" plain size="mini" @click="goManageNodeInformation">人工添加触发条件</el-button>
             </el-form-item>
         </el-form>
+        <el-form label-width="100px" ref="form" :model="form">
+            <el-form-item label="所属服务包" prop="servicePackageId" required="servicePackageId">
+                <el-select v-model="form.servicePackageId" placeholder="请选择所属服务包" style="width:600px" multiple>
+                    <el-option v-for="item in addpackagelist" :key="item.id" :label="item.packageName"
+                        :value="item.id" />
+                </el-select>
+            </el-form-item>
+        </el-form>
         <div class="list" v-if="list">
             <div class="item" @click.stop="edit">
                 <div class="title">
@@ -172,6 +180,9 @@ import {
 import {
     specialDiseaseRoute, triggerConditiondel, specialDiseaseRoutedel, triggerConditionadd, triggerCondition, triggerConditionedit
 } from "@/api/system/editorialSpecialization";
+import {
+    servicepackageinfo
+} from '@/api/manage/signRecord.js'
 export default {
     name: "editorialSpecialization",
     data() {
@@ -181,6 +192,8 @@ export default {
                 routeName: '',
                 id: '',
                 diseaseTypeName: '',
+                servicePackageId: [],
+                routePackageList: [],
             },
             open: false,
             updata: {
@@ -196,6 +209,9 @@ export default {
             updataform: {},
             // 表单校验
             rules: {
+                servicePackageId: [
+                    { required: true, message: '不能为空', trigger: 'change' }
+                ],
                 routeName: [
                     { required: true, message: '不能为空', trigger: 'change' }
                 ],
@@ -203,7 +219,8 @@ export default {
                     { required: true, message: '不能为空', trigger: 'change' }
                 ],
             },
-            list: undefined,
+            list: {},
+            addpackagelist: [],
         };
     },
     created() {
@@ -220,6 +237,13 @@ export default {
             specialDiseaseRoute(this.$route.query.id).then(res => {
                 this.list = res.data
                 this.list.percentage = this.list.agreeNumber / this.list.totalNumber * 100
+                res.data.routePackageList.forEach(e => {
+                    this.form.servicePackageId.push(e.servicePackageId)
+                })
+                //服务包
+                servicepackageinfo({ departmentId: res.data.departmentId }).then(res => {
+                    this.addpackagelist = res.data
+                })
             })
         },
         edit() {
@@ -318,6 +342,21 @@ export default {
         },
         //保存
         preserve() {
+            if (this.form.servicePackageId?.length > 0 && this.addpackagelist?.length > 0) {
+                let routePackageList = []
+                this.addpackagelist.forEach(e => {
+                    this.form.servicePackageId.forEach(el => {
+                        if (e.id == el) {
+                            let item = {
+                                servicePackageId: el,
+                                packageName: e.packageName
+                            }
+                            routePackageList.push(item)
+                        }
+                    })
+                })
+                this.form.routePackageList = routePackageList
+            }
             this.$confirm('是否确认保存?', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',

src/views/system/specialDiseaseRoute/index.vue

@@ -120,7 +120,7 @@
               <el-button size="mini" type="text" v-if="scope.row.releaseStatus == 'PUBLISHED'"
                 @click="norelease(scope.row)">取消发布</el-button>
               <el-button size="mini" type="text" v-else @click="release(scope.row)">发布</el-button>
-              <el-button size="mini" type="text">复制</el-button>
+              <!-- <el-button size="mini" type="text">复制</el-button> -->
               <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:specialDiseaseRoute:edit']">编辑</el-button>
               <el-button size="mini" type="text" @click="handleDelete(scope.row)"
@@ -407,7 +407,7 @@ export default {
             if (e.id == el) {
               let item = {
                 servicePackageId: el,
-                servicePackageName: e.packageName
+                packageName: e.packageName
               }
               routePackageList.push(item)
             }