车辆对接

src/app/routes/order-management/components/bulk/bulk.component.ts

@@ -28,6 +28,10 @@ export class OrderManagementBulkComponent implements OnInit {
   isVisibleEvaluate = false;
   isVisible = false;
   _$expand = false;
+  changeId: any;       // 主页面查看运费变更记录id - 用于运费变更记录
+  changeViewId: any;  // 查看运费变更记录id - 用于查看
+  ViewCause: any;  // 变更运费查看数据
+  sfViewFormData: any;  // 变更运费查看的sf 数据
   @ViewChild('st') private readonly st!: STComponent;
   @ViewChild('stFloat') private readonly stFloat!: STComponent;
   @ViewChild('stFloatView') private readonly stFloatView!: STComponent;
@@ -76,6 +80,11 @@ tabs = {
   get selectedRows() {
     return this.st?.list.filter((item) => item.checked) || [];
   }
+  get changeParams() {
+    return {
+      id: this.changeId
+    };
+  }
   getGoodsSourceStatistical() {
     this.service.request(this.service.$api_getBulkStatistical).subscribe(res => {
       if (res) {
@@ -311,39 +320,33 @@ tabs = {
   initSFView() {
     this.schemaView = {
       properties: {
-        no: {
+        freightPrice: {
           type: 'string',
           title: '运费单价',
-         ui: {
-          widget: 'custom',
-         }
         },
-        sex: {
+        rule: {
           title: '',
           type: 'string',
-          default: 0,
-          enum: [
-            { label: '保留小数', value: 0 },
-            { label: '男', value: 1 },
-            { label: '女', value: 2 },
-            { label: '保密', value: 3 },
-          ],
           ui: {
-            widget: 'select',
+            widget: 'dict-select',
+            params: { dictKey: 'goodresource:rounding:rules' },
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
           } as SFSelectWidgetSchema,
         },
-        appId: {
+        settlementBasis: {
           type: 'string',
           title: '结算重量',
           ui: {
-            widget: 'select',
-            placeholder: '请选择',
-            allowClear: true,
-            asyncData: () => this.getCatalogueMember(),
-          },
+            widget: 'dict-select',
+            params: { dictKey: 'goodresource:settlement:type' },
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          } as SFSelectWidgetSchema,
         },
       },
-      type: 'object',
     };
     this.uiView = { '*': { spanLabelFixed: 80, grid: { span: 12, gutter: 4 } } };
   }
@@ -468,19 +471,19 @@ tabs = {
       {
         title: '序号',
         className: 'text-center',
-        index: 'one', 
+        render: 'order'
       },
       {
         title: '操作时间',
         className: 'text-center',
-        index: 'two', 
+        index: 'applyTime'
       },
       {
         title: '操作人',
         className: 'text-center',
-        index: 'three', 
+        index: 'applyUserName'
       },
-      { title: '状态', render: 'externalSn',  className: 'text-center' },
+      { title: '状态',     index: 'handleStatus',  className: 'text-center' },
       {
         title: '操作',
         fixed: 'right',
@@ -490,10 +493,14 @@ tabs = {
             text: '查看',
             click: (_record) => this.FloatView(_record),
           },
+          // {
+          //   text: '查看协议',
+          //   click: (_record, _modal, _instance) => this.view(_record)
+          // },
           {
             text: '撤销',
-            click: (_record) => this.audit(_record),
-           iif: item => item.externalSn === '1' || item.externalSn === 1,
+            click: (_record) => this.revoke(_record),
+           iif: item => item.handleStatus === '1' || item.handleStatus === 1,
           },
         ],
       },
@@ -505,15 +512,16 @@ tabs = {
         title: '费用名称',
         width: '100px',
         className: 'text-center',
-        render: 'goodsId'
+        index: 'costName'
       },
       {
         title: '变更前',
         width: '100px',
         className: 'text-center',
+        index: 'amountAfterChange'
       },
-      { title: '变更值', index: 'externalSn', width: '120px', className: 'text-center' },
-      { title: '变更后', index: 'externalSn', width: '120px', className: 'text-center' }
+      { title: '变更值', index: 'amountchangeValue', width: '120px', className: 'text-center' },
+      { title: '变更后', index: 'amountBeforeChange', width: '120px', className: 'text-center' }
     ];
   }
   /**
@@ -522,6 +530,11 @@ tabs = {
   get queryFieldCount(): number {
     return Object.keys(this.schema?.properties || {}).length;
   }
+  get changeViewParams() {
+    return {
+      id: this.changeViewId
+    };
+  }
   /**
   * 伸缩查询条件
   */
@@ -589,6 +602,7 @@ tabs = {
     
   }
   OpenPrice(item: any) {
+    this.changeId = item.id;
     this.isVisible = true
   }
    /**
@@ -596,6 +610,10 @@ tabs = {
   */
   FloatView(item: any) {
     console.log(item)
+    this.changeViewId = item.id;
+    this.service.request(this.service.$api_getChangeRecordBulkDetail, {id: this.changeViewId}).subscribe((res) => {
+      this.ViewCause = res;
+    })
     this.isVisibleView = true
   }
    /**
@@ -676,4 +694,19 @@ tabs = {
             }),
         })
       }
+      revoke(item: any) {
+        this.modal.confirm({
+          nzTitle: '是否确定立即撤销费用变更！</i>',
+          nzOnOk: () => 
+          this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id}).subscribe((res) => {
+            console.log(res)
+            if(res) {
+              this.service.msgSrv.success('撤销成功！')
+              this.stFloat.reload()
+            } else {
+              this.service.msgSrv.error(res.msg)
+            }
+          })
+        });
+      }
 }