From 4c3485ada129c4d65b2c12b14c076cacb0465498 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 10 Jan 2022 14:21:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contract-frame.component.html             | 120 +++++++++-------
 .../contract-frame.component.ts               |  97 ++++---------
 .../contract-list.component.html              | 129 ++++++++++--------
 .../contract-list/contract-list.component.ts  |  15 +-
 4 files changed, 186 insertions(+), 175 deletions(-)

diff --git a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html
index e90baeba..ab3d34bb 100644
--- a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html
+++ b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html
@@ -1,63 +1,89 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-07 15:57:49
- * @LastEditTime: 2021-12-07 16:25:09
+ * @LastEditTime: 2022-01-10 14:20:51
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\contract-management\components\contract-list\contract-list.component.html
 -->
 <nz-card>
-    <div nz-row nzGutter="8">
-      <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
-      <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
-        <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading"
-          (formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
-      </div>
-  
-      <!-- 查询字段大于3个时，根据展开状态调整布局 -->
-      <ng-container>
-        <div nz-col [nzSpan]="_$expand ? 24 : 18">
-          <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
-        </div>
-        <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-          <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
-            (click)="st?.load(1)">查询</button>
-          <button nz-button (click)="resetSF()">重置</button>
-          <button nz-button nzType="link" (click)="expandToggle()">
-            {{ !_$expand ? '展开' : '收起' }}
-            <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
-          </button>
-        </div>
-      </ng-container>
+  <div nz-row nzGutter="8">
+    <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
+    <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
+      <sf
+        #sf
+        [schema]="schema"
+        [ui]="ui"
+        [mode]="'search'"
+        [disabled]="!sf?.valid"
+        [loading]="service.http.loading"
+        (formSubmit)="st?.load(1)"
+        (formReset)="resetSF()"
+      ></sf>
     </div>
-  </nz-card>
+
+    <!-- 查询字段大于3个时，根据展开状态调整布局 -->
+    <ng-container>
+      <div nz-col [nzSpan]="_$expand ? 24 : 18">
+        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'">
+          <ng-template sf-template="signTime" let-me let-ui="ui" let-schema="schema">
+            <!-- <input placeholder="请输入1-30" type="number" [ngModel]="sf.value.description3" style="width: 200px;" nz-input />
+              <span> 天内支付运费</span> -->
+            <nz-range-picker [nzShowTime]="true" [(ngModel)]="sf.value.signTime"></nz-range-picker>
+          </ng-template>
+        </sf>
+      </div>
+      <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
+        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+        <button nz-button (click)="resetSF()">重置</button>
+        <button nz-button nzType="link" (click)="expandToggle()">
+          {{ !_$expand ? '展开' : '收起' }}
+          <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+        </button>
+      </div>
+    </ng-container>
+  </div>
+</nz-card>
 
 <nz-card class="content-box" nzBordered>
+  <div style="position: relative">
+    <nz-alert
+      nzType="info"
+      [nzMessage]="'当前共' + st?.total + '行记录，已选择' + selectedRows.length + '项'"
+      nzShowIcon
+      [ngStyle]="{ margin: '0 0 1rem 0' }"
+    >
+    </nz-alert>
+  </div>
 
-    <div style="position: relative">
-        <nz-alert
-          nzType="info"
-          [nzMessage]="'当前共' + st?.total + '行记录，已选择' + selectedRows.length + '项'"
-          nzShowIcon
-          [ngStyle]="{ margin: '0 0 1rem 0' }"
-        >
-        </nz-alert>
-      </div>
-
-    <st #st [data]="url" [columns]="columns"
-        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)"></st>
+  <st
+    #st
+    [data]="service.$api_listFrame_page"
+    [columns]="columns"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loading]="service.http.loading"
+    [scroll]="{ x: '1200px', y: '370px' }"
+    (change)="stChange($event)"
+  >
+  <ng-template st-row="contractCode" let-item let-index="index">
+    <a [routerLink]="'/supply-management/bulk-detail/' + item.id">{{ item?.contractCode }}</a>
+  </ng-template>
+</st>
 </nz-card>
 
 <ng-template #auditModal>
-    <div nz-row nzGutter="8">
-        <div nz-col nzSpan="24" se-container [labelWidth]="80">
-            <se [col]="1" label="备注">
-                <textarea nz-input rows="3" placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
-                    style="width: 325px;margin-left: 14px;"></textarea>
-            </se>
-        </div>
+  <div nz-row nzGutter="8">
+    <div nz-col nzSpan="24" se-container [labelWidth]="80">
+      <se [col]="1" label="备注">
+        <textarea
+          nz-input
+          rows="3"
+          placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
+          style="width: 325px; margin-left: 14px"
+        ></textarea>
+      </se>
     </div>
-</ng-template>
\ No newline at end of file
+  </div>
+</ng-template>
diff --git a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.ts b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.ts
index 7c9d14b2..3aea4685 100644
--- a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.ts
+++ b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.ts
@@ -36,73 +36,49 @@ export class ContractManagementFrameComponent implements OnInit {
    */
    initST() {
     this.columns = [
-      { title: '', type: 'checkbox', width: '50px', className: 'text-center' },
       {
         title: '合同编号',
         width: '100px',
         className: 'text-center',
-        render: 'goodsId'
+        render: 'contractCode'
       },
       {
-        title: '合同类型',
+        title: '合同名称',
         width: '100px',
         className: 'text-center',
+        index:'contractName'
       },
-      { title: '托运人', index: 'externalSn', width: '120px', className: 'text-center' },
-      { title: '承运人', index: 'linkUrl', width: '120px', className: 'text-center' },
+      { title: '托运人', index: 'shipperName', width: '120px', className: 'text-center' },
+      { title: '承运人', index: 'carrierName', width: '120px', className: 'text-center' },
       {
-        title: '业务单号',
-        className: 'text-center',
-        width: '120px',
-      },
-      {
-        title: '装货地',
-        className: 'text-center',
-        width: '120px',
-      }, 
-      {
-        title: '卸货地',
-        className: 'text-center',
-        width: '120px',
-      },
-      {
-        title: '货物名称',
-        className: 'text-center',
-        width: '120px',
-      },
-      {
-        title: '重量/体积',
-        className: 'text-center',
-        width: '120px',
-      },
-      {
-        title: '金额',
+        title: '有效期至',
         className: 'text-center',
         width: '120px',
+        index: 'effectiveEndTime'
       },
       {
         title: '签署日期',
         className: 'text-center',
         width: '120px',
-        render: 'feiong'
+        index: 'signTime'
       },
       {
-        title: '交易时间',
+        title: '状态',
         className: 'text-center',
         width: '120px',
+        type: 'badge',
+        index: 'esignFlowStatus',
+        badge: {
+          '0': { text: '未发起', color: 'default' },
+          '1': { text: '待签章', color: 'default' },
+          '2': { text: '已生效', color: 'success' },
+          '3': { text: '已撤销', color: 'warning' },
+          '4': { text: '已作废', color: 'warning' },
+          '5': { text: '已过期', color: 'warning' },
+          '7': { text: '已拒签', color: 'warning' },
+        },
       },
-      // {
-      //   title: '操作',
-      //   fixed: 'right',
-      //   width: '200px',
-      //   className: 'text-left',
-      //   buttons: [
-      //     {
-      //       text: '查看评价',
-      //       // click: (_record) => this.viewEvaluate(_record),
-      //     },
-      //   ],
-      // },
+   
     ];
   }
     /**
@@ -112,42 +88,27 @@ export class ContractManagementFrameComponent implements OnInit {
       this.schema = {
         properties: {
           _$expand: { type: 'boolean', ui: { hidden: true } },
-          no: {
+          contractCode: {
             type: 'string',
-            title: '用户名',
+            title: '合同编号',
           },
-          no2: {
+          shipperName: {
             type: 'string',
             title: '托运人'
           },
-          no1: {
+          carrierName: {
             type: 'string',
-            title: '承运人'
+            title: '承运人',
           },
-          createTime: {
+          signTime: {
             title: '签署日期',
             type: 'string',
             ui: {
-              widget: 'date',
-              mode: 'range',
-              format: 'yyyy-MM-dd',
+              widget: 'custom',
               visibleIf: {
                 _$expand: (value: boolean) => value,
               },
-            } as SFDateWidgetSchema,
-          },
-          appId: {
-            type: 'string',
-            title: '合同类型',
-            ui: {
-              widget: 'select',
-              placeholder: '请选择',
-              visibleIf: {
-                _$expand: (value: boolean) => value,
-              },
-              allowClear: true,
-              // asyncData: () => this.getCatalogueMember(),
-            },
+            }
           },
         },
         type: 'object',
diff --git a/src/app/routes/contract-management/components/contract-list/contract-list.component.html b/src/app/routes/contract-management/components/contract-list/contract-list.component.html
index b29e420f..b870830f 100644
--- a/src/app/routes/contract-management/components/contract-list/contract-list.component.html
+++ b/src/app/routes/contract-management/components/contract-list/contract-list.component.html
@@ -7,68 +7,83 @@
  * @FilePath: \tms-obc-web\src\app\routes\contract-management\components\contract-list\contract-list.component.html
 -->
 <nz-card>
-    <div nz-row nzGutter="8">
-      <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
-      <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
-        <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading"
-          (formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
-      </div>
-  
-      <!-- 查询字段大于3个时，根据展开状态调整布局 -->
-      <ng-container>
-        <div nz-col [nzSpan]="_$expand ? 24 : 18">
-          <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'">
-            <ng-template sf-template="signTime" let-me let-ui="ui" let-schema="schema">
-              <!-- <input placeholder="请输入1-30" type="number" [ngModel]="sf.value.description3" style="width: 200px;" nz-input />
-              <span> 天内支付运费</span> -->
-              <nz-range-picker [nzShowTime]="true" [(ngModel)]="sf.value.signTime" ></nz-range-picker>
-            </ng-template>
-          </sf>
-        </div>
-        <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-          <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
-            (click)="st?.load(1)">查询</button>
-          <button nz-button (click)="resetSF()">重置</button>
-          <button nz-button nzType="link" (click)="expandToggle()">
-            {{ !_$expand ? '展开' : '收起' }}
-            <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
-          </button>
-        </div>
-      </ng-container>
+  <div nz-row nzGutter="8">
+    <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
+    <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
+      <sf
+        #sf
+        [schema]="schema"
+        [ui]="ui"
+        [mode]="'search'"
+        [disabled]="!sf?.valid"
+        [loading]="service.http.loading"
+        (formSubmit)="st?.load(1)"
+        (formReset)="resetSF()"
+      ></sf>
     </div>
-  </nz-card>
+
+    <!-- 查询字段大于3个时，根据展开状态调整布局 -->
+    <ng-container>
+      <div nz-col [nzSpan]="_$expand ? 24 : 18">
+        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'">
+          <ng-template sf-template="signTime" let-me let-ui="ui" let-schema="schema">
+            <!-- <input placeholder="请输入1-30" type="number" [ngModel]="sf.value.description3" style="width: 200px;" nz-input />
+              <span> 天内支付运费</span> -->
+            <nz-range-picker [nzShowTime]="true" [(ngModel)]="sf.value.signTime"></nz-range-picker>
+          </ng-template>
+        </sf>
+      </div>
+      <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
+        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+        <button nz-button (click)="resetSF()">重置</button>
+        <button nz-button nzType="link" (click)="expandToggle()">
+          {{ !_$expand ? '展开' : '收起' }}
+          <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+        </button>
+      </div>
+    </ng-container>
+  </div>
+</nz-card>
 
 <nz-card class="content-box" nzBordered>
+  <div style="position: relative">
+    <nz-alert
+      nzType="info"
+      [nzMessage]="'当前共' + st?.total + '行记录，已选择' + selectedRows.length + '项'"
+      nzShowIcon
+      [ngStyle]="{ margin: '0 0 1rem 0' }"
+    >
+    </nz-alert>
+  </div>
 
-    <div style="position: relative">
-        <nz-alert
-          nzType="info"
-          [nzMessage]="'当前共' + st?.total + '行记录，已选择' + selectedRows.length + '项'"
-          nzShowIcon
-          [ngStyle]="{ margin: '0 0 1rem 0' }"
-        >
-        </nz-alert>
-      </div>
-
-    <st #st [data]="service.$api_listDetailed_page" [columns]="columns"
-        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)">
-        <ng-template st-row="contractCode" let-item let-index="index">
-          <a [routerLink]="'/supply-management/bulk-detail/'+item.id">{{item?.contractCode}}</a>
-        </ng-template>
-      
-      </st>
+  <st
+    #st
+    [data]="service.$api_listDetailed_page"
+    [columns]="columns"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loading]="service.http.loading"
+    [scroll]="{ x: '1200px', y: '370px' }"
+    (change)="stChange($event)"
+  >
+    <ng-template st-row="contractCode" let-item let-index="index">
+      <a [routerLink]="'/supply-management/bulk-detail/' + item.id">{{ item?.contractCode }}</a>
+    </ng-template>
+  </st>
 </nz-card>
 
 <ng-template #auditModal>
-    <div nz-row nzGutter="8">
-        <div nz-col nzSpan="24" se-container [labelWidth]="80">
-            <se [col]="1" label="备注">
-                <textarea nz-input rows="3" placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
-                    style="width: 325px;margin-left: 14px;"></textarea>
-            </se>
-        </div>
+  <div nz-row nzGutter="8">
+    <div nz-col nzSpan="24" se-container [labelWidth]="80">
+      <se [col]="1" label="备注">
+        <textarea
+          nz-input
+          rows="3"
+          placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
+          style="width: 325px; margin-left: 14px"
+        ></textarea>
+      </se>
     </div>
-</ng-template>
\ No newline at end of file
+  </div>
+</ng-template>
diff --git a/src/app/routes/contract-management/components/contract-list/contract-list.component.ts b/src/app/routes/contract-management/components/contract-list/contract-list.component.ts
index 80526254..ec7ad6ba 100644
--- a/src/app/routes/contract-management/components/contract-list/contract-list.component.ts
+++ b/src/app/routes/contract-management/components/contract-list/contract-list.component.ts
@@ -67,10 +67,16 @@ export class ContractManagementContractListComponent implements OnInit {
         render: 'contractCode'
       },
       {
-        title: '合同类型',
+        title: '单据类型',
         width: '100px',
         className: 'text-center',
-        index:'contractType'
+        index:'documentType'
+      },
+      {
+        title: '合同名称',
+        width: '100px',
+        className: 'text-center',
+        index:'contractName'
       },
       { title: '托运人', index: 'shipperName', width: '120px', className: 'text-center' },
       { title: '承运人', index: 'carrierName', width: '120px', className: 'text-center' },
@@ -163,7 +169,10 @@ export class ContractManagementContractListComponent implements OnInit {
             title: '签署日期',
             type: 'string',
             ui: {
-              widget: 'custom'
+              widget: 'custom',
+              visibleIf: {
+                _$expand: (value: boolean) => value,
+              },
             }
           },
         },