Browse Source

修改布局

xiaodai2017 1 year ago
parent
commit
c9ed21f897
30 changed files with 241 additions and 213 deletions
  1. 1 1
      src/api/InvoiceSales/capitalClaim/index.ts
  2. 1 1
      src/api/InvoiceSales/sheetOrderPool/index.ts
  3. 1 1
      src/api/invoice.ts
  4. 2 2
      src/utils/details/sale.ts
  5. 1 1
      src/views/InvoiceSales/capitalClaim/components/basic-claim/sales-modal.vue
  6. 1 1
      src/views/InvoiceSales/capitalClaim/components/claim-detail/index.vue
  7. 1 1
      src/views/InvoiceSales/capitalClaim/config/configs.ts
  8. 23 22
      src/views/InvoiceSales/capitalClaim/config/search.config.ts
  9. 7 6
      src/views/InvoiceSales/capitalPool/config/content.config.ts
  10. 24 24
      src/views/InvoiceSales/capitalPool/config/search.config.ts
  11. 1 1
      src/views/InvoiceSales/invoiceApply/components/add-edit-form/add-edit-form.vue
  12. 2 2
      src/views/InvoiceSales/invoiceApply/components/add-edit-form/order-dialog.vue
  13. 1 1
      src/views/InvoiceSales/invoiceApply/components/add-edit-form/search.config.ts
  14. 26 26
      src/views/InvoiceSales/invoiceApply/config/search.config.ts
  15. 5 5
      src/views/InvoiceSales/invoicePool/config/search.config.ts
  16. 1 1
      src/views/InvoiceSales/refund/config/configs.ts
  17. 8 6
      src/views/InvoiceSales/refund/config/content.config.ts
  18. 12 11
      src/views/InvoiceSales/refund/config/search.config.ts
  19. 10 0
      src/views/InvoiceSales/returnTicket/config/content.config.ts
  20. 17 17
      src/views/InvoiceSales/returnTicket/config/search.config.ts
  21. 33 30
      src/views/InvoiceSales/sheetOrderPool/config/search.config.ts
  22. 6 5
      src/views/interest/accountQuery/config/content.config.ts
  23. 11 11
      src/views/netOrderEnter/netOrderEntry/config/search.config.ts
  24. 1 4
      src/views/search/standBook/components/search-modal.vue
  25. 25 24
      src/views/search/standBook/config/query.ts
  26. 5 4
      src/views/supplierManage/supplierAccoutQuery/config/content.config.ts
  27. 1 1
      src/views/system/account/index.vue
  28. 12 4
      src/views/system/menuOperator/columns.tsx
  29. 1 0
      src/views/system/menuOperator/components/action-table.vue
  30. 1 0
      src/views/system/menuOperator/index.vue

+ 1 - 1
src/api/InvoiceSales/capitalClaim/index.ts

@@ -38,7 +38,7 @@ export const httpPayAdd = (data: any): any => {
   return http.request("post", `${yewuApi}orderpayadd`, { data });
 };
 
-//销售单列表
+//销售单列表
 export const httpSaleList = (data: any): any => {
   return http.request("post", `${yewuApi}orderlist`, { data });
 };

+ 1 - 1
src/api/InvoiceSales/sheetOrderPool/index.ts

@@ -9,7 +9,7 @@ interface ResponseType extends Promise<any> {
   msg?: string;
 }
 
-//销售单列表
+//销售单列表
 export const httpList = (data: any): any => {
   return http.request("post", `${yewuApi}orderlist`, { data });
 };

+ 1 - 1
src/api/invoice.ts

@@ -11,7 +11,7 @@ interface postType extends Promise<any> {
   message?: string;
 }
 
-//销售单发票票面
+//销售单发票票面
 export const httpSaleInvoice = (data?: object): postType => {
   return http.request("post", `${yewuApi}orderticket`, { data });
 };

+ 2 - 2
src/utils/details/sale.ts

@@ -1,5 +1,5 @@
 /**
- * 销售单详情
+ * 销售单详情
  */
 import { ElTag } from "element-plus";
 import { h } from "vue";
@@ -84,7 +84,7 @@ const INV_STATUS = [
 export const ORDER_COLUMNS: DescriptionColumns = [
   {
     field: "sequenceNo",
-    label: "销售单编码",
+    label: "销售单编码",
     span: 6
   },
   {

+ 1 - 1
src/views/InvoiceSales/capitalClaim/components/basic-claim/sales-modal.vue

@@ -114,7 +114,7 @@ onMounted(() => reuquestSalelist());
   <el-dialog
     :close-on-click-modal="false"
     v-model="visible"
-    title="销售单"
+    title="销售单"
     width="1040px"
     @close="() => (selectSaleOrder = [])"
     center

+ 1 - 1
src/views/InvoiceSales/capitalClaim/components/claim-detail/index.vue

@@ -24,7 +24,7 @@ const { run: createSaleRun } = useAsync({
   success: () => push("/InvoiceSales/capitalClaim")
 });
 
-//新增销售单付款
+//新增销售单付款
 const requesetCreateSalePay = orderArr => {
   createSaleRun(
     httpPayAdd({

+ 1 - 1
src/views/InvoiceSales/capitalClaim/config/configs.ts

@@ -309,7 +309,7 @@ export const sale_columns = [
   }
 ];
 
-//销售单订单类型
+//销售单订单类型
 export const sale_type = [
   {
     value: "1",

+ 23 - 22
src/views/InvoiceSales/capitalClaim/config/search.config.ts

@@ -4,9 +4,15 @@ import { FormConfig } from "/@/components/PageSearch";
 const searchFormConfig: FormConfig = {
   formItems: [
     {
-      field: "tradNo",
-      type: "input",
-      placeholder: "资金编码"
+      field: "create_timer",
+      type: "date_picker",
+      otherOptions: {
+        type: "daterange",
+        startProp: "start",
+        endProp: "end",
+        startPlaceholder: "交易开始时间",
+        endPlaceholder: "交易结束时间"
+      }
     },
     {
       field: "status",
@@ -14,16 +20,6 @@ const searchFormConfig: FormConfig = {
       placeholder: "认领状态",
       options: status_options
     },
-    {
-      type: "input",
-      field: "bank",
-      placeholder: "交易银行"
-    },
-    {
-      type: "input",
-      field: "name",
-      placeholder: "付款单位名称"
-    },
     {
       type: "range",
       field: "gold",
@@ -35,15 +31,20 @@ const searchFormConfig: FormConfig = {
       }
     },
     {
-      field: "create_timer",
-      type: "date_picker",
-      otherOptions: {
-        type: "daterange",
-        startProp: "start",
-        endProp: "end",
-        startPlaceholder: "交易开始时间",
-        endPlaceholder: "交易结束时间"
-      }
+      field: "tradNo",
+      type: "input",
+      placeholder: "资金编码"
+    },
+
+    {
+      type: "input",
+      field: "bank",
+      placeholder: "交易银行"
+    },
+    {
+      type: "input",
+      field: "name",
+      placeholder: "付款单位名称"
     }
   ]
 };

+ 7 - 6
src/views/InvoiceSales/capitalPool/config/content.config.ts

@@ -36,7 +36,7 @@ const columns = [
   },
 
   {
-    label: "销售单编码",
+    label: "销售单编码",
     prop: "orderCode",
     width: "150px"
   },
@@ -45,6 +45,11 @@ const columns = [
     prop: "cxCode",
     width: "160px"
   },
+  {
+    label: "认领金额",
+    prop: "total_fee",
+    width: "110px"
+  },
   {
     label: "平台类型",
     prop: "platform",
@@ -114,11 +119,7 @@ const columns = [
   //   prop: "trade_account",
   //   width: "120px"
   // },
-  {
-    label: "认领金额",
-    prop: "total_fee",
-    width: "110px"
-  },
+
   {
     label: "申请人",
     prop: "apply_name",

+ 24 - 24
src/views/InvoiceSales/capitalPool/config/search.config.ts

@@ -4,6 +4,29 @@ import { useTypeOptions } from "/@/utils/status";
 
 const searchFormConfig: FormConfig = {
   formItems: [
+    {
+      field: "timer",
+      type: "date_picker",
+      otherOptions: {
+        type: "daterange",
+        startProp: "start",
+        endProp: "end",
+        startPlaceholder: "资金认领起始时间",
+        endPlaceholder: "资金认领结束时间"
+      }
+    },
+    {
+      field: "status",
+      type: "select",
+      placeholder: "资金认领状态",
+      options: CAPITAL_STATUS
+    },
+    {
+      field: "platform_type",
+      type: "select",
+      placeholder: "平台类型",
+      options: useTypeOptions
+    },
     {
       field: "logNo",
       type: "input",
@@ -17,35 +40,12 @@ const searchFormConfig: FormConfig = {
     {
       field: "orderCode",
       type: "input",
-      placeholder: "销售单编码"
+      placeholder: "销售单编码"
     },
     {
       field: "cxCode",
       type: "input",
       placeholder: "销售主单号"
-    },
-    {
-      field: "platform_type",
-      type: "select",
-      placeholder: "平台类型",
-      options: useTypeOptions
-    },
-    {
-      field: "status",
-      type: "select",
-      placeholder: "资金认领状态",
-      options: CAPITAL_STATUS
-    },
-    {
-      field: "timer",
-      type: "date_picker",
-      otherOptions: {
-        type: "daterange",
-        startProp: "start",
-        endProp: "end",
-        startPlaceholder: "资金认领起始时间",
-        endPlaceholder: "资金认领结束时间"
-      }
     }
   ]
 };

+ 1 - 1
src/views/InvoiceSales/invoiceApply/components/add-edit-form/add-edit-form.vue

@@ -49,7 +49,7 @@ const initform = {
   email: "", //邮箱
   remark: "", //发票备注
   exam_remark: "", //申请备注
-  orderArr: [], //开票销售单明细 obj:sequenceNo//销售单编码 inv_fee//销售单开票金额,
+  orderArr: [], //开票销售单明细 obj:sequenceNo//销售单编码 inv_fee//销售单开票金额,
   companyType: "01",
   platform_type: ""
 };

+ 2 - 2
src/views/InvoiceSales/invoiceApply/components/add-edit-form/order-dialog.vue

@@ -113,11 +113,11 @@ function handleConfirm() {
   const noInvNum = selectList.filter(o => String(o.winv_num) === "0");
 
   if (noConfirm.length !== 0) {
-    return ElMessage.error(`销售单 ${noConfirm[0].sequenceNo} 开票金额为零`);
+    return ElMessage.error(`销售单 ${noConfirm[0].sequenceNo} 开票金额为零`);
   }
 
   if (noInvNum.length !== 0) {
-    return ElMessage.error(`销售单 ${noInvNum[0].sequenceNo} 开票数量为零`);
+    return ElMessage.error(`销售单 ${noInvNum[0].sequenceNo} 开票数量为零`);
   }
 
   emit("save-btn-click", selectList);

+ 1 - 1
src/views/InvoiceSales/invoiceApply/components/add-edit-form/search.config.ts

@@ -12,7 +12,7 @@ const searchFormConfig: FormConfig = {
     {
       field: "sequenceNo",
       type: "input",
-      placeholder: "销售单编码"
+      placeholder: "销售单编码"
     },
     {
       field: "cxCode",

+ 26 - 26
src/views/InvoiceSales/invoiceApply/config/search.config.ts

@@ -6,19 +6,22 @@ const searchFormConfig: FormConfig = {
   colLayout: { span: 8 },
   formItems: [
     {
-      field: "invNo",
-      type: "input",
-      placeholder: "发票申请编码"
-    },
-    {
-      field: "buyer_name",
-      type: "input",
-      placeholder: "客户名称"
+      field: "timer",
+      type: "date_picker",
+      otherOptions: {
+        type: "daterange",
+        startProp: "start",
+        endProp: "end",
+        startPlaceholder: "申请开始时间",
+        endPlaceholder: "申请结束时间"
+      }
     },
     {
-      field: "apply_name",
-      type: "input",
-      placeholder: "申请人"
+      field: "status",
+      type: "select",
+      placeholder: "状态",
+      span: 4,
+      options: invoiceApplyStatusOptions
     },
     {
       field: "platform_type",
@@ -27,24 +30,21 @@ const searchFormConfig: FormConfig = {
       span: 4,
       options: useTypeOptions
     },
-
     {
-      field: "status",
-      type: "select",
-      placeholder: "状态",
-      span: 4,
-      options: invoiceApplyStatusOptions
+      field: "buyer_name",
+      type: "input",
+      placeholder: "客户名称"
     },
     {
-      field: "timer",
-      type: "date_picker",
-      otherOptions: {
-        type: "daterange",
-        startProp: "start",
-        endProp: "end",
-        startPlaceholder: "申请开始时间",
-        endPlaceholder: "申请结束时间"
-      }
+      field: "invNo",
+      type: "input",
+      placeholder: "发票申请编码"
+    },
+
+    {
+      field: "apply_name",
+      type: "input",
+      placeholder: "申请人"
     }
   ]
 };

+ 5 - 5
src/views/InvoiceSales/invoicePool/config/search.config.ts

@@ -3,11 +3,6 @@ import { xs_inv_type_list, useTypeOptions } from "/@/utils/status";
 
 const searchFormConfig: FormConfig = {
   formItems: [
-    {
-      field: "invNo",
-      type: "input",
-      placeholder: "发票申请编码"
-    },
     {
       field: "timer",
       type: "date_picker",
@@ -24,6 +19,11 @@ const searchFormConfig: FormConfig = {
       type: "select",
       placeholder: "发票类型",
       options: xs_inv_type_list
+    },
+    {
+      field: "invNo",
+      type: "input",
+      placeholder: "发票申请编码"
     }
   ]
 };

+ 1 - 1
src/views/InvoiceSales/refund/config/configs.ts

@@ -292,7 +292,7 @@ export const sale_columns = [
   }
 ];
 
-//销售单订单类型
+//销售单订单类型
 export const sale_type = [
   {
     value: "1",

+ 8 - 6
src/views/InvoiceSales/refund/config/content.config.ts

@@ -27,21 +27,23 @@ const columns = [
     prop: "returnCode",
     width: "150px"
   },
-  {
-    label: "资金编码",
-    prop: "tradNo",
-    width: 150
-  },
+
   {
     label: "资金认领编码",
     prop: "logNo",
     width: 150
   },
+
   {
-    label: "销售单编码",
+    label: "销售单编码",
     prop: "orderCode",
     width: "150px"
   },
+  {
+    label: "资金编码",
+    prop: "tradNo",
+    width: 150
+  },
   {
     label: "退款金额",
     width: "110px",

+ 12 - 11
src/views/InvoiceSales/refund/config/search.config.ts

@@ -34,37 +34,38 @@ const searchFormConfig: FormConfig = {
       placeholder: "退款编码"
     },
     {
-      field: "tradNo",
-      type: "input",
-      placeholder: "资金编码"
+      field: "status",
+      type: "select",
+      placeholder: "退款状态",
+      options: refund_status
     },
     {
       field: "logNo",
       type: "input",
       placeholder: "资金认领编码"
     },
+
     {
       field: "orderCode",
       type: "input",
-      placeholder: "销售单编码"
+      placeholder: "销售订单编码"
+    },
+    {
+      field: "tradNo",
+      type: "input",
+      placeholder: "资金编码"
     },
     {
       field: "apply_name",
       type: "input",
       placeholder: "申请人"
-    },
+    }
     // {
     //   field: "type",
     //   type: "select",
     //   placeholder: "退款类型",
     //   options: refund_type
     // },
-    {
-      field: "status",
-      type: "select",
-      placeholder: "退款状态",
-      options: refund_status
-    }
   ]
 };
 

+ 10 - 0
src/views/InvoiceSales/returnTicket/config/content.config.ts

@@ -69,6 +69,16 @@ const columns = [
       });
     }
   },
+  {
+    label: "业务公司编码",
+    prop: "inv_out",
+    width: 150
+  },
+  {
+    label: "业务公司名称",
+    prop: "companyName",
+    minWidth: 180
+  },
   {
     label: "申请人",
     prop: "apply_name",

+ 17 - 17
src/views/InvoiceSales/returnTicket/config/search.config.ts

@@ -3,6 +3,23 @@ import { FormConfig } from "/@/components/PageSearch";
 
 const searchFormConfig: FormConfig = {
   formItems: [
+    {
+      field: "timer",
+      type: "date_picker",
+      otherOptions: {
+        type: "daterange",
+        startProp: "start",
+        endProp: "end",
+        startPlaceholder: "申请开始时间",
+        endPlaceholder: "申请结束时间"
+      }
+    },
+    {
+      field: "status",
+      type: "select",
+      placeholder: "退票状态",
+      options: RETURN_STATUS
+    },
     {
       field: "returnCode",
       type: "input",
@@ -17,23 +34,6 @@ const searchFormConfig: FormConfig = {
       field: "apply_name",
       type: "input",
       placeholder: "申请人"
-    },
-    {
-      field: "status",
-      type: "select",
-      placeholder: "退票状态",
-      options: RETURN_STATUS
-    },
-    {
-      field: "timer",
-      type: "date_picker",
-      otherOptions: {
-        type: "daterange",
-        startProp: "start",
-        endProp: "end",
-        startPlaceholder: "申请开始时间",
-        endPlaceholder: "申请结束时间"
-      }
     }
   ]
 };

+ 33 - 30
src/views/InvoiceSales/sheetOrderPool/config/search.config.ts

@@ -137,23 +137,6 @@ const tag_type = [
 
 const searchFormConfig: FormConfig = {
   formItems: [
-    {
-      field: "group",
-      type_field: "group_type",
-      type: "input_group",
-      span: 8,
-      otherOptions: {
-        inputGroupOptions: [
-          { value: "sequenceNo", label: "订单编码" },
-          { value: "cxCode", label: "销售订单主编码" },
-          { value: "customerNo", label: "客户编码" },
-          { value: "customer", label: "客户名称" },
-          { value: "platName", label: "平台名称" },
-          { value: "department", label: "部门" },
-          { value: "saler", label: "销售员" }
-        ]
-      }
-    },
     {
       field: "order_timer",
       type: "date_picker",
@@ -165,12 +148,13 @@ const searchFormConfig: FormConfig = {
         endPlaceholder: "下单结束时间"
       }
     },
+
     {
-      field: "inv_status",
+      field: "qrdsource",
       type: "select",
-      placeholder: "开票状态",
-      options: inv_open_status,
-      span: 6
+      placeholder: "订单来源",
+      options: good_source,
+      span: 4
     },
     {
       field: "qrdtype",
@@ -180,12 +164,13 @@ const searchFormConfig: FormConfig = {
       span: 4
     },
     {
-      field: "qrdsource",
+      field: "inv_status",
       type: "select",
-      placeholder: "订单来源",
-      options: good_source,
+      placeholder: "开票状态",
+      options: inv_open_status,
       span: 4
     },
+
     {
       field: "pay_status",
       type: "select",
@@ -193,6 +178,24 @@ const searchFormConfig: FormConfig = {
       options: retrun_status,
       span: 4
     },
+    {
+      field: "group",
+      type_field: "group_type",
+      type: "input_group",
+      span: 8,
+      otherOptions: {
+        inputGroupOptions: [
+          { value: "sequenceNo", label: "订单编码" },
+          { value: "cxCode", label: "销售订单主编码" },
+          { value: "customerNo", label: "客户编码" },
+          { value: "customer", label: "客户名称" },
+          { value: "platName", label: "平台名称" },
+          { value: "department", label: "部门" },
+          { value: "saler", label: "销售员" }
+        ]
+      }
+    },
+
     {
       field: "sendstatus",
       type: "select",
@@ -208,17 +211,17 @@ const searchFormConfig: FormConfig = {
       span: 4
     },
     {
-      field: "tag_id",
+      field: "platform_type",
       type: "select",
-      placeholder: "标签类型",
-      options: tag_type,
+      placeholder: "平台类型",
+      options: useTypeOptions,
       span: 4
     },
     {
-      field: "platform_type",
+      field: "tag_id",
       type: "select",
-      placeholder: "平台类型",
-      options: useTypeOptions,
+      placeholder: "标签类型",
+      options: tag_type,
       span: 4
     }
   ]

+ 6 - 5
src/views/interest/accountQuery/config/content.config.ts

@@ -27,17 +27,18 @@ const columns = [
   {
     label: "手机号",
     prop: "mobile",
-    minWidth: 180,
+    width: 120,
     align: "left"
   },
   {
     label: "真实姓名",
     prop: "nickname",
-    minWidth: 120
+    minWidth: 150
   },
   {
     label: "状态",
     prop: "status",
+    width: 100,
     cellRenderer: ({ row }) => {
       return h(
         ElTag,
@@ -53,7 +54,7 @@ const columns = [
   {
     label: "角色",
     prop: "role_name",
-    minWidth: 180,
+    minWidth: 150,
     align: "left"
   },
 
@@ -71,14 +72,14 @@ const columns = [
   },
   {
     label: "创建时间",
-    minWidth: 180,
+    width: 140,
     prop: "addtime",
     formatter: ({ addtime }) => dayjs(addtime).format("YYYY-MM-DD HH:mm:ss")
   },
   {
     label: "操作",
     fixed: "right",
-    width: 120,
+    width: 100,
     slot: "operation"
   }
 ];

+ 11 - 11
src/views/netOrderEnter/netOrderEntry/config/search.config.ts

@@ -2,6 +2,17 @@ import { FormConfig } from "/@/components/PageSearch";
 
 const searchFormConfig: FormConfig = {
   formItems: [
+    {
+      field: "timer",
+      type: "date_picker",
+      otherOptions: {
+        type: "daterange",
+        startProp: "starttime",
+        endProp: "endtime",
+        startPlaceholder: "订单生成时间起始",
+        endPlaceholder: "订单生成时间结束"
+      }
+    },
     {
       field: "group",
       type_field: "group_type",
@@ -14,17 +25,6 @@ const searchFormConfig: FormConfig = {
           { value: "cgd_saler", label: "采购员" }
         ]
       }
-    },
-    {
-      field: "timer",
-      type: "date_picker",
-      otherOptions: {
-        type: "daterange",
-        startProp: "starttime",
-        endProp: "endtime",
-        startPlaceholder: "订单生成时间起始",
-        endPlaceholder: "订单生成时间结束"
-      }
     }
   ]
 };

+ 1 - 4
src/views/search/standBook/components/search-modal.vue

@@ -42,10 +42,7 @@ defineExpose({
   >
     <div class="flex flex-wrap justify-between gap-3">
       <div v-for="key in Object.keys(QUERY_MAP)" :key="key">
-        <el-input
-          v-model="data[key]"
-          :placeholder="'请输入' + QUERY_MAP[key].query"
-        >
+        <el-input v-model="data[key]" :placeholder="QUERY_MAP[key].query">
           <template #prepend>
             <div w-100px>{{ QUERY_MAP[key].query }}</div>
           </template>

+ 25 - 24
src/views/search/standBook/config/query.ts

@@ -6,7 +6,7 @@ import Purchase from "./../details/purchase.vue";
 import { httpInfo as httpReconciliationInfo } from "/@/api/purchase/orderRecord";
 import Reconciliation from "./../details/reconciliation.vue";
 
-//销售单
+//销售
 import { httpDetail as httpSaleInfo } from "/@/api/InvoiceSales/sheetOrderPool";
 import Sale from "./../details/sale.vue";
 
@@ -40,14 +40,14 @@ import InvOpen from "../details/inv-open.vue";
 import Goods from "../details/goods.vue";
 
 export const QUERY_MAP = {
-  good: {
-    query: "商品信息",
-    detail: "商品信息",
-    requesetProp: "sequenceNo",
-    responseKey: "cgdNo",
-    component: Goods,
-    api: httpPurchaseInfo
-  },
+  // good: {
+  //   query: "商品信息",
+  //   detail: "商品信息",
+  //   requesetProp: "sequenceNo",
+  //   responseKey: "cgdNo",
+  //   component: Goods,
+  //   api: httpPurchaseInfo
+  // },
   cgdNo: {
     query: "采购单号",
     detail: "采购单",
@@ -88,14 +88,15 @@ export const QUERY_MAP = {
     component: Sale,
     api: httpSaleInfo
   },
-  logNo: {
-    query: "资金认领编码",
-    detail: "资金认领",
-    component: Tradelog,
-    responseKey: "logNo",
-    requesetProp: "logNo",
-    api: httpTradelogInfo
+  invNo: {
+    query: "开票申请编码",
+    detail: "开票申请",
+    component: InvOpen,
+    responseKey: "invNo",
+    requesetProp: "invNo",
+    api: httpInvOpenInfo
   },
+
   tradNo: {
     query: "资金编码",
     detail: "资金",
@@ -104,6 +105,14 @@ export const QUERY_MAP = {
     requesetProp: "tradNo",
     api: httpTradeInfo
   },
+  logNo: {
+    query: "资金认领编码",
+    detail: "资金认领",
+    component: Tradelog,
+    responseKey: "logNo",
+    requesetProp: "logNo",
+    api: httpTradelogInfo
+  },
   returnTrad: {
     query: "退款申请编码",
     detail: "资金认领",
@@ -119,14 +128,6 @@ export const QUERY_MAP = {
     responseKey: "returnInv",
     requesetProp: "returnCode",
     api: httpInvReturnInfo
-  },
-  invNo: {
-    query: "开票申请编码",
-    detail: "开票申请",
-    component: InvOpen,
-    responseKey: "invNo",
-    requesetProp: "invNo",
-    api: httpInvOpenInfo
   }
 };
 

+ 5 - 4
src/views/supplierManage/supplierAccoutQuery/config/content.config.ts

@@ -28,17 +28,18 @@ const columns = [
   {
     label: "手机号",
     prop: "mobile",
-    minWidth: 180,
+    width: 120,
     align: "left"
   },
   {
     label: "真实姓名",
     prop: "nickname",
-    minWidth: 120
+    minWidth: 150
   },
   {
     label: "状态",
     prop: "status",
+    width: 120,
     cellRenderer: ({ row }) => {
       return h(
         ElTag,
@@ -54,7 +55,7 @@ const columns = [
   {
     label: "角色",
     prop: "role_name",
-    minWidth: 180,
+    minWidth: 150,
     align: "left"
   },
 
@@ -72,7 +73,7 @@ const columns = [
   },
   {
     label: "创建时间",
-    minWidth: 180,
+    width: 140,
     prop: "addtime",
     formatter: ({ addtime }) => dayjs(addtime).format("YYYY-MM-DD HH:mm:ss")
   },

+ 1 - 1
src/views/system/account/index.vue

@@ -231,7 +231,7 @@ onMounted(() => {
             :icon="useRenderIcon('add')"
             @click="editItem('', 'add', {})"
           >
-            新增账号
+            新增
           </el-button>
         </template>
         <template v-slot="{ size, checkList }">

+ 12 - 4
src/views/system/menuOperator/columns.tsx

@@ -21,32 +21,37 @@ export function useColumns() {
       label: "名称",
       prop: "menu_name",
       minWidth: 200,
-      align: "left"
+      align: "left",
+      showOverflowTooltip: true
     },
     {
       label: "图标",
       prop: "menu_img",
       width: 80,
-      cellRenderer: ({ row }) => (<IconifyIconOnline icon={row.menu_img} /> )
+      showOverflowTooltip: true,
+      cellRenderer: ({ row }) => <IconifyIconOnline icon={row.menu_img} />
     },
     {
       label: "path",
       prop: "menu_route",
       minWidth: 180,
+      showOverflowTooltip: true,
       align: "left"
     },
     {
       label: "权重",
       prop: "weight",
+      showOverflowTooltip: true,
       width: 60
     },
     {
       label: "类型",
       prop: "menu_type",
       minWidth: 80,
+      showOverflowTooltip: true,
       cellRenderer: ({ row, props }) => (
         <el-tag
-          size={props.size}
+          size="small"
           type={row.menu_type + "" === "1" ? "success" : "danger"}
           effect="plain"
         >
@@ -58,9 +63,10 @@ export function useColumns() {
       label: "状态",
       prop: "status",
       minWidth: 80,
+      showOverflowTooltip: true,
       cellRenderer: ({ row, props }) => (
         <el-tag
-          size={props.size}
+          size="small"
           type={row.status + "" === "1" ? "success" : "danger"}
           effect="plain"
         >
@@ -72,12 +78,14 @@ export function useColumns() {
       label: "页面路径",
       prop: "menu_url",
       minWidth: 180,
+      showOverflowTooltip: true,
       align: "left"
     },
     {
       label: "操作",
       fixed: "right",
       width: 180,
+      showOverflowTooltip: true,
       slot: "operation"
     }
   ]);

+ 1 - 0
src/views/system/menuOperator/components/action-table.vue

@@ -87,6 +87,7 @@ defineExpose({
         <el-button
           v-if="powers.some(i => i == '002')"
           type="primary"
+          size="small"
           :icon="useRenderIcon('add')"
           @click="editItem(null, '', 'create')"
         >

+ 1 - 0
src/views/system/menuOperator/index.vue

@@ -24,6 +24,7 @@ onMounted(() => {
     <PagePower :isShow="powers.some(i => i == '001')">
       <ActionTable
         :powers="powers"
+        showOverflowTooltip
         ref="actionTableRef"
         @edit="handleAddChangeCheck"
         @view="handleAddChangeCheck"