Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/views/ContainerManagement/BaseInfo/columns.tsx

@@ -68,14 +68,6 @@ export const searchFormSchema: FormSchema[] = [
         labelField: 'ctnName',
         valueField: 'ediCode',
         resultField: 'data',
-        onChange: (e, obj) => {
-          if (e && obj) {
-            formModel.ctnall = obj.label
-          }
-          if (!e && !obj) {
-            formModel.ctnall = ''
-          }
-        },
       }
     },
   },

src/views/ContainerManagement/BaseInfo/index.vue

@@ -33,7 +33,8 @@
       })
     },
     beforeFetch: (p) => {
-      let Rdata = formatParams(p, ['ctnCode'])
+      // ['ctnCode']
+      let Rdata = formatParams(p, searchFormSchema)
       if (!!p.cntrno) {
         let data = JSON.parse(Rdata.queryCondition)
         data.forEach((item, index) => {

src/views/ContainerManagement/BuyCtn/index.vue

@@ -65,7 +65,8 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['oldContainerOwner', 'bsdate', 'accdate'])
+      // ['oldContainerOwner', 'bsdate', 'accdate']
+      return formatParams(p, searchFormSchema)
     },
     columns,
     formConfig: {

src/views/ContainerManagement/CtnScrap/index.vue

@@ -65,7 +65,8 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['bsdate', 'accdate'])
+      // ['bsdate', 'accdate']
+      return formatParams(p, searchFormSchema)
     },
     columns,
     formConfig: {

src/views/ContainerManagement/CurrentState/index.vue

@@ -54,7 +54,8 @@
       })
     },
     beforeFetch: (p) => {
-      let Rdata = formatParams(p, ['ctnOwner', 'ctnSourceId', 'isOnlineId', 'portid'])
+      // ['ctnOwner', 'ctnSourceId', 'isOnlineId', 'portid']
+      let Rdata = formatParams(p, searchFormSchema)
       if (!!p.cntrno || !!p.CM_ctnCode || !!p.CM_ctnSize || !!p.stateTime) {
         let data = JSON.parse(Rdata.queryCondition)
         let CM_ctnCode: any = null

src/views/ContainerManagement/CustFeeDui/index.vue

@@ -57,7 +57,8 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['oldContainerOwner', 'rentDirectId'])
+      // ['oldContainerOwner', 'rentDirectId']
+      return formatParams(p, searchFormSchema)
     },
     columns,
     formConfig: {

src/views/ContainerManagement/RentIn/index.vue

@@ -65,7 +65,8 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['oldContainerOwner', 'rentDirectId', 'bsdate', 'accdate'])
+      // ['oldContainerOwner', 'rentDirectId', 'bsdate', 'accdate']
+      return formatParams(p, searchFormSchema)
     },
     columns,
     formConfig: {

src/views/ContainerManagement/RentOneWay/index.vue

@@ -65,7 +65,8 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['rentCustomerName', 'bsdate', 'accdate'])
+      // ['rentCustomerName', 'bsdate', 'accdate']
+      return formatParams(p, searchFormSchema)
     },
     columns,
     formConfig: {

src/views/ContainerManagement/RentOneWayIn/index.vue

@@ -65,7 +65,8 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['rentCustomerName', 'bsdate', 'accdate'])
+      // ['rentCustomerName', 'bsdate', 'accdate']
+      return formatParams(p, searchFormSchema)
     },
     columns,
     formConfig: {

src/views/ContainerManagement/RentOut/index.vue

@@ -65,7 +65,8 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['rentCustomerName', 'rentDirectId', 'bsdate', 'accdate'])
+      // ['rentCustomerName', 'rentDirectId', 'bsdate', 'accdate']
+      return formatParams(p, searchFormSchema)
     },
     columns,
     formConfig: {

src/views/ContainerManagement/SellCtn/index.vue

@@ -65,7 +65,8 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['bsdate', 'accdate'])
+      // ['bsdate', 'accdate']
+      return formatParams(p, searchFormSchema)
     },
     columns,
     formConfig: {

src/views/ContainerManagement/Templat/index.vue

@@ -55,7 +55,8 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['ctnOwner', 'ctnSourceId', 'isOnlineId', 'portid'])
+      // ['ctnOwner', 'ctnSourceId', 'isOnlineId', 'portid']
+      return formatParams(p, searchFormSchema)
     },
     columns,
     formConfig: {

src/views/ContainerManagement/dsxxcl/index.vue

@@ -32,7 +32,8 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['ctnall', 'ctnSourceId', 'isOnlineId'])
+      // ['ctnall', 'ctnSourceId', 'isOnlineId']
+      return formatParams(p, searchFormSchema)
     },
     columns,
     rowSelection: { type: 'checkbox' },

src/views/fee/FeeCustTemplate/index.vue

@@ -89,7 +89,8 @@
     beforeFetch: (p) => {
       p['isShared'] = 1
       p['customerId'] = props.clientId
-      return formatParams(p, ['isShared', 'isDisabled'])
+      // ['isShared', 'isDisabled']
+      return formatParams(p, searchFormSchema)
     },
     columns: columns,
     formConfig: {