1. 新增

src/views/tourism/membershipManagement/equityCard/detailsBox/equityCardManagementUseList.vue

@@ -8,6 +8,21 @@
     @close="cancel"
   >
     <div class="form-dialog-box">
+      <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+        <el-form-item label="卡号" prop="cardNo">
+          <el-input
+            v-model="queryParams.cardNo"
+            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> -->
       <div style="height: calc( 100% - 80px );">
         <el-table 
         v-loading="loading" 
@@ -66,6 +81,7 @@ export default {
       },
       tableList: [],
       total: 0,
+      cardNo: null,
     };
   },
   methods: {
@@ -79,15 +95,25 @@ export default {
       this.formStatus = 0
       this.queryParams.pageNum = 1
       this.total = 0
+      this.cardNo = row.id
       await this.getTableDeatilsFun(row)
     },
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getTableDeatilsFun()
+    },
+    resetQuery() {
+      this.queryParams.cardNo = null
+      this.queryParams.pageNum = 1
+      this.queryParams.pageSize = 10
+      this.getTableDeatilsFun()
+    },
     /** 获取详情 */
     async getTableDeatilsFun(row) {
-      const id = row.id
       this.loading = true
       try {
         let res = await getTableDeatilsByIdApi(this.configUrl.details,{
-          merchantId: id,
+          cardNo: this.cardNo,
           ...this.queryParams
         })
         if(res.code == 200) {

src/views/tourism/membershipManagement/equityCard/equityCardManage.vue

@@ -108,7 +108,7 @@
               <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" >
                   <el-button size="mini" type="text" icon="el-icon-d-arrow-right" v-if="checkPermi([...configPermi.Password,...configPermi.AuthRole,...configPermi.sellingCards])">更多</el-button>
                   <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item command="handleAuthRole" :disabled="scope.row.actStatus != 1" icon="el-icon-circle-check"
+                      <el-dropdown-item command="handleAuthRole" :disabled="scope.row.actStatus == 1" icon="el-icon-circle-check"
                       v-hasPermi="configPermi.AuthRole">审核</el-dropdown-item>
                       <!-- <el-dropdown-item command="handleEdit" icon="el-icon-circle-check"
                       v-hasPermi="configPermi.edit">编辑</el-dropdown-item> -->

src/views/tourism/membershipManagement/equityCard/formBox/equityCardAllocationForm.vue

@@ -358,6 +358,8 @@ export default {
               this.$message.error(`请选择不可用周期!!!`);
               return
             }
+          }else {
+            params.unUsedWeek = null
           }
           if(params.validityDayS == -1) {
             params.validityDay = -1

src/views/tourism/orderManagement/roomList/detailsBox/roomListDetails.vue

@@ -0,0 +1,461 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="70%"
+    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)"
+        >
+        <el-form :model="form" ref="form" :rules="rules" label-width="130px">
+          <div class="form-title"><span>订单信息</span></div>
+          <div style="display: flex;">
+            <el-form-item label="订单编号：">
+              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.id }}</span>
+            </el-form-item>
+            <el-form-item label="酒店名称：">
+              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.shopName }}</span>
+            </el-form-item>
+            <el-form-item label="房型名称：">
+              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.goodsName }}</span>
+            </el-form-item>
+          </div>
+          <div style="display: flex;">
+            <el-form-item label="预订数量：">
+              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.quantity }}间</span>
+            </el-form-item>
+            <el-form-item label="房型单价(元)：">
+              <span style="display: inline-block;width: 250px;">{{ form.salePrice }}</span>
+            </el-form-item>
+            <el-form-item label="订单金额(元)：">
+              <span style="display: inline-block;width: 250px;">{{ form.orderPrice }}</span>
+            </el-form-item>
+          </div>
+          <div style="display: flex;">
+            <el-form-item label="实付金额(元)：">
+              <span style="display: inline-block;width: 250px;">{{ form.realPrice }}</span>
+            </el-form-item>
+            <el-form-item label="支付状态：">
+              <span style="display: inline-block;width: 250px;">
+                <dict-tag :options="dict.type.tourism_ticketOrders_payStatus" :value="form.payStatus"/>
+              </span>
+            </el-form-item>
+            <el-form-item label="支付方式：">
+              <span style="display: inline-block;width: 250px;">
+                <dict-tag :options="dict.type.tourism_ticketOrders_payWay" :value="form.payWay"/>
+              </span>
+            </el-form-item>
+          </div>
+          <div style="display: flex;">
+            <el-form-item label="支付时间：">
+              <span style="display: inline-block;width: 250px;">{{ form.payTime }}</span>
+            </el-form-item>
+            <el-form-item label="订单状态：">
+              <span style="display: inline-block;width: 250px;">
+                <dict-tag :options="dict.type.tourism_ticketOrders_status" :value="form.orderStatus"/>
+              </span>
+            </el-form-item>
+            <el-form-item label="下单日期：">
+              <span style="display: inline-block;width: 250px;">{{ form.createTime }}</span>
+            </el-form-item>
+          </div>
+          <div style="display: flex;">
+            
+          </div>
+          <div style="display: flex;">
+            <el-form-item label="预定入住日期：">
+              <span style="display: inline-block;width: 250px;">{{ form.checkinStart }}</span>
+            </el-form-item>
+            <el-form-item label="预定离店日期：">
+              <span style="display: inline-block;width: 250px;">{{ form.checkinEnd }}</span>
+            </el-form-item>
+            <el-form-item label="预计到店时间：">
+              <span style="display: inline-block;width: 250px;">{{ form.reachTime }}</span>
+            </el-form-item>
+          </div>
+          <div style="display: flex;">
+            <el-form-item label="订单来源：">
+              <span style="display: inline-block;width: 250px;">
+                <dict-tag :options="dict.type.tourism_ticketOrders_source" :value="form.source"/>
+              </span>
+            </el-form-item>
+            <el-form-item label="联系人：">
+              <span style="display: inline-block;width: 250px;">{{ form.contactName }}</span>
+            </el-form-item>
+            <el-form-item label="联系电话：">
+              <span style="display: inline-block;width: 250px;">{{ form.contactMobile }}</span>
+            </el-form-item>
+          </div>
+          <div style="display: flex;">
+            <el-form-item v-if="form.orderStatus == 12" label="接单时间：">
+              <span style="display: inline-block;width: 250px;">{{ form.acceptTime }}</span>
+            </el-form-item>
+            <el-form-item v-if="form.orderStatus == 13" label="拒单时间：">
+              <span style="display: inline-block;width: 250px;">{{ form.acceptTime }}</span>
+            </el-form-item>
+            <el-form-item v-if="form.orderStatus == 13" label="拒单说明：">
+              <span style="display: inline-block;width: 250px;">{{ form.remark }}</span>
+            </el-form-item>
+          </div>
+        </el-form>
+      </div>
+    </div>
+    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
+      <el-button @click="cancel">关闭</el-button>
+    </span>
+    <!-- 添加或修改对话框 End -->
+  </el-dialog>
+</template>
+
+<script>
+import { 
+  getTableDeatilsByIdApi,
+  updateTableApi,
+  addTableApi
+ } from '@/api/CURD'
+export default {
+  name: "addAndEdit",
+  dicts: ['tourism_ticketOrders_source','tourism_ticketOrders_status','tourism_ticketOrders_payStatus','tourism_ticketOrders_payWay'],
+  data() {
+    return {
+      title: "",
+      activeName: 'first',
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      loadingText: "拼命加载数据中...",
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configUrl: {
+        add: '', // 新增地址
+        details: '/order/orderInfo/hotelOrderDetail', // 详情地址
+        edit: '', // 编辑地址
+      },
+      form: {
+        id: undefined,
+        goodsImage: []
+      },
+      rules: {},
+
+      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
+      this.tableList = []
+      if(model=='ADD') { // 新增
+        this.$set(this,'form',{
+          ...row,
+          goodsImage: [],
+          status: 1,
+        })
+        this.formStatus = 1
+      }else if(model=='EDIT') { // 新增
+        let obj = {
+          ...row,
+          goodsImage: [],
+          status: 1,
+        }
+        this.$set(this,'form',obj)
+        this.formStatus = 1
+      }else if(model=='EDITInit' || model=='DEATILSInit') { // 新增
+        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,{id})
+        if(res.code == 200) {
+          let obj = {
+            ...res.data,
+          }
+          if(obj.goodsList) {
+            this.tableList = obj.goodsList
+          }
+          if(obj.orderReceive) {
+            obj = {
+              ...res.data.orderDelivery,
+              ...res.data.orderReceive,
+              ...obj,
+            }
+          }
+          this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
+          this.radioInputs(this.form.daySaleRadio)
+          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}
+     */
+    reset() {
+      if(this.$refs["form"]) {
+        this.$refs["form"].clearValidate();
+      }
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+
+    /**  上传图片 单张  */
+    handleAvatarSuccess(response, file, fileList) {
+      console.log("res, file",response, file, fileList)
+      this.actionUrlLoading = false
+      if(response.code == 200) {
+        this.form.goodsImage.push(response.data.url)
+      }
+    },
+    beforeAvatarUpload(file) {
+      const isLt2M = file.size / 1024 / 1024 <= 5;
+      let testmsg = file.name.substring(file.name.lastIndexOf('.')+1)
+      let typeList = ['png','jepg','jpg']
+      const isJPG = typeList.includes(testmsg);
+      if (!isJPG) {
+        this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片图片大小不能超过 5MB!');
+      }
+      return isJPG && isLt2M;
+    },
+    handleAvatarProgress(){
+      this.actionUrlLoading = true
+    },
+    handleAvatarError() {
+      this.actionUrlLoading = false
+    },
+    handleRemove(index) {
+      this.form.goodsImage.splice(index,1)
+    },
+
+    /** */
+    radioInputs(value) {
+      if( value == -1 ){
+        this.rules.daySale[0].required = false
+        this.rules.buyAstrict[0].required = false
+        this.$refs.form.clearValidate('daySale');
+        this.$refs.form.clearValidate('buyAstrict');
+      }else if( value == -2 ) {
+        this.rules.daySale[0].required = true
+        this.rules.buyAstrict[0].required = false
+        this.$refs.form.clearValidate('buyAstrict');
+      }else if( value == -3 ) {
+        this.rules.daySale[0].required = false
+        this.rules.buyAstrict[0].required = true
+        this.$refs.form.clearValidate('daySale');
+      }
+    },
+    /** 选择商品分类 获取分类的名称  */
+    valueChange(list,value) {
+      let str = ''
+      function treeForEach(list) {
+        list.forEach((item,index)=>{
+          if(item.children && item.children.length>0) {
+            treeForEach(item.children,value)
+          }
+          if(item.id == value) {
+            str = item.label
+          }
+        })
+      }
+      treeForEach(list,value)
+      return str
+    }
+  },
+  watch: {
+    'form.goodsSnapshot'() {
+      if(this.form.goodsSnapshot == '<p><br></p>') {
+        this.form.goodsSnapshot = null
+      }
+      if(this.$refs["form"]) {
+        this.$refs["form"].validateField('goodsSnapshot');
+      }
+    }
+  }
+};
+</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>

src/views/tourism/orderManagement/roomList/formBox/cancelOrder.vue

@@ -0,0 +1,303 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="40%"
+    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)"
+        >
+        <el-form :model="form" ref="form" :rules="rules" label-width="130px">
+          <el-form-item 
+          label="取消原因：" 
+          prop="closeReason">
+            <el-input 
+            style="width: 350px;"
+             v-model="form.closeReason" 
+             placeholder="请输入回复内容" 
+             maxlength="150" 
+             show-word-limit 
+             type="textarea"
+            :rows="6"
+             />
+          </el-form-item>
+        </el-form>
+      </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 { 
+  addTableApi
+ } from '@/api/CURD'
+export default {
+  name: "repastOrderAccept",
+  data() {
+    return {
+      title: "",
+      activeName: 'first',
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      loadingText: "拼命加载数据中...",
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configUrl: {
+        add: '/order/ordernfo/cancel', // 新增地址
+        details: '', // 详情地址
+        edit: '/order/ordernfo/cancel', // 编辑地址
+      },
+      form: {
+        id: undefined,
+      },
+      rules: {
+        closeReason: [{ required: false, message: "请输入取消原因", trigger: ["change","blur"] }],
+      },
+      scenicAreaProducts: [],// 景点产品关联
+
+      //  上传文件
+      actionUrl: process.env.VUE_APP_BASE_API + process.env.VUE_APP_UPLOAD_IMAGE,
+      actionUrlLoading: false,
+    };
+  },
+  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 = {
+          orderId: row.id,
+          closeReason: ''
+        }
+        this.$set(this,'form',obj)
+        this.formStatus = 1
+      }
+      this.loading = false
+      this.$nextTick(()=>{
+        if(this.$refs["form"]) {
+          this.$refs["form"].clearValidate();
+        }
+      })
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.loadingText = "提交数据中..."
+          this.loading = true
+          let params = JSON.parse(JSON.stringify(this.form))
+          addTableApi(this.configUrl.edit,{
+            ...params,
+          }).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: 30vh;
+  max-height: 65vh;
+  overflow-y: auto;
+  >div {
+    width: 100%;
+    min-height: 30vh;
+  }
+  .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>

src/views/tourism/orderManagement/roomList/formBox/repastOrderAccept.vue

@@ -0,0 +1,309 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="40%"
+    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)"
+        >
+        <el-form :model="form" ref="form" :rules="rules" label-width="130px">
+          <el-form-item 
+          :label="`${form.status == 12 ? '接单' : '拒单'}回复：`" 
+          prop="remark">
+            <el-input 
+            style="width: 350px;"
+             v-model="form.remark" 
+             placeholder="请输入回复内容" 
+             maxlength="150" 
+             show-word-limit 
+             type="textarea"
+            :rows="6"
+             />
+          </el-form-item>
+        </el-form>
+      </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 { 
+  addTableApi
+ } from '@/api/CURD'
+export default {
+  name: "repastOrderAccept",
+  data() {
+    return {
+      title: "",
+      activeName: 'first',
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      loadingText: "拼命加载数据中...",
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configUrl: {
+        add: '/order/orderInfo/repastOrderAccept', // 新增地址
+        details: '', // 详情地址
+        edit: '/order/orderInfo/repastOrderAccept', // 编辑地址
+      },
+      form: {
+        id: undefined,
+      },
+      rules: {
+        remark: [{ required: true, message: "请输入回复内容", trigger: ["change","blur"] }],
+      },
+      scenicAreaProducts: [],// 景点产品关联
+
+      //  上传文件
+      actionUrl: process.env.VUE_APP_BASE_API + process.env.VUE_APP_UPLOAD_IMAGE,
+      actionUrlLoading: false,
+    };
+  },
+  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') { // 新增
+        if(row.repastOrderAcceptType == 12) {
+          this.rules.remark[0].required = false
+        }else {
+          this.rules.remark[0].required = true
+        }
+        let obj = {
+          id: row.id,
+          status: row.repastOrderAcceptType,
+          remark: ''
+        }
+        this.$set(this,'form',obj)
+        this.formStatus = 1
+      }
+      this.loading = false
+      this.$nextTick(()=>{
+        if(this.$refs["form"]) {
+          this.$refs["form"].clearValidate();
+        }
+      })
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.loadingText = "提交数据中..."
+          this.loading = true
+          let params = JSON.parse(JSON.stringify(this.form))
+          addTableApi(this.configUrl.edit,{
+            ...params,
+          }).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: 30vh;
+  max-height: 65vh;
+  overflow-y: auto;
+  >div {
+    width: 100%;
+    min-height: 30vh;
+  }
+  .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>

src/views/tourism/orderManagement/roomList/roomList.vue

@@ -0,0 +1,410 @@
+<template>
+    <div class="app-container">
+      <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="80px">
+                <el-form-item label="房单号:" prop="id">
+                    <el-input
+                        v-model="queryParams.id"
+                        placeholder="请输入房单号"
+                        clearable
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
+                <el-form-item label="酒店名称:" prop="shopName">
+                    <el-select v-model="queryParams.shopName" clearable placeholder="请输入选择酒店">
+                      <el-option
+                      v-for="item in hotelsList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name">
+                      </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="房型:" prop="goodsName">
+                    <el-input
+                        v-model="queryParams.goodsName"
+                        placeholder="请输入房型"
+                        clearable
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
+                <el-form-item label="联系人:" prop="contactName">
+                    <el-input
+                        v-model="queryParams.contactName"
+                        placeholder="请输入联系人"
+                        clearable
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
+                <el-form-item label="联系电话:" prop="contactMobile" label-width="110px">
+                    <el-input
+                        v-model="queryParams.contactMobile"
+                        placeholder="请输入联系电话"
+                        clearable
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
+                <el-form-item label="抵店时间" prop="createTime">
+                  <el-date-picker
+                    v-model="queryParams.createTime"
+                    type="datetimerange"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    end-placeholder="结束日期">
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item label="订单状态" prop="status">
+                  <el-select v-model="queryParams.status" clearable placeholder="请选择订单状态">
+                      <el-option
+                          v-for="dict in dict.type.tourism_ticketOrders_status"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value">
+                      </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="客类" prop="payStatus">
+                  <el-select v-model="queryParams.payStatus" clearable placeholder="请选择客类">
+                      <el-option
+                          v-for="dict in dict.type.tourism_ticketOrders_payStatus"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value">
+                      </el-option>
+                    </el-select>
+                </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
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                  v-hasPermi="configPermi.export"
+                >导出</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="id" prop="id" v-if="columns[0].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="酒店名称" align="center" key="shopName" prop="shopName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="房号" align="center" key="goodsName" prop="goodsName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="房型" align="center" key="goodsName1" prop="goodsName1" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="入住价格" align="center" key="quantity" prop="quantity" v-if="columns[4].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="入住天数" align="center" key="realPrice" prop="realPrice" v-if="columns[5].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="入住类型" align="center" key="payStatus" prop="payStatus" v-if="columns[6].visible" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.tourism_ticketOrders_payStatus" :value="scope.row.payStatus"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="预授权" align="center" key="contactName" prop="contactName" v-if="columns[7].visible"></el-table-column>
+            <el-table-column label="总付押金" align="center" key="contactName1" prop="contactName1" v-if="columns[8].visible"></el-table-column>
+            <el-table-column label="总消费" align="center" key="contactName12" prop="contactName12" v-if="columns[9].visible"></el-table-column>
+            <el-table-column label="客人姓名" align="center" key="contactName13" prop="contactName13" v-if="columns[10].visible"></el-table-column>
+            <el-table-column label="联系电话" align="center" key="contactMobile" prop="contactMobile" v-if="columns[11].visible"></el-table-column>
+            <el-table-column label="下单时间" align="center" key="createTime" prop="createTime" v-if="columns[12].visible"></el-table-column>
+            <el-table-column label="客类" align="center" key="source" prop="source" v-if="columns[13].visible">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.tourism_ticketOrders_source" :value="scope.row.source"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态" align="center" key="orderStatus" prop="orderStatus" v-if="columns[14].visible">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.tourism_ticketOrders_status" :value="scope.row.orderStatus"/>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="操作"
+              align="center"
+              class-name="small-padding fixed-width"
+              width="180px"
+            >
+              <template slot-scope="scope" >
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-document"
+                  @click="handleDetails(scope.row)"
+                  v-hasPermi="configPermi.details"
+                >详情</el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-position"
+                  @click="repastOrderAcceptFun(scope.row,12)"
+                  v-if="scope.row.orderStatus == 3"
+                  v-hasPermi="configPermi.repastOrderAccept"
+                >接单</el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-position"
+                  @click="repastOrderAcceptFun(scope.row,13)"
+                  v-hasPermi="configPermi.repastOrderAccept"
+                  v-if="scope.row.orderStatus == 3"
+                >拒单</el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="cancelOrderFun(scope.row)"
+                  v-hasPermi="configPermi.cancelOrder"
+                >取消</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </el-col>
+      </el-row>
+      <!--  详情   -->
+      <detailsBox ref="detailsBox" @refresh="getList"></detailsBox>
+      <!-- 发货  -->
+      <repastOrderAccept ref="repastOrderAccept" @refresh="getList"></repastOrderAccept>
+      <!--  取消订单 -->
+      <cancelOrder ref="cancelOrder" @refresh="getList"></cancelOrder>
+    </div>
+  </template>
+
+  <script>
+  import {
+    listTableApi,
+    delTableParamsApi,
+  } from "@/api/CURD";
+  import detailsBox from "./detailsBox/roomListDetails.vue"
+  import repastOrderAccept from "./formBox/repastOrderAccept.vue";
+  import cancelOrder from "./formBox/cancelOrder.vue";
+  export default {
+    name: "User",
+    dicts: ['tourism_ticketOrders_source','tourism_ticketOrders_status','tourism_ticketOrders_payStatus','tourism_ticketOrders_payWay'],
+    components: {detailsBox,repastOrderAccept,cancelOrder},
+    data() {
+      return {
+        title: "酒店订单",// 通用标题
+        configPermi: {
+          add: [''], // 新增权限
+          details: ['orderManagement:roomList:details'], // 详情权限
+          delect: [''], // 删除权限
+          upload: [''],// 导入权限
+          export: ['orderManagement:roomList:export'],// 导出权限
+          delivery: [''],// 发货
+          repastOrderAccept: ['orderManagement:roomList:repastOrderAccept'],
+          cancelOrder: ['orderManagement:roomList:cancelOrder']
+        },
+        configUrl: {
+          list: '/order/orderInfo/hotelOrderList', // 列表地址
+          delect: '', // 删除地址
+          upload: '',// 导入地址
+          download:'', // 下载模板地址
+          export: '/order/orderInfo/hotelOrderListExport',// 导出地址
+          updateStatusById: '',
+          repastOrderAccept: '/order/orderInfo/repastOrderAccept', //  接单/拒单
+          hotelsList: '/merchant/merchantShop/pageList'
+        },
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 用户表格数据
+        tableList: null,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+        },
+        dateRange: [],
+        // 控制列表是否显示
+        columns: [
+          { key: 0, label: `房单号`, visible: true },
+          { key: 1, label: `酒店名称`, visible: true },
+          { key: 2.1, label: `房号`, visible: true },
+          { key: 2.2, label: `房型`, visible: true },
+          { key: 3.5, label: `入住价格(元)`, visible: true },
+          { key: 3, label: `入住天数`, visible: true },
+          { key: 4, label: `入住类型`, visible: true },
+          { key: 5.5, label: `预授权`, visible: true },
+          { key: 5, label: `总付押金`, visible: true },
+          { key: 6, label: `总消费(元)`, visible: true },
+          { key: 7, label: `客人姓名`, visible: true },
+          { key: 8, label: `联系电话`, visible: true },
+          { key: 9, label: `下单时间`, visible: true },
+          { key: 10, label: `客类`, visible: true },
+          { key: 11, label: `状态`, visible: true },
+        ],
+        hotelsList: []
+      };
+    },
+    created() {
+      this.getList1()
+      this.getList();
+    },
+    methods: {
+       /** 查询酒店列表 */
+       getList1() {
+        listTableApi(
+          this.configUrl.hotelsList,
+          {
+            shopType: 5,
+            pageNum: 1,
+            pageSize: 9999
+          }).then(response => {
+            this.hotelsList = response.data.rows;
+          }
+        ).catch (error=>{
+          this.hotelsList = []
+        })
+      },
+      /** 查询用户列表 */
+      getList() {
+        this.loading = true;
+        let params = this.paramsFormat({...this.queryParams})
+        listTableApi(
+          this.configUrl.list,{...params}).then(response => {
+              this.tableList = response.data.rows;
+              this.total = response.data.total;
+              this.loading = false;
+          }
+        ).catch (error=>{
+          console.error('获取列表失败!!!!',error)
+          this.tableList = [];
+          this.total = 0;
+          this.loading = false
+        })
+      },
+      /**  请求参数格式化  */
+      paramsFormat(data,isPage) {
+        let params = JSON.parse(JSON.stringify({
+          ...data,
+          createBeginTime: data.createTime&&data.createTime[0]?data.createTime[0]:null,
+          createEndTime: data.createTime&&data.createTime[1]?data.createTime[1]:null,
+
+          payBeginTime: data.payTime&&data.payTime[0]?data.payTime[0]:null,
+          payEndTime: data.payTime&&data.payTime[1]?data.payTime[1]:null,
+          
+        }))
+        delete params.createTime;
+        delete params.payTime;
+        if(isPage) {
+          delete params.pageSize;
+          delete params.pageNum;
+        }
+        return params
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.dateRange = [];
+        this.queryParams = {
+          pageNum: 1,
+          pageSize: 10,
+        }
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id);
+        this.single = selection.length != 1;
+        this.multiple = !selection.length;
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        if(this.$refs.addAndEdit) {
+          this.$refs.addAndEdit.initData(this.title + '新增', "ADD",{})
+        }
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        if(this.$refs.addAndEdit) {
+          this.$refs.addAndEdit.initData(this.title + '编辑', "EDITInit",{...row})
+        }
+      },
+      /**  发货   */
+      repastOrderAcceptFun(row,type) {
+        if(this.$refs.repastOrderAccept) {
+          this.$refs.repastOrderAccept.initData(`${ type == 12 ? '接单' : '拒单' }操作`, "EDIT",{
+            ...row,
+            repastOrderAcceptType: type
+          })
+        }
+      },
+      handleDetails(row){
+        if(this.$refs.detailsBox) {
+          this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", {...row})
+        }
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const goodsId = row.goodsId || this.ids;
+        this.$modal.confirm('是否确认删除数据项？').then( () => {
+          return delTableParamsApi(this.configUrl.delect,{
+            goodsId: goodsId
+          });
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch((e) => {
+          console.error("删除失败====",e)
+        });
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        let params = this.paramsFormat({...this.queryParams},true)
+        this.downloadGet(this.configUrl.export, {
+          ...params
+        }, `${this.title }_${new Date().getTime()}.xlsx`)
+      },
+      /** 导入按钮操作 */
+      handleImport() {
+        if(this.$refs.upload) {
+          this.$refs.upload.initData({
+            width: '400px',
+            // 弹出层标题（用户导入）
+            title: this.title + "导入",
+            // 下载模板地址
+            importTemplate: this.configUrl.download,
+            // 上传的地址
+            url: this.configUrl.upload
+          })
+        }
+      },
+      /**  取消订单  */
+      cancelOrderFun(row){
+        this.$refs.cancelOrder.initData(`取消订单操作`, "EDIT",{...row})
+      }
+    }
+  };
+  </script>

src/views/tourism/productManagement/formBox/houseTypeListForm.vue

@@ -90,7 +90,12 @@
               type="daterange"
               range-separator="至"
               start-placeholder="开始日期"
-              end-placeholder="结束日期">
+              end-placeholder="结束日期"
+              :picker-options="pickerOptions"
+              clearable
+              @blur="pickerBlur"
+              :unlink-panels="true"
+              >
             </el-date-picker>
             <span>游客可查看和预定销售日期范围内的房型，支持设置最长时间为一年</span>
           </el-form-item>
@@ -360,7 +365,13 @@ export default {
       actionUrlLoading: false,
       labelName: '',
       activeName: 'first',
-      roomTypeDeviceList: []
+      roomTypeDeviceList: [],
+
+      pickDate: '', // 存放getPickDate获取的数据
+      pickerOptions: {
+        onPick: this.getPickDate,
+        disabledDate: this.disabledDate,
+      }
     };
   },
   methods: {
@@ -375,6 +386,7 @@ export default {
       this.activeName = 'first'
       this.labelName = ''
       let list = []
+      this.pickDate = ''
       this.dict.type.room_type_device.forEach((item,index)=>{
         list.push({
           label: item.label,
@@ -677,7 +689,25 @@ export default {
       })
       this.roomTypeDeviceList = list1
       
-    }
+    },
+
+
+    getPickDate(pick) {
+      this.pickDate = pick
+    },
+    disabledDate(date) {
+      const { minDate, maxDate } = this.pickDate
+      if (minDate && !maxDate) {
+        const diff = Math.abs(minDate.valueOf() - date.valueOf())
+        // 日期选择范围不能大于一年
+        if (diff > 1000 * 3600 * 24 * 365) {
+          return true
+        }
+      }
+    },
+    pickerBlur(val) {
+      this.pickDate = '' // 清空getPickDate获取的数据
+    },
   },
   watch: {
     'form.reservationNotice'() {

src/views/tourism/scenicAreaManagement/contentManagement/attractionInfo.vue

@@ -5,6 +5,7 @@
         <el-tab-pane label="基本信息" name="first"></el-tab-pane>
         <el-tab-pane label="景区介绍" name="second"></el-tab-pane>
         <el-tab-pane label="景区文化" name="third"></el-tab-pane>
+        <el-tab-pane label="板块页面" name="sector"></el-tab-pane>
       </el-tabs>
       <!--基本信息-->
       <div style="width: 100%;" v-if="activeName == 'first'">
@@ -19,6 +20,10 @@
       <div style="width: 100%;" v-if="activeName == 'third'">
         <attractionInfoCulture ref="attractionInfoCulture" />
       </div>
+      <!--板块页面-->
+      <div style="width: 100%;" v-if="activeName == 'sector'">
+        <sector ref="sector" />
+      </div>
     </el-row>
   </div>
 </template>
@@ -27,10 +32,11 @@
 import attractionInfoBeas from './tabelBox/attractionInfoBeas.vue';
 import attractionInfoIntroduce from "./tabelBox/attractionInfoIntroduce.vue"
 import attractionInfoCulture from "./tabelBox/attractionInfoCulture.vue"
+import sector from "./tabelBox/sector.vue"
 export default {
   name: "AttractionInfo",
   dicts: [],
-  components: {attractionInfoBeas,attractionInfoIntroduce,attractionInfoCulture},
+  components: {attractionInfoBeas,attractionInfoIntroduce,attractionInfoCulture,sector},
   data() {
     return {
       title: "景区信息",// 通用标题
@@ -55,6 +61,10 @@ export default {
         this.$nextTick(()=>{
           this.$refs.attractionInfoCulture.initData()
         })
+      }else if(this.activeName == 'sector') {
+        this.$nextTick(()=>{
+          this.$refs.sector.initData()
+        })
       }
     }
   }

src/views/tourism/scenicAreaManagement/contentManagement/formBox/attractionInfoIntroduceForm.vue

@@ -115,6 +115,7 @@
             <el-radio-group v-model="form.contentType" @input="setContentType">
               <el-radio 
                 v-for="dict in dict.type.tourism_attractionInfoIntroduce_type"
+                :key="dict.value"
                 :label="Number(dict.value)"
                 >{{ dict.label }}</el-radio>
             </el-radio-group>
@@ -154,6 +155,12 @@ export default {
   name: "addAndEdit",
   dicts: ['tourism_attractionInfoIntroduce_type'],
   components: {Editor},
+  props: {
+    type: {
+      type: [Number,String],
+      default: 1
+    }
+  },
   data() {
     return {
       title: "",
@@ -257,7 +264,7 @@ export default {
           if (this.model != 'ADD') {
             addTableApi(
               this.configUrl.edit,{
-                type: 1,
+                type: this.type,
                 ...this.form,
                 imgUrl: this.form.imgUrl ? this.form.imgUrl.join(','):'',
                 photos: this.form.photos ? this.form.photos.join(','):''
@@ -272,7 +279,7 @@ export default {
             })
           } else {
             addTableApi(this.configUrl.edit,{
-                type: 1,
+                type: this.type,
                 ...this.form,
                 imgUrl: this.form.imgUrl ? this.form.imgUrl.join(','):'',
                 photos: this.form.photos ? this.form.photos.join(','):''

src/views/tourism/scenicAreaManagement/contentManagement/tabelBox/sector.vue

@@ -0,0 +1,319 @@
+<template>
+    <div class="app-container">
+      <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="titleName">
+                    <el-input
+                    v-model="queryParams.titleName"
+                    placeholder="请输入标题名称"
+                    clearable
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
+                <el-form-item label="创建时间" prop="time">
+                    <el-date-picker
+                    v-model="queryParams.time"
+                    type="datetimerange"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    end-placeholder="结束日期">
+                    </el-date-picker>
+                </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
+                type="primary"
+                plain
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd"
+                v-if="checkPermi(configPermi.add) && (!tableList || tableList.length==0)"
+              >新增</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-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="titleName" prop="titleName" v-if="columns[0].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="摘要" align="center" key="contentMain" prop="contentMain" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="创建人" align="center" key="createBy" prop="createBy" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="创建时间" align="center" key="createTime" prop="createTime" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="状态" align="center" key="status" v-if="columns[4].visible" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.tourism_attractionInfoIntroduce_status" :value="scope.row.status"/>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="操作"
+              align="center"
+              width="160"
+              class-name="small-padding fixed-width"
+            >
+              <template slot-scope="scope" >
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-document"
+                  @click="handleRelease(scope.row)"
+                  v-hasPermi="configPermi.release"
+                >{{ scope.row.status == 1 ? '启用' : '禁用' }}</el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="handleUpdate(scope.row)"
+                  v-hasPermi="configPermi.edit"
+                >修改</el-button>
+                <el-button
+                  v-if="scope.row.status == 1"
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.row)"
+                  v-hasPermi="configPermi.delect"
+                >删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+  
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </el-col>
+      </el-row>
+  
+      <!--  导入  -->
+      <!-- <uploadBox ref="upload" @refresh="handleQuery" /> -->
+      <!--  新增或修改  -->
+      <addAndEdit :type="3" ref="addAndEdit" @refresh="getList" />
+    </div>
+  </template>
+  
+  <script>
+  import { 
+    listTableApi, 
+    delTableParamsApi, 
+    publicByPutApi as releaseApi
+    } from "@/api/CURD";
+  import addAndEdit from "../formBox/attractionInfoIntroduceForm.vue"
+  import { checkPermi } from "@/utils/permission"
+  export default {
+    name: "User",
+    dicts: ['tourism_attractionInfoIntroduce_status'],
+    components: {addAndEdit},
+    data() {
+      return {
+        title: "板块页面",// 通用标题
+        configPermi: {
+          add: ['contentManagement:sector:add'], // 新增权限
+          details: [''], // 详情权限
+          delect: ['contentManagement:sector:delect'], // 删除权限
+          edit: ['contentManagement:sector:edit'], // 编辑权限
+          upload: [''],// 导入权限
+          export: [''],// 导出权限
+          release: ['contentManagement:sector:release']
+        },
+        configUrl: {
+          list: '/merchant/merchantDetail/pageList', // 列表地址
+          delect: '/merchant/merchantDetail/deleteById', // 删除地址
+          upload: '',// 导入地址
+          download:'', // 下载模板地址
+          export: '',// 导出地址
+          release: '/merchant/merchantDetail/updateStatus',// 发布接口
+        },
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 用户表格数据
+        tableList: null,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 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 },
+        ],
+      };
+    },
+    methods: {
+      checkPermi,
+        initData() {
+            this.getList();
+        },
+      /** 查询用户列表 */
+      getList() {
+        this.loading = true;
+        let params = JSON.parse(JSON.stringify({
+            ...this.queryParams,
+            startTime: this.queryParams.time&&this.queryParams.time[0]?this.queryParams.time[0]:null,
+            endTime: this.queryParams.time&&this.queryParams.time[1]?this.queryParams.time[1]:null,
+        }))
+      delete params.time;
+        listTableApi(
+          this.configUrl.list,
+          this.addDateRange(
+            {...params,type: 3}, 
+            this.dateRange)).then(response => {
+              this.tableList = response.data.rows;
+              this.total = response.data.total;
+              this.loading = false;
+          }
+        ).catch (error=>{
+          console.error('获取列表失败!!!!',error)
+          this.tableList = [];
+          this.total = 0;
+          this.loading = false
+        }) 
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.dateRange = [];
+        this.queryParams = {
+          pageNum: 1,
+          pageSize: 10,
+        }
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id);
+        this.single = selection.length != 1;
+        this.multiple = !selection.length;
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        if(this.$refs.addAndEdit) {
+          this.$refs.addAndEdit.initData(this.title + '新增', "ADD",{})
+        }
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        if(this.$refs.addAndEdit) {
+          this.$refs.addAndEdit.initData(this.title + '编辑', "EDITInit",{...row})
+        }
+      },
+      handleDetails(row){
+        if(this.$refs.detailsBox) {
+          this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", row)
+        }
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$modal.confirm('是否确认删除数据项？').then( () => {
+          return delTableParamsApi(this.configUrl.delect,{
+            id: ids,
+            type: 1
+          });
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch((e) => {
+          console.error("删除失败====",e)
+        });
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download(this.configUrl.export, {
+          ...this.queryParams
+        }, `${this.title }_${new Date().getTime()}.xlsx`)
+      },
+      /** 导入按钮操作 */
+      handleImport() {
+        if(this.$refs.upload) {
+          this.$refs.upload.initData({
+            width: '400px',
+            // 弹出层标题（用户导入）
+            title: this.title + "导入",
+            // 下载模板地址
+            importTemplate: this.configUrl.download,
+            // 上传的地址
+            url: this.configUrl.upload
+          })
+        }
+      },
+      /** 发布  */
+      handleRelease(row) {
+        const ids = row.id;
+        this.$modal.confirm(`是否确认${row.status == 1 ? '启用' : '禁用'}数据项？`).then( () => {
+          return releaseApi(this.configUrl.release,{
+            id: ids,
+            status: row.status == 1 ? 2 : 1
+          });
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess(`${row.status == 1 ? '启用' : '禁用'}成功`);
+        }).catch((e) => {
+          console.error("发布失败====",e)
+        });
+      }
+    }
+  };
+  </script>
+