修改搜索方式

src/views/purchase/orderRecord/config/content.config.ts

@@ -24,6 +24,13 @@ const columns = [
     width: 150,
     align: "left"
   },
+
+  {
+    label: "对账总额",
+    prop: "total_fee",
+    width: 110,
+    align: "total_fee"
+  },
   {
     label: "状态",
     prop: "status",
@@ -33,10 +40,10 @@ const columns = [
     ...renderProp(statusOptions)
   },
   {
-    label: "对账总额",
-    prop: "total_fee",
-    width: 110,
-    align: "total_fee"
+    label: "供应商端",
+    prop: "has_account",
+    width: 80,
+    ...renderProp(hasAccountOptions, "has_account")
   },
   {
     label: "卖出方公司编码",
@@ -62,12 +69,7 @@ const columns = [
     minWidth: 180,
     align: "left"
   },
-  {
-    label: "供应商端",
-    prop: "has_account",
-    width: 80,
-    ...renderProp(hasAccountOptions, "has_account")
-  },
+
   {
     label: "申请人",
     prop: "apply_name",

src/views/purchase/orderRecord/config/search.config.ts

@@ -2,22 +2,6 @@ import { FormConfig } from "/@/components/PageSearch";
 import { statusOptions, tagTypeOptions } from "./_options";
 const searchFormConfig: FormConfig = {
   formItems: [
-    {
-      field: "group",
-      type_field: "group_type",
-      type: "input_group",
-      otherOptions: {
-        inputGroupOptions: [
-          // { value: "supplierNo", label: "卖方公司编码" },
-          // { value: "supplierName", label: "卖方公司名称" },
-          { value: "payNo", label: "对账编码" }
-        ]
-      }
-    },
-    {
-      field: "supplierNo",
-      type: "supplier-query"
-    },
     {
       field: "timer",
       type: "date_picker",
@@ -29,6 +13,11 @@ const searchFormConfig: FormConfig = {
         endPlaceholder: "结束日期"
       }
     },
+    {
+      field: "supplierNo",
+      type: "supplier-query"
+    },
+
     {
       field: "status",
       type: "select",
@@ -42,6 +31,18 @@ const searchFormConfig: FormConfig = {
       placeholder: "标签状态",
       span: 4,
       options: tagTypeOptions
+    },
+    {
+      field: "group",
+      type_field: "group_type",
+      type: "input_group",
+      otherOptions: {
+        inputGroupOptions: [
+          // { value: "supplierNo", label: "卖方公司编码" },
+          // { value: "supplierName", label: "卖方公司名称" },
+          { value: "payNo", label: "对账编码" }
+        ]
+      }
     }
   ]
 };

src/views/purchase/porder/config/content.config.ts

@@ -14,7 +14,7 @@ const columns = [
   {
     label: "采购单编码",
     prop: "sequenceNo",
-    width: "155=0px"
+    width: "155px"
   },
   {
     label: "采购主单编码",
@@ -24,7 +24,7 @@ const columns = [
   {
     label: "销售订单编码",
     prop: "qrdCode",
-    width: "150px"
+    width: "155px"
   },
   {
     label: "供应商端",

src/views/purchase/purchPay/config/search.config.ts

@@ -3,20 +3,6 @@ import { purchPayStatusOptions } from "/@/utils/status";
 
 const searchFormConfig: FormConfig = {
   formItems: [
-    {
-      field: "dzNo",
-      type: "input",
-      placeholder: "对账付款编码"
-    },
-    {
-      field: "payNo",
-      type: "input",
-      placeholder: "对账编码"
-    },
-    {
-      field: "supplierNo",
-      type: "supplier-query"
-    },
     {
       field: "timer",
       type: "date_picker",
@@ -33,6 +19,21 @@ const searchFormConfig: FormConfig = {
       type: "select",
       placeholder: "审核状态",
       options: purchPayStatusOptions
+    },
+    {
+      field: "supplierNo",
+      type: "supplier-query"
+    },
+
+    {
+      field: "dzNo",
+      type: "input",
+      placeholder: "对账付款编码"
+    },
+    {
+      field: "payNo",
+      type: "input",
+      placeholder: "对账编码"
     }
   ]
 };

src/views/purchase/purchPayRelive/config/content.config.ts

@@ -44,6 +44,30 @@ const columns = [
     width: 150,
     align: "left"
   },
+  {
+    label: "状态",
+    prop: "status",
+    width: 140,
+    cellRenderer: ({ row, props }) =>
+      h(
+        ElTag,
+        {
+          size: props.size
+        },
+        {
+          default: () =>
+            purchPayReliveStatusOptions.find(
+              s => String(row.status) === s.value
+            )?.label
+        }
+      )
+  },
+  {
+    label: "供应商端",
+    prop: "has_account",
+    width: 80,
+    ...renderProp(hasAccountOptions, "has_account")
+  },
   {
     label: "卖方公司编码",
     prop: "supplierNo",
@@ -65,30 +89,7 @@ const columns = [
     prop: "companyName",
     minWidth: 180
   },
-  {
-    label: "供应商端",
-    prop: "has_account",
-    width: 80,
-    ...renderProp(hasAccountOptions, "has_account")
-  },
-  {
-    label: "状态",
-    prop: "status",
-    minWidth: 130,
-    cellRenderer: ({ row, props }) =>
-      h(
-        ElTag,
-        {
-          size: props.size
-        },
-        {
-          default: () =>
-            purchPayReliveStatusOptions.find(
-              s => String(row.status) === s.value
-            )?.label
-        }
-      )
-  },
+
   {
     label: "申请人",
     prop: "apply_name",

src/views/purchase/purchPayRelive/config/search.config.ts

@@ -3,20 +3,6 @@ import { purchPayReliveStatusOptions } from "/@/utils/status";
 
 const searchFormConfig: FormConfig = {
   formItems: [
-    {
-      field: "returnCode",
-      type: "input",
-      placeholder: "付款解除编码"
-    },
-    {
-      field: "payNo",
-      type: "input",
-      placeholder: "对账编码"
-    },
-    {
-      field: "supplierNo",
-      type: "supplier-query"
-    },
     {
       field: "timer",
       type: "date_picker",
@@ -33,6 +19,20 @@ const searchFormConfig: FormConfig = {
       type: "select",
       placeholder: "审核状态",
       options: purchPayReliveStatusOptions
+    },
+    {
+      field: "supplierNo",
+      type: "supplier-query"
+    },
+    {
+      field: "returnCode",
+      type: "input",
+      placeholder: "付款解除编码"
+    },
+    {
+      field: "payNo",
+      type: "input",
+      placeholder: "对账编码"
     }
   ]
 };

src/views/purchase/ticketReturn/config/search.config.ts

@@ -4,12 +4,27 @@ import { checkTypeOptions, ticketReturnStatusOptions } from "/@/utils/status";
 
 const searchFormConfig: FormConfig = {
   formItems: [
+    {
+      field: "create_timer",
+      type: "date_picker",
+      otherOptions: {
+        type: "daterange",
+        startProp: "start",
+        endProp: "end",
+        startPlaceholder: "新建起始时间",
+        endPlaceholder: "新建结束时间"
+      }
+    },
     {
       field: "status",
       type: "select",
       placeholder: "审核状态",
       options: ticketReturnStatusOptions
     },
+    {
+      field: "supplierNo",
+      type: "supplier-query"
+    },
     // {
     //   field: "invType",
     //   type: "select",
@@ -22,36 +37,22 @@ const searchFormConfig: FormConfig = {
       placeholder: "发票查验方式",
       options: checkTypeOptions
     },
-    {
-      field: "payNo",
-      type: "input",
-      placeholder: "对账编码"
-    },
     {
       field: "hpNo",
       type: "input",
-      placeholder: "对账回票申请编码"
+      placeholder: "对账回票编码"
     },
     {
-      field: "supplierNo",
-      type: "supplier-query"
+      field: "payNo",
+      type: "input",
+      placeholder: "对账编码"
     },
     {
       field: "apply_name",
       type: "input",
       placeholder: "申请人"
-    },
-    {
-      field: "create_timer",
-      type: "date_picker",
-      otherOptions: {
-        type: "daterange",
-        startProp: "start",
-        endProp: "end",
-        startPlaceholder: "新建起始时间",
-        endPlaceholder: "新建结束时间"
-      }
     }
+
     // ,
     // {
     //   field: "open_timer",

src/views/purchase/ticketReturnRelive/config/search.config.ts

@@ -3,21 +3,6 @@ import { ticketReturnReliveStatusOptions } from "/@/utils/status";
 
 const searchFormConfig: FormConfig = {
   formItems: [
-    {
-      field: "status",
-      type: "select",
-      placeholder: "审核状态",
-      options: ticketReturnReliveStatusOptions
-    },
-    {
-      field: "returnCode",
-      type: "input",
-      placeholder: "回票解除编码"
-    },
-    {
-      field: "supplierNo",
-      type: "supplier-query"
-    },
     {
       field: "create_timer",
       type: "date_picker",
@@ -28,6 +13,22 @@ const searchFormConfig: FormConfig = {
         startPlaceholder: "新建起始时间",
         endPlaceholder: "新建结束时间"
       }
+    },
+    {
+      field: "supplierNo",
+      type: "supplier-query"
+    },
+    {
+      field: "status",
+      type: "select",
+      placeholder: "审核状态",
+      options: ticketReturnReliveStatusOptions
+    },
+
+    {
+      field: "returnCode",
+      type: "input",
+      placeholder: "回票解除编码"
     }
   ]
 };

src/views/supply/orderRecord/config/content.config.ts

@@ -23,18 +23,19 @@ const columns = [
     width: 150,
     align: "left"
   },
-  {
-    label: "状态",
-    prop: "status",
-    width: 140,
-    ...renderProp(orderRecordStatusOptions)
-  },
   {
     label: "总额款",
     prop: "total_fee",
     width: 110,
     align: "total_fee"
   },
+  {
+    label: "状态",
+    prop: "status",
+    width: 140,
+    ...renderProp(orderRecordStatusOptions)
+  },
+
   {
     label: "卖方公司编码",
     prop: "supplierNo",

src/views/supply/orderRecord/config/search.config.ts

@@ -4,11 +4,14 @@ import { orderRecordStatusOptions } from "/@/utils/status";
 const searchFormConfig: FormConfig = {
   formItems: [
     {
-      field: "group",
-      type_field: "group_type",
-      type: "input_group",
+      field: "timer",
+      type: "date_picker",
       otherOptions: {
-        inputGroupOptions: [{ value: "payNo", label: "对账编码" }]
+        type: "daterange",
+        startProp: "startTime",
+        endProp: "endTime",
+        startPlaceholder: "开始日期",
+        endPlaceholder: "结束日期"
       }
     },
     {
@@ -21,15 +24,13 @@ const searchFormConfig: FormConfig = {
       placeholder: "审核状态",
       options: orderRecordStatusOptions
     },
+
     {
-      field: "timer",
-      type: "date_picker",
+      field: "group",
+      type_field: "group_type",
+      type: "input_group",
       otherOptions: {
-        type: "daterange",
-        startProp: "startTime",
-        endProp: "endTime",
-        startPlaceholder: "开始日期",
-        endPlaceholder: "结束日期"
+        inputGroupOptions: [{ value: "payNo", label: "对账编码" }]
       }
     }
   ]

src/views/supply/purchPay/config/search.config.ts

@@ -3,20 +3,6 @@ import { purchPayStatusOptions } from "/@/utils/status";
 
 const searchFormConfig: FormConfig = {
   formItems: [
-    {
-      field: "companyNo",
-      type: "input",
-      placeholder: "买方公司编码"
-    },
-    {
-      field: "payNo",
-      type: "input",
-      placeholder: "对账编码"
-    },
-    {
-      field: "companyNo",
-      type: "business-query"
-    },
     {
       field: "timer",
       type: "date_picker",
@@ -28,11 +14,31 @@ const searchFormConfig: FormConfig = {
         endPlaceholder: "结束日期"
       }
     },
+    // {
+    //   field: "companyNo",
+    //   type: "input",
+    //   placeholder: "买方公司编码"
+    // },
     {
       field: "status",
       type: "select",
       placeholder: "审核状态",
       options: purchPayStatusOptions
+    },
+    {
+      field: "companyNo",
+      type: "business-query"
+    },
+
+    {
+      field: "dzNo",
+      type: "input",
+      placeholder: "对账付款编码"
+    },
+    {
+      field: "payNo",
+      type: "input",
+      placeholder: "对账编码"
     }
   ]
 };

src/views/supply/purchPayRelive/config/search.config.ts

@@ -3,16 +3,6 @@ import { purchPayReliveStatusOptions } from "/@/utils/status";
 
 const searchFormConfig: FormConfig = {
   formItems: [
-    {
-      field: "returnCode",
-      type: "input",
-      placeholder: "退款申请编码"
-    },
-    {
-      field: "payNo",
-      type: "input",
-      placeholder: "对账编码"
-    },
     {
       field: "timer",
       type: "date_picker",
@@ -29,6 +19,20 @@ const searchFormConfig: FormConfig = {
       type: "select",
       placeholder: "审核状态",
       options: purchPayReliveStatusOptions
+    },
+    {
+      field: "companyNo",
+      type: "business-query"
+    },
+    {
+      field: "returnCode",
+      type: "input",
+      placeholder: "退款申请编码"
+    },
+    {
+      field: "payNo",
+      type: "input",
+      placeholder: "对账编码"
     }
   ]
 };

src/views/supply/ticketReturn/config/search.config.ts

@@ -3,59 +3,61 @@ import { checkTypeOptions, ticketReturnStatusOptions } from "/@/utils/status";
 
 const searchFormConfig: FormConfig = {
   formItems: [
+    {
+      field: "create_timer",
+      type: "date_picker",
+      otherOptions: {
+        type: "daterange",
+        startProp: "start",
+        endProp: "end",
+        startPlaceholder: "新建起始时间",
+        endPlaceholder: "新建结束时间"
+      }
+    },
     {
       field: "status",
       type: "select",
       placeholder: "审核状态",
       options: ticketReturnStatusOptions
     },
+    {
+      field: "companyNo",
+      type: "business-query"
+    },
     {
       field: "checkApi",
       type: "select",
       placeholder: "发票查验方式",
       options: checkTypeOptions
     },
-    {
-      field: "payNo",
-      type: "input",
-      placeholder: "对账编码"
-    },
     {
       field: "hpNo",
       type: "input",
-      placeholder: "对账申请编码"
+      placeholder: "对账回票编码"
     },
     {
-      field: "companyNo",
-      type: "business-query"
+      field: "payNo",
+      type: "input",
+      placeholder: "对账编码"
     },
+
     {
       field: "apply_name",
       type: "input",
       placeholder: "申请人"
-    },
-    {
-      field: "create_timer",
-      type: "date_picker",
-      otherOptions: {
-        type: "daterange",
-        startProp: "start",
-        endProp: "end",
-        startPlaceholder: "新建起始时间",
-        endPlaceholder: "新建结束时间"
-      }
-    },
-    {
-      field: "open_timer",
-      type: "date_picker",
-      otherOptions: {
-        type: "daterange",
-        startProp: "open_start",
-        endProp: "open_end",
-        startPlaceholder: "开票起始时间",
-        endPlaceholder: "开票结束时间"
-      }
     }
+
+    // {
+    //   field: "open_timer",
+    //   type: "date_picker",
+    //   otherOptions: {
+    //     type: "daterange",
+    //     startProp: "open_start",
+    //     endProp: "open_end",
+    //     startPlaceholder: "开票起始时间",
+    //     endPlaceholder: "开票结束时间"
+    //   }
+    // }
   ]
 };
 

src/views/supply/ticketReturnRelive/config/search.config.ts

@@ -4,17 +4,6 @@ import { ticketReturnReliveStatusOptions } from "/@/utils/status";
 
 const searchFormConfig: FormConfig = {
   formItems: [
-    {
-      field: "status",
-      type: "select",
-      placeholder: "审核状态",
-      options: ticketReturnReliveStatusOptions
-    },
-    {
-      field: "returnCode",
-      type: "input",
-      placeholder: "退票申请编码"
-    },
     {
       field: "create_timer",
       type: "date_picker",
@@ -25,6 +14,21 @@ const searchFormConfig: FormConfig = {
         startPlaceholder: "新建起始时间",
         endPlaceholder: "新建结束时间"
       }
+    },
+    {
+      field: "companyNo",
+      type: "business-query"
+    },
+    {
+      field: "status",
+      type: "select",
+      placeholder: "审核状态",
+      options: ticketReturnReliveStatusOptions
+    },
+    {
+      field: "returnCode",
+      type: "input",
+      placeholder: "退票申请编码"
     }
   ]
 };