fix bug

2022-04-09 14:22:43 +08:00
parent 8bc867ee0e
commit d39f4a3219
4 changed files with 87 additions and 52 deletions
--- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
+++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
@ -95,11 +95,16 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
          default: ''
        },
        declareResult: {
-          type: 'string',
          title: '申报结果',
+          type: 'string',
          ui: {
            placeholder: '请选择',
-            widget: 'select',
+            widget: 'dict-select',
+            params: { dictKey: 'service:type' },
+            containsAllLabel: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
          }
        },
        overdueStatus: {
--- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html
+++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-03-30 14:00:43
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-31 10:36:57
+ * @LastEditTime : 2022-04-09 14:13:42
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\individual-declare\\individual-declare.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -44,7 +44,7 @@
  <st
    #st
    [scroll]="{ x: '1200px' }"
-    [data]="service.$api_order_reporting_page"
+    [data]="service.$api_get_taxDeclaration"
    [columns]="columns"
    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
@ -74,8 +74,8 @@
    </div>
    <button nz-button nzType="primary" (click)="upload()">申报</button>
    <button nz-button nzType="primary" (click)="recall()">更正</button>
-    <button nz-button nzType="primary" (click)="resetData()">修改起征点</button>
-    <button nz-button nzType="primary" (click)="uploadSetting()">更新数据</button>
+    <button nz-button nzType="primary" (click)="uploadSetting()">修改起征点</button>
+    <button nz-button nzType="primary" (click)="resetData()">更新数据</button>
  </div>
 </ng-template>

--- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
+++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
@ -109,35 +109,35 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
    this.schema = {
      properties: {
        _$expand: { type: 'boolean', ui: { hidden: true } },
-        billCode: { title: '司机姓名', type: 'string', ui: { placeholder: '请输入' } },
-        resourceCode: {
+        driverName: { title: '司机姓名', type: 'string', ui: { placeholder: '请输入' } },
+        telephone: {
          type: 'string',
          title: '联系电话',
          ui: {
            placeholder: '请输入'
          }
        },
-        driverName: {
+        cardNumber: {
          title: '证件号码',
          type: 'string',
          ui: {
            placeholder: '请输入证件号码'
          }
        },
-        serviceType2: {
+        declareStatus: {
          title: '申报状态',
          type: 'string',
          ui: {
            placeholder: '请选择',
            widget: 'dict-select',
-            params: { dictKey: 'service:type' },
+            params: { dictKey: 'taxincome:declare:status' },
            containsAllLabel: true,
            visibleIf: {
              _$expand: (value: boolean) => value
            }
          }
        },
-        serviceType3: {
+        declareResult: {
          title: '申报结果',
          type: 'string',
          ui: {
@ -150,20 +150,22 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
            }
          }
        },
-        serviceType1: {
+        isOvertime: {
          title: '是否逾期',
          type: 'string',
+          enum: [
+            { value: '', label: '全部' },
+            { value: false, label: '否' },
+            { value: true, label: '是' }
+          ],
          ui: {
            placeholder: '请选择',
-            widget: 'dict-select',
-            params: { dictKey: 'service:type' },
-            containsAllLabel: true,
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
-          }
+            widget: 'select',
+            containsAllLabel: true
+          },
+          default: ''
        },
-        createTime: {
+        taxDate: {
          title: '税款所属期',
          type: 'string',
          ui: {
@ -175,7 +177,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
            }
          } as SFDateWidgetSchema
        },
-        createTime3: {
+        declareDate: {
          title: '申报日期',
          type: 'string',
          ui: {
@ -187,7 +189,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
            }
          } as SFDateWidgetSchema
        },
-        enterpriseInfoId: {
+        ltdId: {
          type: 'string',
          title: '网络货运人',
          ui: {
@ -214,38 +216,57 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
  initST() {
    this.columns = [
      { title: '', type: 'checkbox', className: 'text-center', width: '60px' },
-      { title: '申报状态', render: 'orderStatus', className: 'text-center', width: '120px' },
-      { title: '是否逾期', render: 'localValid', className: 'text-center', width: '120px' },
+      {
+        title: '申报状态',
+        index: 'declareStatus',
+        className: 'text-center',
+        width: '120px',
+        type: 'badge',
+        badge: {
+          '0': { text: '待申报', color: 'default' },
+          '1': { text: '待审核', color: 'processing' },
+          '2': { text: '已通过', color: 'success' },
+          '3': { text: '不通过', color: 'error' }
+        }
+      },
+      {
+        title: '是否逾期',
+        index: 'overdueStatus',
+        className: 'text-center',
+        width: '120px',
+        type: 'enum',
+        enum: { false: '否', true: '是' }
+      },
      {
        title: '税款所属期起',
-        render: 'billComplianceVOS',
+        index: 'skssqq',
        className: 'text-center',
        width: '150px'
      },
-      { title: '税款所属期止', render: 'freightDetails', className: 'text-center', width: '150px' },
+      { title: '税款所属期止', index: 'skssqz', className: 'text-center', width: '150px' },
      {
        title: '纳税人名称',
-        render: 'serviceType',
+        index: 'nsrmc',
        className: 'text-center',
        width: '180px'
      },
-      { title: '纳税人识别号', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '姓名', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '证件类型', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '证件号码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '联系电话', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '国家（地区）', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '所属行业', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '征收项目', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '征收品目', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '计税依据', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '税率', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '应纳税额', render: 'transportInfo', className: 'text-center', width: '180px' },
-      { title: '减免税额', render: 'transportInfo', className: 'text-center', width: '180px' },
-      { title: '已缴纳税额', render: 'transportInfo', className: 'text-center', width: '180px' },
-      { title: '应代征税额', render: 'transportInfo', className: 'text-center', width: '180px' },
-      { title: '已代征税额', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '申报日期', render: 'payeeName', className: 'text-center', width: '150px' },
+      { title: '纳税人识别号', index: 'nsrsbh', className: 'text-center', width: '200px' },
+      { title: '姓名', index: 'xm',  className: 'text-center', width: '200px' },
+      { title: '证件类型', index: 'sfzjlx', className: 'text-center', width: '200px' },
+      { title: '证件号码', index: 'sfzjhm',  className: 'text-center', width: '200px' },
+      { title: '联系电话', index: 'lxdh', className: 'text-center', width: '200px' },
+      { title: '国家（地区）', index: ' gjdq',  className: 'text-center', width: '200px' },
+      { title: '所属行业', index: 'hy',  className: 'text-center', width: '200px' },
+      { title: '征收项目', index: 'zsxm',  className: 'text-center', width: '200px' },
+      { title: '征收品目', index: 'zsmp', className: 'text-center', width: '200px' },
+      { title: '计税依据', index: 'jsyj', className: 'text-center', width: '200px' },
+      { title: '税率', index: 'sl', render: 'sl', className: 'text-center', width: '200px' },
+      { title: '应纳税额', index: 'ynse', className: 'text-center', width: '180px' },
+      { title: '减免税额', index: 'jmse', className: 'text-center', width: '180px' },
+      { title: '已缴纳税额', index: 'yjnse', className: 'text-center', width: '180px' },
+      { title: '应代征税额', index: 'dzse', className: 'text-center', width: '180px' },
+      { title: '已代征税额', index: 'ydzse', className: 'text-center', width: '150px' },
+      { title: '申报日期', render: 'sbrq', className: 'text-center', width: '150px' },
    ];
  }

@ -369,12 +390,16 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
      this.openWainingModal('请选择需要上传的数据');
      return;
    }
-    // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
-    //   if (res) {
-    //     this.service.msgSrv.success('更新成功');
-    //     this.search();
-    //   }
-    // })
+    let params: any[] = [];
+    this.selectedRows.forEach(item => {
+      params.push(item.id);
+    });
+    this.service.request(this.service.$api_get_taxDeclaration_updateAll, params).subscribe((res: any) => {
+      if (res) {
+        this.service.msgSrv.success('更新成功');
+        this.st.load(1);
+      }
+    })
  }

  /**
--- a/src/app/routes/tax-management/services/tax-management.service.ts
+++ b/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-04-08 15:28:39
+ * @LastEditTime : 2022-04-09 14:22:35
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\services\\tax-management.service.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -45,6 +45,11 @@ export class TaxManagementService extends ShipperBaseService {
  $api_get_uploadingTaxOrder = `/api/sdc/tax/uploadingTaxOrder`;
  // 上传税务订单
  $api_get_getTaxFieldCheckList = `/api/sdc/taxFieldCheck/getTaxFieldCheckList`;
+
+  // 查询税务申报
+  $api_get_taxDeclaration = `/api/sdc/taxDeclaration/list/page`;
+  // 更新所有税务申报
+  $api_get_taxDeclaration_updateAll = `/api/sdc/taxDeclaration/updateAll`;
  $api_recall_reporting = ``; // 撤回
  $api_async_export_order_reporting_list = ``; // 导出订单上报
  $api_get_upload_setting = ``; // 修改上传设置