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

src/views/ContainerManagement/BaseInfo/columns.tsx

@@ -50,7 +50,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'cntrno',
     label: '箱号',
     component: 'Input',
-    colProps: { span: 4 },
+    colProps: { span: 8 },
   },
   {
     field: 'ctnCode',

src/views/ContainerManagement/BaseInfo/index.vue

@@ -33,7 +33,18 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['ctnCode'])
+      let Rdata = formatParams(p, ['ctnCode'])
+      if (!!p.cntrno) {
+        let data = JSON.parse(Rdata.queryCondition)
+        data.forEach((item, index) => {
+          if (item.FieldName == 'cntrno') {
+            console.log(item)
+            item.ConditionalType = 15
+          }
+        })
+        Rdata.queryCondition = JSON.stringify(data)
+      }
+      return Rdata
     },
     columns,
     formConfig: {

src/views/ContainerManagement/RentOneWayIn/columns.tsx

@@ -402,7 +402,7 @@ export const formSchema: FormSchema[] = [
     field: 'oldContainerOwner',
     label: '原箱主',
     component: 'ApiSelect',
-    required: false,
+    required: true,
     dynamicDisabled: false,
     colProps: { span: 6 },
     componentProps: ({ formModel }) => {

src/views/ContainerManagement/StateChange/columns.tsx

@@ -110,7 +110,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'cntrno',
     label: '箱号',
     component: 'Input',
-    colProps: { span: 4 },
+    colProps: { span: 8 },
   },
   {
     field: 'ctnBizState',

src/views/ContainerManagement/StateChange/index.vue

@@ -43,7 +43,18 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['ctnBizState', 'changeSourceId'])
+      let Rdata = formatParams(p, ['ctnBizState', 'changeSourceId'])
+      if (!!p.cntrno) {
+        let data = JSON.parse(Rdata.queryCondition)
+        data.forEach((item, index) => {
+          if (item.FieldName == 'cntrno') {
+            console.log(item)
+            item.ConditionalType = 15
+          }
+        })
+        Rdata.queryCondition = JSON.stringify(data)
+      }
+      return Rdata
     },
     columns,
     rowSelection: { type: 'checkbox' },

src/views/baseinfo/infoclient/TenantAuditStepModal.vue

@@ -396,9 +396,9 @@
         CustomerOrSupplier.value = 'isSupplier'
       }
     }
-    ChangeArrclientTag()
+    ChangeArrclientTag(false)
   })
-  function ChangeArrclientTag() {
+  function ChangeArrclientTag(type) {
     // 委托单位  国外发货人  通知人  经营单位 国内发货人  国内同行  国外同行  国内直客，国外直客、指定货发货人 个人  约主
     const ArrclientTagList = [
       'isController',
@@ -445,7 +445,9 @@
           }
         },
       })
-      setFieldsValue({ ArrclientTag: ['isController'] })
+      if (type) {
+        setFieldsValue({ ArrclientTag: ['isController'] })
+      }
     } else if (CustomerOrSupplier.value == 'isSupplier') {
       updateSchema({
         label: '客户属性',
@@ -477,7 +479,9 @@
           }
         },
       })
-      setFieldsValue({ ArrclientTag: [] })
+      if (type) {
+        setFieldsValue({ ArrclientTag: [] })
+      }
     } else if (CustomerOrSupplier.value == 'isCustomerAndisSupplier') {
       updateSchema({
         label: '客户属性',
@@ -503,12 +507,14 @@
           }
         },
       })
-      setFieldsValue({ ArrclientTag: ['isController'] })
+      if (type) {
+        setFieldsValue({ ArrclientTag: ['isController'] })
+      }
     }
   }
   function ChangeCustomerOrSupplier() {
-    setFieldsValue({ ArrclientTag: [] })
-    ChangeArrclientTag()
+    // setFieldsValue({ ArrclientTag: [] })
+    ChangeArrclientTag(true)
   }
   watch(activeKey, (nval, oval) => {
     if (Number(nval) > 2 && !rowId.value) {
@@ -763,7 +769,6 @@
         } else if (res.data.isSupplier) {
           CustomerOrSupplier.value = 'isSupplier'
         }
-
         await setFieldsValue({
           ...res.data,
         })