feat

src/api/invoiceInOut/inOutManager/index.ts

@@ -0,0 +1,44 @@
+import { http } from "/@/utils/http";
+import { loadEnv } from "@build/index";
+const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL, VITE_WORKORDER_REAL } = loadEnv();
+const userAPi = VITE_PROXY_DOMAIN_REAL;
+const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
+
+const newApi = VITE_WORKORDER_REAL
+
+
+interface ResponseType extends Promise<any> {
+    data?: object; code?: number; msg?: string;
+}
+
+// 添加
+export const httpAdd = (data: object): ResponseType => {
+    return http.request("post", `${newApi}/cxinv/FinancialManager/create`, { data });
+};
+
+// 列表
+export const httpList = (data: object): ResponseType => {
+    return http.request("post", `${newApi}/cxinv/FinancialManager/list`, { data });
+};
+
+export const httpDetail = (data: object): ResponseType => {
+    return http.request("post", `${newApi}/cxinv/FinancialProducts/info`, { data });
+};
+
+export const httpStatus = (data: object): ResponseType => {
+    return http.request("post", `${newApi}/cxinv/FinancialProducts/status`, { data });
+};
+
+export const httpCatist = (data: object): ResponseType => {
+    return http.request("post", `${newApi}/user/TaxCategory/list`, { data });
+};
+
+
+export const httpInvList = (data: object): ResponseType => {
+    return http.request("post", `${yewuApi}orderinvlist`, { data });
+};
+
+
+export const httpCompanies = (data: object): any => {
+    return http.request("post", `${yewuApi}companylist`, { data: { noRela: true, ...data } });
+};

src/components/ReIcon/src/iconifyIconOffline.ts

@@ -47,10 +47,11 @@ import downloadLine from "@iconify-icons/ep/download";
 import QuestionFilled from "@iconify-icons/ep/question-filled";
 import Sort from "@iconify-icons/ep/sort";
 import Management from "@iconify-icons/ep/management";
-
 import VideoPause from "@iconify-icons/ep/video-pause"
+import Compass from "@iconify-icons/ep/compass"
 
 
+addIcon('compass', Compass)
 addIcon('video-pause', VideoPause)
 addIcon("sort", Sort);
 addIcon("Management", Management);

src/store/modules/user.ts

@@ -232,6 +232,7 @@ export const useUserStore = defineStore({
             createMenu('盘点', 'inventoryCheck', 'invoiceInOut/inventoryCheck'),
             createMenu('计提出库明细处理', 'provisionOut', 'invoiceInOut/provisionOut'),
             createMenu('调整单', 'adjustOrder', 'invoiceInOut/adjustOrder'),
+            createMenu('收发存汇总', 'summary', 'invoiceInOut/summary')
           ],
           message: '获取成功'
         }

src/views/invoiceInOut/adjustOrder/config/content.config.ts

@@ -13,18 +13,14 @@ const columns = [
   { label: '税后单价', prop: 'TODO', width: 120 },
   { label: '调整数量', prop: 'TODO', width: 120 },
   { label: '调整金额', prop: 'TODO', width: 120 },
-  { label: '创建人', prop: 'TODO', width: 120 },
-  { label: "操作", fixed: "right", width: 45, slot: "operation" }
+  { label: '创建人', prop: 'TODO', width: 120 }
 ];
 
 const contentConfig: ContentConfig = {
   columns,
   title: "商品管理",
   permissions: ['007'],
-  apis: { 
-    httpList,
-    httpAdd: true
-  }
+  apis: { httpList, httpAdd: true }
 };
 
 export default contentConfig;

src/views/invoiceInOut/inOutManager/components/ChooseGoodModal/config/content.config.ts

@@ -95,7 +95,7 @@ const columns = [
 const contentConfig: ContentConfig = {
   columns,
   apis: { 
-    httpList: (parameter = {}) => httpList({ ...parameter, is_combind: '0' })
+    httpList: (parameter = {}) => httpList(parameter)
   }
 };
 

src/views/invoiceInOut/inOutManager/components/ChooseGoodModal/index.vue

@@ -28,12 +28,25 @@ const events: PageEvents = {
 
 function handleSubmit(){
    if(selection.value.length === 0){
-       ElMessage.warning('请选择至少一个子商品')
+       ElMessage.warning('请选择至少一个商品')
        return
    }
 
+   const result = []
+   selection.value.forEach(single => {
+      if (single.ProductsCombind.length === 0) { 
+        result.push({ ...single, goodNum: 1 })
+      } else {
+        single.ProductsCombind.forEach(child => {
+          result.push({ ...single, goodNum: 1 ,childCode: child.products.skuCode, childNum: single.child_num, childActionNum: single.child_num })
+        })
+      }
+   })
+
+   console.log(result, '~~🚀~~')
+
    visible.value = false
-   emit('submit', selection.value.map(item => ({ ...item, goodNum: 0 })))
+   emit('submit', result)
 }
 </script>
 

src/views/invoiceInOut/inOutManager/components/NotOrderImportModal/columns-config.ts

@@ -1,35 +1,3 @@
-const initheaders = [
-  "买方公司编码",
-  "买方公司名称",
-  "卖方公司编码",
-  "卖方公司名称",
-  "对账编码",
-  "发票类型",
-  "发票代码",
-  "发票号码",
-  "发票税前金额",
-  "发票税后金额",
-  "开票日期",
-  "校验码"
-];
-
-export const mapProp = {
-  value0: "companyNo",
-  value1: "companyName",
-  value2: "supplierNo",
-  value3: "supplierName",
-  value4: "payNo",
-  value5: "invoiceType",
-  value6: "invoiceCode",
-  value7: "invoiceNumber",
-  value8: "inv_subtotal_amount",
-  value9: "inv_total",
-  value10: "open_time",
-  value11: "checkNumber"
-};
-
-export const requireHeaders = [];
-
 const columns = [
   {
     type: "index",
@@ -39,214 +7,281 @@ const columns = [
   },
   {
     label: '业务编号',
-    prop: 'TODO1',
-    minWidth: '100px'
+    prop: 'code',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '类型',
-    prop: 'TODO2',
-    minWidth: '100px'
+    prop: 'type',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
-    label:'订单来源',
-    prop: 'TODO3',
-    minWidth: '100px'
+    label: '订单来源',
+    prop: 'source',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '销售方公司纳税识别号',
-    prop: 'TODO4',
-    minWidth: '140px'
+    prop: 'seller_code',
+    minWidth: '160px',
+    defaultData: '',
+    required: true
   },
   {
     label: '销售方公司',
-    prop: 'TODO5',
-    minWidth: '100px'
+    prop: 'seller_name',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '订单编号',
-    prop: 'TODO6',
-    minWidth: '120px'
+    prop: 'orderCode',
+    minWidth: '120px',
+    defaultData: '',
+    required: true
   },
   {
     label: '订单主单号',
-    prop: 'TODO7',
-    minWidth: '120px'
+    prop: 'cxCode',
+    minWidth: '120px',
+    defaultData: '',
+    required: true
+  },
+  {
+    label: '商品编号',
+    prop: 'goodNo',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
-  // {
-  //   label: '商品编号',
-  //   prop: 'TODO8',
-  //   minWidth: '100px'
-  // },
   {
     label: '商品名称',
-    prop: 'TODO9',
-    minWidth: '100px'
+    prop: 'goodName',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
+  },
+  {
+    label: '单位',
+    prop: 'unit',
+    minWidth: '80px',
+    defaultData: '',
+    required: true
   },
-  // {
-  //   label: '单位',
-  //   prop: 'TODO10',
-  //   minWidth: '80px'
-  // },
   {
     label: '商品数量',
-    prop: 'TODO11',
-    minWidth: '110px'
+    prop: 'num',
+    minWidth: '110px',
+    defaultData: '',
+    required: true
   },
-  // {
-  //   label: '商品数量',
-  //   prop: 'TODO11',
-  //   minWidth: '110px'
-  // },
   {
-    label:'商品单价',
-    prop: 'TODO12',
-    minWidth: '110px'
+    label: '商品单价',
+    prop: 'goodPrice',
+    minWidth: '110px',
+    defaultData: '',
+    required: true
   },
   {
     label: '订单总金额',
-    prop: 'TODO13',
-    minWidth: '110px'
+    prop: 'totalPirce',
+    minWidth: '110px',
+    defaultData: '',
+    required: true
   },
   {
     label: '税目',
-    prop: 'TODO14',
-    minWidth: '80px'
+    prop: 'cat_code',
+    minWidth: '80px',
+    defaultData: '',
+    required: true
   },
   {
     label: '税目名称',
-    prop: 'TODO15',
-    minWidth: '100px'
+    prop: 'cat_name',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '关联金额',
-    prop: 'TODO16',
-    minWidth: '100px'
+    prop: 'relaTotal',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '购买方公司名称',
-    prop: 'TODO17',
-    minWidth: '110px'
+    prop: 'inv_buyer_name',
+    minWidth: '130px',
+    defaultData: '',
+    required: true
   },
   {
     label: '购买方公司纳税识别号',
-    prop: 'TODO18',
-    minWidth: '140px'
+    prop: 'inv_buyer_code',
+    minWidth: '170px',
+    defaultData: '',
+    required: true
   },
   {
     label: '发票号码',
-    prop: 'TODO19',
-    minWidth: '100px'
+    prop: 'inv_number',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '发票类型',
-    prop: 'TODO20',
-    minWidth: '100px'
+    prop: 'inv_type',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
-    label: '销售方公司名称',
-    prop: 'TODO21',
-    minWidth: '110px'
+    label: '发票销售方公司',
+    prop: 'inv_seller_name',
+    minWidth: '130px',
+    defaultData: '',
+    required: true
   },
   {
-    label: '销售方公司纳税号',
-    prop: 'TODO22',
-    minWidth: '140px'
+    label: '发票销售方公司纳税号',
+    prop: 'inv_seller_code',
+    minWidth: '170px',
+    defaultData: '',
+    required: true
   },
   {
     label: '发票明细ID',
-    prop: 'TODO23',
-    minWidth: '110px'
+    prop: 'inv_item_id',
+    minWidth: '110px',
+    defaultData: '',
+    required: true
   },
   {
     label: '货物或应税劳务、服务名称',
     prop: 'TODO24',
-    minWidth: '200px'
+    minWidth: '200px',
+    defaultData: '',
+    required: true
   },
   {
     label: '类目编号',
-    prop: 'TODO25',
-    minWidth: '90px'
+    prop: 'inv_cat_code',
+    minWidth: '90px',
+    defaultData: '',
+    required: true
   },
   {
     label: '规格型号',
-    prop: 'TODO27',
-    minWidth: '110px'
+    prop: 'inv_spec',
+    minWidth: '110px',
+    defaultData: '',
+    required: true
   },
   {
-    label: '单位',
-    prop: 'TODO28',
-    minWidth: '80px'
+    label: '发票商品单位',
+    prop: 'inv_unit',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
-    label: '数量',
-    prop: 'TODO29',
-    minWidth: '80px'
+    label: '发票商品数量',
+    prop: 'inv_num',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '税前单价',
-    prop: 'TODO30',
-    minWidth: '100px'
+    prop: 'inv_price',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '税前总价',
-    prop: 'TODO30',
-    minWidth: '100px'
+    prop: 'inv_subprice',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '税率',
-    prop: 'TODO31',
-    minWidth: '80px'
+    prop: 'inv_tax',
+    minWidth: '80px',
+    defaultData: '',
+    required: true
   },
   {
     label: '税后单价',
-    prop: 'TODO32',
-    minWidth: '100px'
+    prop: 'inv_price',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '税后总额',
-    prop: 'TODO33',
-    minWidth: '100px'
+    prop: 'inv_total',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '类目编号状态',
     prop: 'TODO34',
-    minWidth: '100px'
+    minWidth: '100px',
+    defaultData: '',
+    required: false
   },
   {
     label: '税率状态',
     prop: 'TODO35',
-    minWidth: '100px'
+    minWidth: '100px',
+    defaultData: '',
+    required: false
   },
   {
     label: '备注',
-    prop: 'TODO36',
-    minWidth: '80px'
+    prop: 'remark',
+    minWidth: '80px',
+    defaultData: '',
+    required: true
   },
   {
-    label: '商品编号',
+    label: '入账月份',
     prop: 'TODO37',
-    minWidth: '90px'
-  },
-  {
-    label: '操作数量',
-    prop: 'TODO38',
-    minWidth: '90px'
-  },
-  {
-    label: '子商品编号',
-    prop: 'TODO39',
-    minWidth: '100px'
-  },
-  {
-    label: '子商品操作数量',
-    prop: 'TODO40',
-    minWidth: '110px'
+    minWidth: '80px',
+    defaultData: '',
+    required: true
   }
 ]
 
-
 const notOrderTemplate = [columns.slice(1).reduce((prev, current) => {
-  return {...prev, [current.label] : current.detaultData ? current.defaultData : ''}
+  return { ...prev, [current.label]: current.defaultData ? current.defaultData : '' }
 }, {})]
 
-export { initheaders, columns, notOrderTemplate };
+
+export const mapLabelToProp = columns.reduce((prev, current) => ({
+  ...prev,
+  [current.label]: current.prop
+}), {})
+
+
+export const mapPropertyToLabel = columns.reduce((prev, current) => ({
+  ...prev,
+  [current.prop]: current.label
+}), {})
+
+export const requiredProps = columns.filter(column => !!column.required).map(item => item.prop)
+
+export { columns, notOrderTemplate };

src/views/invoiceInOut/inOutManager/components/NotOrderImportModal/index.vue

@@ -1,38 +1,22 @@
 <script setup lang="ts">
 import { ref, h } from "vue";
-import { ElButton, ElDialog, ElMessage,ElMessageBox } from "element-plus";
-import { execlUpload } from "/@/components/execlUpload";
+import { ElButton, ElDialog, ElMessage } from "element-plus";
 import { httpBatchAdd } from "/@/api/purchase/ticketReturn";
+import { execlUpload } from "/@/components/execlUpload";
 import { useResponseHandle } from "/@/hooks";
-import { useCompany } from "/@/hooks/core/useCompany";
-import { cg_inv_type_list } from "/@/utils/status";
 import { useVModel } from "@vueuse/core";
-import dayjs from "dayjs"
-
-import {
-  initheaders,
-  columns,
-  mapProp,
-  requireHeaders
-} from "./columns-config";
 
-console.log(columns)
+import { columns, mapLabelToProp } from "./columns-config";
+import { isImportDataValid } from "./validator";
 
 
 const loading = ref(false);
 const tableData = ref([]);
 
-const props = defineProps<{ visible: boolean }>()
 const emit = defineEmits(["onSuccess"]);
-
-const allTypes = cg_inv_type_list.map(({ label }) => label);
-const row = ref(1);
+const props = defineProps<{ visible: boolean }>()
 
 const visible = useVModel(props, 'visible')
-
-
-const { currentCompany } = useCompany();
-
 const responseHandle = useResponseHandle();
 
 const Uploadsuccess = ({ results, header }) => {
@@ -45,15 +29,12 @@ const Uploadsuccess = ({ results, header }) => {
 
   let headok = true;
 
-  console.log(header.length, columns.length - 1)
   if (header.length !== columns.length - 1) {
     headok = false;
   } else {
     columns.slice(1).forEach((si, sii) => {
-
-      console.log(si.label, sii)
-      if (si.label !== header[sii]) {
-        headok = false;
+      if (si.label !== header[sii]) { 
+        headok = false; 
       }
     });
   }
@@ -66,56 +47,19 @@ const Uploadsuccess = ({ results, header }) => {
 
   tableData.value = [];
 
-  for (const v1 of results) {
-    const b = Object.values(v1);
-    let model = {};
-    b.forEach((si, sii) => { model["value" + sii] = si + ""; });
-    tableData.value.push(model);
-    row.value = row.value + 1;
-  }
-
-    const data = [];
-   tableData.value.forEach((key, index) => {
-      const obj: Record<string, string> = {};
-
-      for (let i in key) {
-        const prop = mapProp[i];
-        const value = key[i];
-        obj[prop] = value;
-     }
-      
-      data.push(obj);
-    });
-
-
-    const typeErrors: string[] = [];
-    const checkErrors: string[] = [];
-    
-    const now = dayjs(new Date()).format('YYYY-MM-DD');
-
-    data.forEach((row, index) => {
-      const source = row.invoiceType.trim();
-      const target = cg_inv_type_list.find(({ label }) => label === source);
+  const result = []
+  for(const tableItem of results){
 
-      if (!target) {
-        typeErrors.push(String(index + 1));
-      } else {
-        row.invoiceType = target.value;
+    const item = {}
+    Object.keys(tableItem).forEach(label => {
+      const prop = mapLabelToProp[label]
+      item[prop] = tableItem[label]
+    })
 
-        if (
-          (target.value === "normal" || target.value === "electronic") &&
-          !row.checkNumber
-        ) {
-          checkErrors.push(String(index + 1));
-        }
-      }
-    });
-
-    if (typeErrors.length > 0) {
-      loading.value = false;
-      return;
-    }
+    result.push(item)
+  }
 
+  if(isImportDataValid(result)){ tableData.value = result }
   loading.value = false;
 };
 
@@ -126,57 +70,8 @@ const handleSubmit = async () => {
     loading.value = true;
     const data = [];
 
-    tableData.value.forEach((key, index) => {
-      const obj: Record<string, string> = {};
-
-      for (let i in key) {
-        const prop = mapProp[i];
-        const value = key[i];
-        obj[prop] = value;
-      }
-      data.push(obj);
-    });
-
-    data.forEach((row, index) => {
-      const source = row.invoiceType.trim();
-      const target = cg_inv_type_list.find(({ label }) => label === source);
-      row.invoiceType = target.value;
-    });
-
-
-    const buyers = data.map(({ supplierNo }) => supplierNo);
-    const setBuyers = [...new Set(buyers)];
-
-    if (setBuyers.length > 1) {
-      ElMessage.error("卖方公司编码不一致");
-      loading.value = false;
-      return;
-    }
 
-    const companyNo = data[0].supplierNo;
-
-    if(companyNo != currentCompany.value.companyNo){
-      ElMessage.error("卖方公司编码与当前选中的公司不一致");
-      loading.value = false;
-      return;
-    }
-
-    data.forEach(item => {
-      const isFullyElectionic = item.invoiceType === 'fully_digitalized_special_electronic' || item.invoiceType === 'fully_digitalized_normal_electronic'
-      if(isFullyElectionic){ item.inv_subtotal_amount = item.inv_total }
-      
-      delete item['inv_total']
-      delete item["supplierNo"];
-      delete item["supplierName"];
-      delete item["companyName"];
-      delete item["companyNo"];
-    });
-    const { code, message,data: _d } = await httpBatchAdd({
-      list: data,
-      companyNo,
-      is_comon: '0'
-      // relaComNo: currentCompany.value.companyNo
-    });
+    const { code, message,data: _d } = await httpBatchAdd({});
 
     loading.value = false;
 
@@ -188,19 +83,6 @@ const handleSubmit = async () => {
         ElMessage.success("数据导入成功！");
         emit("onSuccess");
         visible.value = false;
-      },
-       onError() {
-        if (Number(code) === 10004) {
-          ElMessageBox({
-            title: '以下对账单不符合要求',
-            message: h('div', null, [
-              h('p', null, '当前功能仅支持业务类型为采购订单的对账单,以下通用订单类型的对账单不支持该功能：'),
-              h('p', null, _d.join('、')),
-            ])
-          })
-         }else {
-          ElMessage.warning(message)
-         }
       }
     });
   } catch (err) { 
@@ -214,9 +96,9 @@ const cancel = () => {
 
 <template>
   <ElDialog
-    :close-on-click-modal="false"
     v-model="visible"
-    title="非订单商品导入"
+    :close-on-click-modal="false"
+    title="订单商品导入"
     width="1040px"
     top="8vh"
     center
@@ -241,7 +123,7 @@ const cancel = () => {
         :key="sii"
       >
         <template #header>
-          <span v-if="!requireHeaders.includes(mapProp[si.prop]) || si.label === '序号' ">
+          <span v-if="!si.required">
             {{ si.label }}
           </span>
           

src/views/invoiceInOut/inOutManager/components/NotOrderImportModal/validator.ts

@@ -0,0 +1,72 @@
+import { ElMessageBox } from "element-plus"
+import { mapPropertyToLabel, requiredProps } from "./columns-config"
+import { h } from "vue"
+import { mapLabelToSource, mapLabelToType, sourceOptions, typeOptions } from "../../config/shared"
+
+
+
+function onDisplayErrorMessage(errors) {
+    ElMessageBox({
+        type: 'warning',
+        title: '数据校验失败',
+        message: h('div', { style: 'display: flex, flex-direction:column' }, {
+            default: () => Object.keys(errors).reduce((prev, index) => {
+                return [
+                    ...prev,
+                    h('p', {}, '第' + index  + '行,' + errors[index])
+                ]
+            }, [])
+        })
+    })
+}
+
+
+export function isValidRequired(results: any[]) {
+    const errors = {}
+
+    let isTypeError = false
+    let isSourceError = false
+
+    for (const sourceIndex in results) {
+        const item = results[sourceIndex];
+        const index = Number(sourceIndex) + 1;
+
+        for (const key in item) {
+            const value = String(item[key]).trim()
+            if (requiredProps.includes(key) && (!value || !String(value).trim())) {
+                if (errors[index]) {
+                    errors[index] = errors[index] += '、' + mapPropertyToLabel[key]
+                } else {
+                    errors[index] = mapPropertyToLabel[key]
+                }
+            } else if (key === 'type' && !mapLabelToType[value]){
+                isTypeError = true
+            } else if (key === 'source' && !mapLabelToSource[value]) {
+                isSourceError = true
+            }
+        }
+
+        if (errors[index]) {
+            errors[index] += '不能为空'
+            if (isTypeError) errors[index] += ' , 类型必须为' + typeOptions.map(({ label }) => label).join('、')
+            if (isSourceError) errors[index] += ' ,订单来源必须为' + sourceOptions.map(({ label }) => label).join('、')
+        } else {
+            if (isTypeError) errors[index] = '类型必须为' + typeOptions.map(({ label }) => label).join('、')
+            if (isSourceError) errors[index] = ' 订单来源必须为' + sourceOptions.map(({ label }) => label).join('、')
+        }
+    }
+
+
+    if (Object.keys(errors).length === 0) {
+        return true
+    } else {
+        onDisplayErrorMessage(errors)
+        return false
+    }
+}
+
+export function isImportDataValid(results: any[]) {
+    /* 校验必填字段是否填入 */
+    if (!isValidRequired(results)) { return false }
+    return true
+}

src/views/invoiceInOut/inOutManager/components/OrderImportModal/columns-config.ts

@@ -1,35 +1,3 @@
-const initheaders = [
-  "买方公司编码",
-  "买方公司名称",
-  "卖方公司编码",
-  "卖方公司名称",
-  "对账编码",
-  "发票类型",
-  "发票代码",
-  "发票号码",
-  "发票税前金额",
-  "发票税后金额",
-  "开票日期",
-  "校验码"
-];
-
-export const mapProp = {
-  value0: "companyNo",
-  value1: "companyName",
-  value2: "supplierNo",
-  value3: "supplierName",
-  value4: "payNo",
-  value5: "invoiceType",
-  value6: "invoiceCode",
-  value7: "invoiceNumber",
-  value8: "inv_subtotal_amount",
-  value9: "inv_total",
-  value10: "open_time",
-  value11: "checkNumber"
-};
-
-export const requireHeaders = [];
-
 const columns = [
   {
     type: "index",
@@ -39,198 +7,288 @@ const columns = [
   },
   {
     label: '业务编号',
-    prop: 'TODO1',
-    minWidth: '100px'
+    prop: 'invoiceCode',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '类型',
-    prop: 'TODO2',
-    minWidth: '100px'
+    prop: 'type',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label:'订单来源',
-    prop: 'TODO3',
-    minWidth: '100px'
+    prop: 'source',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '销售方公司纳税识别号',
-    prop: 'TODO4',
-    minWidth: '140px'
+    prop: 'seller_code',
+    minWidth: '160px',
+    defaultData: '',
+    required: true
   },
   {
     label: '销售方公司',
-    prop: 'TODO5',
-    minWidth: '100px'
+    prop: 'seller_name',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '订单编号',
-    prop: 'TODO6',
-    minWidth: '120px'
+    prop: 'orderCode',
+    minWidth: '120px',
+    defaultData: '',
+    required: true
   },
   {
     label: '订单主单号',
-    prop: 'TODO7',
-    minWidth: '120px'
+    prop: 'cxCode',
+    minWidth: '120px',
+    defaultData: '',
+    required: true
   },
   {
     label: '商品编号',
-    prop: 'TODO8',
-    minWidth: '100px'
+    prop: 'goodNo',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '商品名称',
-    prop: 'TODO9',
-    minWidth: '100px'
+    prop: 'goodName',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '单位',
-    prop: 'TODO10',
-    minWidth: '80px'
+    prop: 'unit',
+    minWidth: '80px',
+    defaultData: '',
+    required: true
   },
-  // {
-  //   label: '商品数量',
-  //   prop: 'TODO11',
-  //   minWidth: '110px'
-  // },
   {
     label: '商品数量',
-    prop: 'TODO11',
-    minWidth: '110px'
+    prop: 'num',
+    minWidth: '110px',
+    defaultData: '',
+    required: true
   },
   {
     label:'商品单价',
-    prop: 'TODO12',
-    minWidth: '110px'
+    prop: 'goodPrice',
+    minWidth: '110px',
+    defaultData: '',
+    required: true
   },
   {
     label: '订单总金额',
-    prop: 'TODO13',
-    minWidth: '110px'
+    prop: 'totalPrice',
+    minWidth: '110px',
+    defaultData: '',
+    required: true
   },
   {
     label: '税目',
-    prop: 'TODO14',
-    minWidth: '80px'
+    prop: 'cat_code',
+    minWidth: '80px',
+    defaultData: '',
+    required: true
   },
   {
     label: '税目名称',
-    prop: 'TODO15',
-    minWidth: '100px'
+    prop: 'cat_name',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
+  },
+  {
+    label: '税率',
+    prop: 'tax',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '关联金额',
-    prop: 'TODO16',
-    minWidth: '100px'
+    prop: 'relaTotal',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '购买方公司名称',
-    prop: 'TODO17',
-    minWidth: '110px'
+    prop: 'inv_buyer_name',
+    minWidth: '130px',
+    defaultData: '',
+    required: true
   },
   {
     label: '购买方公司纳税识别号',
-    prop: 'TODO18',
-    minWidth: '140px'
+    prop: 'inv_buyer_code',
+    minWidth: '170px',
+    defaultData: '',
+    required: true
   },
   {
     label: '发票号码',
-    prop: 'TODO19',
-    minWidth: '100px'
+    prop: 'inv_number',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '发票类型',
-    prop: 'TODO20',
-    minWidth: '100px'
+    prop: 'inv_type',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
-    label: '销售方公司名称',
-    prop: 'TODO21',
-    minWidth: '110px'
+    label: '发票销售方公司',
+    prop: 'inv_seller_name',
+    minWidth: '130px',
+    defaultData: '',
+    required: true
   },
   {
-    label: '销售方公司纳税号',
-    prop: 'TODO22',
-    minWidth: '140px'
+    label: '发票销售方公司纳税号',
+    prop: 'inv_seller_code',
+    minWidth: '170px',
+    defaultData: '',
+    required: true
   },
   {
     label: '发票明细ID',
-    prop: 'TODO23',
-    minWidth: '110px'
+    prop: 'inv_item_id',
+    minWidth: '110px',
+    defaultData: '',
+    required: true
   },
   {
     label: '货物或应税劳务、服务名称',
-    prop: 'TODO24',
-    minWidth: '200px'
+    prop: 'nv_good_name',
+    minWidth: '200px',
+    defaultData: '',
+    required: true
   },
   {
     label: '类目编号',
-    prop: 'TODO25',
-    minWidth: '90px'
+    prop: 'inv_cat_code',
+    minWidth: '90px',
+    defaultData: '',
+    required: true
   },
   {
     label: '规格型号',
-    prop: 'TODO27',
-    minWidth: '110px'
+    prop: 'inv_spec',
+    minWidth: '110px',
+    defaultData: '',
+    required: true
+  },
+  {
+    label: '发票商品单位',
+    prop: 'inv_unit',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
-  // {
-  //   label: '单位',
-  //   prop: 'TODO28',
-  //   minWidth: '80px'
-  // },
   {
-    label: '数量',
-    prop: 'TODO29',
-    minWidth: '80px'
+    label: '发票商品数量',
+    prop: 'inv_num',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '税前单价',
-    prop: 'TODO30',
-    minWidth: '100px'
+    prop: 'inv_price',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '税前总价',
-    prop: 'TODO30',
-    minWidth: '100px'
+    prop: 'inv_subprice',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
-    label: '税率',
-    prop: 'TODO31',
-    minWidth: '80px'
+    label: '发票税率',
+    prop: 'inv_tax',
+    minWidth: '80px',
+    defaultData: '',
+    required: true
   },
   {
     label: '税后单价',
-    prop: 'TODO32',
-    minWidth: '100px'
+    prop: 'inv_price',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '税后总额',
-    prop: 'TODO33',
-    minWidth: '100px'
+    prop: 'inv_total',
+    minWidth: '100px',
+    defaultData: '',
+    required: true
   },
   {
     label: '类目编号状态',
     prop: 'TODO34',
-    minWidth: '100px'
+    minWidth: '100px',
+    defaultData: '',
+    required: false
   },
   {
     label: '税率状态',
     prop: 'TODO35',
-    minWidth: '100px'
+    minWidth: '100px',
+    defaultData: '',
+    required: false
   },
   {
     label: '备注',
-    prop: 'TODO36',
-    minWidth: '80px'
+    prop: 'remark',
+    minWidth: '80px',
+    defaultData: '',
+    required: true
   },
   {
     label: '入账月份',
     prop: 'TODO37',
-    minWidth: '80px'
+    minWidth: '80px',
+    defaultData: '',
+    required: true
   }
 ]
 
 const orderTemplate = [columns.slice(1).reduce((prev, current) => {
-  return { ...prev, [current.label]: current.detaultData ? current.defaultData : '' }
+  return { ...prev, [current.label]: current.defaultData ? current.defaultData : '' }
 }, {})]
 
-export { initheaders, columns, orderTemplate };
+
+export const mapLabelToProp = columns.reduce((prev, current) => ({
+  ...prev,
+  [current.label]: current.prop
+}), {})
+
+
+export const mapPropertyToLabel = columns.reduce((prev, current) => ({
+  ...prev,
+  [current.prop]: current.label
+}), {})
+
+export const requiredProps = columns.filter(column => !!column.required).map(item => item.prop)
+
+export { columns, orderTemplate };

src/views/invoiceInOut/inOutManager/components/OrderImportModal/index.vue

@@ -1,36 +1,25 @@
 <script setup lang="ts">
 import { ref, h } from "vue";
-import { ElButton, ElDialog, ElMessage,ElMessageBox } from "element-plus";
-import { execlUpload } from "/@/components/execlUpload";
+import { ElButton, ElDialog, ElMessage } from "element-plus";
 import { httpBatchAdd } from "/@/api/purchase/ticketReturn";
-import { useCompany } from "/@/hooks/core/useCompany";
-import { cg_inv_type_list } from "/@/utils/status";
+import { execlUpload } from "/@/components/execlUpload";
 import { useResponseHandle } from "/@/hooks";
 import { useVModel } from "@vueuse/core";
-import dayjs from "dayjs"
 
-import {
-  initheaders,
-  columns,
-  mapProp,
-  requireHeaders
-} from "./columns-config";
+import { columns, mapLabelToProp } from "./columns-config";
+import { isImportDataValid } from "./validator";
+import { httpAdd } from "/@/api/invoiceInOut/inOutManager";
+import { mapLabelToSource, mapLabelToType } from "../../config/shared";
+
 
 
 const loading = ref(false);
 const tableData = ref([]);
 
-const props = defineProps<{ visible: boolean }>()
 const emit = defineEmits(["onSuccess"]);
+const props = defineProps<{ visible: boolean }>()
 
-const row = ref(1);
-const allTypes = cg_inv_type_list.map(({ label }) => label);
 const visible = useVModel(props, 'visible')
-
-const createInvErrorMessage = (row: string) => `导入数据第 ${row} 行 发票类型格式不正确,发票类型必须为${allTypes.join(",")}`;
-
-const { currentCompany } = useCompany();
-
 const responseHandle = useResponseHandle();
 
 const Uploadsuccess = ({ results, header }) => {
@@ -61,36 +50,19 @@ const Uploadsuccess = ({ results, header }) => {
 
   tableData.value = [];
 
-  for (const v1 of results) {
-    const b = Object.values(v1);
-    let model = {};
-    b.forEach((si, sii) => { model["value" + sii] = si + ""; });
-    tableData.value.push(model);
-    row.value = row.value + 1;
-  }
-
-    const data = [];
-   tableData.value.forEach((key) => {
-      const obj: Record<string, string> = {};
-
-      for (let i in key) {
-        const prop = mapProp[i];
-        const value = key[i];
-        obj[prop] = value;
-     }
-      
-      data.push(obj);
-    });
+  const result = []
+  for(const tableItem of results){
 
+    const item = {}
+    Object.keys(tableItem).forEach(label => {
+      const prop = mapLabelToProp[label]
+      item[prop] = tableItem[label]
+    })
 
-  const openDateErrors: string[] = [];
-  const now = dayjs(new Date()).format('YYYY-MM-DD');
-
-    data.forEach((row, index) => {
- 
-    });
-
+    result.push(item)
+  }
 
+  if(isImportDataValid(result)){ tableData.value = result }
   loading.value = false;
 };
 
@@ -99,58 +71,23 @@ const handleSubmit = async () => {
   try {
     if (loading.value) return;
     loading.value = true;
-    const data = [];
-
-    tableData.value.forEach((key) => {
-      const obj: Record<string, string> = {};
 
-      for (let i in key) {
-        const prop = mapProp[i];
-        const value = key[i];
-        obj[prop] = value;
-      }
-      data.push(obj);
-    });
+    const list = [];
 
-    data.forEach((row) => {
-      const source = row.invoiceType.trim();
-      const target = cg_inv_type_list.find(({ label }) => label === source);
-      row.invoiceType = target.value;
-    });
+    tableData.value.forEach(item => {
+      list.push({ 
+        ...item, 
+        source: mapLabelToSource[item.source], 
+        type: mapLabelToType[item.type],
+        buyer_name: item.inv_buyer_name,
+        buyer_code: item.inv_buyer_code,
+        platform_type: '1',
+        channel: '1',
+        goodType: '1'
+      })
+    })
 
-    const buyers = data.map(({ supplierNo }) => supplierNo);
-    const setBuyers = [...new Set(buyers)];
-
-    if (setBuyers.length > 1) {
-      ElMessage.error("卖方公司编码不一致");
-      loading.value = false;
-      return;
-    }
-
-    const companyNo = data[0].supplierNo;
-
-    if(companyNo != currentCompany.value.companyNo){
-      ElMessage.error("卖方公司编码与当前选中的公司不一致");
-      loading.value = false;
-      return;
-    }
-
-    data.forEach(item => {
-      const isFullyElectionic = item.invoiceType === 'fully_digitalized_special_electronic' || item.invoiceType === 'fully_digitalized_normal_electronic'
-      if(isFullyElectionic){ item.inv_subtotal_amount = item.inv_total }
-      
-      delete item['inv_total']
-      delete item["supplierNo"];
-      delete item["supplierName"];
-      delete item["companyName"];
-      delete item["companyNo"];
-    });
-    const { code, message,data: _d } = await httpBatchAdd({
-      list: data,
-      companyNo,
-      is_comon: '0'
-      // relaComNo: currentCompany.value.companyNo
-    });
+    const { code, message,data: _d } = await httpAdd({ list });
 
     loading.value = false;
 
@@ -162,19 +99,6 @@ const handleSubmit = async () => {
         ElMessage.success("数据导入成功！");
         emit("onSuccess");
         visible.value = false;
-      },
-       onError() {
-        if (Number(code) === 10004) {
-          ElMessageBox({
-            title: '以下对账单不符合要求',
-            message: h('div', null, [
-              h('p', null, '当前功能仅支持业务类型为采购订单的对账单,以下通用订单类型的对账单不支持该功能：'),
-              h('p', null, _d.join('、')),
-            ])
-          })
-         }else {
-          ElMessage.warning(message)
-         }
       }
     });
   } catch (err) { 
@@ -215,7 +139,7 @@ const cancel = () => {
         :key="sii"
       >
         <template #header>
-          <span v-if="!requireHeaders.includes(mapProp[si.prop]) || si.label === '序号' ">
+          <span v-if="!si.required">
             {{ si.label }}
           </span>
           

src/views/invoiceInOut/inOutManager/components/OrderImportModal/validator.ts

@@ -0,0 +1,72 @@
+import { ElMessageBox } from "element-plus"
+import { mapPropertyToLabel, requiredProps } from "./columns-config"
+import { h } from "vue"
+import { mapLabelToSource, mapLabelToType, sourceOptions, typeOptions } from "../../config/shared"
+
+
+
+function onDisplayErrorMessage(errors) {
+    ElMessageBox({
+        type: 'warning',
+        title: '数据校验失败',
+        message: h('div', { style: 'display: flex, flex-direction: column' }, {
+            default: () => Object.keys(errors).reduce((prev, index) => {
+                return [
+                    ...prev,
+                    h('p', {}, '第' + index  + '行,' + errors[index])
+                ]
+            }, [])
+        })
+    })
+}
+
+
+export function isValidRequired(results: any[]) {
+    const errors = {}
+
+    let isTypeError = false
+    let isSourceError = false
+
+    for (const sourceIndex in results) {
+        const item = results[sourceIndex];
+        const index = Number(sourceIndex) + 1;
+
+        for (const key in item) {
+            const value = String(item[key]).trim()
+            if (requiredProps.includes(key) && (!value || !String(value).trim())) {
+                if (errors[index]) {
+                    errors[index] = errors[index] += '、' + mapPropertyToLabel[key]
+                } else {
+                    errors[index] = mapPropertyToLabel[key]
+                }
+            } else if (key === 'type' && !mapLabelToType[value]){
+                isTypeError = true
+            } else if (key === 'source' && !mapLabelToSource[value]) {
+                isSourceError = true
+            }
+        }
+
+        if (errors[index]) {
+            errors[index] += '不能为空'
+            if (isTypeError) errors[index] += ' , 类型必须为' + typeOptions.map(({ label }) => label).join('、')
+            if (isSourceError) errors[index] += ' ,订单来源必须为' + sourceOptions.map(({ label }) => label).join('、')
+        } else {
+            if (isTypeError) errors[index] = '类型必须为' + typeOptions.map(({ label }) => label).join('、')
+            if (isSourceError) errors[index] = ' 订单来源必须为' + sourceOptions.map(({ label }) => label).join('、')
+        }
+    }
+
+
+    if (Object.keys(errors).length === 0) {
+        return true
+    } else {
+        onDisplayErrorMessage(errors)
+        return false
+    }
+}
+
+export function isImportDataValid(results: any[]) {
+    /* 校验必填字段是否填入 */
+    if (!isValidRequired(results)) { return false }
+    return true
+}

src/views/invoiceInOut/inOutManager/config/content.config.ts

@@ -1,23 +1,111 @@
 import { ContentConfig } from "/@/components/PageContent";
-import { httpList } from "/@/api/invoiceInOut/productManager";
-
-import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
+import { httpList } from "/@/api/invoiceInOut/inOutManager";
+import { h } from "vue";
+import { ElTag } from "element-plus";
+import { typeOptions, sourceOptions, statusOptions } from "./shared";
 
 const columns = [
-  { label: "业务编号", prop: "TODO", width: 150 },
-  { label: "类型", prop: "TODO", width: 160 },
-  { label: '数据来源', width: 160 },
-  { label: "状态", prop: "TODO", width: 100 },
-  { label: '异常原因', prop: 'TODO', width: 120 },
-  { label: '销售方公司纳税识别号', prop: 'TODO', width: 200 },
-  { label: '销售方公司', prop: 'TODO', width: 120 },
-  { label: '订单编号', prop: 'TODO', width: 120 },
-  { label: "订单主编号", prop: "TODO", width: 120 },
-  { label: "商品编号", prop: "TODO", width: 120 },
-  { label: "商品名称", prop: "TODO", width: 120 },
-  { label: "单位", prop: "TODO", width: 60 },
-  { label: '商品数量', prop: 'TODO', width: 100 },
-  { label: '商品单价', prop: 'TODO', width: 100 },
+  { 
+    label: "业务编号", 
+    prop: "invoiceCode", 
+    width: 150 
+  },
+
+  { 
+    label: "类型", 
+    width: 80,
+    cellRenderer({ row }){
+      return h(ElTag, { type: 'primary', size: 'small' }, {
+        default: () => typeOptions.find(item => item.value == row.type)?.label
+      })
+    } 
+  },
+
+  { 
+    label: '数据来源', 
+    width: 90,
+    cellRenderer({ row }){
+      return h(ElTag, { type: 'primary', size: 'small' }, {
+        default: () => sourceOptions.find(item => item.value == row.source)?.label
+      })
+    } 
+  },
+
+
+  { 
+    label: "状态", 
+    width: 80,
+    cellRenderer({ row }) {
+      return h(
+        ElTag, 
+          { type: statusOptions.find(item => item.value == row.status)?.type, size: 'small' }, 
+          { default: () => statusOptions.find(item => item.value == row.status)?.label }
+      )
+    } 
+  },
+
+
+  { 
+    label: '异常原因', 
+    prop: 'TODO', 
+    width: 120 
+  },
+
+
+  { 
+    label: '销售方公司纳税识别号', 
+    prop: 'seller_code', 
+    width: 150 
+  },
+
+  { 
+    label: '销售方公司', 
+    prop: 'seller_name', 
+    width: 150 
+  },
+
+  { 
+    label: '订单编号', 
+    prop: 'orderCode', 
+    width: 160 
+  },
+  
+  { 
+    label: "订单主编号", 
+    prop: "cxCode", 
+    width: 160 
+  },
+  
+  { 
+    label: "商品编号", 
+    prop: "skuCode", 
+    width: 120 
+  },
+
+  { 
+    label: "商品名称", 
+    prop: "goodName", 
+    width: 120 
+  },
+
+  { 
+    label: "单位", 
+    prop: "unit", 
+    width: 60 
+  },
+
+  { 
+    label: '商品数量', 
+    prop: 'num', 
+    width: 100 
+  },
+  
+  { 
+    label: '商品单价', 
+    prop: 'goodPrice', 
+    width: 100 
+  },
+  
   { label: '订单总金额', prop: 'TODO', width: 120 },
   { label: '税目', prop: 'TODO', width: 120 },
   { label: '税率', prop: 'TODO', width: 60 },

src/views/invoiceInOut/inOutManager/config/shared.ts

@@ -0,0 +1,30 @@
+export const typeOptions = [
+    { value: '1', label: '入库' },
+    { value: '2', label: '出库' },
+    { value: '3', label: '入库红冲' },
+    { value: '4', label: '出库红冲' },
+]
+
+export const mapLabelToType = typeOptions.reduce((prev, current) => ({
+    ...prev,
+    [current.label]: current.value
+}), {})
+
+
+
+export const sourceOptions = [
+    { value: '1', label: '采销结算' },
+    { value: '2', label: '线下订单' }
+]
+
+export const mapLabelToSource = sourceOptions.reduce((prev, current) => ({
+    ...prev,
+    [current.label]: current.value
+}), {})
+
+
+
+export const statusOptions = [
+    { value: '1', label: '待处理', type: 'warning' },
+    { value: '2', label: '线下订单', type: 'success' }
+]

src/views/invoiceInOut/inOutManager/detail.vue

@@ -58,6 +58,35 @@ function handleChildGoodEdit(index: number){
   state.data = { ...formData.value.goods[index] }
 }
 
+function getSpanNumber(data, prop) {
+  let length = Array.isArray(data) ? data.length : 0;
+  if (length > 0) {
+    let position = 0;
+    let temp = data[0][prop];
+    let result = [1];
+    for (let i = 1; i < length; i++) {
+      if (data[i][prop] == temp) {
+        result[position] += 1;
+        result[i] = 0;
+      } else {
+        position = i;
+        result[i] = 1;
+        temp = data[i][prop];
+      }
+    }
+    return result;
+  } else {
+    return [0];
+  }
+}
+
+function spanMethod({ row:_1, column:_2, rowIndex, columnIndex }: any, data: any[]){
+    if(Number(columnIndex) === 2){
+      let nameSpan = getSpanNumber(formData.value.goods, "skuCode");
+      return { rowspan: nameSpan[rowIndex],colspan: 1};
+    }
+}
+
 async function onSubmit(){
   try{
     await formRef.value.validate()
@@ -77,7 +106,7 @@ async function onSubmit(){
           </ElCollapseItem>
 
           <ElCollapseItem title="出入库信息确认" name="2">
-            <ElForm ref="formRef" :rules="rules" :model="formData">
+            <ElForm ref="formRef" :rules="rules" :model="formData" :span-method="spanMethod">
               <ElFormItem label="操作商品" prop="goods">
                 <ElTable
                   border 
@@ -87,10 +116,10 @@ async function onSubmit(){
                   <ElTableColumn label="商品编号" prop="skuCode" show-overflow-tooltip />
                   <ElTableColumn label="商品名称" prop="goodName" show-overflow-tooltip />
                   <ElTableColumn label="操作数量" prop="goodNum" show-overflow-tooltip/>
-                  <ElTableColumn label="子商品编号" prop="skuCode" show-overflow-tooltip />
+                  <ElTableColumn label="子商品编号" prop="childCode" show-overflow-tooltip />
                   <ElTableColumn label="销售方公司纳税识别号" width="140px" prop="seller_code" show-overflow-tooltip />
-                  <ElTableColumn label="子商品比例" prop="goodNum" show-overflow-tooltip />
-                  <ElTableColumn label="子商品操作数量" prop="goodNum" show-overflow-tooltip />
+                  <ElTableColumn label="子商品比例" prop="childNum" show-overflow-tooltip />
+                  <ElTableColumn label="子商品操作数量" prop="childActionNum" show-overflow-tooltip />
 
                   <ElTableColumn width="70px" label="操作">
                     <template #header>

src/views/invoiceInOut/inOutManager/index.vue

@@ -2,30 +2,21 @@
 import { reactive, ref } from "vue";
 import { useRouter } from "vue-router";
 import { usePageSearch, type PageHooks, type PageEvents } from "/@/hooks/page";
-import contentConfig from "./config/content.config";
-import searchConfig from "./config/search.config";
-
 import NotOrderImportModal from "./components/NotOrderImportModal/index.vue"
 import OrderImportModal from "./components/OrderImportModal/index.vue"
-
 import { notOrderTemplate } from "./components/NotOrderImportModal/columns-config"
 import { orderTemplate } from "./components/OrderImportModal/columns-config"
-
+import { useRenderIcon } from "/@/components/ReIcon/src/hooks"
+import contentConfig from "./config/content.config";
+import searchConfig from "./config/search.config";
 import { utils, writeFile } from "xlsx";
 
-import { useRenderIcon } from "/@/components/ReIcon/src/hooks"
 
 const PageName = "inOutManager";
 const router = useRouter();
 
-const hooks: PageHooks = {
-  pageSearchHook: () => usePageSearch(undefined, undefined, searchConfig)
-};
-
-const state = reactive({ 
-  orderImportVisible: false, 
-  notOrderImportVisible: false 
-})
+const state = reactive({ orderImportVisible: false, notOrderImportVisible: false })
+const hooks: PageHooks = { pageSearchHook: () => usePageSearch(undefined, undefined, searchConfig) };
 
 const events: PageEvents = {
   content: {
@@ -38,7 +29,6 @@ function onDownload(type = 'notOrder'){
   const data = type === 'notOrder' ? notOrderTemplate : orderTemplate
   const title = type === 'notOrder' ? '非订单商品模板.xlsx' : '订单商品模板.xlsx'
 
-
   const workBook = utils.book_new();
   const workSheet = utils.json_to_sheet(data);
   utils.book_append_sheet(workBook, workSheet, "sheet");
@@ -100,8 +90,12 @@ function onDownload(type = 'notOrder'){
 
     </PageContainer>
 
-    <OrderImportModal v-model:visible="state.orderImportVisible" />
+    <OrderImportModal 
+      v-model:visible="state.orderImportVisible" 
+    />
 
-    <NotOrderImportModal v-model:visible="state.notOrderImportVisible" />
+    <NotOrderImportModal 
+      v-model:visible="state.notOrderImportVisible" 
+    />
   </PageAuth>
 </template>

src/views/invoiceInOut/inventoryCheck/components/BaseForm.vue

@@ -59,9 +59,6 @@ function handleSubmit(list: any[]){
   // formData.value.childArr = [ ...formData.value.childArr, ...appends ]
 }
 
-
-console.log(rules);
-
 (async function initialData(){
   const result = await httpCompanies({ size: 10000 })
   if(result.code == 0){

src/views/invoiceInOut/inventoryCheck/index.vue

@@ -40,7 +40,9 @@ const events: PageEvents = {
           @click="visible = true"
         >批量创建</ElButton>
         
-        <ElButton size="small">批量导出当前结存数</ElButton>
+        <ElButton 
+          size="small"
+        >批量导出当前结存数</ElButton>
       </template>
     </PageContainer>
 

src/views/invoiceInOut/provisionOut/config/modal.config.ts

@@ -1,40 +0,0 @@
-import { ModalConfig } from "../../../../components/PageModal/src/types";
-
-const modalConfig: ModalConfig = {
-  title: "客户",
-  itemStyle: {},
-  formItems: [
-    {
-      field: "companyNo",
-      type: "input",
-      label: "客户编码",
-      labelWidth: "120px"
-    },
-    {
-      field: "companyName",
-      type: "input",
-      labelWidth: "120px",
-      label: "客户名称"
-    },
-    {
-      field: "parent",
-      type: "input",
-      labelWidth: "120px",
-      label: "归属集团"
-    },
-    {
-      field: "contactor",
-      type: "input",
-      labelWidth: "120px",
-      label: "联系人"
-    },
-    {
-      field: "createTime",
-      type: "input",
-      labelWidth: "120px",
-      label: "创建时间"
-    }
-  ]
-};
-
-export default modalConfig;

src/views/invoiceInOut/summary/components/NotOrderImportModal/columns-config.ts

@@ -0,0 +1,252 @@
+const initheaders = [
+  "买方公司编码",
+  "买方公司名称",
+  "卖方公司编码",
+  "卖方公司名称",
+  "对账编码",
+  "发票类型",
+  "发票代码",
+  "发票号码",
+  "发票税前金额",
+  "发票税后金额",
+  "开票日期",
+  "校验码"
+];
+
+export const mapProp = {
+  value0: "companyNo",
+  value1: "companyName",
+  value2: "supplierNo",
+  value3: "supplierName",
+  value4: "payNo",
+  value5: "invoiceType",
+  value6: "invoiceCode",
+  value7: "invoiceNumber",
+  value8: "inv_subtotal_amount",
+  value9: "inv_total",
+  value10: "open_time",
+  value11: "checkNumber"
+};
+
+export const requireHeaders = [];
+
+const columns = [
+  {
+    type: "index",
+    fixed: "left",
+    label: "序号",
+    width: "50"
+  },
+  {
+    label: '业务编号',
+    prop: 'TODO1',
+    minWidth: '100px'
+  },
+  {
+    label: '类型',
+    prop: 'TODO2',
+    minWidth: '100px'
+  },
+  {
+    label:'订单来源',
+    prop: 'TODO3',
+    minWidth: '100px'
+  },
+  {
+    label: '销售方公司纳税识别号',
+    prop: 'TODO4',
+    minWidth: '140px'
+  },
+  {
+    label: '销售方公司',
+    prop: 'TODO5',
+    minWidth: '100px'
+  },
+  {
+    label: '订单编号',
+    prop: 'TODO6',
+    minWidth: '120px'
+  },
+  {
+    label: '订单主单号',
+    prop: 'TODO7',
+    minWidth: '120px'
+  },
+  {
+    label: '商品编号',
+    prop: 'TODO8',
+    minWidth: '100px'
+  },
+  {
+    label: '商品名称',
+    prop: 'TODO9',
+    minWidth: '100px'
+  },
+  {
+    label: '单位',
+    prop: 'TODO10',
+    minWidth: '80px'
+  },
+  {
+    label: '商品数量',
+    prop: 'TODO11',
+    minWidth: '110px'
+  },
+  {
+    label: '商品数量',
+    prop: 'TODO11',
+    minWidth: '110px'
+  },
+  {
+    label:'商品单价',
+    prop: 'TODO12',
+    minWidth: '110px'
+  },
+  {
+    label: '订单总金额',
+    prop: 'TODO13',
+    minWidth: '110px'
+  },
+  {
+    label: '税目',
+    prop: 'TODO14',
+    minWidth: '80px'
+  },
+  {
+    label: '税目名称',
+    prop: 'TODO15',
+    minWidth: '100px'
+  },
+  {
+    label: '关联金额',
+    prop: 'TODO16',
+    minWidth: '100px'
+  },
+  {
+    label: '购买方公司名称',
+    prop: 'TODO17',
+    minWidth: '110px'
+  },
+  {
+    label: '购买方公司纳税识别号',
+    prop: 'TODO18',
+    minWidth: '140px'
+  },
+  {
+    label: '发票号码',
+    prop: 'TODO19',
+    minWidth: '100px'
+  },
+  {
+    label: '发票类型',
+    prop: 'TODO20',
+    minWidth: '100px'
+  },
+  {
+    label: '销售方公司名称',
+    prop: 'TODO21',
+    minWidth: '110px'
+  },
+  {
+    label: '销售方公司纳税号',
+    prop: 'TODO',
+    minWidth: '140px'
+  },
+  {
+    label: '发票明细ID',
+    prop: 'TODO',
+    minWidth: '110px'
+  },
+  {
+    label: '货物或应税劳务、服务名称',
+    prop: 'TODO',
+    minWidth: '200px'
+  },
+  {
+    label: '类目编号',
+    prop: 'TODO',
+    minWidth: '90px'
+  },
+  {
+    label: '规格型号',
+    prop: 'TODO',
+    minWidth: '110px'
+  },
+  {
+    label: '单位',
+    prop: 'TODO',
+    minWidth: '80px'
+  },
+  {
+    label: '数量',
+    prop: 'TODO',
+    minWidth: '80px'
+  },
+  {
+    label: '税前单价',
+    prop: 'TODO',
+    minWidth: '100px'
+  },
+  {
+    label: '税前总价',
+    prop: 'TODO',
+    minWidth: '100px'
+  },
+  {
+    label: '税率',
+    prop: 'TODO',
+    minWidth: '80px'
+  },
+  {
+    label: '税后单价',
+    prop: 'TODO',
+    minWidth: '100px'
+  },
+  {
+    label: '税后总额',
+    prop: 'TODO',
+    minWidth: '100px'
+  },
+  {
+    label: '类目编号状态',
+    prop: 'TODO',
+    minWidth: '100px'
+  },
+  {
+    label: '税率状态',
+    prop: 'TODO',
+    minWidth: '100px'
+  },
+  {
+    label: '备注',
+    prop: 'TODO',
+    minWidth: '80px'
+  },
+  {
+    label: '商品编号',
+    prop: 'TODO',
+    minWidth: '90px'
+  },
+  {
+    label: '操作数量',
+    prop: 'TODO',
+    minWidth: '90px'
+  },
+  {
+    label: '子商品编号',
+    prop: 'TODO',
+    minWidth: '100px'
+  },
+  {
+    label: '子商品操作数量',
+    prop: 'TODO',
+    minWidth: '110px'
+  }
+]
+
+
+const notOrderTemplate = [columns.slice(1).reduce((prev, current) => {
+  return {...prev, [current.label] : current.detaultData ? current.defaultData : ''}
+}, {})]
+
+export { initheaders, columns, notOrderTemplate };

src/views/invoiceInOut/summary/components/NotOrderImportModal/index.vue

@@ -0,0 +1,365 @@
+<script setup lang="ts">
+import { ref, h } from "vue";
+import { ElButton, ElDialog, ElMessage,ElMessageBox } from "element-plus";
+import { execlUpload } from "/@/components/execlUpload";
+import { httpBatchAdd } from "/@/api/purchase/ticketReturn";
+import { useResponseHandle } from "/@/hooks";
+import { useCompany } from "/@/hooks/core/useCompany";
+import { cg_inv_type_list } from "/@/utils/status";
+import { useVModel } from "@vueuse/core";
+import dayjs from "dayjs"
+
+import {
+  initheaders,
+  columns,
+  mapProp,
+  requireHeaders
+} from "./columns-config";
+
+
+const loading = ref(false);
+const tableData = ref([]);
+
+const props = defineProps<{ visible: boolean }>()
+const emit = defineEmits(["onSuccess"]);
+
+const allTypes = cg_inv_type_list.map(({ label }) => label);
+const row = ref(1);
+
+const visible = useVModel(props, 'visible')
+
+const createInvErrorMessage = (row: string) =>
+  `导入数据第 ${row} 行 发票类型格式不正确,发票类型必须为${allTypes.join(",")}`;
+
+const { currentCompany } = useCompany();
+
+const responseHandle = useResponseHandle();
+
+const Uploadsuccess = ({ results, header }) => {
+  loading.value = true;
+  if (results.length === 0) {
+    ElMessage.error("表格无有效数据！");
+    loading.value = false;
+    return;
+  }
+
+  let headok = true;
+  if (header.length !== columns.length - 1) {
+    headok = false;
+  } else {
+    columns.slice(1).forEach((si, sii) => {
+      if (si.label !== header[sii]) {
+        headok = false;
+      }
+    });
+  }
+
+  if (!headok) {
+    ElMessage.error("表头与导入模板不匹配！");
+    loading.value = false;
+    return;
+  }
+
+  tableData.value = [];
+
+  for (const v1 of results) {
+    const b = Object.values(v1);
+    let model = {};
+    b.forEach((si, sii) => { model["value" + sii] = si + ""; });
+    tableData.value.push(model);
+    row.value = row.value + 1;
+  }
+
+    const data = [];
+   tableData.value.forEach((key, index) => {
+      const obj: Record<string, string> = {};
+
+      for (let i in key) {
+        const prop = mapProp[i];
+        const value = key[i];
+        obj[prop] = value;
+     }
+      
+      data.push(obj);
+    });
+
+
+    const typeErrors: string[] = [];
+    const checkErrors: string[] = [];
+    const codeErrors: string[] = [];
+    const numberErrors: string[] = [];
+    const priceErrors: string[] = [];
+    const fullyElectionicPriceErrors: string[] = [];
+
+    
+  const openDateErrors: string[] = [];
+  const now = dayjs(new Date()).format('YYYY-MM-DD');
+
+    data.forEach((row, index) => {
+      const source = row.invoiceType.trim();
+      const target = cg_inv_type_list.find(({ label }) => label === source);
+
+      if (!target) {
+        typeErrors.push(String(index + 1));
+      } else {
+        row.invoiceType = target.value;
+
+        if (
+          (target.value === "normal" || target.value === "electronic") &&
+          !row.checkNumber
+        ) {
+          checkErrors.push(String(index + 1));
+        }
+      }
+
+      const isFullyElectionic = row.invoiceType === 'fully_digitalized_special_electronic' || row.invoiceType === 'fully_digitalized_normal_electronic'
+
+      if(!row.open_time || (row.open_time && !dayjs(row.open_time).isSame(dayjs(now)) && !dayjs(row.open_time).isBefore(dayjs(now)))){
+        openDateErrors.push(String(index + 1))
+      }
+
+      const reg = /^\d+(\.\d+)?$/;
+
+      if (!reg.test(row.invoiceCode) && !isFullyElectionic) {
+        codeErrors.push(String(index + 1));
+      }
+
+      if (!reg.test(row.invoiceNumber)) {
+        numberErrors.push(String(index + 1));
+      }
+
+      if ((!reg.test(row.inv_subtotal_amount) || Number(row.inv_subtotal_amount) < 0) && !isFullyElectionic) {
+        priceErrors.push(String(index + 1));
+      }
+
+      if ((!reg.test(row.inv_total) || Number(row.inv_total) < 0) && isFullyElectionic) {
+        fullyElectionicPriceErrors.push(String(index + 1));
+      }
+    });
+
+    if (typeErrors.length > 0) {
+      ElMessage({
+        type: "error",
+        message: createInvErrorMessage(typeErrors.join(","))
+      });
+      loading.value = false;
+      return;
+    }
+
+    if (checkErrors.length > 0) {
+      ElMessage({
+        type: "error",
+        message: `第 ${checkErrors.join(",")} 行,校验码不能为空。`
+      });
+      loading.value = false;
+      tableData.value = [];
+      return;
+    }
+
+    if (codeErrors.length > 0) {
+      ElMessage({
+        type: "error",
+        message: `第 ${codeErrors.join(",")} 行,发票代码必须为数字。`
+      });
+      loading.value = false;
+      tableData.value = [];
+      return;
+    }
+
+
+    if (numberErrors.length > 0) {
+      ElMessage({
+        type: "error",
+        message: `第 ${numberErrors.join(",")} 行,发票号码必须为数字。`
+      });
+      loading.value = false;
+      tableData.value = [];
+      return;
+    }
+
+    if (priceErrors.length > 0) {
+      ElMessage({
+        type: "error",
+        message: `第 ${priceErrors.join(",")} 行,发票税前金额必须为数字且不能是负数`
+      });
+      loading.value = false;
+      tableData.value = [];
+      return;
+    }
+
+    if (fullyElectionicPriceErrors.length > 0) {
+      ElMessage({
+        type: "error",
+        message: `第 ${fullyElectionicPriceErrors.join(",")} 行,发票税后金额必须为数字且不能是负数`
+      });
+      loading.value = false;
+      tableData.value = [];
+      return;
+    }
+
+    if (openDateErrors.length > 0) {
+      ElMessage({
+        type: "error",
+        message: `第 ${openDateErrors.join(",")} 行,开票日期不能为空且不能超过当前日期`
+      });
+      loading.value = false;
+      tableData.value = [];
+      return;
+    }
+
+  loading.value = false;
+};
+
+//提交
+const handleSubmit = async () => {
+  try {
+    if (loading.value) return;
+    loading.value = true;
+    const data = [];
+
+    tableData.value.forEach((key, index) => {
+      const obj: Record<string, string> = {};
+
+      for (let i in key) {
+        const prop = mapProp[i];
+        const value = key[i];
+        obj[prop] = value;
+      }
+      data.push(obj);
+    });
+
+    data.forEach((row, index) => {
+      const source = row.invoiceType.trim();
+      const target = cg_inv_type_list.find(({ label }) => label === source);
+      row.invoiceType = target.value;
+    });
+
+
+    const buyers = data.map(({ supplierNo }) => supplierNo);
+    const setBuyers = [...new Set(buyers)];
+
+    if (setBuyers.length > 1) {
+      ElMessage.error("卖方公司编码不一致");
+      loading.value = false;
+      return;
+    }
+
+    const companyNo = data[0].supplierNo;
+
+    if(companyNo != currentCompany.value.companyNo){
+      ElMessage.error("卖方公司编码与当前选中的公司不一致");
+      loading.value = false;
+      return;
+    }
+
+    data.forEach(item => {
+      const isFullyElectionic = item.invoiceType === 'fully_digitalized_special_electronic' || item.invoiceType === 'fully_digitalized_normal_electronic'
+      if(isFullyElectionic){ item.inv_subtotal_amount = item.inv_total }
+      
+      delete item['inv_total']
+      delete item["supplierNo"];
+      delete item["supplierName"];
+      delete item["companyName"];
+      delete item["companyNo"];
+    });
+    const { code, message,data: _d } = await httpBatchAdd({
+      list: data,
+      companyNo,
+      is_comon: '0'
+      // relaComNo: currentCompany.value.companyNo
+    });
+
+    loading.value = false;
+
+    responseHandle({
+      code,
+      message,
+      noMessage: false,
+      handler: () => {
+        ElMessage.success("数据导入成功！");
+        emit("onSuccess");
+        visible.value = false;
+      },
+       onError() {
+        if (Number(code) === 10004) {
+          ElMessageBox({
+            title: '以下对账单不符合要求',
+            message: h('div', null, [
+              h('p', null, '当前功能仅支持业务类型为采购订单的对账单,以下通用订单类型的对账单不支持该功能：'),
+              h('p', null, _d.join('、')),
+            ])
+          })
+         }else {
+          ElMessage.warning(message)
+         }
+      }
+    });
+  } catch (err) { 
+    console.log(err)
+  }
+};
+const cancel = () => {
+  tableData.value = [];
+};
+</script>
+
+<template>
+  <ElDialog
+    :close-on-click-modal="false"
+    v-model="visible"
+    title="非订单商品导入"
+    width="1040px"
+    top="8vh"
+    center
+  >
+    <execlUpload style="margin-bottom: 10px" @on-success="Uploadsuccess" v-if="tableData.length === 0" />
+
+    <el-table
+      :data="tableData"
+      stripe
+      border
+      max-height="500px"
+      size="small"
+      style="width: 100%"
+    >
+      <el-table-column
+        v-for="(si, sii) in columns"
+        :minWidth="si.minWidth"
+        show-overflow-tooltip
+        :fixed="si.fixed"
+        :prop="si.prop"
+        :type="si.type"
+        :key="sii"
+      >
+        <template #header>
+          <span v-if="!requireHeaders.includes(mapProp[si.prop]) || si.label === '序号' ">
+            {{ si.label }}
+          </span>
+          
+          <p v-else>
+            <span style="color: #f56c6c; font-size: 14px">* </span>
+            {{ si.label }}
+          </p>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div
+      flex
+      justify-end
+      gap-2
+      v-if="tableData.length !== 0"
+      style="padding: 10px 0 0 0"
+    >
+      <ElButton size="small" @click="cancel">取消</ElButton>
+      <el-button
+        size="small"
+        type="primary"
+        :loading="loading"
+        @click="handleSubmit"
+        >保存</el-button
+      >
+    </div>
+  </ElDialog>
+</template>
+
+<style lang="scss" scoped></style>

src/views/invoiceInOut/summary/components/OrderImportModal/columns-config.ts

@@ -0,0 +1,236 @@
+const initheaders = [
+  "买方公司编码",
+  "买方公司名称",
+  "卖方公司编码",
+  "卖方公司名称",
+  "对账编码",
+  "发票类型",
+  "发票代码",
+  "发票号码",
+  "发票税前金额",
+  "发票税后金额",
+  "开票日期",
+  "校验码"
+];
+
+export const mapProp = {
+  value0: "companyNo",
+  value1: "companyName",
+  value2: "supplierNo",
+  value3: "supplierName",
+  value4: "payNo",
+  value5: "invoiceType",
+  value6: "invoiceCode",
+  value7: "invoiceNumber",
+  value8: "inv_subtotal_amount",
+  value9: "inv_total",
+  value10: "open_time",
+  value11: "checkNumber"
+};
+
+export const requireHeaders = [];
+
+const columns = [
+  {
+    type: "index",
+    fixed: "left",
+    label: "序号",
+    width: "50"
+  },
+  {
+    label: '业务编号',
+    prop: 'TODO1',
+    minWidth: '100px'
+  },
+  {
+    label: '类型',
+    prop: 'TODO2',
+    minWidth: '100px'
+  },
+  {
+    label:'订单来源',
+    prop: 'TODO3',
+    minWidth: '100px'
+  },
+  {
+    label: '销售方公司纳税识别号',
+    prop: 'TODO4',
+    minWidth: '140px'
+  },
+  {
+    label: '销售方公司',
+    prop: 'TODO5',
+    minWidth: '100px'
+  },
+  {
+    label: '订单编号',
+    prop: 'TODO6',
+    minWidth: '120px'
+  },
+  {
+    label: '订单主单号',
+    prop: 'TODO7',
+    minWidth: '120px'
+  },
+  {
+    label: '商品编号',
+    prop: 'TODO8',
+    minWidth: '100px'
+  },
+  {
+    label: '商品名称',
+    prop: 'TODO9',
+    minWidth: '100px'
+  },
+  {
+    label: '单位',
+    prop: 'TODO10',
+    minWidth: '80px'
+  },
+  {
+    label: '商品数量',
+    prop: 'TODO11',
+    minWidth: '110px'
+  },
+  {
+    label: '商品数量',
+    prop: 'TODO11',
+    minWidth: '110px'
+  },
+  {
+    label:'商品单价',
+    prop: 'TODO12',
+    minWidth: '110px'
+  },
+  {
+    label: '订单总金额',
+    prop: 'TODO13',
+    minWidth: '110px'
+  },
+  {
+    label: '税目',
+    prop: 'TODO14',
+    minWidth: '80px'
+  },
+  {
+    label: '税目名称',
+    prop: 'TODO15',
+    minWidth: '100px'
+  },
+  {
+    label: '关联金额',
+    prop: 'TODO16',
+    minWidth: '100px'
+  },
+  {
+    label: '购买方公司名称',
+    prop: 'TODO17',
+    minWidth: '110px'
+  },
+  {
+    label: '购买方公司纳税识别号',
+    prop: 'TODO18',
+    minWidth: '140px'
+  },
+  {
+    label: '发票号码',
+    prop: 'TODO19',
+    minWidth: '100px'
+  },
+  {
+    label: '发票类型',
+    prop: 'TODO20',
+    minWidth: '100px'
+  },
+  {
+    label: '销售方公司名称',
+    prop: 'TODO21',
+    minWidth: '110px'
+  },
+  {
+    label: '销售方公司纳税号',
+    prop: 'TODO22',
+    minWidth: '140px'
+  },
+  {
+    label: '发票明细ID',
+    prop: 'TODO23',
+    minWidth: '110px'
+  },
+  {
+    label: '货物或应税劳务、服务名称',
+    prop: 'TODO24',
+    minWidth: '200px'
+  },
+  {
+    label: '类目编号',
+    prop: 'TODO25',
+    minWidth: '90px'
+  },
+  {
+    label: '规格型号',
+    prop: 'TODO27',
+    minWidth: '110px'
+  },
+  {
+    label: '单位',
+    prop: 'TODO28',
+    minWidth: '80px'
+  },
+  {
+    label: '数量',
+    prop: 'TODO29',
+    minWidth: '80px'
+  },
+  {
+    label: '税前单价',
+    prop: 'TODO30',
+    minWidth: '100px'
+  },
+  {
+    label: '税前总价',
+    prop: 'TODO30',
+    minWidth: '100px'
+  },
+  {
+    label: '税率',
+    prop: 'TODO31',
+    minWidth: '80px'
+  },
+  {
+    label: '税后单价',
+    prop: 'TODO32',
+    minWidth: '100px'
+  },
+  {
+    label: '税后总额',
+    prop: 'TODO33',
+    minWidth: '100px'
+  },
+  {
+    label: '类目编号状态',
+    prop: 'TODO34',
+    minWidth: '100px'
+  },
+  {
+    label: '税率状态',
+    prop: 'TODO35',
+    minWidth: '100px'
+  },
+  {
+    label: '备注',
+    prop: 'TODO36',
+    minWidth: '80px'
+  },
+  {
+    label: '入账月份',
+    prop: 'TODO37',
+    minWidth: '80px'
+  }
+]
+
+const orderTemplate = [columns.slice(1).reduce((prev, current) => {
+  return { ...prev, [current.label]: current.detaultData ? current.defaultData : '' }
+}, {})]
+
+export { initheaders, columns, orderTemplate };

src/views/invoiceInOut/summary/components/OrderImportModal/index.vue

@@ -0,0 +1,354 @@
+<script setup lang="ts">
+import { ref, h } from "vue";
+import { ElButton, ElDialog, ElMessage,ElMessageBox } from "element-plus";
+import { execlUpload } from "/@/components/execlUpload";
+import { httpBatchAdd } from "/@/api/purchase/ticketReturn";
+import { useCompany } from "/@/hooks/core/useCompany";
+import { cg_inv_type_list } from "/@/utils/status";
+import { useResponseHandle } from "/@/hooks";
+import { useVModel } from "@vueuse/core";
+import dayjs from "dayjs"
+
+import {
+  initheaders,
+  columns,
+  mapProp,
+  requireHeaders
+} from "./columns-config";
+
+
+const loading = ref(false);
+const tableData = ref([]);
+
+const props = defineProps<{ visible: boolean }>()
+const emit = defineEmits(["onSuccess"]);
+
+const row = ref(1);
+const allTypes = cg_inv_type_list.map(({ label }) => label);
+const visible = useVModel(props, 'visible')
+
+const createInvErrorMessage = (row: string) => `导入数据第 ${row} 行 发票类型格式不正确,发票类型必须为${allTypes.join(",")}`;
+
+const { currentCompany } = useCompany();
+
+const responseHandle = useResponseHandle();
+
+const Uploadsuccess = ({ results, header }) => {
+  loading.value = true;
+  if (results.length === 0) {
+    ElMessage.error("表格无有效数据！");
+    loading.value = false;
+    return;
+  }
+
+  let headok = true;
+  if (header.length !== columns.length - 1) {
+    console.log('joined', header, columns)
+    headok = false;
+  } else {
+    columns.slice(1).forEach((si, sii) => {
+    console.log(si.label, header[sii])
+      if (si.label !== header[sii]) { 
+        headok = false; 
+      }
+    });
+  }
+
+  if (!headok) {
+    ElMessage.error("表头与导入模板不匹配！");
+    loading.value = false;
+    return;
+  }
+
+  tableData.value = [];
+
+  for (const v1 of results) {
+    const b = Object.values(v1);
+    let model = {};
+    b.forEach((si, sii) => { model["value" + sii] = si + ""; });
+    tableData.value.push(model);
+    row.value = row.value + 1;
+  }
+
+    const data = [];
+   tableData.value.forEach((key) => {
+      const obj: Record<string, string> = {};
+
+      for (let i in key) {
+        const prop = mapProp[i];
+        const value = key[i];
+        obj[prop] = value;
+     }
+      
+      data.push(obj);
+    });
+
+
+    const typeErrors: string[] = [];
+    const checkErrors: string[] = [];
+    const codeErrors: string[] = [];
+    const numberErrors: string[] = [];
+    const priceErrors: string[] = [];
+    const fullyElectionicPriceErrors: string[] = [];
+
+    
+  const openDateErrors: string[] = [];
+  const now = dayjs(new Date()).format('YYYY-MM-DD');
+
+    data.forEach((row, index) => {
+      const source = row.invoiceType.trim();
+      const target = cg_inv_type_list.find(({ label }) => label === source);
+
+      if (!target) {
+        typeErrors.push(String(index + 1));
+      } else {
+        row.invoiceType = target.value;
+
+        if (
+          (target.value === "normal" || target.value === "electronic") &&
+          !row.checkNumber
+        ) {
+          checkErrors.push(String(index + 1));
+        }
+      }
+
+      const isFullyElectionic = row.invoiceType === 'fully_digitalized_special_electronic' || row.invoiceType === 'fully_digitalized_normal_electronic'
+
+      if(!row.open_time || (row.open_time && !dayjs(row.open_time).isSame(dayjs(now)) && !dayjs(row.open_time).isBefore(dayjs(now)))){
+        openDateErrors.push(String(index + 1))
+      }
+
+      const reg = /^\d+(\.\d+)?$/;
+
+      if (!reg.test(row.invoiceCode) && !isFullyElectionic) {
+        codeErrors.push(String(index + 1));
+      }
+
+      if (!reg.test(row.invoiceNumber)) {
+        numberErrors.push(String(index + 1));
+      }
+
+      if ((!reg.test(row.inv_subtotal_amount) || Number(row.inv_subtotal_amount) < 0) && !isFullyElectionic) {
+        priceErrors.push(String(index + 1));
+      }
+
+      if ((!reg.test(row.inv_total) || Number(row.inv_total) < 0) && isFullyElectionic) {
+        fullyElectionicPriceErrors.push(String(index + 1));
+      }
+    });
+
+    if (typeErrors.length > 0) {
+      ElMessage({
+        type: "error",
+        message: createInvErrorMessage(typeErrors.join(","))
+      });
+      loading.value = false;
+      return;
+    }
+
+    if (checkErrors.length > 0) {
+      ElMessage({
+        type: "error",
+        message: `第 ${checkErrors.join(",")} 行,校验码不能为空。`
+      });
+      loading.value = false;
+      tableData.value = [];
+      return;
+    }
+
+    if (codeErrors.length > 0) {
+      ElMessage({
+        type: "error",
+        message: `第 ${codeErrors.join(",")} 行,发票代码必须为数字。`
+      });
+      loading.value = false;
+      tableData.value = [];
+      return;
+    }
+
+
+    if (numberErrors.length > 0) {
+      ElMessage({ type: "error", message: `第 ${numberErrors.join(",")} 行,发票号码必须为数字。`});
+
+      loading.value = false;
+      tableData.value = [];
+      return;
+    }
+
+    if (priceErrors.length > 0) {
+      ElMessage({ type: "error", message: `第 ${priceErrors.join(",")} 行,发票税前金额必须为数字且不能是负数` });
+
+      loading.value = false;
+      tableData.value = [];
+      return;
+    }
+
+    if (fullyElectionicPriceErrors.length > 0) {
+      ElMessage({ type: "error", message: `第 ${fullyElectionicPriceErrors.join(",")} 行,发票税后金额必须为数字且不能是负数` });
+      loading.value = false;
+      tableData.value = [];
+      return;
+    }
+
+    if (openDateErrors.length > 0) {
+      ElMessage({ type: "error", message: `第 ${openDateErrors.join(",")} 行,开票日期不能为空且不能超过当前日期`});
+      loading.value = false;
+      tableData.value = [];
+      return;
+    }
+
+  loading.value = false;
+};
+
+//提交
+const handleSubmit = async () => {
+  try {
+    if (loading.value) return;
+    loading.value = true;
+    const data = [];
+
+    tableData.value.forEach((key) => {
+      const obj: Record<string, string> = {};
+
+      for (let i in key) {
+        const prop = mapProp[i];
+        const value = key[i];
+        obj[prop] = value;
+      }
+      data.push(obj);
+    });
+
+    data.forEach((row) => {
+      const source = row.invoiceType.trim();
+      const target = cg_inv_type_list.find(({ label }) => label === source);
+      row.invoiceType = target.value;
+    });
+
+    const buyers = data.map(({ supplierNo }) => supplierNo);
+    const setBuyers = [...new Set(buyers)];
+
+    if (setBuyers.length > 1) {
+      ElMessage.error("卖方公司编码不一致");
+      loading.value = false;
+      return;
+    }
+
+    const companyNo = data[0].supplierNo;
+
+    if(companyNo != currentCompany.value.companyNo){
+      ElMessage.error("卖方公司编码与当前选中的公司不一致");
+      loading.value = false;
+      return;
+    }
+
+    data.forEach(item => {
+      const isFullyElectionic = item.invoiceType === 'fully_digitalized_special_electronic' || item.invoiceType === 'fully_digitalized_normal_electronic'
+      if(isFullyElectionic){ item.inv_subtotal_amount = item.inv_total }
+      
+      delete item['inv_total']
+      delete item["supplierNo"];
+      delete item["supplierName"];
+      delete item["companyName"];
+      delete item["companyNo"];
+    });
+    const { code, message,data: _d } = await httpBatchAdd({
+      list: data,
+      companyNo,
+      is_comon: '0'
+      // relaComNo: currentCompany.value.companyNo
+    });
+
+    loading.value = false;
+
+    responseHandle({
+      code,
+      message,
+      noMessage: false,
+      handler: () => {
+        ElMessage.success("数据导入成功！");
+        emit("onSuccess");
+        visible.value = false;
+      },
+       onError() {
+        if (Number(code) === 10004) {
+          ElMessageBox({
+            title: '以下对账单不符合要求',
+            message: h('div', null, [
+              h('p', null, '当前功能仅支持业务类型为采购订单的对账单,以下通用订单类型的对账单不支持该功能：'),
+              h('p', null, _d.join('、')),
+            ])
+          })
+         }else {
+          ElMessage.warning(message)
+         }
+      }
+    });
+  } catch (err) { 
+    console.log(err)
+  }
+};
+const cancel = () => {
+  tableData.value = [];
+};
+</script>
+
+<template>
+  <ElDialog
+    v-model="visible"
+    :close-on-click-modal="false"
+    title="订单商品导入"
+    width="1040px"
+    top="8vh"
+    center
+  >
+    <execlUpload style="margin-bottom: 10px" @on-success="Uploadsuccess" v-if="tableData.length === 0" />
+
+    <el-table
+      :data="tableData"
+      stripe
+      border
+      max-height="500px"
+      size="small"
+      style="width: 100%"
+    >
+      <el-table-column
+        v-for="(si, sii) in columns"
+        :minWidth="si.minWidth"
+        show-overflow-tooltip
+        :fixed="si.fixed"
+        :prop="si.prop"
+        :type="si.type"
+        :key="sii"
+      >
+        <template #header>
+          <span v-if="!requireHeaders.includes(mapProp[si.prop]) || si.label === '序号' ">
+            {{ si.label }}
+          </span>
+          
+          <p v-else>
+            <span style="color: #f56c6c; font-size: 14px">* </span>
+            {{ si.label }}
+          </p>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div
+      flex
+      justify-end
+      gap-2
+      v-if="tableData.length !== 0"
+      style="padding: 10px 0 0 0"
+    >
+      <ElButton size="small" @click="cancel">取消</ElButton>
+      <el-button
+        size="small"
+        type="primary"
+        :loading="loading"
+        @click="handleSubmit"
+        >保存</el-button
+      >
+    </div>
+  </ElDialog>
+</template>
+
+<style lang="scss" scoped></style>

src/views/invoiceInOut/summary/components/rules.ts

@@ -0,0 +1,18 @@
+export const rules = {
+    supplierNo: [{ required: true, message: '请选择销售方公司', trigger: 'change' }],
+    companyNo: [{ required: true, message: '请选择购买方公司', trigger: 'change' }],
+    goodSource: [{ required: true, message: '请选择商品来源', trigger: 'change' }],
+    spuCode: [{ required: true, message: '请输入商品编号', trigger: 'change' }],
+    goodType: [{ required: true, message: '请选择订单商品类型', trigger: 'change' }],
+    is_combind: [{ required: true, message: '请选择组合类型', trigger: 'change' }],
+    goodName: [{ required: true, message: '请输入订单商品名称', trigger: 'change' }],
+    invGoodName: [{ required: true, message: '请输入发票商品名称', trigger: 'change' }],
+    beforeTaxPrice: [{ required: true, message: '请输入成本税前单价', trigger: 'change' }],
+    unit: [{ required: true, message: '请选择单位', trigger: 'change' }],
+    weight: [{ required: true, message: '请选择重量', trigger: 'change' }],
+    afterTaxPrice: [{ required: true, message: '请输入成本税后单价', trigger: 'change' }],
+    in_code: [{ required: true, message: '请选择进项类目', trigger: 'change' }],
+    invType: [{ required: true, message: '请选择发票类型', trigger: 'change' }],
+    in_tax: [{ required: true, message: '请选择进项税率', trigger: 'change' }],
+    in_cost_status: [{ required: true, message: '请选择进项成本类型', trigger: 'change' }]
+}

src/views/invoiceInOut/summary/config/columns.ts

@@ -0,0 +1,24 @@
+export const goodColumns = [
+  { label: '处理编号', field: 'TODO', span: 6 },
+  { label: '发票明细ID', field: 'TODO', span: 6 },
+  { label: '业务编号', field:'TODO', span: 6 },
+  { label: '商品编号', field: 'TODO', span: 6 },
+  { label: '商品名称', field: 'TODO', span: 6 },
+  { label: '商品数量', field: 'TODO', span: 6  },
+  { label: '税前单价', field: 'TODO', span: 6 },
+  { label: '税后单价', field: 'TODO', span: 6 },
+  { label: '出库金额', field: 'TODO', span: 6 },
+  
+  { 
+    label: '状态' , 
+    field: 'TODO' 
+  },
+
+  { label: '分光', field: 'TODO', span: 6 },
+  { label: '创建人', field: 'TODO', span: 6 },
+  { label: '创建时间', field: 'TODO', span: 6 }
+]
+
+
+
+export const orderGoodColumns = []

src/views/invoiceInOut/summary/config/content.config.ts

@@ -0,0 +1,65 @@
+import { ContentConfig } from "/@/components/PageContent";
+import { httpList } from "/@/api/invoiceInOut/productManager";
+
+const columns = [
+  { 
+    label: "封帐编号", 
+    prop: "TODO", 
+    minWidth: 150
+  },
+  
+  { 
+    label: "记帐月份", 
+    prop: "TODO", 
+    minWidth: 160 
+  },
+  
+  { 
+    label: '公司纳税识别号',
+    prop: 'TODO',
+    minWidth: 160 
+  },
+  
+  { 
+    label: "业务公司名称", 
+    prop: "TODO", 
+    minWidth: 100 
+  },
+  
+  { 
+    label: '状态', 
+    prop: 'TODO', 
+    minWidth: 100 
+  },
+  
+  { 
+    label: '封装操作人', 
+    prop: 'TODO', 
+    minWidth: 100 
+  },
+  
+  { 
+    label: '封装时间', 
+    prop: 'TODO', 
+    minWidth: 120 
+  },
+  
+  { 
+    label: "操作", 
+    fixed: "right", 
+    slot: "operation",
+    width: 160
+  }
+];
+
+const contentConfig: ContentConfig = {
+  columns,
+  title: "商品管理",
+  permissions: ['007'],
+  apis: { 
+    httpList,
+    httpAdd: true
+  }
+};
+
+export default contentConfig;

src/views/invoiceInOut/summary/config/search.config.ts

@@ -0,0 +1,33 @@
+import { FormConfig } from "/@/components/PageSearch";
+import { goodTypeOptions } from "/@/utils/status";
+
+const searchFormConfig: FormConfig = {
+  formItems: [
+    {
+      field: 'goodNo',
+      type: 'input',
+      placeholder: '商品编码'
+    },
+    {
+      field: 'goodType',
+      type: 'select',
+      options: goodTypeOptions,
+      placeholder: '商品类型'
+    },
+    {
+      field: "timer",
+      type: "date_picker",
+      span: 7,
+      label: '创建时间',
+      otherOptions: {
+        type: "daterange",
+        startProp: "start",
+        endProp: "end",
+        startPlaceholder: "开始时间",
+        endPlaceholder: "结束时间"
+      }
+    },
+  ]
+};
+
+export default searchFormConfig;

src/views/invoiceInOut/summary/config/shared.ts

@@ -0,0 +1,5 @@
+export const statusOptions = [
+    { value: '0', label: '待审批' },
+    { value: '1', label: '未封帐' },
+    { value: '2', label: '已封帐' },
+]

src/views/invoiceInOut/summary/detail.vue

@@ -0,0 +1,90 @@
+<script setup lang="ts">
+import { ref } from "vue"
+import { useDetail } from "/@/hooks/core/useDetail"
+
+import { 
+  ElCollapseItem,
+  ElTableColumn,
+  ElDatePicker,
+  ElPagination,
+  ElFormItem,
+  ElCollapse, 
+  ElTabPane,
+  ElInput,
+  ElTable,
+  ElForm,
+  ElTabs,
+  ElRow,
+  ElCol
+} from "element-plus"
+
+const { title, collapses } = useDetail({ baseName: '收发存汇总', collapseLen: 2 });
+</script>
+
+<template>
+  <div class="padding__container">
+    <ElTabs>
+      <ElTabPane :label="title">
+        <ElCollapse v-model="collapses">
+          <ElCollapseItem :title="title" name="1">
+            <ElForm>
+              <ElRow :gutter="10">
+                <ElCol :span="12">
+                  <ElFormItem label="记账月份">
+                    <ElDatePicker style="width: 100%" type="month" :modelValue="'2024-11'" />
+                  </ElFormItem>
+                </ElCol>
+              
+                <ElCol :span="12">
+                  <ElFormItem label="公司名称">
+                    <ElInput :model-value="'百辰荣达'" />
+                  </ElFormItem>
+                </ElCol>
+
+                <ElCol :span="24">
+                  <ElTable size="small">
+                    <ElTableColumn label="存货" align="center">
+                        <ElTableColumn label="编码" />
+                        <ElTableColumn label="代码" />
+                        <ElTableColumn label="名称" />
+                        <ElTableColumn label="规格" />
+                        <ElTableColumn label="单位" />
+                        <ElTableColumn label="重量" />
+                        <ElTableColumn label="分光" />
+                    </ElTableColumn>
+
+                    <ElTableColumn label="期初" align="center">
+                      <ElTableColumn label="数量" />
+                      <ElTableColumn label="单价" />
+                      <ElTableColumn label="金额" />
+                    </ElTableColumn>
+
+                    <ElTableColumn label="收入" align="center">
+                      <ElTableColumn label="数量" />
+                      <ElTableColumn label="单价" />
+                      <ElTableColumn label="金额" />
+                    </ElTableColumn>
+
+                     <ElTableColumn label="发出" align="center">
+                      <ElTableColumn label="数量" />
+                      <ElTableColumn label="单价" />
+                      <ElTableColumn label="金额" />
+                    </ElTableColumn>
+
+                    <ElTableColumn label="结存" align="center">
+                      <ElTableColumn label="数量" />
+                      <ElTableColumn label="单价" />
+                      <ElTableColumn label="金额" />
+                    </ElTableColumn>
+                  </ElTable>
+
+                  <ElPagination />
+                </ElCol>
+              </ElRow>
+            </ElForm>
+          </ElCollapseItem>
+        </ElCollapse>
+      </ElTabPane>
+    </ElTabs>
+  </div>
+</template>

src/views/invoiceInOut/summary/index.vue

@@ -0,0 +1,79 @@
+<script setup lang="ts">
+import { reactive } from "vue";
+import { useRouter } from "vue-router";
+import { usePageSearch, type PageHooks, type PageEvents } from "/@/hooks/page";
+import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
+import contentConfig from "./config/content.config";
+import searchConfig from "./config/search.config";
+import { ElButton, ElMessageBox, ElTooltip } from "element-plus";
+
+const PageName = "productManager";
+const router = useRouter();
+
+const hooks: PageHooks = { pageSearchHook: () => usePageSearch(undefined, undefined, searchConfig) };
+const events: PageEvents = { content: { preview: ({ id }) => router.push("/invoiceInOut/summaryDetail?id=" + id) } };
+
+
+async function handleStatusChange(){
+  try{
+    ElMessageBox.alert('是否确认审核', '提示', { type: 'warning', confirmButtonText: '确认' })
+    .then(res => { console.log(res, '🚀~~') })
+    .catch(err => { console.log(err, '🚀~~') })
+  } catch(err) {
+    console.log(err)
+  }
+}
+</script>
+
+<template>
+  <PageAuth :pageName="PageName">
+    <PageContainer
+      :hooks="hooks"
+      :events="events"
+      :searchConfig="searchConfig"
+      :contentConfig="contentConfig"
+    >
+      <template #content_action>
+        <ElTooltip content="审批通过" placement="top">
+          <ElButton
+            link
+            size="small"
+            type="primary"
+            @click="handleStatusChange" 
+            :icon="useRenderIcon('checkbox-circle-line')"
+          />
+        </ElTooltip>
+
+        <ElTooltip content="改为未封账" placement="top">
+          <ElButton
+            link
+            size="small"
+            type="primary" 
+            @click="handleStatusChange"
+            :icon="useRenderIcon('close-circle-line')"
+          />
+        </ElTooltip>
+
+        <ElTooltip content="解除封账" placement="top">
+          <ElButton
+            link
+            size="small"
+            type="primary" 
+            @click="handleStatusChange"
+            :icon="useRenderIcon('link')"
+          />
+        </ElTooltip>
+
+        <ElTooltip content="改为待审批" placement="top">
+          <ElButton
+            link
+            size="small"
+            type="primary" 
+            @click="handleStatusChange"
+            :icon="useRenderIcon('compass')"
+          />
+        </ElTooltip>
+      </template>
+    </PageContainer>
+  </PageAuth>
+</template>