Browse Source

修改编码

xiaodai2017 1 year ago
parent
commit
4be6808e04
100 changed files with 719 additions and 662 deletions
  1. 1 1
      package.json
  2. 313 277
      pnpm-lock.yaml
  3. 3 3
      src/components/OrderRecordDetail/src/index.vue
  4. 2 2
      src/components/ReconciliationForm/src/_options.ts
  5. 5 5
      src/components/ReconciliationForm/src/cpns/batch-mode.vue
  6. 4 4
      src/components/ReconciliationForm/src/cpns/purchase-table.vue
  7. 9 9
      src/components/ReconciliationForm/src/cpns/single-mode.vue
  8. 1 1
      src/layout/components/system-notify.vue
  9. 2 2
      src/utils/details/_purchase/orderRecord.ts
  10. 6 6
      src/utils/details/_purchase/porder.ts
  11. 5 5
      src/utils/details/_purchase/purchPay.ts
  12. 3 3
      src/utils/details/_purchase/purchPayRelive.ts
  13. 3 3
      src/utils/details/_purchase/ticketReturn.ts
  14. 3 3
      src/utils/details/_purchase/ticketReturnRelive.ts
  15. 8 8
      src/utils/details/inv-open.ts
  16. 3 3
      src/utils/details/inv-return.ts
  17. 3 3
      src/utils/details/refund.ts
  18. 6 6
      src/utils/details/sale.ts
  19. 3 3
      src/utils/details/trade.ts
  20. 4 4
      src/utils/details/tragelog.ts
  21. 2 2
      src/views/InvoiceSaleSettings/_component/execl-files-upload/columns-config.ts
  22. 2 2
      src/views/InvoiceSaleSettings/_config/xls-template.ts
  23. 4 4
      src/views/InvoiceSaleSettings/commodityCost/config/configs.ts
  24. 5 5
      src/views/InvoiceSaleSettings/commodityCost/config/content.config.ts
  25. 1 1
      src/views/InvoiceSaleSettings/commodityCost/config/modal.config.ts
  26. 1 1
      src/views/InvoiceSaleSettings/commodityCost/config/search.config.ts
  27. 1 1
      src/views/InvoiceSaleSettings/commodityCost/index.vue
  28. 4 4
      src/views/InvoiceSaleSettings/consultingCost/config/configs.ts
  29. 5 5
      src/views/InvoiceSaleSettings/consultingCost/config/content.config.ts
  30. 1 1
      src/views/InvoiceSaleSettings/consultingCost/config/modal.config.ts
  31. 1 1
      src/views/InvoiceSaleSettings/consultingCost/config/search.config.ts
  32. 1 1
      src/views/InvoiceSaleSettings/consultingCost/index.vue
  33. 2 2
      src/views/InvoiceSales/capitalClaim/components/basic-claim/sales-modal.vue
  34. 9 9
      src/views/InvoiceSales/capitalClaim/components/execl-capital-files-upload/columns-config.ts
  35. 2 2
      src/views/InvoiceSales/capitalClaim/components/execl-files-upload/columns-config.ts
  36. 21 18
      src/views/InvoiceSales/capitalClaim/config/configs.ts
  37. 4 4
      src/views/InvoiceSales/capitalClaim/config/content.config.ts
  38. 3 3
      src/views/InvoiceSales/capitalClaim/config/modal.config.ts
  39. 1 1
      src/views/InvoiceSales/capitalClaim/config/search.config.ts
  40. 4 4
      src/views/InvoiceSales/capitalClaim/config/xls-template.ts
  41. 8 8
      src/views/InvoiceSales/capitalClaim/index.vue
  42. 8 8
      src/views/InvoiceSales/capitalPool/config/content.config.ts
  43. 1 1
      src/views/InvoiceSales/capitalPool/config/modal.config.ts
  44. 3 3
      src/views/InvoiceSales/capitalPool/config/search.config.ts
  45. 9 9
      src/views/InvoiceSales/invoiceApply/components/add-edit-form/add-edit-form.vue
  46. 20 19
      src/views/InvoiceSales/invoiceApply/components/add-edit-form/columns.tsx
  47. 2 2
      src/views/InvoiceSales/invoiceApply/components/add-edit-form/search.config.ts
  48. 1 1
      src/views/InvoiceSales/invoiceApply/components/execl-files-upload/columns-config.ts
  49. 2 2
      src/views/InvoiceSales/invoiceApply/components/post-modal.vue
  50. 7 7
      src/views/InvoiceSales/invoiceApply/config/_details.ts
  51. 5 5
      src/views/InvoiceSales/invoiceApply/config/content.config.ts
  52. 1 1
      src/views/InvoiceSales/invoiceApply/config/search.config.ts
  53. 1 1
      src/views/InvoiceSales/invoiceApply/config/xls-template.ts
  54. 5 5
      src/views/InvoiceSales/invoicePool/config/content.config.ts
  55. 1 1
      src/views/InvoiceSales/invoicePool/config/modal.config.ts
  56. 1 1
      src/views/InvoiceSales/invoicePool/config/search.config.ts
  57. 3 3
      src/views/InvoiceSales/invoiceQuery/columns.tsx
  58. 5 5
      src/views/InvoiceSales/invoiceQuery/components/sale-config/content.config.ts
  59. 1 1
      src/views/InvoiceSales/invoiceQuery/components/sale-config/modal.config.ts
  60. 1 1
      src/views/InvoiceSales/invoiceQuery/components/sale-config/search.config.ts
  61. 8 7
      src/views/InvoiceSales/redInk/config/content.config.ts
  62. 2 2
      src/views/InvoiceSales/redInk/config/search.config.ts
  63. 2 2
      src/views/InvoiceSales/refund/components/capital-modal.vue
  64. 2 2
      src/views/InvoiceSales/refund/components/create-refund/capital-modal.vue
  65. 5 5
      src/views/InvoiceSales/refund/config/_details.ts
  66. 19 16
      src/views/InvoiceSales/refund/config/configs.ts
  67. 16 15
      src/views/InvoiceSales/refund/config/content.config.ts
  68. 4 4
      src/views/InvoiceSales/refund/config/search.config.ts
  69. 3 3
      src/views/InvoiceSales/returnTicket/components/approval-pending.vue
  70. 3 3
      src/views/InvoiceSales/returnTicket/components/approval-process/approval-pending.vue
  71. 1 1
      src/views/InvoiceSales/returnTicket/components/capital-modal.vue
  72. 2 2
      src/views/InvoiceSales/returnTicket/components/create-return-ticket/capital-modal.vue
  73. 4 4
      src/views/InvoiceSales/returnTicket/config/_details.ts
  74. 3 3
      src/views/InvoiceSales/returnTicket/config/configs.ts
  75. 9 9
      src/views/InvoiceSales/returnTicket/config/content.config.ts
  76. 2 2
      src/views/InvoiceSales/returnTicket/config/modal.config.ts
  77. 2 2
      src/views/InvoiceSales/returnTicket/config/search.config.ts
  78. 1 1
      src/views/InvoiceSales/sheetOrderPool/components/sheet-modal.vue
  79. 16 16
      src/views/InvoiceSales/sheetOrderPool/config/content.config.ts
  80. 4 4
      src/views/InvoiceSales/sheetOrderPool/config/frontColumns.ts
  81. 1 1
      src/views/InvoiceSales/sheetOrderPool/config/modal.config.ts
  82. 2 2
      src/views/InvoiceSales/sheetOrderPool/config/search.config.ts
  83. 1 1
      src/views/InvoiceSales/sheetOrderPool/detail-dialog.vue
  84. 2 2
      src/views/interest/accountQuery/config/content.config.ts
  85. 1 1
      src/views/interest/action/columns.tsx
  86. 1 1
      src/views/interest/companyAccount-origin/addEdit.vue
  87. 1 1
      src/views/interest/companyAccount-origin/components/company-modal.vue
  88. 9 3
      src/views/interest/companyAccount/addEdit.vue
  89. 1 1
      src/views/interest/companyAccount/components/company-modal.vue
  90. 1 1
      src/views/netOrderEnter/netOrderEntry/config/_options.ts
  91. 16 16
      src/views/netOrderEnter/netOrderEntry/config/content.config.ts
  92. 2 2
      src/views/netOrderEnter/netOrderEntry/config/search.config.ts
  93. 1 1
      src/views/netOrderEnter/netOrderEntry/index.vue
  94. 4 4
      src/views/netOrderEnter/netOrderEntry/qrd-modal.vue
  95. 2 1
      src/views/parameter/clients/config/content.config.ts
  96. 1 1
      src/views/parameter/clients/config/modal.config.ts
  97. 15 10
      src/views/parameter/finance/config/content.config.ts
  98. 1 1
      src/views/parameter/finance/config/search.config.ts
  99. 1 1
      src/views/parameter/supplierPay/config/content.config.ts
  100. 2 2
      src/views/parameter/tagManage/config/content.config.ts

+ 1 - 1
package.json

@@ -80,7 +80,7 @@
     "vue-types": "^4.1.1",
     "vue-virtual-scroller": "^2.0.0-alpha.1",
     "vuedraggable": "4.1.0",
-    "vxe-table": "^4.2.3",
+    "vxe-table": "4.2.3",
     "xe-utils": "^3.5.4",
     "xgplayer": "^2.31.6",
     "xlsx": "^0.18.5"

File diff suppressed because it is too large
+ 313 - 277
pnpm-lock.yaml


+ 3 - 3
src/components/OrderRecordDetail/src/index.vue

@@ -85,7 +85,7 @@ defineExpose({
     :data="(orderRecordDetail as any).cgdlist || []"
     max-height="400"
   >
-    <el-table-column label="采购单编" prop="sequenceNo" width="150" />
+    <el-table-column label="采购单编" prop="sequenceNo" width="150" />
     <el-table-column label="采购单信息">
       <el-table-column
         label="供货商"
@@ -134,9 +134,9 @@ defineExpose({
     </el-table-column>
     <el-table-column label="商品信息">
       <el-table-column
-        label="商品编"
+        label="商品编"
         prop="goodNo"
-        width="140"
+        width="150"
         show-overflow-tooltip
       />
       <el-table-column

+ 2 - 2
src/components/ReconciliationForm/src/_options.ts

@@ -1,6 +1,6 @@
 export const selectOptions = [
-  { value: "sequenceNo", label: "采购单编" },
-  { value: "goodNo", label: "商品编" },
+  { value: "sequenceNo", label: "采购单编" },
+  { value: "goodNo", label: "商品编" },
   { value: "goodName", label: "商品名称" },
   { value: "cgder", label: "采购员名称" }
 ];

+ 5 - 5
src/components/ReconciliationForm/src/cpns/batch-mode.vue

@@ -75,7 +75,7 @@ function onSubmit() {
     :rows="4"
     v-model="sourceText"
     style="margin-bottom: 10px"
-    placeholder="输入采购单编(小于100条),系统支持的分割符为逗号(,)、句号(.)、分号(;)、顿号(、),回车后开始解析。"
+    placeholder="输入采购单编(小于100条),系统支持的分割符为逗号(,)、句号(.)、分号(;)、顿号(、),回车后开始解析。"
     type="textarea"
     @keydown.enter="handleEnter"
   />
@@ -87,8 +87,8 @@ function onSubmit() {
     max-height="580px"
   >
     <el-table-column type="index" width="50" label="序号" />
-    <ElTableColumn label="采购单编" prop="sequenceNo" width="150" />
-    <ElTableColumn label="采购主单编" prop="cxCode" width="150" />
+    <ElTableColumn label="采购单编" prop="sequenceNo" width="150" />
+    <ElTableColumn label="采购主单编" prop="cxCode" width="150" />
     <ElTableColumn label="采购单信息">
       <ElTableColumn
         label="供货商"
@@ -140,9 +140,9 @@ function onSubmit() {
     </ElTableColumn>
     <ElTableColumn label="商品信息">
       <ElTableColumn
-        label="商品编"
+        label="商品编"
         prop="goodNo"
-        width="140"
+        width="150"
         show-overflow-tooltip
       />
       <ElTableColumn

+ 4 - 4
src/components/ReconciliationForm/src/cpns/purchase-table.vue

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

+ 9 - 9
src/components/ReconciliationForm/src/cpns/single-mode.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ElTable } from "element-plus";
-import { reactive, ref, unref ,onMounted } from "vue";
+import { reactive, ref, unref, onMounted } from "vue";
 import { useAsync } from "/@/hooks/core/useAsync";
 import { httpCgdList } from "/@/api/purchase/orderRecord";
 import { selectOptions as _selectOptions } from "../_options";
@@ -125,7 +125,7 @@ onMounted(() => {
     <ElCol :span="6">
       <ElInput
         size="small"
-        placeholder="采购单编"
+        placeholder="采购单编"
         v-model="formData.sequenceNo"
       />
     </ElCol>
@@ -133,7 +133,7 @@ onMounted(() => {
     <ElCol :span="6">
       <ElInput
         size="small"
-        placeholder="采购主单编"
+        placeholder="采购主单编"
         v-model="formData.cxCode"
       />
     </ElCol>
@@ -141,14 +141,14 @@ onMounted(() => {
     <ElCol :span="6">
       <ElInput
         size="small"
-        placeholder="确认单编号"
+        placeholder="销售订单编码"
         v-model="formData.qrdCode"
       />
     </ElCol>
   </ElRow>
   <ElRow :gutter="5" mb-2>
     <ElCol :span="6">
-      <ElInput size="small" placeholder="商品编" v-model="formData.goodNo" />
+      <ElInput size="small" placeholder="商品编" v-model="formData.goodNo" />
     </ElCol>
 
     <ElCol :span="6">
@@ -232,8 +232,8 @@ onMounted(() => {
     max-height="580px"
   >
     <ElTableColumn type="selection" width="55" />
-    <ElTableColumn label="采购单编" prop="sequenceNo" width="150" />
-    <ElTableColumn label="采购主单编" prop="cxCode" width="150" />
+    <ElTableColumn label="采购单编" prop="sequenceNo" width="150" />
+    <ElTableColumn label="采购主单编" prop="cxCode" width="150" />
     <ElTableColumn label="采购单信息">
       <ElTableColumn
         label="供货商"
@@ -285,9 +285,9 @@ onMounted(() => {
     </ElTableColumn>
     <ElTableColumn label="商品信息">
       <ElTableColumn
-        label="商品编"
+        label="商品编"
         prop="goodNo"
-        width="140"
+        width="150"
         show-overflow-tooltip
       />
       <ElTableColumn

+ 1 - 1
src/layout/components/system-notify.vue

@@ -76,7 +76,7 @@ defineExpose({
     <div class="my-[20px] p-[10px]">
       <ElRow>
         <ElCol :span="12" style="display: flex">
-          <p class="font-bold mr-5 mb-5">版本编:</p>
+          <p class="font-bold mr-5 mb-5">版本编:</p>
           <p>{{ systemInfo.version }}</p>
         </ElCol>
         <ElCol :span="12" style="display: flex">

+ 2 - 2
src/utils/details/_purchase/orderRecord.ts

@@ -37,14 +37,14 @@ export const orderRecordColumns: DescriptionColumns = [
     label: "卖出方公司",
     span: 12,
     render: (supplierName, { supplierNo }) =>
-      createTooltip(supplierName, "卖出方公司编 : " + supplierNo, 270)
+      createTooltip(supplierName, "卖出方公司编 : " + supplierNo, 270)
   },
   {
     field: "companyName",
     label: "买入方公司",
     span: 12,
     render: (companyName, { companyNo }) =>
-      createTooltip(companyName, "买入方公司编 : " + companyNo, 270)
+      createTooltip(companyName, "买入方公司编 : " + companyNo, 270)
   },
   {
     field: "pay_status",

+ 6 - 6
src/utils/details/_purchase/porder.ts

@@ -106,12 +106,12 @@ export const PAY_STATUS = [
 //采购单不包含商品的详情
 export const purchaseOrderNotIncludeProduceColumns: DescriptionColumns = [
   {
-    label: "采购单编",
+    label: "采购单编",
     field: "sequenceNo",
     span: 6
   },
   {
-    label: "确认单编号",
+    label: "销售订单编码",
     field: "qrdCode",
     span: 6
   },
@@ -133,21 +133,21 @@ export const purchaseOrderNotIncludeProduceColumns: DescriptionColumns = [
     field: "companyName",
     span: 12,
     render: (companyName, { companyNo }) =>
-      createTooltip(companyName, "业务企业公司编 : " + companyNo, 300)
+      createTooltip(companyName, "业务企业公司编 : " + companyNo, 300)
   },
   {
     label: "卖出方公司",
     span: 12,
     field: "supplierName",
     render: (supplierName, { supplierNo }) =>
-      createTooltip(supplierName, "供应商编 : " + supplierNo, 300)
+      createTooltip(supplierName, "供应商编 : " + supplierNo, 300)
   },
   {
     label: "商品名称",
     field: "goodName",
     span: 24,
     render: (goodName, { goodNo }) =>
-      createTooltip(goodName, "商品编 : " + goodNo, 260)
+      createTooltip(goodName, "商品编 : " + goodNo, 260)
   },
   {
     label: "对账状态",
@@ -203,7 +203,7 @@ export const purchaseOrderNotIncludeProduceColumns: DescriptionColumns = [
     field: "thNum"
   },
   {
-    label: "备库编",
+    label: "备库编",
     field: "bkCode"
   },
   {

+ 5 - 5
src/utils/details/_purchase/purchPay.ts

@@ -11,7 +11,7 @@ export const purchpayColumns: DescriptionColumns = [
   {
     field: "dzNo",
     span: 6,
-    label: "对账付款编"
+    label: "对账付款编"
   },
   {
     field: "status",
@@ -29,7 +29,7 @@ export const purchpayColumns: DescriptionColumns = [
   {
     field: "payNo",
     span: 7,
-    label: "对账申请编"
+    label: "对账申请编"
   },
 
   {
@@ -78,13 +78,13 @@ export const purchpayColumns: DescriptionColumns = [
 
 export const columns = [
   {
-    label: "对账编",
+    label: "对账编",
     prop: "payNo",
     minWidth: 160,
     align: "left"
   },
   {
-    label: "供应商编",
+    label: "供应商编",
     prop: "supplierNo",
     minWidth: 150,
     align: "left"
@@ -96,7 +96,7 @@ export const columns = [
     align: "left"
   },
   {
-    label: "业务公司编",
+    label: "业务公司编",
     prop: "companyNo",
     minWidth: 150
   },

+ 3 - 3
src/utils/details/_purchase/purchPayRelive.ts

@@ -14,7 +14,7 @@ import {
 export const purchpayReliveColumns: DescriptionColumns = [
   {
     field: "returnCode",
-    label: "付款解除编"
+    label: "付款解除编"
   },
   {
     field: "status",
@@ -73,7 +73,7 @@ export const purchpayColumns: DescriptionColumns = [
   {
     field: "dzNo",
     span: 6,
-    label: "对账付款编"
+    label: "对账付款编"
   },
   {
     field: "status",
@@ -91,7 +91,7 @@ export const purchpayColumns: DescriptionColumns = [
   {
     field: "payNo",
     span: 7,
-    label: "对账申请编"
+    label: "对账申请编"
   },
 
   {

+ 3 - 3
src/utils/details/_purchase/ticketReturn.ts

@@ -17,7 +17,7 @@ import {
 export const ticketReturnColumns: DescriptionColumns = [
   {
     field: "hpNo",
-    label: "对账回票编"
+    label: "对账回票编"
   },
   {
     field: "status",
@@ -42,7 +42,7 @@ export const ticketReturnColumns: DescriptionColumns = [
     span: 12,
     label: "卖方公司名称",
     render(supplierName, { supplierNo }) {
-      return createTooltip(supplierName, "卖方公司编 : " + supplierNo, 360);
+      return createTooltip(supplierName, "卖方公司编 : " + supplierNo, 360);
     }
   },
   {
@@ -50,7 +50,7 @@ export const ticketReturnColumns: DescriptionColumns = [
     label: "买方公司名称",
     span: 12,
     render(companyName, { companyNo }) {
-      return createTooltip(companyName, "买方公司编 : " + companyNo, 360);
+      return createTooltip(companyName, "买方公司编 : " + companyNo, 360);
     }
   },
   {

+ 3 - 3
src/utils/details/_purchase/ticketReturnRelive.ts

@@ -11,7 +11,7 @@ import { ticketReturnReliveStatusOptions } from "/@/utils/status";
 export const ticketReturnReliveColumns: DescriptionColumns = [
   {
     field: "returnCode",
-    label: "退票编"
+    label: "退票编"
   },
   {
     field: "apply_name",
@@ -21,14 +21,14 @@ export const ticketReturnReliveColumns: DescriptionColumns = [
     field: "supplierName",
     label: "卖方公司名称",
     render(supplierName, { supplierNo }) {
-      return createTooltip(supplierName, "卖方公司编 : " + supplierNo, 360);
+      return createTooltip(supplierName, "卖方公司编 : " + supplierNo, 360);
     }
   },
   {
     field: "companyName",
     label: "买方公司名称",
     render(companyName, { companyNo }) {
-      return createTooltip(companyName, "买方公司编 : " + companyNo, 360);
+      return createTooltip(companyName, "买方公司编 : " + companyNo, 360);
     }
   },
   {

+ 8 - 8
src/utils/details/inv-open.ts

@@ -41,7 +41,7 @@ export const INV_OPEN_STATUS = [
 export const INV_OPEN_COLUMNS: DescriptionColumns = [
   {
     field: "invNo",
-    label: "发票编",
+    label: "发票编",
     labelWidth: "100px"
   },
 
@@ -145,10 +145,10 @@ export const INV_OPEN_COLUMNS: DescriptionColumns = [
 
   {
     field: "inv_company",
-    label: "销售方公司编",
+    label: "销售方公司编",
     span: 12,
     render: (inv_company, { inv_out }) =>
-      createTooltip(inv_company, "销售方公司编 : " + inv_out, 300)
+      createTooltip(inv_company, "销售方公司编 : " + inv_out, 300)
   },
   {
     field: "email",
@@ -156,7 +156,7 @@ export const INV_OPEN_COLUMNS: DescriptionColumns = [
   },
   {
     field: "post_code",
-    label: "快递编",
+    label: "快递编",
     render: (post_code, { post_company }) =>
       createTooltip(post_code, "快递公司 : " + post_company, 300)
   },
@@ -247,7 +247,7 @@ export const INV_OPEN_COLUMNS: DescriptionColumns = [
           default: () => [
             h(ElTableColumn, {
               prop: "sequenceNo",
-              label: "订单编",
+              label: "订单编",
               width: "150px",
               fixed: "left",
               showOverflowTooltip: true
@@ -334,7 +334,7 @@ export const INV_OPEN_COLUMNS: DescriptionColumns = [
 export const ORDER_COLUMNS = [
   {
     field: "invNo",
-    label: "发票编"
+    label: "发票编"
   },
   {
     field: "inv_value",
@@ -344,7 +344,7 @@ export const ORDER_COLUMNS = [
     field: "buyer_title",
     label: "开票公司",
     render: (buyer_title, { inv_out }) =>
-      createTooltip(buyer_title, "开票公司编 : " + inv_out, 360)
+      createTooltip(buyer_title, "开票公司编 : " + inv_out, 360)
   },
   // {
   //   field: "buyer_title",
@@ -430,7 +430,7 @@ export const ORDER_COLUMNS = [
   },
   {
     field: "post_code",
-    label: "快递编"
+    label: "快递编"
   },
   {
     field: "post_company",

+ 3 - 3
src/utils/details/inv-return.ts

@@ -81,17 +81,17 @@ const RED_REASON = [
 export const INV_RETURN_COLUMNS: DescriptionColumns = [
   {
     field: "returnCode",
-    label: "退票编",
+    label: "退票编",
     span: 2
   },
   {
     field: "invNo",
-    label: "开票申请编",
+    label: "开票申请编",
     span: 2
   },
   {
     field: "post_code",
-    label: "物流编",
+    label: "物流编",
     span: 2
   },
   {

+ 3 - 3
src/utils/details/refund.ts

@@ -36,17 +36,17 @@ export const RETRUN_STATUS = [
 
 export const REFOUD_COLUMNS: DescriptionColumns = [
   {
-    label: "退款编",
+    label: "退款编",
     span: 2,
     field: "returnCode"
   },
   {
-    label: "资金认领编",
+    label: "资金认领编",
     span: 2,
     field: "logNo"
   },
   {
-    label: "资金编",
+    label: "资金编",
     span: 2,
     field: "tradNo"
   },

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

@@ -84,7 +84,7 @@ const INV_STATUS = [
 export const ORDER_COLUMNS: DescriptionColumns = [
   {
     field: "sequenceNo",
-    label: "销售单编",
+    label: "销售单编",
     span: 6
   },
   {
@@ -120,19 +120,19 @@ export const ORDER_COLUMNS: DescriptionColumns = [
     label: "业务公司",
     span: 12,
     render: (company, { companyNo }) =>
-      createTooltip(company, "业务公司编 : " + companyNo, 270)
+      createTooltip(company, "业务公司编 : " + companyNo, 270)
   },
   {
     field: "customerName",
     label: "客户公司",
     span: 12,
     render: (customer, { customerNo }) =>
-      createTooltip(customer, "客户公司编 : " + customerNo, 270)
+      createTooltip(customer, "客户公司编 : " + customerNo, 270)
   },
   {
     field: "poCode",
     span: 24,
-    label: "平台订单编"
+    label: "平台订单编"
   },
   {
     field: "sendType",
@@ -270,7 +270,7 @@ export const ORDER_COLUMNS: DescriptionColumns = [
 export const GOOD_COLUMNS: DescriptionColumns = [
   {
     field: "goodNo",
-    label: "商品编",
+    label: "商品编",
     span: 6
   },
   {
@@ -297,7 +297,7 @@ export const GOOD_COLUMNS: DescriptionColumns = [
     label: "商品名称",
     span: 24,
     render: (goodName, { goodNo }) =>
-      createTooltip(goodName, "商品编 : " + goodNo, 270)
+      createTooltip(goodName, "商品编 : " + goodNo, 270)
   },
 
   {

+ 3 - 3
src/utils/details/trade.ts

@@ -6,18 +6,18 @@ import { DescriptionColumns } from "/@/components/BasicDescriptions";
 export const TRADE_COLUMNS: DescriptionColumns = [
   {
     field: "tradNo",
-    label: "编",
+    label: "编",
     span: 2
   },
   {
     field: "tradNo",
     span: 2,
-    label: "客户编"
+    label: "客户编"
   },
   {
     field: "companyNo",
     span: 2,
-    label: "业务编"
+    label: "业务编"
   },
   {
     field: "trade_bank",

+ 4 - 4
src/utils/details/tragelog.ts

@@ -33,7 +33,7 @@ export const CAPITAL_STATUS = [
 export const CAPITAL_COLUMNS: DescriptionColumns = [
   {
     field: "logNo",
-    label: "编",
+    label: "编",
     width: "180px",
     span: 6
   },
@@ -68,19 +68,19 @@ export const CAPITAL_COLUMNS: DescriptionColumns = [
 export const tableColumns = [
   {
     field: "tradNo",
-    label: "资金编",
+    label: "资金编",
     width: "180px",
     span: 2
   },
   {
     field: "logNo",
-    label: "认领编",
+    label: "认领编",
     width: "180px",
     span: 2
   },
   {
     field: "orderCode",
-    label: "确认单编号",
+    label: "销售订单编码",
     width: "180px",
     span: 2
   },

+ 2 - 2
src/views/InvoiceSaleSettings/_component/execl-files-upload/columns-config.ts

@@ -1,7 +1,7 @@
 const initheaders = [
-  "商品编",
+  "商品编",
   "税率",
-  "类目编",
+  "类目编",
   "开票商品名称",
   "税率标识",
   "是否有优惠政策",

+ 2 - 2
src/views/InvoiceSaleSettings/_config/xls-template.ts

@@ -1,7 +1,7 @@
 export const template = {
-  商品编: "",
+  商品编: "",
   税率: "",
-  类目编: "",
+  类目编: "",
   开票商品名称: "",
   税率标识: "",
   是否有优惠政策: "",

+ 4 - 4
src/views/InvoiceSaleSettings/commodityCost/config/configs.ts

@@ -40,7 +40,7 @@ export const good_detail_columns = [
   {
     field: "spuCode",
     span: 6,
-    label: "商品编"
+    label: "商品编"
   },
   {
     field: "good_name",
@@ -66,14 +66,14 @@ export const good_detail_columns = [
     field: "companyName",
     label: "业务公司名称",
     render: (companyName, { companyNo }) =>
-      createTooltip(companyName, "业务公司编 : " + companyNo, 270),
+      createTooltip(companyName, "业务公司编 : " + companyNo, 270),
     span: 12
   },
   {
     field: "supplierName",
     label: "供应商名称",
     render: (supplierName, { supplierNo }) =>
-      createTooltip(supplierName, "供应商编 : " + supplierNo, 270),
+      createTooltip(supplierName, "供应商编 : " + supplierNo, 270),
     span: 12
   },
 
@@ -102,7 +102,7 @@ export const good_detail_columns = [
   },
   {
     field: "inv_cat_code",
-    label: "类目编"
+    label: "类目编"
   },
   {
     field: "inv_tax",

+ 5 - 5
src/views/InvoiceSaleSettings/commodityCost/config/content.config.ts

@@ -28,12 +28,12 @@ const columns = [
     label: "商品编码",
     prop: "spuCode",
     fixed: "left",
-    width: 185
+    width: 150
   },
   {
-    label: "卖方公司编",
+    label: "卖方公司编",
     prop: "supplierNo",
-    width: 175
+    width: 150
   },
   {
     label: "卖方公司名称",
@@ -41,9 +41,9 @@ const columns = [
     width: 175
   },
   {
-    label: "买方公司编",
+    label: "买方公司编",
     prop: "companyNo",
-    width: 175
+    width: 150
   },
   {
     label: "买方公司名称",

+ 1 - 1
src/views/InvoiceSaleSettings/commodityCost/config/modal.config.ts

@@ -7,7 +7,7 @@ const modalConfig: ModalConfig = {
     {
       field: "companyNo",
       type: "input",
-      label: "客户编",
+      label: "客户编",
       labelWidth: "120px"
     },
     {

+ 1 - 1
src/views/InvoiceSaleSettings/commodityCost/config/search.config.ts

@@ -11,7 +11,7 @@ const searchFormConfig: FormConfig = {
         inputGroupOptions: [
           { value: "spuCode", label: "商品编码" },
           { value: "good_name", label: "商品名称" },
-          { value: "supplierNo", label: "卖方公司编" },
+          { value: "supplierNo", label: "卖方公司编" },
           // { value: "supplierName", label: "卖方公司名称" },
           { value: "creater", label: "创建人" }
         ]

+ 1 - 1
src/views/InvoiceSaleSettings/commodityCost/index.vue

@@ -44,7 +44,7 @@ function onDownloadTemplate() {
   const data: any[] = [];
   selects.value.forEach(({ spuCode, good_name }) => {
     const _template = { ...template };
-    _template["商品编"] = spuCode;
+    _template["商品编"] = spuCode;
     _template["开票商品名称"] = good_name;
     data.push(_template);
   });

+ 4 - 4
src/views/InvoiceSaleSettings/consultingCost/config/configs.ts

@@ -44,7 +44,7 @@ export const good_detail_columns = [
   {
     field: "spuCode",
     span: 6,
-    label: "商品编"
+    label: "商品编"
   },
   {
     field: "good_name",
@@ -70,14 +70,14 @@ export const good_detail_columns = [
     field: "companyName",
     label: "业务公司名称",
     render: (companyName, { companyNo }) =>
-      createTooltip(companyName, "业务公司编 : " + companyNo, 270),
+      createTooltip(companyName, "业务公司编 : " + companyNo, 270),
     span: 12
   },
   {
     field: "supplierName",
     label: "供应商名称",
     render: (supplierName, { supplierNo }) =>
-      createTooltip(supplierName, "供应商编 : " + supplierNo, 270),
+      createTooltip(supplierName, "供应商编 : " + supplierNo, 270),
     span: 12
   },
 
@@ -106,7 +106,7 @@ export const good_detail_columns = [
   },
   {
     field: "inv_cat_code",
-    label: "类目编"
+    label: "类目编"
   },
   {
     field: "inv_tax",

+ 5 - 5
src/views/InvoiceSaleSettings/consultingCost/config/content.config.ts

@@ -27,12 +27,12 @@ const columns = [
   {
     label: "商品编码",
     prop: "spuCode",
-    width: 185
+    width: 150
   },
   {
-    label: "卖方公司编",
+    label: "卖方公司编",
     prop: "supplierNo",
-    width: 175
+    width: 150
   },
   {
     label: "卖方公司名称",
@@ -40,9 +40,9 @@ const columns = [
     width: 175
   },
   {
-    label: "买方公司编",
+    label: "买方公司编",
     prop: "companyNo",
-    width: 175
+    width: 150
   },
   {
     label: "买方公司名称",

+ 1 - 1
src/views/InvoiceSaleSettings/consultingCost/config/modal.config.ts

@@ -7,7 +7,7 @@ const modalConfig: ModalConfig = {
     {
       field: "companyNo",
       type: "input",
-      label: "客户编",
+      label: "客户编",
       labelWidth: "120px"
     },
     {

+ 1 - 1
src/views/InvoiceSaleSettings/consultingCost/config/search.config.ts

@@ -11,7 +11,7 @@ const searchFormConfig: FormConfig = {
         inputGroupOptions: [
           { value: "spuCode", label: "商品编码" },
           { value: "good_name", label: "商品名称" },
-          { value: "supplierNo", label: "卖方公司编" },
+          { value: "supplierNo", label: "卖方公司编" },
           // { value: "supplierName", label: "卖方公司名称" },
           { value: "creater", label: "创建人" }
         ]

+ 1 - 1
src/views/InvoiceSaleSettings/consultingCost/index.vue

@@ -44,7 +44,7 @@ function onDownloadTemplate() {
   const data: any[] = [];
   selects.value.forEach(({ spuCode, good_name }) => {
     const _template = { ...template };
-    _template["商品编"] = spuCode;
+    _template["商品编"] = spuCode;
     _template["开票商品名称"] = good_name;
     data.push(_template);
   });

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

@@ -127,7 +127,7 @@ onMounted(() => reuquestSalelist());
       <el-col :span="8">
         <el-input
           v-model="data.sequenceNo"
-          placeholder="订单编"
+          placeholder="订单编"
           size="small"
         />
       </el-col>
@@ -175,7 +175,7 @@ onMounted(() => reuquestSalelist());
     <el-row :gutter="10">
       <el-col :span="8">
         <el-input
-          placeholder="销售订单主编"
+          placeholder="销售订单主编"
           size="small"
           v-model="data.cxCode"
         />

+ 9 - 9
src/views/InvoiceSales/capitalClaim/components/execl-capital-files-upload/columns-config.ts

@@ -1,15 +1,15 @@
 const initheaders = [
-  "收款方公司编",
+  "收款方公司编",
   "收款方公司名称",
-  "资金编",
-  "订单编",
+  "资金编",
+  "订单编",
   "认领资金"
 ];
 
 export const requireHeaders = [
-  "收款方公司编",
-  "资金编",
-  "订单编",
+  "收款方公司编",
+  "资金编",
+  "订单编",
   "认领资金"
 ];
 
@@ -30,7 +30,7 @@ const columns = () => {
     },
     {
       prop: "companyNo",
-      label: "收款方公司编"
+      label: "收款方公司编"
     },
     {
       prop: "companyName",
@@ -38,11 +38,11 @@ const columns = () => {
     },
     {
       prop: "tradNo",
-      label: "资金编"
+      label: "资金编"
     },
     {
       prop: "orderCode",
-      label: "订单编"
+      label: "订单编"
     },
     {
       prop: "trad_fee",

+ 2 - 2
src/views/InvoiceSales/capitalClaim/components/execl-files-upload/columns-config.ts

@@ -1,5 +1,5 @@
 const initheaders = [
-  "收款方公司编",
+  "收款方公司编",
   "收款方公司名称",
   "收款方账户",
   "交易时间",
@@ -13,7 +13,7 @@ const initheaders = [
 ];
 
 export const requireHeaders = [
-  "收款方公司编",
+  "收款方公司编",
   "收款方账户",
   "交易时间",
   "收入金额",

+ 21 - 18
src/views/InvoiceSales/capitalClaim/config/configs.ts

@@ -2,82 +2,85 @@ import { ElTag } from "element-plus";
 import { h } from "vue";
 export const order_columns = [
   {
-    label: "业务订单编",
+    label: "业务订单编",
     prop: "sequenceNo",
-    width: 180,
+    width: 150,
     align: "left",
     fixed: "left"
   },
   {
-    label: "销售订单主编",
+    label: "销售订单主编",
     prop: "cxCode",
-    width: 180,
+    width: 150,
     align: "left"
   },
   {
     label: "客户名称",
     prop: "customerName",
-    minWidth: 180,
+    minWidth: 150,
     align: "left"
   },
   {
     label: "订单总金额",
     prop: "totalPrice",
-    minWidth: 180,
+    width: 110,
     align: "left"
   },
   {
     prop: "apay_fee",
+    width: 110,
     label: "已付款"
   },
   {
     prop: "pay_fee",
+    width: 110,
     label: "付款中"
   },
   {
     prop: "wpay_fee",
+    width: 110,
     label: "未付款"
   },
   {
     label: "商品名称",
     prop: "goodName",
-    minWidth: 180,
+    minWidth: 150,
     align: "left"
   },
   {
     label: "平台名称",
     prop: "platName",
-    minWidth: 180,
+    width: 120,
     align: "left"
   },
   {
     label: "销售员",
     prop: "saler",
-    minWidth: 180,
+    width: 90,
     align: "left"
   },
   {
     label: "购买方公司",
     prop: "customerName",
-    minWidth: 180,
+    minWidth: 150,
     align: "left"
   },
   {
     label: "销售方公司",
     prop: "companyName",
-    minWidth: 180,
+    minWidth: 150,
     align: "left"
   },
   {
     label: "此次认领",
     prop: "cchx",
-    minWidth: 180,
+    width: 110,
     align: "left"
   },
   {
     label: "交易时间",
     prop: "addtime",
-    minWidth: 180,
+    width: 140,
     align: "left"
   }
 ];
@@ -151,7 +154,7 @@ export const description_columns_out = [
 
 export const public_columns = [
   {
-    label: "资金编",
+    label: "资金编",
     span: 24,
     field: "tradNo"
   },
@@ -228,12 +231,12 @@ export const sale_columns = [
   },
   {
     field: "sequenceNo",
-    label: "业务订单编",
+    label: "业务订单编",
     width: 140,
     fixed: "left"
   },
   {
-    label: "销售订单主编",
+    label: "销售订单主编",
     prop: "cxCode",
     width: 160,
     align: "left"
@@ -273,7 +276,7 @@ export const sale_columns = [
   },
   {
     field: "goodNo",
-    label: "商品编",
+    label: "商品编",
     width: 140
   },
   {
@@ -296,7 +299,7 @@ export const sale_columns = [
   },
   {
     field: "companyNo",
-    label: "业务公司编",
+    label: "业务公司编",
     width: 140
   },
   {

+ 4 - 4
src/views/InvoiceSales/capitalClaim/config/content.config.ts

@@ -24,10 +24,10 @@ const columns = [
     fixed: "left"
   },
   {
-    label: "资金编",
+    label: "资金编",
     prop: "tradNo",
     fixed: "left",
-    width: 140
+    width: 150
   },
   {
     label: "状态",
@@ -98,9 +98,9 @@ const columns = [
   },
 
   {
-    label: "收款公司编",
+    label: "收款公司编",
     prop: "companyNo",
-    width: 145
+    width: 150
   },
   {
     label: "收款公司名称",

+ 3 - 3
src/views/InvoiceSales/capitalClaim/config/modal.config.ts

@@ -47,9 +47,9 @@ const modalConfig: ModalConfig = {
       field: "invoice_code",
       type: "input",
       labelWidth: "120px",
-      label: "发票编",
-      placeholder: "发票编",
-      rules: [{ required: true, trigger: "change", message: "请输入发票编" }]
+      label: "发票编",
+      placeholder: "发票编",
+      rules: [{ required: true, trigger: "change", message: "请输入发票编" }]
     },
     {
       field: "invoice_bank",

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

@@ -6,7 +6,7 @@ const searchFormConfig: FormConfig = {
     {
       field: "tradNo",
       type: "input",
-      placeholder: "资金编"
+      placeholder: "资金编"
     },
     {
       field: "status",

+ 4 - 4
src/views/InvoiceSales/capitalClaim/config/xls-template.ts

@@ -1,5 +1,5 @@
 export const template = {
-  收款方公司编: "",
+  收款方公司编: "",
   收款方公司名称: "",
   收款方账户: "",
   交易时间: "",
@@ -13,9 +13,9 @@ export const template = {
 };
 
 export const capitalTemplate = {
-  收款方公司编: "",
+  收款方公司编: "",
   收款方公司名称: "",
-  资金编: "",
-  订单编: "",
+  资金编: "",
+  订单编: "",
   认领资金: ""
 };

+ 8 - 8
src/views/InvoiceSales/capitalClaim/index.vue

@@ -152,9 +152,9 @@ async function onDownloadOpenInv() {
               border
             >
               <el-table-column
-                label="资金认领编"
+                label="资金认领编"
                 prop="logNo"
-                width="188"
+                width="150"
                 fixed="left"
                 show-overflow-tooltip
               />
@@ -175,9 +175,9 @@ async function onDownloadOpenInv() {
                 </template>
               </el-table-column>
               <el-table-column
-                label="订单编"
+                label="订单编"
                 prop="orderCode"
-                width="160"
+                width="150"
                 show-overflow-tooltip
               />
               <el-table-column
@@ -209,9 +209,9 @@ async function onDownloadOpenInv() {
                 show-overflow-tooltip
               />
               <el-table-column
-                label="商品编"
+                label="商品编"
                 prop="goodNo"
-                width="160"
+                width="150"
                 show-overflow-tooltip
               />
               <el-table-column
@@ -237,9 +237,9 @@ async function onDownloadOpenInv() {
                 show-overflow-tooltip
               />
               <el-table-column
-                label="企业客户编"
+                label="企业客户编"
                 prop="customerNo"
-                width="160"
+                width="150"
                 show-overflow-tooltip
               />
               <el-table-column

+ 8 - 8
src/views/InvoiceSales/capitalPool/config/content.config.ts

@@ -24,21 +24,21 @@ const columns = [
   //   hide: ({ checkList }) => !checkList.includes("序号列")
   // },
   {
-    label: "资金认领编",
+    label: "资金认领编",
     prop: "logNo",
     fixed: "left",
-    width: "160px"
+    width: "150px"
   },
   {
-    label: "资金编",
+    label: "资金编",
     prop: "tradNo",
-    width: "160px"
+    width: "150px"
   },
 
   {
-    label: "销售单编",
+    label: "销售单编",
     prop: "orderCode",
-    width: "160px"
+    width: "150px"
   },
   {
     label: "销售主单号",
@@ -95,9 +95,9 @@ const columns = [
     width: "120px"
   },
   {
-    label: "商品编",
+    label: "商品编",
     prop: "goodNo",
-    width: "160px"
+    width: "150px"
   },
   {
     label: "商品名称",

+ 1 - 1
src/views/InvoiceSales/capitalPool/config/modal.config.ts

@@ -7,7 +7,7 @@ const modalConfig: ModalConfig = {
     {
       field: "companyNo",
       type: "input",
-      label: "客户编",
+      label: "客户编",
       labelWidth: "120px"
     },
     {

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

@@ -7,17 +7,17 @@ const searchFormConfig: FormConfig = {
     {
       field: "logNo",
       type: "input",
-      placeholder: "资金认领编"
+      placeholder: "资金认领编"
     },
     {
       field: "tradNo",
       type: "input",
-      placeholder: "资金编"
+      placeholder: "资金编"
     },
     {
       field: "orderCode",
       type: "input",
-      placeholder: "销售单编"
+      placeholder: "销售单编"
     },
     {
       field: "cxCode",

+ 9 - 9
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: ""
 };
@@ -369,19 +369,19 @@ onMounted(() => {
             <el-table :data="orderList" stripe border max-height="300">
               <el-table-column
                 prop="sequenceNo"
-                label="销售订单编"
-                width="200"
+                label="销售订单编"
+                width="150"
               />
               <el-table-column
                 prop="poCode"
-                label="平台订单编"
+                label="平台订单编"
                 show-overflow-tooltip
-                width="200"
+                width="150"
               />
               <el-table-column
                 prop="customerNo"
-                label="购买方公司编"
-                width="200"
+                label="购买方公司编"
+                width="150"
               />
               <el-table-column
                 prop="customerName"
@@ -389,8 +389,8 @@ onMounted(() => {
                 show-overflow-tooltip
                 width="200"
               />
-              <el-table-column prop="winv_num" label="未开票数量" width="120" />
-              <el-table-column prop="winv_fee" label="未开票金额" width="120" />
+              <el-table-column prop="winv_num" label="未开票数量" width="110" />
+              <el-table-column prop="winv_fee" label="未开票金额" width="110" />
 
               <el-table-column label="开票金额" width="110">
                 <template #="{ row }">{{

+ 20 - 19
src/views/InvoiceSales/invoiceApply/components/add-edit-form/columns.tsx

@@ -8,16 +8,16 @@ export function useColumns() {
       width: 30
     },
     {
-      label: "业务订单编",
+      label: "业务订单编",
       prop: "sequenceNo",
-      minWidth: 160,
+      width: 150,
       showOverflowTooltip: true,
       fixed: "left"
     },
     {
-      label: "销售订单主编",
+      label: "销售订单主编",
       prop: "cxCode",
-      minWidth: 160,
+      width: 150,
       showOverflowTooltip: true
     },
     // {
@@ -27,14 +27,14 @@ export function useColumns() {
     //   showOverflowTooltip: true
     // },
     {
-      label: "平台订单编",
+      label: "平台订单编",
       prop: "poCode",
-      minWidth: 190
+      width: 150
     },
     {
       label: "商品编码",
       prop: "goodNo",
-      minWidth: 160,
+      width: 150,
       showOverflowTooltip: true
     },
     {
@@ -50,9 +50,9 @@ export function useColumns() {
       slot: "platform_type"
     },
     {
-      label: "客户编",
+      label: "客户编",
       prop: "customerNo",
-      minWidth: 160,
+      width: 150,
       showOverflowTooltip: true
     },
     {
@@ -64,41 +64,42 @@ export function useColumns() {
     {
       label: "订单总金额",
       prop: "totalPrice",
-      minWidth: 110,
+      width: 110,
       showOverflowTooltip: true
     },
     {
       label: "商品数量",
       prop: "goodNum",
-      minWidth: 160,
+      width: 110,
       showOverflowTooltip: true
     },
     {
       label: "未开票数量",
-      prop: "winv_num"
+      prop: "winv_num",
+      width: 110
     },
     {
       label: "已开票金额",
       prop: "ainv_fee",
-      minWidth: 110,
+      width: 110,
       showOverflowTooltip: true
     },
     {
       label: "开票中金额",
       prop: "inv_fee",
-      minWidth: 110,
+      width: 110,
       showOverflowTooltip: true
     },
     {
       label: "未开票金额",
       prop: "winv_fee",
-      minWidth: 110,
+      width: 110,
       showOverflowTooltip: true
     },
     {
       label: "发货状态",
       prop: "sendStatus",
-      minWidth: 110,
+      width: 110,
       showOverflowTooltip: true,
       cellRenderer: ({ row, props }) => (
         <el-tag
@@ -122,12 +123,12 @@ export function useColumns() {
     {
       label: "业务员",
       prop: "ownerName",
-      minWidth: 80,
+      width: 80,
       showOverflowTooltip: true
     },
     {
       label: "创建时间",
-      minWidth: 145,
+      width: 140,
       prop: "createTime",
       showOverflowTooltip: true,
       formatter: ({ addtime }) => dayjs(addtime).format("YYYY-MM-DD HH:mm:ss")
@@ -142,7 +143,7 @@ export function useColumns() {
 export const order_detail_columns = [
   {
     field: "sequenceNo",
-    label: "确认单编号"
+    label: "销售订单编码"
   },
   {
     field: "ownerName",

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

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

+ 1 - 1
src/views/InvoiceSales/invoiceApply/components/execl-files-upload/columns-config.ts

@@ -1,5 +1,5 @@
 const initheaders = [
-  "发票申请编",
+  "发票申请编",
   "发票类型",
   "发票代码",
   "发票号码",

+ 2 - 2
src/views/InvoiceSales/invoiceApply/components/post-modal.vue

@@ -18,7 +18,7 @@ const rules = {
   post_company: [
     { message: "请输入物流快递公司", trigger: "change", required: true }
   ],
-  post_code: [{ message: "请输入物流编", trigger: "change", required: true }],
+  post_code: [{ message: "请输入物流编", trigger: "change", required: true }],
   post_fee: [{ message: "请输入物流费", trigger: "change", required: true }]
 };
 
@@ -59,7 +59,7 @@ defineExpose({
       <el-form-item label="物流快递公司" prop="post_company">
         <el-input v-model="formData.post_company" />
       </el-form-item>
-      <el-form-item label="物流编" prop="post_code">
+      <el-form-item label="物流编" prop="post_code">
         <el-input v-model="formData.post_code" />
       </el-form-item>
       <el-form-item label="物流费" prop="post_fee">

+ 7 - 7
src/views/InvoiceSales/invoiceApply/config/_details.ts

@@ -33,7 +33,7 @@ export const OPEN_TYPE = [
 export const invOpenColumns: DescriptionColumns = [
   {
     field: "invNo",
-    label: "发票编",
+    label: "发票编",
     span: 2,
     labelWidth: "100px"
   },
@@ -42,7 +42,7 @@ export const invOpenColumns: DescriptionColumns = [
     label: "开票业务公司",
     span: 2,
     render: (seller_title, { inv_out }) =>
-      createTooltip(seller_title, "业务公司编 : " + inv_out, 300)
+      createTooltip(seller_title, "业务公司编 : " + inv_out, 300)
   },
   {
     field: "inv_in",
@@ -122,7 +122,7 @@ export const invOpenColumns: DescriptionColumns = [
   },
   {
     field: "post_code",
-    label: "快递编",
+    label: "快递编",
     span: 2
   },
   {
@@ -231,7 +231,7 @@ export const invOpenColumns: DescriptionColumns = [
           default: () => [
             h(ElTableColumn, {
               prop: "orderCode",
-              label: "编",
+              label: "编",
               width: "180px",
               showOverflowTooltip: true
             }),
@@ -290,7 +290,7 @@ export const invOpenColumns: DescriptionColumns = [
 export const ORDER_COLUMNS = [
   {
     field: "invNo",
-    label: "发票编"
+    label: "发票编"
   },
   {
     field: "inv_value",
@@ -300,7 +300,7 @@ export const ORDER_COLUMNS = [
     field: "buyer_title",
     label: "开票公司",
     render: (buyer_title, { inv_out }) =>
-      createTooltip(buyer_title, "开票公司编 : " + inv_out, 360)
+      createTooltip(buyer_title, "开票公司编 : " + inv_out, 360)
   },
   {
     field: "buyer_title",
@@ -388,7 +388,7 @@ export const ORDER_COLUMNS = [
   },
   {
     field: "post_code",
-    label: "快递编"
+    label: "快递编"
   },
   {
     field: "post_company",

+ 5 - 5
src/views/InvoiceSales/invoiceApply/config/content.config.ts

@@ -14,14 +14,14 @@ import { ElTag } from "element-plus";
 
 const columns = [
   {
-    label: "发票申请编",
+    label: "发票申请编",
     prop: "invNo",
-    width: 155
+    width: 150
   },
   {
-    label: "业务企业编",
+    label: "业务企业编",
     prop: "inv_out",
-    width: 155
+    width: 150
   },
   {
     label: "客户公司名称",
@@ -67,7 +67,7 @@ const columns = [
   {
     label: "发票类型",
     prop: "status",
-    minWidth: 160,
+    width: 160,
     cellRenderer: ({ row }) => {
       return h(ElTag, null, {
         default: () =>

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

@@ -8,7 +8,7 @@ const searchFormConfig: FormConfig = {
     {
       field: "invNo",
       type: "input",
-      placeholder: "发票申请编"
+      placeholder: "发票申请编"
     },
     {
       field: "buyer_name",

+ 1 - 1
src/views/InvoiceSales/invoiceApply/config/xls-template.ts

@@ -1,5 +1,5 @@
 export const template = {
-  发票申请编: "INV20210712w0vHkk",
+  发票申请编: "INV20210712w0vHkk",
   发票类型: "增值税电子普通发票",
   发票代码: "011002000711",
   发票号码: "51678540",

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

@@ -19,14 +19,14 @@ const columns = [
   //   hide: ({ checkList }) => !checkList.includes("序号列")
   // },
   {
-    label: "发票申请编",
+    label: "发票申请编",
     prop: "invNo",
-    minWidth: 160
+    width: 150
   },
   {
-    label: "业务企业编",
+    label: "业务企业编",
     prop: "inv_out",
-    minWidth: 160
+    width: 150
   },
   {
     label: "业务公司名称",
@@ -45,7 +45,7 @@ const columns = [
   },
   {
     label: "发票类型",
-    width: 150,
+    width: 160,
     cellRenderer({ row }) {
       const current = invoiceTypeList.find(
         i => i.value === String(row.inv_type)

+ 1 - 1
src/views/InvoiceSales/invoicePool/config/modal.config.ts

@@ -7,7 +7,7 @@ const modalConfig: ModalConfig = {
     {
       field: "companyNo",
       type: "input",
-      label: "客户编",
+      label: "客户编",
       labelWidth: "120px"
     },
     {

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

@@ -6,7 +6,7 @@ const searchFormConfig: FormConfig = {
     {
       field: "invNo",
       type: "input",
-      placeholder: "发票申请编"
+      placeholder: "发票申请编"
     },
     {
       field: "timer",

+ 3 - 3
src/views/InvoiceSales/invoiceQuery/columns.tsx

@@ -3,9 +3,9 @@ import { ref } from "vue";
 export function useColumns() {
   const xsColumns = ref([
     {
-      label: "业务编",
+      label: "业务编",
       prop: "invNo",
-      width: "180px"
+      width: "150px"
     },
     {
       label: "业务类型",
@@ -66,7 +66,7 @@ export function useColumns() {
     {
       prop: "hpNo",
       label: "对账回票申请",
-      width: "180px"
+      width: "150px"
     },
     {
       label: "业务类型",

+ 5 - 5
src/views/InvoiceSales/invoiceQuery/components/sale-config/content.config.ts

@@ -11,14 +11,14 @@ import { ElTag } from "element-plus";
 
 const columns = [
   {
-    label: "发票申请编",
+    label: "发票申请编",
     prop: "invNo",
-    width: 155
+    width: 150
   },
   {
-    label: "业务企业编",
+    label: "业务企业编",
     prop: "inv_out",
-    width: 155
+    width: 150
   },
   {
     label: "客户公司名称",
@@ -48,7 +48,7 @@ const columns = [
   {
     label: "发票类型",
     prop: "status",
-    minWidth: 160,
+    width: 160,
     cellRenderer: ({ row }) => {
       return h(ElTag, null, {
         default: () =>

+ 1 - 1
src/views/InvoiceSales/invoiceQuery/components/sale-config/modal.config.ts

@@ -7,7 +7,7 @@ const modalConfig: ModalConfig = {
     {
       field: "companyNo",
       type: "input",
-      label: "客户编",
+      label: "客户编",
       labelWidth: "120px"
     },
     {

+ 1 - 1
src/views/InvoiceSales/invoiceQuery/components/sale-config/search.config.ts

@@ -9,7 +9,7 @@ const searchFormConfig: FormConfig = {
       field: "invNo",
       type: "input",
       span: 4,
-      placeholder: "发票申请编"
+      placeholder: "发票申请编"
     },
     {
       field: "status",

+ 8 - 7
src/views/InvoiceSales/redInk/config/content.config.ts

@@ -52,32 +52,33 @@ const columns = [
     hide: ({ checkList }) => !checkList.includes("序号列")
   },
   {
-    label: "红冲申请编",
-    width: 130,
+    label: "红冲申请编",
+    width: 150,
     prop: "invRed"
   },
   {
     label: "红冲申请流水号",
-    width: 130,
+    width: 150,
     prop: "SQBSCQQLSH"
   },
   {
     label: "红冲申请批次号",
-    width: 130,
+    width: 150,
     prop: "SQBSCQQPCH"
   },
   {
     label: "发票类型",
-    width: 90,
+    width: 160,
     prop: "FPLXDM"
   },
   {
-    label: "原发票申请编",
-    width: 130,
+    label: "原发票申请编",
+    width: 150,
     prop: "invNo"
   },
   {
     label: "原发票号码",
+    width: 130,
     prop: "YFPHM"
   },
   {

+ 2 - 2
src/views/InvoiceSales/redInk/config/search.config.ts

@@ -5,13 +5,13 @@ const searchFormConfig: FormConfig = {
     {
       field: "invRed",
       type: "input",
-      placeholder: "红冲申请编",
+      placeholder: "红冲申请编",
       span: 6
     },
     {
       field: "invNo",
       type: "input",
-      placeholder: "发票申请编",
+      placeholder: "发票申请编",
       span: 6
     },
     {

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

@@ -81,8 +81,8 @@ defineExpose({
   >
     <div flex mb-2>
       <div flex flex-1 gap="5" pr="20px">
-        <el-input placeholder="资金编" size="small" v-model="params.tradNo" />
-        <el-input placeholder="认领编" size="small" v-model="params.logNo" />
+        <el-input placeholder="资金编" size="small" v-model="params.tradNo" />
+        <el-input placeholder="认领编" size="small" v-model="params.logNo" />
       </div>
 
       <div flex width="120px">

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

@@ -77,8 +77,8 @@ defineExpose({
   >
     <div flex mb-2>
       <div flex flex-1 gap="5" pr="20px">
-        <el-input placeholder="资金编" size="small" v-model="params.tradNo" />
-        <el-input placeholder="认领编" size="small" v-model="params.logNo" />
+        <el-input placeholder="资金编" size="small" v-model="params.tradNo" />
+        <el-input placeholder="认领编" size="small" v-model="params.logNo" />
       </div>
 
       <div flex width="120px">

+ 5 - 5
src/views/InvoiceSales/refund/config/_details.ts

@@ -9,17 +9,17 @@ import { refundTypeOptions, refundStatusOptions } from "./_options";
 
 export const refundColumns: DescriptionColumns = [
   {
-    label: "退款编",
+    label: "退款编",
     span: 6,
     field: "returnCode"
   },
   {
-    label: "资金认领编",
+    label: "资金认领编",
     span: 6,
     field: "logNo"
   },
   {
-    label: "资金编",
+    label: "资金编",
     span: 6,
     field: "tradNo"
   },
@@ -153,7 +153,7 @@ const CAPITAL_STATUS = [
 export const CAPITAL_COLUMNS: DescriptionColumns = [
   {
     field: "logNo",
-    label: "编",
+    label: "编",
     width: "180px",
     span: 6
   },
@@ -202,7 +202,7 @@ export const status_options = [
 
 export const public_columns = [
   {
-    label: "资金编",
+    label: "资金编",
     span: 24,
     field: "tradNo"
   },

+ 19 - 16
src/views/InvoiceSales/refund/config/configs.ts

@@ -2,52 +2,55 @@ import { ElTag } from "element-plus";
 import { h } from "vue";
 export const order_columns = [
   {
-    label: "订单编",
+    label: "订单编",
     prop: "sequenceNo",
-    minWidth: 180,
+    width: 150,
     align: "left",
     fixed: "left"
   },
   {
     label: "客户名称",
     prop: "customerName",
-    minWidth: 180,
+    width: 180,
     align: "left"
   },
   {
     label: "订单总金额",
     prop: "totalPrice",
-    minWidth: 180,
+    width: 110,
     align: "left"
   },
   {
     prop: "apay_fee",
-    label: "已付款"
+    label: "已付款",
+    width: 110
   },
   {
     prop: "pay_fee",
-    label: "付款中"
+    label: "付款中",
+    width: 110
   },
   {
     prop: "wpay_fee",
-    label: "未付款"
+    label: "未付款",
+    width: 110
   },
   {
     label: "商品名称",
     prop: "goodName",
-    minWidth: 180,
+    width: 180,
     align: "left"
   },
   {
     label: "平台名称",
     prop: "platName",
-    minWidth: 180,
+    width: 120,
     align: "left"
   },
   {
     label: "销售员",
     prop: "saler",
-    minWidth: 180,
+    width: 180,
     align: "left"
   },
   {
@@ -65,13 +68,13 @@ export const order_columns = [
   {
     label: "此次认领",
     prop: "cchx",
-    minWidth: 180,
+    width: 110,
     align: "left"
   },
   {
     label: "交易时间",
     prop: "addtime",
-    minWidth: 180,
+    width: 140,
     align: "left"
   }
 ];
@@ -145,7 +148,7 @@ export const description_columns_out = [
 
 export const public_columns = [
   {
-    label: "资金编",
+    label: "资金编",
     span: 24,
     field: "tradNo"
   },
@@ -222,7 +225,7 @@ export const sale_columns = [
   },
   {
     field: "sequenceNo",
-    label: "订单编",
+    label: "订单编",
     width: 140,
     fixed: "left"
   },
@@ -256,7 +259,7 @@ export const sale_columns = [
   },
   {
     field: "goodNo",
-    label: "商品编",
+    label: "商品编",
     width: 140
   },
   {
@@ -279,7 +282,7 @@ export const sale_columns = [
   },
   {
     field: "companyNo",
-    label: "业务公司编",
+    label: "业务公司编",
     width: 140
   },
   {

+ 16 - 15
src/views/InvoiceSales/refund/config/content.config.ts

@@ -23,28 +23,28 @@ const columns = [
   //   hide: ({ checkList }) => !checkList.includes("序号列")
   // },
   {
-    label: "退款编",
+    label: "退款编",
     prop: "returnCode",
-    width: "160px"
+    width: "150px"
   },
   {
-    label: "资金编",
+    label: "资金编",
     prop: "tradNo",
-    width: 160
+    width: 150
   },
   {
-    label: "资金认领编",
+    label: "资金认领编",
     prop: "logNo",
-    width: 160
+    width: 150
   },
   {
-    label: "销售单编",
+    label: "销售单编",
     prop: "orderCode",
-    width: "160px"
+    width: "150px"
   },
   {
     label: "退款金额",
-    width: "100px",
+    width: "110px",
     prop: "cancel_fee"
   },
 
@@ -93,9 +93,9 @@ const columns = [
     }
   },
   {
-    label: "商品编",
+    label: "商品编",
     prop: "goodNo",
-    width: "160px"
+    width: "150px"
   },
   {
     label: "商品名称",
@@ -109,8 +109,8 @@ const columns = [
   },
 
   {
-    label: "客户编",
-    width: "160px",
+    label: "客户编",
+    width: "150px",
     prop: "companyNo"
   },
   {
@@ -121,12 +121,13 @@ const columns = [
 
   {
     label: "申请人",
-    prop: "apply_name"
+    prop: "apply_name",
+    width: "80px"
   },
   {
     label: "添加时间",
     prop: "addtime",
-    width: "150px"
+    width: "140px"
   },
   {
     label: "操作",

+ 4 - 4
src/views/InvoiceSales/refund/config/search.config.ts

@@ -31,22 +31,22 @@ const searchFormConfig: FormConfig = {
     {
       field: "returnCode",
       type: "input",
-      placeholder: "退款编"
+      placeholder: "退款编"
     },
     {
       field: "tradNo",
       type: "input",
-      placeholder: "资金编"
+      placeholder: "资金编"
     },
     {
       field: "logNo",
       type: "input",
-      placeholder: "资金认领编"
+      placeholder: "资金认领编"
     },
     {
       field: "orderCode",
       type: "input",
-      placeholder: "销售单编"
+      placeholder: "销售单编"
     },
     {
       field: "apply_name",

+ 3 - 3
src/views/InvoiceSales/returnTicket/components/approval-pending.vue

@@ -58,7 +58,7 @@ const rules = reactive({
     {
       required: true,
       trigger: "change",
-      message: "请输入发票编"
+      message: "请输入发票编"
     }
   ],
   invNum: [
@@ -176,9 +176,9 @@ watchEffect(() => {
 
       <div w-400px v-if="showInvoiceInfo">
         <el-form-item
-          label="发票编"
+          label="发票编"
           prop="invCode"
-          placeholder="请输入发票编"
+          placeholder="请输入发票编"
         >
           <el-input v-model="formData.invCode" />
         </el-form-item>

+ 3 - 3
src/views/InvoiceSales/returnTicket/components/approval-process/approval-pending.vue

@@ -55,7 +55,7 @@ const rules = reactive({
     {
       required: true,
       trigger: "change",
-      message: "请输入发票编"
+      message: "请输入发票编"
     }
   ],
   invNum: [
@@ -136,9 +136,9 @@ const handlePaymentReceipt = () => {
 
     <div w-400px v-if="showInvoiceInfo">
       <el-form-item
-        label="发票编"
+        label="发票编"
         prop="invCode"
-        placeholder="请输入发票编"
+        placeholder="请输入发票编"
       >
         <el-input v-model="formData.invCode" />
       </el-form-item>

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

@@ -101,7 +101,7 @@ defineExpose({
     <div flex mb-2>
       <div flex flex-1 gap="5" pr="20px">
         <el-input
-          placeholder="发票申请编"
+          placeholder="发票申请编"
           size="small"
           v-model="params.invNo"
         />

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

@@ -106,12 +106,12 @@ defineExpose({
     <div flex mb-2>
       <div flex flex-1 gap="5" pr="20px">
         <el-input
-          placeholder="发票申请编"
+          placeholder="发票申请编"
           size="small"
           v-model="params.invNo"
         />
         <el-input
-          placeholder="业务公司编"
+          placeholder="业务公司编"
           size="small"
           v-model="params.inv_out"
         />

+ 4 - 4
src/views/InvoiceSales/returnTicket/config/_details.ts

@@ -12,7 +12,7 @@ import {
 export const invReturnColumns: DescriptionColumns = [
   {
     field: "returnCode",
-    label: "退票编"
+    label: "退票编"
   },
   {
     field: "status",
@@ -41,7 +41,7 @@ export const invReturnColumns: DescriptionColumns = [
   },
   {
     field: "invNo",
-    label: "开票申请编"
+    label: "开票申请编"
   },
   // {
   //   field: "inv_value",
@@ -49,7 +49,7 @@ export const invReturnColumns: DescriptionColumns = [
   // },
   {
     field: "red_inv",
-    label: "红冲信息表编"
+    label: "红冲信息表编"
   },
   {
     field: "return_reason",
@@ -98,7 +98,7 @@ export const invReturnColumns: DescriptionColumns = [
 
 export const inv_columns = [
   {
-    label: "发票申请编",
+    label: "发票申请编",
     prop: "invNo",
     width: 150
   },

+ 3 - 3
src/views/InvoiceSales/returnTicket/config/configs.ts

@@ -1,18 +1,18 @@
 export const inv_columns = [
   {
-    label: "发票申请编",
+    label: "发票申请编",
     prop: "invNo",
     width: 150
   },
   {
     label: "业务公司编码",
     prop: "inv_out",
-    width: 160
+    width: 150
   },
   {
     label: "业务公司名称",
     prop: "inv_company",
-    width: 140
+    width: 160
   },
   {
     label: "发票号码",

+ 9 - 9
src/views/InvoiceSales/returnTicket/config/content.config.ts

@@ -19,25 +19,25 @@ const columns = [
   //   hide: ({ checkList }) => !checkList.includes("序号列")
   // },
   {
-    label: "退票编",
+    label: "退票编",
     prop: "returnCode",
-    minWidth: 160
+    width: 150
   },
   {
-    label: "发票申请编",
+    label: "发票申请编",
     prop: "invNo",
-    minWidth: 160
+    width: 150
   },
   {
     label: "发票金额",
     prop: "inv_value",
-    minWidth: 110
+    width: 110
   },
 
   {
     label: "退票状态",
     prop: "status",
-    minWidth: 100,
+    width: 120,
     cellRenderer: ({ row }) => {
       return h(ElTag, null, {
         default: () =>
@@ -48,7 +48,7 @@ const columns = [
   {
     label: "发票类型",
     prop: "inv_type",
-    minWidth: 160,
+    width: 160,
     cellRenderer: ({ row }) => {
       return h(ElTag, null, {
         default: () =>
@@ -60,7 +60,7 @@ const columns = [
   {
     label: "退票方式",
     prop: "return_type",
-    minWidth: 130,
+    width: 130,
     cellRenderer: ({ row }) => {
       return h(ElTag, null, {
         default: () =>
@@ -72,7 +72,7 @@ const columns = [
   {
     label: "申请人",
     prop: "apply_name",
-    minWidth: 70
+    width: 70
   },
   {
     label: "申请时间",

+ 2 - 2
src/views/InvoiceSales/returnTicket/config/modal.config.ts

@@ -7,13 +7,13 @@ const modalConfig: ModalConfig = {
     {
       field: "invNo",
       type: "input",
-      label: "发票编",
+      label: "发票编",
       labelWidth: "120px",
       rules: [
         {
           required: true,
           trigger: "change",
-          message: "请输入发票编"
+          message: "请输入发票编"
         }
       ]
     },

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

@@ -6,12 +6,12 @@ const searchFormConfig: FormConfig = {
     {
       field: "returnCode",
       type: "input",
-      placeholder: "退票编"
+      placeholder: "退票编"
     },
     {
       field: "invNo",
       type: "input",
-      placeholder: "发票编"
+      placeholder: "发票编"
     },
     {
       field: "apply_name",

+ 1 - 1
src/views/InvoiceSales/sheetOrderPool/components/sheet-modal.vue

@@ -23,7 +23,7 @@ defineExpose({
 <template>
   <ElDialog
     center
-    title="确认单详情"
+    title="销售订单详情"
     v-model="visible"
     width="1100px"
     :close-on-click-modal="false"

+ 16 - 16
src/views/InvoiceSales/sheetOrderPool/config/content.config.ts

@@ -24,15 +24,15 @@ const columns = [
   //   hide: ({ checkList }) => !checkList.includes("序号列")
   // },
   {
-    label: "业务订单编",
+    label: "业务订单编",
     prop: "sequenceNo",
     fixed: "left",
-    width: 160
+    width: 150
   },
   {
-    label: "销售订单主编",
+    label: "销售订单主编",
     prop: "cxCode",
-    width: 160
+    width: 150
   },
   {
     label: "平台类型",
@@ -46,7 +46,7 @@ const columns = [
   {
     label: "卖方公司编码",
     prop: "companyNo",
-    width: 160
+    width: 150
   },
   {
     label: "卖方公司名称",
@@ -54,9 +54,9 @@ const columns = [
     minWidth: 160
   },
   {
-    label: "客户编",
+    label: "客户编",
     prop: "customerNo",
-    width: 160
+    width: 150
   },
   {
     label: "客户名称",
@@ -109,22 +109,22 @@ const columns = [
   {
     label: "已开票",
     prop: "ainv_fee",
-    width: 100
+    width: 110
   },
   {
     label: "开票中",
     prop: "inv_fee",
-    width: 100
+    width: 110
   },
   {
     label: "未开票",
     prop: "winv_fee",
-    width: 100
+    width: 110
   },
   {
     label: "开票标签金额",
     prop: "inv_tag_fee",
-    width: 100
+    width: 110
   },
   {
     label: "标签图片",
@@ -157,22 +157,22 @@ const columns = [
   {
     label: "已回款",
     prop: "apay_fee",
-    width: 100
+    width: 110
   },
   {
     label: "回款中",
     prop: "pay_fee",
-    width: 100
+    width: 110
   },
   {
     label: "未回款",
     prop: "wpay_fee",
-    width: 100
+    width: 110
   },
   {
     label: "回款标签金额",
     prop: "pay_tag_fee",
-    width: 100
+    width: 110
   },
   {
     label: "标签图片",
@@ -211,7 +211,7 @@ const columns = [
 ];
 
 const contentConfig: ContentConfig = {
-  title: "确认单公海池",
+  title: "销售订单公海池",
   columns,
   superUserNoAction: true,
   payProps: {

+ 4 - 4
src/views/InvoiceSales/sheetOrderPool/config/frontColumns.ts

@@ -1,14 +1,14 @@
 const columns = [
   {
-    label: "订单编",
+    label: "订单编",
     prop: "sequenceNo",
     fixed: "left",
-    width: 160
+    width: 150
   },
   {
-    label: "客户编",
+    label: "客户编",
     prop: "customerNo",
-    width: 160
+    width: 150
   },
   {
     label: "客户名称",

+ 1 - 1
src/views/InvoiceSales/sheetOrderPool/config/modal.config.ts

@@ -7,7 +7,7 @@ const modalConfig: ModalConfig = {
     {
       field: "companyNo",
       type: "input",
-      label: "客户编",
+      label: "客户编",
       labelWidth: "120px"
     },
     {

+ 2 - 2
src/views/InvoiceSales/sheetOrderPool/config/search.config.ts

@@ -144,8 +144,8 @@ const searchFormConfig: FormConfig = {
       span: 8,
       otherOptions: {
         inputGroupOptions: [
-          { value: "sequenceNo", label: "订单编" },
-          { value: "cxCode", label: "销售订单主编" },
+          { value: "sequenceNo", label: "订单编" },
+          { value: "cxCode", label: "销售订单主编" },
           { value: "customerNo", label: "客户编码" },
           { value: "customer", label: "客户名称" },
           { value: "platName", label: "平台名称" },

+ 1 - 1
src/views/InvoiceSales/sheetOrderPool/detail-dialog.vue

@@ -23,7 +23,7 @@ defineExpose({
 <template>
   <ElDialog
     center
-    title="确认单详情"
+    title="销售订单详情"
     v-model="visible"
     width="1040px"
     :close-on-click-modal="false"

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

@@ -58,9 +58,9 @@ const columns = [
   },
 
   {
-    label: "公司编",
+    label: "公司编",
     prop: "companyCode",
-    minWidth: 180,
+    width: 150,
     align: "left"
   },
   {

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

@@ -19,7 +19,7 @@ export function useColumns() {
       hide: ({ checkList }) => !checkList.includes("序号列")
     },
     {
-      label: "用户编",
+      label: "用户编",
       prop: "id"
     },
     {

+ 1 - 1
src/views/interest/companyAccount-origin/addEdit.vue

@@ -381,7 +381,7 @@ function handleDefaultCompanyChange(index: number) {
                 </template>
               </el-table-column>
 
-              <el-table-column label="公司编" prop="companyCode" />
+              <el-table-column label="公司编" prop="companyCode" />
               <el-table-column label="公司名称" prop="companyName" />
 
               <el-table-column

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

@@ -105,7 +105,7 @@ defineExpose({
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column label="公司编" prop="code" show-overflow-tooltip />
+      <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 />
     </el-table>

+ 9 - 3
src/views/interest/companyAccount/addEdit.vue

@@ -137,7 +137,9 @@ const submitForm = async (formEl: FormInstance | undefined) => {
       console.log(model.companyArr);
 
       // eslint-disable-next-line prettier/prettier
-      model.companyArr.forEach(item => {item.is_main = item.companyCode === mainCompany.companyCode ? "1" : "0"; });
+      model.companyArr.forEach(item => {
+        item.is_main = item.companyCode === mainCompany.companyCode ? "1" : "0";
+      });
 
       loading.value = true;
 
@@ -242,7 +244,11 @@ function handleChoose(companys) {
     if (!codes.includes(item.companyNo)) {
       const { companyNo, company_name } = item;
       // eslint-disable-next-line prettier/prettier
-      ruleForm.companyArr.push({ companyCode: companyNo, companyName: company_name, is_main: false});
+      ruleForm.companyArr.push({
+        companyCode: companyNo,
+        companyName: company_name,
+        is_main: false
+      });
     }
   });
 }
@@ -335,7 +341,7 @@ function handleDefaultCompanyChange(index: number) {
                 </template>
               </el-table-column>
 
-              <el-table-column label="公司编" prop="companyCode" />
+              <el-table-column label="公司编" prop="companyCode" />
               <el-table-column label="公司名称" prop="companyName" />
 
               <el-table-column

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

@@ -110,7 +110,7 @@ defineExpose({
     >
       <el-table-column type="selection" width="55" />
       <el-table-column
-        label="公司编"
+        label="公司编"
         prop="companyNo"
         show-overflow-tooltip
       />

+ 1 - 1
src/views/netOrderEnter/netOrderEntry/config/_options.ts

@@ -93,7 +93,7 @@ export const formRules = {
   poCode: [
     {
       required: true,
-      message: "平台订单编",
+      message: "平台订单编",
       trigger: "blur"
     }
   ],

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

@@ -18,66 +18,66 @@ const columns = [
   {
     type: "expand",
     label: "",
-    slot: "expand",
+    slot: "expand"
   },
   {
     prop: "orderCode",
-    label: "确认单编号",
-    width: "165px",
+    label: "销售订单编码",
+    width: "150px"
     // fixed: "left",
   },
   {
     prop: "sale_name",
     label: "业务员",
-    width: "70px",
+    width: "70px"
   },
   {
     prop: "khNo",
     label: "企业客户编码",
-    width: "125px",
+    width: "150px"
   },
   {
     prop: "khName",
     label: "企业客户",
-    "min-width": "190px",
+    "min-width": "190px"
   },
   {
     prop: "companyNo",
-    label: "确认单销售公司编码",
-    width: "175px",
+    label: "销售公司编码",
+    width: "150px"
   },
   {
     prop: "companyName",
-    label: "确认单销售公司",
-    "min-width": "190px",
+    label: "销售公司",
+    "min-width": "190px"
   },
 
   {
     prop: "cgdNo",
     label: "采购单号",
-    width: "165px",
+    width: "165px"
   },
   {
     prop: "supplierNo",
-    label: "供应商编",
-    width: "140px",
+    label: "供应商编",
+    width: "150px"
   },
   {
     prop: "supplierName",
     label: "供应商",
-    "min-width": "190px",
+    "min-width": "190px"
   },
   {
     prop: "ordertime",
     label: "创建时间",
-    width: "140px",
+    width: "140px"
   },
   {
     prop: "",
     label: "操作",
     width: "85px",
     slot: "operation",
-    fixed: 'right'
+    fixed: "right"
   }
 ];
 

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

@@ -8,8 +8,8 @@ const searchFormConfig: FormConfig = {
       type: "input_group",
       otherOptions: {
         inputGroupOptions: [
-          { value: "qrdNo", label: "确认单编号" },
-          { value: "cgdNo", label: "采购单编" },
+          { value: "qrdNo", label: "销售订单编码" },
+          { value: "cgdNo", label: "采购单编" },
           { value: "sale_name", label: "销售员" },
           { value: "cgd_saler", label: "采购员" }
         ]

+ 1 - 1
src/views/netOrderEnter/netOrderEntry/index.vue

@@ -69,7 +69,7 @@ const events: PageEvents = {
             <ElDescriptionsItem label="单据号">{{
               row.workCode
             }}</ElDescriptionsItem>
-            <ElDescriptionsItem label="平台订单编">{{
+            <ElDescriptionsItem label="平台订单编">{{
               row.poCode
             }}</ElDescriptionsItem>
             <ElDescriptionsItem label="税点">{{ row.tax }}%</ElDescriptionsItem>

+ 4 - 4
src/views/netOrderEnter/netOrderEntry/qrd-modal.vue

@@ -110,7 +110,7 @@ const { run: runDetail, loading: detailLoading } = useAsync({
 });
 
 const title = computed(() => {
-  const baseTitle = "确认单";
+  const baseTitle = "销售订单";
   const isPreview = modalType.value === ModalTypes.preview;
   const isCreate = modalType.value === ModalTypes.create;
   if (isPreview) return `${baseTitle}详情`;
@@ -216,7 +216,7 @@ defineExpose({ onDisplay });
     >
       <ElRow :gutter="10">
         <ElCol :span="24" style="padding: 0 0 10px 0; margin-top: -5px">
-          <ElDivider><ElTag>确认单信息</ElTag></ElDivider>
+          <ElDivider><ElTag>销售订单信息</ElTag></ElDivider>
         </ElCol>
 
         <ElCol :span="8">
@@ -307,10 +307,10 @@ defineExpose({ onDisplay });
         </ElCol>
 
         <ElCol :span="12">
-          <ElFormItem label="平台订单编" prop="poCode" label-width="110px">
+          <ElFormItem label="平台订单编" prop="poCode" label-width="110px">
             <ElInput
               v-model="formData.poCode"
-              placeholder="平台订单编"
+              placeholder="平台订单编"
               maxlength="200"
             />
           </ElFormItem>

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

@@ -16,7 +16,8 @@ const columns = [
     hide: ({ checkList }) => !checkList.includes("序号列")
   },
   {
-    label: "客户编号",
+    label: "客户编码",
+    width: 150,
     prop: "companyNo"
   },
   {

+ 1 - 1
src/views/parameter/clients/config/modal.config.ts

@@ -7,7 +7,7 @@ const modalConfig: ModalConfig = {
     {
       field: "companyNo",
       type: "input",
-      label: "客户编",
+      label: "客户编",
       labelWidth: "120px"
     },
     {

+ 15 - 10
src/views/parameter/finance/config/content.config.ts

@@ -2,11 +2,7 @@
 // eslint-disable-next-line prettier/prettier
 
 import { ContentConfig } from "/@/components/PageContent";
-import {
-  httpList,
-  httpUpdate,
-  httpStatus
-} from "/@/api/parameter/finance";
+import { httpList, httpUpdate, httpStatus } from "/@/api/parameter/finance";
 
 import dayjs from "dayjs";
 import { h } from "vue";
@@ -46,7 +42,7 @@ const columns = [
   {
     label: "业务企业编码",
     prop: "companyNo",
-    width: 180
+    width: 150
   },
   {
     label: "业务企业名称",
@@ -61,7 +57,7 @@ const columns = [
   {
     label: "企业纳税号",
     prop: "company_license",
-    minWidth: 120
+    width: 120
   },
   {
     label: "开户银行账户",
@@ -98,20 +94,29 @@ const columns = [
     prop: "input_ticket",
     width: 100,
     cellRenderer: ({ row }) =>
-      String(row.input_ticket) === "1" ? "金税" : String(row.input_ticket) === '2' ? "人工" : '--'
+      String(row.input_ticket) === "1"
+        ? "金税"
+        : String(row.input_ticket) === "2"
+        ? "人工"
+        : "--"
   },
   {
     label: "销项设置",
     prop: "out_ticket",
     width: 100,
     cellRenderer: ({ row }) =>
-      String(row.out_ticket) === "1" ? "金税" : String(row.out_ticket) === '2' ? "人工" : '--'
+      String(row.out_ticket) === "1"
+        ? "金税"
+        : String(row.out_ticket) === "2"
+        ? "人工"
+        : "--"
   },
   {
     label: "最大面额",
     prop: "denomination",
     width: 120,
-    cellRenderer: ({ row }) => String(row.denomination).trim() ? row.denomination + '万元' : '--'
+    cellRenderer: ({ row }) =>
+      String(row.denomination).trim() ? row.denomination + "万元" : "--"
   },
   {
     label: "创建时间",

+ 1 - 1
src/views/parameter/finance/config/search.config.ts

@@ -5,7 +5,7 @@ const searchFormConfig: FormConfig = {
     {
       field: "companyNo",
       type: "input",
-      placeholder: "业务企业编"
+      placeholder: "业务企业编"
     },
     {
       field: "companyName",

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

@@ -16,7 +16,7 @@ const columns = [
     hide: ({ checkList }) => !checkList.includes("序号列")
   },
   {
-    label: "公司编",
+    label: "公司编",
     prop: "code",
     width: 200
   },

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

@@ -28,12 +28,12 @@ const columns = [
   {
     label: "业务公司编码",
     prop: "companyNo",
-    width: "260px"
+    width: "150px"
   },
   {
     label: "业务公司名称",
     prop: "companyName",
-    width: "260px"
+    width: "160px"
   },
   {
     label: "标签类型",

Some files were not shown because too many files changed in this diff