From 36c38de600e3edb7a937e2507f491382fbd99e67 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 1 Mar 2022 16:32:10 +0800
Subject: [PATCH] fix bug

---
 .../bulk-publish/bulk-publish.component.html   |  8 ++++----
 .../bulk-release-publish.component.html        |  8 ++++----
 .../onecar-publish.component.html              | 18 +++++++++---------
 .../release-publish.component.html             | 12 ++++++------
 .../import-supply/import-supply.component.html |  5 ++++-
 .../import-supply/import-supply.component.ts   |  7 +++++--
 6 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html
index 0f52adc0..8b82b607 100644
--- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html
+++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html
@@ -20,7 +20,7 @@
       <div nz-col [nzSpan]="10">
         <div *ngFor="let data1 of startInfo; let idx = index">
           <nz-form-item>
-            <nz-form-label [nzSpan]="3" nzRequired>装货地</nz-form-label>
+            <nz-form-label  nzRequired>装货地</nz-form-label>
             <nz-form-control [nzErrorTip]="'请输入装货地'">
               <div class="align-center">
                 <nz-input-group [nzSuffix]="endInconTemp1">
@@ -37,7 +37,7 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label [nzSpan]="3" nzRequired>联系人</nz-form-label>
+            <nz-form-label  nzRequired>联系人</nz-form-label>
             <div style="display: flex ;width: 86%">
               <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
                 <input
@@ -71,7 +71,7 @@
       <div nz-col [nzSpan]="10">
         <div *ngFor="let data2 of endInfo; let idx = index">
           <nz-form-item>
-            <nz-form-label [nzSpan]="3" nzRequired>卸货地</nz-form-label>
+            <nz-form-label  nzRequired>卸货地</nz-form-label>
             <nz-form-control [nzErrorTip]="'请输入卸货地'">
               <div class="align-center">
                 <nz-input-group [nzSuffix]="endInconTemp1">
@@ -88,7 +88,7 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label [nzSpan]="3" nzRequired>联系人</nz-form-label>
+            <nz-form-label  nzRequired>联系人</nz-form-label>
             <div style="display: flex;width: 86%">
               <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
                 <input
diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html
index 167c671c..8ef67db2 100644
--- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html
+++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html
@@ -26,7 +26,7 @@
       <div nz-col [nzSpan]="10">
         <div *ngFor="let data1 of startInfo; let idx = index">
           <nz-form-item>
-            <nz-form-label [nzSpan]="3" nzRequired>装货地</nz-form-label>
+            <nz-form-label  nzRequired>装货地</nz-form-label>
             <nz-form-control [nzErrorTip]="'请输入装货地'">
               <div class="align-center">
                 <nz-input-group [nzSuffix]="endInconTemp1">
@@ -44,7 +44,7 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label [nzSpan]="3" nzRequired>联系人</nz-form-label>
+            <nz-form-label  nzRequired>联系人</nz-form-label>
             <div style="display: flex;width: 86%">
               <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
                 <input
@@ -80,7 +80,7 @@
       <div nz-col [nzSpan]="10">
         <div *ngFor="let data2 of endInfo; let idx = index">
           <nz-form-item>
-            <nz-form-label [nzSpan]="3" nzRequired>卸货地</nz-form-label>
+            <nz-form-label  nzRequired>卸货地</nz-form-label>
             <nz-form-control [nzErrorTip]="'请输入卸货地'">
               <div class="align-center">
                 <nz-input-group [nzSuffix]="endInconTemp1">
@@ -98,7 +98,7 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label [nzSpan]="3" nzRequired>联系人</nz-form-label>
+            <nz-form-label  nzRequired>联系人</nz-form-label>
             <div style="display: flex;width: 86%">
               <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
                 <input
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
index d48a2dae..ee5b6177 100644
--- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
+++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
@@ -20,7 +20,7 @@
       <div nz-col [nzSpan]="10">
         <div *ngFor="let data1 of startInfo; let idx = index">
           <nz-form-item>
-            <nz-form-label [nzSpan]="3" nzRequired>装货地</nz-form-label>
+            <nz-form-label  nzRequired>装货地</nz-form-label>
             <nz-form-control [nzErrorTip]="'请输入装货地'">
               <div class="align-center">
                 <nz-input-group [nzSuffix]="endInconTemp1">
@@ -43,7 +43,7 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label [nzSpan]="3" nzRequired>联系人</nz-form-label>
+            <nz-form-label  nzRequired>联系人</nz-form-label>
             <div style="display: flex; width: 80.7%">
               <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
                 <input
@@ -88,7 +88,7 @@
       <div nz-col [nzSpan]="10">
         <div *ngFor="let data2 of endInfo; let idx = index">
           <nz-form-item>
-            <nz-form-label [nzSpan]="4" nzRequired>卸货地</nz-form-label>
+            <nz-form-label  nzRequired>卸货地</nz-form-label>
             <nz-form-control [nzErrorTip]="'请输入卸货地'">
               <div class="align-center">
                 <nz-input-group [nzSuffix]="endInconTemp1">
@@ -112,7 +112,7 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label [nzSpan]="3" nzRequired>联系人</nz-form-label>
+            <nz-form-label  nzRequired>联系人</nz-form-label>
             <div style="display: flex; width: 80.7%">
               <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
                 <input
@@ -150,9 +150,9 @@
       </div>
     </div>
     <div nz-row [nzGutter]="24" style="margin-top: 24px">
-      <div nz-col [nzSpan]="10">
+      <div nz-col nzXs="2" nzSm="4" nzMd="8" nzLg="8" nzXl="10">
         <nz-form-item>
-          <nz-form-label [nzSpan]="3" nzRequired>装货时间</nz-form-label>
+          <nz-form-label  nzRequired>装货时间</nz-form-label>
           <nz-form-control [nzErrorTip]="'请输入装货时间'">
             <nz-date-picker
             [nzShowTime]="{ nzFormat: 'HH' }"
@@ -163,10 +163,10 @@
           </nz-form-control>
         </nz-form-item>
       </div>
-      <div nz-col [nzSpan]="4"></div>
-      <div nz-col [nzSpan]="10">
+      <div nz-col nzXs="20" nzSm="16" nzMd="12" nzLg="8" nzXl="4"></div>
+      <div nz-col nzXs="2" nzSm="4" nzMd="8" nzLg="8" nzXl="10">
         <nz-form-item>
-          <nz-form-label [nzSpan]="3" nzRequired>卸货时间</nz-form-label>
+          <nz-form-label  nzRequired>卸货时间</nz-form-label>
           <nz-form-control [nzErrorTip]="'请输入卸货时间'">
             <nz-date-picker [nzShowTime]="{ nzFormat: 'HH' }"
             nzFormat="yyyy-MM-dd HH:00前" formControlName="unloadingTime"></nz-date-picker>
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 7d8445ec..0a0bbca3 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
@@ -26,7 +26,7 @@
       <div nz-col [nzSpan]="10">
         <div *ngFor="let data1 of startInfo; let idx = index">
           <nz-form-item>
-            <nz-form-label [nzSpan]="3" nzRequired>装货地</nz-form-label>
+            <nz-form-label nzRequired>装货地</nz-form-label>
             <nz-form-control [nzErrorTip]="'请输入装货地'">
               <div class="align-center">
                 <nz-input-group [nzSuffix]="endInconTemp1">
@@ -49,7 +49,7 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label [nzSpan]="3" nzRequired>联系人</nz-form-label>
+            <nz-form-label  nzRequired>联系人</nz-form-label>
             <div style="display: flex; width: 80.7%">
               <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
                 <input
@@ -94,7 +94,7 @@
       <div nz-col [nzSpan]="10">
         <div *ngFor="let data2 of endInfo; let idx = index">
           <nz-form-item>
-            <nz-form-label [nzSpan]="4" nzRequired>卸货地</nz-form-label>
+            <nz-form-label  nzRequired>卸货地</nz-form-label>
             <nz-form-control [nzErrorTip]="'请输入卸货地'">
               <div class="align-center">
                 <nz-input-group [nzSuffix]="endInconTemp1">
@@ -118,7 +118,7 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label [nzSpan]="3" nzRequired>联系人</nz-form-label>
+            <nz-form-label  nzRequired>联系人</nz-form-label>
             <div style="display: flex; width: 80.7%">
               <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
                 <input
@@ -158,7 +158,7 @@
     <div nz-row [nzGutter]="24" style="margin-top: 24px">
       <div nz-col [nzSpan]="10">
         <nz-form-item>
-          <nz-form-label [nzSpan]="3" nzRequired>装货时间</nz-form-label>
+          <nz-form-label nzRequired>装货时间</nz-form-label>
           <nz-form-control [nzErrorTip]="'请输入装货时间'">
             <nz-date-picker
                 [nzShowTime]="{ nzFormat: 'HH' }"
@@ -172,7 +172,7 @@
       <div nz-col [nzSpan]="4"></div>
       <div nz-col [nzSpan]="10">
         <nz-form-item>
-          <nz-form-label [nzSpan]="3" nzRequired>卸货时间</nz-form-label>
+          <nz-form-label  nzRequired>卸货时间</nz-form-label>
           <nz-form-control [nzErrorTip]="'请输入卸货时间'">
             <nz-date-picker [nzShowTime]="{ nzFormat: 'HH' }"
               nzFormat="yyyy-MM-dd HH:00前" formControlName="unloadingTime"></nz-date-picker>
diff --git a/src/app/routes/supply-management/model/import-supply/import-supply.component.html b/src/app/routes/supply-management/model/import-supply/import-supply.component.html
index e9f8866d..f6a5b464 100644
--- a/src/app/routes/supply-management/model/import-supply/import-supply.component.html
+++ b/src/app/routes/supply-management/model/import-supply/import-supply.component.html
@@ -8,7 +8,7 @@
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\model\\import-supply\\import-supply.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
-<div>
+<div *ngIf="status">
   <sf #sf mode="edit" [schema]="schema" [ui]="ui" button="none">
     <ng-template sf-template="resourceCode2" let-me let-ui="ui" let-schema="schema">
       <input readonly nz-input placeholder="请选择上传文件" [(ngModel)]="files2" />
@@ -41,6 +41,9 @@
     <sv style="height: 20px;">5、发布成功后，可在货源列表-待接单查看</sv>
   </sv-container>
 </div>
+<div *ngIf="!status">
+  文件上传成功！成功xx条，失败xx条！
+</div>
 <div class="modal-footer text-right">
   <button nz-button type="button" (click)="close()">取消</button>
   <button nz-button type="submit" nzType="primary" (click)="save()">确定</button>
diff --git a/src/app/routes/supply-management/model/import-supply/import-supply.component.ts b/src/app/routes/supply-management/model/import-supply/import-supply.component.ts
index 7957abc1..294878aa 100644
--- a/src/app/routes/supply-management/model/import-supply/import-supply.component.ts
+++ b/src/app/routes/supply-management/model/import-supply/import-supply.component.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-03-01 15:13:03
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-01 16:15:26
+ * @LastEditTime : 2022-03-01 16:18:58
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\model\\import-supply\\import-supply.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -26,6 +26,7 @@ import { SupplyManagementService } from '../../services/supply-management.servic
 export class SupplyManagementImportSupplyComponent implements OnInit {
   record: any = {};
   files: any;
+  status: boolean = true
   files2: any;
   schema: SFSchema = {};
   ui: SFUISchema = {};
@@ -185,7 +186,9 @@ export class SupplyManagementImportSupplyComponent implements OnInit {
   downFile() {
     this.service.request(this.service.$api_exportGoodsResourceOperateTemplate).subscribe((res: any)=> {
       console.log(res)
-      
+      if(res) {
+        this.status = false
+      }
     })
     // window.location.href('')
   }