Merge branch 'master' of http://82.156.35.112:3000/chensiyi/zonghe_web

.env.development

@@ -17,7 +17,7 @@ VITE_APP_BASE_URL = 'http://100.65.11.2:8086/ndev/' #线上地址 nDev
 # VITE_APP_BASE_URL = 'http://100.64.2.111:50001/' #宇轩给测试环境
 # VITE_APP_BASE_URL = 'https://192.168.124.43:50001/' #宇轩服务器 
 # VITE_APP_BASE_URL = 'http://192.168.124.56:50001/' #试运行环境/青云环境/生成环境地址
-VITE_APP_BASE_URL_N = 'http://qtzl.etcjz.cn/ndev/' # 新地址
+VITE_APP_BASE_URL_N = 'https://qtzl.etcjz.cn/prod/' # 新地址
 # VITE_APP_BASE_URL_N = 'http://100.64.2.104:8087/nDev/' #线上地址 nDev
 # VITE_APP_BASE_URL_N = 'https://qtzl.etcjz.cn/ndev/' # 新地址
 # VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/nDev/' # 新地址

.env.production

@@ -10,9 +10,9 @@ ENV = 'production'
 # VITE_APP_BASE_URL ='http://192.168.100.63:8087/'
 # VITE_APP_BASE_URL = 'https://trial.etcjz.cn/' #测试环境地址
 # VITE_APP_BASE_URL = 'https://qtzl.etcjz.cn/dev/' #生成环境地址/试运行环境
-VITE_APP_BASE_URL = 'http://100.65.11.2:8086/ndev/' #线上地址 nDev
+VITE_APP_BASE_URL = 'http://100.65.11.2:8086/prod/' #线上地址 nDev
 # VITE_APP_BASE_URL = 'http://100.64.2.111:50001/' #宇轩给测试环境
-VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/ndev/' # 新地址
+VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/prod/' # 新地址
 # VITE_APP_BASE_URL_N = 'https://qtzl.etcjz.cn/ndev/' # 新地址
 
 # VITE_APP_BASE_URL = "http://43.136.169.197:50001/"

src/utils/baseService.ts

@@ -180,7 +180,7 @@ export default {
       a.href = url
       let receiveTime = moment().format('YYYY-MM-DDTHH_mm_ss')
       fileName += receiveTime
-      a.download = fileName
+      a.download = fileName + '.xlsx'
       a.click()
     }
     x.send()

src/views/inventoryControl/putInstorage/addOrUpdate.vue

@@ -441,7 +441,7 @@
             if (res && res.code === 0) {
                 let bizContent = res.data
                 let url = bizContent.url || "";
-                let fileName = bizContent.fileName ? `${bizContent.fileName}.xls` : '校验结果明细.xls'
+                let fileName = bizContent.fileName ? `${bizContent.fileName}` : '校验结果明细'
                 if (url) {
                     // window.open(import.meta.env.VITE_APP_UPLOAD_URL+url);
                     BaseService.getDownload(import.meta.env.VITE_APP_UPLOAD_URL + url, fileName);
@@ -645,7 +645,7 @@
                 if (res && res.code === 0) {
                     let bizContent = res.data
                     let url = bizContent.url || "";
-                    let fileName = bizContent.fileName ? `${bizContent.fileName}.xls` : '初始设备入库明细.xls'
+                    let fileName = bizContent.fileName ? `${bizContent.fileName}` : '初始设备入库明细'
                     if (url) {
                         //window.open(url)
                         //处理下载有文件名

src/views/onlineBusinessHall/automobileSeroice/businessAudit/index.vue

@@ -2191,7 +2191,7 @@
   // 车牌校验
   function licensePlatevVerification(row) {
     row.btnLoading = true
-    BaseService.post('/iaw/app/issue/plateCheck/check', { id: row.id }).then((res: any) => {
+    BaseService.post('/managew/businessreformplate/mixVehicleCheck', { id: row.id }).then((res: any) => {
       if (res && res.statusCode === 0) {
         const data = res.data
         const info = '车牌校验：' + data.info1 + ' | 营改增车校验：' + data.info4
@@ -2345,7 +2345,8 @@
         params = {
           auditStatus: autdis.examineStatus,
           failReason: autdis.examineRes,
-          orderId: autdis.orderId
+          orderNo: autdis.orderId,
+          orderId: autdis.orderId,
         }
         api = '/iaw/aftersale/vehicleInfoChange/manualAudit'
     } else if (rowData.value.orderType === 'VEHICLEINFOCHANGE') {

src/views/onlineBusinessHall/orderManagement/orderReview/orderInfo.vue

@@ -81,6 +81,24 @@
             isRouterAlive.value = true;
         });
     });
+    const jyfwList = ref([
+        {
+            label: '普通车',
+            value: '0',
+        },
+        {
+            label: '道路运输证经营范围仅有【货物专用运输(集装箱)】的牵引车',
+            value: '24',
+        },
+        {
+            label: '道路运输证经营范围不含【货物专用运输(集装箱)】的牵引车',
+            value: '27',
+        },
+        {
+            label: '道路运输证经营范围除【货物专用运输(集装箱)】外，还有【普通货运】等其他项目的牵引车',
+            value: '28',
+        },
+    ])
 
     function startCut(index, type) {
         listData.value[index].foldStart = type

src/views/settlement/reportManagement/ETCtollConfirmationFormStatistics/index.vue

@@ -434,16 +434,16 @@
       }
 
       if (currentData.value.excelUrl) {
-        let fileName = currentData.value.groupName || '下载模板.xlsx'
-        let reg = /(\.xls|xlsx)$/
-        if (!reg.test(fileName)) {
-          fileName += '.xlsx'
-        }
-        console.log(currentData.value.excelUrl, fileName || '下载模板.xlsx')
+        let fileName = currentData.value.groupName || '下载模板'
+        // let reg = /(\.xls|xlsx)$/
+        // if (!reg.test(fileName)) {
+        //   fileName += '.xlsx'
+        // }
+        console.log(currentData.value.excelUrl, fileName || '下载模板')
 
         BaseService.getDownloadFileName(
           currentData.value.excelUrl,
-          fileName || '下载模板.xlsx'
+          fileName || '下载模板'
         )
       }
       // 普通导出

src/views/system/menuManage/index.vue

@@ -520,7 +520,7 @@
     })
   }
   function getRow(data) {
-    BaseService.postN(data.type ? '/rbac/permquery' : '/rbac/menuquery', {
+    BaseService.postN(data.type ? '/userw/rbac/permquery' : '/userw/rbac/menuquery', {
       id: data.id,
     }).then((res: any) => {
       if (res && res.code === 0) {
@@ -567,7 +567,7 @@
       type: 'error',
     })
       .then(() => {
-        BaseService.postN(!row.type ? '/rbac/menudelete' : '/rbac/permdelete', {
+        BaseService.postN(!row.type ? '/userw/rbac/menudelete' : '/userw/rbac/permdelete', {
           id: row.id,
         }).then((res: any) => {
           if (res && res.code === 0) {