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

src/utils/details/refund.ts

@@ -26,7 +26,7 @@ export const RETRUN_STATUS = [
   },
   {
     value: "1",
-    label: "财务审核"
+    label: "审核通过"
   },
   {
     value: "2",

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

@@ -8,17 +8,17 @@ import { capital_status } from "./configs";
 import { CAPITAL_STATUS } from "/@/utils/details/tragelog";
 
 const columns = [
-  {
-    type: "selection",
-    width: 55,
-    hide: ({ checkList }) => !checkList.includes("勾选列")
-  },
-  {
-    label: "序号",
-    type: "index",
-    width: 70,
-    hide: ({ checkList }) => !checkList.includes("序号列")
-  },
+  // {
+  //   type: "selection",
+  //   width: 55,
+  //   hide: ({ checkList }) => !checkList.includes("勾选列")
+  // },
+  // {
+  //   label: "序号",
+  //   type: "index",
+  //   width: 70,
+  //   hide: ({ checkList }) => !checkList.includes("序号列")
+  // },
   {
     type: "expand",
     slot: "expand"
@@ -26,7 +26,7 @@ const columns = [
   {
     label: "资金编号",
     prop: "tradNo",
-    width: 160
+    width: 140
   },
   {
     label: "状态",
@@ -50,49 +50,60 @@ const columns = [
       )
   },
   {
-    label: "付款单位账号",
-    prop: "trade_account",
-    width: 160
+    label: "收入金额",
+    prop: "total_fee",
+    width: 120
   },
   {
-    label: "付款银行单位名称",
-    prop: "trade_out",
-    width: 160
+    label: "未认领金额",
+    prop: "balance",
+    width: 120
   },
   {
-    label: "交易时间",
-    prop: "trade_time",
-    width: 120,
-    cellRenderer: ({ row }) => dayjs(row.trade_time).format("YYYY-MM-DD")
+    label: "已认领金额",
+    prop: "used_fee",
+    width: 120
   },
   {
-    label: "收入金额",
-    prop: "total_fee",
-    width: 110
+    label: "收款公司账户",
+    prop: "trade_in_account",
+    width: 145
   },
   {
-    label: "交易银行",
+    label: "交易行名",
     prop: "trade_bank",
-    width: 130
+    width: 160
   },
   {
-    label: "收款单位名称",
-    prop: "trade_in"
+    label: "付款单位账号",
+    prop: "trade_account",
+    width: 160
   },
   {
-    label: "未认领",
-    prop: "balance",
-    width: 80
+    label: "付款单位名称",
+    prop: "trade_out",
+    width: 160
   },
   {
-    label: "已认领",
-    prop: "used_fee",
-    width: 80
+    label: "交易时间",
+    prop: "trade_time",
+    width: 140
+  },
+  {
+    label: "收款公司编号",
+    prop: "companyNo",
+    width: 145
+  },
+  {
+    label: "收款公司名称",
+    prop: "trade_in",
+    width: 145
   },
+
   {
     label: "操作",
     fixed: "right",
-    width: 60,
+    width: 50,
     slot: "operation"
   }
 ];

src/views/InvoiceSales/capitalClaim/index.vue

@@ -10,7 +10,10 @@ import searchFormConfig from "./config/search.config";
 import contentConfig from "./config/content.config";
 import { template } from "./config/xls-template";
 import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
-import { cgd_type_list, xs_order_source_options } from "/@/utils/status";
+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";
@@ -100,9 +103,26 @@ function onDownloadTemplate() {
               <el-table-column
                 label="资金认领编号"
                 prop="logNo"
-                width="160"
+                width="188"
+                fixed="left"
                 show-overflow-tooltip
               />
+              <el-table-column
+                label="认领状态"
+                prop="status"
+                width="100"
+                show-overflow-tooltip
+              >
+                <template #="{ $index }">
+                  <el-tag
+                    >{{
+                      capital_status_list.find(
+                        t => t.value === row.child[$index].status
+                      )?.label || "--"
+                    }}
+                  </el-tag>
+                </template>
+              </el-table-column>
               <el-table-column
                 label="订单编号"
                 prop="orderCode"
@@ -118,25 +138,10 @@ function onDownloadTemplate() {
               <el-table-column
                 label="商品名称"
                 prop="goodName"
-                width="180"
+                minWidth="180"
                 show-overflow-tooltip
               />
-              <el-table-column
-                label="认领状态"
-                prop="status"
-                width="90"
-                show-overflow-tooltip
-              >
-                <template #="{ $index }">
-                  <el-tag
-                    >{{
-                      capital_status_list.find(
-                        t => t.value === row.child[$index].status
-                      )?.label || "--"
-                    }}
-                  </el-tag>
-                </template>
-              </el-table-column>
+
               <el-table-column
                 label="订单来源"
                 prop="qrdSource"
@@ -162,7 +167,7 @@ function onDownloadTemplate() {
                 <template #="{ $index }">
                   <el-tag
                     >{{
-                      cgd_type_list.find(
+                      xs_order_type_options.find(
                         t => t.value === row.child[$index].qrdType
                       )?.label
                     }}

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

@@ -2,53 +2,56 @@ import { ContentConfig } from "/@/components/PageContent";
 import { httpList, httpAdd } from "/@/api/InvoiceSales/refund";
 
 import { h } from "vue";
-import dayjs from "dayjs";
 import { ElTag } from "element-plus";
 import { RETRUN_STATUS } from "/@/utils/details/refund";
 import { refund_type } from "./search.config";
-import { xs_order_source_options } from "/@/utils/status";
+import {
+  xs_order_source_options,
+  xs_order_type_options
+} from "/@/utils/status";
 
 const columns = [
-  {
-    type: "selection",
-    width: 55,
-    hide: ({ checkList }) => !checkList.includes("勾选列")
-  },
-  {
-    label: "序号",
-    type: "index",
-    width: 70,
-    hide: ({ checkList }) => !checkList.includes("序号列")
-  },
+  // {
+  //   type: "selection",
+  //   width: 55,
+  //   hide: ({ checkList }) => !checkList.includes("勾选列")
+  // },
+  // {
+  //   label: "序号",
+  //   type: "index",
+  //   width: 70,
+  //   hide: ({ checkList }) => !checkList.includes("序号列")
+  // },
   {
     label: "退款编号",
     prop: "returnCode",
-    width: "120px"
+    width: "160px"
   },
   {
     label: "资金编号",
     prop: "tradNo",
-    width: 120
+    width: 160
   },
   {
     label: "资金认领编号",
     prop: "logNo",
-    width: 120
+    width: 160
   },
   {
     label: "销售单编号",
     prop: "orderCode",
-    width: "120px"
+    width: "160px"
   },
   {
-    label: "商品编号",
-    prop: "goodNo",
-    width: "120px"
+    label: "退款金额",
+    width: "100px",
+    prop: "cancel_fee"
   },
+
   // {
   //   label: "退款类型",
   //   prop: "status",
-  //   width: "120px",
+  //   width: "160px",
   //   cellRenderer: ({ row }) => {
   //     return h(ElTag, null, {
   //       default: () =>
@@ -68,9 +71,9 @@ const columns = [
     }
   },
   {
-    label: "销售来源",
+    label: "订单来源",
     prop: "qrdSource",
-    width: "120px",
+    width: "100px",
     cellRenderer({ row }) {
       return h(ElTag, null, {
         default: () =>
@@ -79,39 +82,56 @@ const columns = [
     }
   },
   {
-    label: "平台名称",
-    prop: "platName",
-    width: "120px"
+    label: "商品类型",
+    prop: "qrdType",
+    width: "100px",
+    cellRenderer({ row }) {
+      return h(ElTag, null, {
+        default: () =>
+          xs_order_type_options.find(s => s.value === row.qrdType)?.label
+      });
+    }
   },
   {
-    label: "客户名称",
-    width: "180px",
-    prop: "customerName"
+    label: "商品编号",
+    prop: "goodNo",
+    width: "160px"
   },
   {
     label: "商品名称",
     prop: "goodName",
-    width: "120px"
+    minWidth: "160px"
   },
   {
-    label: "退款金额",
-    width: "120px",
-    prop: "cancel_fee"
+    label: "平台名称",
+    prop: "platName",
+    width: "100px"
   },
+
+  {
+    label: "客户编号",
+    width: "160px",
+    prop: "companyNo"
+  },
+  {
+    label: "客户名称",
+    width: "180px",
+    prop: "customerName"
+  },
+
   {
     label: "申请人",
     prop: "apply_name"
   },
   {
-    label: "退款时间",
+    label: "添加时间",
     prop: "addtime",
-    width: "120px",
-    formatter: ({ addtime }) => dayjs(addtime).format("YYYY-MM-DD HH:mm:ss")
+    width: "150px"
   },
   {
     label: "操作",
     fixed: "right",
-    width: 80,
+    width: 50,
     slot: "operation"
   }
 ];

src/views/system/menuOperator/columns.tsx

@@ -4,32 +4,30 @@ import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
 
 export function useColumns() {
   const columns = ref([
-    {
-      type: "selection",
-      minWidth: 55,
-      align: "left",
-      hide: ({ checkList }) => !checkList.includes("勾选列")
-    },
-    {
-      label: "序号",
-      type: "index",
-      minWidth: 60,
-      align: "left",
-      hide: ({ checkList }) => !checkList.includes("序号列")
-    },
+    // {
+    //   type: "selection",
+    //   minWidth: 55,
+    //   align: "left",
+    //   hide: ({ checkList }) => !checkList.includes("勾选列")
+    // },
+    // {
+    //   label: "序号",
+    //   type: "index",
+    //   minWidth: 60,
+    //   align: "left",
+    //   hide: ({ checkList }) => !checkList.includes("序号列")
+    // },
     {
       label: "名称",
       prop: "menu_name",
-      minWidth: 180,
+      minWidth: 200,
       align: "left"
     },
     {
       label: "图标",
       prop: "menu_img",
-      minWidth: 80,
-      cellRenderer: ({ row, props }) => (
-        <IconifyIconOnline icon={row.menu_img} />
-      )
+      width: 80,
+      cellRenderer: ({ row }) => <IconifyIconOnline icon={row.menu_img} />
     },
     {
       label: "path",
@@ -40,7 +38,7 @@ export function useColumns() {
     {
       label: "权重",
       prop: "weight",
-      minWidth: 60
+      width: 60
     },
     {
       label: "类型",

src/views/system/menuOperator/components/action-table.vue

@@ -100,7 +100,6 @@ defineExpose({
           align="left"
           row-key="id"
           table-layout="auto"
-          default-expand-all
           :size="size"
           :data="dataList"
           :columns="columns"