MONSTER-ygh 9 месяцев назад
Родитель
Сommit
2541ead0e6

+ 1 - 1
src/views/tourism/financialManagement/detailsBox/hotelsRefundManagementDetails.vue

@@ -77,7 +77,7 @@
               <span style="display: block; min-width: 250px;">{{ form.refundNo }}</span>
             </el-form-item>
             <el-form-item label="扣除手续费(元):">
-              <span style="display: block; min-width: 250px;">{{ form.deductionFee }}</span>
+              <span style="display: block; min-width: 250px;">{{ form.chargeAmount }}</span>
             </el-form-item>
             <el-form-item label="实际退款金额(元):">
               <span style="display: block; min-width: 250px;">{{ form.refundAmount }}</span>

+ 1 - 1
src/views/tourism/financialManagement/hotelsRefundManagement.vue

@@ -175,7 +175,7 @@
           delect: '', // 删除地址
           upload: '',// 导入地址
           download:'', // 下载模板地址
-          export: '/merchant/merchantOrder/exportFoodExcel',// 导出地址
+          export: '/merchant/merchantOrder/exportShopExcel',// 导出地址
           edit: '', // 编辑地址
         },
         // 遮罩层

+ 2 - 2
src/views/tourism/productManagement/formBox/commodityListForm.vue

@@ -130,14 +130,14 @@
               </el-form-item>
             </div>
           </div>
-          <el-form-item label="库存数量:" prop="quantity">
+          <!-- <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> -->
           <div style="display: flex;">
             <el-form-item label="菜品标签:" prop="labelName">
               <div>

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

@@ -72,8 +72,8 @@
               <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[3].visible" :show-overflow-tooltip="true" />
-              <el-table-column label="上架/下架" align="center" key="status" v-if="columns[4].visible">
+              <!-- <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[3].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[5].visible" :show-overflow-tooltip="true" />
+              <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"
@@ -214,7 +214,7 @@ export default {
           { key: 2, label: `菜品名称`, visible: true },
           { key: 3, label: `分类类型`, visible: true },
           // { key: 4, label: `价格(元)`, visible: true },
-          { key: 5, 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

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