1. 新增

src/views/tourism/financialManagement/cateringRefundManagement.vue

@@ -0,0 +1,340 @@
+<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="100px">
+            <el-form-item label="原订单号">
+                <el-input
+                v-model="queryParams.orderId"
+                placeholder="请输入原订单号"
+                clearable
+                style="width: 240px;"
+                @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="退款单号">
+                <el-input
+                v-model="queryParams.refundNo"
+                placeholder="请输入退款单号"
+                clearable
+                style="width: 240px;"
+                @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="联系电话">
+                <el-input
+                v-model="queryParams.refundMobile"
+                placeholder="请输入联系电话"
+                clearable
+                style="width: 240px;"
+                @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="退款状态">
+                <el-select
+                v-model="queryParams.status"
+                placeholder="退款状态"
+                clearable
+                style="width: 100%"
+                >
+                <el-option
+                    v-for="dict in dict.type.tourism_orderRefund_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="退款申请时间">
+              <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="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="refundNo" prop="refundNo" v-if="columns[0].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="原订单号" align="center" key="orderId" prop="orderId" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="支付单号" align="center" key="transactionId" prop="transactionId" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="下单人手机号" align="center" key="refundMobile" prop="refundMobile" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="商品名称" align="center" key="goodsName" prop="goodsName" v-if="columns[4].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="退款申请时间" align="center" key="createTime" prop="createTime" v-if="columns[5].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="退款金额" align="center" key="refundAmount" prop="refundAmount" v-if="columns[6].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="申请原因" align="center" key="refundReason" prop="refundReason" v-if="columns[7].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="退款状态" align="center" key="status" prop="status" v-if="columns[8].visible" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.tourism_orderRefund_status" :value="scope.row.status"/>
+                </template>
+            </el-table-column>
+            <el-table-column label="审核人" align="center" key="auditName" prop="auditName" v-if="columns[9].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="审核时间" align="center" key="auditTime" prop="auditTime" v-if="columns[10].visible" :show-overflow-tooltip="true" />
+            <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="handleDetails(scope.row)"
+                v-hasPermi="configPermi.details"
+                >详情</el-button>
+                <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-coordinate"
+                v-if="scope.row.status == 0"
+                @click="refundAuditFun(scope.row)"
+                v-hasPermi="configPermi.refundAudit"
+                >审核</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" />
+    </div>
+  </template>
+  
+  <script>
+  import { 
+    listTableApi, 
+    delTableParamsApi, 
+    updateTableApi
+  } from "@/api/CURD";
+  import detailsBox from "./detailsBox/cateringRefundManagementDetails.vue"
+  export default {
+    name: "User",
+    dicts: ['tourism_orderRefund_status'],
+    components: {detailsBox},
+    data() {
+      return {
+        title: "商品退款管理",// 通用标题
+        configPermi: {
+          add: [''], // 新增权限
+          details: ['financialManagement:productRefundManagement:details'], // 详情权限
+          delect: [], // 删除权限
+          edit: [], // 编辑权限
+          upload: [],// 导入权限
+          export: ['financialManagement:productRefundManagement:export'],// 导出权限
+          refundAudit: ['financialManagement:productRefundManagement:refundAudit'], //审核
+        },
+        configUrl: {
+          list: '/merchant/merchantOrder/orderRefundList', // 列表地址
+          delect: '', // 删除地址
+          upload: '',// 导入地址
+          download:'', // 下载模板地址
+          export: '/merchant/merchantOrder/exportFoodExcel',// 导出地址
+          edit: '', // 编辑地址
+        },
+        // 遮罩层
+        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, label: `支付单号`, visible: true },
+          { key: 3, label: `下单人手机号`, visible: true },
+          { key: 4, 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 },
+        ],
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询用户列表 */
+      getList() {
+        this.loading = true;
+        let params = JSON.parse(JSON.stringify({
+            ...this.queryParams,
+            orderType: 4,
+            startCreateTime: this.queryParams.time&&this.queryParams.time[0]?this.queryParams.time[0]:null,
+            endCreateTime: this.queryParams.time&&this.queryParams.time[1]?this.queryParams.time[1]:null,
+        }))
+        delete params.time;
+        listTableApi(
+          this.configUrl.list,
+          this.addDateRange(
+            params,
+            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)
+        }
+      },
+      /**    */
+      refundAuditFun(row){
+        if(this.$refs.detailsBox) {
+          this.$refs.detailsBox.initData(this.title + '审核',"DEATILSADD", row)
+        }
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$modal.confirm('是否确认删除数据项？').then( () => {
+          return delTableParamsApi(this.configUrl.delect,{
+            id: ids
+          });
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch((e) => {
+          console.error("删除失败====",e)
+        });
+      },
+      /** 导出按钮操作 */
+      /** 导出按钮操作 */
+      handleExport() {
+        
+        let params = JSON.parse(JSON.stringify({
+            ...this.queryParams,
+            startCreateTime: this.queryParams.time&&this.queryParams.time[0]?this.queryParams.time[0]:null,
+            endCreateTime: this.queryParams.time&&this.queryParams.time[1]?this.queryParams.time[1]:null,
+            orderType: 4,
+        }))
+        delete params.time;
+        delete params.pageSize;
+        delete params.pageNum;
+        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
+          })
+        }
+      },
+      /** 开/闭 园 */
+      openAttraction(row) {
+        console.log("row======",row)
+        this.$modal.confirm(`是否确认${row.status == 1 ? '关闭' : '打开'} ${row.titleName}吗？`).then( () => {
+          return updateTableApi(this.configUrl.edit,{
+            ...row,
+            status: row.status == 1 ? 0 : 1
+          });
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess(`${row.status == 1 ? '打开' : '关闭'}成功`);
+        }).catch((e) => {
+          console.error("失败====",e)
+        });
+      },
+    }
+  };
+  </script>
+  

src/views/tourism/financialManagement/detailsBox/cateringRefundManagementDetails.vue

@@ -0,0 +1,441 @@
+<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="120px">
+          <div class="form-title"><span>订单信息</span></div>
+          <div style="display: flex;">
+            <el-form-item label="订单号：">
+              <span style="display: block; min-width: 250px;">{{ form.orderId }}</span>
+            </el-form-item>
+            
+            <el-form-item label="支付单号：">
+              <span style="display: block; min-width: 250px;">{{ form.transactionId }}</span>
+            </el-form-item>
+            <el-form-item label="应付金额：">
+              <span style="display: block; min-width: 250px;">{{ form.orderPrice }}</span>
+            </el-form-item>
+          </div>
+
+          <!-- <div style="display: flex;">
+            <el-form-item label="商品名称：">
+              <span style="display: block; min-width: 250px;">{{ form.goodsName }}</span>
+            </el-form-item>
+            <el-form-item label="商品单价：">
+              <span style="display: block; min-width: 250px;">{{ form.salePrice }}</span>
+            </el-form-item>
+            <el-form-item label="购买数量：">
+              <span style="display: block; min-width: 250px;">{{ form.saleNum }}</span>
+            </el-form-item>
+            
+          </div> -->
+
+          <div style="display: flex;">
+            <el-form-item label="实付金额：">
+              <span style="display: block; min-width: 250px;">{{ form.realPrice }}</span>
+            </el-form-item>
+            <el-form-item label="下单时间：">
+              <span style="display: block; min-width: 250px;">{{ form.orderCreateTime }}</span>
+            </el-form-item>
+            <el-form-item label="支付时间：">
+              <span style="display: block; min-width: 250px;">{{ form.payTime }}</span>
+            </el-form-item>
+          </div>
+          <div class="form-title"><span>商品信息</span></div>
+          <div style="display: flex;padding: 10px 0 15px;">
+            <el-table :data="tableList">
+              <el-table-column type="index" label="编号" align="center"  />
+              <el-table-column label="商品名称" align="center" key="goodsName" prop="goodsName" :show-overflow-tooltip="true" />
+              <el-table-column label="分类" align="center" key="classifyName" prop="classifyName" :show-overflow-tooltip="true" />
+              <el-table-column label="单价(元)" align="center" key="salePrice" prop="salePrice" :show-overflow-tooltip="true" />
+              <el-table-column label="数量" align="center" key="saleNum" prop="saleNum" :show-overflow-tooltip="true" />
+              <el-table-column label="实付金额(元)" align="center" key="priceSubtotal" prop="priceSubtotal" :show-overflow-tooltip="true" />
+            </el-table>
+          </div>
+          <div class="form-title"><span>下单人信息</span></div>
+          <div style="display: flex;">
+            <el-form-item label="姓名：">
+              <span style="display: block;min-width: 250px;">{{ form.refundName }}</span>
+            </el-form-item>
+            <el-form-item label="手机号：">
+              <span style="display: block;min-width: 250px;">{{ form.refundMobile }}</span>
+            </el-form-item>
+          </div>
+          <div class="form-title"><span>退款信息</span></div>
+          <div style="display: flex;">
+            <el-form-item label="退款单号：">
+              <span style="display: block; min-width: 250px;">{{ form.refundNo }}</span>
+            </el-form-item>
+            <el-form-item label="退款金额：">
+              <span style="display: block; min-width: 250px;">{{ form.refundAmount }}</span>
+            </el-form-item>
+            <!-- <el-form-item label="申请类型：">
+              <span style="display: block; min-width: 250px;">{{ form.memberName }}</span>
+            </el-form-item> -->
+          </div>
+          <div style="display: flex;">
+            <el-form-item label="退款原因：">
+              <span style="display: block; min-width: 250px;">{{ form.refundReason }}</span>
+            </el-form-item>
+            <el-form-item label="申请时间：">
+              <span style="display: block; min-width: 250px;">{{ form.createTime }}</span>
+            </el-form-item>
+            <el-form-item label="退款状态：">
+              <dict-tag :options="dict.type.tourism_orderRefund_status" :value="form.status"/>
+            </el-form-item>
+          </div>
+          <div style="display: flex;" v-if="form.errReason">
+            <el-form-item label="退款驳回原因：">
+              <span style="display: block; min-width: 250px;">{{ form.errReason }}</span>
+            </el-form-item>
+          </div>
+          <div style="display: flex;" v-if="form.remark">
+            <el-form-item label="审核备注：">
+              <span style="display: block; min-width: 250px;">{{ form.remark }}</span>
+            </el-form-item>
+          </div>
+          <div>
+            <el-form-item label="凭证：" prop="imags">
+              <div style="display: flex;flex-wrap: wrap;">
+                <div 
+                v-for="(item,index) in form.imags" 
+                :key="index"
+                style="width: 100px; height: 100px;position: relative;border: 1px solid #999;border-radius: 5px;margin-right: 20px;">
+                  <el-image 
+                    style="width: 100%; height: 100%"
+                    :src="item" 
+                    :preview-src-list="form.imags">
+                  </el-image>
+                </div>
+              </div>
+            </el-form-item>
+          </div>
+          <div v-if="model=='DEATILSADD'">
+            <div class="form-title" style="display: flex;align-items: flex-end;"><span>审核操作</span><i>(注意：驳回时需填写驳回原因)</i></div>
+              <div>
+                <el-form-item label="审核备注：" :error="errReasonText" label-width="100px"></el-form-item>
+                <div>
+                  <el-input
+                    type="textarea"
+                    :rows="2"
+                    placeholder="请输入审核备注"
+                    v-model="form.errReason1">
+                  </el-input>
+                </div>
+              </div>
+              <div style="display: flex;margin-top: 10px;justify-content: center;">
+                <el-button 
+                type="danger" 
+                @click="refundAudit(2)"
+                :loading="loading"
+                >驳回</el-button>
+                <el-button type="primary" :loading="loading" @click="refundAudit(1)">同意</el-button>
+              </div>
+          </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,
+  addTableApi
+ } from '@/api/CURD'
+
+export default {
+  name: "addAndEdit",
+  dicts: ['tourism_orderRefund_status'],
+  data() {
+    return {
+      title: "",
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      loadingText: "拼命加载数据中...",
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configUrl: {
+        add: '', // 新增地址
+        details: '/merchant/merchantOrder/orderRefundById', // 详情地址
+        edit: '', // 编辑地址
+        refundAudit: '/merchant/merchantOrder/refundAudit',// 审核接口
+      },
+      form: {
+        id: undefined,
+      },
+      rules: {},
+      scenicAreaProducts: [],// 景点产品关联
+      errReasonText: '',
+      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=='DEATILSADD') { // 新增
+        await this.getTableDeatilsFun(row)
+        this.formStatus = 1
+      }else if(model=='DEATILS') { // 新增
+        let obj = {
+          ...row
+        }
+        this.$set(this,'form',obj)
+        this.formStatus = 1
+      }else if(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,
+            avatar: res.data.avatar?res.data.avatar.split(','):[],
+            vedioUrl: res.data.vedioUrl?res.data.vedioUrl.split(','):[],
+            imags: res.data.imags?res.data.imags.split(','):[]
+        }
+        if(obj.goodsList) {
+            this.tableList = obj.goodsList
+          }
+          this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
+          this.errReasonText = ''
+          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;
+    },
+    /**  审核操作  */
+    refundAudit(type){
+      if(type == 2 && !this.form.errReason1) {
+        this.errReasonText = "请输入驳回原因"
+        return
+      } 
+      this.loading = true
+      let params = {
+        refundId: this.form.id,// 退款ID-列表ID
+        status: type,
+        errReason: this.form.errReason1,
+        remark: this.form.errReason1
+      }
+      addTableApi(
+        this.configUrl.refundAudit,{
+          ...params 
+        }).then(response => {
+          this.$modal.msgSuccess(`提交成功`);
+          this.loading = false
+          this.open = false;
+          this.$emit('refresh')
+        }).catch(()=>{
+          this.$message.error("提交失败!!!");
+          this.loading = false
+        })
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.form-dialog-box {
+  padding: 0 30px;
+  padding: 0 30px;
+  min-height: 50vh;
+  max-height: 80vh;
+  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/cateringOrders/cateringOrders.vue

@@ -0,0 +1,379 @@
+<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="merchantName">
+                    <el-input
+                        v-model="queryParams.merchantName"
+                        placeholder="请输入归属门店"
+                        clearable
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
+                <el-form-item label="联系电话:" prop="memberMobile" label-width="110px">
+                    <el-input
+                        v-model="queryParams.memberMobile"
+                        placeholder="请输入联系电话"
+                        clearable
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
+                <el-form-item label="支付方式" prop="payWay">
+                  <el-select v-model="queryParams.payWay" clearable placeholder="请选择支付方式">
+                      <el-option
+                          v-for="dict in dict.type.tourism_ticketOrders_payWay"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value">
+                      </el-option>
+                    </el-select>
+                </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 label="支付时间" prop="payTime">
+                  <el-date-picker
+                    v-model="queryParams.payTime"
+                    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="source">
+                  <el-select v-model="queryParams.source" clearable placeholder="请选择支付状态">
+                      <el-option
+                          v-for="dict in dict.type.tourism_ticketOrders_source"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value">
+                      </el-option>
+                    </el-select>
+                </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>
+                    <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="repastOrderAcceptFun"
+                  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="merchantName" prop="merchantName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="实付金额(元)" align="center" key="realPrice" prop="realPrice" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="支付状态" align="center" key="payStatus" prop="payStatus" v-if="columns[3].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="payWay" prop="payWay" v-if="columns[4].visible" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.tourism_ticketOrders_payWay" :value="scope.row.payWay"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="联系电话" align="center" key="memberMobile" prop="memberMobile" v-if="columns[5].visible"></el-table-column>
+            <el-table-column label="下单时间" align="center" key="createTime" prop="createTime" v-if="columns[6].visible"></el-table-column>
+            <el-table-column label="订单来源" align="center" key="source" prop="source" v-if="columns[7].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[8].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>
+              </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>
+    </div>
+  </template>
+
+  <script>
+  import {
+    listTableApi,
+    delTableParamsApi,
+    } from "@/api/CURD";
+  import detailsBox from "./detailsBox/cateringOrdersDetails.vue"
+  import repastOrderAccept from "./formBox/repastOrderAccept.vue";
+  export default {
+    name: "User",
+    dicts: ['tourism_ticketOrders_source','tourism_ticketOrders_status','tourism_ticketOrders_payStatus','tourism_ticketOrders_payWay'],
+    components: {detailsBox,repastOrderAccept},
+    data() {
+      return {
+        title: "餐饮订单",// 通用标题
+        configPermi: {
+          add: [''], // 新增权限
+          details: ['orderManagement:cateringOrders:details'], // 详情权限
+          delect: [''], // 删除权限
+          upload: [''],// 导入权限
+          export: [''],// 导出权限
+          repastOrderAccept: ['orderManagement:cateringOrders:repastOrderAccept'],
+        },
+        configUrl: {
+          list: '/order/orderInfo/repastOrderList', // 列表地址
+          delect: '', // 删除地址
+          upload: '',// 导入地址
+          download:'', // 下载模板地址
+          export: '',// 导出地址
+          updateStatusById: '',
+          repastOrderAccept: '/order/orderInfo/repastOrderAccept', //  接单/拒单
+        },
+        // 遮罩层
+        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.5, label: `实付金额(元)`, visible: true },
+          { key: 3, label: `支付状态`, visible: true },
+          { key: 4, label: `支付方式`, visible: true },
+          { key: 5, label: `联系电话`, visible: true },
+          { key: 6, label: `下单时间`, visible: true },
+          { key: 7, label: `订单来源`, visible: true },
+          { key: 8, label: `订单状态`, visible: true },
+        ],
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询用户列表 */
+      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 == 11 ? '接单' : '拒单' }操作`, "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.download(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
+          })
+        }
+      },
+    }
+  };
+  </script>

src/views/tourism/orderManagement/cateringOrders/detailsBox/cateringOrdersDetails.vue

@@ -0,0 +1,447 @@
+<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.name }}</span>
+            </el-form-item>
+            <el-form-item label="就餐人数：">
+              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.useUserNum }}</span>
+            </el-form-item>
+          </div>
+          <div style="display: flex;">
+            <el-form-item label="下单数量：">
+              <span style="display: inline-block;width: 250px;">{{ form.createTime }}</span>
+            </el-form-item>
+            <el-form-item label="订单金额(元)：">
+              <span style="display: inline-block;width: 250px;">{{ form.orderPrice }}</span>
+            </el-form-item>
+            <el-form-item label="实付金额(元)：">
+              <span style="display: inline-block;width: 250px;">{{ form.realPrice }}</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_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>
+            <el-form-item label="下单时间：">
+              <span style="display: inline-block;width: 250px;">{{ form.createTime }}</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.status"/>
+              </span>
+            </el-form-item>
+            <el-form-item label="消费时间：">
+              <span style="display: inline-block;width: 250px;">{{ form.qrcodeUseTime }}</span>
+            </el-form-item>
+          </div>
+          <div style="display: flex;">
+            <el-form-item label="联系电话：">
+              <span style="display: inline-block;width: 250px;">{{ form.contactMobile }}</span>
+            </el-form-item>
+            <el-form-item label="接单时间：">
+              <span style="display: inline-block;width: 250px;">{{ form.acceptTime }}</span>
+            </el-form-item>
+            <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>
+            
+          </div>
+          <div class="form-title"><span>下单信息</span></div>
+          <div style="display: flex;padding: 10px 0 15px;">
+            <el-table :data="tableList">
+              <el-table-column type="index" label="编号" align="center"  />
+              <el-table-column label="菜品名称" align="center" key="goodsName" prop="goodsName" :show-overflow-tooltip="true" />
+              <el-table-column label="价格" align="center" key="classifyName" prop="classifyName" :show-overflow-tooltip="true" />
+              <el-table-column label="下单数量" align="center" key="salePrice" prop="salePrice" :show-overflow-tooltip="true" />
+              <el-table-column label="实付金额(元)" align="center" key="priceSubtotal" prop="priceSubtotal" :show-overflow-tooltip="true" />
+            </el-table>
+          </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/repastOrderDetail', // 详情地址
+        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/cateringOrders/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 == 11 ? '接单' : '拒单'}回复：`" 
+          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 == 11) {
+          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/hotelsOrders/detailsBox/hotelsOrdersDetails.vue

@@ -0,0 +1,447 @@
+<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.name }}</span>
+            </el-form-item>
+            <el-form-item label="就餐人数：">
+              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.useUserNum }}</span>
+            </el-form-item>
+          </div>
+          <div style="display: flex;">
+            <el-form-item label="下单数量：">
+              <span style="display: inline-block;width: 250px;">{{ form.createTime }}</span>
+            </el-form-item>
+            <el-form-item label="订单金额(元)：">
+              <span style="display: inline-block;width: 250px;">{{ form.orderPrice }}</span>
+            </el-form-item>
+            <el-form-item label="实付金额(元)：">
+              <span style="display: inline-block;width: 250px;">{{ form.realPrice }}</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_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>
+            <el-form-item label="下单时间：">
+              <span style="display: inline-block;width: 250px;">{{ form.createTime }}</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.status"/>
+              </span>
+            </el-form-item>
+            <el-form-item label="消费时间：">
+              <span style="display: inline-block;width: 250px;">{{ form.qrcodeUseTime }}</span>
+            </el-form-item>
+          </div>
+          <div style="display: flex;">
+            <el-form-item label="联系电话：">
+              <span style="display: inline-block;width: 250px;">{{ form.contactMobile }}</span>
+            </el-form-item>
+            <el-form-item label="接单时间：">
+              <span style="display: inline-block;width: 250px;">{{ form.acceptTime }}</span>
+            </el-form-item>
+            <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>
+            
+          </div>
+          <div class="form-title"><span>下单信息</span></div>
+          <div style="display: flex;padding: 10px 0 15px;">
+            <el-table :data="tableList">
+              <el-table-column type="index" label="编号" align="center"  />
+              <el-table-column label="菜品名称" align="center" key="goodsName" prop="goodsName" :show-overflow-tooltip="true" />
+              <el-table-column label="价格" align="center" key="classifyName" prop="classifyName" :show-overflow-tooltip="true" />
+              <el-table-column label="下单数量" align="center" key="salePrice" prop="salePrice" :show-overflow-tooltip="true" />
+              <el-table-column label="实付金额(元)" align="center" key="priceSubtotal" prop="priceSubtotal" :show-overflow-tooltip="true" />
+            </el-table>
+          </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/repastOrderDetail', // 详情地址
+        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/hotelsOrders/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 == 11 ? '接单' : '拒单'}回复：`" 
+          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 == 11) {
+          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/hotelsOrders/hotelsOrders.vue

@@ -0,0 +1,380 @@
+<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="merchantName">
+                    <el-input
+                        v-model="queryParams.merchantName"
+                        placeholder="请输入归属门店"
+                        clearable
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
+                <el-form-item label="联系电话:" prop="memberMobile" label-width="110px">
+                    <el-input
+                        v-model="queryParams.memberMobile"
+                        placeholder="请输入联系电话"
+                        clearable
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
+                <el-form-item label="支付方式" prop="payWay">
+                  <el-select v-model="queryParams.payWay" clearable placeholder="请选择支付方式">
+                      <el-option
+                          v-for="dict in dict.type.tourism_ticketOrders_payWay"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value">
+                      </el-option>
+                    </el-select>
+                </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 label="支付时间" prop="payTime">
+                  <el-date-picker
+                    v-model="queryParams.payTime"
+                    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="source">
+                  <el-select v-model="queryParams.source" clearable placeholder="请选择支付状态">
+                      <el-option
+                          v-for="dict in dict.type.tourism_ticketOrders_source"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value">
+                      </el-option>
+                    </el-select>
+                </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>
+                    <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="repastOrderAcceptFun"
+                  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="merchantName" prop="merchantName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="实付金额(元)" align="center" key="realPrice" prop="realPrice" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="支付状态" align="center" key="payStatus" prop="payStatus" v-if="columns[3].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="payWay" prop="payWay" v-if="columns[4].visible" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.tourism_ticketOrders_payWay" :value="scope.row.payWay"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="联系电话" align="center" key="memberMobile" prop="memberMobile" v-if="columns[5].visible"></el-table-column>
+            <el-table-column label="下单时间" align="center" key="createTime" prop="createTime" v-if="columns[6].visible"></el-table-column>
+            <el-table-column label="订单来源" align="center" key="source" prop="source" v-if="columns[7].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[8].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>
+              </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>
+    </div>
+  </template>
+
+  <script>
+  import {
+    listTableApi,
+    delTableParamsApi,
+    } from "@/api/CURD";
+  import detailsBox from "./detailsBox/hotelsOrdersDetails.vue"
+  import repastOrderAccept from "./formBox/repastOrderAccept.vue";
+  export default {
+    name: "User",
+    dicts: ['tourism_ticketOrders_source','tourism_ticketOrders_status','tourism_ticketOrders_payStatus','tourism_ticketOrders_payWay'],
+    components: {detailsBox,repastOrderAccept},
+    data() {
+      return {
+        title: "酒店订单",// 通用标题
+        configPermi: {
+          add: [''], // 新增权限
+          details: ['orderManagement:hotelsOrders:details'], // 详情权限
+          delect: [''], // 删除权限
+          upload: [''],// 导入权限
+          export: [''],// 导出权限
+          delivery: [''],// 发货
+          repastOrderAccept: ['orderManagement:hotelsOrders:repastOrderAccept'],
+        },
+        configUrl: {
+          list: '/order/orderInfo/repastOrderList', // 列表地址
+          delect: '', // 删除地址
+          upload: '',// 导入地址
+          download:'', // 下载模板地址
+          export: '',// 导出地址
+          updateStatusById: '',
+          repastOrderAccept: '/order/orderInfo/repastOrderAccept', //  接单/拒单
+        },
+        // 遮罩层
+        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.5, label: `实付金额(元)`, visible: true },
+          { key: 3, label: `支付状态`, visible: true },
+          { key: 4, label: `支付方式`, visible: true },
+          { key: 5, label: `联系电话`, visible: true },
+          { key: 6, label: `下单时间`, visible: true },
+          { key: 7, label: `订单来源`, visible: true },
+          { key: 8, label: `订单状态`, visible: true },
+        ],
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询用户列表 */
+      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 == 11 ? '接单' : '拒单' }操作`, "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.download(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
+          })
+        }
+      },
+    }
+  };
+  </script>

src/views/tourism/productManagement/cateringManagement.vue

@@ -81,21 +81,21 @@
                   type="text"
                   icon="el-icon-edit"
                   @click="handleClass(scope.row)"
-                  v-hasPermi="configPermi.editBase"
+                  v-hasPermi="configPermi.class"
                 >分类管理</el-button>
                 <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-edit"
                   @click="handlecategory(scope.row)"
-                  v-hasPermi="configPermi.editBase"
+                  v-hasPermi="configPermi.category"
                 >菜品管理</el-button>
                 <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-edit"
                   @click="openAttraction(scope.row)"
-                  v-hasPermi="configPermi.editGuige"
+                  v-hasPermi="configPermi.attraction"
                 >{{ scope.row.status == 1 ? '暂停营业':'开启营业' }}</el-button>
                 <el-button
                   size="mini"
@@ -145,11 +145,13 @@
       return {
         title: "餐饮管理",// 通用标题
         configPermi: {
-          add: ['commodityManagement:shopManagement:add'], // 新增权限
+          add: ['productManagement:cateringManagement:add'], // 新增权限
           details: [''], // 详情权限
-          delect: ['commodityManagement:shopManagement:delect'], // 删除权限
-          editBase: ['commodityManagement:shopManagement:editBase'], // 编辑店铺信息配置
-          editGuige: ['commodityManagement:shopManagement:editGuige'], // 编辑营业
+          delect: ['productManagement:cateringManagement:delect'], // 删除权限
+          editBase: ['productManagement:cateringManagement:editBase'], // 门店信息配置
+          attraction: ['productManagement:cateringManagement:attraction'], // 编辑营业
+          class: ['productManagement:cateringManagement:class'], // 分类管理
+          category: ['productManagement:cateringManagement:category'], // 菜品管理
           upload: [''],// 导入权限
           export: [''],// 导出权限
           release: ['']
@@ -240,30 +242,30 @@
       /** 新增按钮操作 */
       handleAdd() {
         if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(this.title + '新增', "ADD",{})
+          this.$refs.addAndEdit.initData(this.title + '-新增门店', "ADD",{})
         }
       },
       /** 修改按钮操作 */
       handleUpdate(row) {
         if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(row.name + '基本信息编辑', "EDITInit",{...row})
+          this.$refs.addAndEdit.initData(row.name + '-门店基本信息编辑', "EDITInit",{...row})
         }
       },
       /** 修改按钮操作  分类 */
       handleClass(row) {
         if(this.$refs.classList) {
-          this.$refs.classList.initData(row.name + '基本信息编辑', "EDITInit",{...row})
+          this.$refs.classList.initData(row.name + '-分类管理', "EDITInit",{...row})
         }
       },
       /** 修改按钮操作  品类 */
       handlecategory(row) {
         if(this.$refs.categoryList) {
-          this.$refs.categoryList.initData(row.name, "EDITInit",{...row})
+          this.$refs.categoryList.initData(row.name + '-菜品管理', "EDITInit",{...row})
         }
       },
       handleDetails(row){
         if(this.$refs.detailsBox) {
-          this.$refs.detailsBox.initData(row.name + '详情',"DEATILSInit", row)
+          this.$refs.detailsBox.initData(row.name + '-详情',"DEATILSInit", row)
         }
       },
       /** 删除按钮操作 */

src/views/tourism/productManagement/detailsBox/commodityListDetails.vue

@@ -34,9 +34,6 @@
                   :src="item" 
                   :preview-src-list="form.goodsImage">
                 </el-image>
-                <span @click="handleRemove(index)" style="position: absolute;top: -15px;right: -15px;color: red;font-size: 24px;z-index: 999;cursor: pointer;">
-                  <i class="el-icon-error"></i>
-                </span>
               </div>
             </div>
           </el-form-item>
@@ -68,14 +65,14 @@
                       prop="skuName"
                       label="规格名称">
                       <template slot-scope="scope">
-                        <el-input v-model="scope.row.skuName" placeholder="请输入内容"></el-input>
+                        <span>{{ scope.row.skuName }}</span>
                       </template>
                     </el-table-column>
                     <el-table-column
                       prop="price"
                       label="菜品价格">
                       <template slot-scope="scope">
-                        <el-input-number v-model="scope.row.price" controls-position="right"></el-input-number>
+                        <span>{{ scope.row.price }}</span>
                       </template>
                     </el-table-column>
                   </el-table>

src/views/tourism/productManagement/tabelBox/cateringManagementCategoryTabel.vue

@@ -168,10 +168,10 @@ export default {
       loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configPermi: {
-          add: ['commodityManagement:commodityList:add'], // 新增权限
-          details: ['commodityManagement:commodityList:details'], // 详情权限
-          delect: ['commodityManagement:commodityList:delect'], // 删除权限
-          edit: ['commodityManagement:commodityList:edit'], // 编辑基本信息权限
+          add: ['cateringManagement:cateringManagementCategoryTabel:add'], // 新增权限
+          details: ['cateringManagement:cateringManagementCategoryTabel:details'], // 详情权限
+          delect: ['cateringManagement:cateringManagementCategoryTabel:delect'], // 删除权限
+          edit: ['cateringManagement:cateringManagementCategoryTabel:edit'], // 编辑基本信息权限
           upload: [''],// 导入权限
           export: [''],// 导出权限
           release: ['']
@@ -289,7 +289,7 @@ export default {
       /** 新增按钮操作 */
       handleAdd() {
         if(this.$refs.addAndEditBox) {
-          this.$refs.addAndEditBox.initData(this.title + '新增', "ADD",{
+          this.$refs.addAndEditBox.initData(this.title + '-添加菜品', "ADD",{
             shopId: this.tabelId,
             shopName: this.tabelName
           })
@@ -299,12 +299,12 @@ export default {
       handleUpdate(row) {
         if(this.$refs.addAndEditBox) {
           console.log("dsfsdfdsfsdfsfdsdfsdf",this.$refs.addAndEditBox)
-          this.$refs.addAndEditBox.initData(this.title + '编辑', "EDITInit",{...row})
+          this.$refs.addAndEditBox.initData(this.title + '-修改菜品', "EDITInit",{...row})
         }
       },
       handleDetails(row){
         if(this.$refs.detailsBox) {
-          this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", {...row})
+          this.$refs.detailsBox.initData(this.title + '-菜品详情',"DEATILSInit", {...row})
         }
       },
       /** 删除按钮操作 */

src/views/tourism/productManagement/tabelBox/cateringManagementClassTabel.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    :title="''"
+    :title="title"
     :visible.sync="open"
     width="90%"
     append-to-body
@@ -112,10 +112,10 @@ export default {
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       tableId: null,
       configPermi: {
-          add: ['commodityManagement:commodityClass:add'], // 新增权限
+          add: ['cateringManagement:cateringManagementClassTabel:add'], // 新增权限
           details: [''], // 详情权限
-          delect: ['commodityManagement:commodityClass:delect'], // 删除权限
-          edit: ['commodityManagement:commodityClass:edit'], // 编辑
+          delect: ['cateringManagement:cateringManagementClassTabel:delect'], // 删除权限
+          edit: ['cateringManagement:cateringManagementClassTabel:edit'], // 编辑
           upload: [''],// 导入权限
           export: [''],// 导出权限
           release: ['']
@@ -216,7 +216,7 @@ export default {
       /** 新增按钮操作 */
       handleAdd(row) {
         if(this.$refs.addAndEdit1) {
-          this.$refs.addAndEdit1.initData(this.title + '新增', "ADD",{
+          this.$refs.addAndEdit1.initData(this.title + '-添加分类', "ADD",{
             ...row,
             shopId: this.tabelId,
             shopName: this.tabelName
@@ -226,12 +226,12 @@ export default {
       /** 修改按钮操作 */
       handleUpdate(row) {
         if(this.$refs.addAndEdit1) {
-          this.$refs.addAndEdit1.initData(this.title + '基本信息编辑', "EDITInit",{...row})
+          this.$refs.addAndEdit1.initData(this.title + '-修改分类', "EDITInit",{...row})
         }
       },
       handleDetails(row){
         if(this.$refs.detailsBox) {
-          this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", row)
+          this.$refs.detailsBox.initData(this.title + '-分类详情',"DEATILSInit", row)
         }
       },
       /** 删除按钮操作 */