Browse Source

1. 优化

MONSTER-ygh 1 year ago
parent
commit
1a6b77ef17

+ 45 - 29
src/views/tourism/productManagement/formBox/scenicAreaTicketsForm.vue

@@ -20,10 +20,10 @@
         >
         <el-form :model="form" ref="form" :rules="rules" label-width="130px">
           <div class="form-title"><span>基本信息</span></div>
-          <el-form-item label="标题名称:" prop="title">
-            <el-input style="width: 350px;" v-model="form.title" placeholder="请输入标题名称" maxlength="50" show-word-limit />
+          <el-form-item label="门票名称:" prop="name">
+            <el-input style="width: 350px;" v-model="form.name" placeholder="请输入门票名称" maxlength="50" show-word-limit />
           </el-form-item>
-          <el-form-item label="封面上传:" prop="imgUrl">
+          <el-form-item label="详情图片:" prop="posterUrl">
 
             <div
             style="width: 120px;"
@@ -46,26 +46,40 @@
                 :disabled="actionUrlLoading"
                 :on-error="handleAvatarError"
                 >
-                <img v-if="form.imgUrl" style="width: 100px;height: 100px;" :src="form.imgUrl" class="avatar">
+                <img v-if="form.posterUrl" style="width: 100px;height: 100px;" :src="form.posterUrl" class="avatar">
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </div>
             <span>建议上传xxx*xxx,支持jpg/png/gif,支持1MB大小以内的图片上传</span>
           </el-form-item>
-          <div class="form-title"><span>基本信息</span></div>
-          <el-form-item label-width="70px" label="内容:" prop="detail">
-          </el-form-item>
-          <div>
-            <quill-editor
-                v-model="form.detail"
-                ref="myQuillEditor"
-                :options="editorOption"
-                @blur="onEditorBlur($event)"
-                @focus="onEditorFocus($event)"
-                @change="onEditorChange($event)"
-                @ready="onEditorReady($event)">
-            </quill-editor>
-          </div>
+          <el-tabs v-model="activeName">
+            <el-tab-pane label="产品介绍" name="first">
+              <el-form-item label-width="0" label="0" prop="performSnapshot">
+                <quill-editor
+                  v-model="form.performSnapshot"
+                  ref="myQuillEditor"
+                  :options="editorOption"
+                  @blur="onEditorBlur($event)"
+                  @focus="onEditorFocus($event)"
+                  @change="($event)=>onEditorChange($event,'performSnapshot')"
+                  @ready="onEditorReady($event)">
+                </quill-editor>
+              </el-form-item>
+            </el-tab-pane>
+            <el-tab-pane label="购票须知" name="second">
+              <el-form-item label-width="0" label="0" prop="performNotice">
+                <quill-editor
+                  v-model="form.performNotice"
+                  ref="myQuillEditor"
+                  :options="editorOption"
+                  @blur="onEditorBlur($event)"
+                  @focus="onEditorFocus($event)"
+                  @change="($event)=>onEditorChange($event,'performNotice')"
+                  @ready="onEditorReady($event)">
+              </quill-editor>
+              </el-form-item>
+            </el-tab-pane>
+          </el-tabs>
         </el-form>
       </div>
     </div>
@@ -105,23 +119,25 @@ export default {
   data() {
     return {
       title: "",
+      activeName: 'first',
       model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式(需要请求详情)
       open: false,
       loading: false,
       loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
-        add: '/merchant/merchantIntroduction/insertOrUpdate', // 新增地址
-        details: '/merchant/merchantIntroduction/selectById', // 详情地址
-        edit: '/merchant/merchantIntroduction/insertOrUpdate', // 编辑地址
+        add: '/merchant/merchantPerformAuditorium/saveMerchantPerform', // 新增地址
+        details: '', // 详情地址
+        edit: '/merchant/merchantPerformAuditorium/saveMerchantPerform', // 编辑地址
       },
       form: {
         id: undefined,
       },
       rules: {
-        title: [{ required: true, message: "请输入标题名称", trigger: ["change","blur"] }],
-        detail: [{ required: true, message: "请输入内容", trigger: ["change","blur"] }],
-        imgUrl: [{ required: true, message: "请上传图片", trigger: ["change","blur"] }],
+        name: [{ required: true, message: "请输入门票名称", trigger: ["change","blur"] }],
+        posterUrl: [{ required: true, message: "请上传图片", trigger: ["change","blur"] }],
+        performSnapshot: [{ required: true, message: "请输产品介绍", trigger: ["change","blur"] }],
+        performNotice: [{ required: true, message: "请输购票须知", trigger: ["change","blur"] }],
       },
       scenicAreaProducts: [],// 景点产品关联
       // 富文本编辑器配置
@@ -277,9 +293,9 @@ export default {
       console.log('editor ready!', quill)
     },
     // 内容改变事件
-    onEditorChange({ quill, html, text }) {
+    onEditorChange({ quill, html, text },key) {
       console.log('editor change!', quill, html, text)
-      this.form.detail = html
+      this.form['key'] = html
     },
 
 
@@ -288,9 +304,9 @@ export default {
       console.log("res, file",res, file)
       this.actionUrlLoading = false
       if(res.code != 200) {
-        this.$set(this.form,'imgUrl',null) 
+        this.$set(this.form,'posterUrl',null) 
       }else {
-        this.$set(this.form,'imgUrl',res.data.url) 
+        this.$set(this.form,'posterUrl',res.data.url) 
       }
       
     },
@@ -312,7 +328,7 @@ export default {
     },
     handleAvatarError() {
       this.actionUrlLoading = false
-    }
+    },
   },
 };
 </script>

+ 453 - 0
src/views/tourism/productManagement/formBox/scenicAreaTicketsSpecsForm.vue

@@ -0,0 +1,453 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="90%"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="form-dialog-box"
+    v-loading="loading"
+    :element-loading-text="loadingText"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0)">
+      <div
+        v-loading="loading"
+        :element-loading-text="''"
+        element-loading-spinner="''"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+        >
+        <div style="display: flex;">
+          <!-- 票种规格  -->
+          <div style="width: 400px;">
+            <el-table :data="tableList">
+              <el-table-column type="index" label="序号" align="center"  />
+              <el-table-column label="门票名称" align="center" key="name" prop="name" />
+              <el-table-column label="门票名称" align="center" key="name1" prop="name1" />
+              <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+              >
+                <template slot-scope="scope">
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <!-- 规格信息  -->
+          <div style="width: calc( 100% - 400px );padding-left: 40px;box-sizing: border-box;">
+            <el-form :model="form" ref="form" :rules="rules" label-width="130px">
+              <div class="form-title"><span>规格信息</span></div>
+              <el-form-item label="票种规格名称:" prop="name">
+                <el-input style="width: 100%;" v-model="form.name" placeholder="请输入票种规格名称" maxlength="50" show-word-limit />
+              </el-form-item>
+              <el-form-item label="规格描述:" prop="name">
+                <el-input style="width: 100%;" v-model="form.name" placeholder="请输入规格描述" maxlength="50" show-word-limit />
+              </el-form-item>
+              <el-form-item label="日期类型" prop="type">
+                <el-radio-group v-model="form.type">
+                  <el-radio 
+                    v-for="dict in dict.type.tourism_online_type"
+                    :label="Number(dict.value)"
+                    >{{ dict.label }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="消费日期" prop="type">
+                <el-radio-group v-model="form.type">
+                  <el-radio 
+                    v-for="dict in dict.type.tourism_online_type"
+                    :label="Number(dict.value)"
+                    >{{ dict.label }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="销售价格">
+                <div style="display: flex;">
+                  <el-form-item label="小程序价格:" prop="name">
+                    <el-input style="width: 100%;" v-model="form.name" placeholder="请输入小程序价格" maxlength="50" show-word-limit />
+                  </el-form-item>
+                  <el-form-item label="规划价格:" prop="name">
+                    <el-input style="width: 100%;" v-model="form.name" placeholder="请输入规划价格" maxlength="50" show-word-limit />
+                  </el-form-item>
+                </div>
+              </el-form-item>
+              <el-form-item label="实名购票" prop="type">
+                <el-radio-group v-model="form.type">
+                  <el-radio 
+                    v-for="dict in dict.type.tourism_online_type"
+                    :label="Number(dict.value)"
+                    >{{ dict.label }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="实名要求" prop="type">
+                <el-radio-group v-model="form.type">
+                  <el-radio 
+                    v-for="dict in dict.type.tourism_online_type"
+                    :label="Number(dict.value)"
+                    >{{ dict.label }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <div class="form-title"><span>退票规则</span></div>
+              <el-form-item label="退票政策" prop="type">
+                <el-radio-group v-model="form.type">
+                  <el-radio 
+                    v-for="dict in dict.type.tourism_online_type"
+                    :label="Number(dict.value)"
+                    >{{ dict.label }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="提前退票" prop="type">
+                <el-radio-group v-model="form.type">
+                  <el-radio 
+                    v-for="dict in dict.type.tourism_online_type"
+                    :label="Number(dict.value)"
+                    >{{ dict.label }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="过期未核销" prop="type">
+                <el-radio-group v-model="form.type">
+                  <el-radio 
+                    v-for="dict in dict.type.tourism_online_type"
+                    :label="Number(dict.value)"
+                    >{{ dict.label }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <div class="form-title"><span>特殊票种</span></div>
+              <el-form-item label="指定年龄" prop="type">
+                <el-radio-group v-model="form.type">
+                  <el-radio 
+                    v-for="dict in dict.type.tourism_online_type"
+                    :label="Number(dict.value)"
+                    >{{ dict.label }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="指定性别" prop="type">
+                <el-radio-group v-model="form.type">
+                  <el-radio 
+                    v-for="dict in dict.type.tourism_online_type"
+                    :label="Number(dict.value)"
+                    >{{ dict.label }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="指定地点" prop="type">
+                <el-radio-group v-model="form.type">
+                  <el-radio 
+                    v-for="dict in dict.type.tourism_online_type"
+                    :label="Number(dict.value)"
+                    >{{ dict.label }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-form>
+          </div>
+        </div>
+      </div>
+    </div>
+    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
+      <el-button @click="cancel">取消</el-button>
+      <el-button
+        type="primary"
+        @click="submitForm"
+        :loading="loading"
+        element-loading-text="提交中..."
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+      > 
+        {{ loading ? '提交中...' : '保存' }}
+      </el-button>
+    </span>
+    <!-- 添加或修改对话框 End -->
+  </el-dialog>
+</template>
+
+<script>
+import { 
+  getTableDeatilsByIdApi,
+  updateTableApi,
+  addTableApi
+ } from '@/api/CURD'
+
+export default {
+  name: "addAndEdit",
+  dicts: ['tourism_online_status','tourism_online_type','tourism_online_type'],
+  data() {
+    return {
+      title: "",
+      activeName: 'first',
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式(需要请求详情)
+      open: false,
+      loading: false,
+      loadingText: "拼命加载数据中...",
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configUrl: {
+        add: '/merchant/merchantPerformAuditorium/saveMerchantPerform', // 新增地址
+        details: '/merchant/merchantPerformAuditorium/merchantGoodsDetail', // 规格详情
+        list: '/merchant/merchantPerformAuditorium/merchantGoodsList',// 规格列表
+        edit: '/merchant/merchantPerformAuditorium/saveMerchantPerform', // 编辑地址
+      },
+      form: {
+        id: undefined,
+      },
+      rules: {
+        name: [{ required: true, message: "请输入门票名称", trigger: ["change","blur"] }],
+        posterUrl: [{ required: true, message: "请上传图片", trigger: ["change","blur"] }],
+        performSnapshot: [{ required: true, message: "请输产品介绍", trigger: ["change","blur"] }],
+        performNotice: [{ required: true, message: "请输购票须知", trigger: ["change","blur"] }],
+      },
+      tableList: [],// 景点产品关联
+    };
+  },
+  methods: {
+    async initData(title , model,row){
+      this.title = title
+      this.open = true
+      this.loadingText = "拼命加载数据中..."
+      this.loading = true
+      this.actionUrlLoading = false
+      this.model = model
+      this.formStatus = 0
+      if(model=='ADD') { // 新增
+        this.$set(this,'form',row)
+        this.formStatus = 1
+      }else if(model=='EDIT') { // 新增
+        let obj = {
+          ...row
+        }
+        this.$set(this,'form',obj)
+        this.formStatus = 1
+      }else if(model=='EDITInit') { // 新增
+        await this.getTableDeatilsFun(row)
+      }
+      this.loading = false
+      this.$nextTick(()=>{
+        if(this.$refs["form"]) {
+          this.$refs["form"].clearValidate();
+        }
+      })
+    },
+    /** 获取详情 */
+    async getTableDeatilsFun(row) {
+      const id = row.id
+      this.loading = true
+      try {
+        let res = await getTableDeatilsByIdApi(this.configUrl.details,{goodsId: id})
+        if(res.code == 200) {
+          let obj = {
+            ...res.data
+          }
+          this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
+          this.formStatus = 1
+        }else {
+          this.$message.error('获取详情失败!!!');
+          this.formStatus = 2
+          this.loading = false
+          this.open = false;
+        }
+        this.loading = false
+      } catch (error) {
+        console.error('获取详情失败!!!!',error)
+        this.formStatus = 2
+        this.loading = false
+        this.open = false;
+      }
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.loadingText = "提交数据中..."
+          this.loading = true
+          if (this.model != 'ADD') {
+            addTableApi(
+              this.configUrl.edit,{
+                ...this.form
+              }).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.loading = false
+              this.open = false;
+              this.$emit('refresh')
+            }).catch(()=>{
+              this.$message.error("修改失败!!!");
+              this.loading = false
+            })
+          } else {
+            addTableApi(this.configUrl.edit,{
+                ...this.form
+              }).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.loading = false
+              this.open = false;
+              this.$emit('refresh')
+            }).catch(()=>{
+              this.$message.error("新增失败!!!");
+              this.loading = false
+            })
+          }
+        }
+      });
+    },
+    /**
+     * 重置
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    reset() {
+      if(this.$refs["form"]) {
+        this.$refs["form"].clearValidate();
+      }
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.form-dialog-box {
+  padding: 0 30px;
+  padding: 0 30px;
+  min-height: 50vh;
+  max-height: 65vh;
+  overflow-y: auto;
+  >div {
+    width: 100%;
+    min-height: 50vh;
+  }
+  .form-title {
+    padding: 0 0 10px 0;
+    span {
+      display: flex;
+      color: rgba(65,80,88,1);
+      font-size: 16px;
+      font-family: SourceHanSansSC;
+      font-weight: 700;
+      line-height: 23px;
+      border-left: 4px solid rgb(22, 132, 252);
+      padding-left: 10px;
+    }
+    
+  }
+  ::v-deep .ql-editor {
+    height: 400px;
+  }
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+.el-table{
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+
+.area-container {
+  min-height: 400px;
+}
+
+::v-deep .area-wrap-city.el-cascader {
+  line-height: normal;
+  .el-input {
+    cursor: pointer;
+    width: 100% !important;
+    height: 28px !important;
+    .el-input__inner {
+      display: none !important;
+    }
+    span.el-input__suffix {
+      position: inherit !important;
+      i.el-input__icon {
+        line-height: inherit;
+        margin-left: 5px;
+      }
+    }
+
+    .el-input__wrapper {
+      box-shadow: none;
+      input {
+        display: none;
+      }
+    }
+  }
+
+  .el-cascader__tags {
+    display: none;
+  }
+}
+
+.area-city-popper {
+  .el-cascader-panel {
+    .el-scrollbar.el-cascader-menu {
+      .el-cascader-menu__wrap.el-scrollbar__wrap {
+        height: 315px;
+      }
+    }
+  }
+}
+
+::v-deep .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  ::v-deep .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  ::v-deep .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 100px;
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+  }
+  ::v-deep .avatar {
+    width: 100px;
+    height: 100px;
+    display: block;
+  }
+</style>
+<style>
+.custom-class-box {
+  z-index: 999999 !important;
+}
+</style>

+ 51 - 73
src/views/tourism/productManagement/scenicAreaTickets.vue

@@ -3,22 +3,6 @@
       <el-row :gutter="20">
         <!--用户数据-->
         <el-col :span="24" :xs="24">
-          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="标题名称" prop="title">
-              <el-input
-                v-model="queryParams.title"
-                placeholder="请输入标题名称"
-                clearable
-                style="width: 240px"
-                @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
@@ -28,66 +12,48 @@
                 size="mini"
                 @click="handleAdd"
                 v-hasPermi="configPermi.add"
-              >新增</el-button>
-            </el-col>
-            <el-col :span="1.5" v-if="false">
-              <el-button
-                type="danger"
-                plain
-                icon="el-icon-delete"
-                size="mini"
-                :disabled="multiple"
-                @click="handleDelete"
-                v-hasPermi="configPermi.delect"
-              >删除</el-button>
-            </el-col>
-            <el-col :span="1.5" v-if="false">
-              <el-button
-                type="info"
-                plain
-                icon="el-icon-upload2"
-                size="mini"
-                @click="handleImport"
-                v-hasPermi="configPermi.upload"
-              >导入</el-button>
-            </el-col>
-            <el-col :span="1.5" v-if="false">
-              <el-button
-                type="warning"
-                plain
-                icon="el-icon-download"
-                size="mini"
-                @click="handleExport"
-                v-hasPermi="configPermi.export"
-              >导出</el-button>
+              >添加门票</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
           </el-row>
   
           <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
             <el-table-column type="index" label="序号" align="center"  />
-            <el-table-column label="票务名称" align="center" key="title" prop="title" v-if="columns[0].visible" />
-            <el-table-column label="销售价" align="center" key="releaseBy" prop="releaseBy" v-if="columns[1].visible" />
-            <el-table-column label="销售渠道" align="center" key="releaseBy" prop="releaseBy" v-if="columns[2].visible" />
-            <el-table-column label="是否限购" align="center" key="releaseBy" prop="releaseBy" v-if="columns[3].visible" />
-            <el-table-column label="可用状态" align="center" key="status" v-if="columns[4].visible">
+            <el-table-column label="门票名称" align="center" key="name" prop="name" v-if="columns[0].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="门票图片" align="center" key="sliderImg" v-if="columns[1].visible">
               <template slot-scope="scope">
-                <switchBox 
-                  :defaultChecked="true" 
-                  v-model="scope.row.status" 
-                  @changeFun="handleRelease(scope.row)" 
-                  :disabled="false"
-                  :active-value="2"
-                  :inactive-value="1"
-                   />
+                <el-image 
+                v-if="scope.row.posterUrl"
+                  style="width: 100px; height: 100px"
+                  :src="scope.row.posterUrl" 
+                  :preview-src-list="[scope.row.posterUrl]">
+                </el-image>
+                <span v-else>暂无图片</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="产品介绍" align="center" key="performSnapshot" prop="performSnapshot" v-if="columns[2].visible">
+              <template slot-scope="scope">
+                <el-tooltip class="item" effect="dark" placement="top">
+                  <div slot="content"><div v-html="scope.row.performSnapshot"></div></div>
+                  <div style="width: 100%;height: 40px;display: flex;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                    <span style="width: 100%;height: 40px;display: flex; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" v-html="scope.row.performSnapshot"></span>
+                  </div>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+            <el-table-column label="购票须知" align="center" key="performNotice" prop="performNotice" v-if="columns[3].visible">
+              <template slot-scope="scope">
+                <el-tooltip class="item" effect="dark" placement="top">
+                  <div slot="content"><div v-html="scope.row.performNotice"></div></div>
+                  <div style="width: 100%;height: 40px;display: flex;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                    <span style="width: 100%;height: 40px;display: flex; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" v-html="scope.row.performNotice"></span>
+                  </div>
+                </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column label="发布时间" align="center" key="releaseTime" prop="releaseTime" v-if="columns[5].visible" :show-overflow-tooltip="true" />
-            
             <el-table-column
               label="操作"
               align="center"
-              width="160"
               class-name="small-padding fixed-width"
             >
               <template slot-scope="scope" v-if="scope.row.id !== 1">
@@ -97,7 +63,14 @@
                   icon="el-icon-edit"
                   @click="handleUpdate(scope.row)"
                   v-hasPermi="configPermi.edit"
-                >修改</el-button>
+                >修改基本信息</el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="handleUpdateSpecs(scope.row)"
+                  v-hasPermi="configPermi.edit"
+                >规格信息</el-button>
                 <el-button
                   size="mini"
                   type="text"
@@ -120,6 +93,7 @@
       </el-row>
       <!--  新增或修改  -->
       <addAndEdit ref="addAndEdit" @refresh="getList" />
+      <addAndEditSpecs ref="addAndEditSpecs" @refresh="getList" />
     </div>
   </template>
   
@@ -130,10 +104,11 @@
     publicByPutApi as releaseApi
     } from "@/api/CURD";
   import addAndEdit from "./formBox/scenicAreaTicketsForm.vue"
+  import addAndEditSpecs from "./formBox/scenicAreaTicketsSpecsForm.vue"
   export default {
     name: "User",
     dicts: [],
-    components: {addAndEdit},
+    components: {addAndEdit,addAndEditSpecs},
     data() {
       return {
         title: "旅游攻略",// 通用标题
@@ -176,12 +151,10 @@
         dateRange: [],
         // 控制列表是否显示
         columns: [
-          { key: 0, label: `票务名称`, visible: true },
-          { key: 2, label: `销售价`, visible: true },
-          { key: 3, label: `销售渠道`, visible: true },
-          { key: 4, label: `是否限购`, visible: true },
-          { key: 5, label: `可用状态`, visible: true },
-          { key: 6, label: `发布时间`, visible: true },
+          { key: 0, label: `门票名称`, visible: true },
+          { key: 2, label: `门票图片`, visible: true },
+          { key: 3, label: `产品简介`, visible: true },
+          { key: 4, label: `购票须知`, visible: true },
         ],
       };
     },
@@ -237,7 +210,12 @@
       /** 修改按钮操作 */
       handleUpdate(row) {
         if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(this.title + '编辑', "EDITInit",{...row})
+          this.$refs.addAndEdit.initData(this.title + '编辑', "EDIT",{...row})
+        }
+      },
+      handleUpdateSpecs(row) {
+        if(this.$refs.addAndEditSpecs) {
+          this.$refs.addAndEditSpecs.initData(this.title + '编辑', "EDITInit",{...row})
         }
       },
       handleDetails(row){

+ 1 - 1
src/views/tourism/scenicAreaManagement/contentManagement/formBox/attractionInfoCultureForm.vue

@@ -218,7 +218,7 @@ export default {
         if(res.code == 200) {
           let obj = {
             ...res.data,
-            imgUrl: row.imgUrl?row.imgUrl.split(','):[]
+            imgUrl: res.data.imgUrl?res.data.imgUrl.split(','):[]
           }
           this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
           this.formStatus = 1

+ 1 - 1
src/views/tourism/scenicAreaManagement/contentManagement/formBox/attractionInfoIntroduceForm.vue

@@ -263,7 +263,7 @@ export default {
           let obj = {
             ...res.data,
             photos: res.data.photos?res.data.photos.split(','):[],
-            imgUrl: row.imgUrl?row.imgUrl.split(','):[]
+            imgUrl: res.data.imgUrl?res.data.imgUrl.split(','):[]
           }
           this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
           this.formStatus = 1

+ 3 - 5
src/views/tourism/scenicAreaManagement/contentManagement/formBox/tourismStrategyForm.vue

@@ -52,10 +52,8 @@
             </div>
             <span>建议上传xxx*xxx,支持jpg/png/gif,支持1MB大小以内的图片上传</span>
           </el-form-item>
-          <div class="form-title"><span>基本信息</span></div>
-          <el-form-item label-width="70px" label="内容:" prop="detail">
-          </el-form-item>
-          <div>
+          <div class="form-title"><span>内容详情</span></div>
+          <el-form-item label-width="0" label="" prop="detail">
             <quill-editor
                 v-model="form.detail"
                 ref="myQuillEditor"
@@ -65,7 +63,7 @@
                 @change="onEditorChange($event)"
                 @ready="onEditorReady($event)">
             </quill-editor>
-          </div>
+          </el-form-item>
         </el-form>
       </div>
     </div>