feat

src/api/InvoiceSales/refund/index.ts

@@ -44,7 +44,5 @@ export const httpDetail = (data: object): ResponseType => {
 
 //退款单审核
 export const httpStatus = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderreturnstatus`, {
-    data
-  });
+  return http.request("post", `${newApi}cxinv/trade/backstatus`, { data });
 };

src/components/PageContent/src/page-content.tsx

@@ -213,6 +213,7 @@ const PageContent = defineComponent({
                         />
                       </ElTooltip>
                     </ElButtonGroup>
+
                     <ElCheckbox label={prop} key={prop} size="small">
                       {label}
                     </ElCheckbox>
@@ -250,7 +251,6 @@ const PageContent = defineComponent({
           paginationSmall={size === "small" ? true : false}
           spanMethod={spanMethod? (data) => spanMethod(data, dataList.value) : undefined}
           rowClassName={tableRowClassName}
-          maxHeight={ maxHeight ? maxHeight : '660px'}
           paginationSmall={ size === "small" ? true : false }
           headerCellStyle={{ background: "#fafafa", color: "#606266" }}
           onSelectionChange={handleSelection}
@@ -284,11 +284,11 @@ const PageContent = defineComponent({
       return (
         <TableProBar
           tableRef={tableRef.value?.getTableRef()}
-          title={title}
-          showTitle={showTitle && title}
+          showTitle={showTitle && !!title}
           dataList={dataList.value}
-          onRefresh={onSearch}
           loading={loading.value}
+          onRefresh={onSearch}
+          title={title}
           custom
           v-slots={{
             buttons: () => renderButtons(),

src/utils/btnList.ts

@@ -63,6 +63,7 @@ const btnList = [
   { code: "064", name: "批量导入发票与订单关联数据" },
   { code: "065", name: "财务审核关联信息" },
   { code: "066", name: "修改关联公司" },
-  { code: '067', name: '待关联发票明细' }
+  { code: '067', name: '待关联发票明细' },
+  { code: '068', name: '导入平台订单回款数据(批量)' }
 ];
 export default btnList;

src/views/InvoiceSales/batchImportYunlong/ProcessModal.vue

@@ -1,11 +1,10 @@
 <script setup lang="ts">
 import { reactive, watch, nextTick, ref } from "vue"
-import { useVModel } from "@vueuse/core"
-import InvoiceTitle from "./InvoiceTitle.vue"
 import { invoiceTypeList, mapInvoiceTypeToLabel, useTypeOptions, mapUseTypeToLabel } from "/@/utils/status"
-import { addition, division } from "/@/utils/calc";
-
 import { httpList, httpAdd } from "/@/api/invoiceSales/batchImportYunlong"
+import { addition, division } from "/@/utils/calc";
+import InvoiceTitle from "./InvoiceTitle.vue"
+import { useVModel } from "@vueuse/core"
 
 
 const props = defineProps<{ 
@@ -26,22 +25,20 @@ const initialData = () => ({
   email: '',
   invtype: '',
   platform_type: '',
-  remark: '',
-  orderArr: []
+  orderArr: [],
+  remark: ''
 })
 
 const state = reactive({ 
-  currentGroup: 1, 
-  groupCount: 0,
   tableloading: false,
   formloading: false,
-  orderData: []
+  orderData: [],
+  currentGroup: 1, 
+  groupCount: 0
 })
 
-
 const formData = ref({ ...initialData() })
 
-
 async function setFormData(groupData: any[]){
   formData.value = {
     email: groupData[0].email,
@@ -100,18 +97,33 @@ async function setFormData(groupData: any[]){
           emit('updateSequenceNo', { sequenceNo, remark: '查询不到该订单', status: 3 })
         })
 
-        data.forEach(sequenceNo => {
-          formData.value.orderArr = formData.value.orderArr.filter(item => item.sequenceNo !== sequenceNo)
-        })
+        data.forEach(sequenceNo => { formData.value.orderArr = formData.value.orderArr.filter(item => item.sequenceNo !== sequenceNo) })
       }
-      
+
+      const noPriceSequenceNos = []
       result.data.forEach(item => {
         const index = formData.value.orderArr.findIndex(({ sequenceNo }) => sequenceNo === item.sequenceNo)
         const target = formData.value.orderArr[index]
         item.current_inv_fee = target.inv_fee
         item.current_inv_num = Number(division(target.inv_fee, item.goodPrice)).toFixed(8)
         formData.value.orderArr[index].num =  item.current_inv_num
+        const { current_inv_fee, ainv_fee,  inv_fee, apay_fee, sequenceNo } = item
+        const invTotal = Number(current_inv_fee) + Number(ainv_fee) + Number(inv_fee)
+        if(invTotal > apay_fee){
+          emit('updateSequenceNo', { sequenceNo, remark: '订单已开票金额+未开票金额+本次开票金额必须小于或等于已认款金额', status: 3 })
+          noPriceSequenceNos.push(sequenceNo)
+        }
       })
+
+      formData.value.orderArr = formData.value.orderArr.filter(({ sequenceNo }) => !noPriceSequenceNos.includes(sequenceNo))
+
+
+      if(formData.value.orderArr.length === 0){
+        onNext()
+        return
+      }
+
+
       state.orderData = result.data
 
       state.formloading = true

src/views/InvoiceSales/batchImportYunlong/index.vue

@@ -133,7 +133,7 @@ initialData()
     v-loading="state.loading"
   >
     <div class="flex w-full">
-      <ElForm label-width="120px">
+      <ElForm label-width="120px" style="width:100%">
         <ElRow>
           <ElCol :span="12">
             <ElFormItem label="销售方公司抬头">

src/views/InvoiceSales/capitalClaim/components/execl-files-business-upload/index.vue

@@ -5,9 +5,9 @@ import { columns, initialColumns, requsetHeaderIdxs, getPropertyAsLabel } from "
 import { ElMessage, ElNotification } from "element-plus";
 import { responseHandle } from "/@/utils/responseHandle";
 import { execlUpload } from "/@/components/execlUpload";
+import { useCompany } from "/@/hooks/core/useCompany";
 import { useNav } from "/@/layout/hooks/nav";
 
-
 const emit = defineEmits(["onSuccess"]);
 
 const visible = ref(false);
@@ -17,6 +17,7 @@ const loading = ref(false);
 const tableData = ref([])
 const { logout } = useNav();
 const columnsConfig = columns();
+const { currentCompany } = useCompany();
 
 
 const visibleHeader = ref(false)
@@ -56,6 +57,19 @@ const Uploadsuccess = ({ results, header }) => {
       tableData.value.push(item);
     });
 
+    const companies = [...new Set(tableData.value.map(({companyNo}) => companyNo))]
+     if(companies.length !== 1){
+      ElMessage.warning('上传数据的收款方公司必须为同一家公司')
+      tableData.value = []      
+      return
+     }
+
+     if(companies[0] !== currentCompany.value.companyNo){
+      ElMessage.warning('上传数据的收款方公司与当前选中的业务公司不一致')
+      tableData.value = []
+      return
+     }
+
     loading.value = false;
     if(isDateError){
       tableData.value = []

src/views/InvoiceSales/capitalClaim/components/execl-files-upload/index.vue

@@ -11,18 +11,20 @@ import { ElMessage, ElNotification } from "element-plus";
 import { responseHandle } from "/@/utils/responseHandle";
 import { useNav } from "/@/layout/hooks/nav";
 import { execlUpload } from "/@/components/execlUpload";
+import { useCompany } from "/@/hooks/core/useCompany";
+
+const emit = defineEmits(["onSuccess"]);
+
 const visible = ref(false);
 const loading = ref(false);
 const tableData = ref([]);
 const columnsConfig = columns();
 const { logout } = useNav();
-const emit = defineEmits(["onSuccess"]);
-
+const { currentCompany } = useCompany();
 
 const visibleHeader = ref(false)
 const importHeader = ref([])
 
-
 const handleClose = () => {
   // execlFile.value = null;
   // uploadRef.value.clearFiles();
@@ -73,6 +75,19 @@ const Uploadsuccess = ({ results, header }) => {
       tableData.value.push(model);
     });
     loading.value = false;
+
+    const companies = [...new Set(tableData.value.map(({value0}) => value0))]
+    if(companies.length !== 1){
+     ElMessage.warning('上传数据的收款方公司必须为同一家公司')
+     tableData.value = []      
+     return
+    }
+
+    if(companies[0] !== currentCompany.value.companyNo){
+     ElMessage.warning('上传数据的收款方公司与当前选中的业务公司不一致')
+     tableData.value = []
+     return
+    }
  
     if(isDateError){
       tableData.value = []
@@ -114,14 +129,17 @@ const handleSubmit = async () => {
       if (requsetHeaderIdxs.includes(i) && !key[i]) { isok = false; }
       item[mapToProp[i]] = key[i]
     }
-
     const newItem: Record<string, any> = { ...item, trade_type: '0' ,trade_remark: '' }
-    const { companyNo, trade_in } = newItem
+    const { companyNo, trade_in, trade_fee } = newItem
     newItem.trade_in_code = companyNo
     newItem.companyName = trade_in
+    newItem.com_total = trade_fee
     data.push(newItem);
   });
 
+  // console.log(data)
+  // return
+
   if (!isok) {
     ElNotification({
       title: "必填字段缺失！",

src/views/InvoiceSales/capitalClaim/config/configs.ts

@@ -363,8 +363,8 @@ export const sale_columns = [
 
 
 export const tradeTypeOptions = [
-  { label: '业务公司回款', value: 0 },
-  { label: '平台公司回款', value: 1 }
+  { label: '自营订单回款', value: 0 },
+  { label: '平台订单回款', value: 1 }
 ]
 
 //销售订单订单类型

src/views/InvoiceSales/capitalClaim/config/content.config.ts

@@ -115,7 +115,10 @@ const columns = [
   {
     label: '业务公司收入总价',
     width: 120,
-    prop: 'comPrice'
+    // prop: 'comPrice',
+    cellRenderer({ row }){
+      return row.trade_type == '0' ? row.total_fee : row.com_total
+    }
   },
   {
     label: '交易用途',

src/views/InvoiceSales/capitalClaim/config/search.config.ts

@@ -55,7 +55,7 @@ const searchFormConfig: FormConfig = {
       span: 8,
       otherOptions: {
         inputGroupOptions: [
-          { value: "name", label: "客户机构名称" },
+          { value: "customerName", label: "客户机构名称" },
           { value: "poCode", label: "客户PO" },
           { value: "NdCode", label: "客户DN" },
           { value: "palt_po", label: "平台采购PO" },

src/views/InvoiceSales/capitalClaim/index.vue

@@ -116,7 +116,6 @@ async function onDownloadCapitalInfo() {
 
 
 function handleShow(row){
-
   visible.value = true
   detailTask.run(httpInfo({ tradNo: row.tradNo }))
 }
@@ -126,7 +125,7 @@ function handleShow(row){
   
   <div class="main capital-claim">
     <PagePower :is-show="hasPermissionWithCode('001')">
-      <div w-full>
+      <div class="w-full">
         <PageSearch
           :form-config="searchFormConfig"
           @search-btn-click="handleSearchClick"
@@ -137,26 +136,27 @@ function handleShow(row){
               <el-button-group>
               <el-button
                 type="warning" plain
-               v-if="!isSuperUser && hasPermissionWithCode('029')"
+               v-if="hasPermissionWithCode('029')"
                @click="onDownloadTemplate">
-                1.下载资金导入模板
+                1.下载自营订单回款资金导入模板
               </el-button>
               <el-button
                 type="primary" plain
                 v-if="!isSuperUser && hasPermissionWithCode('030')"
                 @click="() => execlUploadRef.onDisplay()"
                 >
-                2.导入客户付款资金数据(批量)
+                2.导入自营订单回款资金数据(批量)
               </el-button>
-              <el-button plain type="warning"  @click="onDownloadCapitalTemplate">
-                3.下载平台公司资金导入模板
+              <el-button plain type="warning"  @click="onDownloadCapitalTemplate" >
+                3.下载平台订单回款资金导入模板
               </el-button>
-              <el-button plain type="primary" @click="execlBusinessUploadRef.onDisplay()">
-                4.导入平台公司导入模板
+              <el-button plain type="primary" @click="execlBusinessUploadRef.onDisplay()" v-if="!isSuperUser && hasPermissionWithCode('068')">
+                4.导入平台订单回款资金数据(批量)
               </el-button>
 
-              <el-button 
-                type="success" plain
+              <el-button
+                plain
+                type="success" 
                 v-if="hasPermissionWithCode('057')"
                 @click="() => onDownloadCapitalInfo()"
                :loading="loading" 

src/views/InvoiceSales/capitalPool/base-form/choose-invoice-modal/config/configs.ts

@@ -363,8 +363,8 @@ export const sale_columns = [
 
 
 export const tradeTypeOptions = [
-  { label: '业务公司回款', value: 0 },
-  { label: '平台公司回款', value: 1 }
+  { label: '自营订单回款', value: 0 },
+  { label: '平台订单回款', value: 1 }
 ]
 
 //销售订单订单类型

src/views/InvoiceSales/capitalPool/components/execl-capital-files-upload/index.vue

@@ -69,7 +69,6 @@ const Uploadsuccess = ({ results, header }) => {
     });
 
      const companies = [...new Set(tableData.value.map(({companyNo}) => companyNo))]
-
      if(companies.length !== 1){
       ElMessage.warning('上传数据的收款方公司必须为同一家公司')
       tableData.value = []      
@@ -78,7 +77,7 @@ const Uploadsuccess = ({ results, header }) => {
 
      if(companies[0] !== currentCompany.value.companyNo){
       ElMessage.warning('上传数据的收款方公司与当前选中的业务公司不一致')
-      tableData.value = []      
+      tableData.value = []
       return
      }
 

src/views/InvoiceSales/capitalPool/config/content.config.ts

@@ -129,38 +129,17 @@ const columns = [
     prop: "platName",
     width: "120px"
   },
-  // {
-  //   label: "商品编码",
-  //   prop: "goodNo",
-  //   width: "150px"
-  // },
   {
     label: "商品名称",
     prop: "goodName",
     nimWidth: "160px",
     ...renderIconLabelLeft('goodNo','goodName','商品编码:')
   },
-  // {
-  //   label: "交易银行",
-  //   prop: "trade_bank",
-  //   width: "120px"
-  // },
-  // {
-  //   label: "交易账户",
-  //   prop: "trade_account",
-  //   width: "120px"
-  // },
-
   {
     label: "申请人",
     prop: "apply_name",
     width: "70px"
   },
-  // {
-  //   label: "交易时间",
-  //   prop: "trade_time",
-  //   width: "160px"
-  // },
   {
     label: "认领时间",
     prop: "addtime",

src/views/InvoiceSales/capitalPool/detail.vue

@@ -92,7 +92,7 @@ watchEffect(() => tradeNo.value && requestTradeDetail());
           <!-- 审核 -->
           <ElCollapseItem
             name="5"
-            v-if="currentProcess && !isSuperUser"
+            v-if="currentProcess && !isSuperUser  && hasPermissionWithCode('025')"
             :title="currentProcess.title"
           >
             <component

src/views/InvoiceSales/capitalPool/index.vue

@@ -1,30 +1,31 @@
 <script setup lang="ts">
 import { ref, computed } from "vue";
-import contentConfig from "./config/content.config";
-import searchConfig from "./config/search.config";
-import CapitalModal from "./components/capital-modal.vue";
 import { usePageSearch, type PageHooks, type PageEvents } from "/@/hooks/page";
+import { httpWithdraw, httpBatchStatus } from "/@/api/InvoiceSales/capitalClaim";
+import ExcelCapitalUpload from "./components/execl-capital-files-upload/index.vue";
+import { template, capitalTemplate } from "./config/xls-template";
 import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
 import { usePermission } from "/@/hooks/core/usePermission";
-import { httpWithdraw, httpBatchStatus } from "/@/api/InvoiceSales/capitalClaim";
-import { useAsync } from "/@/hooks/core/useAsync";
-import { useRouter } from "vue-router";
-import { useTask } from "/@/hooks/core"
-import { ElMessage } from "element-plus"
 import { useCompany } from "/@/hooks/core/useCompany";
+import CapitalModal from "./components/capital-modal.vue";
+import contentConfig from "./config/content.config";
 import { httpRequsetExport } from "/@/utils/export";
 import { useUserInfo } from "/@/hooks/core/useUser";
-import { template, capitalTemplate } from "./config/xls-template";
-import ExeclCapitalUpload from "./components/execl-capital-files-upload/index.vue";
+import searchConfig from "./config/search.config";
+import { useAsync } from "/@/hooks/core/useAsync";
+import { ElMessage } from "element-plus";
 import { utils, writeFile } from "xlsx";
+import { useTask } from "/@/hooks/core";
+import { useRouter } from "vue-router";
+
 
 import { cloneDeep } from "lodash-unified";
 
 const PageName = "capitalPool";
 
 const selected = ref([])
-const formRef = ref<any>(null)
 const visible = ref(false)
+const formRef = ref<any>(null)
 
 const loading = ref(false);
 const { currentCompany } = useCompany();
@@ -32,8 +33,6 @@ const formData = ref({ status: '', remark: '' })
 
 const contenConfigtRef = ref(contentConfig)
 
-console.log(contenConfigtRef.value)
-
 const rules = computed(() => ({
   status: [{ required: true, message: "请选择审核状态", trigger: 'change' }],
   remark: [{ required: formData.value.status == '3', message: "请选择审核状态", trigger: 'change' }],
@@ -72,9 +71,10 @@ const events: PageEvents = {
       const { pcData = {} } = data
       const { pcCode } = parameter
       const { balancePrce, totalPrice, tradPrice, usedPrice } = pcData
+      const total = Number(balancePrce) + Number(tradPrice) + Number(usedPrice)
 
-      if(totalPrice != 0){
-        contenConfigtRef.value.title = `批次号总金额:${totalPrice},订单已认领总金额: ${usedPrice},订单认领中总金额: ${tradPrice}, 订单未认领总金额: ${totalPrice}`
+      if(total != 0){
+        contenConfigtRef.value.title = `批次号总金额:${total},订单已认领总金额: ${usedPrice},订单认领中总金额: ${tradPrice}, 订单未认领总金额: ${balancePrce}`
       } else {
         contenConfigtRef.value.title = ''
       }
@@ -122,9 +122,7 @@ async function onDownloadOpenInv() {
     return
   }
 
-
   const { start, end, ...rest } = params
-
   const parameter = { 
     create_start: start, 
     create_end: end,
@@ -144,8 +142,8 @@ async function onDownloadOpenInv() {
   await httpRequsetExport({
     url: "ope",
     name: "资金认领数据表",
-    onStart: () => (loading.value = true),
     onSuccess: () => (loading.value = false),
+    onStart: () => (loading.value = true),
     onFail: () => (loading.value = false),
     params: { ...parameter, company: currentCompany.value.companyNo }
   });
@@ -156,9 +154,9 @@ async function handleBatchSubmit(){
   try{
     await formRef.value?.validate()
     batchTask.run(httpBatchStatus({ 
-      idArr: selected.value.map(({id}) => id),
-     status: formData.value.status,
-     remark: formData.value.remark
+      idArr: selected.value.map(({ id }) => id),
+      status: formData.value.status,
+      remark: formData.value.remark
     }))
   }catch(err){
     console.log(err)
@@ -173,11 +171,11 @@ function handleImportData(){
 <template>
   <div>
     <PageAuth :pageName="PageName" class="capital-claim">
-    <PageContainer 
+      <PageContainer 
       :hooks="hooks" 
-      :events="events" 
-      :content-config="contenConfigtRef" 
+      :events="events"
       :search-config="searchConfig"
+      :content-config="contenConfigtRef" 
       :get-content-ref="ref => pageContentRef = ref"  
        @content-select-change="values => selected = values"
     >
@@ -197,7 +195,8 @@ function handleImportData(){
           placement="top"
           title="是否确认撤销资金认领?" 
           @confirm="() => handleWithDraw({ logNo: row.logNo })"
-          >
+          v-if="hasPermissionWithCode('009') && String(row.status) === '1'" 
+        >
           <template #reference>
             <el-button :icon="useRenderIcon('refresh-right')" type="primary" link />
           </template>
@@ -229,10 +228,10 @@ function handleImportData(){
           </el-button>
         </el-button-group>
       </template>
-    </PageContainer>
-    <CapitalModal ref="capitalModalRef"  />
+      </PageContainer>
+      <CapitalModal ref="capitalModalRef"  />
 
-    <ElDialog v-model="visible" title="批量审批" center @close="formData = { status: '', remark: '' }">
+      <ElDialog v-model="visible" title="批量审批" center @close="formData = { status: '', remark: '' }">
       <ElForm :model="formData" :rules="rules" ref="formRef" v-loading="batchTask.loading">
         <ElFormItem prop="status" label="审核状态">
           <ElSelect placeholder="审核状态" v-model="formData.status" style="width: 100%">
@@ -257,9 +256,9 @@ function handleImportData(){
           </div>
         </ElFormItem>
       </ElForm>
-    </ElDialog>
-  </PageAuth>
+      </ElDialog>
+    </PageAuth>
 
-  <ExeclCapitalUpload ref="execlCapitalUploadRef" @onSuccess="pageContentRef.onSearch()" />
+   <ExeclCapitalUpload ref="execlCapitalUploadRef" @onSuccess="pageContentRef.onSearch()" />
   </div>
 </template>

src/views/InvoiceSales/invoiceApply/components/currentcy-form-wanyu/add-edit-form.vue

@@ -94,10 +94,7 @@ async function handleCompanyChange(companyNo, isSeller = true) {
 }
 
 async function handleSupplierChange(companyNo: string) {
-  // ruleForm.value.buyer = companyName;
-
   const { code, data, message } = await httpCompanylist({ noRela: true, size:1000 });
-
   responseHandle({
     code,
     message,

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

@@ -60,10 +60,7 @@ const invoiceTypes = ref([]);
 const ruleForm = ref({ ...initform });
 const rules = reactive<FormRules>({ ...ADD_EDIT_FORM_RULES });
 
-function handleShowEditModal(_, row: any) {
-
-  editOrderRef.value.onDisplay({  row  });
-}
+function handleShowEditModal(_, row: any) { editOrderRef.value.onDisplay({  row  }); }
 
 function handleEdit({ row, inv_fee, num }) {
   mapSequenceNoToInvfee.value[row.sequenceNo] = {
@@ -124,6 +121,18 @@ function handleSave() {
     }
 
     const { orderArr } = generatorOrderArr();
+    const noPriceSequenceNos = orderList.value.filter(item => {
+      const {ainv_fee,  inv_fee, apay_fee, sequenceNo } = item
+      const { inv_fee: current_inv_fee } = orderArr.find((item) => item.sequenceNo === sequenceNo) || {}
+      const invTotal = Number(current_inv_fee) + Number(ainv_fee) + Number(inv_fee)
+      console.log(invTotal, apay_fee)
+      return invTotal > apay_fee
+    })
+
+    if(noPriceSequenceNos.length !== 0){
+      ElMessage.error(`订单:${noPriceSequenceNos.map(({ sequenceNo }) => sequenceNo)},已开票金额+未开票金额+本次开票金额必须小于或等于已认款金额`);
+      return
+    }
     const total = orderArr.reduce(
       (prev, { inv_fee }) => prev + Number(inv_fee),
       0
@@ -182,6 +191,7 @@ function handleAddOrder(list) {
         num: winv_num,
         platform_type
       };
+
       orderList.value.push(item);
       ruleForm.value.remark += index === 0 ? poCode : ";" + poCode;
     }

src/views/InvoiceSales/refund/config/content.config.ts

@@ -58,27 +58,28 @@ const columns = [
     prop: "cancel_fee"
   },
   {
-    label: '关联资金认领编号',
-    width: 200
-  },
-  {
-    label: "状态",
-    prop: "status",
-    width: 100,
+    label: '操作来源',
+    width: 120,
     cellRenderer: ({ row }) => {
       return h(ElTag, null, {
         default: () =>
-          RETRUN_STATUS.find(s => s.value === String(row.status))?.label || "--"
+          typeOptions.find(s => s.value == row.tag_type)?.label || "--"
       });
     }
   },
   {
-    label: '操作来源',
+    label: '关联资金认领编号',
     width: 120,
+    prop: 'relaNo'
+  },
+  {
+    label: "状态",
+    prop: "status",
+    width: 100,
     cellRenderer: ({ row }) => {
       return h(ElTag, null, {
         default: () =>
-          typeOptions.find(s => s.value == row.tag_type)?.label || "--"
+          RETRUN_STATUS.find(s => s.value === String(row.status))?.label || "--"
       });
     }
   },