fix bug

src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-06 20:20:26
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-15 14:52:18
+ * @LastEditTime : 2022-03-02 10:30:06
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -95,8 +95,8 @@
       {{ i?.unloadPlanTime }}
     </sv>
     <sv label="接单数量"> {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件 </sv>
-    <sv label="装货数量"> {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件 </sv>
-    <sv label="卸货数量"> {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方,{{ i?.acceptNumber }}件 </sv>
+    <sv *ngIf="i?.billStatus =='3' || i?.billStatus =='4' || i?.billStatus =='5'" label="装货数量"> {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件 </sv>
+    <sv *ngIf="i?.billStatus =='4' || i?.billStatus =='5'" label="卸货数量"> {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方,{{ i?.acceptNumber }}件 </sv>
   </sv-container>
   <div class="mt-md">
     <h4 class="text-md"

src/app/routes/supply-management/model/import-supply/import-supply.component.ts

@@ -78,9 +78,9 @@ export class SupplyManagementImportSupplyComponent implements OnInit {
           type: 'string',
           title: '网络货运人',
           ui: {
-            widget: 'text'
-          },
-          default: '确认货主后带出'
+            widget: 'select',
+            placeholder: '请选择'
+          } as SFSelectWidgetSchema
         },
         enterpriseProjectId: {
           type: 'string',
@@ -131,6 +131,23 @@ export class SupplyManagementImportSupplyComponent implements OnInit {
         this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
       });
   }
+  getRegionCode2(regionCode: any) {
+    console.log(regionCode);
+    return this.service
+      .request(this.service.$api_get_enterprise_project, { id: regionCode })
+      .pipe(
+        map(res =>
+          res.map((item: any) => ({
+            label: item.projectName,
+            value: item.id
+          }))
+        )
+      )
+      .subscribe(res => {
+        this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
+        this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
+      });
+  }
   save(): void {
     console.log(this.files)
     // this.service.request(this.service.$api_update_price, { id, freightType, freightPrice, resourceCode, rule, resourceId }).subscribe(res => {
@@ -184,36 +201,6 @@ export class SupplyManagementImportSupplyComponent implements OnInit {
     });
   };
   downFile() {
-    console.log('78')
-    // this.service.request(this.service.$api_exportGoodsResourceOperateTemplate).subscribe((res: any)=> {
-    // console.log('66')
-    //   console.log(res)
-    //     let aLink = document.createElement('a');
-    //     const content = res;
-    //     let blob = this.base64ToBlob(content); //new Blob([content]);
-    //     let evt = document.createEvent("HTMLEvents");
-    //     evt.initEvent("click", true, true);//initEvent 不加后两个参数在IE下会报错  事件类型，是否冒泡，是否阻止浏览器的默认行为
-    //     aLink.download = '模板';
-    //     aLink.href = URL.createObjectURL(blob);
-    //     // aLink.dispatchEvent(evt);
-    //     aLink.click();
-    //     this.status = false
-    // })
    this.service.downloadFile(this.service.$api_exportGoodsResourceOperateTemplate);
-
-    
-    // window.location.href('')
   }
-    //base64转blob
-    base64ToBlob(code: any) {
-      let parts = code.split(';base64,');
-      let contentType = parts[0].split(':')[1];
-      let raw = window.atob(parts[1]);
-      let rawLength = raw.length;
-      let uInt8Array = new Uint8Array(rawLength);
-      for (let i = 0; i < rawLength; ++i) {
-        uInt8Array[i] = raw.charCodeAt(i);
-      }
-      return new Blob([uInt8Array], { type: contentType });
-    }
 }

src/app/routes/supply-management/services/supply-management.service.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-03 11:10:14
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-01 14:08:30
+ * @LastEditTime : 2022-03-02 10:10:18
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\services\\supply-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -159,4 +159,6 @@ export class SupplyManagementService extends BaseService {
   public $api_getWholeInsuranceInfo = '/api/sdc/goodsResourceShipper/getWholeInsuranceInfo';
   // 下载导入货源模板-运营后台
   public $api_exportGoodsResourceOperateTemplate = '/api/sdc/uploadGoodsResource/exportGoodsResourceOperateTemplate';
+  // 导入货源-运营后台
+  public $api_goodsResourceOperateImport = '/api/sdc/uploadGoodsResource/goodsResourceOperateImport';
 }

src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html

@@ -91,10 +91,10 @@
     <sv label="接单数量">
       {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件
     </sv>
-    <sv label="装货数量">
+    <sv *ngIf="i?.billStatus =='3' || i?.billStatus =='4' || i?.billStatus =='5'" label="装货数量">
       {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件
     </sv>
-    <sv label="卸货数量">
+    <sv *ngIf="i?.billStatus =='4' || i?.billStatus =='5'" label="卸货数量">
       {{i?.settlementWeight}}吨,{{i?.settlementVolume}}方,{{i?.acceptNumber}}件
     </sv>
 </sv-container>