Merge branch 'develop' of gitlab.eascs.com:tms-ui/tms-obc-web into develop

proxy.conf.js

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-02 15:55:18
+ * @LastEditTime : 2022-03-23 15:21:39
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -20,7 +20,7 @@ module.exports = {
   // }
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts

@@ -65,7 +65,6 @@ export class VehicleSureArriveComponent implements OnInit {
           imgUrl3: {
             type: 'string',
             title: '装货凭证',
-            readOnly: true,
             ui: {
               widget: 'upload',
               action: apiConf.fileUpload,
@@ -104,7 +103,6 @@ export class VehicleSureArriveComponent implements OnInit {
           imgUrl4: {
             type: 'string',
             title: '',
-            readOnly: true,
             ui: {
               widget: 'upload',
               action: apiConf.fileUpload,
@@ -252,7 +250,6 @@ export class VehicleSureArriveComponent implements OnInit {
           imgUrl3: {
             type: 'string',
             title: '装货凭证',
-            readOnly: true,
             ui: {
               widget: 'upload',
               action: apiConf.fileUpload,
@@ -291,7 +288,6 @@ export class VehicleSureArriveComponent implements OnInit {
           imgUrl4: {
             type: 'string',
             title: '',
-            readOnly: true,
             ui: {
               widget: 'upload',
               action: apiConf.fileUpload,
@@ -427,6 +423,10 @@ export class VehicleSureArriveComponent implements OnInit {
     };
   }
   save(value: any): void {
+    console.log(this.Status);
+    console.log(value?.imgUrl3?.data?.fullFilePath);
+    console.log(value?.imgUrl3.url);
+    
     if (this.Status === 1) {
       if (!value.time) {
         this.service.msgSrv.warning('卸货时间为空！');
@@ -436,9 +436,12 @@ export class VehicleSureArriveComponent implements OnInit {
         id: this.i.id,
         imgUrl1: value?.imgUrl1?.data?.fullFilePath,
         imgUrl2: value?.imgUrl2?.data?.fullFilePath,
+        setLading: value?.imgUrl3?.data?.fullFilePath || value?.imgUrl3.url,
+        setPeoCarGoods: value?.imgUrl4?.data?.fullFilePath || value?.imgUrl4.url,
         time: value?.time
       };
       params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ');
+      console.log(params);
       
       this.service.request(this.service.$api_get_insertWholeUnloadCarInfo, params).subscribe(res => {
         if (res) {
@@ -463,6 +466,8 @@ export class VehicleSureArriveComponent implements OnInit {
         id: this.i?.id,
         imgUrl1: value?.imgUrl1?.data?.fullFilePath,
         imgUrl2: value?.imgUrl2?.data?.fullFilePath,
+        setLading: value?.imgUrl3?.data?.fullFilePath || value?.imgUrl3.url,
+        setPeoCarGoods: value?.imgUrl4?.data?.fullFilePath || value?.imgUrl4.url,
         time: value?.time,
         volume: this.data?.volume,
         weight: this.data?.weight

src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts

@@ -57,7 +57,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
     { title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-left' },
     { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
     { title: '卸货地', index: 'unloadingAddressArr', width: '180px', className: 'text-left' },
-    { title: '承运司机', index: 'driver', width: '90px', className: 'text-left' },
+    { title: '承运司机', index: 'driver', width: '200px', className: 'text-left' },
     { title: '异常信息', index: 'exceptionContent', width: '250px', className: 'text-left' },
     { title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '220px', className: 'text-left' },
     { title: '上报时间', index: 'createTime', width: '180px', className: 'text-left' },

src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts

@@ -51,10 +51,17 @@ export class DynamicSettingH5Component implements OnInit {
       return;
     }
     // 配置校验
-    if (this.configList.find((config: any) => !config.itemValue && config.requiredField)) {
-      this.service.msgSrv.warning('请填写必填项');
+    for (let index = 0; index < this.configList.length; index++) {
+      const config = this.configList[index];
+      if (!config.itemValue && config.requiredField) {
+        this.service.msgSrv.warning(`${config.name}不能为${config.itemValue}！`);
         return;
       }
+    }
+    // if (this.configList.find((config: any) => !config.itemValue && config.requiredField)) {
+    //   this.service.msgSrv.warning('请填写必填项');
+    //   return;
+    // }
     let params = [...this.configList];
     params = params.map((item: any) => {
       if (item.itemType == 9) {