1. 新增

src/views/tourism/commodityManagement/commodityList.vue

@@ -222,10 +222,13 @@
       /** 查询用户列表 */
       getList() {
         this.loading = true;
+        let params = JSON.parse(JSON.stringify(this.queryParams))
+        params['shopType'] = 4
         listTableApi(
           this.configUrl.list,
           this.addDateRange(
-            this.queryParams,
+            params,
+            {shopType: 3},
             this.dateRange)).then(response => {
               this.tableList = response.data.rows;
               this.total = response.data.total;

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

@@ -51,7 +51,7 @@
           <el-form-item label="商品上架：">
             <span style="width: 250px;">{{ form.status == 1 ? '已下架':'已上架' }}</span>
           </el-form-item>
-          <el-form-item label="景点图片">
+          <el-form-item label="商品图片">
             <div style="display: flex;">
               <div 
               v-for="(item,index) in form.goodsImage" 

src/views/tourism/productManagement/cateringManagement.vue

@@ -0,0 +1,323 @@
+<template>
+    <div class="app-container">
+      <el-row :gutter="20">
+        <!--用户数据-->
+        <el-col :span="24" :xs="24">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+                <el-form-item label="门店名称" prop="name">
+                </el-form-item>
+                <el-form-item label="营业状态" prop="status">
+                  <el-select v-model="queryParams.status" clearable placeholder="请选择状态">
+                    <el-option
+                    v-for="item in [
+                        {label: '营业中',value: 1},
+                        {label: '暂停营业',value: 0}
+                    ]"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                    <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                </el-form-item>
+            </el-form>
+  
+            <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button
+                type="primary"
+                plain
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd"
+                v-hasPermi="configPermi.add"
+              >添加门店</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="shopLogo" prop="shopLogo" v-if="columns[0].visible" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                    <el-image
+                    style="width: 60px; height: 40px"
+                    :src="scope.row.shopLogo"
+                    :preview-src-list="[scope.row.shopLogo]"
+                    fit="fill"></el-image>
+                </template>
+            </el-table-column>
+            <el-table-column label="餐厅名称" align="center" key="name" prop="name" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+           
+            <el-table-column label="营业时间" align="center" key="openTimeStart" prop="openTimeStart" v-if="columns[3].visible" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                    <span>{{ scope.row.openTimeStart + '--' + scope.row.openTimeEnd }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="营业状态" align="center" key="status" prop="status" v-if="columns[2].visible" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                    <span>{{ scope.row.status == 0 ? '暂停营业' :  scope.row.status == 1 ? '营业中': '--' }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="创建时间" align="center" key="createTime" prop="createTime" v-if="columns[4].visible" :show-overflow-tooltip="true" />
+            <el-table-column
+              label="操作"
+              align="center"
+              class-name="small-padding fixed-width"
+            >
+              <template slot-scope="scope" >
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="handleUpdate(scope.row)"
+                  v-hasPermi="configPermi.editBase"
+                >门店信息配置</el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="handleClass(scope.row)"
+                  v-hasPermi="configPermi.editBase"
+                >分类管理</el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="handlecategory(scope.row)"
+                  v-hasPermi="configPermi.editBase"
+                >菜品管理</el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="openAttraction(scope.row)"
+                  v-hasPermi="configPermi.editGuige"
+                >{{ scope.row.status == 1 ? '暂停营业':'开启营业' }}</el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.row)"
+                  v-hasPermi="configPermi.delect"
+                >删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </el-col>
+      </el-row>
+      <!--  新增或修改 基本信息  -->
+      <addAndEdit ref="addAndEdit" @refresh="getList" />
+
+      <!--  新增或修改 基本信息  -->
+      <classList ref="classList" @refresh="getList" />
+
+      <!--  新增或修改 基本信息  -->
+      <categoryList ref="categoryList" @refresh="getList" />
+    </div>
+  </template>
+
+  <script>
+  import {
+    listTableApi,
+    delTableParamsApi,
+    publicByPutApi as releaseApi
+    } from "@/api/CURD";
+  import addAndEdit from "./formBox/cateringManagementForm.vue"
+  import classList from "./tabelBox/cateringManagementClassTabel.vue"
+  import categoryList from "./tabelBox/cateringManagementCategoryTabel.vue"
+  export default {
+    name: "User",
+    dicts: [],
+    components: {addAndEdit,classList,categoryList},
+    data() {
+      return {
+        title: "餐饮管理",// 通用标题
+        configPermi: {
+          add: ['commodityManagement:shopManagement:add'], // 新增权限
+          details: [''], // 详情权限
+          delect: ['commodityManagement:shopManagement:delect'], // 删除权限
+          editBase: ['commodityManagement:shopManagement:editBase'], // 编辑店铺信息配置
+          editGuige: ['commodityManagement:shopManagement:editGuige'], // 编辑营业
+          upload: [''],// 导入权限
+          export: [''],// 导出权限
+          release: ['']
+        },
+        configUrl: {
+          list: '/merchant/merchantShop/pageList', // 列表地址
+          delect: '/merchant/merchantShop/deleteById', // 删除地址
+          upload: '',// 导入地址
+          download:'', // 下载模板地址
+          export: '',// 导出地址
+          updateStatusById: '/merchant/merchantShop/enable',
+        },
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 用户表格数据
+        tableList: null,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+        },
+        dateRange: [],
+        // 控制列表是否显示
+        columns: [
+          { key: 0, label: `商铺logo`, visible: true },
+          { key: 2, label: `商铺名称`, visible: true },
+          { key: 3.5, label: `状态`, visible: true },
+          { key: 3, label: `营业时间`, visible: true },
+          { key: 4, label: `创建时间`, visible: true },
+        ],
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询用户列表 */
+      getList() {
+        this.loading = true;
+        let params = JSON.parse(JSON.stringify(this.queryParams))
+        params['shopType'] = 4
+        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(row.name + '基本信息编辑', "EDITInit",{...row})
+        }
+      },
+      /** 修改按钮操作  分类 */
+      handleClass(row) {
+        if(this.$refs.classList) {
+          this.$refs.classList.initData(row.name + '基本信息编辑', "EDITInit",{...row})
+        }
+      },
+      /** 修改按钮操作  品类 */
+      handlecategory(row) {
+        if(this.$refs.categoryList) {
+          this.$refs.categoryList.initData(row.name, "EDITInit",{...row})
+        }
+      },
+      handleDetails(row){
+        if(this.$refs.detailsBox) {
+          this.$refs.detailsBox.initData(row.name + '详情',"DEATILSInit", 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() {
+        this.download(this.configUrl.export, {
+          ...this.queryParams
+        }, `${this.title }_${new Date().getTime()}.xlsx`)
+      },
+      /** 导入按钮操作 */
+      handleImport() {
+        if(this.$refs.upload) {
+          this.$refs.upload.initData({
+            width: '400px',
+            // 弹出层标题（用户导入）
+            title: this.title + "导入",
+            // 下载模板地址
+            importTemplate: this.configUrl.download,
+            // 上传的地址
+            url: this.configUrl.upload
+          })
+        }
+      },
+      /**
+       * 修改状态
+       * @date 2023-11-22
+       * @returns {any}
+       */
+      openAttraction(row) {
+        this.$modal.confirm(`是否确认${row.status == 0 ? '开启营业' : '暂停营业'} ${row.name}吗？`).then( () => {
+          return listTableApi(this.configUrl.updateStatusById,{
+            id: row.id,
+            status: row.status == 1 ? 0 : 1
+          });
+        }).then(() => {
+          this.getList()
+          this.$modal.msgSuccess(`${row.status == 0 ? '开启营业' : '暂停营业'}成功`);
+        }).catch((e) => {
+          console.error("失败====",e)
+        });
+      },
+    }
+  };
+  </script>

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

@@ -0,0 +1,405 @@
+<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>
+          <el-form-item label="菜品名称：" prop="goodsName">
+            <span>{{ form.goodsName }}</span>
+          </el-form-item>
+          <el-form-item label="菜品图片：" prop="goodsImage">
+            <div style="display: flex;">
+              <div 
+              v-for="(item,index) in form.goodsImage" 
+              :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.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>
+          <el-form-item label="分类类型：" prop="classifyId">
+            <span>{{ form.classifyName }}</span>
+          </el-form-item>
+          <div>
+            <div>
+              <el-form-item label="是否多规格：" prop="specFlag">
+                <span>{{ form.specFlag == 1 ? '单规格' : form.specFlag == 2 ? '多规格' : '' }}</span>
+              </el-form-item>
+            </div>
+            <div v-if="form.specFlag == 1">
+              <el-form-item label="规格：" prop="specName">
+                <span>{{ form.specName }}</span>
+              </el-form-item>
+              <el-form-item label="菜品价格(元)：" prop="salePrice">
+                <span>{{ form.salePrice }}</span>
+              </el-form-item>
+            </div>
+            <div v-if="form.specFlag == 2">
+              <el-form-item label=" " prop="goodsSkuList">
+                  <el-table
+                  :data="form.goodsSkuList"
+                  border
+                  style="width: 100%">
+                    <el-table-column
+                      fixed
+                      prop="skuName"
+                      label="规格名称">
+                      <template slot-scope="scope">
+                        <el-input v-model="scope.row.skuName" placeholder="请输入内容"></el-input>
+                      </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>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+              </el-form-item>
+            </div>
+          </div>
+          <div style="display: flex;">
+            <el-form-item label="菜品标签：" prop="labelName">
+              <el-tag
+                    v-for="(tag,index) in form.labelName"
+                    :key="index"
+                    style="margin-right: 5px;">
+                    {{tag}}
+                  </el-tag>
+            </el-form-item>
+          </div>
+          <el-form-item label-width="80px" label="菜品详情">
+            <editor ref="editor" v-model="form.goodsSnapshot" :fileSize="20" :min-height="200" />
+          </el-form-item>
+        </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'
+import Editor from "@/components/Editor";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+export default {
+  name: "CommodityListDetails",
+  components: {Editor,Treeselect},
+  props: ['listTreeCopy'],
+  data() {
+    return {
+      title: "",
+      activeName: 'first',
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      loadingText: "拼命加载数据中...",
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configUrl: {
+        add: '/merchant/merchantPerformAuditorium/saveMerchantGoods', // 新增地址
+        details: '/merchant/merchantPerformAuditorium/merchantGoodsDetail', // 详情地址
+        edit: '/merchant/merchantPerformAuditorium/saveMerchantGoods', // 编辑地址
+      },
+      form: {
+        id: undefined,
+        goodsImage: [],
+        labelName: [],
+        goodsSkuList: []
+      },
+      rules: {
+      },
+      scenicAreaProducts: [],// 景点产品关联
+
+      //  上传文件
+      actionUrl: process.env.VUE_APP_BASE_API + process.env.VUE_APP_UPLOAD_IMAGE,
+      actionUrlLoading: false,
+      labelName: ''
+    };
+  },
+  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.labelName = ''
+      if(model=='ADD') { // 新增
+        this.$set(this,'form',{
+          ...row,
+          goodsImage: [],
+          daySaleRadio: '-1',
+          backStatus: 0,
+          status: 1,
+          labelName: [],
+          goodsSkuList: [],
+        })
+        this.formStatus = 1
+      }else if(model=='EDIT') { // 新增
+        let obj = {
+          goodsImage: [],
+          status: 1,
+          labelName: [],
+          goodsSkuList: [],
+          ...row,
+        }
+        this.$set(this,'form',obj)
+        this.formStatus = 1
+      }else if(model=='EDITInit' || model=='DEATILSInit') { // 新增
+        await this.getTableDeatilsFun(row)
+      }
+      this.loading = false
+    },
+    /** 获取详情 */
+    async getTableDeatilsFun(row) {
+      const id = row.id
+      this.loading = true
+      try {
+        let res = await getTableDeatilsByIdApi(this.configUrl.details,{goodsId: row.goodsId})
+        if(res.code == 200) {
+          let obj = {
+            ...res.data,
+            labelName: res.data.labelName ? res.data.labelName.split(',') : [],
+            goodsSkuList: res.data.goodsSkuList ? res.data.goodsSkuList : [],
+          }
+          if(obj.goodsImage) {
+            obj.goodsImage = obj.goodsImage.split(',')
+          }else {
+            obj.goodsImage = []
+          }
+          if(obj.daySale<=0 && obj.buyAstrict<=0) {
+            obj.daySaleRadio = '-1'
+            obj.daySale = undefined
+            obj.buyAstrict = undefined
+          }else if(obj.daySale > 0){
+            obj.daySaleRadio = '-3'
+            obj.daySale = obj.daySale
+            obj.buyAstrict = undefined
+          }else if(obj.buyAstrict > 0) {
+            obj.daySaleRadio = '-2'
+            obj.daySale = undefined
+            obj.buyAstrict = obj.buyAstrict
+          }
+
+          this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
+          this.formStatus = 1
+        }else {
+          this.$message.error('获取详情失败!!!');
+          this.formStatus = 2
+          this.loading = false
+          this.open = false;
+        }
+        this.loading = false
+      } catch (error) {
+        console.error('获取详情失败!!!!',error)
+        this.formStatus = 2
+        this.loading = false
+        this.open = false;
+      }
+    },
+    /**
+     * 重置
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    reset() {
+      if(this.$refs["form"]) {
+        this.$refs["form"].clearValidate();
+      }
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+  },
+  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/productManagement/formBox/cateringManagementForm.vue

@@ -0,0 +1,692 @@
+<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="150px">
+          <div class="form-title"><span>基本信息</span></div>
+          <el-form-item label="门店名称：" prop="name">
+            <el-input style="width: 350px;" v-model="form.name" placeholder="请输入门店名称" maxlength="50" show-word-limit />
+          </el-form-item>
+          <el-form-item label="归属景区：" prop="affiliationArea">
+            <el-input style="width: 350px;" v-model="form.affiliationArea" placeholder="请输入归属景区" maxlength="50" show-word-limit />
+          </el-form-item>
+          <el-form-item label="餐厅Logo：" prop="shopLogo">
+            <div
+            style="width: 120px;"
+            v-loading="actionUrlLoading"
+            element-loading-text="上传中..."
+            element-loading-spinner="el-icon-loading"
+            element-loading-background="rgba(0, 0, 0, 0.8)"
+            >
+              <el-upload
+                class="avatar-uploader"
+                :action="actionUrl"
+                :data="{
+                  bucket: 'tourism'
+                }"
+                :show-file-list="false"
+                accept=".jpg, .png, jpeg"
+                :on-success="handleAvatarSuccess"
+                :on-progress="handleAvatarProgress"
+                :before-upload="beforeAvatarUpload"
+                :disabled="actionUrlLoading"
+                :on-error="handleAvatarError"
+                >
+                <img v-if="form.shopLogo" style="width: 100px;height: 100px;" :src="form.shopLogo" class="avatar">
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+            </div>
+            <span>建议上传图片尺寸40px X 40px,支持jpg/png/gif,支持5MB大小以内的图片上传</span>
+          </el-form-item>
+
+          <el-form-item label="门店宣传" prop="shopAdvImgs">
+            <div style="display: flex;">
+              <div 
+              v-for="(item,index) in form.shopAdvImgs" 
+              :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.shopAdvImgs">
+                </el-image>
+                <span @click="handleRemoveMore(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 
+              style="width: 100px; height: 100px;" 
+              v-if="!form.shopAdvImgs||form.shopAdvImgs.length<6"
+              v-loading="actionUrlMoreLoading"
+              element-loading-text="上传中..."
+              element-loading-spinner="el-icon-loading"
+              element-loading-background="rgba(0, 0, 0, 0.8)"
+              >
+                <el-upload
+                  class="avatar-uploader"
+                  :action="actionUrl"
+                  :data="{
+                    bucket: 'tourism'
+                  }"
+                  :show-file-list="false"
+                  :before-upload="beforeAvatarUploadMore"
+                  :on-success="handleAvatarSuccessMore"
+                  :on-progress="handleAvatarProgressMore"
+                  :disabled="actionUrlMoreLoading"
+                  :on-error="handleAvatarErrorMore"
+                  >
+                  <i class="el-icon-plus avatar-uploader-icon"></i>
+                </el-upload>
+              </div>
+              
+            </div>
+            <span>建议上传图片尺寸140px X 90px,支持jpg、png、gif,支持5MB大小以内的图片上传</span>
+          </el-form-item>
+
+          <el-form-item label="营业时间：" prop="openTimeStart">
+            <div style="display: flex;">
+              <el-form-item label-width="0" label="">
+                <el-input style="width: 150px;" v-model="form.openTimeStart" placeholder="请输入开始时间" />
+              </el-form-item>
+              <span>--</span>
+              <el-form-item label-width="0" label="" prop="openTimeEnd">
+                <el-input style="width: 150px;" v-model="form.openTimeEnd" placeholder="请输入结束时间" />
+              </el-form-item>
+            </div>
+          </el-form-item>
+
+          <el-form-item label="餐厅地址" prop="address">
+            <el-input
+              v-model="form.address"
+              placeholder="请输入餐厅地址"
+              clearable
+              style="width: 300px"
+            />
+          </el-form-item>
+          <div style="display: flex;">
+            <el-form-item label="经度" prop="longitude">
+                <el-input
+                v-model="form.longitude"
+                placeholder="请输入经度"
+                clearable
+                style="width: 300px"
+                readonly
+                />
+            </el-form-item>
+            <el-form-item label="纬度" prop="latitude">
+                
+                <el-input
+                v-model="form.latitude"
+                placeholder="请输入纬度"
+                clearable
+                style="width: 300px"
+                readonly
+                />
+            </el-form-item>   
+          </div>
+          <div style="width: 100%;height: 300px;">
+            <qqMapBox ref="qqMapBox" @setDot="setDot" />
+          </div>
+          <el-form-item label="联系电话：" style="margin-top: 20px;">
+            <el-input style="width: 350px;" v-model="form.contactsMobile" placeholder="请输入联系电话" />
+          </el-form-item>
+          <div style="display: flex;">
+            <el-form-item label="门店标签：" prop="shopLabel">
+              <div>
+                <div>
+                  <el-input style="width: 250px;" v-model="shopLabel" placeholder="请输入门店标签" maxlength="6" show-word-limit />
+                  <el-button
+                    type="primary"
+                    v-if="form.shopLabel.length<5"
+                    @click="addshopLabel"
+                    style="margin-left: 10px;"
+                  > 
+                    添加标签
+                  </el-button>
+                  <el-button
+                    type="danger"
+                    @click="clearAllshopLabel"
+                    style="margin-left: 10px;"
+                  > 
+                    全部清除
+                  </el-button>
+                  <span style="font-size: 12px;color: #ccc;margin-left: 15px;">(最多可添加5个标签)</span>
+                </div>
+                <div>
+                  <el-tag
+                    v-for="(tag,index) in form.shopLabel"
+                    :key="index"
+                    @close="clearshopLabel(tag,index)"
+                    style="margin-right: 5px;"
+                    closable>
+                    {{tag}}
+                  </el-tag>
+                </div>
+              </div>
+              
+            </el-form-item>
+            
+          </div>
+          <el-form-item label="是否支持取消订单：" :prop="'cancelOrderFlag'">
+                <div style="display: flex;align-items: center;">
+                  <el-radio-group v-model="form.cancelOrderFlag" @input="radioInputs">
+                    <div style="display: flex;align-items: center;">
+                      <el-radio label="-1">否</el-radio>
+                      <el-radio label="-2">随时可取消</el-radio>
+                      <el-radio style="display: flex;align-items: center;" label="-3">
+                        <el-form-item label="" label-width="0" :prop="'cancelOrderTime'">
+                          <span>下单后</span>
+                          <el-input-number 
+                            :disabled="form.cancelOrderFlag!=-3"
+                            v-model="form.cancelOrderTime" 
+                            placeholder="请输入分钟"
+                            controls-position="right">
+                          </el-input-number>
+                          <span>分钟内可取消订单</span>
+                        </el-form-item>
+                      </el-radio>
+                    </div>
+                  </el-radio-group>
+                </div>
+          </el-form-item>
+          <el-form-item label-width="80px" label="须知说明">
+            <editor ref="editor" v-model="form.shopDetail" :fileSize="20" :min-height="200" />
+          </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 { 
+  getTableDeatilsByIdApi,
+  updateTableApi,
+  addTableApi
+ } from '@/api/CURD'
+import Editor from "@/components/Editor";
+import qqMapBox from '@/myComponents/qqMap.vue'
+export default {
+  name: "addAndEdit",
+  dicts: ['tourism_online_status','tourism_online_type'],
+  components: {Editor,qqMapBox},
+  data() {
+    return {
+      title: "",
+      activeName: 'first',
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      loadingText: "拼命加载数据中...",
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configUrl: {
+        add: '/merchant/merchantShop/insertOrUpdate', // 新增地址
+        details: '/merchant/merchantShop/selectById', // 详情地址
+        edit: '/merchant/merchantShop/insertOrUpdate', // 编辑地址
+      },
+      form: {
+        id: undefined,
+        shopAdvImgs: [],
+        shopLabel: [],
+        cancelOrderFlag: '-1'
+      },
+      rules: {
+        name: [{ required: true, message: "请输入门店名称", trigger: ["change","blur"] }],
+        affiliationArea: [{ required: true, message: "请输入归属景区", trigger: ["change","blur"] }],
+        shopLogo: [{ required: true, message: "请上传商铺Logo", trigger: ["change","blur"] }],
+        shopAdvImgs: [{ required: true, message: "请上传门店宣传", trigger: ["change","blur"] }],
+        shopDetail: [{ required: true, message: "请输须知说明", trigger: ["change","blur"] }],
+        openTimeStart: [{ required: true, message: "请输入开始时间", trigger: ["change","blur"] }],
+        openTimeEnd: [{ required: true, message: "请输入结束时间", trigger: ["change","blur"] }],
+        address: [{ required: true, message: "请输入餐厅地址", trigger: ["change","blur"] }],
+        longitude: [{ required: true, message: "请输入经度", trigger: ["change","blur"] }],
+        latitude: [{ required: true, message: "请输入纬度", trigger: ["change","blur"] }],
+       
+        cancelOrderFlag: [{ required: true, message: "请选择是否支持取消订单", trigger: ["change","blur"] }],
+        cancelOrderTime: [{ required: false, message: "请输入分钟", trigger: ["change","blur"] }],
+      },
+      scenicAreaProducts: [],// 景点产品关联
+
+      //  上传文件
+      actionUrl: process.env.VUE_APP_BASE_API + process.env.VUE_APP_UPLOAD_IMAGE,
+      actionUrlLoading: false,
+      actionUrlMoreLoading: false,
+      shopLabel: '',
+    };
+  },
+  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,
+          shopAdvImgs: [],
+          shopLabel: [],
+          cancelOrderFlag: '-1'
+        })
+        this.formStatus = 1
+      }else if(model=='EDIT') { // 新增
+        let obj = {
+          ...row
+        }
+        this.$set(this,'form',obj)
+        this.formStatus = 1
+      }else if(model=='EDITInit') { // 新增
+        await this.getTableDeatilsFun(row)
+      }
+      this.loading = false
+      this.$nextTick(()=>{
+        if(this.$refs["form"]) {
+          this.$refs["form"].clearValidate();
+          this.radioInputs(this.form.cancelOrderFlag)
+        }
+      })
+    },
+    /** 获取详情 */
+    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,
+            shopAdvImgs: res.data.shopAdvImgs ? res.data.shopAdvImgs.split(',') : [],
+            shopLabel: res.data.shopLabel ? res.data.shopLabel.split(',') : []
+          }
+          if(obj.cancelOrderFlag == 0) {
+            obj.cancelOrderFlag = '-1'
+            obj['cancelOrderTime'] = undefined
+          }else if(obj.cancelOrderFlag == 1 && obj.cancelOrderTime > 0){
+            obj.cancelOrderFlag = '-3'
+          }else if(obj.cancelOrderFlag == 1 && obj.cancelOrderTime == 0) {
+            obj.cancelOrderFlag = '-2'
+            obj['cancelOrderTime'] = undefined
+          }
+          this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
+          this.formStatus = 1
+          this.$nextTick(()=>{
+            if(this.form.longitude&&this.form.latitude){
+              this.$refs.qqMapBox.setMakerLayer({
+                height: 0,
+                lat: this.form.latitude,
+                lng: this.form.longitude,
+              },true)
+            }
+            
+          })
+        }else {
+          this.$message.error('获取详情失败!!!');
+          this.formStatus = 2
+          this.loading = false
+          this.open = false;
+        }
+        this.loading = false
+      } catch (error) {
+        console.error('获取详情失败!!!!',error)
+        this.formStatus = 2
+        this.loading = false
+        this.open = false;
+      }
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.loadingText = "提交数据中..."
+          this.loading = true
+          let params = JSON.parse(JSON.stringify(this.form))
+          if(params.cancelOrderFlag == -1){
+            params['cancelOrderFlag'] = 0
+            params['cancelOrderTime'] = null
+          }else if(params.cancelOrderFlag == -3) {
+            params['cancelOrderFlag'] = 1
+          }else if(params.cancelOrderFlag == -2) {
+            params['cancelOrderFlag'] = 1
+            params['cancelOrderTime'] = 0
+          }
+          params.shopLabel = params.shopLabel.join(',')
+          params.shopAdvImgs = params.shopAdvImgs.join(',')
+          if (this.model != 'ADD') {
+            addTableApi(
+              this.configUrl.edit,{
+                ...params,
+                shopType: 4,
+              }).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.loading = false
+              this.open = false;
+              this.$emit('refresh')
+            }).catch(()=>{
+              this.$message.error("修改失败!!!");
+              this.loading = false
+            })
+          } else {
+            addTableApi(this.configUrl.edit,{
+                ...params,
+                shopType: 4,
+              }).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;
+    },
+
+    /**  上传图片 单张  */
+    handleAvatarSuccess(res, file) {
+      console.log("res, file",res, file)
+      this.actionUrlLoading = false
+      if(res.code != 200) {
+        this.$set(this.form,'shopLogo',null) 
+      }else {
+        this.$set(this.form,'shopLogo',res.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','gif']
+      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
+    },
+    /**  上传图片 多张  */
+    beforeAvatarUploadMore(file) {
+      const isLt2M = file.size / 1024 / 1024 <= 5;
+      let testmsg = file.name.substring(file.name.lastIndexOf('.')+1)
+      let typeList = ['png','jepg','jpg','gif']
+      const isJPG = typeList.includes(testmsg);
+      if (!isJPG) {
+        this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片图片大小不能超过 5MB!');
+      }
+      return isJPG && isLt2M;
+    },
+    handleAvatarSuccessMore(response, file, fileList) {
+      console.log("res, file===",response, file, fileList)
+      this.actionUrlMoreLoading = false
+      if(response.code == 200) {
+        this.form.shopAdvImgs.push(response.data.url)
+      }
+      // if(res.code != 200) {
+      //   this.$set(this.form,'photos',null) 
+      // }else {
+      //   this.$set(this.form,'photos',res.data.url) 
+      // }
+      
+    },
+    handleRemoveMore(index) {
+      this.form.shopAdvImgs.splice(index,1)
+    },
+    handleAvatarProgressMore(){
+      this.actionUrlMoreLoading = true
+    },
+    handleAvatarErrorMore() {
+      this.actionUrlMoreLoading = false
+    },
+
+    /**  标签 */
+    clearAllshopLabel() {
+      this.form.shopLabel = []
+    },
+    clearshopLabel(tag,index) {
+      this.form.shopLabel.splice(index,1)
+    },
+    addshopLabel() {
+      if(this.shopLabel) {
+        this.form.shopLabel.push(this.shopLabel)
+        this.shopLabel = ''
+      }else {
+        this.$message.error('请填写内容!!!');
+      }
+    },
+
+    /**  */
+    radioInputs(value) {
+      if( value == -1 ){
+        this.rules.cancelOrderTime[0].required = false
+        this.$refs.form.clearValidate('cancelOrderTime');
+      }else if( value == -3 ) {
+        this.rules.cancelOrderTime[0].required = true
+      }else if( value == -2 ) {
+        this.rules.cancelOrderTime[0].required = false
+        this.$refs.form.clearValidate('cancelOrderTime');
+      }
+    },
+    setDot(params){
+      this.$set(this.form,'longitude',params.lng)
+      this.$set(this.form,'latitude',params.lat)
+    }
+  },
+  watch: {
+    'form.shopDetail'() {
+      if(this.form.shopDetail == '<p><br></p>') {
+        this.form.shopDetail = null
+      }
+      if(this.$refs["form"]) {
+        this.$refs["form"].validateField('shopDetail');
+      }
+    }
+  }
+};
+</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/productManagement/formBox/commodityClassForm.vue

@@ -0,0 +1,371 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="40%"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="form-dialog-box"
+    v-loading="loading"
+    :element-loading-text="loadingText"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0)">
+      <div
+        v-loading="loading"
+        :element-loading-text="''"
+        element-loading-spinner="''"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+        >
+        <el-form :model="form" ref="form" :rules="rules" label-width="130px">
+          <el-form-item label="上级分类：" prop="parentsId">
+              <treeselect
+                v-model="form.parentsId"
+                :options="listTreeCopy"
+                :show-count="true"
+                placeholder="选择上级分类"
+              />
+            </el-form-item>
+          <el-form-item label="分类名称：" prop="classifyName">
+            <el-input style="width: 350px;" v-model="form.classifyName" placeholder="请输入分类名称" maxlength="50" show-word-limit />
+          </el-form-item>
+          <el-form-item label="排序：">
+            <el-input style="width: 350px;" v-model="form.sort" placeholder="请输入排序" />
+          </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 { 
+  getTableDeatilsByIdApi,
+  updateTableApi,
+  listTableApi,
+  addTableApi
+ } from '@/api/CURD'
+ import Treeselect from "@riophae/vue-treeselect";
+ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+export default {
+  name: "addAndEdit",
+  dicts: ['tourism_online_status','tourism_online_type'],
+  components: {Treeselect},
+  data() {
+    return {
+      title: "",
+      activeName: 'first',
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      loadingText: "拼命加载数据中...",
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configUrl: {
+        list: '/goods/goodsClassify/treeList', // 列表地址
+        add: '/goods/goodsClassify/insertOrUpdate', // 新增地址
+        details: '/goods/goodsClassify/selectById', // 详情地址
+        edit: '/goods/goodsClassify/insertOrUpdate', // 编辑地址
+      },
+      form: {
+        id: undefined,
+      },
+      rules: {
+        parentsId: [{ required: true, message: "请选择上级分类", trigger: ["change","blur"] }],
+        classifyName: [{ required: true, message: "请选择分类名称", trigger: ["change","blur"] }],
+      },
+      listTreeCopy: []
+    };
+  },
+  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
+      await this.getList()
+      if(model=='ADD') { // 新增
+        this.$set(this,'form',row)
+        this.formStatus = 1
+      }else if(model=='EDIT') { // 新增
+        let obj = {
+          ...row
+        }
+        this.$set(this,'form',obj)
+        this.formStatus = 1
+      }else if(model=='EDITInit') { // 新增
+        await this.getTableDeatilsFun(row)
+      }
+      this.loading = false
+      this.$nextTick(()=>{
+        if(this.$refs["form"]) {
+          this.$refs["form"].clearValidate();
+        }
+      })
+    },
+      /** 查询用户列表 */
+      getList() {
+        listTableApi(this.configUrl.list).then(response => {
+              let list = response.data
+              this.listTreeCopy = [
+                {
+                  "id": "-9999",
+                  "label": "顶级",
+                  "children": [...list]
+                }
+              ];
+          }
+        ).catch (error=>{
+          console.error('获取列表失败!!!!',error)
+          this.listTreeCopy = [];
+        })
+      },
+    /** 获取详情 */
+    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.parentsId || obj.parentsId == '0') {
+            obj['parentsId'] = '-9999'
+          }
+          this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
+          this.formStatus = 1
+        }else {
+          this.$message.error('获取详情失败!!!');
+          this.formStatus = 2
+          this.loading = false
+          this.open = false;
+        }
+        this.loading = false
+      } catch (error) {
+        console.error('获取详情失败!!!!',error)
+        this.formStatus = 2
+        this.loading = false
+        this.open = false;
+      }
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.loadingText = "提交数据中..."
+          this.loading = true
+          if (this.model != 'ADD') {
+            addTableApi(
+              this.configUrl.edit,{
+                ...this.form,
+                parentsId: this.form.parentsId == '-9999' ? '':this.form.parentsId
+              }).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.loading = false
+              this.open = false;
+              this.$emit('refresh')
+            }).catch(()=>{
+              this.$message.error("修改失败!!!");
+              this.loading = false
+            })
+          } else {
+            addTableApi(this.configUrl.edit,{
+                ...this.form,
+                parentsId: this.form.parentsId == '-9999' ? '':this.form.parentsId
+              }).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.loading = false
+              this.open = false;
+              this.$emit('refresh')
+            }).catch(()=>{
+              this.$message.error("新增失败!!!");
+              this.loading = false
+            })
+          }
+        }
+      });
+    },
+    /**
+     * 重置
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    reset() {
+      if(this.$refs["form"]) {
+        this.$refs["form"].clearValidate();
+      }
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.form-dialog-box {
+  padding: 0 30px;
+  padding: 0 30px;
+  min-height: 50vh;
+  max-height: 65vh;
+  overflow-y: auto;
+  >div {
+    width: 100%;
+    min-height: 50vh;
+  }
+  .form-title {
+    padding: 0 0 10px 0;
+    span {
+      display: flex;
+      color: rgba(65,80,88,1);
+      font-size: 16px;
+      font-family: SourceHanSansSC;
+      font-weight: 700;
+      line-height: 23px;
+      border-left: 4px solid rgb(22, 132, 252);
+      padding-left: 10px;
+    }
+    
+  }
+  ::v-deep .ql-editor {
+    height: 400px;
+  }
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+.el-table{
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+
+.area-container {
+  min-height: 400px;
+}
+
+::v-deep .area-wrap-city.el-cascader {
+  line-height: normal;
+  .el-input {
+    cursor: pointer;
+    width: 100% !important;
+    height: 28px !important;
+    .el-input__inner {
+      display: none !important;
+    }
+    span.el-input__suffix {
+      position: inherit !important;
+      i.el-input__icon {
+        line-height: inherit;
+        margin-left: 5px;
+      }
+    }
+
+    .el-input__wrapper {
+      box-shadow: none;
+      input {
+        display: none;
+      }
+    }
+  }
+
+  .el-cascader__tags {
+    display: none;
+  }
+}
+
+.area-city-popper {
+  .el-cascader-panel {
+    .el-scrollbar.el-cascader-menu {
+      .el-cascader-menu__wrap.el-scrollbar__wrap {
+        height: 315px;
+      }
+    }
+  }
+}
+
+::v-deep .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  ::v-deep .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  ::v-deep .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 100px;
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+  }
+  ::v-deep .avatar {
+    width: 100px;
+    height: 100px;
+    display: block;
+  }
+</style>
+<style>
+.custom-class-box {
+  z-index: 999999 !important;
+}
+</style>

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

@@ -0,0 +1,678 @@
+<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>
+          <el-form-item label="菜品名称：" prop="goodsName">
+            <el-input style="width: 350px;" v-model="form.goodsName" placeholder="请输入菜品名称" maxlength="10" show-word-limit />
+          </el-form-item>
+          <el-form-item label="菜品图片" prop="goodsImage">
+            <div style="display: flex;">
+              <div 
+              v-for="(item,index) in form.goodsImage" 
+              :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.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 
+              style="width: 100px; height: 100px;" 
+              v-if="!form.goodsImage||form.goodsImage.length<1"
+              v-loading="actionUrlLoading"
+              element-loading-text="上传中..."
+              element-loading-spinner="el-icon-loading"
+              element-loading-background="rgba(0, 0, 0, 0.8)"
+              >
+                <el-upload
+                  class="avatar-uploader"
+                  :action="actionUrl"
+                  :data="{
+                    bucket: 'tourism'
+                  }"
+                  :show-file-list="false"
+                  :before-upload="beforeAvatarUpload"
+                  :on-success="handleAvatarSuccess"
+                  :on-progress="handleAvatarProgress"
+                  :disabled="actionUrlLoading"
+                  :on-error="handleAvatarError"
+                  >
+                  <i class="el-icon-plus avatar-uploader-icon"></i>
+                </el-upload>
+              </div>
+              
+            </div>
+            <span>建议上传图片尺寸200px X 144px,支持jpg、png,支持5MB大小以内的图片上传</span>
+          </el-form-item>
+          <el-form-item label="分类类型：" prop="classifyId">
+            <div style="width: 350px;">
+              <treeselect
+                v-model="form.classifyId"
+                :options="listTreeCopy"
+                :show-count="true"
+                placeholder="请选择分类类型"
+              />
+            </div>
+          </el-form-item>
+          <div>
+            <div>
+              <el-form-item label="是否多规格：" prop="specFlag">
+                <el-radio-group v-model="form.specFlag" placeholder="请选择是否多规格">
+                  <el-radio :label="1">单规格</el-radio>
+                  <el-radio :label="2">多规格</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </div>
+            <div v-if="form.specFlag == 1">
+              <el-form-item label="规格：" prop="specName">
+                <el-input style="width: 250px;" v-model="form.specName" placeholder="请输入规格" />
+              </el-form-item>
+              <el-form-item label="菜品价格(元)：" prop="salePrice">
+                <el-input-number 
+                  v-model="form.salePrice" 
+                  placeholder="请输入菜品价格"
+                  controls-position="right">
+                </el-input-number>
+              </el-form-item>
+            </div>
+            <div v-if="form.specFlag == 2">
+              <el-form-item label=" " prop="goodsSkuList">
+                <el-button style="margin-bottom: 10px;" type="primary" @click="addGoodsSkuList" size="small">新增</el-button>
+                  <el-table
+                  :data="form.goodsSkuList"
+                  border
+                  style="width: 100%">
+                    <el-table-column
+                      fixed
+                      prop="skuName"
+                      label="规格名称">
+                      <template slot-scope="scope">
+                        <el-input v-model="scope.row.skuName" placeholder="请输入内容"></el-input>
+                      </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>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                      fixed="right"
+                      label="操作">
+                      <template slot-scope="scope">
+                        <el-button @click="clearGoodsSkuList(scope.row,scope.$index)" type="text" size="small">删除</el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+              </el-form-item>
+            </div>
+          </div>
+          <el-form-item label="库存数量：" prop="quantity">
+            <el-input-number 
+              v-model="form.quantity" 
+              placeholder="请输入库存数量"
+              :step="1"
+              controls-position="right">
+            </el-input-number>
+          </el-form-item>
+          <div style="display: flex;">
+            <el-form-item label="菜品标签：" prop="labelName">
+              <div>
+                <div>
+                  <el-input style="width: 250px;" v-model="labelName" placeholder="请输入菜品标签" maxlength="6" show-word-limit />
+                  <el-button
+                    type="primary"
+                    v-if="form.labelName.length<5"
+                    @click="addLabelName"
+                    style="margin-left: 10px;"
+                  > 
+                    添加标签
+                  </el-button>
+                  <el-button
+                    type="danger"
+                    @click="clearAllLabelName"
+                    style="margin-left: 10px;"
+                  > 
+                    全部清除
+                  </el-button>
+                  <span style="font-size: 12px;color: #ccc;margin-left: 15px;">(最多可添加5个标签)</span>
+                </div>
+                <div>
+                  <el-tag
+                    v-for="(tag,index) in form.labelName"
+                    :key="index"
+                    @close="clearLabelName(tag,index)"
+                    style="margin-right: 5px;"
+                    closable>
+                    {{tag}}
+                  </el-tag>
+                </div>
+              </div>
+            </el-form-item>
+          </div>
+          <el-form-item label-width="80px" label="菜品详情">
+            <editor ref="editor" v-model="form.goodsSnapshot" :fileSize="20" :min-height="200" />
+          </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 { 
+  getTableDeatilsByIdApi,
+  updateTableApi,
+  addTableApi
+ } from '@/api/CURD'
+import Editor from "@/components/Editor";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+export default {
+  name: "addAndEdit4",
+  dicts: ['tourism_online_status','tourism_online_type'],
+  components: {Editor,Treeselect},
+  props: ['listTreeCopy'],
+  data() {
+    return {
+      title: "",
+      activeName: 'first',
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      loadingText: "拼命加载数据中...",
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configUrl: {
+        add: '/merchant/merchantPerformAuditorium/saveMerchantGoods', // 新增地址
+        details: '/merchant/merchantPerformAuditorium/merchantGoodsDetail', // 详情地址
+        edit: '/merchant/merchantPerformAuditorium/saveMerchantGoods', // 编辑地址
+      },
+      form: {
+        id: undefined,
+        goodsImage: [],
+        labelName: [],
+        goodsSkuList: []
+      },
+      rules: {
+        goodsName: [{ required: true, message: "请输入菜品名称", trigger: ["change","blur"] }],
+        classifyId: [{ required: true, message: "请选择分类类型", trigger: ["change","blur"] }],
+        salePrice: [{ required: true, message: "请输入菜品价格", trigger: ["change","blur"] }],
+        specName: [{ required: true, message: "请输入规格", trigger: ["change","blur"] }],
+        unitName: [{ required: true, message: "请输入单位", trigger: ["change","blur"] }],
+        labelName: [{ required: false, message: "请输入菜品标签", trigger: ["change","blur"] }],
+        status: [{ required: true, message: "请选择菜品上架", trigger: ["change","blur"] }],
+        goodsSnapshot: [{ required: true, message: "请上传菜品图片", trigger: ["change","blur"] }],
+        goodsImage: [{ required: true, message: "请输入菜品介绍", trigger: ["change","blur"] }],
+        quantity: [{ required: true, message: "请输入库存数量", trigger: ["change","blur"] }],
+
+
+        daySaleRadio: [{ required: true, message: "请选择菜品限购", trigger: ["change","blur"] }],
+        daySale: [{ required: false, message: "请输入每日限售数量", trigger: ["change","blur"] }],
+        buyAstrict: [{ required: false, message: "请输入下单限购数量", trigger: ["change","blur"] }],
+        
+        specFlag: [{ required: true, message: "请选择是否多规格", trigger: ["change","blur"] }],
+        backStatus: [{ required: true, message: "请选择允许退款", trigger: ["change","blur"] }],
+        goodsSkuList: [{ required: true, message: "请输入规格", trigger: ["change","blur"] }],
+      },
+      scenicAreaProducts: [],// 景点产品关联
+
+      //  上传文件
+      actionUrl: process.env.VUE_APP_BASE_API + process.env.VUE_APP_UPLOAD_IMAGE,
+      actionUrlLoading: false,
+      labelName: ''
+    };
+  },
+  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.labelName = ''
+      if(model=='ADD') { // 新增
+        this.$set(this,'form',{
+          ...row,
+          goodsImage: [],
+          daySaleRadio: '-1',
+          backStatus: 0,
+          status: 1,
+          labelName: [],
+          goodsSkuList: [],
+        })
+        this.formStatus = 1
+      }else if(model=='EDIT') { // 新增
+        let obj = {
+          goodsImage: [],
+          status: 1,
+          labelName: [],
+          goodsSkuList: [],
+          ...row,
+        }
+        this.$set(this,'form',obj)
+        this.formStatus = 1
+      }else if(model=='EDITInit') { // 新增
+        await this.getTableDeatilsFun(row)
+      }
+      this.loading = false
+      this.$nextTick(()=>{
+        if(this.$refs["form"]) {
+          this.$refs["form"].clearValidate();
+          this.radioInputs(this.form.daySaleRadio)
+        }
+      })
+    },
+    /** 获取详情 */
+    async getTableDeatilsFun(row) {
+      const id = row.id
+      this.loading = true
+      try {
+        let res = await getTableDeatilsByIdApi(this.configUrl.details,{goodsId: row.goodsId})
+        if(res.code == 200) {
+          let obj = {
+            ...res.data,
+            labelName: res.data.labelName ? res.data.labelName.split(',') : [],
+            goodsSkuList: res.data.goodsSkuList ? res.data.goodsSkuList : [],
+          }
+          if(obj.goodsImage) {
+            obj.goodsImage = obj.goodsImage.split(',')
+          }else {
+            obj.goodsImage = []
+          }
+          if(obj.daySale<=0 && obj.buyAstrict<=0) {
+            obj.daySaleRadio = '-1'
+            obj.daySale = undefined
+            obj.buyAstrict = undefined
+          }else if(obj.daySale > 0){
+            obj.daySaleRadio = '-3'
+            obj.daySale = obj.daySale
+            obj.buyAstrict = undefined
+          }else if(obj.buyAstrict > 0) {
+            obj.daySaleRadio = '-2'
+            obj.daySale = undefined
+            obj.buyAstrict = obj.buyAstrict
+          }
+
+          this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
+          this.formStatus = 1
+        }else {
+          this.$message.error('获取详情失败!!!');
+          this.formStatus = 2
+          this.loading = false
+          this.open = false;
+        }
+        this.loading = false
+      } catch (error) {
+        console.error('获取详情失败!!!!',error)
+        this.formStatus = 2
+        this.loading = false
+        this.open = false;
+      }
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let flog = false
+          this.form.goodsSkuList.forEach((item,index)=>{
+            if(!item.skuName || (!item.price && item.price !=0)) {
+              flog = true
+            }
+          })
+          if(flog) {
+            this.$message.error("请输入规格名称或菜品价格!!!");
+            return
+          }
+          this.loadingText = "提交数据中..."
+          this.loading = true
+          let params = JSON.parse(JSON.stringify(this.form))
+          if(params.daySaleRadio == -1){
+            params['daySale'] = -1
+            params['buyAstrict'] = -1
+          }else if(params.daySaleRadio == -3) {
+            params['daySale'] =  params.daySale
+            params['buyAstrict'] = -1
+          }else if(params.daySaleRadio == -2) {
+            params['daySale'] =  -1
+            params['buyAstrict'] = params.buyAstrict
+          }
+          params.labelName = params.labelName.join(',')
+          params.goodsImage = params.goodsImage.join(',')
+          params.classifyName = this.valueChange(this.listTreeCopy,this.form.classifyId)
+          delete params.daySaleRadio
+          if (this.model != 'ADD') {
+            addTableApi(
+              this.configUrl.edit,{
+                ...params,
+                goodsType: 4,
+              }).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.loading = false
+              this.open = false;
+              this.$emit('refresh')
+            }).catch(()=>{
+              this.$message.error("修改失败!!!");
+              this.loading = false
+            })
+          } else {
+            addTableApi(this.configUrl.edit,{
+              ...params,
+              goodsType: 4,
+              }).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;
+    },
+
+    /**  上传图片 单张  */
+    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 == -3 ) {
+        this.rules.daySale[0].required = true
+        this.rules.buyAstrict[0].required = false
+        this.$refs.form.clearValidate('buyAstrict');
+      }else if( value == -2 ) {
+        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
+    },
+    clearAllLabelName() {
+      this.form.labelName = []
+    },
+    clearLabelName(tag,index) {
+      this.form.labelName.splice(index,1)
+    },
+    addLabelName() {
+      if(this.labelName) {
+        this.form.labelName.push(this.labelName)
+        this.labelName = ''
+      }else {
+        this.$message.error('请填写内容!!!');
+      }
+    },
+    /**  新增规格  */
+    addGoodsSkuList() {
+      this.form.goodsSkuList.push({
+        skuName: undefined,
+        price: undefined
+      })
+    },
+    /**  删除规格  */
+    clearGoodsSkuList(row,index) {
+      this.form.goodsSkuList.splice(index,1)
+    }
+  },
+  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/productManagement/tabelBox/cateringManagementCategoryTabel.vue

@@ -0,0 +1,546 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="90%"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="form-dialog-box">
+      <div class="app-container1">
+        <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="goodsName">
+                      <el-input
+                          v-model="queryParams.goodsName"
+                          placeholder="请输入菜品名称"
+                          clearable
+                          style="width: 240px"
+                          @keyup.enter.native="handleQuery"
+                      />
+                  </el-form-item>
+                  <el-form-item label="分类类型:" prop="classifyId">
+                    <div style="width: 200px;">
+                      <treeselect
+                        v-model="queryParams.classifyId"
+                        :options="listTreeCopy"
+                        :show-count="true"
+                        placeholder="请选择分类类型"
+                      />
+                    </div>
+                  </el-form-item>
+                  <el-form-item label="上架状态:" prop="status">
+                    <el-select v-model="queryParams.status" clearable placeholder="请选择上架状态">
+                      <el-option :key="1" label="下架" :value="1"></el-option>
+                      <el-option :key="0" label="上架" :value="0"></el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item>
+                      <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                      <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                  </el-form-item>
+              </el-form>
+    
+              <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd"
+                  v-hasPermi="configPermi.add"
+                >添加商品</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="goodsImage" prop="goodsImage" v-if="columns[0].visible" :show-overflow-tooltip="true">
+                  <template slot-scope="scope">
+                      <el-image
+                      style="width: 60px; height: 40px"
+                      :src="scope.row.goodsImage"
+                      :preview-src-list="[scope.row.goodsImage]"
+                      fit="fill"></el-image>
+                  </template>
+              </el-table-column>
+              <el-table-column label="菜品名称" align="center" key="goodsName" prop="goodsName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+              <el-table-column label="分类类型" align="center" key="classifyName" prop="classifyName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+              <el-table-column label="价格(元)" align="center" key="salePrice" prop="salePrice" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+              <el-table-column label="库存" align="center" key="quantity" prop="quantity" v-if="columns[5].visible" :show-overflow-tooltip="true" />
+              <el-table-column label="上架/下架" align="center" key="status" v-if="columns[9].visible">
+                <template slot-scope="scope">
+                  <switchBox 
+                  :defaultChecked="true" 
+                  v-model="scope.row.status" 
+                  @changeFun="openAttraction(scope.row)" 
+                  :disabled="false"
+                  :active-value="0"
+                  :inactive-value="1"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column label="创建时间" align="center" key="createTime" prop="createTime" v-if="columns[10].visible" :show-overflow-tooltip="true" />
+              <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-edit"
+                    @click="handleDetails(scope.row)"
+                    v-hasPermi="configPermi.details"
+                  >详情</el-button>
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-edit"
+                    @click="handleUpdate(scope.row)"
+                    v-hasPermi="configPermi.edit"
+                  >修改</el-button>
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="handleDelete(scope.row)"
+                    v-hasPermi="configPermi.delect"
+                  >删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+
+            <pagination
+              v-show="total>0"
+              :total="total"
+              :page.sync="queryParams.pageNum"
+              :limit.sync="queryParams.pageSize"
+              @pagination="getList"
+            />
+          </el-col>
+        </el-row>
+        
+      </div>
+    </div>
+    <!-- 添加或修改对话框 End -->
+    <!--  新增或修改  -->
+    <addAndEditBox ref="addAndEditBox" :listTreeCopy="listTreeCopy" @refresh="getList" />
+    <!--  详情   -->
+    <detailsBox ref="detailsBox" @refresh="getList"></detailsBox>
+  </el-dialog>
+</template>
+
+<script>
+import {
+  listTableApi,
+  delTableParamsApi,
+  publicByPutApi as releaseApi,
+  addTableApi
+} from "@/api/CURD";
+import addAndEditBox from "../formBox/commodityListForm.vue"
+import detailsBox from "../detailsBox/commodityListDetails.vue"
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "CateringManagementCategoryTabel",
+  dicts: [],
+  components: {
+    addAndEditBox,
+    Treeselect,
+    detailsBox
+  },
+  data() {
+    return {
+      title: "",
+      activeName: 'first',
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      loadingText: "拼命加载数据中...",
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configPermi: {
+          add: ['commodityManagement:commodityList:add'], // 新增权限
+          details: ['commodityManagement:commodityList:details'], // 详情权限
+          delect: ['commodityManagement:commodityList:delect'], // 删除权限
+          edit: ['commodityManagement:commodityList:edit'], // 编辑基本信息权限
+          upload: [''],// 导入权限
+          export: [''],// 导出权限
+          release: ['']
+        },
+        configUrl: {
+          list: '/merchant/merchantPerformAuditorium/shopGoodsList', // 列表地址
+          delect: '/merchant/merchantPerformAuditorium/deleteMerchantGoods', // 删除地址
+          upload: '',// 导入地址
+          download:'', // 下载模板地址
+          export: '',// 导出地址
+          updateStatusById: '/merchant/merchantPerformAuditorium/updateStatus',
+          classifyList: '/goods/goodsClassify/treeList', // 商品分类
+          shopList: '/merchant/merchantShop/pageList', // 店铺
+        },
+
+        tabelId: null,
+        tabelName: null,
+
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 用户表格数据
+        tableList: null,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+        },
+        dateRange: [],
+        // 控制列表是否显示
+        columns: [
+          { key: 0, label: `商品图片`, visible: true },
+          { key: 2, label: `商品名称`, visible: true },
+          { key: 3, label: `分类`, visible: true },
+          { key: 4, label: `销售价格`, visible: true },
+          { key: 5, label: `规格`, visible: true },
+          { key: 6, label: `库存`, visible: true },
+          { key: 7, label: `总销量`, visible: true },
+          { key: 8, label: `单位`, visible: true },
+          { key: 9, label: `限购`, visible: true },
+          { key: 10, label: `上架/下架`, visible: true },
+          { key: 11, label: `创建时间`, visible: true },
+        ],
+        listTreeCopy: [],
+        shopList: [],
+        shopListTime: null,
+        shopListLoading: 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 = 1
+      this.loading = false
+      this.tabelId = row.id
+      this.tabelName = row.name
+      this.getList();
+      this.remoteClassifyId()
+      this.remoteShop('')
+    },
+    /** 查询用户列表 */
+    getList() {
+        this.loading = true;
+        let params = JSON.parse(JSON.stringify(this.queryParams))
+        params['shopId'] = this.tabelId
+        params['goodsType'] = 4
+        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.addAndEditBox) {
+          this.$refs.addAndEditBox.initData(this.title + '新增', "ADD",{
+            shopId: this.tabelId,
+            shopName: this.tabelName
+          })
+        }
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        if(this.$refs.addAndEditBox) {
+          console.log("dsfsdfdsfsdfsfdsdfsdf",this.$refs.addAndEditBox)
+          this.$refs.addAndEditBox.initData(this.title + '编辑', "EDITInit",{...row})
+        }
+      },
+      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() {
+        this.download(this.configUrl.export, {
+          ...this.queryParams
+        }, `${this.title }_${new Date().getTime()}.xlsx`)
+      },
+      /** 导入按钮操作 */
+      handleImport() {
+        if(this.$refs.upload) {
+          this.$refs.upload.initData({
+            width: '400px',
+            // 弹出层标题（用户导入）
+            title: this.title + "导入",
+            // 下载模板地址
+            importTemplate: this.configUrl.download,
+            // 上传的地址
+            url: this.configUrl.upload
+          })
+        }
+      },
+      /**
+       * 修改状态
+       * @date 2023-11-22
+       * @returns {any}
+       */
+      openAttraction(row) {
+        this.$modal.confirm(`是否确认${row.status == 0 ? '下架' : '上架'}吗？`).then( () => {
+          return addTableApi(this.configUrl.updateStatusById,{
+            goodsId: row.goodsId,
+            status: row.status == 1 ? 0 : 1
+          });
+        }).then(() => {
+          this.getList()
+          this.$modal.msgSuccess(`${row.status == 0 ? '下架' : '上架'}成功`);
+        }).catch((e) => {
+          console.error("失败====",e)
+        });
+      },
+      /**  远程搜索商品分类  */
+      remoteClassifyId() {
+        listTableApi(this.configUrl.classifyList,{
+          shopId: this.tabelId
+        }).then(response => {
+              let list = response.data
+              this.listTreeCopy = list
+          }
+        ).catch (error=>{
+          console.error('获取列表失败!!!!',error)
+          this.listTreeCopy = [];
+        })
+      },
+      /**   远程归属店铺   */
+      remoteShop(value) {
+        try {
+          if(this.shopListTime) {
+            clearTimeout(this.shopListTime)
+          }
+          this.shopListLoading = true
+          this.shopListTime = setTimeout(async ()=>{
+            let res = await listTableApi(this.configUrl.shopList,{name: value})
+           this.shopList = res.data.rows
+           this.shopListLoading = false
+          },1000)
+        } catch (error) {
+          this.shopListLoading = false
+        }
+        
+      },
+
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.open = false;
+    },
+  },
+  watch: {
+
+  }
+};
+</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/productManagement/tabelBox/cateringManagementClassTabel.vue

@@ -0,0 +1,443 @@
+<template>
+  <el-dialog
+    :title="''"
+    :visible.sync="open"
+    width="90%"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="form-dialog-box">
+      <div class="app-container1">
+      <el-row :gutter="20">
+        <!--用户数据-->
+        <el-col :span="24" :xs="24">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+                <el-form-item label="分类名称" prop="classifyName">
+                <el-input
+                    v-model="queryParams.classifyName"
+                    placeholder="请输入分类名称"
+                    clearable
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                    <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                </el-form-item>
+            </el-form>
+  
+            <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button
+                type="primary"
+                plain
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd({})"
+                v-hasPermi="configPermi.add"
+              >添加分类</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+          </el-row>
+
+          <el-table
+            v-loading="loading"
+            :data="tableList"
+            row-key="id"
+            :default-expand-all="isExpandAll"
+            :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+          >
+            <el-table-column type="index" label="编号" align="center"  /> 
+            <el-table-column prop="label" label="分类名称" v-if="columns[0].visible" :show-overflow-tooltip="true" />
+            <el-table-column prop="level" label="级别" v-if="columns[1].visible" ></el-table-column>
+            <el-table-column prop="sort" label="排序" v-if="columns[2].visible" :show-overflow-tooltip="true"></el-table-column>
+            <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[3].visible" />
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="handleUpdate(scope.row)"
+                  v-hasPermi="configPermi.edit"
+                >修改</el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-plus"
+                  @click="handleAdd({parentsId: scope.row.id})"
+                  v-hasPermi="configPermi.add"
+                >新增下级</el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.row)"
+                  v-hasPermi="configPermi.delect"
+                >删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col>
+      </el-row>
+      <!--  新增或修改  -->
+      <addAndEdit1 ref="addAndEdit1"  @refresh="getList" />
+    </div>
+    </div>
+    <!-- 添加或修改对话框 End -->
+  </el-dialog>
+</template>
+
+<script>
+import {
+  listTableApi,
+  delTableParamsApi
+} from "@/api/CURD"
+import addAndEdit1 from "../formBox/commodityClassForm.vue"
+
+export default {
+  name: "CateringManagementClassTabel",
+  dicts: [],
+  components: { addAndEdit1 },
+  data() {
+    return {
+      title: "分类管理",// 通用标题
+      activeName: 'first',
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      loadingText: "拼命加载数据中...",
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      tableId: null,
+      configPermi: {
+          add: ['commodityManagement:commodityClass:add'], // 新增权限
+          details: [''], // 详情权限
+          delect: ['commodityManagement:commodityClass:delect'], // 删除权限
+          edit: ['commodityManagement:commodityClass:edit'], // 编辑
+          upload: [''],// 导入权限
+          export: [''],// 导出权限
+          release: ['']
+        },
+        configUrl: {
+          list: '/goods/goodsClassify/treeList', // 列表地址
+          delect: '/goods/goodsClassify/deleteById', // 删除地址
+          upload: '',// 导入地址
+          download:'', // 下载模板地址
+          export: '',// 导出地址
+          updateStatusById: '/merchant/merchantShop/enable',
+        },
+        tabelId: null,
+        tabelName: null,
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 用户表格数据
+        tableList: [],
+        // 查询参数
+        queryParams: {
+        },
+        dateRange: [],
+        // 控制列表是否显示
+        columns: [
+          { key: 0, label: `分类名称`, visible: true },
+          { key: 2, label: `级别`, visible: true },
+          { key: 3.5, label: `排序`, visible: true },
+          { key: 3, label: `创建时间`, visible: true },
+        ],
+        isExpandAll: 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 = 1
+      this.loading = false
+      this.tabelId = row.id
+      this.tabelName = row.name
+      this.getList();
+    },
+    /** 查询用户列表 */
+    getList() {
+        this.loading = true;
+        let params = JSON.parse(JSON.stringify(this.queryParams))
+        params['shopId'] = this.tabelId
+        listTableApi(
+          this.configUrl.list,
+          this.addDateRange(
+            params,
+            this.dateRange)).then(response => {
+              let list = response.data
+              this.tableList = list;
+              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(row) {
+        if(this.$refs.addAndEdit1) {
+          this.$refs.addAndEdit1.initData(this.title + '新增', "ADD",{
+            ...row,
+            shopId: this.tabelId,
+            shopName: this.tabelName
+          })
+        }
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        if(this.$refs.addAndEdit1) {
+          this.$refs.addAndEdit1.initData(this.title + '基本信息编辑', "EDITInit",{...row})
+        }
+      },
+      handleDetails(row){
+        if(this.$refs.detailsBox) {
+          this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", row)
+        }
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$modal.confirm('是否确认删除数据项？').then( () => {
+          return delTableParamsApi(this.configUrl.delect,{
+            id: ids
+          });
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch((e) => {
+          console.error("删除失败====",e)
+        });
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download(this.configUrl.export, {
+          ...this.queryParams
+        }, `${this.title }_${new Date().getTime()}.xlsx`)
+      },
+      /** 导入按钮操作 */
+      handleImport() {
+        if(this.$refs.upload) {
+          this.$refs.upload.initData({
+            width: '400px',
+            // 弹出层标题（用户导入）
+            title: this.title + "导入",
+            // 下载模板地址
+            importTemplate: this.configUrl.download,
+            // 上传的地址
+            url: this.configUrl.upload
+          })
+        }
+      },
+      /**
+       * 修改状态
+       * @date 2023-11-22
+       * @returns {any}
+       */
+      openAttraction(row) {
+        this.$modal.confirm(`是否确认${row.status == 0 ? '开启营业' : '暂停营业'} ${row.name}吗？`).then( () => {
+          return listTableApi(this.configUrl.updateStatusById,{
+            id: row.id,
+            status: row.status == 1 ? 0 : 1
+          });
+        }).then(() => {
+          this.getList()
+          this.$modal.msgSuccess(`${row.status == 0 ? '开启营业' : '暂停营业'}成功`);
+        }).catch((e) => {
+          console.error("失败====",e)
+        });
+      },
+
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.open = false;
+    },
+  },
+  watch: {
+
+  }
+};
+</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>