Merge branch 'zth' into dev

src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx

@@ -4,7 +4,7 @@ import { GetUserList } from '/@/api/common'
 export const columns: BasicColumn[] = [
   {
     title: '干系人姓名',
-    dataIndex: 'createByName',
+    dataIndex: 'userName',
     sorter: true,
     width: 150,
   },
@@ -20,6 +20,18 @@ export const columns: BasicColumn[] = [
     sorter: true,
     width: 150,
   },
+  {
+    title: '创建人',
+    dataIndex: 'createByName',
+    sorter: true,
+    width: 150,
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    sorter: true,
+    width: 150,
+  },
   {
     title: '备注',
     dataIndex: 'remark',
@@ -30,7 +42,7 @@ export const columns: BasicColumn[] = [
 
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'createByName',
+    field: 'userName',
     label: '干系人姓名',
     component: 'Input',
     colProps: { span: 4 },
@@ -59,13 +71,13 @@ export const formSchema: FormSchema[] = [
   },
   {
     label: '干系人Name',
-    field: 'createByName',
+    field: 'userName',
     component: 'Input',
     show: false,
   },
   {
     label: '干系人',
-    field: 'createBy',
+    field: 'userId',
     component: 'ApiSelect',
     required: false,
     defaultValue: null,
@@ -81,12 +93,12 @@ export const formSchema: FormSchema[] = [
         onChange: (e, obj) => {
           if (e && obj) {
             console.log(e, obj)
-            formModel.createBy = obj.value
-            formModel.createByName = obj.label
+            formModel.userId = obj.value
+            formModel.userName = obj.label
           }
           if (!e && !obj) {
-            formModel.createBy = ''
-            formModel.createByName = ''
+            formModel.userId = ''
+            formModel.userName = ''
           }
         },
       }

src/views/baseinfo/infoclient/TenantAuditStepModal.vue

@@ -520,7 +520,6 @@
     }
   }
   function ChangeCustomerOrSupplier() {
-    // setFieldsValue({ ArrclientTag: [] })
     ChangeArrclientTag(true)
   }
   watch(activeKey, (nval, oval) => {

src/views/baseinfo/infoclient/columns.tsx

@@ -1261,7 +1261,7 @@ export const formSchema: FormSchema[] = [
     field: 'ArrclientTag',
     component: 'ApiSelect',
     colProps: { span: 12 },
-    defaultValue: 'isController',
+    defaultValue: ['isController'],
     componentProps: ({ formModel }) => {
       return {
         api: () => {