Merge branch 'test'

src/views/reportManage/TaskManage/index.vue

@@ -39,14 +39,14 @@ interface taskRuleForm {
   company: string;
   platform: string;
   companyEnglishName: string;
-  address: string;
+  // address: string;
   juridicalPerson: string;
-  juridicalPersonCreditCard: string;
-  juridicalPersonCreditCardAddress: string;
-  receivablesAccount: string;
-  receivablesAccountCompany: string;
-  vatNumber: string;
-  vatCompany: string;
+  // juridicalPersonCreditCard: string;
+  // juridicalPersonCreditCardAddress: string;
+  // receivablesAccount: string;
+  // receivablesAccountCompany: string;
+  // vatNumber: string;
+  // vatCompany: string;
 }
 
 const formSize = ref<ComponentSize>('default');
@@ -61,7 +61,14 @@ const taskRuleForm = reactive({
   operater: [],
   currency: '',
   currencyCodePlatform: '',
+  line: '',
+  ipaddress: '',
+  company: '',
+  platform: '',
+  companyEnglishName: '',
+  juridicalPerson: '',
 });
+
 const resetForm = (formEl: FormInstance | undefined) => {
   if (!formEl) return;
   formEl.resetFields();
@@ -518,14 +525,14 @@ async function updateRow(row) {
       company: row.company,
       platform: row.platform,
       companyEnglishName: row.companyEnglishName,
-      address: row.address,
+      // address: row.address,
       juridicalPerson: row.juridicalPerson,
-      juridicalPersonCreditCard: row.juridicalPersonCreditCard,
-      juridicalPersonCreditCardAddress: row.juridicalPersonCreditCardAddress,
-      receivablesAccount: row.receivablesAccount,
-      receivablesAccountCompany: row.receivablesAccountCompany,
-      vatNumber: row.vatNumber,
-      vatCompany: row.vatCompany,
+      // juridicalPersonCreditCard: row.juridicalPersonCreditCard,
+      // juridicalPersonCreditCardAddress: row.juridicalPersonCreditCardAddress,
+      // receivablesAccount: row.receivablesAccount,
+      // receivablesAccountCompany: row.receivablesAccountCompany,
+      // vatNumber: row.vatNumber,
+      // vatCompany: row.vatCompany,
     };
     try {
       const response = await postUpdateTask(updatedRowData);
@@ -599,14 +606,14 @@ async function createTask() {
     company: taskRuleForm.company,
     platform: taskRuleForm.platform,
     companyEnglishName: taskRuleForm.companyEnglishName,
-    address: taskRuleForm.address,
+    // address: taskRuleForm.address,
     juridicalPerson: taskRuleForm.juridicalPerson,
-    juridicalPersonCreditCard: taskRuleForm.juridicalPersonCreditCard,
-    juridicalPersonCreditCardAddress: taskRuleForm.juridicalPersonCreditCardAddress,
-    receivablesAccount: taskRuleForm.receivablesAccount,
-    receivablesAccountCompany: taskRuleForm.receivablesAccountCompany,
-    vatNumber: taskRuleForm.vatNumber,
-    vatCompany: taskRuleForm.vatCompany,
+    // juridicalPersonCreditCard: taskRuleForm.juridicalPersonCreditCard,
+    // juridicalPersonCreditCardAddress: taskRuleForm.juridicalPersonCreditCardAddress,
+    // receivablesAccount: taskRuleForm.receivablesAccount,
+    // receivablesAccountCompany: taskRuleForm.receivablesAccountCompany,
+    // vatNumber: taskRuleForm.vatNumber,
+    // vatCompany: taskRuleForm.vatCompany,
     user: taskRuleForm.operation,
     operater: [taskRuleForm.operater],
   };
@@ -779,14 +786,14 @@ const formItems = ref([
   { label: 'IP地址', prop: 'ipaddress', type: 'input', placeholder: '请输入IP地址' },
   { label: '注册公司', prop: 'company', type: 'input', placeholder: '请输入注册公司' },
   { label: '公司英文名称', prop: 'companyEnglishName', type: 'input', placeholder: '请输入公司英文名称' },
-  { label: '公司地址', prop: 'address', type: 'input', placeholder: '请输入公司地址' },
+  // { label: '公司地址', prop: 'address', type: 'input', placeholder: '请输入公司地址' },
   { label: '公司法人', prop: 'juridicalPerson', type: 'input', placeholder: '请输入公司法人' },
-  { label: '法人信用卡', prop: 'juridicalPersonCreditCard', type: 'input', placeholder: '请输入法人信用卡' },
-  { label: '信用卡地址', prop: 'juridicalPersonCreditCardAddress', type: 'input', placeholder: '请输入信用卡地址' },
-  { label: '收款账号', prop: 'receivablesAccount', type: 'input', placeholder: '请输入收款账号' },
-  { label: '收款账号公司', prop: 'receivablesAccountCompany', type: 'input', placeholder: '请输入收款账号公司' },
-  { label: 'VAT税号', prop: 'vatNumber', type: 'input', placeholder: '请输入VAT税号' },
-  { label: 'VAT税号公司名称', prop: 'vatCompany', type: 'input', placeholder: '请输入VAT税号公司名称' },
+  // { label: '法人信用卡', prop: 'juridicalPersonCreditCard', type: 'input', placeholder: '请输入法人信用卡' },
+  // { label: '信用卡地址', prop: 'juridicalPersonCreditCardAddress', type: 'input', placeholder: '请输入信用卡地址' },
+  // { label: '收款账号', prop: 'receivablesAccount', type: 'input', placeholder: '请输入收款账号' },
+  // { label: '收款账号公司', prop: 'receivablesAccountCompany', type: 'input', placeholder: '请输入收款账号公司' },
+  // { label: 'VAT税号', prop: 'vatNumber', type: 'input', placeholder: '请输入VAT税号' },
+  // { label: 'VAT税号公司名称', prop: 'vatCompany', type: 'input', placeholder: '请输入VAT税号公司名称' },
 ]);
 
 // 表格样式

src/views/reportManage/TaskManage/utils/columns.ts

@@ -65,14 +65,14 @@ export const taskColumns = ref([
     editRender: {},
     slots: { edit: 'currency_edit' },
     align: 'center',
-    minWidth: 76
+    minWidth: 74
   },
   {
     field: 'currencyCodePlatform',
     title: '回款/余额币种',
     editRender: {},
     slots: { edit: 'currencyCodePlatform_edit' },
-    minWidth: 110,
+    minWidth: 100,
     align: 'center'
   },
   {
@@ -101,14 +101,14 @@ export const taskColumns = ref([
     align: 'center',
     minWidth: 126
   },
-  {
-    field: 'address',
-    title: '公司地址',
-    editRender: {},
-    slots: { edit: 'address_edit' },
-    align: 'center',
-    minWidth: 262
-  },
+  // {
+  //   field: 'address',
+  //   title: '公司地址',
+  //   editRender: {},
+  //   slots: { edit: 'address_edit' },
+  //   align: 'center',
+  //   minWidth: 262
+  // },
   {
     field: 'juridicalPerson',
     title: '公司法人',
@@ -117,54 +117,54 @@ export const taskColumns = ref([
     align: 'center',
     minWidth: 95
   },
-  {
-    field: 'juridicalPersonCreditCard',
-    title: '法人信用卡',
-    editRender: {},
-    slots: { edit: 'juridicalPersonCreditCard_edit' },
-    align: 'center',
-    minWidth: 105
-  },
-  {
-    field: 'juridicalPersonCreditCardAddress',
-    title: '信用卡地址',
-    editRender: {},
-    slots: { edit: 'juridicalPersonCreditCardAddress_edit' },
-    align: 'center',
-    minWidth: 262
-  },
-  {
-    field: 'receivablesAccount',
-    title: '收款账号',
-    editRender: {},
-    slots: { edit: 'receivablesAccount_edit' },
-    align: 'center',
-    minWidth: 156
-  },
-  {
-    field: 'receivablesAccountCompany',
-    title: '收款账号公司',
-    editRender: {},
-    slots: { edit: 'receivablesAccountCompany_edit' },
-    align: 'center',
-    minWidth: 115
-  },
-  {
-    field: 'vatNumber',
-    title: 'VAT税号',
-    editRender: {},
-    slots: { edit: 'vatNumber_edit' },
-    align: 'center',
-    minWidth: 245
-  },
-  {
-    field: 'vatCompany',
-    title: 'VAT税号公司名称',
-    editRender: {},
-    slots: { edit: 'vatCompany_edit' },
-    align: 'center',
-    minWidth: 135
-  },
+  // {
+  //   field: 'juridicalPersonCreditCard',
+  //   title: '法人信用卡',
+  //   editRender: {},
+  //   slots: { edit: 'juridicalPersonCreditCard_edit' },
+  //   align: 'center',
+  //   minWidth: 105
+  // },
+  // {
+  //   field: 'juridicalPersonCreditCardAddress',
+  //   title: '信用卡地址',
+  //   editRender: {},
+  //   slots: { edit: 'juridicalPersonCreditCardAddress_edit' },
+  //   align: 'center',
+  //   minWidth: 262
+  // },
+  // {
+  //   field: 'receivablesAccount',
+  //   title: '收款账号',
+  //   editRender: {},
+  //   slots: { edit: 'receivablesAccount_edit' },
+  //   align: 'center',
+  //   minWidth: 156
+  // },
+  // {
+  //   field: 'receivablesAccountCompany',
+  //   title: '收款账号公司',
+  //   editRender: {},
+  //   slots: { edit: 'receivablesAccountCompany_edit' },
+  //   align: 'center',
+  //   minWidth: 115
+  // },
+  // {
+  //   field: 'vatNumber',
+  //   title: 'VAT税号',
+  //   editRender: {},
+  //   slots: { edit: 'vatNumber_edit' },
+  //   align: 'center',
+  //   minWidth: 245
+  // },
+  // {
+  //   field: 'vatCompany',
+  //   title: 'VAT税号公司名称',
+  //   editRender: {},
+  //   slots: { edit: 'vatCompany_edit' },
+  //   align: 'center',
+  //   minWidth: 135
+  // },
 
   { field: 'status', title: '状态', slots: { default: 'status_default' }, align: 'center', minWidth: 89 },
   { title: '操作', minWidth: 108, slots: { default: 'operate' }, fixed: 'right' },