1. 优化

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

@@ -176,7 +176,7 @@
                     type="text"
                     icon="el-icon-document-delete"
                     @click="cancekOrderFun(scope.row)"
-                    v-if="scope.row.orderStatus == 0 || scope.row.orderStatus == 3"
+                    v-if="scope.row.orderStatus != 9"
                   >取消订单</el-button>
                 </span>
               </template>
@@ -357,7 +357,7 @@
       /** 取消订单  */
       cancekOrderFun(row){
         if(this.$refs.cancelBox) {
-          this.$refs.cancelBox.initData(this.title + '驳回', 'EDIT',{...row})
+          this.$refs.cancelBox.initData(this.title + '取消', 'EDIT',{...row})
         }
       },
       /** 导出按钮操作 */

src/views/tourism/orderManagement/cateringOrders/formBox/cancel.vue

@@ -20,12 +20,12 @@
         >
         <el-form :model="form" ref="form" :rules="rules" label-width="130px">
           <el-form-item 
-          label="驳回原因" 
+          label="取消原因" 
           prop="remark">
             <el-input 
             style="width: 350px;"
              v-model="form.remark" 
-             placeholder="请输入驳回原因" 
+             placeholder="请输入取消原因" 
              maxlength="150" 
              show-word-limit 
              type="textarea"
@@ -75,7 +75,7 @@ export default {
         id: undefined,
       },
       rules: {
-        remark: [{ required: false, message: "请输入驳回原因", trigger: ["change","blur"] }],
+        remark: [{ required: false, message: "请输入取消原因", trigger: ["change","blur"] }],
       },
       scenicAreaProducts: [],// 景点产品关联
 
@@ -124,7 +124,7 @@ export default {
           this.loadingText = "取消订单中..."
           this.loading = true
           let params = JSON.parse(JSON.stringify(this.form))
-          listTableApi(this.configUrl.cancel,{
+          addTableApi(this.configUrl.cancel,{
             orderId: params.id,
             closeReason: params.remark,
           }).then(response => {

src/views/tourism/orderManagement/hotelsOrders/formBox/cancelOrder.vue

@@ -68,9 +68,9 @@ export default {
       loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
-        add: '/order/ordernfo/cancel', // 新增地址
+        add: '/order/orderInfo/cancel', // 新增地址
         details: '', // 详情地址
-        edit: '/order/ordernfo/cancel', // 编辑地址
+        edit: '/order/orderInfo/cancel', // 编辑地址
       },
       form: {
         id: undefined,

src/views/tourism/orderManagement/hotelsOrders/hotelsOrders.vue

@@ -179,23 +179,21 @@
                   type="text"
                   icon="el-icon-position"
                   @click="repastOrderAcceptFun(scope.row,12)"
-                  v-if="scope.row.orderStatus == 3"
-                  v-hasPermi="configPermi.repastOrderAccept"
+                  v-if="checkPermi(configPermi.repastOrderAccept) && scope.row.orderStatus == 3"
                 >接单</el-button>
                 <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-position"
                   @click="repastOrderAcceptFun(scope.row,13)"
-                  v-hasPermi="configPermi.repastOrderAccept"
-                  v-if="scope.row.orderStatus == 3"
+                  v-if="checkPermi(configPermi.repastOrderAccep) && scope.row.orderStatus == 3"
                 >拒单</el-button>
                 <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-delete"
                   @click="cancelOrderFun(scope.row)"
-                  v-hasPermi="configPermi.cancelOrder"
+                  v-if="checkPermi(configPermi.cancelOrder) && scope.row.orderStatus != 9"
                 >取消</el-button>
               </template>
             </el-table-column>
@@ -227,6 +225,7 @@
   import detailsBox from "./detailsBox/hotelsOrdersDetails.vue"
   import repastOrderAccept from "./formBox/repastOrderAccept.vue";
   import cancelOrder from "./formBox/cancelOrder.vue";
+  import { checkPermi } from "@/utils/permission"
   export default {
     name: "User",
     dicts: ['tourism_ticketOrders_source','tourism_ticketOrders_status','tourism_ticketOrders_payStatus','tourism_ticketOrders_payWay'],
@@ -297,6 +296,7 @@
       this.getList();
     },
     methods: {
+      checkPermi,
        /** 查询酒店列表 */
        getList1() {
         listTableApi(

src/views/tourism/orderManagement/roomList/roomList.vue

@@ -138,7 +138,7 @@
                   @click="handleDetails(scope.row)"
                   v-hasPermi="configPermi.details"
                 >详情</el-button>
-                <el-button
+                <!-- <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-position"
@@ -160,7 +160,7 @@
                   icon="el-icon-delete"
                   @click="cancelOrderFun(scope.row)"
                   v-hasPermi="configPermi.cancelOrder"
-                >取消</el-button>
+                >取消</el-button> -->
               </template>
             </el-table-column>
           </el-table>