wxy 3 ماه پیش
والد
کامیت
48187d1907

+ 1 - 1
src/api/path/lotCard.api.js

@@ -57,7 +57,7 @@ export function getDataPlanList(params) {
 
 // CDR详单查询
 export function getDataCDR(params) {
-    return service.post("/admin/sim/simCDR", params);
+    return service.post("/admin/sim/newSimCDR", params);
 }
 
 

+ 4 - 3
src/components/Layout/components/layout/menu.vue

@@ -61,7 +61,7 @@ import { useRoute, useRouter } from "vue-router";
 import { useSystemStore } from "@/store/modules/systemStore";
 import LayoutHeader from "@/components/Layout/components/layoutHeader/index.vue";
 import subMenu from "@/components/Layout/components/subMenu/index.vue";
-import {RouterTagData} from '@/store/modules/routerTag.js'
+import { RouterTagData } from '@/store/modules/routerTag.js'
 
 // 标签页仓库
 const settingStore = RouterTagData()
@@ -103,8 +103,9 @@ const evMouseLeavesSubMenu = () => {
 };
 // 鼠标滑动上去更新菜单栏 目前先屏蔽
 const evMenuGetFn = (routeItem, type) => {
-  menuSecondData.value = routeItem;
-  // console.log(routeItem);
+  if (menuSecondLongShow.value) {
+    menuSecondData.value = routeItem;
+  }
 };
 
 // 查找最下级

+ 1 - 0
src/i18n/zh/order.js

@@ -47,4 +47,5 @@ export default {
     AuditOpinion:'审核意见',
     TurnDown:'驳回',
     ReturnAmount:'退货金额',
+    ChangeTariff:'变更资费'
 }

+ 2 - 0
src/views/order/BuyCard/index.vue

@@ -51,6 +51,8 @@
             $t('order.UploadAmount') }}</a-button>
           <a-button @click="openEndDate(record)" type="text" v-if="userType == 1 && record.moderationStatus == 2">{{
             $t('order.ChangeValidity') }}</a-button>
+            <a-button @click="openEndDate(record)" type="text" v-if="userType == 2 && record.moderationStatus == 2">{{
+            $t('order.ChangeTariff') }}</a-button>
           <a-button @click="openDetail(record)" type="text">{{ $t('order.view') }}</a-button>
         </div>
       </template>

+ 2 - 1
src/views/tariffManagement/config.js

@@ -239,6 +239,7 @@ export const UserColumns = [
     title: window.$t("customer.userAdmin"),
     dataIndex: "username",
     align: "center",
+    minWidth: "200",
   },
   {
     title: window.$t("customer.customerStatus"),
@@ -270,6 +271,6 @@ export const UserColumns = [
     slotName: "operation",
     align: "center",
     ellipsis: true,
-    fixed: 'right',
+    fixed: "right",
   },
 ];

+ 2 - 2
vite.config.js

@@ -61,9 +61,9 @@ export default defineConfig({
         hmr: true,
         proxy: {
             "/api": {
-                // target: "http://sim.nanodreamtech.com",
+                target: "http://sim.nanodreamtech.com",
                 // target: "http://127.0.0.1:3001",
-                target: "http://sim.ainets.net",
+                // target: "http://sim.ainets.net",
                 changeOrigin: true,
                 ws: true,
                 secure: true,