Merge branch 'sit' of http://120.46.155.214:3000/xiaodai2022/accout-vue3-ui into sit

src/views/InvoiceSales/capitalClaim/config/content.config.ts

@@ -103,7 +103,7 @@ const columns = [
   {
     label: "操作",
     fixed: "right",
-    width: 50,
+    width: 60,
     slot: "operation"
   }
 ];

src/views/InvoiceSales/capitalClaim/index.vue

@@ -14,11 +14,10 @@ import {
   xs_order_source_options,
   xs_order_type_options
 } from "/@/utils/status";
-import { capital_status_list } from "./config/configs";
 import { usePermission } from "/@/hooks/core/usePermission";
 import { useUserInfo } from "/@/hooks/core/useUser";
 import { useAsync } from "/@/hooks/core/useAsync";
-
+import { CAPITAL_STATUS } from "/@/utils/details/tragelog";
 import { httpWithdraw } from "/@/api/InvoiceSales/capitalClaim";
 
 const { push } = useRouter();
@@ -116,7 +115,7 @@ function onDownloadTemplate() {
                 <template #="{ $index }">
                   <el-tag
                     >{{
-                      capital_status_list.find(
+                      CAPITAL_STATUS.find(
                         t => t.value === row.child[$index].status
                       )?.label || "--"
                     }}
@@ -129,19 +128,6 @@ function onDownloadTemplate() {
                 width="160"
                 show-overflow-tooltip
               />
-              <el-table-column
-                label="商品编号"
-                prop="goodNo"
-                width="160"
-                show-overflow-tooltip
-              />
-              <el-table-column
-                label="商品名称"
-                prop="goodName"
-                minWidth="180"
-                show-overflow-tooltip
-              />
-
               <el-table-column
                 label="订单来源"
                 prop="qrdSource"
@@ -158,10 +144,22 @@ function onDownloadTemplate() {
                   </el-tag>
                 </template>
               </el-table-column>
+              <el-table-column
+                label="平台单号"
+                prop="poCode"
+                width="180"
+                show-overflow-tooltip
+              />
+              <el-table-column
+                label="商品编号"
+                prop="goodNo"
+                width="160"
+                show-overflow-tooltip
+              />
               <el-table-column
                 label="商品来源"
                 prop="qrdType"
-                width="80"
+                width="90"
                 show-overflow-tooltip
               >
                 <template #="{ $index }">
@@ -175,23 +173,31 @@ function onDownloadTemplate() {
                 </template>
               </el-table-column>
               <el-table-column
-                label="资金创建人"
+                label="商品名称"
+                prop="goodName"
+                minWidth="180"
+                show-overflow-tooltip
+              />
+
+              <el-table-column
+                label="订单创建人"
                 prop="ownerName"
                 width="80"
                 show-overflow-tooltip
               />
               <el-table-column
-                label="认领创建人"
+                label="认领人"
                 prop="apply_name"
                 width="80"
                 show-overflow-tooltip
               />
               <el-table-column
-                label="平台单号"
-                prop="poCode"
-                width="180"
+                label="认领时间"
+                prop="addtime"
+                width="145"
                 show-overflow-tooltip
               />
+
               <el-table-column fixed="right" label="操作" width="60px">
                 <template #default="{ row }">
                   <el-button