xiaodai2017 1 year ago
parent
commit
68d77f4f0b
75 changed files with 219 additions and 130 deletions
  1. 28 7
      src/components/ReconciliationForm/src/cpns/batch-mode.vue
  2. 3 3
      src/components/ReconciliationForm/src/cpns/purchase-modal.vue
  3. 18 3
      src/components/ReconciliationForm/src/cpns/purchase-table.vue
  4. 24 7
      src/components/ReconciliationForm/src/cpns/single-mode.vue
  5. 3 2
      src/views/InvoiceSaleSettings/commodityCost/config/content.config.ts
  6. 2 1
      src/views/InvoiceSaleSettings/consultingCost/config/content.config.ts
  7. 2 0
      src/views/InvoiceSales/capitalClaim/config/configs.ts
  8. 2 1
      src/views/InvoiceSales/capitalClaim/config/content.config.ts
  9. 2 1
      src/views/InvoiceSales/capitalPool/config/content.config.ts
  10. 4 3
      src/views/InvoiceSales/invoiceApply/components/add-edit-form/columns.tsx
  11. 2 1
      src/views/InvoiceSales/invoicePool/config/content.config.ts
  12. 1 1
      src/views/InvoiceSales/redInk/components/create-redink.vue
  13. 2 1
      src/views/InvoiceSales/redInk/config/content.config.ts
  14. 1 1
      src/views/InvoiceSales/refund/components/capital-modal.vue
  15. 1 1
      src/views/InvoiceSales/refund/components/create-refund/capital-modal.vue
  16. 2 0
      src/views/InvoiceSales/refund/config/configs.ts
  17. 2 1
      src/views/InvoiceSales/refund/config/content.config.ts
  18. 1 1
      src/views/InvoiceSales/returnTicket/components/capital-modal.vue
  19. 1 1
      src/views/InvoiceSales/returnTicket/components/create-return-ticket/capital-modal.vue
  20. 2 1
      src/views/InvoiceSales/returnTicket/config/content.config.ts
  21. 3 2
      src/views/InvoiceSales/sheetOrderPool/config/content.config.ts
  22. 2 2
      src/views/interest/accountQuery/config/content.config.ts
  23. 2 1
      src/views/interest/action/columns.tsx
  24. 2 1
      src/views/interest/company/config/content.config.ts
  25. 2 1
      src/views/interest/companyAccount-origin/columns.tsx
  26. 1 1
      src/views/interest/companyAccount-origin/components/company-modal.vue
  27. 2 1
      src/views/interest/companyAccount/columns.tsx
  28. 1 1
      src/views/interest/companyAccount/components/company-modal.vue
  29. 2 1
      src/views/interest/role/columns.tsx
  30. 2 1
      src/views/interest/userGroup/config/content.config.ts
  31. 2 2
      src/views/netOrderEnter/netOrderEntry/config/content.config.ts
  32. 2 1
      src/views/parameter/clients/config/content.config.ts
  33. 2 1
      src/views/parameter/finance/config/content.config.ts
  34. 2 3
      src/views/parameter/invoiceheader/config/content.config.ts
  35. 2 1
      src/views/parameter/setActionProcess/config/content.config.ts
  36. 2 1
      src/views/parameter/setProcess/config/content.config.ts
  37. 2 1
      src/views/parameter/supplierPay/config/content.config.ts
  38. 2 1
      src/views/parameter/tagManage/config/content.config.ts
  39. 1 1
      src/views/purchase/buyInvoiceQuery/components/choose-modal.vue
  40. 2 1
      src/views/purchase/buyInvoiceQuery/config/content.config.ts
  41. 2 2
      src/views/purchase/orderRecord/config/content.config.ts
  42. 2 2
      src/views/purchase/orderRecordQuery/config/content.config.ts
  43. 1 1
      src/views/purchase/purchPay/component/choose-modal.vue
  44. 1 1
      src/views/purchase/purchPayRelive/component/choose-modal.vue
  45. 2 2
      src/views/purchase/purchPayRelive/config/content.config.ts
  46. 1 1
      src/views/purchase/ticketReturn/components/choose-modal.vue
  47. 3 3
      src/views/purchase/ticketReturn/components/invoice-form.vue
  48. 3 3
      src/views/purchase/ticketReturn/components/invoice-table.vue
  49. 2 1
      src/views/purchase/ticketReturn/config/content.config.ts
  50. 17 19
      src/views/purchase/ticketReturnRelive/components/choose-modal.vue
  51. 1 1
      src/views/purchase/ticketReturnRelive/config/_details.ts
  52. 2 1
      src/views/purchase/ticketReturnRelive/config/content.config.ts
  53. 2 1
      src/views/reportForm/reportApply/config/content.config.ts
  54. 2 1
      src/views/reportForm/reportRecord/config/content.config.ts
  55. 2 1
      src/views/supplierManage/supplierAccoutManage/columns.tsx
  56. 1 1
      src/views/supplierManage/supplierAccoutManage/components/company-modal.vue
  57. 2 2
      src/views/supplierManage/supplierAccoutQuery/config/content.config.ts
  58. 2 1
      src/views/supplierManage/supplierRole/columns.tsx
  59. 2 1
      src/views/supply/orderRecord/config/content.config.ts
  60. 2 2
      src/views/supply/orderRecordQuery/config/content.config.ts
  61. 2 1
      src/views/supply/porder/config/content.config.ts
  62. 1 1
      src/views/supply/purchPay/component/choose-modal.vue
  63. 2 2
      src/views/supply/purchPay/config/content.config.ts
  64. 1 1
      src/views/supply/purchPayRelive/component/choose-modal.vue
  65. 2 2
      src/views/supply/purchPayRelive/config/content.config.ts
  66. 1 1
      src/views/supply/sellInvoiceQuery/components/choose-modal.vue
  67. 2 1
      src/views/supply/sellInvoiceQuery/config/content.config.ts
  68. 1 1
      src/views/supply/ticketReturn/components/choose-modal.vue
  69. 3 3
      src/views/supply/ticketReturn/components/invoice-form.vue
  70. 2 1
      src/views/supply/ticketReturn/config/content.config.ts
  71. 1 1
      src/views/supply/ticketReturnRelive/components/choose-modal.vue
  72. 2 1
      src/views/supply/ticketReturnRelive/config/content.config.ts
  73. 2 1
      src/views/system/account/columns.tsx
  74. 2 2
      src/views/system/menuOperator/columns.tsx
  75. 2 2
      src/views/system/setBtn/config/content.config.ts

+ 28 - 7
src/components/ReconciliationForm/src/cpns/batch-mode.vue

@@ -86,9 +86,30 @@ function onSubmit() {
     v-loading="loading"
     max-height="580px"
   >
-    <el-table-column type="index" width="50" label="序号" />
-    <ElTableColumn label="采购单编码" prop="sequenceNo" width="150" />
-    <ElTableColumn label="采购主单编码" prop="cxCode" width="150" />
+    <el-table-column
+      type="index"
+      width="50"
+      show-overflow-tooltip
+      label="序号"
+    />
+    <ElTableColumn
+      label="采购单编码"
+      prop="sequenceNo"
+      show-overflow-tooltip
+      width="150"
+    />
+    <ElTableColumn
+      label="销售订单编码"
+      prop="qrdCode"
+      show-overflow-tooltip
+      width="150"
+    />
+    <ElTableColumn
+      label="采购主单编码"
+      show-overflow-tooltip
+      prop="cxCode"
+      width="150"
+    />
     <ElTableColumn label="采购单信息">
       <ElTableColumn
         label="供货商"
@@ -103,7 +124,7 @@ function onSubmit() {
         show-overflow-tooltip
       >
         <template #default="{ row }">
-          <ElTag>{{
+          <ElTag size="small">{{
             send_status_list.find(s => s.value === String(row.sendStatus))
               ?.label
           }}</ElTag>
@@ -122,7 +143,7 @@ function onSubmit() {
         show-overflow-tooltip
       >
         <template #default="{ row }">
-          <ElTag>
+          <ElTag size="small">
             {{
               cg_order_source_options.find(
                 t => t.value === String(row.cgdSource)
@@ -158,7 +179,7 @@ function onSubmit() {
         show-overflow-tooltip
       >
         <template #="{ row }">
-          <ElTag>
+          <ElTag size="small">
             {{
               cg_order_type_options.find(t => t.value === String(row.cgdType))
                 ?.label
@@ -176,7 +197,7 @@ function onSubmit() {
     <ElTableColumn
       label="采购员"
       prop="ownerName"
-      width="75"
+      width="70"
       show-overflow-tooltip
     />
   </ElTable>

+ 3 - 3
src/components/ReconciliationForm/src/cpns/purchase-modal.vue

@@ -29,14 +29,14 @@ defineExpose({
     :close-on-click-modal="false"
     top="5vh"
     v-model="visible"
-    title="选择采购商品"
+    title="选择采购"
     center
     destroy-on-close
     width="1040px"
   >
     <el-switch
-      active-text="输入采购单"
-      inactive-text="选择采购单"
+      active-text="批量查找"
+      inactive-text="勾选查找"
       v-model="isBatch"
     />
 

+ 18 - 3
src/components/ReconciliationForm/src/cpns/purchase-table.vue

@@ -72,9 +72,24 @@ function handleAddPurchase() {
       :data="purchaseOrders"
       max-height="400"
     >
-      <ElTableColumn label="采购单编码" prop="sequenceNo" width="150" />
-      <ElTableColumn label="销售订单编码" prop="qrdCode" width="150" />
-      <ElTableColumn label="采购主单号" prop="cxCode" width="150" />
+      <ElTableColumn
+        label="采购单编码"
+        show-overflow-tooltip
+        prop="sequenceNo"
+        width="150"
+      />
+      <ElTableColumn
+        label="销售订单编码"
+        show-overflow-tooltip
+        prop="qrdCode"
+        width="150"
+      />
+      <ElTableColumn
+        label="采购主单号"
+        show-overflow-tooltip
+        prop="cxCode"
+        width="150"
+      />
       <ElTableColumn label="采购单信息">
         <ElTableColumn
           label="供货商"

+ 24 - 7
src/components/ReconciliationForm/src/cpns/single-mode.vue

@@ -231,9 +231,26 @@ onMounted(() => {
     @selection-change="handleSelection"
     max-height="580px"
   >
-    <ElTableColumn type="selection" width="55" />
-    <ElTableColumn label="采购单编码" prop="sequenceNo" width="150" />
-    <ElTableColumn label="采购主单编码" prop="cxCode" width="150" />
+    <ElTableColumn type="selection" fixed="left" align="center" width="40" />
+    <ElTableColumn
+      label="采购单编码"
+      prop="sequenceNo"
+      show-overflow-tooltip
+      width="150"
+    />
+    <ElTableColumn
+      label="销售订单编码"
+      prop="qrdCode"
+      show-overflow-tooltip
+      width="150"
+    />
+
+    <ElTableColumn
+      label="采购主单编码"
+      prop="cxCode"
+      show-overflow-tooltip
+      width="150"
+    />
     <ElTableColumn label="采购单信息">
       <ElTableColumn
         label="供货商"
@@ -248,7 +265,7 @@ onMounted(() => {
         show-overflow-tooltip
       >
         <template #default="{ row }">
-          <ElTag>{{
+          <ElTag size="small">{{
             send_status_list.find(s => s.value === String(row.sendStatus))
               ?.label
           }}</ElTag>
@@ -267,7 +284,7 @@ onMounted(() => {
         show-overflow-tooltip
       >
         <template #default="{ row }">
-          <ElTag>
+          <ElTag size="small">
             {{
               cg_order_source_options.find(
                 t => t.value === String(row.cgdSource)
@@ -303,7 +320,7 @@ onMounted(() => {
         show-overflow-tooltip
       >
         <template #="{ row }">
-          <ElTag>
+          <ElTag size="small">
             {{
               cg_order_type_options.find(t => t.value === String(row.cgdType))
                 ?.label
@@ -321,7 +338,7 @@ onMounted(() => {
     <ElTableColumn
       label="采购员"
       prop="ownerName"
-      width="75"
+      width="70"
       show-overflow-tooltip
     />
   </ElTable>

+ 3 - 2
src/views/InvoiceSaleSettings/commodityCost/config/content.config.ts

@@ -22,12 +22,13 @@ function renderGoodImage(imgSrc: string) {
 const columns = [
   {
     type: "selection",
-    width: 55
+    width: 40,
+    align: "center",
+    fixed: "left"
   },
   {
     label: "商品编码",
     prop: "spuCode",
-    fixed: "left",
     width: 150
   },
   {

+ 2 - 1
src/views/InvoiceSaleSettings/consultingCost/config/content.config.ts

@@ -22,7 +22,8 @@ function renderGoodImage(imgSrc: string) {
 const columns = [
   {
     type: "selection",
-    width: 55
+    width: 40,
+    align: "center"
   },
   {
     label: "商品编码",

+ 2 - 0
src/views/InvoiceSales/capitalClaim/config/configs.ts

@@ -227,6 +227,8 @@ export const status_options = [
 export const sale_columns = [
   {
     type: "selection",
+    width: 40,
+    align: "center",
     fixed: "left"
   },
   {

+ 2 - 1
src/views/InvoiceSales/capitalClaim/config/content.config.ts

@@ -9,7 +9,8 @@ import { CAPITAL_STATUS } from "/@/utils/details/tragelog";
 const columns = [
   // {
   //   type: "selection",
-  //   width: 55,
+  //   width: 40,
+  // align: "center"
   //   hide: ({ checkList }) => !checkList.includes("勾选列")
   // },
   // {

+ 2 - 1
src/views/InvoiceSales/capitalPool/config/content.config.ts

@@ -14,7 +14,8 @@ import {
 const columns = [
   // {
   //   type: "selection",
-  //   width: 55,
+  //   width: 40,
+  // align: "center"
   //   hide: ({ checkList }) => !checkList.includes("勾选列")
   // },
   // {

+ 4 - 3
src/views/InvoiceSales/invoiceApply/components/add-edit-form/columns.tsx

@@ -5,14 +5,15 @@ export function useColumns() {
   const columns = ref([
     {
       type: "selection",
-      width: 30
+      width: 40,
+      align: "center",
+      fixed: "left"
     },
     {
       label: "业务订单编码",
       prop: "sequenceNo",
       width: 150,
-      showOverflowTooltip: true,
-      fixed: "left"
+      showOverflowTooltip: true
     },
     {
       label: "销售订单主编码",

+ 2 - 1
src/views/InvoiceSales/invoicePool/config/content.config.ts

@@ -9,7 +9,8 @@ import { invoiceTypeList } from "/@/utils/status";
 const columns = [
   // {
   //   type: "selection",
-  //   width: 55,
+  //   width: 40,
+  // align: "center",
   //   hide: ({ checkList }) => !checkList.includes("勾选列")
   // },
   // {

+ 1 - 1
src/views/InvoiceSales/redInk/components/create-redink.vue

@@ -96,7 +96,7 @@ defineExpose({
       @selection-change="handleSelectionChange"
       max-height="520px"
     >
-      <el-table-column type="selection" />
+      <el-table-column type="selection" align="center" width="40px" />
       <el-table-column
         v-for="inv in inv_columns"
         :key="inv.prop"

+ 2 - 1
src/views/InvoiceSales/redInk/config/content.config.ts

@@ -42,7 +42,8 @@ const RED_STATUS = [
 const columns = [
   {
     type: "selection",
-    width: 55,
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 1 - 1
src/views/InvoiceSales/refund/components/capital-modal.vue

@@ -103,7 +103,7 @@ defineExpose({
       v-loading="loading"
       max-height="520px"
     >
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" align="center" width="40" />
       <el-table-column
         v-for="{ field, label, width } in tableColumns"
         :key="field"

+ 1 - 1
src/views/InvoiceSales/refund/components/create-refund/capital-modal.vue

@@ -98,7 +98,7 @@ defineExpose({
       @selection-change="handleSelectionChange"
       v-loading="loading"
     >
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" align="center" width="40" />
       <el-table-column
         v-for="{ field, label, width } in columns"
         :key="field"

+ 2 - 0
src/views/InvoiceSales/refund/config/configs.ts

@@ -221,6 +221,8 @@ export const status_options = [
 export const sale_columns = [
   {
     type: "selection",
+    width: 40,
+    align: "center",
     fixed: "left"
   },
   {

+ 2 - 1
src/views/InvoiceSales/refund/config/content.config.ts

@@ -13,7 +13,8 @@ import {
 const columns = [
   // {
   //   type: "selection",
-  //   width: 55,
+  //   width: 40,
+  // align: "center",
   //   hide: ({ checkList }) => !checkList.includes("勾选列")
   // },
   // {

+ 1 - 1
src/views/InvoiceSales/returnTicket/components/capital-modal.vue

@@ -125,7 +125,7 @@ defineExpose({
       @selection-change="handleSelectionChange"
       max-height="520px"
     >
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" align="center" width="40" />
       <el-table-column
         v-for="(col, index) in inv_columns"
         :key="index"

+ 1 - 1
src/views/InvoiceSales/returnTicket/components/create-return-ticket/capital-modal.vue

@@ -140,7 +140,7 @@ defineExpose({
       row-key="id"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" align="center" width="40" />
       <el-table-column
         v-for="(col, index) in inv_columns"
         :key="index"

+ 2 - 1
src/views/InvoiceSales/returnTicket/config/content.config.ts

@@ -9,7 +9,8 @@ import { invoiceTypeList } from "/@/utils/status";
 const columns = [
   // {
   //   type: "selection",
-  //   width: 55,
+  //   width: 40,
+  // align: "center",
   //   hide: ({ checkList }) => !checkList.includes("勾选列")
   // },
   // {

+ 3 - 2
src/views/InvoiceSales/sheetOrderPool/config/content.config.ts

@@ -15,7 +15,9 @@ import { inv_open_status, retrun_status } from "./search.config";
 const columns = [
   {
     type: "selection",
-    width: 40
+    width: 40,
+    align: "center",
+    fixed: "left"
   },
   // {
   //   label: "序号",
@@ -26,7 +28,6 @@ const columns = [
   {
     label: "业务订单编码",
     prop: "sequenceNo",
-    fixed: "left",
     width: 150
   },
   {

+ 2 - 2
src/views/interest/accountQuery/config/content.config.ts

@@ -13,8 +13,8 @@ import { ElTag } from "element-plus";
 const columns = [
   {
     type: "selection",
-    minWidth: 55,
-    align: "left",
+    width: 40,
+    align: "center"
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 2 - 1
src/views/interest/action/columns.tsx

@@ -9,7 +9,8 @@ export function useColumns() {
   const columns = ref([
     {
       type: "selection",
-      width: 55,
+      width: 40,
+    align: "center"
       hide: ({ checkList }) => !checkList.includes("勾选列")
     },
     {

+ 2 - 1
src/views/interest/company/config/content.config.ts

@@ -10,7 +10,8 @@ import { ElTag } from "element-plus";
 const columns = [
   {
     type: "selection",
-    width: 55,
+    width: 40,
+    align: "center"
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 2 - 1
src/views/interest/companyAccount-origin/columns.tsx

@@ -5,7 +5,8 @@ export function useColumns() {
   const columns = ref([
     {
       type: "selection",
-      width: 55,
+      width: 40,
+    align: "center"
       hide: ({ checkList }) => !checkList.includes("勾选列")
     },
     {

+ 1 - 1
src/views/interest/companyAccount-origin/components/company-modal.vue

@@ -104,7 +104,7 @@ defineExpose({
       row-key="id"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" align="center" width="40" />
       <el-table-column label="公司编码" prop="code" show-overflow-tooltip />
       <el-table-column label="公司名称" prop="name" show-overflow-tooltip />
       <el-table-column label="公司类型" prop="nature" show-overflow-tooltip />

+ 2 - 1
src/views/interest/companyAccount/columns.tsx

@@ -5,7 +5,8 @@ export function useColumns() {
   const columns = ref([
     {
       type: "selection",
-      width: 55,
+      width: 40,
+    align: "center"
       hide: ({ checkList }) => !checkList.includes("勾选列")
     },
     {

+ 1 - 1
src/views/interest/companyAccount/components/company-modal.vue

@@ -108,7 +108,7 @@ defineExpose({
       row-key="id"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" align="center" width="40" />
       <el-table-column
         label="公司编码"
         prop="companyNo"

+ 2 - 1
src/views/interest/role/columns.tsx

@@ -5,7 +5,8 @@ export function useColumns() {
   const columns = ref([
     {
       type: "selection",
-      width: 55,
+      width: 40,
+    align: "center"
       hide: ({ checkList }) => !checkList.includes("勾选列")
     },
     {

+ 2 - 1
src/views/interest/userGroup/config/content.config.ts

@@ -10,7 +10,8 @@ import { ElTag } from "element-plus";
 const columns = [
   {
     type: "selection",
-    width: 55,
+    width: 40,
+    align: "center"
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 2 - 2
src/views/netOrderEnter/netOrderEntry/config/content.config.ts

@@ -4,8 +4,8 @@ import { httpList } from "/@/api/netOrderEnter/netOrderEntry";
 const columns = [
   {
     type: "selection",
-    minWidth: 55,
-    align: "left",
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 2 - 1
src/views/parameter/clients/config/content.config.ts

@@ -6,7 +6,8 @@ import dayjs from "dayjs";
 const columns = [
   {
     type: "selection",
-    width: 55,
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 2 - 1
src/views/parameter/finance/config/content.config.ts

@@ -30,7 +30,8 @@ import { ElTag } from "element-plus";
 const columns = [
   {
     type: "selection",
-    width: 55,
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 2 - 3
src/views/parameter/invoiceheader/config/content.config.ts

@@ -6,12 +6,11 @@ import {
   httpUpdate
 } from "/@/api/parameter/invoiceheader";
 
-import dayjs from "dayjs";
-
 const columns = [
   {
     type: "selection",
-    width: 55,
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 2 - 1
src/views/parameter/setActionProcess/config/content.config.ts

@@ -14,7 +14,8 @@ import { actionTypes, operactionTypes } from "./configs";
 const columns = [
   {
     type: "selection",
-    width: 55,
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 2 - 1
src/views/parameter/setProcess/config/content.config.ts

@@ -15,7 +15,8 @@ import {
 const columns = [
   {
     type: "selection",
-    width: 55,
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 2 - 1
src/views/parameter/supplierPay/config/content.config.ts

@@ -6,7 +6,8 @@ import dayjs from "dayjs";
 const columns = [
   {
     type: "selection",
-    width: 55,
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 2 - 1
src/views/parameter/tagManage/config/content.config.ts

@@ -16,7 +16,8 @@ import { tag_type } from "./_options";
 const columns = [
   {
     type: "selection",
-    width: 55,
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 1 - 1
src/views/purchase/buyInvoiceQuery/components/choose-modal.vue

@@ -138,7 +138,7 @@ defineExpose({
       mb-2
       v-loading="loading"
     >
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" align="center" width="40" />
       <el-table-column
         v-for="(col, index) in columns"
         :key="index"

+ 2 - 1
src/views/purchase/buyInvoiceQuery/config/content.config.ts

@@ -17,7 +17,8 @@ import {
 const columns = [
   {
     type: "selection",
-    width: 55,
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 2 - 2
src/views/purchase/orderRecord/config/content.config.ts

@@ -8,8 +8,8 @@ import { hasAccountOptions } from "/@/utils/status";
 const columns = [
   {
     type: "selection",
-    minWidth: 55,
-    align: "left"
+    width: 40,
+    align: "center"
   },
   // {
   //   label: "序号",

+ 2 - 2
src/views/purchase/orderRecordQuery/config/content.config.ts

@@ -9,8 +9,8 @@ import { invStatusOptions, payStatusOptions } from "./_options";
 const columns = [
   {
     type: "selection",
-    minWidth: 55,
-    align: "left",
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 1 - 1
src/views/purchase/purchPay/component/choose-modal.vue

@@ -196,7 +196,7 @@ defineExpose({
       v-loading="loading"
       max-height="520px"
     >
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" align="center" width="40" />
       <el-table-column
         v-for="(col, index) in columns"
         :key="index"

+ 1 - 1
src/views/purchase/purchPayRelive/component/choose-modal.vue

@@ -174,7 +174,7 @@ defineExpose({
       v-loading="loading"
       max-height="520px"
     >
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" align="center" width="40" />
       <el-table-column
         v-for="(col, index) in columns"
         :key="index"

+ 2 - 2
src/views/purchase/purchPayRelive/config/content.config.ts

@@ -14,8 +14,8 @@ import { renderProp } from "/@/utils/columnRenderHelper";
 const columns = [
   // {
   //   type: "selection",
-  //   minWidth: 55,
-  //   align: "left",
+  //   width: 40,
+  // align: "center",
   //   hide: ({ checkList }) => !checkList.includes("勾选列")
   // },
   // {

+ 1 - 1
src/views/purchase/ticketReturn/components/choose-modal.vue

@@ -196,7 +196,7 @@ defineExpose({
       v-loading="loading"
       max-height="520px"
     >
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" align="center" width="40" />
       <el-table-column
         v-for="(col, index) in columns"
         :key="index"

+ 3 - 3
src/views/purchase/ticketReturn/components/invoice-form.vue

@@ -198,12 +198,12 @@ electronicsHiddens;
       ref="formRef"
       size="small"
     >
-      <el-form-item label="发票上传方式">
+      <!-- <el-form-item label="发票上传方式">
         <el-select v-model="invType" disabled>
           <el-option label="手工添加" value="1" />
-          <!-- <el-option label="ocr识别" value="2" /> -->
+          <el-option label="ocr识别" value="2" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
 
       <!-- 扫码枪识别 -->
       <el-form-item label="扫码枪" v-if="showScanInput">

+ 3 - 3
src/views/purchase/ticketReturn/components/invoice-table.vue

@@ -40,8 +40,8 @@ function handleDelete({ $index }) {
     <el-table-column label="发票号码" prop="invNumber" show-overflow-tooltip />
     <el-table-column label="发票代码" prop="invCode" show-overflow-tooltip />
     <el-table-column label="校验码" prop="checkNumber" show-overflow-tooltip />
-    <el-table-column label="发票名称" prop="invName" show-overflow-tooltip />
-    <el-table-column label="发票图片" prop="inv_img" show-overflow-tooltip>
+    <!-- <el-table-column label="发票名称" prop="invName" show-overflow-tooltip /> -->
+    <!-- <el-table-column label="发票图片" prop="inv_img" show-overflow-tooltip>
       <template #="{ row }">
         <el-image
           :src="row.inv_img"
@@ -50,7 +50,7 @@ function handleDelete({ $index }) {
           preview-teleported
         />
       </template>
-    </el-table-column>
+    </el-table-column> -->
     <el-table-column label="税前金额" prop="subtotal_amount" />
 
     <el-table-column label="开票日期" prop="open_time" show-overflow-tooltip />

+ 2 - 1
src/views/purchase/ticketReturn/config/content.config.ts

@@ -17,7 +17,8 @@ import { renderProp } from "/@/utils/columnRenderHelper";
 const columns = [
   {
     type: "selection",
-    width: 55,
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 17 - 19
src/views/purchase/ticketReturnRelive/components/choose-modal.vue

@@ -124,6 +124,20 @@ defineExpose({
   >
     <el-form size="small">
       <el-row :gutter="10">
+        <el-col :span="8">
+          <date-range prefix="申请" v-model="formData.timer" />
+        </el-col>
+
+        <el-col :span="8">
+          <date-range prefix="开票" v-model="formData.openTimer" />
+        </el-col>
+
+        <el-col :span="8">
+          <supplier-query
+            v-model="formData.supplierNo"
+            placeholder="卖出方公司名称"
+          />
+        </el-col>
         <el-col :span="8">
           <el-form-item>
             <el-input
@@ -140,22 +154,6 @@ defineExpose({
             </el-input>
           </el-form-item>
         </el-col>
-
-        <el-col :span="8">
-          <date-range prefix="申请" v-model="formData.timer" />
-        </el-col>
-
-        <el-col :span="8">
-          <date-range prefix="开票" v-model="formData.openTimer" />
-        </el-col>
-
-        <el-col :span="8">
-          <supplier-query
-            v-model="formData.supplierNo"
-            placeholder="卖出方公司名称"
-          />
-        </el-col>
-
         <el-col :span="6">
           <el-select
             style="width: 100%"
@@ -198,7 +196,7 @@ defineExpose({
       max-height="520px"
       v-loading="loading"
     >
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" width="40" align="center" />
       <el-table-column
         v-for="(col, index) in columns"
         :key="index"
@@ -206,12 +204,12 @@ defineExpose({
         show-overflow-tooltip
       >
         <template #="{ row }">
-          <el-tag v-if="col.prop === 'pay_status'">{{
+          <el-tag v-if="col.prop === 'pay_status'" size="small">{{
             payStatusOptions.find(p => p.value === String(row.pay_status))
               ?.label
           }}</el-tag>
 
-          <el-tag v-else-if="col.prop === 'checkApi'">{{
+          <el-tag v-else-if="col.prop === 'checkApi'" size="small">{{
             checkTypeOptions.find(p => p.value === String(row.checkApi))?.label
           }}</el-tag>
 

+ 1 - 1
src/views/purchase/ticketReturnRelive/config/_details.ts

@@ -40,7 +40,7 @@ export const columns = [
     minWidth: 140
   },
   {
-    label: "开票时间",
+    label: "开票日期",
     prop: "open_time",
     minWidth: 130
   },

+ 2 - 1
src/views/purchase/ticketReturnRelive/config/content.config.ts

@@ -13,7 +13,8 @@ import { renderProp } from "/@/utils/columnRenderHelper";
 const columns = [
   // {
   //   type: "selection",
-  //   width: 55,
+  //    width: 40,
+  // align: "center",
   //   hide: ({ checkList }) => !checkList.includes("勾选列")
   // },
   // {

+ 2 - 1
src/views/reportForm/reportApply/config/content.config.ts

@@ -7,7 +7,8 @@ import { ElTag } from "element-plus";
 const columns = [
   {
     type: "selection",
-    width: 55,
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 2 - 1
src/views/reportForm/reportRecord/config/content.config.ts

@@ -10,7 +10,8 @@ import { type_options, tag_type } from "./_options";
 const columns = [
   {
     type: "selection",
-    width: 55,
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 2 - 1
src/views/supplierManage/supplierAccoutManage/columns.tsx

@@ -5,7 +5,8 @@ export function useColumns() {
   const columns = ref([
     {
       type: "selection",
-      width: 55,
+      width: 40,
+      align: "center",
       hide: ({ checkList }) => !checkList.includes("勾选列")
     },
     {

+ 1 - 1
src/views/supplierManage/supplierAccoutManage/components/company-modal.vue

@@ -104,7 +104,7 @@ defineExpose({
       row-key="id"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" align="center" width="40" />
       <el-table-column
         label="公司编码"
         prop="code"

+ 2 - 2
src/views/supplierManage/supplierAccoutQuery/config/content.config.ts

@@ -14,8 +14,8 @@ import { ElTag } from "element-plus";
 const columns = [
   {
     type: "selection",
-    minWidth: 55,
-    align: "left",
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 2 - 1
src/views/supplierManage/supplierRole/columns.tsx

@@ -5,7 +5,8 @@ export function useColumns() {
   const columns = ref([
     {
       type: "selection",
-      width: 55,
+      width: 40,
+      align: "center",
       hide: ({ checkList }) => !checkList.includes("勾选列")
     },
     {

+ 2 - 1
src/views/supply/orderRecord/config/content.config.ts

@@ -8,7 +8,8 @@ import { orderRecordStatusOptions } from "/@/utils/status";
 const columns = [
   {
     type: "selection",
-    align: "left"
+    width: 40,
+    align: "center"
   },
   {
     label: "序号",

+ 2 - 2
src/views/supply/orderRecordQuery/config/content.config.ts

@@ -9,8 +9,8 @@ import { invStatusOptions, payStatusOptions } from "./_options";
 const columns = [
   {
     type: "selection",
-    minWidth: 55,
-    align: "left",
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 2 - 1
src/views/supply/porder/config/content.config.ts

@@ -12,7 +12,8 @@ import {
 const columns = [
   {
     type: "selection",
-    width: 55,
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 1 - 1
src/views/supply/purchPay/component/choose-modal.vue

@@ -197,7 +197,7 @@ defineExpose({
       v-loading="loading"
       max-height="520px"
     >
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" align="center" width="40" />
       <el-table-column
         v-for="(col, index) in columns"
         :key="index"

+ 2 - 2
src/views/supply/purchPay/config/content.config.ts

@@ -9,8 +9,8 @@ import { purchPayStatusOptions } from "/@/utils/status";
 const columns = [
   {
     type: "selection",
-    minWidth: 55,
-    align: "left",
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 1 - 1
src/views/supply/purchPayRelive/component/choose-modal.vue

@@ -174,7 +174,7 @@ defineExpose({
       v-loading="loading"
       max-height="520px"
     >
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" align="center" width="40" />
       <el-table-column
         v-for="(col, index) in columns"
         :key="index"

+ 2 - 2
src/views/supply/purchPayRelive/config/content.config.ts

@@ -9,8 +9,8 @@ import { purchPayReliveStatusOptions } from "/@/utils/status";
 const columns = [
   {
     type: "selection",
-    minWidth: 55,
-    align: "left",
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 1 - 1
src/views/supply/sellInvoiceQuery/components/choose-modal.vue

@@ -139,7 +139,7 @@ defineExpose({
       mb-2
       v-loading="loading"
     >
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" align="center" width="40" />
       <el-table-column
         v-for="(col, index) in columns"
         :key="index"

+ 2 - 1
src/views/supply/sellInvoiceQuery/config/content.config.ts

@@ -16,7 +16,8 @@ import {
 const columns = [
   {
     type: "selection",
-    width: 55,
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 1 - 1
src/views/supply/ticketReturn/components/choose-modal.vue

@@ -196,7 +196,7 @@ defineExpose({
       v-loading="loading"
       max-height="520px"
     >
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" align="center" width="40" />
       <el-table-column
         v-for="(col, index) in columns"
         :key="index"

+ 3 - 3
src/views/supply/ticketReturn/components/invoice-form.vue

@@ -198,12 +198,12 @@ electronicsHiddens;
       ref="formRef"
       size="small"
     >
-      <el-form-item label="发票上传方式">
+      <!-- <el-form-item label="发票上传方式">
         <el-select v-model="invType" disabled>
           <el-option label="手工添加" value="1" />
-          <!-- <el-option label="ocr识别" value="2" /> -->
+          <el-option label="ocr识别" value="2" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
 
       <!-- 扫码枪识别 -->
       <el-form-item label="扫码枪" v-if="showScanInput">

+ 2 - 1
src/views/supply/ticketReturn/config/content.config.ts

@@ -16,7 +16,8 @@ import {
 const columns = [
   {
     type: "selection",
-    width: 55,
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 1 - 1
src/views/supply/ticketReturnRelive/components/choose-modal.vue

@@ -198,7 +198,7 @@ defineExpose({
       max-height="520px"
       v-loading="loading"
     >
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" align="center" width="40" />
       <el-table-column
         v-for="(col, index) in columns"
         :key="index"

+ 2 - 1
src/views/supply/ticketReturnRelive/config/content.config.ts

@@ -10,7 +10,8 @@ import { ticketReturnReliveStatusOptions } from "/@/utils/status";
 const columns = [
   {
     type: "selection",
-    width: 55,
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 2 - 1
src/views/system/account/columns.tsx

@@ -5,7 +5,8 @@ export function useColumns() {
   const columns = ref([
     // {
     //   type: "selection",
-    //   width: 55,
+    //    width: 40,
+    // align: "center",
     //   hide: ({ checkList }) => !checkList.includes("勾选列")
     // },
     // {

+ 2 - 2
src/views/system/menuOperator/columns.tsx

@@ -6,8 +6,8 @@ export function useColumns() {
   const columns = ref([
     // {
     //   type: "selection",
-    //   minWidth: 55,
-    //   align: "left",
+    //   width: 40,
+    // align: "center",
     //   hide: ({ checkList }) => !checkList.includes("勾选列")
     // },
     // {

+ 2 - 2
src/views/system/setBtn/config/content.config.ts

@@ -13,8 +13,8 @@ import { ElTag } from "element-plus";
 const columns = [
   {
     type: "selection",
-    minWidth: 55,
-    align: "left",
+    width: 40,
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {