From a18aa776805fdac37be0ec94f7895810d03d0525 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 6 Nov 2024 13:49:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=BC=80=E7=A5=A8=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerSaleInvoiceMain.data.ts           | 24 ++++-------
 .../customerSaleInvoiceMain/index.vue         | 41 +++----------------
 2 files changed, 14 insertions(+), 51 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceMain/customerSaleInvoiceMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceMain/customerSaleInvoiceMain.data.ts
index 0fbce55ae..2a80a9470 100644
--- a/src/views/wms/deliversettlementManage/customerSaleInvoiceMain/customerSaleInvoiceMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceMain/customerSaleInvoiceMain.data.ts
@@ -53,7 +53,7 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '客户代码',
-    field: 'customer',
+    field: 'customerCode',
     sort: 'custom',
     isSearch: true,
     form: {
@@ -74,7 +74,7 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '未税金额',
-    field: 'beforeTaxAmount',
+    field: 'mainBeforeTaxAmount',
     sort: 'custom',
     form: {
       componentProps: {
@@ -87,7 +87,6 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'taxRate',
     dictType: DICT_TYPE.TAX_RATE_DICT,
     dictClass: 'string',
-    sortTableDefault: 3,
     isTable: true,
     sort: 'custom',
     table: {
@@ -96,7 +95,7 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '税额',
-    field: 'taxAmount',
+    field: 'mainTaxAmount',
     sort: 'custom',
     form: {
       componentProps: {
@@ -106,7 +105,7 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '价税合计金额',
-    field: 'adTaxAmount',
+    field: 'mainAdTaxAmount',
     sort: 'custom',
     form: {
       componentProps: {
@@ -146,13 +145,6 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'remark',
     sort: 'custom',
   },
-  {
-    label: '是否可用默认TRUE',
-    field: 'available',
-    sort: 'custom',
-    isTable: false,
-    isForm:false
-  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -189,7 +181,7 @@ export const CustomerSaleInvoiceDetailRules = reactive({
 export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '品番',
-    field: 'number',
+    field: 'itemCode',
     sort: 'custom',
     isSearch: true,
     isForm: false,
@@ -250,7 +242,7 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '合计单价',
-    field: 'beforeTaxAmount',
+    field: 'sumPrice',
     sort: 'custom',
     form: {
       componentProps: {
@@ -260,7 +252,7 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '未税金额',
-    field: 'taxRate',
+    field: 'beforeTaxAmount',
     sort: 'custom',
   },
   {
@@ -275,7 +267,7 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '含税金额',
-    field: 'adTaxAmount',
+    field: 'afterTaxAmount',
     sort: 'custom',
     form: {
       componentProps: {
diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceMain/index.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceMain/index.vue
index 5141e9782..f2db8a097 100644
--- a/src/views/wms/deliversettlementManage/customerSaleInvoiceMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...CustomerSaleInvoiceMain.allSchemas.searchSchema,...CustomerSaleInvoiceDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="CustomerSaleInvoiceMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,7 +12,6 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="CustomerSaleInvoiceMain.allSchemas"
-      :detailAllSchemas="CustomerSaleInvoiceDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -105,10 +104,10 @@ const businessType = ref()
 const importFileName = ref()
 console.log(99 ,  routeName.value)
 const customerCode = ref()
-const tableColumns = ref([...CustomerSaleInvoiceMain.allSchemas.tableColumns,...CustomerSaleInvoiceDetail.allSchemas.tableMainColumns])
+const tableColumns = ref(CustomerSaleInvoiceMain.allSchemas.tableColumns)
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: CustomerSaleInvoiceDetailApi.getCustomerSaleInvoiceDetailPage // 分页接口
+  getListApi: CustomerSaleInvoiceMainApi.getCustomerSaleInvoiceMainPage // 分页接口
 })
 
 
@@ -181,33 +180,6 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   })
 }
 
-// 修改 tableform 属性
-CustomerSaleInvoiceDetail.allSchemas.tableFormColumns.map(item => {
-  if(item.field == 'itemCode') {
-      item.tableForm.searchCondition = [
-      {
-        key: 'businessType',
-        value: businessType.value ,
-        isMainValue: false
-      },
-      {
-        key: 'customerCode',
-        value: 'customerCode' ,
-        isMainValue: true
-      }]
-      item.form.componentProps.searchCondition = [
-      {
-        key: 'businessType',
-        value: businessType.value,
-        isMainValue: false
-      },
-      {
-        key: 'customerCode',
-        value: 'customerCode' ,
-        isMainValue: true
-      }]
-      }
-  })
 
 // 子表新增的时候选择表格之后需要会显得字段
 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
@@ -215,12 +187,11 @@ const Echo =  []
 
 // 获得表格的各种操作
 const { getList, setSearchParams } = tableMethods
-
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:`wms:${routeName.value}:create` }), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:`wms:${routeName.value}:import` }), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export` }), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:`wms:customer-sale-invoice-main:create` }), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:`wms:customer-sale-invoice-main:import` }), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:`wms:customer-sale-invoice-main:export` }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置