Browse Source

1. 优化

MONSTER-ygh 10 months ago
parent
commit
f74e413a61

+ 4 - 5
src/views/tourism/commodityManagement/commodityClass.vue

@@ -52,7 +52,7 @@
                   type="text"
                   icon="el-icon-edit"
                   @click="handleUpdate(scope.row)"
-                  v-hasPermi="configPermi.editBase"
+                  v-hasPermi="configPermi.edit"
                 >修改</el-button>
                 <el-button
                   size="mini"
@@ -92,11 +92,10 @@
       return {
         title: "商品分类",// 通用标题
         configPermi: {
-          add: ['productManagement:scenicAreaTickets:add'], // 新增权限
+          add: ['commodityManagement:commodityClass:add'], // 新增权限
           details: [''], // 详情权限
-          delect: ['productManagement:scenicAreaTickets:delect'], // 删除权限
-          editBase: ['productManagement:scenicAreaTickets:editBase'], // 编辑基本信息权限
-          editGuige: ['productManagement:scenicAreaTickets:editGuige'], // 编辑规格信息权限
+          delect: ['commodityManagement:commodityClass:delect'], // 删除权限
+          edit: ['commodityManagement:commodityClass:edit'], // 编辑
           upload: [''],// 导入权限
           export: [''],// 导出权限
           release: ['']

+ 5 - 6
src/views/tourism/commodityManagement/commodityList.vue

@@ -107,7 +107,7 @@
                   type="text"
                   icon="el-icon-edit"
                   @click="handleUpdate(scope.row)"
-                  v-hasPermi="configPermi.editBase"
+                  v-hasPermi="configPermi.edit"
                 >修改</el-button>
                 <el-button
                   size="mini"
@@ -155,11 +155,10 @@
       return {
         title: "商品管理",// 通用标题
         configPermi: {
-          add: ['productManagement:scenicAreaTickets:add'], // 新增权限
-          details: [''], // 详情权限
-          delect: ['productManagement:scenicAreaTickets:delect'], // 删除权限
-          editBase: ['productManagement:scenicAreaTickets:editBase'], // 编辑基本信息权限
-          editGuige: ['productManagement:scenicAreaTickets:editGuige'], // 编辑规格信息权限
+          add: ['commodityManagement:commodityList:add'], // 新增权限
+          details: ['commodityManagement:commodityList:details'], // 详情权限
+          delect: ['commodityManagement:commodityList:delect'], // 删除权限
+          edit: ['commodityManagement:commodityList:edit'], // 编辑基本信息权限
           upload: [''],// 导入权限
           export: [''],// 导出权限
           release: ['']

+ 4 - 4
src/views/tourism/commodityManagement/shopManagement.vue

@@ -116,11 +116,11 @@
       return {
         title: "店铺管理",// 通用标题
         configPermi: {
-          add: ['productManagement:scenicAreaTickets:add'], // 新增权限
+          add: ['commodityManagement:shopManagement:add'], // 新增权限
           details: [''], // 详情权限
-          delect: ['productManagement:scenicAreaTickets:delect'], // 删除权限
-          editBase: ['productManagement:scenicAreaTickets:editBase'], // 编辑基本信息权限
-          editGuige: ['productManagement:scenicAreaTickets:editGuige'], // 编辑规格信息权限
+          delect: ['commodityManagement:shopManagement:delect'], // 删除权限
+          editBase: ['commodityManagement:shopManagement:editBase'], // 编辑店铺信息配置
+          editGuige: ['commodityManagement:shopManagement:editGuige'], // 编辑营业
           upload: [''],// 导入权限
           export: [''],// 导出权限
           release: ['']

+ 10 - 8
src/views/tourism/financialManagement/detailsBox/productRefundManagementDetails.vue

@@ -24,25 +24,27 @@
             <el-form-item label="订单号:">
               <span style="display: block; min-width: 250px;">{{ form.orderId }}</span>
             </el-form-item>
-            <el-form-item label="商品名称:">
-              <span style="display: block; min-width: 250px;">{{ form.goodsName }}</span>
-            </el-form-item>
+            
             <el-form-item label="支付单号:">
               <span style="display: block; min-width: 250px;">{{ form.transactionId }}</span>
             </el-form-item>
+            <el-form-item label="应付金额:">
+              <span style="display: block; min-width: 250px;">{{ form.priceSubtotal }}</span>
+            </el-form-item>
           </div>
 
-          <div style="display: flex;">
+          <!-- <div style="display: flex;">
+            <el-form-item label="商品名称:">
+              <span style="display: block; min-width: 250px;">{{ form.goodsName }}</span>
+            </el-form-item>
             <el-form-item label="商品单价:">
               <span style="display: block; min-width: 250px;">{{ form.salePrice }}</span>
             </el-form-item>
             <el-form-item label="购买数量:">
               <span style="display: block; min-width: 250px;">{{ form.saleNum }}</span>
             </el-form-item>
-            <el-form-item label="应付金额:">
-              <span style="display: block; min-width: 250px;">{{ form.priceSubtotal }}</span>
-            </el-form-item>
-          </div>
+            
+          </div> -->
 
           <div style="display: flex;">
             <el-form-item label="实付金额:">

+ 4 - 4
src/views/tourism/financialManagement/productRefundManagement.vue

@@ -149,12 +149,12 @@
         title: "商品退款管理",// 通用标题
         configPermi: {
           add: [''], // 新增权限
-          details: ['popularCheck:contentManagement:details'], // 详情权限
-          delect: ['popularCheck:contentManagement:delect'], // 删除权限
+          details: ['financialManagement:productRefundManagement:details'], // 详情权限
+          delect: [], // 删除权限
           edit: [], // 编辑权限
           upload: [],// 导入权限
-          export: ['popularCheck:contentManagement:export'],// 导出权限
-          refundAudit: ['popularCheck:contentManagement:refundAudit'], //审核
+          export: ['financialManagement:productRefundManagement:export'],// 导出权限
+          refundAudit: ['financialManagement:productRefundManagement:refundAudit'], //审核
         },
         configUrl: {
           list: '/merchant/merchantOrder/orderRefundList', // 列表地址

+ 6 - 8
src/views/tourism/orderManagement/productOrders/productOrders.vue

@@ -136,7 +136,7 @@
                   type="text"
                   icon="el-icon-document"
                   @click="handleDetails(scope.row)"
-                  v-hasPermi="configPermi.editBase"
+                  v-hasPermi="configPermi.details"
                 >详情</el-button>
                 <el-button
                   size="mini"
@@ -144,7 +144,7 @@
                   icon="el-icon-position"
                   @click="releaseFormFun(scope.row)"
                   v-if="scope.row.status == 3"
-                  v-hasPermi="configPermi.editBase"
+                  v-hasPermi="configPermi.delivery"
                 >发货</el-button>
               </template>
             </el-table-column>
@@ -181,14 +181,12 @@
       return {
         title: "商品订单",// 通用标题
         configPermi: {
-          add: ['productManagement:scenicAreaTickets:add'], // 新增权限
-          details: [''], // 详情权限
-          delect: ['productManagement:scenicAreaTickets:delect'], // 删除权限
-          editBase: ['productManagement:scenicAreaTickets:editBase'], // 编辑基本信息权限
-          editGuige: ['productManagement:scenicAreaTickets:editGuige'], // 编辑规格信息权限
+          add: [''], // 新增权限
+          details: ['orderManagement:productOrders:details'], // 详情权限
+          delect: [''], // 删除权限
           upload: [''],// 导入权限
           export: [''],// 导出权限
-          release: ['']
+          delivery: ['orderManagement:productOrders:delivery'],// 发货
         },
         configUrl: {
           list: '/order/orderInfo/orderList', // 列表地址