客户对账单接口对接

src/components/ImportForm/src/ImportCustomerStatementForm.vue

@@ -2,34 +2,38 @@
 <template>
   <Dialog v-model="dialogVisible" :title="t('ts.导入')" width="600" :close-on-click-modal="false">
     <el-form
-  :inline="true"
+      :inline="true"
-  :model="queryParams"
+      :model="queryParams"
-  class="demo-form-inline"
+      class="demo-form-inline"
-  style="margin-bottom: 10px"
+      style="margin-bottom: 10px"
-  label-width="100px"
+      label-width="70px"
->
-  <el-form-item label="客户代码" style="margin-right: 20px;">
-    <el-select
-      v-model="queryParams.customerCode"
-      placeholder="请选择客户代码"
-      clearable
-      style="width: 100px"
     >
-      <el-option v-for="(item) in customerList" :key="item.code" :label="item.name" :value="item.code" />
+      <el-row>
-    </el-select>
+        <el-col :span="12">
-  </el-form-item>
+          <el-form-item label="客户代码">
-  
+            <el-select
-  <el-form-item label="年月" style="margin-right: 20px;">
+              v-model="queryParams.customerCode"
-    <el-date-picker
+              placeholder="请选择客户代码"
-      v-model="queryParams.yearsMonthStr"
+              clearable
-      type="month"
+            >
-      placeholder="选择年月"
+              <el-option v-for="(item) in customerList" :key="item.code" :label="item.name" :value="item.code" />
-      format="YYYY-MM"
+            </el-select>
-      value-format="YYYY-MM"
+          </el-form-item>
-      style="width: 100%">
+        </el-col>
-    </el-date-picker>
+        <el-col :span="12">
-  </el-form-item>
+          <el-form-item label="年月">
-</el-form>
+            <el-date-picker
+              v-model="queryParams.yearsMonthStr"
+              type="month"
+              placeholder="选择年月"
+              format="YYYY-MM"
+              value-format="YYYY-MM"
+              style="width: 100%"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
     <el-upload
       ref="uploadRef"
       v-model:file-list="fileList"

src/locales/en-US.ts

@@ -1302,7 +1302,14 @@ export default {
     可开票数量范围是: 'The range of invoices is',
     重新对比: 'Re compare',
     确认对比结果: 'Confirm the comparison results',
-    确认分摊金额: 'Confirm the shared amount'
+    确认分摊金额: 'Confirm the shared amount',
+    导入模具分摊对账单: 'Import mold allocation statement',
+    是否重新比对: 'Do you want to re compare?',
+    是否确认对比结果: 'Are you sure about the comparison results?',
+    是否退回: 'Do you want to return it?',
+    是否作废: 'Do you want to invalidate it?',
+    是否确认分摊金额: 'Do you want to confirm the allocation amount?',
+    创建开票申请: 'Create an invoice request?',
   },
 
 

src/locales/zh-CN.ts

@@ -1301,8 +1301,16 @@ export default {
     发票回转成功: '发票回转成功',
     最后更新人:'最后更新人',
     可开票数量范围是: '可开票数量范围是',
+    重新比对: '重新比对',
     确认对比结果: '确认对比结果',
-    确认分摊金额: '确认分摊金额'
+    确认分摊金额: '确认分摊金额',
+    导入模具分摊对账单: '导入模具分摊对账单',
+    是否重新比对: '是否重新比对？',
+    是否确认对比结果: "是否确认对比结果？",
+    是否退回: '是否退回？',
+    是否作废: '是否作废？',
+    是否确认分摊金额: '是否确认分摊金额？',
+    创建开票申请: '创建开票申请',
   },
 
 }

src/utils/disposition/defaultButtons.ts

@@ -470,7 +470,7 @@ export function mainListCancelBtn(option: any) {
     label: t(`ts.作废`).replace('ts.', ''),
     name: 'cancel',
     hide: false,
-    type: 'primary',
+    type: 'danger',
     color: '',
     link: true, // 文本展现按钮
     hasPermi: ''

src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts

@@ -25,7 +25,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '客户编号',
+    label: '客户代码',
     field: 'customerCode',
     sort: 'custom',
     isSearch: true,
@@ -53,13 +53,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM'
     },
-    table: {
+    isTable:false,
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'YYYY-MM'
-      }
-    },
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -68,6 +62,15 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '年月',
+    field: 'yearsMonthStr',
+    sort: 'custom',
+    detail: {
+      dateFormat: 'YYYY-MM'
+    },
+    isForm:false,
+  },
   {
     label: '状态',
     field: 'status',
@@ -80,145 +83,12 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'Select',
     },
   },
+ 
   {
-    label: '重新比对时间',
+    label: '创建者',
-    field: 'comparisonTime',
-    sort: 'custom',
-    isTable:false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '发布时间',
-    field: 'publishTime',
-    sort: 'custom',
-    isTable:false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '已分摊时间',
-    field: 'shareTime',
-    sort: 'custom',
-    isTable:false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '待开票时间',
-    field: 'beInvoicedTime',
-    sort: 'custom',
-    isTable:false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '开票中时间',
-    field: 'invoicedTime',
-    sort: 'custom',
-    isTable:false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '已开票时间',
-    field: 'issuedInvoicedTime',
-    sort: 'custom',
-    isTable:false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '已作废时间',
-    field: 'abrogateTime',
-    sort: 'custom',
-    isTable:false,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    formatter: dateFormatter,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '操作人',
     field: 'creator',
     sort: 'custom',
   },
-  {
-    label: '版本号',
-    field: 'versionNumber',
-    sort: 'custom',
-  },
-  // {
-  //   label: '备注',
-  //   field: 'remark',
-  //   sort: 'custom',
-  // },
-  // {
-  //   label: '是否可用默认TRUE',
-  //   field: 'available',
-  //   sort: 'custom',
-  // },
   {
     label: '创建时间',
     field: 'createTime',
@@ -238,23 +108,13 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
-  // {
-  //   label: '地点ID',
-  //   field: 'siteId',
-  //   sort: 'custom',
-  // },
-  // {
-  //   label: '并发乐观锁',
-  //   field: 'concurrencyStamp',
-  //   sort: 'custom',
-  // },
   {
     label: '操作',
     isDetail:false,
     field: 'action',
     isForm: false,
     table: {
-      width: 300,
+      width: 360,
       fixed: 'right'
     }
   }
@@ -282,9 +142,6 @@ export const CustomerStatementDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '开票种类',
     field: 'invoiceType',
     sort: 'custom',
-    form: {
-      component: 'SelectV2'
-    },
     isForm: false,
   },
   {

src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue

@@ -72,6 +72,7 @@
   </Detail>
   <!-- 导入 -->
   <ImportCustomerStatementForm ref="importFormRef" url="/wms/customer-statement-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportCustomerStatementShareForm ref="importShareFormRef" url="/wms/customer-tool-apport-statement-detail/import" :importTemplateData="importShareTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
@@ -83,6 +84,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportCustomerStatementForm from '@/components/ImportForm/src/ImportCustomerStatementForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import ImportCustomerStatementShareForm from '@/components/ImportForm/src/ImportCustomerStatementShareForm.vue'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'CustomerStatementMain' })
 
@@ -125,10 +128,8 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   //defaultButtons.defaultAddBtn({hasPermi:'wms:customerStatementMain:create'}), // 新增
-  //defaultButtons.defaultImportBtn({hasPermi:'wms:customerStatementMain:import'}), // 导入
+  defaultButtons.defaultImportBtn({hasPermi:'wms:customer-statement-main:import'}), // 导入
-  //defaultButtons.defaultExportBtn({hasPermi:'wms:customerStatementMain:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'wms:customer-statement-main:export'}), // 导出
-  defaultButtons.defaultImportBtn(null), // 导入
-  defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -168,7 +169,7 @@ const butttondata = (row, $index) => {
     // defaultButtons.mainListEditBtn({hasPermi:'wms:customerStatementMain:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hasPermi:'wms:customerStatementMain:delete'}), // 删除
     { 
-      label: t('重新比对'),
+      label: t('ts.重新比对'),
       name: 'rematch',
       hide: isShowMainButton(row, ['2']),
       type: 'primary',
@@ -178,7 +179,7 @@ const butttondata = (row, $index) => {
       link: true // 文本展现按钮
     },
     {
-      label: t('确认对比结果'),
+      label: t('ts.确认对比结果'),
       name: 'confirmationContrast',
       hide: isShowMainButton(row, ['2']),
       type: 'primary',
@@ -187,18 +188,36 @@ const butttondata = (row, $index) => {
       hasPermi: '',
       link: true // 文本展现按钮
     },
-    defaultButtons.mainSendBackBtn({ hide: isShowMainButton(row, ['3','4','5']) }), // 退回
-    //defaultButtons.mainListCancelBtn({ hide: isShowMainButton(row, ['2','3','4','5']), hasPermi: 'wms:purchase-plan-main:update' }), // 作废
-    defaultButtons.mainListCancelBtn({ hide: isShowMainButton(row, ['2','3','4','5'])}), // 作废
     {
-      label: t('导入'),
+      label:  t('ts.导入模具分摊对账单'),
-      name: 'import',
+      name: 'importShareReconciliation',
       hide: isShowMainButton(row, ['3','4']),
-      type: 'warning',
+      type: 'primary',
+      color: '',
+      hasPermi: '',
+      link: true // 文本展现按钮
+    },
+    {
+      label: t('ts.确认分摊金额'),
+      name: 'confirmShareMoney',
+      hide: isShowMainButton(row, ['4']),
+      type: 'primary',
+      color: '',
+      hasPermi: '',
+      link: true // 文本展现按钮
+    },
+    {
+      label: t('ts.创建开票申请'),
+      name: 'createTicketApply',
+      hide: isShowMainButton(row, ['5']),
+      type: 'primary',
       color: '',
       hasPermi: '',
       link: true // 文本展现按钮
     },
+    defaultButtons.mainSendBackBtn({ hide: isShowMainButton(row, ['3','4','5']) }), // 退回
+    defaultButtons.mainListCancelBtn({ hide: isShowMainButton(row, ['2','3','4','5'])}), // 作废
+   
 
   ]
 }
@@ -209,12 +228,16 @@ const buttonTableClick = async (val, row) => {
     tapRematch(row.id);
   } else if (val == 'confirmationContrast') { // 确认对比结果
     tapConfirmationContrast(row.id)
+  } else if (val == 'importShareReconciliation') { // 导入模具分摊对账单、
+    handleShareImport(row.id)
+  } else if (val == 'confirmShareMoney') { // 确认分摊金额
+    handleConfirmShareMoney(row.id)
+  } else if (val == 'createTicketApply') { // 创建开票申请
+    // handleConfirmShareMoney(row.id)
   }else if (val == 'sendBack') { // 退回
     tapSendBack(row.id)
   }else if (val == 'cancel') { // 作废
     tapCancel(row.id)
-  }else if (val == 'import') { // 导入
-    handleDelete(row.id)
   }
 }
 
@@ -277,8 +300,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await CustomerStatementMainApi.exportCustomerStatementMain(tableObject.params)
-    download.excel(data, '客户对账单主信息表（WMS）.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -287,13 +311,25 @@ const handleExport = async () => {
 
 /** 导入 */
 const importFormRef = ref()
+//导入客户模具分摊对账单
+const importShareFormRef = ref()
 const handleImport = () => {
   importFormRef.value.open()
 }
+const handleShareImport = (id:number) => {
+  importShareTemplateData.customerId = id
+  importShareFormRef.value.open()
+}
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '客户对账单导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
+})
+//导入客户模具对账单参数
+const importShareTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '模具分摊对账单导入模版.xlsx',
+  customerId: 0
 })
 // 导入成功之后
 const importSuccess = () => {
@@ -318,7 +354,7 @@ onMounted(async () => {
 const tapRematch = async (id:number) => {
   try {
     // 确认
-    await message.confirm('是否重新比对')
+    await message.confirm( t('ts.是否重新比对'))
     await CustomerStatementMainApi.recontrast(id);
     // 发起导出
     //exportLoading.value = true
@@ -333,7 +369,7 @@ const tapRematch = async (id:number) => {
 //点击确认对比方法
 const tapConfirmationContrast = async (id:number) => {
   try {
-    await message.confirm('是否确认对比结果')
+    await message.confirm( t('ts.是否确认对比结果'))
     await CustomerStatementMainApi.confirmationContrast(id);
     // 发起导出
     //exportLoading.value = true
@@ -348,7 +384,7 @@ const tapConfirmationContrast = async (id:number) => {
 //点击退回方法
 const tapSendBack = async (id:number) => {
   try {
-    await message.confirm('是否退回')
+    await message.confirm(t('ts.是否退回'))
     await CustomerStatementMainApi.sendBack(id);
     // 发起导出
     //exportLoading.value = true
@@ -363,7 +399,7 @@ const tapSendBack = async (id:number) => {
 //点击作废方法
 const tapCancel = async (id:number) => {
   try {
-    await message.confirm('是否作废')
+    await message.confirm(t('ts.是否作废'))
     await CustomerStatementMainApi.nodeAbrogate(id);
     // 发起导出
     //exportLoading.value = true
@@ -374,14 +410,23 @@ const tapCancel = async (id:number) => {
     await getList()
   }
 }
-
+// 确认分摊金额
-  // 根据状态返回该按钮是否显示
+const handleConfirmShareMoney = async (id:number) => {
-  const isShowMainButton = (row, val) => {
+   try {
-    if (val.indexOf(row.status) > -1) {
+    await message.confirm(t('ts.是否确认分摊金额'))
-      return false
+    await CustomerStatementMainApi.confirmationShare(id);
-    } else {
+  } finally {
-      return true
+    // 刷新列表
-    }
+    await getList()
+  }
+}
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
 }
 const tabCurrent = ref({})
 const changeTabs = async (item) => {
@@ -426,7 +471,7 @@ const changeTabs = async (item) => {
         hasPermi: ''
       },
       {
-        label:'重新对比',
+        label: t('ts.重新对比'),
         name: 'againContrast',
         hide: false,
         type: 'primary',
@@ -453,7 +498,7 @@ const changeTabs = async (item) => {
     apiPage.value = CustomerStatementDetailApi.getCustomerStatementDetailPage
     DetailAllSchemas.value = CustomerStatementShareReconciliation.allSchemas
     otherHeadButttonData.value = [
-       {
+      {
         label: t(`ts.导出`).replace('ts.', ''),
         name: 'exportConfirmShareMoney',
         hide: false,