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

src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue

@@ -214,11 +214,15 @@
 
   const TotTableType = ref(false)
   async function submit() {
-    console.log('submit', 11111111111111)
-
     const values = await validate()
-    if (values.rentDirectId == 1) {
+    if (values.rentDirectId == 1 && values.oldContainerOwnerId) {
       TotTableType.value = true
+      setTimeout(async () => {
+        await setFieldsValueSearchBox({ oldContainerOwnerId: values.oldContainerOwnerId })
+        ViewlallCheck.value = false
+        ViewlsomeCheck.value = false
+        handleSearch()
+      }, 100)
     } else {
       TotTableType.value = false
     }
@@ -270,8 +274,6 @@
       queryCondition: `[{ FieldName: 'Pid', FieldValue: '${rowId.value}', ConditionalType: 1 }]`,
       pageCondition: { pageIndex: 1, pageSize: 999, sortConditions: [] },
     }).then((res) => {
-      // console.log(res)
-
       // list.value.splice(0)
       // res.data.forEach((item) => {
       //   list.value.push(item)
@@ -280,7 +282,6 @@
       list.value.splice(0)
       let Arr = ['pickupDate', 'dropoffDate', 'feeStartDate', 'bsdate']
       res.data.forEach((item) => {
-        console.log(item)
         Arr.forEach((e) => {
           if (item[e]) {
             item[e] = item[e].split(' ')[0]
@@ -373,9 +374,7 @@
         })
       })
       if (values.bsdate) {
-        console.log(values.bsdate)
         values.bsdate = moment(values.bsdate).format('YYYY-MM-DD 00:00:00')
-        console.log(values.bsdate)
       }
       if (values.accdate) {
         values.accdate = moment(values.bsdate).format('YYYY-MM')
@@ -1093,7 +1092,11 @@
   //--------------------------------------- tab1 View ---------------------------------------
   const [
     registerSearchBoxForm,
-    { resetFields: resetSearchBoxFields, validate: validateSearchBox },
+    {
+      resetFields: resetSearchBoxFields,
+      setFieldsValue: setFieldsValueSearchBox,
+      validate: validateSearchBox,
+    },
   ] = useForm({
     labelWidth: 100,
     schemas: formSearchBoxSchema,
@@ -1180,12 +1183,10 @@
   }
   async function handleSearch() {
     const values = await validateSearchBox()
-    console.log(values)
+
     let ApiData: any = []
     Object.keys(values).forEach((item) => {
       if (values[item]) {
-        console.log(values[item].split(','))
-
         if (item == 'cntrno') {
           ApiData.push({ FieldName: item, FieldValue: values[item], ConditionalType: 15 })
         } else {
@@ -1205,7 +1206,7 @@
         ApiData.ids.push(e.id)
       }
     })
-    console.log(ApiData.ids)
+
     if (ApiData.ids.length) {
       ApiAddCtn(ApiData).then(async (res) => {
         if (res.succeeded) {

src/views/ContainerManagement/RentIn/columns.tsx

@@ -397,7 +397,7 @@ export const formSchema: FormSchema[] = [
     required: true,
     dynamicDisabled: false,
     colProps: { span: 6 },
-    componentProps: ({ formModel }) => {
+    componentProps: ({ formModel, formActionType }) => {
       return {
         allowClear: true,
         showSearch: true,
@@ -412,6 +412,7 @@ export const formSchema: FormSchema[] = [
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
         onChange: (e, obj) => {
+          formActionType ? formActionType.submit() : null
           if (e && obj) {
             formModel.oldContainerOwnerId = obj.id
           }
@@ -501,7 +502,7 @@ export const formSearchBoxSchema: FormSchema[] = [
         showName: 'shortName',
         valueField: 'id',
         resultField: 'data',
-        immediate: false,
+
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },

src/views/baseinfo/infoclient/columns.tsx

@@ -1182,8 +1182,6 @@ export const formSchema: FormSchema[] = [
         options: OrgList,
         allowClear: true,
         onChange: (e, obj) => {
-          console.log(e, obj)
-
           if (e && obj) {
             formModel.saleOrgName = obj.label
             formModel.saleOrgId = obj.value

src/views/baseinfo/infoclient/index.vue

@@ -219,8 +219,6 @@
     },
   })
   function handleSuccess() {
-    console.log('handleSuccess')
-
     reload()
   }
   function handleCreate() {
@@ -237,8 +235,6 @@
     let ids = []
     let StateDelType = true
     getSelectRows().forEach((item: any) => {
-      console.log(item)
-
       if (item.auditStatus == 0) {
         StateDelType = false
       } else {