From 6138a753129f8845d9b561805b5bf17cf9149d67 Mon Sep 17 00:00:00 2001
From: weiyu <weiyu.wei@eascs.com>
Date: Thu, 21 Apr 2022 17:35:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sms-template/sms-template.component.ts    | 15 +++++++----
 .../invoice-reporting.component.html          |  3 ---
 .../invoice-reporting.component.ts            | 27 ++++++++++++++-----
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts b/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts
index 7073d001..2746608c 100644
--- a/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts
+++ b/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts
@@ -24,6 +24,11 @@ export class SmsTemplateComponent implements OnInit {
 
   searchSchema: SFSchema = {
     properties: {
+      templateName: {
+        type: 'string',
+        title: '模板名称',
+        ui: { placeholder: '请输入模板名称' }
+      },
       templateCode: {
         type: 'string',
         title: '模板编码',
@@ -39,6 +44,11 @@ export class SmsTemplateComponent implements OnInit {
 
   editSchema: SFSchema = {
     properties: {
+      templateName: {
+        type: 'string',
+        title: '模板名称',
+        ui: { placeholder: '请输入模板名称' }
+      },
       templateCode: {
         type: 'string',
         title: '模板编码',
@@ -48,11 +58,6 @@ export class SmsTemplateComponent implements OnInit {
         type: 'string',
         title: '模板内容',
         ui: { placeholder: '请输入模板内容' }
-      },
-      templateName: {
-        type: 'string',
-        title: '模板名称',
-        ui: { placeholder: '请输入模板名称' }
       }
     }
   }
diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html
index c8ef14e3..3ed4ee8f 100644
--- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html
+++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html
@@ -34,9 +34,6 @@
       <span *ngIf="item?.uploadSts == '2'">上传中</span>
       <span  *ngIf="item?.uploadSts == '4'" style="color: red;" (click)="unnormal(item)">上传异常</span>
     </ng-template>
-    <ng-template st-row="invoiceNO" let-item let-index="index">
-      <a href="/">{{item.invoiceno}}</a>
-    </ng-template>
     <ng-template st-row="artoname" let-item let-index="index">
       <a href="/">{{item.artoname}}</a>
     </ng-template>
diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts
index 6194279b..d66a23fa 100644
--- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts
+++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts
@@ -50,7 +50,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
    * 查询参数
    */
   get reqParams() {
-    const params = Object.assign({}, this.sf?.value || {}, {uploadSts: this.selectedIndex});
+    const params = Object.assign({}, this.sf?.value || {}, { uploadSts: this.selectedIndex });
     delete params._$expand;
     return { ...params };
   }
@@ -213,9 +213,12 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
       {
         title: '发票号码',
         index: 'invoiceno',
-        render: 'invoiceNO',
         className: 'text-center',
         width: '150px',
+        type: 'link',
+        click: item => {
+          window.open(`/#/ticket/invoice-list/detail/${item.invoiceno}`, '_blank', 'noopener')
+        }
       },
       { title: '发票代码', index: 'invoiceno2', className: 'text-center', width: '150px', },
       {
@@ -224,14 +227,24 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
         className: 'text-center',
         width: '180px',
       },
-      { title: '购买方企业名称', index: 'artoname', render: 'artoname', className: 'text-center', width: '200px' },
+      {
+        title: '购买方企业名称', index: 'artoname', className: 'text-center', width: '200px', type: 'link',
+        click: item => {
+          window.open(`/#/usercenter/freight/list/detail/${item.ltdId}`, '_blank', 'noopener')
+        }
+      },
       { title: '购买方统一社会信用代码', index: 'artotaxno', className: 'text-center', width: '200px' },
-      { title: '订单号', index: 'billHCode', render: 'billHCode', className: 'text-center', width: '120px' },
+      {
+        title: '订单号', index: 'billHCode', render: 'billHCode', className: 'text-center', width: '120px', type: 'link',
+        click: item => {
+          window.open(`/#/order-management/vehicle/vehicle-detail/${item.ltdId}`, '_blank', 'noopener')
+        }
+      },
       { title: '货物名称', index: 'goodsinfo', className: 'text-center', width: '180px' },
       { title: '价税合计', index: 'vatmoney', className: 'text-center', width: '180px' },
       { title: '开票日期', index: 'invoicedate', className: 'text-center', width: '180px' },
       { title: '发票所属月份', index: 'invoicemonth', className: 'text-center', width: '250px' },
-      { title: '发票状态', index: 'sts', render:'sts', className: 'text-center', width: '200px' },
+      { title: '发票状态', index: 'sts', render: 'sts', className: 'text-center', width: '200px' },
       { title: '上传日期', index: 'uoloadDate', className: 'text-center', width: '200px' },
     ];
   }
@@ -258,7 +271,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
       nzOkText: '确定',
       nzCancelText: '取消',
       nzOnOk: () => {
-        this.service.request(this.service.$api_invoiceUpload_withdraw, {ids}).subscribe((res: any) => {
+        this.service.request(this.service.$api_invoiceUpload_withdraw, { ids }).subscribe((res: any) => {
           if (res) {
             this.service.msgSrv.success('撤销成功');
             this.search();
@@ -324,7 +337,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
 
     this.selectedIndex = item?.value || '';
     console.log(this.selectedIndex);
-    
+
     setTimeout(() => {
       this.st.load();
     })