Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

proxy.conf.js

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-13 09:36:19
+ * @LastEditTime : 2022-05-13 13:38:02
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -30,7 +30,7 @@ module.exports = {
   // },
   '//api': {
     target: {
-      host: 'tms-api-test.eascs.com',
+      host: 'tms-api-dev.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/routes/partner/channel-sales/components/edit/edit.component.ts

@@ -53,7 +53,7 @@ export class ParterChannelSalesEditComponent implements OnInit {
           delete value1.employeeVO;
           let value = res.employeeVO;
           List.push({ label: value.empName + '/' + value.empNo, value: value.empNo });
-          res.roleInfoVOList.forEach((element: any) => {
+          res?.roleInfoVOList?.forEach((element: any) => {
             List3.push(element.id);
           });
           setTimeout(() => {

src/app/routes/partner/recorded/components/detail/detail.component.ts

@@ -36,53 +36,38 @@ export class PartnerRecordedDetailComponent implements OnInit {
         console.log(res);
         // submitTime creattime
         let isEnd = false;
-        if (res.reAuditTime) {
+          if (res.sts == '2') {
-          isEnd = true;
-          if (res.sts === '3') {
-            this.timeLineData.push({ time: res.successTime, value: `到账成功`, color: 'green' });
-          } else {
-            this.timeLineData.push({ time: res.successTime, value: `提现失败`, color: 'red' });
-          }
-        }
-        if (res.agreeTime && res.refundStatus !== '4') {
-          this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' });
-        }
-        if (res.reAuditTime) {
-          if (res.refundStatus === '4') {
             isEnd = true;
+            this.timeLineData.push({ time: res.modifyTime, value: `入账成功`, color: 'green' });
+          } else if (res.sts == '3'){
+            isEnd = true;
+            this.timeLineData.push({ time: res.modifyTime, value: `入账失败`, color: 'red' });
+          }
+        // if (res.agreeTime && res.refundStatus !== '4') {
+        //   this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' });
+        // }
+        if (res.reAuditTime) {
+          if (res.sts === '2') {
             this.timeLineData.push({
               time: res.reAuditTime,
-              value: `拒绝提现<br/>操作人员：${res.handlerUserIdLabel}`,
+              value: `审核通过<br/>操作人员：${res.reAuditName}`,
-              color: 'red'
-            });
-          } else {
-            this.timeLineData.push({
-              time: res.reAuditTime,
-              value: `审核通过<br/>操作人员：${res.handlerUserIdLabel}`,
               color: 'gray'
             });
           }
         }
-        if (res.agreeTime) {
+        if (res.firstAuditTime) {
-          if (res.refundStatus === '4') {
+          if (res.sts === '1') {
-            isEnd = true;
             this.timeLineData.push({
-              time: res.agreeTime,
+              time: res.firstAuditTime,
-              value: `拒绝提现<br/>操作人员：${res.handlerUserIdLabel}`,
+              value: `审核通过<br/>操作人员：${res.fristAuditName}`,
-              color: 'red'
-            });
-          } else {
-            this.timeLineData.push({
-              time: res.agreeTime,
-              value: `审核通过<br/>操作人员：${res.handlerUserIdLabel}`,
               color: 'gray'
             });
           }
         }
-        if (res.createTime) {
+        if (res.sts) {
           this.timeLineData.push({
-            time: res.createTime,
+            time: res.submitTime,
-            value: `提交提现申请<br/>提现${res.amount}元至${res.bankName}(${res.bankCardNumber})<br/>操作人员：${res.userIdLabel}`,
+            value: `提交入账申请<br/>入账${res.entryAmount}元至${res.fictitiousAccount}<br/>操作人员：${res.submitUserName}`,
             color: 'gray'
           });
         }

src/app/routes/sys-setting/components/network-freight/new/new.component.ts

@@ -354,7 +354,7 @@ export class NetworkFreightNewComponent implements OnInit {
           type: 'string',
           title: '行业',
           enum: [
-            { label: '道路运输业', value: 54},
+            { label: '普通货物道路运输', value: 5431},
           ],
           default: 0,
           ui: {

src/app/routes/tax-management/services/tax-management.service.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-27 10:30:56
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-13 11:42:37
+ * @LastEditTime : 2022-05-13 14:06:34
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\services\\tax-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -61,7 +61,7 @@ export class TaxManagementService extends ShipperBaseService {
   // 获取发票上传列表
   $api_getInvoiceReport_page = '/api/sdc/invoiceUploadInfo/list/page';
   // 发票上传列表导出
-  $api_invoiceUpload_export = '/api/sdc/exportInvoiceUpload/exportInvoiceUpload';
+  $api_invoiceUpload_export = '/api/sdc/invoiceUploadInfo/exportInvoiceUpload';
   // 个税明细导出接口
   $api_taxIncome_export = '/api/sdc/taxIncome/asyncExport';
   // 个税汇总导出接口