Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop
This commit is contained in:
		| @ -1,63 +1,89 @@ | |||||||
| <!-- | <!-- | ||||||
|  * @Author: your name |  * @Author: your name | ||||||
|  * @Date: 2021-12-07 15:57:49 |  * @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 |  * @LastEditors: Please set LastEditors | ||||||
|  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE |  * @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 |  * @FilePath: \tms-obc-web\src\app\routes\contract-management\components\contract-list\contract-list.component.html | ||||||
| --> | --> | ||||||
| <nz-card> | <nz-card> | ||||||
|     <div nz-row nzGutter="8"> |   <div nz-row nzGutter="8"> | ||||||
|       <!-- 查询字段小于或等于3个时,不显示伸缩按钮 --> |     <!-- 查询字段小于或等于3个时,不显示伸缩按钮 --> | ||||||
|       <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4"> |     <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4"> | ||||||
|         <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading" |       <sf | ||||||
|           (formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf> |         #sf | ||||||
|       </div> |         [schema]="schema" | ||||||
|    |         [ui]="ui" | ||||||
|       <!-- 查询字段大于3个时,根据展开状态调整布局 --> |         [mode]="'search'" | ||||||
|       <ng-container> |         [disabled]="!sf?.valid" | ||||||
|         <div nz-col [nzSpan]="_$expand ? 24 : 18"> |         [loading]="service.http.loading" | ||||||
|           <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> |         (formSubmit)="st?.load(1)" | ||||||
|         </div> |         (formReset)="resetSF()" | ||||||
|         <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand"> |       ></sf> | ||||||
|           <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> |     </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> | <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"> |   <st | ||||||
|         <nz-alert |     #st | ||||||
|           nzType="info" |     [data]="service.$api_listFrame_page" | ||||||
|           [nzMessage]="'当前共' + st?.total + '行记录,已选择' + selectedRows.length + '项'" |     [columns]="columns" | ||||||
|           nzShowIcon |     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" | ||||||
|           [ngStyle]="{ margin: '0 0 1rem 0' }" |     [res]="{ reName: { list: 'data.records', total: 'data.total' } }" | ||||||
|         > |     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" | ||||||
|         </nz-alert> |     [loading]="service.http.loading" | ||||||
|       </div> |     [scroll]="{ x: '1200px', y: '370px' }" | ||||||
|  |     (change)="stChange($event)" | ||||||
|     <st #st [data]="url" [columns]="columns" |   > | ||||||
|         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" |   <ng-template st-row="contractCode" let-item let-index="index"> | ||||||
|         [res]="{ reName: { list: 'data.records', total: 'data.total' } }" |     <a [routerLink]="'/supply-management/bulk-detail/' + item.id">{{ item?.contractCode }}</a> | ||||||
|         [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" |   </ng-template> | ||||||
|         [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)"></st> | </st> | ||||||
| </nz-card> | </nz-card> | ||||||
|  |  | ||||||
| <ng-template #auditModal> | <ng-template #auditModal> | ||||||
|     <div nz-row nzGutter="8"> |   <div nz-row nzGutter="8"> | ||||||
|         <div nz-col nzSpan="24" se-container [labelWidth]="80"> |     <div nz-col nzSpan="24" se-container [labelWidth]="80"> | ||||||
|             <se [col]="1" label="备注"> |       <se [col]="1" label="备注"> | ||||||
|                 <textarea nz-input rows="3" placeholder="同意可以不用填写原因 ,拒绝必须说明原因" |         <textarea | ||||||
|                     style="width: 325px;margin-left: 14px;"></textarea> |           nz-input | ||||||
|             </se> |           rows="3" | ||||||
|         </div> |           placeholder="同意可以不用填写原因 ,拒绝必须说明原因" | ||||||
|  |           style="width: 325px; margin-left: 14px" | ||||||
|  |         ></textarea> | ||||||
|  |       </se> | ||||||
|     </div> |     </div> | ||||||
| </ng-template> |   </div> | ||||||
|  | </ng-template> | ||||||
|  | |||||||
| @ -36,73 +36,49 @@ export class ContractManagementFrameComponent implements OnInit { | |||||||
|    */ |    */ | ||||||
|    initST() { |    initST() { | ||||||
|     this.columns = [ |     this.columns = [ | ||||||
|       { title: '', type: 'checkbox', width: '50px', className: 'text-center' }, |  | ||||||
|       { |       { | ||||||
|         title: '合同编号', |         title: '合同编号', | ||||||
|         width: '100px', |         width: '100px', | ||||||
|         className: 'text-center', |         className: 'text-center', | ||||||
|         render: 'goodsId' |         render: 'contractCode' | ||||||
|       }, |       }, | ||||||
|       { |       { | ||||||
|         title: '合同类型', |         title: '合同名称', | ||||||
|         width: '100px', |         width: '100px', | ||||||
|         className: 'text-center', |         className: 'text-center', | ||||||
|  |         index:'contractName' | ||||||
|       }, |       }, | ||||||
|       { title: '托运人', index: 'externalSn', width: '120px', className: 'text-center' }, |       { title: '托运人', index: 'shipperName', width: '120px', className: 'text-center' }, | ||||||
|       { title: '承运人', index: 'linkUrl', width: '120px', className: 'text-center' }, |       { title: '承运人', index: 'carrierName', width: '120px', className: 'text-center' }, | ||||||
|       { |       { | ||||||
|         title: '业务单号', |         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: '金额', |  | ||||||
|         className: 'text-center', |         className: 'text-center', | ||||||
|         width: '120px', |         width: '120px', | ||||||
|  |         index: 'effectiveEndTime' | ||||||
|       }, |       }, | ||||||
|       { |       { | ||||||
|         title: '签署日期', |         title: '签署日期', | ||||||
|         className: 'text-center', |         className: 'text-center', | ||||||
|         width: '120px', |         width: '120px', | ||||||
|         render: 'feiong' |         index: 'signTime' | ||||||
|       }, |       }, | ||||||
|       { |       { | ||||||
|         title: '交易时间', |         title: '状态', | ||||||
|         className: 'text-center', |         className: 'text-center', | ||||||
|         width: '120px', |         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 = { |       this.schema = { | ||||||
|         properties: { |         properties: { | ||||||
|           _$expand: { type: 'boolean', ui: { hidden: true } }, |           _$expand: { type: 'boolean', ui: { hidden: true } }, | ||||||
|           no: { |           contractCode: { | ||||||
|             type: 'string', |             type: 'string', | ||||||
|             title: '用户名', |             title: '合同编号', | ||||||
|           }, |           }, | ||||||
|           no2: { |           shipperName: { | ||||||
|             type: 'string', |             type: 'string', | ||||||
|             title: '托运人' |             title: '托运人' | ||||||
|           }, |           }, | ||||||
|           no1: { |           carrierName: { | ||||||
|             type: 'string', |             type: 'string', | ||||||
|             title: '承运人' |             title: '承运人', | ||||||
|           }, |           }, | ||||||
|           createTime: { |           signTime: { | ||||||
|             title: '签署日期', |             title: '签署日期', | ||||||
|             type: 'string', |             type: 'string', | ||||||
|             ui: { |             ui: { | ||||||
|               widget: 'date', |               widget: 'custom', | ||||||
|               mode: 'range', |  | ||||||
|               format: 'yyyy-MM-dd', |  | ||||||
|               visibleIf: { |               visibleIf: { | ||||||
|                 _$expand: (value: boolean) => value, |                 _$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', |         type: 'object', | ||||||
|  | |||||||
| @ -7,68 +7,83 @@ | |||||||
|  * @FilePath: \tms-obc-web\src\app\routes\contract-management\components\contract-list\contract-list.component.html |  * @FilePath: \tms-obc-web\src\app\routes\contract-management\components\contract-list\contract-list.component.html | ||||||
| --> | --> | ||||||
| <nz-card> | <nz-card> | ||||||
|     <div nz-row nzGutter="8"> |   <div nz-row nzGutter="8"> | ||||||
|       <!-- 查询字段小于或等于3个时,不显示伸缩按钮 --> |     <!-- 查询字段小于或等于3个时,不显示伸缩按钮 --> | ||||||
|       <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4"> |     <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4"> | ||||||
|         <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading" |       <sf | ||||||
|           (formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf> |         #sf | ||||||
|       </div> |         [schema]="schema" | ||||||
|    |         [ui]="ui" | ||||||
|       <!-- 查询字段大于3个时,根据展开状态调整布局 --> |         [mode]="'search'" | ||||||
|       <ng-container> |         [disabled]="!sf?.valid" | ||||||
|         <div nz-col [nzSpan]="_$expand ? 24 : 18"> |         [loading]="service.http.loading" | ||||||
|           <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"> |         (formSubmit)="st?.load(1)" | ||||||
|             <ng-template sf-template="signTime" let-me let-ui="ui" let-schema="schema"> |         (formReset)="resetSF()" | ||||||
|               <!-- <input placeholder="请输入1-30" type="number" [ngModel]="sf.value.description3" style="width: 200px;" nz-input /> |       ></sf> | ||||||
|               <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> |     </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> | <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"> |   <st | ||||||
|         <nz-alert |     #st | ||||||
|           nzType="info" |     [data]="service.$api_listDetailed_page" | ||||||
|           [nzMessage]="'当前共' + st?.total + '行记录,已选择' + selectedRows.length + '项'" |     [columns]="columns" | ||||||
|           nzShowIcon |     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" | ||||||
|           [ngStyle]="{ margin: '0 0 1rem 0' }" |     [res]="{ reName: { list: 'data.records', total: 'data.total' } }" | ||||||
|         > |     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" | ||||||
|         </nz-alert> |     [loading]="service.http.loading" | ||||||
|       </div> |     [scroll]="{ x: '1200px', y: '370px' }" | ||||||
|  |     (change)="stChange($event)" | ||||||
|     <st #st [data]="service.$api_listDetailed_page" [columns]="columns" |   > | ||||||
|         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" |     <ng-template st-row="contractCode" let-item let-index="index"> | ||||||
|         [res]="{ reName: { list: 'data.records', total: 'data.total' } }" |       <a [routerLink]="'/supply-management/bulk-detail/' + item.id">{{ item?.contractCode }}</a> | ||||||
|         [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" |     </ng-template> | ||||||
|         [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)"> |   </st> | ||||||
|         <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> | </nz-card> | ||||||
|  |  | ||||||
| <ng-template #auditModal> | <ng-template #auditModal> | ||||||
|     <div nz-row nzGutter="8"> |   <div nz-row nzGutter="8"> | ||||||
|         <div nz-col nzSpan="24" se-container [labelWidth]="80"> |     <div nz-col nzSpan="24" se-container [labelWidth]="80"> | ||||||
|             <se [col]="1" label="备注"> |       <se [col]="1" label="备注"> | ||||||
|                 <textarea nz-input rows="3" placeholder="同意可以不用填写原因 ,拒绝必须说明原因" |         <textarea | ||||||
|                     style="width: 325px;margin-left: 14px;"></textarea> |           nz-input | ||||||
|             </se> |           rows="3" | ||||||
|         </div> |           placeholder="同意可以不用填写原因 ,拒绝必须说明原因" | ||||||
|  |           style="width: 325px; margin-left: 14px" | ||||||
|  |         ></textarea> | ||||||
|  |       </se> | ||||||
|     </div> |     </div> | ||||||
| </ng-template> |   </div> | ||||||
|  | </ng-template> | ||||||
|  | |||||||
| @ -67,10 +67,16 @@ export class ContractManagementContractListComponent implements OnInit { | |||||||
|         render: 'contractCode' |         render: 'contractCode' | ||||||
|       }, |       }, | ||||||
|       { |       { | ||||||
|         title: '合同类型', |         title: '单据类型', | ||||||
|         width: '100px', |         width: '100px', | ||||||
|         className: 'text-center', |         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: 'shipperName', width: '120px', className: 'text-center' }, | ||||||
|       { title: '承运人', index: 'carrierName', width: '120px', className: 'text-center' }, |       { title: '承运人', index: 'carrierName', width: '120px', className: 'text-center' }, | ||||||
| @ -163,7 +169,10 @@ export class ContractManagementContractListComponent implements OnInit { | |||||||
|             title: '签署日期', |             title: '签署日期', | ||||||
|             type: 'string', |             type: 'string', | ||||||
|             ui: { |             ui: { | ||||||
|               widget: 'custom' |               widget: 'custom', | ||||||
|  |               visibleIf: { | ||||||
|  |                 _$expand: (value: boolean) => value, | ||||||
|  |               }, | ||||||
|             } |             } | ||||||
|           }, |           }, | ||||||
|         }, |         }, | ||||||
|  | |||||||
| @ -1,7 +1,7 @@ | |||||||
| <!-- | <!-- | ||||||
|  * @Author: your name |  * @Author: your name | ||||||
|  * @Date: 2021-12-03 11:10:14 |  * @Date: 2021-12-03 11:10:14 | ||||||
|  * @LastEditTime: 2022-01-04 20:50:04 |  * @LastEditTime: 2022-01-10 13:40:12 | ||||||
|  * @LastEditors: Please set LastEditors |  * @LastEditors: Please set LastEditors | ||||||
|  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE |  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE | ||||||
|  * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html |  * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html | ||||||
| @ -94,7 +94,7 @@ | |||||||
|   </div> |   </div> | ||||||
| </nz-card> | </nz-card> | ||||||
|  |  | ||||||
| <nz-modal [(nzVisible)]="isVisibleRE"  [nzWidth]="600" [nzFooter]="nzModalFooterview2"  (nzOnOk)="handleOK()" nzTitle="处理" (nzOnCancel)="handleCancel('1')"> | <nz-modal [(nzVisible)]="isVisibleRE"  [nzWidth]="600" [nzFooter]="nzModalFooterview2"  (nzOnOk)="handleOK()" nzTitle="处理" (nzOnCancel)="Cancel()"> | ||||||
|   <ng-container *nzModalContent> |   <ng-container *nzModalContent> | ||||||
|     <sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'"> |     <sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'"> | ||||||
|     </sf> |     </sf> | ||||||
|  | |||||||
| @ -275,6 +275,9 @@ export class OrderManagementComplaintComponent implements OnInit { | |||||||
|     }) |     }) | ||||||
|     this.isVisibleRE = false |     this.isVisibleRE = false | ||||||
|   } |   } | ||||||
|  |   Cancel() { | ||||||
|  |     this.isVisibleRE = false | ||||||
|  |   } | ||||||
|   handleCancel2() { |   handleCancel2() { | ||||||
|     const paramsa = { |     const paramsa = { | ||||||
|       id: this.channelId |       id: this.channelId | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user