10/29 禅道

src/views/ContainerManagement/BaseInfo/columns.tsx

@@ -49,8 +49,13 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'cntrno',
     label: '箱号',
-    component: 'Input',
+    component: 'InputTextArea',
     colProps: { span: 8 },
+    componentProps: {
+      validateOnRuleChange: false,
+      placeholder: '可输入多个箱号',
+      rows: 1,
+    },
   },
   {
     field: 'ctnCode',

src/views/ContainerManagement/BaseInfo/index.vue

@@ -38,7 +38,7 @@
         let data = JSON.parse(Rdata.queryCondition)
         data.forEach((item, index) => {
           if (item.FieldName == 'cntrno') {
-            console.log(item)
+            item.FieldValue = item.FieldValue.replace(/ {1,}/g, ',')
             item.ConditionalType = 15
           }
         })

src/views/ContainerManagement/CurrentState/columns.tsx

@@ -334,8 +334,13 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'cntrno',
     label: '箱号',
-    component: 'Input',
+    component: 'InputTextArea',
     colProps: { span: 8 },
+    componentProps: {
+      validateOnRuleChange: false,
+      placeholder: '可输入多个箱号',
+      rows: 1,
+    },
   },
   {
     field: 'portid',
@@ -367,6 +372,7 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Input',
     colProps: { span: 4 },
   },
+
   // {
   //   field: 'ctnSourceId',
   //   label: '箱来源',

src/views/ContainerManagement/CurrentState/index.vue

@@ -61,6 +61,7 @@
         let CM_ctnSize: any = null
         data.forEach((item, index) => {
           if (item.FieldName == 'cntrno') {
+            item.FieldValue = item.FieldValue.replace(/ {1,}/g, ',')
             item.ConditionalType = 15
           }
           if (item.FieldName == 'CM_ctnCode') {

src/views/ContainerManagement/CustFeeDui/columns.tsx

@@ -163,14 +163,15 @@ export const searchFormSchema: FormSchema[] = [
         api: () => {
           return new Promise((resolve) => {
             getDictOption('CM_RentDirect').then((res) => {
-              let data: any = []
+              // let data: any = []
-              res.forEach((item) => {
+              // res.forEach((item) => {
-                item.value = parseInt(item.value)
+              //   item.value = parseInt(item.value)
-                if (!item.label.indexOf('租入')) {
+              //   if (!item.label.indexOf('租入')) {
-                  data.push(item)
+              //     data.push(item)
-                }
+              //   }
-              })
+              // })
-              resolve(data)
+              // resolve(data)
+              resolve(res)
             })
           })
         },
@@ -184,27 +185,40 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
-    field: 'etd',
+    field: 'accdate',
-    label: 'ETD',
+    label: '会计期间',
-    component: 'DatePicker',
+    component: 'MonthPicker',
-    colProps: { span: 4 },
-    defaultValue: '',
-    componentProps: {
-      showTime: true,
-      style: 'width:100%',
-    },
-  },
-  {
-    field: 'eta',
-    label: 'ETA',
-    component: 'DatePicker',
     colProps: { span: 4 },
-    defaultValue: '',
+    // defaultValue: moment(),
     componentProps: {
       showTime: true,
-      style: 'width:100%',
+      allowClear: true,
+      valueFormat: 'YYYY-MM',
+      format: 'YYYY-MM',
     },
   },
+  // {
+  //   field: 'etd',
+  //   label: 'ETD',
+  //   component: 'DatePicker',
+  //   colProps: { span: 4 },
+  //   defaultValue: '',
+  //   componentProps: {
+  //     showTime: true,
+  //     style: 'width:100%',
+  //   },
+  // },
+  // {
+  //   field: 'eta',
+  //   label: 'ETA',
+  //   component: 'DatePicker',
+  //   colProps: { span: 4 },
+  //   defaultValue: '',
+  //   componentProps: {
+  //     showTime: true,
+  //     style: 'width:100%',
+  //   },
+  // },
 ]
 export const formSchema: FormSchema[] = [
   {

src/views/ContainerManagement/StateChange/columns.tsx

@@ -166,21 +166,26 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'cntrno',
     label: '箱号',
-    component: 'Input',
+    component: 'InputTextArea',
     colProps: { span: 8 },
-  },
-  {
-    field: 'changeTime',
-    label: '状态时间',
-    component: 'RangePicker',
-    required: false,
-    dynamicDisabled: false,
-    colProps: { span: 4 },
     componentProps: {
-      allowClear: true,
+      validateOnRuleChange: false,
+      placeholder: '可输入多个箱号',
+      rows: 2,
     },
   },
   // {
+  //   field: 'changeTime',
+  //   label: '状态时间',
+  //   component: 'RangePicker',
+  //   required: false,
+  //   dynamicDisabled: false,
+  //   colProps: { span: 4 },
+  //   componentProps: {
+  //     allowClear: true,
+  //   },
+  // },
+  // {
   //   field: 'ctnBizState',
   //   label: '箱业务状态',
   //   component: 'ApiSelect',

src/views/ContainerManagement/StateChange/index.vue

@@ -55,6 +55,7 @@
         let data = JSON.parse(Rdata.queryCondition)
         data.forEach((item, index) => {
           if (item.FieldName == 'cntrno') {
+            item.FieldValue = item.FieldValue.replace(/ {1,}/g, ',')
             item.ConditionalType = 15
           }
         })