10/10

src/views/baseinfo/TaskMail/TenantAuditStepModal.vue

@@ -73,8 +73,6 @@
   })
   const DiyFieldIdS = ref<any>([])
   function linkageForm(data) {
-    console.log(data, 11111111)
-
     // 清楚所有添加的Schema
     if (DiyFieldIdS.value.length) {
       DiyFieldIdS.value.forEach((item) => {
@@ -84,6 +82,7 @@
     }
 
     DiyFieldIdS.value.splice(0)
+    console.log(data, 11111111)
     data.forEach((item) => {
       appendSchemaByField(
         [
@@ -325,6 +324,7 @@
               label: element.templateName,
             })
             DiyFieldIdSObj[e.templateId] = e.fileName
+            DiyFieldIdSObj[`${e.templateId}-fileType`] = e.fileType
           }
         })
       })

src/views/baseinfo/TaskMail/columns.tsx

@@ -208,8 +208,8 @@ export const formSchema: FormSchema[] = [
         mode: 'multiple',
         class: 'NoLimitHeight',
         onChange: (e, obj) => {
-          if (formModel && formModel.id) {
-            console.log(formModel.id)
+          if (formModel && formModel.id && obj) {
+            console.log(formModel.id, e, obj)
 
             let DelData: any = []
             if (formModel.attachments.length) {
@@ -355,6 +355,19 @@ export const ReceiverformSchema: FormSchema[] = [
       unCheckedValue: false,
     },
   },
+  {
+    field: 'isShipperCn',
+    label: '是否国内发货人',
+    component: 'Switch',
+    colProps: { span: 6 },
+    defaultValue: false,
+    componentProps: {
+      checkedChildren: '是',
+      checkedValue: true,
+      unCheckedChildren: '否',
+      unCheckedValue: false,
+    },
+  },
 ]
 export const SenderformSchema: FormSchema[] = [
   {

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

@@ -31,7 +31,7 @@ export const columns: BasicColumn[] = [
     width: 120,
   },
   {
-    title: '费用对象',
+    title: '客户名称',
     dataIndex: 'customerName',
     width: 200,
   },
@@ -223,7 +223,7 @@ export const formSchema: FormSchema[] = [
   // },
   {
     field: 'customerId',
-    label: '费用对象',
+    label: '客户名称',
     defaultValue: '',
     component: 'Input',
     show: false,
@@ -231,44 +231,44 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'customerName',
-    label: '费用对象',
+    label: '客户名称',
     component: 'Input',
     defaultValue: '',
     dynamicDisabled: true,
     colProps: { span: 6 },
   },
-  {
-    field: 'customerType',
-    label: '费用对象类别',
-    defaultValue: '',
-    component: 'ApiSelect',
-    colProps: { span: 6 },
-    componentProps: ({ formModel }) => {
-      return {
-        api: () => {
-          return new Promise((resolve) => {
-            getDictOption('djy_cust_prop').then((res) => {
-              resolve(res)
-            })
-          })
-        },
-        labelField: 'label',
-        valueField: 'value',
-        resultField: 'data',
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
-      }
-    },
-    dynamicRules: ({ values }) => {
-      return [
-        {
-          required: values.customerId ? false : true,
-          message: '未选择费用对象时,此项必填！',
-        },
-      ]
-    },
-  },
+  // {
+  //   field: 'customerType',
+  //   label: '客户名称类别',
+  //   defaultValue: '',
+  //   component: 'ApiSelect',
+  //   colProps: { span: 6 },
+  //   componentProps: ({ formModel }) => {
+  //     return {
+  //       api: () => {
+  //         return new Promise((resolve) => {
+  //           getDictOption('djy_cust_prop').then((res) => {
+  //             resolve(res)
+  //           })
+  //         })
+  //       },
+  //       labelField: 'label',
+  //       valueField: 'value',
+  //       resultField: 'data',
+  //       filterOption: (input: string, option: any) => {
+  //         return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+  //       },
+  //     }
+  //   },
+  //   dynamicRules: ({ values }) => {
+  //     return [
+  //       {
+  //         required: values.customerId ? false : true,
+  //         message: '未选择客户名称时,此项必填！',
+  //       },
+  //     ]
+  //   },
+  // },
   // {
   //   label: '',
   //   field: 'customerId',

src/views/fee/FeeCustTemplate/columns.tsx

@@ -36,7 +36,7 @@ export const columns: BasicColumn[] = [
     width: 120,
   },
   {
-    title: '费用对象',
+    title: '客户名称',
     dataIndex: 'customerName',
     width: 200,
   },
@@ -243,7 +243,7 @@ export const formSchema: FormSchema[] = [
   // },
   {
     field: 'customerName',
-    label: '费用对象',
+    label: '客户名称',
     defaultValue: '',
     component: 'Input',
     show: false,
@@ -251,7 +251,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'customerId',
-    label: '费用对象',
+    label: '客户名称',
     component: 'ApiSelect',
     required: false,
     dynamicDisabled: false,
@@ -277,38 +277,38 @@ export const formSchema: FormSchema[] = [
       }
     },
   },
-  {
-    field: 'customerType',
-    label: '费用对象类别',
-    defaultValue: '',
-    component: 'ApiSelect',
-    colProps: { span: 6 },
-    componentProps: ({ formModel }) => {
-      return {
-        api: () => {
-          return new Promise((resolve) => {
-            getDictOption('djy_cust_prop').then((res) => {
-              resolve(res)
-            })
-          })
-        },
-        labelField: 'label',
-        valueField: 'value',
-        resultField: 'data',
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
-      }
-    },
-    dynamicRules: ({ values }) => {
-      return [
-        {
-          required: values.customerId ? false : true,
-          message: '未选择费用对象时,此项必填！',
-        },
-      ]
-    },
-  },
+  // {
+  //   field: 'customerType',
+  //   label: '客户名称类别',
+  //   defaultValue: '',
+  //   component: 'ApiSelect',
+  //   colProps: { span: 6 },
+  //   componentProps: ({ formModel }) => {
+  //     return {
+  //       api: () => {
+  //         return new Promise((resolve) => {
+  //           getDictOption('djy_cust_prop').then((res) => {
+  //             resolve(res)
+  //           })
+  //         })
+  //       },
+  //       labelField: 'label',
+  //       valueField: 'value',
+  //       resultField: 'data',
+  //       filterOption: (input: string, option: any) => {
+  //         return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+  //       },
+  //     }
+  //   },
+  //   dynamicRules: ({ values }) => {
+  //     return [
+  //       {
+  //         required: values.customerId ? false : true,
+  //         message: '未选择客户名称时,此项必填！',
+  //       },
+  //     ]
+  //   },
+  // },
   // {
   //   label: '',
   //   field: 'customerId',