From ef3138ebaf7975072a955ce8b6da05cbf69813ac Mon Sep 17 00:00:00 2001
From: "@jyuhsin" <729757837@qq.com>
Date: Wed, 28 May 2025 15:25:26 +0800
Subject: [PATCH] commit

---
 .../theRapyRecuperation/basicManage/line.html | 102 +-----------------
 .../basicManage/travelAgency.html             |  18 ++--
 2 files changed, 13 insertions(+), 107 deletions(-)

diff --git a/src/main/resources/views/platform/theRapyRecuperation/basicManage/line.html b/src/main/resources/views/platform/theRapyRecuperation/basicManage/line.html
index 8f7ee5d..81d78ff 100644
--- a/src/main/resources/views/platform/theRapyRecuperation/basicManage/line.html
+++ b/src/main/resources/views/platform/theRapyRecuperation/basicManage/line.html
@@ -127,7 +127,6 @@ layout("/layouts/platform.html"){
         <el-card class="mt10" shadow="never">
             <table-tool :app="this" label="线路列表">
                 <template #func>
-<!--                    <el-button @click="openImport" size="medium" type="primary">导入线路</el-button>-->
                     <el-button @click="openAdd" size="medium" type="primary">新建线路</el-button>
                 </template>
             </table-tool>
@@ -167,10 +166,6 @@ layout("/layouts/platform.html"){
                                    type="text">
                             查看详情
                         </el-button>
-                        <!--                        v-if="row.createMode===2 && row.signUpMode===1"-->
-                        <!--<span v-else>
-                            {{row.playStartTime + '至' + row.playEndTime}}
-                        </span>-->
                     </template>
                 </el-table-column>
                 <el-table-column label="操作" width="250px">
@@ -241,7 +236,7 @@ layout("/layouts/platform.html"){
                                 <el-option :key="index"
                                            :label="item"
                                            :value="item"
-                                           v-for="(item,index) in (travelAgencyList.find(v => v.id === formData.travelAgencyId) ?? {}).travelAgencyPlaces"
+                                           v-for="(item,index) in (travelAgencyList?.find(v => v.id === formData.travelAgencyId) ?? {}).travelAgencyPlaces"
                                 ></el-option>
                             </el-select>
                         </el-form-item>
@@ -251,7 +246,7 @@ layout("/layouts/platform.html"){
                         <el-form-item label="旅行社联系人">
                             <el-input
                                     placeholder="请输入旅行社联系人"
-                                    :value="(travelAgencyList.find(v => v.id === formData.travelAgencyId) ?? {}).contact"
+                                    :value="(travelAgencyList?.find(v => v.id === formData.travelAgencyId) ?? {}).contact"
                                     readonly></el-input>
                         </el-form-item>
                     </el-col>
@@ -259,7 +254,7 @@ layout("/layouts/platform.html"){
                         <el-form-item label="旅行社联系方式">
                             <el-input
                                     placeholder="请输入旅行社联系方式"
-                                    :value="(travelAgencyList.find(v => v.id === formData.travelAgencyId) ?? {}).contactMobileNumber"
+                                    :value="(travelAgencyList?.find(v => v.id === formData.travelAgencyId) ?? {}).contactMobileNumber"
                                     readonly></el-input>
                         </el-form-item>
                     </el-col>
@@ -367,82 +362,6 @@ layout("/layouts/platform.html"){
                     </el-col>
                 </el-row>
 
-                <!--                <template v-if="formData.signUpMode===2 || formData.createMode===1">-->
-                <!--                    <el-row :gutter="20">-->
-                <!--                        <el-col :md="12" :sm="24" :xs="24">-->
-                <!--                            <el-form-item label="报名开始时间" prop="signUpStartTime">-->
-                <!--                                <el-date-picker style="width: 100%"-->
-                <!--                                                type="datetime"-->
-                <!--                                                v-model="formData.signUpStartTime"-->
-                <!--                                                format="yyyy-MM-dd HH:mm"-->
-                <!--                                                value-format="yyyy-MM-dd HH:mm:ss">-->
-                <!--                                </el-date-picker>-->
-                <!--                            </el-form-item>-->
-                <!--                        </el-col>-->
-                <!--                        <el-col :md="12" :sm="24" :xs="24">-->
-                <!--                            <el-form-item label="报名截至时间" prop="signUpEndTime">-->
-                <!--                                <el-date-picker style="width: 100%"-->
-                <!--                                                type="datetime"-->
-                <!--                                                v-model="formData.signUpEndTime"-->
-                <!--                                                format="yyyy-MM-dd HH:mm"-->
-                <!--                                                value-format="yyyy-MM-dd HH:mm:ss">-->
-                <!--                                </el-date-picker>-->
-                <!--                            </el-form-item>-->
-                <!--                        </el-col>-->
-                <!--                    </el-row>-->
-
-                <!--                    <el-row :gutter="20">-->
-                <!--                        <el-col :md="12" :sm="24" :xs="24">-->
-                <!--                            <el-form-item label="变更截至时间" prop="changeEndTime">-->
-                <!--                                <el-date-picker style="width: 100%"-->
-                <!--                                                type="datetime"-->
-                <!--                                                v-model="formData.changeEndTime"-->
-                <!--                                                value-format="yyyy-MM-dd HH:mm:ss">-->
-                <!--                                </el-date-picker>-->
-                <!--                            </el-form-item>-->
-                <!--                        </el-col>-->
-                <!--                        <el-col :md="12" :sm="24" :xs="24">-->
-                <!--                            <el-form-item>-->
-                <!--                                <template #label>-->
-                <!--                                    <span class="text-primary">-->
-                <!--                                        <i class="el-icon-warning"></i>-->
-                <!--                                        温馨提醒:-->
-                <!--                                    </span>-->
-                <!--                                </template>-->
-                <!--                                <span class="text-primary">-->
-                <!--                                    变更时间应该大于报名截至时间，小于出行时间。-->
-                <!--                                </span>-->
-
-                <!--                            </el-form-item>-->
-                <!--                        </el-col>-->
-                <!--                    </el-row>-->
-
-                <!--                    <el-row :gutter="20">-->
-                <!--                        <el-col :md="12" :sm="24" :xs="24">-->
-                <!--                            <el-form-item label="出行开始时间" prop="playStartTime">-->
-                <!--                                <el-date-picker-->
-                <!--                                        placeholder="出行开始时间"-->
-                <!--                                        style="width: 100%"-->
-                <!--                                        type="date"-->
-                <!--                                        v-model="formData.playStartTime"-->
-                <!--                                        value-format="yyyy-MM-dd">-->
-                <!--                                </el-date-picker>-->
-                <!--                            </el-form-item>-->
-                <!--                        </el-col>-->
-                <!--                        <el-col :md="12" :sm="24" :xs="24">-->
-                <!--                            <el-form-item label="出行结束时间" prop="playEndTime">-->
-                <!--                                <el-date-picker-->
-                <!--                                        placeholder="出行结束时间"-->
-                <!--                                        style="width: 100%"-->
-                <!--                                        type="date"-->
-                <!--                                        v-model="formData.playEndTime"-->
-                <!--                                        value-format="yyyy-MM-dd">-->
-                <!--                                </el-date-picker>-->
-                <!--                            </el-form-item>-->
-                <!--                        </el-col>-->
-                <!--                    </el-row>-->
-                <!--                </template>-->
-
                 <el-row :gutter="20">
                     <el-col :md="24" :sm="24" :xs="24">
                         <el-form-item label="线路内容" prop="content">
@@ -556,7 +475,6 @@ layout("/layouts/platform.html"){
 </div>
 
 <script>
-    let lineContentEditor = null
 
     const vue = new Vue({
         el: '#app',
@@ -740,7 +658,6 @@ layout("/layouts/platform.html"){
                         this.$refs['form'].resetFields()
                     }
                     this.formData.id = null
-                    this.initLineContentEditor()
                 })
                 const createMode = await this.getCreateMode()
                 this.formData.createMode = createMode
@@ -760,7 +677,6 @@ layout("/layouts/platform.html"){
                     const data = resp.data
                     data.year = data.year.toString()
                     this.formData = {...data}
-                    this.initLineContentEditor(data.content)
                 } else {
                     this.notifyWarning(resp.msg)
                 }
@@ -814,18 +730,6 @@ layout("/layouts/platform.html"){
                 this.$refs.guava.view()
                 this.$refs.viewLineInfo.openView(id)
             },
-            initLineContentEditor(content) {
-                $("#lineContent").html("")
-                lineContentEditor = new wangEditor("#lineContent")
-                lineContentEditor.config.onchange = (html) => {
-                    this.formData.content = html
-                }
-                lineContentEditor.config.uploadImgShowBase64 = true
-                lineContentEditor.create()
-                if (content) {
-                    lineContentEditor.txt.html(content)
-                }
-            },
             async selectTravelAgencyList() {
                 const resp = await $.post('/platform/theRapyRecuperation/travelAgency/selectTravelAgency', {year: this.formData.year})
                 this.travelAgencyList = resp.data
diff --git a/src/main/resources/views/platform/theRapyRecuperation/basicManage/travelAgency.html b/src/main/resources/views/platform/theRapyRecuperation/basicManage/travelAgency.html
index aff8683..9db0619 100644
--- a/src/main/resources/views/platform/theRapyRecuperation/basicManage/travelAgency.html
+++ b/src/main/resources/views/platform/theRapyRecuperation/basicManage/travelAgency.html
@@ -93,27 +93,28 @@ layout("/layouts/platform.html"){
         </el-card>
 
         <el-dialog :close-on-click-modal="false" :title="editDialogTitle" :visible.sync="editDialogVisible"
-                   width="60%">
+                   width="60%" top="2%">
             <el-form :model="formData" :rules="rules" label-width="120px" ref="form">
                 <el-row :gutter="20">
                     <el-col :md="12" :sm="24" :xs="24">
                         <el-form-item label="年度" prop="year">
                             <el-date-picker style="width: 100%"
                                             type="year"
+                                            placeholder="请选择年度"
                                             v-model="formData.year"
                                             value-format="yyyy"></el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :md="12" :sm="24" :xs="24">
                         <el-form-item label="编号" prop="serialNumber">
-                            <el-input maxlength="50" v-model="formData.serialNumber"></el-input>
+                            <el-input maxlength="50"  placeholder="请输入编号" v-model="formData.serialNumber"></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row :gutter="20">
                     <el-col :md="12" :sm="12" :xs="12">
                         <el-form-item label="旅行社名称" prop="travelAgencyName">
-                            <el-input maxlength="50" v-model="formData.travelAgencyName"></el-input>
+                            <el-input maxlength="50"  placeholder="请输入旅行社名称" v-model="formData.travelAgencyName"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :md="12" :sm="12" :xs="12">
@@ -124,7 +125,7 @@ layout("/layouts/platform.html"){
                                     filterable
                                     allow-create
                                     default-first-option
-                                    placeholder="请创建旅行社地点" style="width: 100%">
+                                    placeholder="请选择旅行社地点" style="width: 100%">
                                 <el-option
                                         v-for="(item,index) in travelAgencyPlaceList"
                                         :key="index"
@@ -138,12 +139,12 @@ layout("/layouts/platform.html"){
                 <el-row :gutter="20">
                     <el-col :md="12" :sm="24" :xs="24">
                         <el-form-item label="旅行社联系人" prop="contact">
-                            <el-input maxlength="10" v-model="formData.contact"></el-input>
+                            <el-input maxlength="10" placeholder="请输入旅行社联系人" v-model="formData.contact"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :md="12" :sm="24" :xs="24">
                         <el-form-item label="联系电话" prop="contactMobileNumber">
-                            <el-input v-model="formData.contactMobileNumber"></el-input>
+                            <el-input placeholder="请输入联系电话" v-model="formData.contactMobileNumber"></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -151,12 +152,12 @@ layout("/layouts/platform.html"){
                 <el-row :gutter="20">
                     <el-col :md="12" :sm="24" :xs="24">
                         <el-form-item label="邮箱" prop="email">
-                            <el-input maxlength="50" v-model="formData.email"></el-input>
+                            <el-input maxlength="50" placeholder="请输入邮箱" v-model="formData.email"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :md="12" :sm="24" :xs="24">
                         <el-form-item label="官网" prop="officialWebsite">
-                            <el-input maxlength="100" v-model="formData.officialWebsite"></el-input>
+                            <el-input maxlength="100" placeholder="请输入官网" v-model="formData.officialWebsite"></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -166,6 +167,7 @@ layout("/layouts/platform.html"){
                         <el-form-item label="备注" prop="note">
                             <el-input maxlength="100"
                                       type="textarea"
+                                      placeholder="请输入备注"
                                       v-model="formData.note"></el-input>
                         </el-form-item>
                     </el-col>