1. 新增

src/views/tourism/commodityManagement/commodityList.vue

@@ -3,42 +3,48 @@
       <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 :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.name"
+                        v-model="queryParams.goodsName"
                         placeholder="请输入商品名称"
                         clearable
                         style="width: 240px"
                         @keyup.enter.native="handleQuery"
                     />
                 </el-form-item>
-                <el-form-item label="归属店铺" prop="name">
-                    <el-input
-                        v-model="queryParams.name"
-                        placeholder="请输入归属店铺"
-                        clearable
-                        style="width: 240px"
-                        @keyup.enter.native="handleQuery"
-                    />
+                <el-form-item label="归属店铺:" prop="shopId">
+                  <el-select
+                    v-model="queryParams.shopId"
+                    filterable
+                    remote
+                    reserve-keyword
+                    placeholder="请选择归属店铺"
+                    :remote-method="remoteShop"
+                    :loading="shopListLoading">
+                    <el-option
+                      v-for="item in shopList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id">
+                    </el-option>
+                  </el-select>
                 </el-form-item>
-                <el-form-item label="商品分类" prop="name">
-                    <el-input
-                        v-model="queryParams.name"
-                        placeholder="请输入商品分类"
-                        clearable
-                        style="width: 240px"
-                        @keyup.enter.native="handleQuery"
+                <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="name">
-                    <el-input
-                        v-model="queryParams.name"
-                        placeholder="请输入上架状态"
-                        clearable
-                        style="width: 240px"
-                        @keyup.enter.native="handleQuery"
-                    />
+                <el-form-item label="上架状态:" prop="status">
+                  <el-select v-model="queryParams.status" 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>
@@ -55,32 +61,38 @@
                 size="mini"
                 @click="handleAdd"
                 v-hasPermi="configPermi.add"
-              >添加商铺</el-button>
+              >添加商品</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
           </el-row>
 
           <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
             <el-table-column type="index" label="序号" align="center"  />
-            <el-table-column label="商品图片" align="center" key="shopLogo" prop="shopLogo" v-if="columns[0].visible" :show-overflow-tooltip="true">
+            <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.shopLogo"
-                    :preview-src-list="[scope.row.shopLogo]"
+                    :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="name" prop="name" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="归属店铺" align="center" key="name1" prop="name1" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="分类" align="center" key="name2" prop="name2" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="销售价格" align="center" key="name3" prop="name3" v-if="columns[4].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="规格" align="center" key="name4" prop="name4" v-if="columns[5].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="库存" align="center" key="name5" prop="name5" v-if="columns[6].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="总销量" align="center" key="name6" prop="name6" v-if="columns[7].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="单位" align="center" key="name7" prop="name7" v-if="columns[8].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="限购" align="center" key="name8" prop="name8" v-if="columns[9].visible" :show-overflow-tooltip="true" />
-            
+            <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="shopName" prop="shopName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="分类" align="center" key="classifyName" prop="classifyName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="销售价格(元)" align="center" key="salePrice" prop="salePrice" v-if="columns[4].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="规格" align="center" key="specName" prop="specName" v-if="columns[5].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="库存" align="center" key="quantity" prop="quantity" v-if="columns[6].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="总销量" align="center" key="saleNum" prop="saleNum" v-if="columns[7].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="单位" align="center" key="unitName" prop="unitName" v-if="columns[8].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="限购" align="center" width="190px" key="name8" prop="name8" v-if="columns[9].visible" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <span>{{ 
+                  scope.row.daySale <=0 && scope.row.buyAstrict <=0? '不限' : 
+                  scope.row.daySale <=0 && scope.row.buyAstrict > 0? ('每人每日限购数量'+scope.row.buyAstrict): ('每人限购数量'+scope.row.daySale)
+                }}</span>  
+              </template>
+            </el-table-column>
             <el-table-column label="上架/下架" align="center" key="status" v-if="columns[10].visible">
               <template slot-scope="scope">
                 <switchBox 
@@ -88,8 +100,8 @@
                 v-model="scope.row.status" 
                 @changeFun="openAttraction(scope.row)" 
                 :disabled="false"
-                :active-value="1"
-                :inactive-value="0"
+                :active-value="0"
+                :inactive-value="1"
                  />
               </template>
             </el-table-column>
@@ -98,6 +110,7 @@
               label="操作"
               align="center"
               class-name="small-padding fixed-width"
+              width="180px"
             >
               <template slot-scope="scope" >
                 <el-button
@@ -135,7 +148,9 @@
         </el-col>
       </el-row>
       <!--  新增或修改  -->
-      <addAndEdit ref="addAndEdit" @refresh="getList" />
+      <addAndEdit ref="addAndEdit" :listTreeCopy="listTreeCopy" @refresh="getList" />
+      <!--  详情   -->
+      <detailsBox ref="detailsBox" @refresh="getList"></detailsBox>
     </div>
   </template>
 
@@ -143,16 +158,20 @@
   import {
     listTableApi,
     delTableParamsApi,
-    publicByPutApi as releaseApi
+    publicByPutApi as releaseApi,
+    addTableApi
     } from "@/api/CURD";
   import addAndEdit 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: "User",
     dicts: [],
-    components: {addAndEdit},
+    components: {addAndEdit,Treeselect,detailsBox},
     data() {
       return {
-        title: "店铺管理",// 通用标题
+        title: "商品管理",// 通用标题
         configPermi: {
           add: ['productManagement:scenicAreaTickets:add'], // 新增权限
           details: [''], // 详情权限
@@ -164,12 +183,14 @@
           release: ['']
         },
         configUrl: {
-          list: '/merchant/merchantShop/pageList', // 列表地址
-          delect: '/merchant/merchantShop/deleteById', // 删除地址
+          list: '/merchant/merchantPerformAuditorium/shopGoodsList', // 列表地址
+          delect: '/merchant/merchantPerformAuditorium/deleteMerchantGoods', // 删除地址
           upload: '',// 导入地址
           download:'', // 下载模板地址
           export: '',// 导出地址
-          updateStatusById: '/merchant/merchantShop/enable',
+          updateStatusById: '/merchant/merchantPerformAuditorium/updateStatus',
+          classifyList: '/goods/goodsClassify/treeList', // 商品分类
+          shopList: '/merchant/merchantShop/pageList', // 店铺
         },
         // 遮罩层
         loading: true,
@@ -206,10 +227,16 @@
           { key: 10, label: `上架/下架`, visible: true },
           { key: 11, label: `创建时间`, visible: true },
         ],
+        listTreeCopy: [],
+        shopList: [],
+        shopListTime: null,
+        shopListLoading: false,
       };
     },
     created() {
       this.getList();
+      this.remoteClassifyId()
+      this.remoteShop('')
     },
     methods: {
       /** 查询用户列表 */
@@ -260,20 +287,20 @@
       /** 修改按钮操作 */
       handleUpdate(row) {
         if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(this.title + '基本信息编辑', "EDITInit",{...row})
+          this.$refs.addAndEdit.initData(this.title + '编辑', "EDITInit",{...row})
         }
       },
       handleDetails(row){
         if(this.$refs.detailsBox) {
-          this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", row)
+          this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", {...row})
         }
       },
       /** 删除按钮操作 */
       handleDelete(row) {
-        const ids = row.id || this.ids;
+        const goodsId = row.goodsId || this.ids;
         this.$modal.confirm('是否确认删除数据项？').then( () => {
           return delTableParamsApi(this.configUrl.delect,{
-            id: ids
+            goodsId: goodsId
           });
         }).then(() => {
           this.getList();
@@ -308,18 +335,46 @@
        * @returns {any}
        */
       openAttraction(row) {
-        this.$modal.confirm(`是否确认${row.status == 0 ? '开启营业' : '暂停营业'} ${row.name}吗？`).then( () => {
-          return listTableApi(this.configUrl.updateStatusById,{
-            id: row.id,
+        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 ? '开启营业' : '暂停营业'}成功`);
+          this.$modal.msgSuccess(`${row.status == 0 ? '下架' : '上架'}成功`);
         }).catch((e) => {
           console.error("失败====",e)
         });
       },
+      /**  远程搜索商品分类  */
+      remoteClassifyId() {
+        listTableApi(this.configUrl.classifyList).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
+        }
+        
+      },
     }
   };
   </script>

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

@@ -0,0 +1,519 @@
+<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="商品名称：">
+            <span>{{ form.goodsName }}</span>
+          </el-form-item>
+          <el-form-item label="商品分类：">
+            <span>{{ form.classifyName }}</span>
+          </el-form-item>
+          <div style="display: flex;">
+            <el-form-item label="销售价格(元)：">
+              <span style="width: 250px;">{{ form.salePrice }}</span>
+            </el-form-item>
+            <el-form-item label="规格：">
+              <span style="width: 250px;">{{ form.specName }}</span>
+            </el-form-item>
+            <el-form-item label="单位：">
+              <span style="width: 250px;">{{ form.unitName }}</span>
+            </el-form-item>
+          </div>
+          <div style="display: flex;">
+            <el-form-item label="商品标签：">
+              <span style="width: 250px;">{{ form.labelName }}</span>
+            </el-form-item>
+            <el-form-item label="商品上架：">
+              <span style="width: 250px;">{{ form.status == 1 ? '已下架':'已上架' }}</span>
+            </el-form-item>
+          </div>
+          <el-form-item label="景点图片">
+            <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>
+              </div>
+            </div>
+          </el-form-item>
+          <el-form-item label-width="80px" label="商家介绍">
+            <editor ref="editor" v-model="form.goodsSnapshot" :fileSize="20" :min-height="100" />
+          </el-form-item>
+          <div class="form-title"><span>库存信息</span></div>
+          <el-form-item label="库存数量：">
+            <span>{{ form.quantity}}</span>
+          </el-form-item>
+          <div class="form-title"><span>购买规则</span></div>
+          <el-form-item label="商品限购：">
+            <span v-if="form.daySaleRadio == -1">不限</span>
+            <span v-if="form.daySaleRadio == -2">每人限购数量{{ form.daySale }}</span>
+            <span v-if="form.daySaleRadio == -2">每人每日限购数量{{ form.buyAstrict }}</span>
+          </el-form-item>
+          <el-form-item label="允许退款：">
+            <span v-if="form.backStatus == 0">允许退款</span>
+            <span v-if="form.backStatus == 1">不允许退款</span>
+            <el-radio-group v-model="form.backStatus" placeholder="请选择允许退款">
+            </el-radio-group>
+          </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: "addAndEdit",
+  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: []
+      },
+      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: true, 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"] }],
+
+        backStatus: [{ required: true, message: "请选择允许退款", trigger: ["change","blur"] }],
+      },
+      scenicAreaProducts: [],// 景点产品关联
+
+      //  上传文件
+      actionUrl: process.env.VUE_APP_BASE_API + process.env.VUE_APP_UPLOAD_IMAGE,
+      actionUrlLoading: false,
+    };
+  },
+  methods: {
+    async initData(title , model,row){
+      this.title = title
+      this.open = true
+      this.loadingText = "拼命加载数据中..."
+      this.loading = true
+      this.actionUrlLoading = false
+      this.model = model
+      this.formStatus = 0
+      if(model=='ADD') { // 新增
+        this.$set(this,'form',{
+          ...row,
+          goodsImage: [],
+          status: 1,
+        })
+        this.formStatus = 1
+      }else if(model=='EDIT') { // 新增
+        let obj = {
+          ...row,
+          goodsImage: [],
+          status: 1,
+        }
+        this.$set(this,'form',obj)
+        this.formStatus = 1
+      }else if(model=='EDITInit' || model=='DEATILSInit') { // 新增
+        await this.getTableDeatilsFun(row)
+      }
+      this.loading = false
+      this.$nextTick(()=>{
+        if(this.$refs["form"]) {
+          this.$refs["form"].clearValidate();
+        }
+      })
+    },
+    /** 获取详情 */
+    async getTableDeatilsFun(row) {
+      const id = row.id
+      this.loading = true
+      try {
+        let res = await getTableDeatilsByIdApi(this.configUrl.details,{goodsId: row.goodsId})
+        if(res.code == 200) {
+          let obj = {
+            ...res.data
+          }
+          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 = '-2'
+            obj.daySale = obj.daySale
+            obj.buyAstrict = undefined
+          }else if(obj.buyAstrict > 0) {
+            obj.daySaleRadio = '-3'
+            obj.daySale = undefined
+            obj.buyAstrict = obj.buyAstrict
+          }
+          this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
+          this.radioInputs(this.form.daySaleRadio)
+          this.formStatus = 1
+        }else {
+          this.$message.error('获取详情失败!!!');
+          this.formStatus = 2
+          this.loading = false
+          this.open = false;
+        }
+        this.loading = false
+      } catch (error) {
+        console.error('获取详情失败!!!!',error)
+        this.formStatus = 2
+        this.loading = false
+        this.open = false;
+      }
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          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 == -2) {
+            params['daySale'] =  params.daySale
+            params['buyAstrict'] = -1
+          }else if(params.daySaleRadio == -3) {
+            params['daySale'] =  -1
+            params['buyAstrict'] = params.buyAstrict
+          }
+          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: 3,
+              }).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: 3,
+              }).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 == -2 ) {
+        this.rules.daySale[0].required = true
+        this.rules.buyAstrict[0].required = false
+        this.$refs.form.clearValidate('buyAstrict');
+      }else if( value == -3 ) {
+        this.rules.daySale[0].required = false
+        this.rules.buyAstrict[0].required = true
+        this.$refs.form.clearValidate('daySale');
+      }
+    },
+    /** 选择商品分类 获取分类的名称  */
+    valueChange(list,value) {
+      let str = ''
+      function treeForEach(list) {
+        list.forEach((item,index)=>{
+          if(item.children && item.children.length>0) {
+            treeForEach(item.children,value)
+          }
+          if(item.id == value) {
+            str = item.label
+          }
+        })
+      }
+      treeForEach(list,value)
+      return str
+    }
+  },
+  watch: {
+    'form.goodsSnapshot'() {
+      if(this.form.goodsSnapshot == '<p><br></p>') {
+        this.form.goodsSnapshot = null
+      }
+      if(this.$refs["form"]) {
+        this.$refs["form"].validateField('goodsSnapshot');
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.form-dialog-box {
+  padding: 0 30px;
+  padding: 0 30px;
+  min-height: 50vh;
+  max-height: 65vh;
+  overflow-y: auto;
+  >div {
+    width: 100%;
+    min-height: 50vh;
+  }
+  .form-title {
+    padding: 0 0 10px 0;
+    span {
+      display: flex;
+      color: rgba(65,80,88,1);
+      font-size: 16px;
+      font-family: SourceHanSansSC;
+      font-weight: 700;
+      line-height: 23px;
+      border-left: 4px solid rgb(22, 132, 252);
+      padding-left: 10px;
+    }
+    
+  }
+  ::v-deep .ql-editor {
+    height: 400px;
+  }
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+.el-table{
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+
+.area-container {
+  min-height: 400px;
+}
+
+::v-deep .area-wrap-city.el-cascader {
+  line-height: normal;
+  .el-input {
+    cursor: pointer;
+    width: 100% !important;
+    height: 28px !important;
+    .el-input__inner {
+      display: none !important;
+    }
+    span.el-input__suffix {
+      position: inherit !important;
+      i.el-input__icon {
+        line-height: inherit;
+        margin-left: 5px;
+      }
+    }
+
+    .el-input__wrapper {
+      box-shadow: none;
+      input {
+        display: none;
+      }
+    }
+  }
+
+  .el-cascader__tags {
+    display: none;
+  }
+}
+
+.area-city-popper {
+  .el-cascader-panel {
+    .el-scrollbar.el-cascader-menu {
+      .el-cascader-menu__wrap.el-scrollbar__wrap {
+        height: 315px;
+      }
+    }
+  }
+}
+
+::v-deep .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  ::v-deep .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  ::v-deep .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 100px;
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+  }
+  ::v-deep .avatar {
+    width: 100px;
+    height: 100px;
+    display: block;
+  }
+</style>
+<style>
+.custom-class-box {
+  z-index: 999999 !important;
+}
+</style>

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

@@ -20,56 +20,142 @@
         >
         <el-form :model="form" ref="form" :rules="rules" label-width="130px">
           <div class="form-title"><span>基本信息</span></div>
-          <el-form-item label="商铺名称：" prop="name">
-            <el-input style="width: 350px;" v-model="form.name" placeholder="请输入商铺名称" maxlength="50" show-word-limit />
+          <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="商铺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>
+          <el-form-item label="商品分类：" prop="classifyId">
+            <div style="width: 350px;">
+              <treeselect
+                v-model="form.classifyId"
+                :options="listTreeCopy"
+                :show-count="true"
+                placeholder="请选择商品分类"
+              />
             </div>
-            <span>建议上传图片尺寸343px X 94px,支持jpg/png/gif,支持5MB大小以内的图片上传</span>
           </el-form-item>
-          <el-form-item label="营业时间：" prop="openTimeStart">
+          <div style="display: flex;">
+            <el-form-item label="销售价格(元)：" prop="salePrice">
+              <el-input-number 
+                v-model="form.salePrice" 
+                placeholder="请输入销售价格"
+                controls-position="right">
+              </el-input-number>
+            </el-form-item>
+            <el-form-item label="规格：" prop="specName">
+              <el-input style="width: 250px;" v-model="form.specName" placeholder="请输入规格" maxlength="10" show-word-limit />
+            </el-form-item>
+            <el-form-item label="单位：" prop="unitName">
+              <el-input style="width: 250px;" v-model="form.unitName" placeholder="请输入单位" maxlength="10" show-word-limit />
+            </el-form-item>
+          </div>
+          <div style="display: flex;">
+            <el-form-item label="商品标签：" prop="labelName">
+              <el-input style="width: 250px;" v-model="form.labelName" placeholder="请输入商品标签" maxlength="10" show-word-limit />
+            </el-form-item>
+            <el-form-item label="商品上架：" prop="status">
+                 <el-switch
+                v-model="form.status"
+                active-color="#13ce66"
+                inactive-color="#cccccc"
+                :active-value="0"
+                :inactive-value="1">
+              </el-switch>
+            </el-form-item>
+          </div>
+          <el-form-item label="景点图片" prop="goodsImage">
             <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 
+              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="联系人：">
-            <el-input style="width: 350px;" v-model="form.contactsName" placeholder="请输入联系人" maxlength="10" show-word-limit />
+          <el-form-item label-width="80px" label="商家介绍" prop="goodsSnapshot">
+            <editor ref="editor" v-model="form.goodsSnapshot" :fileSize="20" :min-height="100" />
           </el-form-item>
-          <el-form-item label="联系电话：">
-            <el-input style="width: 350px;" v-model="form.contactsMobile" placeholder="请输入联系电话" />
+          <div class="form-title"><span>库存信息</span></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>
-          <el-form-item label-width="80px" label="商家介绍">
-            <editor ref="editor" v-model="form.shopDetail" :fileSize="20" :min-height="200" />
+          <div class="form-title"><span>购买规则</span></div>
+          <el-form-item label="商品限购：" :prop="'daySaleRadio'">
+                <div style="display: flex;align-items: center;">
+                  <el-radio-group v-model="form.daySaleRadio" @input="radioInputs">
+                    <div style="display: flex;align-items: center;">
+                      <el-radio label="-1">不限</el-radio>
+                      <el-radio style="display: flex;align-items: center;" label="-2">
+                        <el-form-item label="" label-width="0" :prop="'daySale'">
+                          <span>每人限购数量</span>
+                          <el-input-number 
+                            :disabled="form.daySaleRadio!=-2"
+                            v-model="form.daySale" 
+                            placeholder="请输入限购数量"
+                            controls-position="right">
+                          </el-input-number>
+                          <span></span>
+                        </el-form-item>
+                      </el-radio>
+                      <el-radio style="display: flex;align-items: center;" label="-3">
+                        <el-form-item label="" label-width="0" :prop="'buyAstrict'">
+                          <span>每人每日限购数量</span>
+                          <el-input-number 
+                            :disabled="form.daySaleRadio!=-3"
+                            v-model="form.buyAstrict" 
+                            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="允许退款：" prop="backStatus">
+            <el-radio-group v-model="form.backStatus" placeholder="请选择允许退款">
+              <el-radio :label="0">允许退款</el-radio>
+              <el-radio :label="1">不允许退款</el-radio>
+            </el-radio-group>
           </el-form-item>
         </el-form>
       </div>
@@ -98,11 +184,13 @@ import {
   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: "addAndEdit",
   dicts: ['tourism_online_status','tourism_online_type'],
-  components: {Editor},
+  components: {Editor,Treeselect},
+  props: ['listTreeCopy'],
   data() {
     return {
       title: "",
@@ -113,19 +201,32 @@ export default {
       loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
-        add: '/merchant/merchantShop/insertOrUpdate', // 新增地址
-        details: '/merchant/merchantShop/selectById', // 详情地址
-        edit: '/merchant/merchantShop/insertOrUpdate', // 编辑地址
+        add: '/merchant/merchantPerformAuditorium/saveMerchantGoods', // 新增地址
+        details: '/merchant/merchantPerformAuditorium/merchantGoodsDetail', // 详情地址
+        edit: '/merchant/merchantPerformAuditorium/saveMerchantGoods', // 编辑地址
       },
       form: {
         id: undefined,
+        goodsImage: []
       },
       rules: {
-        name: [{ required: true, message: "请输入商铺名称", trigger: ["change","blur"] }],
-        shopLogo: [{ required: true, message: "请上传商铺Logo", trigger: ["change","blur"] }],
-        shopDetail: [{ required: true, message: "请输产品介绍", trigger: ["change","blur"] }],
-        openTimeStart: [{ required: true, message: "请输入开始时间", trigger: ["change","blur"] }],
-        openTimeEnd: [{ required: true, message: "请输入结束时间", trigger: ["change","blur"] }],
+        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: true, 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"] }],
+
+        backStatus: [{ required: true, message: "请选择允许退款", trigger: ["change","blur"] }],
       },
       scenicAreaProducts: [],// 景点产品关联
 
@@ -144,11 +245,17 @@ export default {
       this.model = model
       this.formStatus = 0
       if(model=='ADD') { // 新增
-        this.$set(this,'form',row)
+        this.$set(this,'form',{
+          ...row,
+          goodsImage: [],
+          status: 1,
+        })
         this.formStatus = 1
       }else if(model=='EDIT') { // 新增
         let obj = {
-          ...row
+          ...row,
+          goodsImage: [],
+          status: 1,
         }
         this.$set(this,'form',obj)
         this.formStatus = 1
@@ -167,12 +274,31 @@ export default {
       const id = row.id
       this.loading = true
       try {
-        let res = await getTableDeatilsByIdApi(this.configUrl.details,{id})
+        let res = await getTableDeatilsByIdApi(this.configUrl.details,{goodsId: row.goodsId})
         if(res.code == 200) {
           let obj = {
             ...res.data
           }
+          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 = '-2'
+            obj.daySale = obj.daySale
+            obj.buyAstrict = undefined
+          }else if(obj.buyAstrict > 0) {
+            obj.daySaleRadio = '-3'
+            obj.daySale = undefined
+            obj.buyAstrict = obj.buyAstrict
+          }
           this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
+          this.radioInputs(this.form.daySaleRadio)
           this.formStatus = 1
         }else {
           this.$message.error('获取详情失败!!!');
@@ -198,10 +324,25 @@ export default {
         if (valid) {
           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 == -2) {
+            params['daySale'] =  params.daySale
+            params['buyAstrict'] = -1
+          }else if(params.daySaleRadio == -3) {
+            params['daySale'] =  -1
+            params['buyAstrict'] = params.buyAstrict
+          }
+          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,{
-                ...this.form
+                ...params,
+                goodsType: 3,
               }).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.loading = false
@@ -213,7 +354,8 @@ export default {
             })
           } else {
             addTableApi(this.configUrl.edit,{
-                ...this.form
+              ...params,
+              goodsType: 3,
               }).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.loading = false
@@ -247,21 +389,18 @@ export default {
       this.open = false;
     },
 
-    /**  上传图片  */
-    handleAvatarSuccess(res, file) {
-      console.log("res, file",res, file)
+    /**  上传图片 单张  */
+    handleAvatarSuccess(response, file, fileList) {
+      console.log("res, file",response, file, fileList)
       this.actionUrlLoading = false
-      if(res.code != 200) {
-        this.$set(this.form,'shopLogo',null) 
-      }else {
-        this.$set(this.form,'shopLogo',res.data.url) 
+      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','gif']
+      let typeList = ['png','jepg','jpg']
       const isJPG = typeList.includes(testmsg);
       if (!isJPG) {
         this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
@@ -277,14 +416,51 @@ export default {
     handleAvatarError() {
       this.actionUrlLoading = false
     },
+    handleRemove(index) {
+      this.form.goodsImage.splice(index,1)
+    },
+
+    /** */
+    radioInputs(value) {
+      if( value == -1 ){
+        this.rules.daySale[0].required = false
+        this.rules.buyAstrict[0].required = false
+        this.$refs.form.clearValidate('daySale');
+        this.$refs.form.clearValidate('buyAstrict');
+      }else if( value == -2 ) {
+        this.rules.daySale[0].required = true
+        this.rules.buyAstrict[0].required = false
+        this.$refs.form.clearValidate('buyAstrict');
+      }else if( value == -3 ) {
+        this.rules.daySale[0].required = false
+        this.rules.buyAstrict[0].required = true
+        this.$refs.form.clearValidate('daySale');
+      }
+    },
+    /** 选择商品分类 获取分类的名称  */
+    valueChange(list,value) {
+      let str = ''
+      function treeForEach(list) {
+        list.forEach((item,index)=>{
+          if(item.children && item.children.length>0) {
+            treeForEach(item.children,value)
+          }
+          if(item.id == value) {
+            str = item.label
+          }
+        })
+      }
+      treeForEach(list,value)
+      return str
+    }
   },
   watch: {
-    'form.shopDetail'() {
-      if(this.form.shopDetail == '<p><br></p>') {
-        this.form.shopDetail = null
+    'form.goodsSnapshot'() {
+      if(this.form.goodsSnapshot == '<p><br></p>') {
+        this.form.goodsSnapshot = null
       }
       if(this.$refs["form"]) {
-        this.$refs["form"].validateField('shopDetail');
+        this.$refs["form"].validateField('goodsSnapshot');
       }
     }
   }