车辆对接

src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-05 11:01:55
- * @LastEditTime: 2022-01-06 10:29:11
+ * @LastEditTime: 2022-01-06 19:27:02
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\contract-management\components\contract-template-detail\contract-template-detail.component.ts
@@ -75,28 +75,41 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
           title: '模版名称',
         },
         templateType: {
+          title: '模板类型',
           type: 'string',
-          title: '模版类型',
+          default: '',
-          enum: [
-            { label: '需要', value: true },
-            { label: '不需要', value: false }
-          ],
           ui: {
-            widget: 'select',
+            widget: 'dict-select',
-            errors: { required: '请选择' },
+            params: { dictKey: 'contract:template:type' },
-            placeholder: '请选择'
+            containAllLable:true,
-          }
-        },
-        contractType: {
-          type: 'string',
-          title: '单据类型',
-          ui: {
-            widget: 'select',
-            placeholder: '请选择',
             visibleIf: {
-              templateType: value => value === true
+              _$expand: (value: boolean) => value,
+            },
+          } as SFSelectWidgetSchema,
+        },
+        // contractType: {
+        //   type: 'string',
+        //   title: '单据类型',
+        //   ui: {
+        //     widget: 'select',
+        //     placeholder: '请选择',
+        //     visibleIf: {
+        //       templateType: value => value === true
+        //     }
+        //   } as SFSelectWidgetSchema
+        // },
+        contractType: {
+          title: '单据类型',
+          type: 'string',
+          default: '',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'contract:type' },
+            containAllLable:true,
+              visibleIf: {
+              templateType: value => value === "MX"
             }
-          } as SFSelectWidgetSchema
+          } as SFSelectWidgetSchema,
         },
       }
     };
@@ -135,5 +148,16 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
     console.log(this.sfdata);
     console.log(this.sf2.value);
     console.log(this.title);
+    const params = {
+      ...this.sf.value,
+      ...this.sf2.value,
+      title: this.title
+    }
+    this.service.request(this.service.$api_save_contractTemplate, params).subscribe((res: any) => {
+      console.log(res)
+      if(res) {
+        this.service.msgSrv.success("保存成功！")
+      }
+    })
   }
 }

src/app/routes/contract-management/components/contract-template/contract-template.component.ts

@@ -79,7 +79,7 @@ export class OrderManagementTemplateComponent implements OnInit {
           default: '',
           ui: {
             widget: 'dict-select',
-            params: { dictKey: 'service:type' },
+            params: { dictKey: 'contract:template:type' },
             containAllLable:true,
             visibleIf: {
               _$expand: (value: boolean) => value,

src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts

@@ -1031,15 +1031,19 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
     //   remarks: res?.remarks
     // };
     this.sf6data = {
-      stateReceipt: res?.stateReceipt,
+      stateReceipt: res?.supplementaryInformationVO?.stateReceipt,
-      receiptType: res?.receiptType || '',
+      receiptType: res?.supplementaryInformationVO?.receiptType || '',
-      receiptAddressId: res?.receiptAddressId || '',
+      receiptAddressId: res?.supplementaryInformationVO?.receiptAddressId || '',
-      receiptUserName: res?.receiptUserName || '',
+      receiptUserName: res?.supplementaryInformationVO?.receiptUserName || '',
-      area: res?.area || '',
+      area: res?.supplementaryInformationVO?.area || '',
-      phon: res?.phon || '',
+      phon: res?.supplementaryInformationVO?.phon || '',
-      address: res?.address || '',
+      address: res?.supplementaryInformationVO?.address || '',
-      remarks: res?.remarks || '',
+      remarks: res?.supplementaryInformationVO?.remarks || '',
+      id: res?.supplementaryInformationVO?.id
     };
+    // if (this.PageStatus === '整车修改') { 
+    //   this.sf6data.id = res?.supplementaryInformationVO?.id
+    // }
     this.sf7data = {
       prePay: res?.shippingInformationVO?.prePay,
       toPay: res?.shippingInformationVO?.toPay,

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

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-06 16:38:52
+ * @LastEditTime: 2022-01-06 19:16:43
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\supply-management\services\supply-management.service.ts
@@ -38,7 +38,7 @@ export class SupplyManagementService extends BaseService {
   $api_delete_bulkdeletebatch = `/api/sdc/goodsInfo/deletebatch`;
   $api_get_catalogue_member = `/user?_allow_anonymous=true`;
   $api_get_listModifyPrice = `/api/sdc/goodsInfo/listModifyPrice`;
-  $api_update_price = `/api/sdc/goodsInfo/modifyPrice`; // 根据货物ID修改单价
+  $api_update_price = `/api/sdc/goodsResourceShipper/modifyPrice`; // 根据货物ID修改单价
   $api_get_goods_resource_statistical = `/api/sdc/goodsResourceOperate/statisticalStatus`; // 统计整车、大宗货源状态数量
     // 获取货主企业列表
   public $api_getList = '/api/mdc/cuc/enterpriseInfo/cargoOwner/getList?_allow_anonymous=true';