From 99d00bafa88f4fe556b1e2c3618f09f3c40ec857 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 4 Mar 2022 15:36:26 +0800
Subject: [PATCH] fix bug

---
 .../onecar-publish.component.ts               | 46 ++++++-------------
 .../release-publish.component.html            |  9 ----
 .../release-publish.component.ts              | 46 ++++++-------------
 3 files changed, 26 insertions(+), 75 deletions(-)

diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
index b2ee178e..fcfcf8c4 100644
--- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
+++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
@@ -581,65 +581,45 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
             }
           }
         },
-        receiptAddress: {
-          type: 'string',
-          title: '回单收件人信息',
-          ui: {
-            widget: 'custom',
-            placeholder: '请点击选择回单收件人信息',
-            // validator: val => (this.sf6?.value?.receiptType === '2' ? [{ keyword: 'required', message: '请点击选择收回单地址' }] : []),
-            visibleIf: {
-              receiptType: value => value === '2'
-            }
-          },
-          default: ''
-        },
-        receiptAddressId: {
-          type: 'string',
-          title: '',
-          ui: {
-            hidden: true
-          }
-        },
         receiptUserName: {
           type: 'string',
           title: '联系人',
+          maxLength: 15,
           ui: {
             visibleIf: {
               receiptType: value => value === '2'
             }
-          },
-          readOnly: true
+          }
         },
-        phon: {
+        receiptUserPhone: {
           type: 'string',
           title: '联系电话',
+          maxLength: 11,
           ui: {
             visibleIf: {
               receiptType: value => value === '2'
             }
-          },
-          readOnly: true
+          }
         },
-        area: {
+        receiptAddressArea: {
           type: 'string',
           title: '所在地区',
+          maxLength: 30,
           ui: {
             visibleIf: {
               receiptType: value => value === '2'
             }
-          },
-          readOnly: true
+          }
         },
-        address: {
+        receiptAddress: {
           type: 'string',
           title: '详细地址',
+          maxLength: 30,
           ui: {
             visibleIf: {
               receiptType: value => value === '2'
             }
-          },
-          readOnly: true
+          }
         },
         remarks: {
           type: 'string',
@@ -652,11 +632,11 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
           } as SFTextareaWidgetSchema
         }
       },
-      required: ['stateReceipt', 'receiptType', 'receiptAddress']
+      required: ['stateReceipt', 'receiptType', 'receiptUserName', 'receiptUserPhone', 'receiptAddressArea', 'receiptAddress']
     };
     this.ui6 = {
       '*': {
-        spanLabelFixed: 115,
+        spanLabelFixed: 90,
         grid: { span: 24 }
       }
     };
diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.html b/src/app/routes/supply-management/components/release-publish/release-publish.component.html
index 5981b49e..e8897d62 100644
--- a/src/app/routes/supply-management/components/release-publish/release-publish.component.html
+++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.html
@@ -281,15 +281,6 @@
   <div nz-row>
     <div nz-col nzSpan="12">
       <sf #sf6 [schema]="schema6" [button]="'none'" [ui]="ui6" [formData]="sf6data">
-        <!-- <ng-template sf-template="receiptAddressId" let-i let-ui="ui">
-          <input
-            nz-input
-            [ngModel]="i.value"
-            (ngModelChange)="i.setValue($event)"
-            placeholder="请点击选择收回单地址"
-            (click)="backBillChange()"
-          />
-        </ng-template> -->
       </sf>
     </div>
   </div>
diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
index 6db5bdf8..6421e36f 100644
--- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
+++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
@@ -565,65 +565,45 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
             }
           }
         },
-        receiptAddress: {
-          type: 'string',
-          title: '回单收件人信息',
-          ui: {
-            widget: 'custom',
-            placeholder: '请点击选择回单收件人信息',
-            // validator: val => (this.sf6?.value?.receiptType === '2' ? [{ keyword: 'required', message: '请点击选择收回单地址' }] : []),
-            visibleIf: {
-              receiptType: value => value === '2'
-            }
-          },
-          default: ''
-        },
-        receiptAddressId: {
-          type: 'string',
-          title: '',
-          ui: {
-            hidden: true
-          }
-        },
         receiptUserName: {
           type: 'string',
           title: '联系人',
+          maxLength: 15,
           ui: {
             visibleIf: {
               receiptType: value => value === '2'
             }
-          },
-          readOnly: true
+          }
         },
-        phon: {
+        receiptUserPhone: {
           type: 'string',
           title: '联系电话',
+          maxLength: 11,
           ui: {
             visibleIf: {
               receiptType: value => value === '2'
             }
-          },
-          readOnly: true
+          }
         },
-        area: {
+        receiptAddressArea: {
           type: 'string',
           title: '所在地区',
+          maxLength: 30,
           ui: {
             visibleIf: {
               receiptType: value => value === '2'
             }
-          },
-          readOnly: true
+          }
         },
-        address: {
+        receiptAddress: {
           type: 'string',
           title: '详细地址',
+          maxLength: 30,
           ui: {
             visibleIf: {
               receiptType: value => value === '2'
             }
-          },
-          readOnly: true
+          }
         },
         remarks: {
           type: 'string',
@@ -636,11 +616,11 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
           } as SFTextareaWidgetSchema
         }
       },
-      required: ['stateReceipt', 'receiptType', 'receiptAddress']
+      required: ['stateReceipt', 'receiptType', 'receiptUserName', 'receiptUserPhone', 'receiptAddressArea', 'receiptAddress']
     };
     this.ui6 = {
       '*': {
-        spanLabelFixed: 115,
+        spanLabelFixed: 90,
         grid: { span: 24 }
       }
     };