MONSTER-ygh 9 bulan lalu
induk
melakukan
6bd46d7fad

+ 13 - 17
src/views/tourism/orderManagement/hotelsOrders/detailsBox/hotelsOrdersDetails.vue

@@ -28,7 +28,7 @@
               <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.shopName }}</span>
             </el-form-item>
             <el-form-item label="房型名称:">
-              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.useUserNum }}</span>
+              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.goodsName }}</span>
             </el-form-item>
           </div>
           <div style="display: flex;">
@@ -71,14 +71,14 @@
             </el-form-item>
           </div>
           <div style="display: flex;">
-            <el-form-item label="预定入日期:">
-              <span style="display: inline-block;width: 250px;">{{ form.contactMobile }}</span>
+            <el-form-item label="预定入日期:">
+              <span style="display: inline-block;width: 250px;">{{ form.checkinStart }}</span>
             </el-form-item>
             <el-form-item label="预定离店日期:">
-              <span style="display: inline-block;width: 250px;">{{ form.acceptTime }}</span>
+              <span style="display: inline-block;width: 250px;">{{ form.checkinEnd }}</span>
             </el-form-item>
             <el-form-item label="预计到店时间:">
-              <span style="display: inline-block;width: 250px;">{{ form.acceptTime }}</span>
+              <span style="display: inline-block;width: 250px;">{{ form.reachTime }}</span>
             </el-form-item>
           </div>
           <div style="display: flex;">
@@ -87,19 +87,15 @@
                 <dict-tag :options="dict.type.tourism_ticketOrders_source" :value="form.source"/>
               </span>
             </el-form-item>
-            <el-form-item label="接单时间:">
+            <el-form-item v-if="form.orderStatus == 12" label="接单时间:">
               <span style="display: inline-block;width: 250px;">{{ form.acceptTime }}</span>
             </el-form-item>
-          </div>
-          <div class="form-title"><span>入驻信息</span></div>
-          <div style="display: flex;padding: 10px 0 15px;">
-            <el-table :data="tableList">
-              <el-table-column type="index" label="编号" align="center"  />
-              <el-table-column label="入驻人" align="center" key="goodsName" prop="goodsName" :show-overflow-tooltip="true" />
-              <el-table-column label="联系电话" align="center" key="classifyName" prop="classifyName" :show-overflow-tooltip="true" />
-              <el-table-column label="房间号" align="center" key="salePrice" prop="salePrice" :show-overflow-tooltip="true" />
-              <el-table-column label="入驻时间" align="center" key="priceSubtotal" prop="priceSubtotal" :show-overflow-tooltip="true" />
-            </el-table>
+            <el-form-item v-if="form.orderStatus == 13" label="拒单时间:">
+              <span style="display: inline-block;width: 250px;">{{ form.acceptTime }}</span>
+            </el-form-item>
+            <el-form-item v-if="form.orderStatus == 13" label="拒单说明:">
+              <span style="display: inline-block;width: 250px;">{{ form.remark }}</span>
+            </el-form-item>
           </div>
         </el-form>
       </div>
@@ -131,7 +127,7 @@ export default {
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
         add: '', // 新增地址
-        details: '/order/orderInfo/repastOrderDetail', // 详情地址
+        details: '/order/orderInfo/hotelOrderDetail', // 详情地址
         edit: '', // 编辑地址
       },
       form: {

+ 3 - 3
src/views/tourism/productManagement/formBox/commodityClassForm.vue

@@ -100,7 +100,7 @@ export default {
       this.actionUrlLoading = false
       this.model = model
       this.formStatus = 0
-      await this.getList()
+      await this.getList(row.shopId)
       if(model=='ADD') { // 新增
         this.$set(this,'form',row)
         this.formStatus = 1
@@ -121,8 +121,8 @@ export default {
       })
     },
       /** 查询用户列表 */
-      getList() {
-        listTableApi(this.configUrl.list).then(response => {
+      getList(id) {
+        listTableApi(this.configUrl.list,{shopId: id}).then(response => {
               let list = response.data
               this.listTreeCopy = [
                 {

+ 0 - 863
src/views/tourism/productManagement/formBox/hotelsManagementForm copy.vue

@@ -1,863 +0,0 @@
-<template>
-  <el-dialog
-    :title="title"
-    :visible.sync="open"
-    width="90%"
-    append-to-body
-    :close-on-click-modal="false"
-    @close="cancel"
-  >
-    <div class="form-dialog-box"
-    v-loading="loading"
-    :element-loading-text="loadingText"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0)">
-      <div
-        v-loading="loading"
-        :element-loading-text="''"
-        element-loading-spinner="''"
-        element-loading-background="rgba(0, 0, 0, 0.8)"
-        >
-        <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="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="name">
-            <el-input-number style="width: 350px;" v-model="form.name" placeholder="请输入房型数量" />
-          </el-form-item>
-          <div style="display: flex;">
-            <el-form-item label="房型价格:" prop="name">
-              <el-input-number style="width: 350px;" v-model="form.name" placeholder="请输入房型价格" />
-            </el-form-item>
-            <el-form-item label="划线价格:" prop="name">
-              <el-input-number style="width: 350px;" v-model="form.name" placeholder="请输入划线价格" />
-            </el-form-item>
-          </div>
-          <el-form-item label="销售日期:" prop="name">
-            <el-date-picker
-              v-model="form.name"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期">
-            </el-date-picker>
-          </el-form-item>
-          <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="name">
-            <el-input-number style="width: 350px;" v-model="form.name" placeholder="请输入面积" />
-            <span>㎡</span>
-          </el-form-item>
-          <el-form-item label="可住人数:" prop="name">
-            <el-input-number style="width: 350px;" v-model="form.name" placeholder="请输入可住人数" />
-            <span>人</span>
-          </el-form-item>
-          <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="name">
-            <el-input style="width: 350px;" v-model="form.name" placeholder="请输窗户" maxlength="50" show-word-limit />
-          </el-form-item>
-          <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="name">
-            <el-input style="width: 350px;" type="textarea" v-model="form.name" placeholder="请输其他信息" maxlength="200" show-word-limit />
-          </el-form-item>
-          <div class="form-title"><span>订购规则</span></div>
-          <el-form-item label="支持设置限制账号单笔订单的最大预购数量:" prop="name" label-width="300px">
-            <el-input-number style="width: 350px;" v-model="form.name" placeholder="请输入面积" />
-            <span>间</span>
-          </el-form-item>
-          <div style="display: flex;">
-            <el-form-item label="当日最早入住时间:" prop="name" label-width="300px">
-              <el-time-picker v-model="form.time" value-format="HH:mm" format="HH:mm" splaceholder="请选择当日最早入住时间" ></el-time-picker>
-            </el-form-item>
-            <el-form-item label="次日最晚离店时间:" prop="name" label-width="300px">
-              <el-time-picker v-model="form.time" value-format="HH:mm" format="HH:mm" splaceholder="请选择次日最晚离店时间" ></el-time-picker>
-            </el-form-item>
-          </div>
-          <el-form-item label="类型:" prop="shopModel">
-            <el-select v-model="form.shopModel" clearable placeholder="请选择类型">
-              <el-option
-                v-for="item in [
-                  { value: 1, label: '酒店' },
-                  { value: 2, label: '民宿' }
-                ]"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="酒店门头照:" prop="shopHeadImg">
-            <div
-            style="width: 120px;"
-            v-loading="actionUrlLoading_1"
-            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_1"
-                :on-progress="handleAvatarProgress_1"
-                :before-upload="beforeAvatarUpload_1"
-                :disabled="actionUrlLoading_1"
-                :on-error="handleAvatarError_1"
-                >
-                <img v-if="form.shopHeadImg" style="width: 100px;height: 100px;" :src="form.shopHeadImg" 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-width="80px" label="酒店介绍">
-            <editor ref="editor" v-model="form.shopDetail" :fileSize="20" :min-height="200" />
-          </el-form-item>
-          <div style="display: flex;width: 100%;padding: 10px 0;">
-            <div style="width: 50%;flex-shrink: 0;">
-              <el-form-item label="酒店标签:" prop="shopLabel">
-                <div>
-                  <div>
-                    <el-input style="width: 150px;" 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;"
-                      size="mini"
-                    > 
-                      全部清除
-                    </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>
-              <el-form-item label="酒店地址" prop="address">
-                <el-input
-                  v-model="form.address"
-                  placeholder="请输入酒店地址"
-                  clearable
-                  style="width: 300px"
-                />
-              </el-form-item>
-              <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>
-              <el-form-item label="酒店电话:" style="margin-top: 20px;" prop="contactsMobile">
-                <el-input style="width: 350px;" v-model="form.contactsMobile" placeholder="请输入酒店电话" />
-              </el-form-item>
-            </div>
-            <div style="width: 50%;flex-shrink: 0;">
-              <div style="width: 100%;height: 350px;">
-                <qqMapBox ref="qqMapBox" @setDot="setDot" />
-              </div>
-            </div>
-          </div>
-          <div class="form-title"><span>规则设置</span></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 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="自动接单:" :prop="'acceptOrderFlag'">
-                <div style="display: flex;align-items: center;">
-                  <el-radio-group v-model="form.acceptOrderFlag" @input="radioInputs1">
-                    <div style="display: flex;align-items: center;">
-                      <el-radio label="-1">关闭</el-radio>
-                      <el-radio style="display: flex;align-items: center;" label="-3">
-                        <el-form-item label="" label-width="0" :prop="'acceptOrderTime'">
-                          <span>下单后</span>
-                          <el-input-number 
-                            :disabled="form.acceptOrderFlag!=-3"
-                            v-model="form.acceptOrderTime" 
-                            placeholder="请输入分钟"
-                            controls-position="right">
-                          </el-input-number>
-                          <span>分钟内,管理员未对订单进行审核操作,系统自动接单</span>
-                        </el-form-item>
-                      </el-radio>
-                    </div>
-                  </el-radio-group>
-                </div>
-          </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: "hotelsManagementForm",
-  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"] }],
-        shopModel: [{ required: true, message: "请选择类型", trigger: ["change","blur"] }],
-        shopLogo: [{ required: true, message: "请上传酒店Logo", trigger: ["change","blur"] }],
-        shopHeadImg: [{ required: true, message: "请上传酒店门头照", 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"] }],
-        contactsMobile: [{ required: true, message: "请输入酒店电话", trigger: ["change","blur"] }],
-
-        cancelOrderFlag: [{ required: true, message: "请选择是否自动审核退款", trigger: ["change","blur"] }],
-        cancelOrderTime: [{ required: false, message: "请输入分钟", trigger: ["change","blur"] }],
-        
-        acceptOrderFlag: [{ required: true, message: "请选择是否自动接单", trigger: ["change","blur"] }],
-        acceptOrderTime: [{ required: false, message: "请输入分钟", trigger: ["change","blur"] }],
-      },
-      scenicAreaProducts: [],// 景点产品关联
-
-      //  上传文件
-      actionUrl: process.env.VUE_APP_BASE_API + process.env.VUE_APP_UPLOAD_IMAGE,
-      actionUrlLoading: false,
-      actionUrlLoading_1: false,
-      actionUrlMoreLoading: false,
-      shopLabel: '',
-      activeName: 'first'
-    };
-  },
-  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.activeName = 'first'
-      if(model=='ADD') { // 新增
-        this.$set(this,'form',{
-          row,
-          shopAdvImgs: [],
-          shopLabel: [],
-          cancelOrderFlag: '-1',
-          acceptOrderFlag: '-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)
-          this.radioInputs1(this.form.acceptOrderFlag)
-        }
-      })
-    },
-    /** 获取详情 */
-    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.cancelOrderFlag = '-3'
-          }
-          if(obj.acceptOrderFlag == 0) {
-            obj.acceptOrderFlag = '-1'
-            obj['acceptOrderTime'] = undefined
-          }else if(obj.acceptOrderFlag == 1){
-            obj.acceptOrderFlag = '-3'
-          }
-          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
-          }
-          if(params.acceptOrderFlag == -1){
-            params['acceptOrderFlag'] = 0
-            params['acceptOrderTime'] = null
-          }else if(params.acceptOrderFlag == -3) {
-            params['acceptOrderFlag'] = 1
-          }
-          params.shopLabel = params.shopLabel.join(',')
-          params.shopAdvImgs = params.shopAdvImgs.join(',')
-          if (this.model != 'ADD') {
-            addTableApi(
-              this.configUrl.edit,{
-                ...params,
-                shopType: 5,
-              }).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: 5,
-              }).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
-    },
-    /**  上传图片 单张  */
-    handleAvatarSuccess_1(res, file) {
-      console.log("res, file",res, file)
-      this.actionUrlLoading_1 = false
-      if(res.code != 200) {
-        this.$set(this.form,'shopHeadImg',null) 
-      }else {
-        this.$set(this.form,'shopHeadImg',res.data.url) 
-      }
-      
-    },
-    beforeAvatarUpload_1(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_1(){
-      this.actionUrlLoading_1 = true
-    },
-    handleAvatarError_1() {
-      this.actionUrlLoading_1 = 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
-      }
-    },
-    /**  */
-    radioInputs1(value) {
-      if( value == -1 ){
-        this.rules.acceptOrderTime[0].required = false
-        this.$refs.form.clearValidate('acceptOrderTime');
-      }else if( value == -3 ) {
-        this.rules.acceptOrderTime[0].required = true
-      }
-    },
-    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>

+ 5 - 5
src/views/tourism/productManagement/tabelBox/cateringManagementCategoryTabel.vue

@@ -71,9 +71,9 @@
               </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[4].visible" :show-overflow-tooltip="true" />
-              <el-table-column label="上架/下架" align="center" key="status" v-if="columns[5].visible">
+              <!-- <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[3].visible" :show-overflow-tooltip="true" />
+              <el-table-column label="上架/下架" align="center" key="status" v-if="columns[4].visible">
                 <template slot-scope="scope">
                   <switchBox 
                   :defaultChecked="true" 
@@ -85,7 +85,7 @@
                   />
                 </template>
               </el-table-column>
-              <el-table-column label="创建时间" align="center" key="createTime" prop="createTime" v-if="columns[6].visible" :show-overflow-tooltip="true" />
+              <el-table-column label="创建时间" align="center" key="createTime" prop="createTime" v-if="columns[5].visible" :show-overflow-tooltip="true" />
               <el-table-column
                 label="操作"
                 align="center"
@@ -213,7 +213,7 @@ export default {
           { key: 0, label: `菜品图片`, visible: true },
           { key: 2, label: `菜品名称`, visible: true },
           { key: 3, label: `分类类型`, visible: true },
-          { key: 4, label: `价格(元)`, visible: true },
+          // { key: 4, label: `价格(元)`, visible: true },
           { key: 5, label: `库存`, visible: true },
           { key: 6, label: `上架/下架`, visible: true },
           { key: 7, label: `创建时间`, visible: true },

+ 1 - 1
src/views/tourism/productManagement/tabelBox/hotelsManagementCategoryTabel.vue

@@ -331,7 +331,7 @@ export default {
        */
       openAttraction(row) {
         this.$modal.confirm(`是否确认${row.status == 0 ? '下架' : '上架'}吗?`).then( () => {
-          return addTableApi(this.configUrl.updateStatusById,{
+          return listTableApi(this.configUrl.updateStatusById,{
             goodsId: row.goodsId,
             status: row.status == 1 ? 0 : 1
           });