解决冲突

2022-02-23 19:38:18 +08:00
parent c27874bb3f
commit f40c5a53a4
19 changed files with 520 additions and 150 deletions
--- a/src/app/routes/contract-management/components/contract-partner/contract-partner.component.html
+++ b/src/app/routes/contract-management/components/contract-partner/contract-partner.component.html
@ -0,0 +1,100 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-01-07 13:29:57
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-02-23 16:04:18
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-frame\\contract-frame.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<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)"
+          acl
+          [acl-ability]="['CONTRACT-INDEX-listFrame']"
+          >查询</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>
+
+  <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]="'/contract-management/index/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>
+</ng-template>
--- a/src/app/routes/contract-management/components/contract-partner/contract-partner.component.less
+++ b/src/app/routes/contract-management/components/contract-partner/contract-partner.component.less
@ -0,0 +1,35 @@
+:host::ng-deep {
+    .search-box {
+        .ant-card-body {
+            padding-bottom: 18px;
+        }
+    }
+
+    .content-box {
+        .ant-card-body {
+            padding-top: 0;
+        }
+    }
+
+    nz-range-picker {
+        width: 100%;
+    }
+
+    .ant-tabs-tab-btn {
+        padding-right: 16px;
+        padding-left : 16px;
+    }
+}
+
+.expend-options {
+    margin-top: 0;
+}
+
+
+@media (min-width: 1200px) {
+    .expend-options {
+        z-index   : -99;
+        margin-top: -40px;
+    }
+
+}
--- a/src/app/routes/contract-management/components/contract-partner/contract-partner.component.ts
+++ b/src/app/routes/contract-management/components/contract-partner/contract-partner.component.ts
@ -0,0 +1,200 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
+import { STComponent, STColumn, STChange } from '@delon/abc/st';
+import { SFComponent, SFSchema, SFDateWidgetSchema, SFUISchema } from '@delon/form';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { ContractManagementService } from '../../services/contract-management.service';
+
+@Component({
+  selector: 'app-contract-management-contract-frame',
+  templateUrl: './contract-frame.component.html',
+  styleUrls: ['./contract-frame.component.less']
+})
+export class ContractManagementFrameComponent implements OnInit {
+  url = `/rule?_allow_anonymous=true`;
+  @ViewChild('st', { static: true })
+  st!: STComponent;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  @ViewChild('auditModal', { static: false })
+  auditModal!: any;
+  schema: SFSchema = {};
+  columns: STColumn[] = [];
+  ui: SFUISchema = {};
+  _$expand = false;
+
+  reqParams = {};
+  selectedRows: any[] = [];
+  constructor(public service: ContractManagementService, private nzModalService: NzModalService, private router: Router) {}
+
+  ngOnInit(): void {
+    this.initST()
+    this.initSF()
+  }
+  /**
+   * 初始化数据列表
+   */
+   initST() {
+    this.columns = [
+      {
+        title: '合同编号',
+        width: '100px',
+        className: 'text-center',
+        render: 'contractCode'
+      },
+      {
+        title: '合同名称',
+        width: '100px',
+        className: 'text-center',
+        index:'contractName'
+      },
+      { title: '托运人', index: 'shipperName', width: '120px', className: 'text-center' },
+      { title: '承运人', index: 'carrierName', width: '120px', className: 'text-center' },
+      {
+        title: '有效期至',
+        className: 'text-center',
+        width: '120px',
+        index: 'effectiveEndTime'
+      },
+      {
+        title: '签署日期',
+        className: 'text-center',
+        width: '120px',
+        index: 'signTime'
+      },
+      {
+        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' },
+        },
+      },
+   
+    ];
+  }
+    /**
+ * 初始化查询表单
+ */
+     initSF() {
+      this.schema = {
+        properties: {
+          _$expand: { type: 'boolean', ui: { hidden: true } },
+          contractCode: {
+            type: 'string',
+            title: '合同编号',
+          },
+          shipperName: {
+            type: 'string',
+            title: '托运人'
+          },
+          carrierName: {
+            type: 'string',
+            title: '承运人',
+          },
+          signTime: {
+            title: '签署日期',
+            type: 'string',
+            ui: {
+              widget: 'custom',
+              visibleIf: {
+                _$expand: (value: boolean) => value,
+              },
+            }
+          },
+        },
+        type: 'object',
+      };
+      this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
+    }
+      /**
+   * 查询字段个数
+   */
+  get queryFieldCount(): number {
+    return Object.keys(this.schema?.properties || {}).length;
+  }
+  stChange(e: STChange): void {
+    switch (e.type) {
+      case 'checkbox':
+        this.selectedRows = e.checkbox!;
+        break;
+      case 'filter':
+        this.st.load();
+        break;
+    }
+  }
+
+  approval(): void {}
+
+  add(): void {}
+
+  routeTo(item: any) {
+    this.router.navigate(['/ticket/invoice-requested-detail/1']);
+  }
+
+  auditAction(item: any) {
+    const modal = this.nzModalService.create({
+      nzTitle: '审核',
+      nzContent: this.auditModal,
+      nzFooter: [
+        {
+          label: '拒绝',
+          type: 'default',
+          onClick: () => {
+            modal.destroy();
+          }
+        },
+        {
+          label: '通过',
+          type: 'primary',
+          onClick: () => {
+            modal.destroy();
+          }
+        }
+      ]
+    });
+    modal.afterClose.subscribe(res => {
+      this.st.load();
+    });
+  }
+
+  showReason(item: any) {
+    const modal = this.nzModalService.create({
+      nzTitle: '查看原因',
+      nzContent: '运单数据异常，暂时无法开票，请联系客服400-xxxx-xxxx',
+      nzFooter: [
+        {
+          label: '关闭',
+          type: 'primary',
+          onClick: () => {
+            modal.destroy();
+          }
+        }
+      ]
+    });
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this._$expand = false;
+  }
+
+  /**
+   * 伸缩查询条件
+   */
+   expandToggle(): void {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/_$expand', this._$expand);
+  }
+}
--- a/src/app/routes/contract-management/components/index/index.component.html
+++ b/src/app/routes/contract-management/components/index/index.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-07 13:27:10
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:16:56
+ * @LastEditTime : 2022-02-23 19:30:19
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\index\\index.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -19,5 +19,8 @@
    <nz-tab nzTitle="框架合同">
      <app-contract-management-contract-frame></app-contract-management-contract-frame>
    </nz-tab>
+    <nz-tab nzTitle="合伙人合同">
+      <app-contract-management-contract-frame></app-contract-management-contract-frame>
+    </nz-tab>
  </nz-tabset>
 </ng-template>