feat

src/api/invoiceInOut/productManager/index.ts

@@ -1,9 +1,11 @@
 import { http } from "/@/utils/http";
 import { loadEnv } from "@build/index";
-const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL } = loadEnv();
+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;
@@ -12,12 +14,24 @@ interface ResponseType extends Promise<any> {
 
 // 添加
 export const httpAdd = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderpayadd`, { data });
+  return http.request("post", `${newApi}/cxinv/FinancialProducts/create`, { data });
 };
 
 // 列表
 export const httpList = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderinvlist`, { data: { ...data, status: "4" } });
+  return http.request("post", `${newApi}/cxinv/FinancialProducts/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 });
 };
 
 

src/components/Input/src/number.vue

@@ -7,6 +7,7 @@ const props = defineProps<{
   placeholder?: string;
 }>();
 
+const emit = defineEmits(["change"])
 const modelValue = useVModel(props, "modelValue");
 
 function valid(value) {
@@ -20,5 +21,9 @@ watch(
 </script>
 
 <template>
-  <ElInput v-model="modelValue" :placeholder="placeholder" />
+  <ElInput 
+    v-model="modelValue" 
+    :placeholder="placeholder" 
+    @change="value => emit('change', value)" 
+  />
 </template>

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

@@ -322,9 +322,7 @@ const PageContent = defineComponent({
           data={dataList.value}
           checkList={checkList}
           maxHeight={maxHeight ? maxHeight : '660px'}
-          paginationSmall={
-            size === "small" ? true : false
-          }
+          paginationSmall={size === "small" ? true : false}
           rowClassName={tableRowClassName}
           headerCellStyle={{ background: "#fafafa", color: "#606266" }}
           onSelectionChange={handleSelection}

src/store/modules/user.ts

@@ -230,7 +230,8 @@ export const useUserStore = defineStore({
           code: 0,
           data: [
             createMenu('商品管理', 'productManager', 'invoiceInOut/productManager'),
-            createMenu('出入库管理', 'inOutManager', 'invoiceInOut/inOutManager')
+            createMenu('出入库管理', 'inOutManager', 'invoiceInOut/inOutManager'),
+            createMenu('盘点', 'inventoryCheck', 'invoiceInOut/inventoryCheck'),
           ],
           message: '获取成功'
         }

src/utils/status.ts

@@ -5,7 +5,7 @@ export const goodTypeOptions = [
 ];
 
 const statusList = [
-  { value: "1", label: "启用", type: "primary" },
+  { value: "1", label: "启用", type: "success" },
   { value: "0", label: "禁用", type: "warning" }
 ];
 
@@ -35,14 +35,14 @@ const cg_order_type_options = [
   { value: "1", label: "库存商品" },
   { value: "2", label: "非库存商品" },
   { value: "3", label: "反馈商品" },
-  { value: "4", label: "报备商品" }
+  // { value: "4", label: "报备商品" }
 ];
 
 const xs_order_type_options = [
   { value: "1", label: "库存商品" },
   { value: "2", label: "非库存商品" },
   { value: "3", label: "反馈商品" },
-  { value: "4", label: "报备商品" }
+  // { value: "4", label: "报备商品" }
 ];
 
 const cg_order_source_options = [
@@ -144,6 +144,13 @@ export const xs_inv_type_list = [
   { label: "电子发票（增值税普通发票）", value: "fully_digitalized_normal_electronic", scanValue: "32" }
 ];
 
+export const tax_list = [
+  { label: "0%", value: "0%",},
+  { label: "6%", value: "6%" },
+  { label: "9%", value: "9%" },
+  { label: "13%", value: "13%" },
+];
+
 const send_status_list = [
   { value: "1", label: "未发货", type: "warning" },
   { value: "2", label: "部分已发", type: "primary" },

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

@@ -1,62 +0,0 @@
-<script setup lang="ts">
-import { ElForm, ElFormItem, ElRow, ElCol } from 'element-plus';
-import { onMounted } from "vue"
-
-onMounted(() => { })
-</script>
-
-<template>
-  <ElForm>
-    <ElRow>
-      <ElCol :span="12">
-        <ElFormItem label="销售方公司">
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="12">
-        <ElFormItem label="购买方公司">
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="8">
-        <ElFormItem label="订单商品名称">
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="8">
-        <ElFormItem label="发票商品名称">
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="8">
-        <ElFormItem label="商品类型">
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="6">
-        <ElFormItem label="规格">
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="6">
-        <ElFormItem label="单位">
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="6">
-        <ElFormItem label="税前单价">
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="6">
-        <ElFormItem label="税后单价">
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="6">
-        <ElFormItem label="重量">
-        </ElFormItem>
-      </ElCol>
-    </ElRow>
-  </ElForm>
-</template>

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

@@ -1,67 +0,0 @@
-export const goodColumns = [
-  {
-    span: 12,
-    field: 'TODO',
-    label: '销售方公司'
-  },
-  {
-    span: 12,
-    field: 'TODO',
-    label: '购买方公司'
-  },
-  {
-    span: 12,
-    field: 'TODO',
-    label: '订单商品名称'
-  },
-  {
-    span: 12,
-    field: 'TODO',
-    label: '发票商品名称'
-  },
-  {
-    span: 6,
-    field: 'TODO',
-    label: '商品类型'
-  },
-  {
-    span: 6,
-    field: 'TODO',
-    label: '商品代码'
-  },
-  {
-    span: 6,
-    field: 'TODO',
-    label: '规格'
-  },
-  {
-    span: 6,
-    field: 'TODO',
-    label: '单位'
-  },
-  {
-    span: 6,
-    field: 'TODO',
-    label: '税前单价'
-  },
-  {
-    span: 6,
-    field: 'TODO',
-    label: '税后单价'
-  },
-  {
-    span: 6,
-    field: 'TODO',
-    label: '重量'
-  },
-  {
-    span: 6,
-    field: 'TODO',
-    label: '分光'
-  },
-  {
-    field: 'TODO',
-    label: '进项类目',
-    span: 24
-  }
-]

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

@@ -1,78 +0,0 @@
-import { ContentConfig } from "/@/components/PageContent";
-import { httpList } from "/@/api/invoiceInOut/productManager";
-
-import dayjs from "dayjs";
-import { h } from "vue";
-import { ElTag } from "element-plus";
-import { invoiceTypeList, useTypeOptions } from "/@/utils/status";
-import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
-
-const columns = [
-  {
-    label: "商品编码",
-    prop: "TODO",
-    minWidth: 150
-  },
-  {
-    label: "商品代码",
-    prop: "TODO",
-    minWidth: 160
-  },
-  {
-    label: '商品类型',
-    prop: 'TODO',
-    minWidth: 100
-  },
-  {
-    label: '商品名称',
-    prop: 'TODO',
-    minWidth: 100
-  },
-  {
-    label: "规格",
-    prop: "TODO",
-    minWidth: 80
-  },
-  {
-    label: "单位",
-    prop: "TODO",
-    minWidth: 80
-  },
-  {
-    label: '单价',
-    prop: 'TODO',
-    minWidth: 100
-  },
-  {
-    label: '重量',
-    prop: 'TODO',
-    minWidth: 80
-  },
-  {
-    label: '分光',
-    prop: 'TODO',
-    minWidth: 80
-  },
-  {
-    label:'创建时间',
-    prop: 'TODO',
-    width: 140
-  },
-  {
-    label: "操作",
-    fixed: "right",
-    width: 55,
-    slot: "operation"
-  }
-];
-
-const contentConfig: ContentConfig = {
-  title: "组合商品管理",
-  columns,
-  apis: {
-    httpList,
-    httpAdd: true
-  }
-};
-
-export default contentConfig;

src/views/invoiceInOut/combindProductManager/detail.vue

@@ -1,38 +0,0 @@
-<script setup lang="ts">
-import { useDetail } from "/@/hooks/core/useDetail";
-import BasicDescriptions from "/@/components/BasicDescriptions";
-import { goodColumns } from "./config/columns"
-
-import BaseForm from "./components/BaseForm.vue"
-
-const { 
-  title, 
-  isDetail, 
-  collapses 
-} = useDetail({ 
-  baseName: '组合类型', 
-  collapseLen: 2 
-});
-
-
-</script>
-
-<template>
-  <div class="padding__container">
-    <ElTabs>
-      <ElTabPane :label="title">
-        <ElCollapse v-model="collapses">
-          <ElCollapseItem :title="title" name="1">
-            <BasicDescriptions
-              v-if="isDetail" 
-              :columns="goodColumns"
-              :data="{}" 
-            />
-
-            <BaseForm v-else/>
-          </ElCollapseItem>
-        </ElCollapse>
-      </ElTabPane>
-    </ElTabs>
-  </div>
-</template>

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

@@ -1,298 +0,0 @@
-<script setup lang="ts">
-import { reactive, ref } from "vue";
-import { rules } from "./rules"
-import { cg_order_type_options, xs_inv_type_list } from "/@/utils/status";
-import { httpCompanies } from "/@/api/invoiceInOut/productManager";
-
-import { ElForm, ElOption, ElSelect } from "element-plus"
-
-const formRef = ref<InstanceType<typeof ElForm> | null>(null)
-
-const formData = ref({ 
-  companyNo: "", 
-  supplierNo: "",
-  goodSource: "",
-  goodCode: '',
-  goodType: '',
-  is_combind: "",
-  invGoodName: "",
-  afterTaxPrice: '',
-  in_cost_status: '',
-  beforeTaxPrice: '',
-  goodName: "",
-  spuCode: '',
-  in_code: '',
-  invType: '',
-  in_tax: '',
-  spec: '',
-  unit: '',
-  weight: '',
-  fg: ''
-})
-
-const state = reactive({
-  companies: []
-})
-
-async function submit(){
-  try{
-    await formRef.value?.validate()
-    console.log('joined~~~')
-  }catch(err){
-    console.log(err)
-  }
-}
-
-(async function initialData(){
-  const result = await httpCompanies({ size: 10000 })
-
-  if(result.code == 0){
-    state.companies = result.data.list.map(({ companyNo, company_name }) => ({ value: companyNo, label: company_name })) 
-    console.log(state.companies)
-  }
-})()
-</script>
-
-<template>
-  <ElForm
-    ref="formRef"
-    :rules="rules" 
-    :model="formData" 
-  >
-    <ElRow :gutter="10">
-      <ElCol :span="12">
-        <ElFormItem label="销售方公司" prop="supplierNo">
-          <ElSelect
-            style="width: 100%"
-            v-model="formData.supplierNo" 
-            placeholder="销售方公司" 
-          >
-            <ElOption 
-              v-for="item in state.companies"
-              :value="item.value"
-              :label="item.label"
-            />
-          </ElSelect>
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="12">
-        <ElFormItem label="购买方公司" prop="companyNo">
-          <ElInput
-            v-model="formData.companyNo" 
-            placeholder="购买方公司" 
-          />
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="8">
-        <ElFormItem label="商品来源" prop="goodSource">
-          <ElSelect
-            @change="formData.goodCode = ''"
-            v-model="formData.goodSource"
-            placeholder="商品来源"
-            style="width: 100%"
-          >
-            <ElOption label="采销商品" value="0" />
-            <ElOption label="非采销商品" value="1" />
-          </ElSelect>
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="8">
-        <ElFormItem label="商品编号" prop="spuCode">
-          <ElInput v-model="formData.spuCode" placeholder="商品编号" />
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="8">
-        <ElFormItem label="订单商品类型" prop="goodType">
-          <ElSelect 
-            v-model="formData.goodType"
-            placeholder="订单商品类型"
-            style="width: 100%" 
-          >
-            <ElOption
-              v-for="opt in cg_order_type_options"
-              :value="opt.value"
-              :label="opt.label"
-            />
-          </ElSelect>
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="8">
-        <ElFormItem label="组合类型" prop="is_combind">
-          <ElSelect style="width: 100%" v-model="formData.is_combind">
-            <ElOption label="非组合商品" value="0" />
-            <ElOption label="组合商品" value="1" />
-          </ElSelect>
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="8">
-        <ElFormItem label="订单商品名称" prop="goodName">
-          <ElInput
-            v-model="formData.goodName"
-            placeholder="订单商品名称" 
-          />
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="8">
-        <ElFormItem label="发票商品名称" prop="invGoodName">
-          <ElInput 
-            v-model="formData.invGoodName" 
-            placeholder="发票商品名称" 
-          />
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="8">
-        <ElFormItem label="规格" prop="spec">
-          <ElInput 
-            v-model="formData.spec" 
-            placeholder="规格" 
-          />
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="8">
-        <ElFormItem label="商品代码" prop="goodCode">
-          <ElInput 
-            v-model="formData.goodCode" 
-            placeholder="商品代码" 
-          />
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="8">
-        <ElFormItem label="成本税前单价" prop="beforeTaxPrice">
-          <ElInput 
-            v-model="formData.beforeTaxPrice"  
-            placeholder="成本税前单价" 
-          />
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="8">
-        <ElFormItem label="单位" prop="unit">
-          <ElInput 
-            v-model="formData.unit"  
-            placeholder="单位" 
-          />
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="8">
-        <ElFormItem label="重量" prop="weight">
-          <ElInput 
-            v-model="formData.weight" 
-            placeholder="重量" 
-          />
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="8">
-        <ElFormItem label="成本税后单价" prop="afterTaxPrice">
-          <ElInput 
-            v-model="formData.afterTaxPrice" 
-            placeholder="成本税后单价" 
-          />
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="6">
-        <ElFormItem label="进项税目" prop="in_code">
-          <ElInput
-            prop="in_code"
-            style="width: 100%" 
-            placeholder="进项税目" 
-            v-model="formData.in_code"
-           />
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="6">
-        <ElFormItem label="分光" prop="fg">
-          <ElInput  
-            v-model="formData.fg"
-            placeholder="分光" 
-            style="width: 100%" 
-          />
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="6">
-        <ElFormItem label="发票类型" prop="invType">
-          <ElSelect
-            v-model="formData.invType"
-            placeholder="发票类型" 
-            style="width: 100%" 
-          > 
-            <ElOption 
-              v-for="opt in xs_inv_type_list"
-              :value="opt.value"
-              :label="opt.label"
-            />
-          </ElSelect>
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="6">
-        <ElFormItem label="进项税率" prop="in_tax">
-          <ElSelect 
-            v-model="formData.in_tax" 
-            placeholder="进项税率" 
-            style="width: 100%"
-          > </ElSelect>
-        </ElFormItem>
-      </ElCol>
-
-      <ElCol :span="6">
-        <ElFormItem label="进项成本状态" prop="in_cost_status">
-          <ElSelect 
-            v-mdoel="formData.in_cost_status" 
-            placeholder="进项成本状态"
-          >
-            <ElOption label="真实成本信息" value="0" />
-            <ElOption label="预估成本信息" value="1" />
-          </ElSelect>
-        </ElFormItem>
-      </ElCol>
-    </ElRow>
-
-    <!-- 
-    <ElRow>
-      <ElCol :span="24">
-        <ElFormItem label="子商品">
-          <ElTable border size="small">
-            <ElTableColumn label="比例" />
-            <ElTableColumn label="商品编号" />
-            <ElTableColumn label="商品类型" />
-            <ElTableColumn label="商品名称" />
-
-            <ElTableColumn width="80px">
-              <template #header>
-                <div class="w-full flex justify-between">
-                  <p>操作</p>
-                  <ElButton
-                    link
-                    size="small"
-                    type="primary"
-                    :icon="useRenderIcon('add')"
-                  />
-                </div>
-              </template>
-            </ElTableColumn>
-          </ElTable>
-        </ElFormItem>
-      </ElCol>
-    </ElRow> -->
-    <!-- <Modal /> -->
-
-    <div class="w-full flex justify-end">
-      <ElButton type="primary" @click="submit">保存</ElButton>
-    </div>
-  </ElForm>
-</template>

src/views/invoiceInOut/inOutManager/components/Modal.vue

@@ -1,13 +0,0 @@
-<script setup lang="ts">
-import { useVModel } from "@vueuse/core"
-
-const props = defineProps<{ visible: boolean }>()
-const visible = useVModel(props, 'visible')
-
-</script>
-
-<template>
-  <ElDialog v-model="visible">
-    
-  </ElDialog>
-</template>

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

@@ -0,0 +1,247 @@
+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: '90px'
+  },
+  {
+    label: '操作数量',
+    prop: 'TODO38',
+    minWidth: '90px'
+  },
+  {
+    label: '子商品编号',
+    prop: 'TODO39',
+    minWidth: '100px'
+  },
+  {
+    label: '子商品操作数量',
+    prop: 'TODO40',
+    minWidth: '110px'
+  }
+]
+
+export { initheaders, columns };

src/views/invoiceInOut/inOutManager/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 !== initheaders.length) {
+    headok = false;
+  } else {
+    initheaders.forEach((si, sii) => {
+      if (si !== 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/inOutManager/components/OrderImportModal/columns-config.ts

@@ -0,0 +1,232 @@
+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'
+  }
+]
+
+export { initheaders, columns };

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

@@ -0,0 +1,350 @@
+<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 !== initheaders.length) {
+    headok = false;
+  } else {
+    initheaders.forEach((si, sii) => {
+      if (si !== 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/inOutManager/config/columns.ts

@@ -1,67 +1,9 @@
-export const goodColumns = [
+export const goodColumns = []
+
+
+
+export const orderGoodColumns = [
   {
-    span: 12,
-    field: 'TODO',
-    label: '销售方公司'
-  },
-  {
-    span: 12,
-    field: 'TODO',
-    label: '购买方公司'
-  },
-  {
-    span: 12,
-    field: 'TODO',
-    label: '订单商品名称'
-  },
-  {
-    span: 12,
-    field: 'TODO',
-    label: '发票商品名称'
-  },
-  {
-    span: 6,
-    field: 'TODO',
-    label: '商品类型'
-  },
-  {
-    span: 6,
-    field: 'TODO',
-    label: '商品代码'
-  },
-  {
-    span: 6,
-    field: 'TODO',
-    label: '规格'
-  },
-  {
-    span: 6,
-    field: 'TODO',
-    label: '单位'
-  },
-  {
-    span: 6,
-    field: 'TODO',
-    label: '税前单价'
-  },
-  {
-    span: 6,
-    field: 'TODO',
-    label: '税后单价'
-  },
-  {
-    span: 6,
-    field: 'TODO',
-    label: '重量'
-  },
-  {
-    span: 6,
-    field: 'TODO',
-    label: '分光'
-  },
-  {
-    field: 'TODO',
-    label: '进项类目',
-    span: 24
+    label: '业务编号',
   }
-]
+]

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

@@ -8,46 +8,48 @@ const columns = [
   { 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: 150 },
-  { label: "规格", prop: "TODO", width: 80 },
-  { label: "单位", prop: "TODO", width: 80 },
-  {
-    label: '税前单价',
-    prop: 'TODO',
-    width: 100
-  },
-  {
-    label: '税后单价',
-    prop: 'TODO',
-    width: 100
-  },
-  {
-    label: '重量',
-    prop: 'TODO',
-    width: 80
-  },
-  {
-    label: '分光',
-    prop: 'TODO',
-    width: 80
-  },
-  {
-    label: '创建人',
-    prop: 'TODO',
-    width: 80
-  },
-  {
-    label:'创建时间',
-    prop: 'TODO',
-    width: 140
-  },
-  {
-    label: "操作",
-    fixed: "right",
-    width: 55,
-    slot: "operation"
-  }
+  { 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: 'TODO', width: 120 },
+  { label: '税目', prop: 'TODO', width: 120 },
+  { label: '税率', prop: 'TODO', width: 60 },
+  { label: '关联金额', prop: 'TODO', width: 120 },
+  { label: '购买方公司名称', prop: 'TODO', width: 120 },
+  { label: '购买方公司纳税号', prop: 'TODO', width: 120 },
+  { label: '发票号码', prop: 'TODO', width: 100 },
+  { label: '发票类型', prop: 'TODO', width: 100 },
+  { label: '销售方公司', prop: 'TODO', width: 100 },
+  { label: '销售方公司纳税号', prop: 'TODO', width: 120 },
+  { label: '发票明细ID', prop: 'TODO', width: 100 },
+  { label: '货物或应税劳务、服务名称', prop: 'TODO', width: 170 },
+  { label: '类目编号', prop: 'TODO', width: 100 },
+  { label: '规格型号', prop: 'TODO', width: 80 },
+  { label: '单位', prop: 'TODO', width: 80 },
+  { label: '数量', prop: 'TODO', width: 80 },
+  { label: '税前单价', prop: 'TODO', width: 100 },
+  { label: '税后总价', prop: 'TODO', width: 100 },
+  { label: '税率', prop: 'TODO', width: 80 },
+  { label: '税额', prop: 'TODO', width: 80 },
+  { label: '税后单价', prop: 'TODO', width: 100 },
+  { label: '税后总额', prop: 'TODO', width: 100 },
+  { label: '类目编号状态', prop: 'TODO', width: 100 },
+  { label: '税率状态', prop: 'TODO', width: 100 },
+  { label: '备注', prop: 'TODO', width: 100 },
+  { label: '业务类型', prop: 'TODO', width: 100 },
+  { label: '商品编号', prop: 'TODO', width: 100 },
+  { label: '商品名称', prop: 'TODO', width: 100 },
+  { label: '税前单价', prop: 'TODO', width: 100 },
+  { label: '单价', prop: 'TODO', width: 100 },
+  { label: '数量', prop: 'TODO', width: 100 },
+  { label: "操作", fixed: "right", width: 55, slot: "operation" }
 ];
 
 const contentConfig: ContentConfig = {

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

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

src/views/invoiceInOut/inOutManager/detail.vue

@@ -3,9 +3,7 @@ import { useDetail } from "/@/hooks/core/useDetail";
 // import BasicDescriptions from "/@/components/BasicDescriptions";
 // import { goodColumns } from "./config/columns"
 
-import BaseForm from "./components/BaseForm.vue"
-
-const { id, title, isDetail, collapses } = useDetail({ baseName: '商品', collapseLen: 2 });
+const { id, isDetail, title, collapses } = useDetail({ baseName: '商品', collapseLen: 2 });
 </script>
 
 <template>
@@ -14,8 +12,6 @@ const { id, title, isDetail, collapses } = useDetail({ baseName: '商品', colla
       <ElTabPane :label="title">
         <ElCollapse v-model="collapses">
           <ElCollapseItem :title="title" name="1">
-            <BaseForm />
-            <!-- <BasicDescriptions :columns="goodColumns" :data="{}" /> -->
           </ElCollapseItem>
         </ElCollapse>
       </ElTabPane>

src/views/invoiceInOut/inOutManager/index.vue

@@ -1,24 +1,31 @@
 <script setup lang="ts">
+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 { useRouter } from "vue-router";
+
+import NotOrderImportModal from "./components/NotOrderImportModal/index.vue"
+import OrderImportModal from "./components/OrderImportModal/index.vue"
+
+import { useRenderIcon } from "/@/components/ReIcon/src/hooks"
 
 const PageName = "productManager";
 const router = useRouter();
 
 const hooks: PageHooks = {
-  pageSearchHook: () => usePageSearch(
-    undefined, 
-    undefined, 
-    searchConfig
-  )
+  pageSearchHook: () => usePageSearch(undefined, undefined, searchConfig)
 };
 
+const state = reactive({ 
+  orderImportVisible: false, 
+  notOrderImportVisible: false 
+})
+
 const events: PageEvents = {
   content: {
-    preview: ({ id }) => router.push("/invoiceInOut/productManagerDetail?id=" + id),
-    create: () => router.push('/invoiceInOut/productManagerDetail')
+    create: () => router.push('/invoiceInOut/productManagerDetail'),
+    preview: ({ id }) => router.push("/invoiceInOut/productManagerDetail?id=" + id)
   }
 };
 </script>
@@ -30,6 +37,44 @@ const events: PageEvents = {
       :events="events"
       :searchConfig="searchConfig"
       :contentConfig="contentConfig"
-    />
+    >
+      <template #content_header>
+        <ElDropdown>
+          <ElButton 
+            size="small" 
+            type="primary"
+            style="margin-right: 10px;margin-top:1px"
+            :icon="useRenderIcon('arrow-up-line')"
+          >商品导入
+          </ElButton>
+          
+          <template #dropdown>
+            <ElDropdownMenu>
+              <ElDropdownItem @click="state.orderImportVisible = true">订单商品</ElDropdownItem>
+              <ElDropdownItem @click="state.notOrderImportVisible = true">非订单商品</ElDropdownItem>
+            </ElDropdownMenu>
+          </template>
+        </ElDropdown>
+
+        <ElDropdown>
+          <ElButton 
+            size="small" 
+            style="margin-right: 10px;margin-top:1px"
+            :icon="useRenderIcon('arrow-down-line')"
+          >商品导入模板下载</ElButton>
+          
+          <template #dropdown>
+            <ElDropdownMenu>
+              <ElDropdownItem>订单商品</ElDropdownItem>
+              <ElDropdownItem>非订单商品</ElDropdownItem>
+            </ElDropdownMenu>
+          </template>
+        </ElDropdown>
+      </template>
+
+    </PageContainer>
+
+    <OrderImportModal v-model:visible="state.orderImportVisible" />
+    <NotOrderImportModal v-model:visible="state.notOrderImportVisible" />
   </PageAuth>
 </template>

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

@@ -0,0 +1,396 @@
+<script setup lang="ts">
+import { reactive, ref } from "vue";
+import { cg_order_type_options, xs_inv_type_list, tax_list } from "/@/utils/status"
+import { ElButton, ElCol, ElForm, ElFormItem, ElMessage, ElOption, ElSelect, ElTooltip } from "element-plus"
+import { httpCompanies } from "/@/api/invoiceInOut/productManager"
+import RemoteSelect from "/@/components/RemoteSelect";
+import InvoiceTitle from "./InvoiceTitle.vue";
+import { rules } from "./rules"
+
+import { convertInvoiceTitle, convertInvoiceTitleData, createInitalData } from "./shared"
+import { useTask } from "/@/hooks/core"
+import { useRouter } from "vue-router"
+
+import ChooseGoodModal from "./ChooseGoodModal/index.vue"
+import ChildGoodEditModal from "./ChildGoodEditModal.vue";
+
+
+import { httpInvoiceList } from "/@/api/InvoiceSales/invoiceApply";
+import { httpAdd, httpCatist } from "/@/api/invoiceInOut/productManager";
+import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
+
+
+const router = useRouter()
+const formRef = ref<InstanceType<typeof ElForm> | null>(null)
+
+const state = reactive({ 
+  editVisible: false,
+  visible: false,
+  companies: [],
+  index: -1,
+  data: {}
+})
+
+
+
+const createTask = useTask({ success(){ router.push('/invoiceInOut/productManager') } })
+const formData = ref(createInitalData())
+
+const sellerInvoiceTitle = ref<Record<string, string>>({});
+const purchaserInvoiceTitle = ref<Record<string, string>>({});
+
+async function submit(){
+  if(formData.value.is_combind === '1' && formData.value.childArr.length === 0){
+    ElMessage.warning('请选择至少一个子商品')
+    return
+  }
+
+  if(formData.value.is_combind === '0'){
+    formData.value.childArr = []
+  }
+
+  try{
+    await formRef.value?.validate()
+    createTask.run(httpAdd({
+      ...formData.value,
+      childArr: formData.value.childArr.map(({ child_id, child_num }) => ({ child_id, child_num }))
+    }))
+  }catch(err){
+    console.log(err)
+  }
+}
+
+function handleInvoiceTitle(_isSeller: boolean, invoiceTitle: Record<string, string> ) {
+  if (_isSeller) {
+    invoiceTitle = state.companies.find(item => item.company_license === formData.value.seller_code)
+    formData.value.seller_name = invoiceTitle.company_name
+    //支持的开票方式
+    // const { invoiceType, denomination: _denomination } = invoiceTitle;
+    // const chunks = invoiceType.split(",");
+    // ruleForm.value.invtype = "";
+    // invoiceTypes.value = xs_inv_type_list.filter(({ value }) => chunks.includes(value));
+    // formData.value.seller_name = 
+  } else{
+    formData.value.buyer_name = invoiceTitle.invoice_title
+  }
+
+  if (!invoiceTitle) {
+    if (_isSeller) { return (sellerInvoiceTitle.value = {}); }
+    return (purchaserInvoiceTitle.value = {});
+  }
+
+  _isSeller
+    ? (sellerInvoiceTitle.value = convertInvoiceTitleData(convertInvoiceTitle(invoiceTitle)))
+    : (purchaserInvoiceTitle.value = convertInvoiceTitleData(invoiceTitle));
+}
+
+
+const setSellerInvoiceTitle = handleInvoiceTitle.bind(null, true);
+const setPurchaserInvoiceTitle = handleInvoiceTitle.bind(null, false);
+
+
+function handleSubmit(list: any[]){
+  const currentIds = formData.value.childArr.map(({ id }) => id)
+  const appends: any[] = []
+
+  for(const item of list){
+    if(currentIds.includes(item.id)){ continue }
+    appends.push(item)
+  }
+
+  formData.value.childArr = [ ...formData.value.childArr, ...appends ]
+}
+
+
+function handleChildGoodEdit(index: number){
+  state.index = index
+  state.editVisible = true
+  state.data = { ...formData.value.childArr[index] }
+}
+
+(async function initialData(){
+  const result = await httpCompanies({ size: 10000 })
+  if(result.code == 0){
+    state.companies = [...result.data.list]
+    console.log(state.companies)
+  }
+})()
+</script>
+
+<template>
+  <ElForm
+    ref="formRef"
+    :rules="rules" 
+    :model="formData" 
+    v-loading="createTask.loading"
+  >
+    <ElRow :gutter="10">
+      <ElCol :span="12">
+        <ElFormItem label="销售方公司" prop="seller_code">
+          <ElSelect
+            style="width: 100%"
+            placeholder="销售方公司"
+            v-model="formData.seller_code" 
+            @change="setSellerInvoiceTitle"
+          >
+            <ElOption 
+              v-for="item in state.companies"
+              :label="item.company_name"
+              :value="item.company_license"
+            />
+          </ElSelect>
+        </ElFormItem>
+        <InvoiceTitle :detail="sellerInvoiceTitle" />
+      </ElCol>
+
+      <ElCol :span="12">
+        <ElFormItem label="购买方公司" prop="buyer_code">
+          <RemoteSelect
+            is-root
+            style="width: 100%"
+            request-prop="name"
+            :api="httpInvoiceList"
+            response-val-prop="invoice_code"
+            placeholder="购买方公司抬头"
+            v-model:value="formData.buyer_code"
+            response-label-prop="invoice_title"
+            @item-change="setPurchaserInvoiceTitle"
+          />
+        </ElFormItem>
+        <InvoiceTitle :detail="purchaserInvoiceTitle" />
+      </ElCol>
+
+
+      <ElCol :span="8">
+        <ElFormItem label="商品来源" prop="good_source">
+          <ElSelect
+            @change="formData.good_code = ''"
+            v-model="formData.good_source"
+            placeholder="商品来源"
+            style="width: 100%"
+          >
+            <ElOption label="采销商品" value="1" />
+            <ElOption label="非采销商品" value="2" />
+          </ElSelect>
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="商品编号" prop="skuCode">
+          <ElInput v-model="formData.skuCode" placeholder="商品编号" />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="订单商品类型" prop="good_type">
+          <ElSelect 
+            v-model="formData.good_type"
+            placeholder="订单商品类型"
+            style="width: 100%" 
+          >
+            <ElOption
+              v-for="opt in cg_order_type_options"
+              :value="opt.value"
+              :label="opt.label"
+            />
+          </ElSelect>
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="组合类型" prop="is_combind">
+          <ElSelect style="width: 100%" v-model="formData.is_combind">
+            <ElOption label="非组合商品" value="0" />
+            <ElOption label="组合商品" value="1" />
+          </ElSelect>
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="订单商品名称" prop="goodName">
+          <ElInput v-model="formData.goodName" placeholder="订单商品名称"  />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="发票商品名称" prop="inv_good_name">
+          <ElInput v-model="formData.inv_good_name" placeholder="发票商品名称" />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="规格" prop="spec">
+          <ElInput  v-model="formData.spec" placeholder="规格"  />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="商品代码" prop="good_code">
+          <ElInput  v-model="formData.good_code" placeholder="商品代码"  />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="成本税前单价" prop="unit_price">
+          <ElInput v-model="formData.unit_price"  placeholder="成本税前单价" />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="单位" prop="unit">
+          <ElInput v-model="formData.unit"  placeholder="单位"  />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="重量" prop="unit_weight">
+          <ElInput v-model="formData.unit_weight" placeholder="重量"  />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="成本税后单价" prop="subunit_price">
+          <ElInput 
+            v-model="formData.subunit_price" 
+            placeholder="成本税后单价" 
+          />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="6">
+        <ElFormItem label="分光" prop="spectral">
+          <ElInput  
+            v-model="formData.spectral"
+            placeholder="分光" 
+            style="width: 100%" 
+          />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="6">
+        <ElFormItem label="发票类型" prop="inv_type">
+          <ElSelect
+            v-model="formData.inv_type"
+            placeholder="发票类型" 
+            style="width: 100%" 
+          > 
+            <ElOption 
+              v-for="opt in xs_inv_type_list"
+              :value="opt.value"
+              :label="opt.label"
+            />
+          </ElSelect>
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="6">
+        <ElFormItem label="进项税目" prop="cat_code">
+          <RemoteSelect
+            :api="httpCatist"
+            style="width: 100%"
+            request-prop="cat_name"
+            placeholder="进项税目"
+            response-val-prop="cat_code"
+            response-label-prop="cat_name"
+            v-model:value="formData.cat_code"
+          />
+          <!-- <ElInput v-model="formData.cat_code" placeholder="进项税目" /> -->
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="6">
+        <ElFormItem label="进项税率" prop="cat_tax">
+          <ElSelect v-model="formData.cat_tax" placeholder="进项税率">
+            <ElOption v-for="tax in tax_list" v-bind="tax" />
+          </ElSelect>
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="6">
+        <ElFormItem label="进项成本状态" prop="basic_status">
+          <ElSelect 
+            v-model="formData.basic_status" 
+            placeholder="进项成本状态"
+          >
+            <ElOption label="真实成本信息" value="1" />
+            <ElOption label="预估成本信息" value="2" />
+          </ElSelect>
+        </ElFormItem>
+      </ElCol>
+    </ElRow>
+
+    <ElRow v-if="formData.is_combind == '1'">
+      <ElCol :span="24">
+        <ElFormItem label="子商品">
+          <ElTable border size="small" :data="formData.childArr">
+            <ElTableColumn label="比例" prop="child_num" width="60px" />
+
+            <ElTableColumn label="商品编号" prop="skuCode" />
+            <ElTableColumn label="商品类型" prop="good_type">
+              <template #="{ row }">
+                <ElTag size="small">
+                  {{ cg_order_type_options.find(item => item.value == row.good_type)?.label }}
+                </ElTag>
+              </template>
+            </ElTableColumn>
+            
+            <ElTableColumn label="商品名称" prop="goodName" />
+
+            <ElTableColumn width="80px">
+              <template #header>
+                <div class="w-full flex justify-between">
+                  <p>操作</p>
+                  <ElButton
+                    link
+                    size="small"
+                    type="primary"
+                    :icon="useRenderIcon('add')"
+                    @click="state.visible = true"
+                  />
+                </div>
+              </template>
+
+              <template #="{ $index }">
+                <ElTooltip content="删除" placement="top">
+                  <ElButton 
+                    link 
+                    size="small" 
+                    type="danger" 
+                    :icon="useRenderIcon('delete')"
+                    @click="formData.childArr.splice($index, 1)"
+                  />
+                </ElTooltip>
+
+                <ElTooltip content="编辑" placement="top">
+                  <ElButton 
+                    link 
+                    size="small" 
+                    type="primary" 
+                    :icon="useRenderIcon('edits')"
+                    @click="handleChildGoodEdit($index)"
+                  />
+                </ElTooltip>
+              </template>
+            </ElTableColumn>
+          </ElTable>
+        </ElFormItem>
+      </ElCol>
+    </ElRow>
+
+    <div class="w-full flex justify-end">
+      <ElButton type="primary" @click="submit">保存</ElButton>
+    </div>
+
+    <ChooseGoodModal 
+      v-model:visible="state.visible"
+      @submit="handleSubmit"
+    />
+
+    <ChildGoodEditModal 
+      v-model:visible="state.editVisible"
+      :index="state.index"
+      :data="state.data"
+      @submit="(index, data) => formData.childArr[index] = { ...data }"
+    />
+  </ElForm>
+</template>

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

@@ -0,0 +1,50 @@
+<script setup lang="ts">
+import { useVModel } from '@vueuse/core';
+import { ElDialog } from 'element-plus';
+import { goodColumns } from '../config/columns';
+import BasicDescriptions from "/@/components/BasicDescriptions";
+
+import { NumberInput } from "/@/components/Input"
+import { ref, watch} from 'vue';
+
+const props = defineProps<{ 
+    visible: boolean;
+    index: any; 
+    data: any; 
+}>()
+
+const emit = defineEmits(['submit'])
+const visible = useVModel(props, 'visible')
+
+const child_num = ref(0)
+
+
+watch(() => visible.value, () => {
+    if(!visible.value){  return }
+    child_num.value = props.data.child_num
+})
+
+function handleSubmit(){
+    emit('submit', props.index, { ...props.data, child_num: child_num.value })    
+    visible.value = false
+}
+</script>
+
+<template>
+    <ElDialog
+       v-model="visible"
+       title="编辑子商品" 
+       center
+    >
+        <BasicDescriptions style="overflow: hidden;" v-if="props.data" :data="props.data" :columns="goodColumns" />
+
+        <div class="flex justify-between mt-[10px]">
+            <div class="flex items-center">
+                <p style="width: 110px">子商品比例:</p>
+                <NumberInput v-model="child_num" placeholder="子商品比例" />
+            </div>
+
+            <ElButton type="primary" @click="handleSubmit">保存</ElButton>
+        </div>
+    </ElDialog>
+</template>

src/views/invoiceInOut/inventoryCheck/components/ChooseGoodModal/config/columns.ts

@@ -0,0 +1,76 @@
+import { render } from "nprogress";
+import { cg_order_type_options, statusList } from "/@/utils/status";
+import { h } from "vue";
+import { ElTag } from "element-plus";
+
+export const goodColumns = [
+  {
+    span: 12,
+    field: 'seller_name',
+    label: '销售方公司'
+  },
+  {
+    span: 12,
+    field: 'buyer_name',
+    label: '购买方公司'
+  },
+  {
+    span: 12,
+    field: 'goodName',
+    label: '订单商品名称'
+  },
+  {
+    span: 12,
+    field: 'inv_good_name',
+    label: '发票商品名称'
+  },
+  {
+    span: 6,
+    label: '商品类型',
+    render(_, { good_type }){
+      return h(ElTag, { size: 'small' }, {
+        default: () => cg_order_type_options.find(item => item.value == good_type)?.label || '--'
+      })
+    }
+  },
+  {
+    span: 6,
+    field: 'good_code',
+    label: '商品代码'
+  },
+  {
+    span: 6,
+    field: 'spec',
+    label: '规格'
+  },
+  {
+    span: 6,
+    field: 'unit',
+    label: '单位'
+  },
+  {
+    span: 6,
+    field: 'unit_price',
+    label: '税前单价'
+  },
+  {
+    span: 6,
+    field: 'subunit_price',
+    label: '税后单价'
+  },
+  {
+    span: 6,
+    field: 'unit_weight',
+    label: '重量'
+  },
+  {
+    span: 6,
+    field: 'spectral',
+    label: '分光'
+  },
+  {
+    field: 'cat_name',
+    label: '进项类目',
+    span: 24
+  }
+]

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

@@ -0,0 +1,99 @@
+import { ContentConfig } from "/@/components/PageContent";
+import { httpList } from "/@/api/invoiceInOut/productManager";
+
+import { cg_order_type_options, statusList } from "/@/utils/status";
+import { ElTag } from "element-plus";
+import { h } from "vue";
+
+const columns = [
+  {
+    width: 40,
+    type: 'selection'
+  },
+  {
+    label: "商品编码",
+    prop: "skuCode",
+    width: 150
+  },
+  {
+    label: "销售方公司",
+    prop: "seller_name",
+    width: 160
+  },
+  {
+    label: "购买方公司",
+    prop: "buyer_name",
+    width: 160
+  },
+  {
+    label: '商品类型',
+    width: 100,
+    cellRenderer({ row }){
+      return h(ElTag, { size: 'small' }, {
+        default: () => cg_order_type_options.find(item => item.value == row.good_type)?.label || '--'
+      })
+    }
+  },
+  {
+    label: '商品名称',
+    prop: 'goodName',
+    width: 150
+  },
+  {
+    label: "规格",
+    prop: "spec",
+    width: 80
+  },
+  {
+    label: "单位",
+    prop: "unit",
+    width: 80
+  },
+  {
+    label: "状态",
+    prop: "status",
+    width: 80,
+    cellRenderer({ row }){
+      return h(ElTag, { size: 'small', type: statusList.find(item => item.value == row.status)?.type || 'warning' }, {
+        default: () => statusList.find(item => item.value == row.status)?.label || '--'
+      })
+    }
+  },
+  {
+    label: '税前单价',
+    prop: 'subunit_price',
+    width: 100
+  },
+  {
+    label: '税后单价',
+    prop: 'unit_price',
+    width: 100
+  },
+  {
+    label: '重量',
+    prop: 'unit_weight',
+    width: 80
+  },
+  {
+    label: '分光',
+    prop: 'spectral',
+    width: 80
+  },
+  {
+    label: '创建人',
+    prop: 'apply_name',
+    width: 80
+  },
+  {
+    label:'创建时间',
+    prop: 'create_time',
+    width: 140
+  }
+];
+
+const contentConfig: ContentConfig = {
+  columns,
+  apis: { httpList: (parameter = {}) => httpList({ ...parameter, is_combind: '0' }) }
+};
+
+export default contentConfig;

src/views/invoiceInOut/combindProductManager/config/search.config.ts → src/views/invoiceInOut/inventoryCheck/components/ChooseGoodModal/config/search.config.ts

@@ -4,12 +4,12 @@ import { goodTypeOptions } from "/@/utils/status";
 const searchFormConfig: FormConfig = {
   formItems: [
     {
-      field: 'TODO',
+      field: 'skuCode',
       type: 'input',
       placeholder: '商品编码'
     },
     {
-      field: 'TODO',
+      field: 'good_type',
       type: 'select',
       options: goodTypeOptions,
       placeholder: '商品类型'

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

@@ -0,0 +1,58 @@
+<script setup lang="ts">
+import { usePageSearch, type PageHooks, type PageEvents } from "/@/hooks/page";
+import contentConfig from "./config/content.config";
+import searchConfig from "./config/search.config";
+import { useVModel } from "@vueuse/core";
+import { ElDialog, ElMessage } from "element-plus";
+import { useRouter } from "vue-router";
+import { ref } from "vue";
+
+const props = defineProps<{ visible: boolean }>()
+const emit = defineEmits(['submit'])
+
+const visible = useVModel(props, 'visible')
+
+const router = useRouter();
+
+const hooks: PageHooks = {
+  pageSearchHook: () => usePageSearch(undefined, undefined, searchConfig)
+};
+
+const selection= ref([])
+
+const events: PageEvents = {
+  content: {
+    preview: ({ id }) => router.push("/invoiceInOut/productManagerDetail?id=" + id),
+    create: () => router.push('/invoiceInOut/productManagerDetail')
+  }
+};
+
+function handleSubmit(){
+   if(selection.value.length === 0){
+       ElMessage.warning('请选择至少一个子商品')
+       return
+   }
+
+   visible.value = false
+   emit('submit', selection.value)
+}
+</script>
+
+<template>
+    <ElDialog class="reactive" v-model="visible" title="选择子商品" center top="10px">
+      <PageContainer
+        v-if="visible"
+        :hooks="hooks"
+        :events="events"
+        :searchConfig="searchConfig"
+        :contentConfig="contentConfig"
+        :isPageStart="true"
+        @content-select-change="values => selection = values.map(item => ({ ...item, child_num: '1', child_id: item.id }))"
+      />
+      <ElButton 
+        class="absolute bottom-[30px] right-[20px]" 
+        type="primary"
+        @click="handleSubmit"
+       >保存 </ElButton>
+    </ElDialog>
+</template>

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

@@ -0,0 +1,18 @@
+<script setup lang="ts">
+import { invoice_columns } from "./shared";
+import BasicDescriptions from "/@/components/BasicDescriptions";
+
+defineProps<{ detail: Record<string, string> }>();
+</script>
+
+<template>
+  <BasicDescriptions
+    px-8
+    pb-5
+    v-if="Object.keys(detail).length !== 0"
+    :data="detail"
+    :columns="invoice_columns"
+    :col-number="1"
+    label-width="130"
+  />
+</template>

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

@@ -0,0 +1,18 @@
+export const rules = {
+    seller_code: [{ required: true, message: '请选择销售方公司', trigger: 'change' }],
+    buyer_code: [{ required: true, message: '请选择购买方公司', trigger: 'change' }],
+    good_source: [{ required: true, message: '请选择商品来源', trigger: 'change' }],
+    skuCode: [{ required: true, message: '请输入商品编号', trigger: 'change' }],
+    good_type: [{ required: true, message: '请选择订单商品类型', trigger: 'change' }],
+    is_combind: [{ required: true, message: '请选择组合类型', trigger: 'change' }],
+    goodName: [{ required: true, message: '请输入订单商品名称', trigger: 'change' }],
+    inv_good_name: [{ required: true, message: '请输入发票商品名称', trigger: 'change' }],
+    unit_price: [{ required: true, message: '请输入成本税前单价', trigger: 'change' }],
+    unit: [{ required: true, message: '请选择单位', trigger: 'change' }],
+    unit_weight: [{ required: true, message: '请选择重量', trigger: 'change' }],
+    subunit_price: [{ required: true, message: '请输入成本税后单价', trigger: 'change' }],
+    cat_code: [{ required: true, message: '请选择进项类目', trigger: 'change' }],
+    inv_type: [{ required: true, message: '请选择发票类型', trigger: 'change' }],
+    cat_tax: [{ required: true, message: '请选择进项税率', trigger: 'change' }],
+    basic_status: [{ required: true, message: '请选择进项成本类型', trigger: 'change' }]
+}

src/views/invoiceInOut/productManager/components/columns.ts → src/views/invoiceInOut/inventoryCheck/components/shared.ts

@@ -45,24 +45,34 @@ export const convertInvoiceTitleData = (title: Record<string, string>) => {
 };
 
 export const invoice_columns = [
-    {
-        label: "抬头",
-        span: 24,
-        field: "invoice_title"
-    },
-    {
-        label: "纳税人识别号",
-        span: 24,
-        field: "invoice_code"
-    },
-    {
-        label: "地址、电话",
-        span: 24,
-        field: "addrAndmobile"
-    },
-    {
-        label: "开户行及账号",
-        span: 24,
-        field: "bankAndBankNo"
-    }
+    { label: "抬头", span: 24, field: "invoice_title" },
+    { label: "纳税人识别号", span: 24, field: "invoice_code" },
+    // { label: "地址、电话", span: 24, field: "addrAndmobile" },
+    // { label: "开户行及账号", span: 24, field: "bankAndBankNo" }
 ];
+
+
+export const createInitalData = () => ({
+    buyer_code: "",
+    buyer_name: "",
+    seller_code: "",
+    seller_name: "",
+    good_source: "",
+    good_code: '',
+    good_type: '',
+    is_combind: "1",
+    inv_good_name: "",
+    subunit_price: '',
+    basic_status: '',
+    unit_price: '',
+    goodName: "",
+    skuCode: '',
+    cat_code: '',
+    inv_type: '',
+    cat_tax: '',
+    spec: '',
+    unit: '',
+    unit_weight: '',
+    spectral: '',
+    childArr: []
+})

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

@@ -0,0 +1,165 @@
+import { render } from "nprogress";
+import { cg_order_type_options, statusList } from "/@/utils/status";
+import { h } from "vue";
+import { ElTable, ElTableColumn, ElTag } from "element-plus";
+
+export const goodColumns = [
+  {
+    span: 12,
+    field: 'seller_name',
+    label: '销售方公司'
+  },
+  {
+    span: 12,
+    field: 'buyer_name',
+    label: '购买方公司'
+  },
+  {
+    span: 12,
+    field: 'goodName',
+    label: '订单商品名称'
+  },
+  {
+    span: 12,
+    field: 'inv_good_name',
+    label: '发票商品名称'
+  },
+  {
+    span: 6,
+    label: '商品类型',
+    render(_, { good_type }){
+      return h(ElTag, { size: 'small' }, {
+        default: () => cg_order_type_options.find(item => item.value == good_type)?.label || '--'
+      })
+    }
+  },
+  {
+    span: 6,
+    field: 'good_code',
+    label: '商品代码'
+  },
+  {
+    span: 6,
+    field: 'spec',
+    label: '规格'
+  },
+  {
+    span: 6,
+    field: 'unit',
+    label: '单位'
+  },
+  {
+    span: 6,
+    field: 'unit_price',
+    label: '税前单价'
+  },
+  {
+    span: 6,
+    field: 'subunit_price',
+    label: '税后单价'
+  },
+  {
+    span: 6,
+    field: 'unit_weight',
+    label: '重量'
+  },
+  {
+    span: 6,
+    field: 'spectral',
+    label: '分光'
+  },
+  {
+    field: 'cat_name',
+    label: '进项类目',
+    span: 24
+  }
+]
+
+
+export const goodHasChildColumns = [
+  {
+    span: 12,
+    field: 'seller_name',
+    label: '销售方公司'
+  },
+  {
+    span: 12,
+    field: 'buyer_name',
+    label: '购买方公司'
+  },
+  {
+    span: 12,
+    field: 'goodName',
+    label: '订单商品名称'
+  },
+  {
+    span: 12,
+    field: 'inv_good_name',
+    label: '发票商品名称'
+  },
+  {
+    span: 6,
+    label: '商品类型',
+    render(_, { good_type }) {
+      return h(ElTag, { size: 'small' }, {
+        default: () => cg_order_type_options.find(item => item.value == good_type)?.label || '--'
+      })
+    }
+  },
+  {
+    span: 6,
+    field: 'good_code',
+    label: '商品代码'
+  },
+  {
+    span: 6,
+    field: 'spec',
+    label: '规格'
+  },
+  {
+    span: 6,
+    field: 'unit',
+    label: '单位'
+  },
+  {
+    span: 6,
+    field: 'unit_price',
+    label: '税前单价'
+  },
+  {
+    span: 6,
+    field: 'subunit_price',
+    label: '税后单价'
+  },
+  {
+    span: 6,
+    field: 'unit_weight',
+    label: '重量'
+  },
+  {
+    span: 6,
+    field: 'spectral',
+    label: '分光'
+  },
+  {
+    field: 'cat_name',
+    label: '进项类目',
+    span: 24
+  },
+  {
+    label: '子商品',
+    span: 24,
+    render(_, { ProductsCombind = [] }){
+      return h(ElTable, { size: 'small', data: ProductsCombind, border: true }, {
+        default: () => [
+          h(ElTableColumn, { label: '比例', prop: 'child_num', width: 100, showOverflowTooltip: true }),
+          h(ElTableColumn, { label: '商品编号', showOverflowTooltip: true }, { default: (scope) => scope.row.products?.skuCode }),
+          h(ElTableColumn, { label: '商品类型', showOverflowTooltip: true }, { default: (scope) =>
+            h(ElTag, { size: 'small' }, { default: () => cg_order_type_options.find(item => item.value == scope.row.products?.good_type)?.label || '--'  })
+          }),
+          h(ElTableColumn, { label: '商品名称' }, { default: (scope) => scope.row.products?.goodName }),
+        ]
+      })
+    }
+  }
+]

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

@@ -0,0 +1,107 @@
+import { ContentConfig } from "/@/components/PageContent";
+import { httpList, httpStatus } from "/@/api/invoiceInOut/productManager";
+
+import { cg_order_type_options, statusList } from "/@/utils/status";
+import { ElTag } from "element-plus";
+import { h } from "vue";
+
+const columns = [
+  {
+    label: "商品编码",
+    prop: "skuCode",
+    width: 150
+  },
+  {
+    label: "销售方公司",
+    prop: "seller_name",
+    width: 160
+  },
+  {
+    label: "购买方公司",
+    prop: "buyer_name",
+    width: 160
+  },
+  {
+    label: '商品类型',
+    width: 100,
+    cellRenderer({ row }){
+      return h(ElTag, { size: 'small' }, {
+        default: () => cg_order_type_options.find(item => item.value == row.good_type)?.label || '--'
+      })
+    }
+  },
+  {
+    label: '商品名称',
+    prop: 'goodName',
+    width: 150
+  },
+  {
+    label: "规格",
+    prop: "spec",
+    width: 80
+  },
+  {
+    label: "单位",
+    prop: "unit",
+    width: 80
+  },
+  {
+    label: "状态",
+    prop: "status",
+    width: 80,
+    cellRenderer({ row }){
+      return h(ElTag, { size: 'small', type: statusList.find(item => item.value == row.status)?.type || 'warning' }, {
+        default: () => statusList.find(item => item.value == row.status)?.label || '--'
+      })
+    }
+  },
+  {
+    label: '税前单价',
+    prop: 'subunit_price',
+    width: 100
+  },
+  {
+    label: '税后单价',
+    prop: 'unit_price',
+    width: 100
+  },
+  {
+    label: '重量',
+    prop: 'unit_weight',
+    width: 80
+  },
+  {
+    label: '分光',
+    prop: 'spectral',
+    width: 80
+  },
+  {
+    label: '创建人',
+    prop: 'apply_name',
+    width: 80
+  },
+  {
+    label:'创建时间',
+    prop: 'create_time',
+    width: 140
+  },
+  {
+    label: "操作",
+    fixed: "right",
+    width: 80,
+    slot: "operation"
+  }
+];
+
+const contentConfig: ContentConfig = {
+  columns,
+  title: "商品管理",
+  permissions: ['003', '004', '007'],
+  apis: { 
+    httpList,
+    httpStatus,
+    httpAdd: true
+  }
+};
+
+export default contentConfig;

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

@@ -0,0 +1,40 @@
+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/inventoryCheck/config/search.config.ts

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

src/views/invoiceInOut/inventoryCheck/detail.vue

@@ -0,0 +1,35 @@
+<script setup lang="ts">
+import BasicDescriptions from "/@/components/BasicDescriptions";
+import { useDetail } from "/@/hooks/core/useDetail";
+import BaseForm from "./components/BaseForm.vue"
+import { goodColumns, goodHasChildColumns } from "./config/columns"
+
+import { httpDetail } from "/@/api/invoiceInOut/productManager";
+import { useTask } from "/@/hooks/core"
+
+
+const detailTask = useTask()
+const { title, isDetail, collapses, id } = useDetail({ baseName: '商品', collapseLen: 2 });
+
+
+id.value && detailTask.run(httpDetail({ id: id.value }))
+</script>
+
+<template>
+  <div class="padding__container" v-loading="detailTask.loading">
+    <ElTabs>
+      <ElTabPane :label="title">
+        <ElCollapse v-model="collapses">
+          <ElCollapseItem :title="title" name="1">
+            <BaseForm v-if="!isDetail" />
+            <BasicDescriptions 
+              v-if="isDetail && detailTask.data" 
+              :columns="detailTask.data.is_combind == '1' ? goodHasChildColumns : goodColumns" 
+              :data="detailTask.data" 
+            />
+          </ElCollapseItem>
+        </ElCollapse>
+      </ElTabPane>
+    </ElTabs>
+  </div>
+</template>

src/views/invoiceInOut/combindProductManager/index.vue → src/views/invoiceInOut/inventoryCheck/index.vue

@@ -2,20 +2,20 @@
 import { usePageSearch, type PageHooks, type PageEvents } from "/@/hooks/page";
 import contentConfig from "./config/content.config";
 import searchConfig from "./config/search.config";
-import { useRouter } from "vue-router"
+import { useRouter } from "vue-router";
 
-const PageName = "combindProductManager";
-const router = useRouter()
+const PageName = "productManager";
+const router = useRouter();
 
 const hooks: PageHooks = {
   pageSearchHook: () => usePageSearch(undefined, undefined, searchConfig)
 };
 
 const events: PageEvents = {
-  content: { 
-    preview: ({ id }) => router.push('/invoiceInOut/combindProductManagerDetail?id=' + id),
-    create: () => router.push('/invoiceInOut/combindProductManagerDetail')
-   }
+  content: {
+    preview: ({ id }) => router.push("/invoiceInOut/productManagerDetail?id=" + id),
+    create: () => router.push('/invoiceInOut/productManagerDetail')
+  }
 };
 </script>
 
@@ -24,8 +24,8 @@ const events: PageEvents = {
     <PageContainer
       :hooks="hooks"
       :events="events"
+      :searchConfig="searchConfig"
       :contentConfig="contentConfig"
-      :search-config="searchConfig"
     />
   </PageAuth>
 </template>

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

@@ -1,72 +1,82 @@
 <script setup lang="ts">
 import { reactive, ref } from "vue";
-import { rules } from "./rules"
-import { cg_order_type_options, xs_inv_type_list } from "/@/utils/status"
-import { convertInvoiceTitle, convertInvoiceTitleData } from "./columns"
+import { cg_order_type_options, xs_inv_type_list, tax_list } from "/@/utils/status"
+import { ElButton, ElCol, ElForm, ElFormItem, ElMessage, ElOption, ElSelect, ElTooltip } from "element-plus"
 import { httpCompanies } from "/@/api/invoiceInOut/productManager"
-import { ElCol, ElForm, ElFormItem, ElOption, ElSelect } from "element-plus"
 import RemoteSelect from "/@/components/RemoteSelect";
 import InvoiceTitle from "./InvoiceTitle.vue";
+import { rules } from "./rules"
+
+import { convertInvoiceTitle, convertInvoiceTitleData, createInitalData } from "./shared"
+import { useTask } from "/@/hooks/core"
+import { useRouter } from "vue-router"
+
+import ChooseGoodModal from "./ChooseGoodModal/index.vue"
+import ChildGoodEditModal from "./ChildGoodEditModal.vue";
+
 
 import { httpInvoiceList } from "/@/api/InvoiceSales/invoiceApply";
+import { httpAdd, httpCatist } from "/@/api/invoiceInOut/productManager";
+import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
+
 
+const router = useRouter()
 const formRef = ref<InstanceType<typeof ElForm> | null>(null)
 
-const formData = ref({ 
-  companyNo: "", 
-  supplierNo: "",
-  goodSource: "",
-  goodCode: '',
-  goodType: '',
-  is_combind: "",
-  invGoodName: "",
-  afterTaxPrice: '',
-  in_cost_status: '',
-  beforeTaxPrice: '',
-  goodName: "",
-  spuCode: '',
-  in_code: '',
-  invType: '',
-  in_tax: '',
-  spec: '',
-  unit: '',
-  weight: '',
-  fg: ''
+const state = reactive({ 
+  editVisible: false,
+  visible: false,
+  companies: [],
+  index: -1,
+  data: {}
 })
 
-const state = reactive({
-  companies: []
-})
+
+
+const createTask = useTask({ success(){ router.push('/invoiceInOut/productManager') } })
+const formData = ref(createInitalData())
 
 const sellerInvoiceTitle = ref<Record<string, string>>({});
 const purchaserInvoiceTitle = ref<Record<string, string>>({});
 
 async function submit(){
+  if(formData.value.is_combind === '1' && formData.value.childArr.length === 0){
+    ElMessage.warning('请选择至少一个子商品')
+    return
+  }
+
+  if(formData.value.is_combind === '0'){
+    formData.value.childArr = []
+  }
+
   try{
     await formRef.value?.validate()
-    console.log('joined~~~')
+    createTask.run(httpAdd({
+      ...formData.value,
+      childArr: formData.value.childArr.map(({ child_id, child_num }) => ({ child_id, child_num }))
+    }))
   }catch(err){
     console.log(err)
   }
 }
 
-function handleInvoiceTitle(
-  _isSeller: boolean,
-  invoiceTitle: Record<string, string>
-) {
-  if (!invoiceTitle) {
-    if (_isSeller) { return (sellerInvoiceTitle.value = {}); }
-    return (purchaserInvoiceTitle.value = {});
-  }
-
+function handleInvoiceTitle(_isSeller: boolean, invoiceTitle: Record<string, string> ) {
   if (_isSeller) {
-    invoiceTitle = state.companies.find(item => item.companyNo === invoiceTitle)
+    invoiceTitle = state.companies.find(item => item.company_license === formData.value.seller_code)
+    formData.value.seller_name = invoiceTitle.company_name
     //支持的开票方式
-    const { invoiceType, denomination: _denomination } = invoiceTitle;
+    // const { invoiceType, denomination: _denomination } = invoiceTitle;
     // const chunks = invoiceType.split(",");
     // ruleForm.value.invtype = "";
     // invoiceTypes.value = xs_inv_type_list.filter(({ value }) => chunks.includes(value));
+    // formData.value.seller_name = 
+  } else{
+    formData.value.buyer_name = invoiceTitle.invoice_title
+  }
 
+  if (!invoiceTitle) {
+    if (_isSeller) { return (sellerInvoiceTitle.value = {}); }
+    return (purchaserInvoiceTitle.value = {});
   }
 
   _isSeller
@@ -75,13 +85,31 @@ function handleInvoiceTitle(
 }
 
 
-
 const setSellerInvoiceTitle = handleInvoiceTitle.bind(null, true);
 const setPurchaserInvoiceTitle = handleInvoiceTitle.bind(null, false);
 
+
+function handleSubmit(list: any[]){
+  const currentIds = formData.value.childArr.map(({ id }) => id)
+  const appends: any[] = []
+
+  for(const item of list){
+    if(currentIds.includes(item.id)){ continue }
+    appends.push(item)
+  }
+
+  formData.value.childArr = [ ...formData.value.childArr, ...appends ]
+}
+
+
+function handleChildGoodEdit(index: number){
+  state.index = index
+  state.editVisible = true
+  state.data = { ...formData.value.childArr[index] }
+}
+
 (async function initialData(){
   const result = await httpCompanies({ size: 10000 })
-
   if(result.code == 0){
     state.companies = [...result.data.list]
     console.log(state.companies)
@@ -94,20 +122,21 @@ const setPurchaserInvoiceTitle = handleInvoiceTitle.bind(null, false);
     ref="formRef"
     :rules="rules" 
     :model="formData" 
+    v-loading="createTask.loading"
   >
     <ElRow :gutter="10">
       <ElCol :span="12">
-        <ElFormItem label="销售方公司" prop="supplierNo">
+        <ElFormItem label="销售方公司" prop="seller_code">
           <ElSelect
             style="width: 100%"
             placeholder="销售方公司"
-            v-model="formData.supplierNo" 
+            v-model="formData.seller_code" 
             @change="setSellerInvoiceTitle"
           >
             <ElOption 
               v-for="item in state.companies"
               :label="item.company_name"
-              :value="item.companyNo"
+              :value="item.company_license"
             />
           </ElSelect>
         </ElFormItem>
@@ -115,15 +144,15 @@ const setPurchaserInvoiceTitle = handleInvoiceTitle.bind(null, false);
       </ElCol>
 
       <ElCol :span="12">
-        <ElFormItem label="购买方公司" prop="companyNo">
+        <ElFormItem label="购买方公司" prop="buyer_code">
           <RemoteSelect
             is-root
             style="width: 100%"
             request-prop="name"
             :api="httpInvoiceList"
-            response-val-prop="id"
+            response-val-prop="invoice_code"
             placeholder="购买方公司抬头"
-            v-model:value="formData.companyNo"
+            v-model:value="formData.buyer_code"
             response-label-prop="invoice_title"
             @item-change="setPurchaserInvoiceTitle"
           />
@@ -133,29 +162,29 @@ const setPurchaserInvoiceTitle = handleInvoiceTitle.bind(null, false);
 
 
       <ElCol :span="8">
-        <ElFormItem label="商品来源" prop="goodSource">
+        <ElFormItem label="商品来源" prop="good_source">
           <ElSelect
-            @change="formData.goodCode = ''"
-            v-model="formData.goodSource"
+            @change="formData.good_code = ''"
+            v-model="formData.good_source"
             placeholder="商品来源"
             style="width: 100%"
           >
-            <ElOption label="采销商品" value="0" />
-            <ElOption label="非采销商品" value="1" />
+            <ElOption label="采销商品" value="1" />
+            <ElOption label="非采销商品" value="2" />
           </ElSelect>
         </ElFormItem>
       </ElCol>
 
       <ElCol :span="8">
-        <ElFormItem label="商品编号" prop="spuCode">
-          <ElInput v-model="formData.spuCode" placeholder="商品编号" />
+        <ElFormItem label="商品编号" prop="skuCode">
+          <ElInput v-model="formData.skuCode" placeholder="商品编号" />
         </ElFormItem>
       </ElCol>
 
       <ElCol :span="8">
-        <ElFormItem label="订单商品类型" prop="goodType">
+        <ElFormItem label="订单商品类型" prop="good_type">
           <ElSelect 
-            v-model="formData.goodType"
+            v-model="formData.good_type"
             placeholder="订单商品类型"
             style="width: 100%" 
           >
@@ -184,8 +213,8 @@ const setPurchaserInvoiceTitle = handleInvoiceTitle.bind(null, false);
       </ElCol>
 
       <ElCol :span="8">
-        <ElFormItem label="发票商品名称" prop="invGoodName">
-          <ElInput v-model="formData.invGoodName" placeholder="发票商品名称" />
+        <ElFormItem label="发票商品名称" prop="inv_good_name">
+          <ElInput v-model="formData.inv_good_name" placeholder="发票商品名称" />
         </ElFormItem>
       </ElCol>
 
@@ -196,14 +225,14 @@ const setPurchaserInvoiceTitle = handleInvoiceTitle.bind(null, false);
       </ElCol>
 
       <ElCol :span="8">
-        <ElFormItem label="商品代码" prop="goodCode">
-          <ElInput  v-model="formData.goodCode" placeholder="商品代码"  />
+        <ElFormItem label="商品代码" prop="good_code">
+          <ElInput  v-model="formData.good_code" placeholder="商品代码"  />
         </ElFormItem>
       </ElCol>
 
       <ElCol :span="8">
-        <ElFormItem label="成本税前单价" prop="beforeTaxPrice">
-          <ElInput v-model="formData.beforeTaxPrice"  placeholder="成本税前单价" />
+        <ElFormItem label="成本税前单价" prop="unit_price">
+          <ElInput v-model="formData.unit_price"  placeholder="成本税前单价" />
         </ElFormItem>
       </ElCol>
 
@@ -214,24 +243,24 @@ const setPurchaserInvoiceTitle = handleInvoiceTitle.bind(null, false);
       </ElCol>
 
       <ElCol :span="8">
-        <ElFormItem label="重量" prop="weight">
-          <ElInput v-model="formData.weight" placeholder="重量"  />
+        <ElFormItem label="重量" prop="unit_weight">
+          <ElInput v-model="formData.unit_weight" placeholder="重量"  />
         </ElFormItem>
       </ElCol>
 
       <ElCol :span="8">
-        <ElFormItem label="成本税后单价" prop="afterTaxPrice">
+        <ElFormItem label="成本税后单价" prop="subunit_price">
           <ElInput 
-            v-model="formData.afterTaxPrice" 
+            v-model="formData.subunit_price" 
             placeholder="成本税后单价" 
           />
         </ElFormItem>
       </ElCol>
 
       <ElCol :span="6">
-        <ElFormItem label="分光" prop="fg">
+        <ElFormItem label="分光" prop="spectral">
           <ElInput  
-            v-model="formData.fg"
+            v-model="formData.spectral"
             placeholder="分光" 
             style="width: 100%" 
           />
@@ -239,9 +268,9 @@ const setPurchaserInvoiceTitle = handleInvoiceTitle.bind(null, false);
       </ElCol>
 
       <ElCol :span="6">
-        <ElFormItem label="发票类型" prop="invType">
+        <ElFormItem label="发票类型" prop="inv_type">
           <ElSelect
-            v-model="formData.invType"
+            v-model="formData.inv_type"
             placeholder="发票类型" 
             style="width: 100%" 
           > 
@@ -255,53 +284,57 @@ const setPurchaserInvoiceTitle = handleInvoiceTitle.bind(null, false);
       </ElCol>
 
       <ElCol :span="6">
-        <ElFormItem label="进项税目" prop="in_code">
+        <ElFormItem label="进项税目" prop="cat_code">
           <RemoteSelect
-            is-root
+            :api="httpCatist"
             style="width: 100%"
-            request-prop="name"
-            :api="httpInvoiceList"
-            response-val-prop="id"
+            request-prop="cat_name"
             placeholder="进项税目"
-            v-model:value="formData.in_code"
-            response-label-prop="invoice_title"
-            @item-change="setPurchaserInvoiceTitle"
+            response-val-prop="cat_code"
+            response-label-prop="cat_name"
+            v-model:value="formData.cat_code"
           />
+          <!-- <ElInput v-model="formData.cat_code" placeholder="进项税目" /> -->
         </ElFormItem>
       </ElCol>
 
       <ElCol :span="6">
-        <ElFormItem label="进项税率" prop="in_tax">
-          <ElSelect 
-            v-model="formData.in_tax" 
-            placeholder="进项税率" 
-            style="width: 100%"
-          > </ElSelect>
+        <ElFormItem label="进项税率" prop="cat_tax">
+          <ElSelect v-model="formData.cat_tax" placeholder="进项税率">
+            <ElOption v-for="tax in tax_list" v-bind="tax" />
+          </ElSelect>
         </ElFormItem>
       </ElCol>
 
       <ElCol :span="6">
-        <ElFormItem label="进项成本状态" prop="in_cost_status">
+        <ElFormItem label="进项成本状态" prop="basic_status">
           <ElSelect 
-            v-mdoel="formData.in_cost_status" 
+            v-model="formData.basic_status" 
             placeholder="进项成本状态"
           >
-            <ElOption label="真实成本信息" value="0" />
-            <ElOption label="预估成本信息" value="1" />
+            <ElOption label="真实成本信息" value="1" />
+            <ElOption label="预估成本信息" value="2" />
           </ElSelect>
         </ElFormItem>
       </ElCol>
     </ElRow>
 
-    <!-- 
-    <ElRow>
+    <ElRow v-if="formData.is_combind == '1'">
       <ElCol :span="24">
         <ElFormItem label="子商品">
-          <ElTable border size="small">
-            <ElTableColumn label="比例" />
-            <ElTableColumn label="商品编号" />
-            <ElTableColumn label="商品类型" />
-            <ElTableColumn label="商品名称" />
+          <ElTable border size="small" :data="formData.childArr">
+            <ElTableColumn label="比例" prop="child_num" width="60px" />
+
+            <ElTableColumn label="商品编号" prop="skuCode" />
+            <ElTableColumn label="商品类型" prop="good_type">
+              <template #="{ row }">
+                <ElTag size="small">
+                  {{ cg_order_type_options.find(item => item.value == row.good_type)?.label }}
+                </ElTag>
+              </template>
+            </ElTableColumn>
+            
+            <ElTableColumn label="商品名称" prop="goodName" />
 
             <ElTableColumn width="80px">
               <template #header>
@@ -312,18 +345,52 @@ const setPurchaserInvoiceTitle = handleInvoiceTitle.bind(null, false);
                     size="small"
                     type="primary"
                     :icon="useRenderIcon('add')"
+                    @click="state.visible = true"
                   />
                 </div>
               </template>
+
+              <template #="{ $index }">
+                <ElTooltip content="删除" placement="top">
+                  <ElButton 
+                    link 
+                    size="small" 
+                    type="danger" 
+                    :icon="useRenderIcon('delete')"
+                    @click="formData.childArr.splice($index, 1)"
+                  />
+                </ElTooltip>
+
+                <ElTooltip content="编辑" placement="top">
+                  <ElButton 
+                    link 
+                    size="small" 
+                    type="primary" 
+                    :icon="useRenderIcon('edits')"
+                    @click="handleChildGoodEdit($index)"
+                  />
+                </ElTooltip>
+              </template>
             </ElTableColumn>
           </ElTable>
         </ElFormItem>
       </ElCol>
-    </ElRow> -->
-    <!-- <Modal /> -->
+    </ElRow>
 
     <div class="w-full flex justify-end">
       <ElButton type="primary" @click="submit">保存</ElButton>
     </div>
+
+    <ChooseGoodModal 
+      v-model:visible="state.visible"
+      @submit="handleSubmit"
+    />
+
+    <ChildGoodEditModal 
+      v-model:visible="state.editVisible"
+      :index="state.index"
+      :data="state.data"
+      @submit="(index, data) => formData.childArr[index] = { ...data }"
+    />
   </ElForm>
 </template>

src/views/invoiceInOut/productManager/components/ChildGoodEditModal.vue

@@ -0,0 +1,50 @@
+<script setup lang="ts">
+import { useVModel } from '@vueuse/core';
+import { ElDialog } from 'element-plus';
+import { goodColumns } from '../config/columns';
+import BasicDescriptions from "/@/components/BasicDescriptions";
+
+import { NumberInput } from "/@/components/Input"
+import { ref, watch} from 'vue';
+
+const props = defineProps<{ 
+    visible: boolean;
+    index: any; 
+    data: any; 
+}>()
+
+const emit = defineEmits(['submit'])
+const visible = useVModel(props, 'visible')
+
+const child_num = ref(0)
+
+
+watch(() => visible.value, () => {
+    if(!visible.value){  return }
+    child_num.value = props.data.child_num
+})
+
+function handleSubmit(){
+    emit('submit', props.index, { ...props.data, child_num: child_num.value })    
+    visible.value = false
+}
+</script>
+
+<template>
+    <ElDialog
+       v-model="visible"
+       title="编辑子商品" 
+       center
+    >
+        <BasicDescriptions style="overflow: hidden;" v-if="props.data" :data="props.data" :columns="goodColumns" />
+
+        <div class="flex justify-between mt-[10px]">
+            <div class="flex items-center">
+                <p style="width: 110px">子商品比例:</p>
+                <NumberInput v-model="child_num" placeholder="子商品比例" />
+            </div>
+
+            <ElButton type="primary" @click="handleSubmit">保存</ElButton>
+        </div>
+    </ElDialog>
+</template>

src/views/invoiceInOut/productManager/components/ChooseGoodModal/config/columns.ts

@@ -0,0 +1,76 @@
+import { render } from "nprogress";
+import { cg_order_type_options, statusList } from "/@/utils/status";
+import { h } from "vue";
+import { ElTag } from "element-plus";
+
+export const goodColumns = [
+  {
+    span: 12,
+    field: 'seller_name',
+    label: '销售方公司'
+  },
+  {
+    span: 12,
+    field: 'buyer_name',
+    label: '购买方公司'
+  },
+  {
+    span: 12,
+    field: 'goodName',
+    label: '订单商品名称'
+  },
+  {
+    span: 12,
+    field: 'inv_good_name',
+    label: '发票商品名称'
+  },
+  {
+    span: 6,
+    label: '商品类型',
+    render(_, { good_type }){
+      return h(ElTag, { size: 'small' }, {
+        default: () => cg_order_type_options.find(item => item.value == good_type)?.label || '--'
+      })
+    }
+  },
+  {
+    span: 6,
+    field: 'good_code',
+    label: '商品代码'
+  },
+  {
+    span: 6,
+    field: 'spec',
+    label: '规格'
+  },
+  {
+    span: 6,
+    field: 'unit',
+    label: '单位'
+  },
+  {
+    span: 6,
+    field: 'unit_price',
+    label: '税前单价'
+  },
+  {
+    span: 6,
+    field: 'subunit_price',
+    label: '税后单价'
+  },
+  {
+    span: 6,
+    field: 'unit_weight',
+    label: '重量'
+  },
+  {
+    span: 6,
+    field: 'spectral',
+    label: '分光'
+  },
+  {
+    field: 'cat_name',
+    label: '进项类目',
+    span: 24
+  }
+]

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

@@ -0,0 +1,99 @@
+import { ContentConfig } from "/@/components/PageContent";
+import { httpList } from "/@/api/invoiceInOut/productManager";
+
+import { cg_order_type_options, statusList } from "/@/utils/status";
+import { ElTag } from "element-plus";
+import { h } from "vue";
+
+const columns = [
+  {
+    width: 40,
+    type: 'selection'
+  },
+  {
+    label: "商品编码",
+    prop: "skuCode",
+    width: 150
+  },
+  {
+    label: "销售方公司",
+    prop: "seller_name",
+    width: 160
+  },
+  {
+    label: "购买方公司",
+    prop: "buyer_name",
+    width: 160
+  },
+  {
+    label: '商品类型',
+    width: 100,
+    cellRenderer({ row }){
+      return h(ElTag, { size: 'small' }, {
+        default: () => cg_order_type_options.find(item => item.value == row.good_type)?.label || '--'
+      })
+    }
+  },
+  {
+    label: '商品名称',
+    prop: 'goodName',
+    width: 150
+  },
+  {
+    label: "规格",
+    prop: "spec",
+    width: 80
+  },
+  {
+    label: "单位",
+    prop: "unit",
+    width: 80
+  },
+  {
+    label: "状态",
+    prop: "status",
+    width: 80,
+    cellRenderer({ row }){
+      return h(ElTag, { size: 'small', type: statusList.find(item => item.value == row.status)?.type || 'warning' }, {
+        default: () => statusList.find(item => item.value == row.status)?.label || '--'
+      })
+    }
+  },
+  {
+    label: '税前单价',
+    prop: 'subunit_price',
+    width: 100
+  },
+  {
+    label: '税后单价',
+    prop: 'unit_price',
+    width: 100
+  },
+  {
+    label: '重量',
+    prop: 'unit_weight',
+    width: 80
+  },
+  {
+    label: '分光',
+    prop: 'spectral',
+    width: 80
+  },
+  {
+    label: '创建人',
+    prop: 'apply_name',
+    width: 80
+  },
+  {
+    label:'创建时间',
+    prop: 'create_time',
+    width: 140
+  }
+];
+
+const contentConfig: ContentConfig = {
+  columns,
+  apis: { httpList: (parameter = {}) => httpList({ ...parameter, is_combind: '0' }) }
+};
+
+export default contentConfig;

src/views/invoiceInOut/productManager/components/ChooseGoodModal/config/modal.config.ts

@@ -0,0 +1,40 @@
+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/productManager/components/ChooseGoodModal/config/search.config.ts

@@ -0,0 +1,33 @@
+import { FormConfig } from "/@/components/PageSearch";
+import { goodTypeOptions } from "/@/utils/status";
+
+const searchFormConfig: FormConfig = {
+  formItems: [
+    {
+      field: 'skuCode',
+      type: 'input',
+      placeholder: '商品编码'
+    },
+    {
+      field: 'good_type',
+      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/productManager/components/ChooseGoodModal/index.vue

@@ -0,0 +1,58 @@
+<script setup lang="ts">
+import { usePageSearch, type PageHooks, type PageEvents } from "/@/hooks/page";
+import contentConfig from "./config/content.config";
+import searchConfig from "./config/search.config";
+import { useVModel } from "@vueuse/core";
+import { ElDialog, ElMessage } from "element-plus";
+import { useRouter } from "vue-router";
+import { ref } from "vue";
+
+const props = defineProps<{ visible: boolean }>()
+const emit = defineEmits(['submit'])
+
+const visible = useVModel(props, 'visible')
+
+const router = useRouter();
+
+const hooks: PageHooks = {
+  pageSearchHook: () => usePageSearch(undefined, undefined, searchConfig)
+};
+
+const selection= ref([])
+
+const events: PageEvents = {
+  content: {
+    preview: ({ id }) => router.push("/invoiceInOut/productManagerDetail?id=" + id),
+    create: () => router.push('/invoiceInOut/productManagerDetail')
+  }
+};
+
+function handleSubmit(){
+   if(selection.value.length === 0){
+       ElMessage.warning('请选择至少一个子商品')
+       return
+   }
+
+   visible.value = false
+   emit('submit', selection.value)
+}
+</script>
+
+<template>
+    <ElDialog class="reactive" v-model="visible" title="选择子商品" center top="10px">
+      <PageContainer
+        v-if="visible"
+        :hooks="hooks"
+        :events="events"
+        :searchConfig="searchConfig"
+        :contentConfig="contentConfig"
+        :isPageStart="true"
+        @content-select-change="values => selection = values.map(item => ({ ...item, child_num: '1', child_id: item.id }))"
+      />
+      <ElButton 
+        class="absolute bottom-[30px] right-[20px]" 
+        type="primary"
+        @click="handleSubmit"
+       >保存 </ElButton>
+    </ElDialog>
+</template>

src/views/invoiceInOut/productManager/components/InvoiceTitle.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { invoice_columns } from "./columns";
+import { invoice_columns } from "./shared";
 import BasicDescriptions from "/@/components/BasicDescriptions";
 
 defineProps<{ detail: Record<string, string> }>();

src/views/invoiceInOut/productManager/components/Modal.vue

@@ -1,13 +0,0 @@
-<script setup lang="ts">
-import { useVModel } from "@vueuse/core"
-
-const props = defineProps<{ visible: boolean }>()
-const visible = useVModel(props, 'visible')
-
-</script>
-
-<template>
-  <ElDialog v-model="visible">
-    
-  </ElDialog>
-</template>

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

@@ -1,18 +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' }],
+    seller_code: [{ required: true, message: '请选择销售方公司', trigger: 'change' }],
+    buyer_code: [{ required: true, message: '请选择购买方公司', trigger: 'change' }],
+    good_source: [{ required: true, message: '请选择商品来源', trigger: 'change' }],
+    skuCode: [{ required: true, message: '请输入商品编号', trigger: 'change' }],
+    good_type: [{ 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' }],
+    inv_good_name: [{ required: true, message: '请输入发票商品名称', trigger: 'change' }],
+    unit_price: [{ 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' }]
+    unit_weight: [{ required: true, message: '请选择重量', trigger: 'change' }],
+    subunit_price: [{ required: true, message: '请输入成本税后单价', trigger: 'change' }],
+    cat_code: [{ required: true, message: '请选择进项类目', trigger: 'change' }],
+    inv_type: [{ required: true, message: '请选择发票类型', trigger: 'change' }],
+    cat_tax: [{ required: true, message: '请选择进项税率', trigger: 'change' }],
+    basic_status: [{ required: true, message: '请选择进项成本类型', trigger: 'change' }]
 }

src/views/invoiceInOut/productManager/components/shared.ts

@@ -0,0 +1,78 @@
+/**
+ * @invoice_addr 公司注册地址
+ * @invoice_people  法人
+ * @invoice_mobile 联系方式
+ * @invoice_code 纳税识别号
+ * @invoice_bank 开户行
+ * @invoice_bankNo 开户账户
+ */
+export const convertInvoiceTitle = (title: Record<string, string>) => {
+    const {
+        company_address,
+        mobile,
+        company_license,
+        bank_name,
+        bankNo,
+        company_name
+    } = title;
+
+    return {
+        invoice_addr: company_address,
+        invoice_mobile: mobile,
+        invoice_code: company_license,
+        invoice_bank: bank_name,
+        invoice_bankNo: bankNo,
+        invoice_title: company_name
+    };
+};
+
+export const convertInvoiceTitleData = (title: Record<string, string>) => {
+    const {
+        invoice_addr,
+        invoice_mobile,
+        invoice_code,
+        invoice_bank,
+        invoice_bankNo,
+        invoice_title
+    } = title;
+
+    return {
+        invoice_code,
+        invoice_title,
+        addrAndmobile: invoice_addr + " " + invoice_mobile,
+        bankAndBankNo: invoice_bank + " " + invoice_bankNo
+    };
+};
+
+export const invoice_columns = [
+    { label: "抬头", span: 24, field: "invoice_title" },
+    { label: "纳税人识别号", span: 24, field: "invoice_code" },
+    // { label: "地址、电话", span: 24, field: "addrAndmobile" },
+    // { label: "开户行及账号", span: 24, field: "bankAndBankNo" }
+];
+
+
+export const createInitalData = () => ({
+    buyer_code: "",
+    buyer_name: "",
+    seller_code: "",
+    seller_name: "",
+    good_source: "",
+    good_code: '',
+    good_type: '',
+    is_combind: "1",
+    inv_good_name: "",
+    subunit_price: '',
+    basic_status: '',
+    unit_price: '',
+    goodName: "",
+    skuCode: '',
+    cat_code: '',
+    inv_type: '',
+    cat_tax: '',
+    spec: '',
+    unit: '',
+    unit_weight: '',
+    spectral: '',
+    childArr: []
+})

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

@@ -1,67 +1,165 @@
+import { render } from "nprogress";
+import { cg_order_type_options, statusList } from "/@/utils/status";
+import { h } from "vue";
+import { ElTable, ElTableColumn, ElTag } from "element-plus";
+
 export const goodColumns = [
   {
     span: 12,
-    field: 'TODO',
+    field: 'seller_name',
     label: '销售方公司'
   },
   {
     span: 12,
-    field: 'TODO',
+    field: 'buyer_name',
     label: '购买方公司'
   },
   {
     span: 12,
-    field: 'TODO',
+    field: 'goodName',
     label: '订单商品名称'
   },
   {
     span: 12,
-    field: 'TODO',
+    field: 'inv_good_name',
     label: '发票商品名称'
   },
   {
     span: 6,
-    field: 'TODO',
-    label: '商品类型'
+    label: '商品类型',
+    render(_, { good_type }){
+      return h(ElTag, { size: 'small' }, {
+        default: () => cg_order_type_options.find(item => item.value == good_type)?.label || '--'
+      })
+    }
   },
   {
     span: 6,
-    field: 'TODO',
+    field: 'good_code',
     label: '商品代码'
   },
   {
     span: 6,
-    field: 'TODO',
+    field: 'spec',
     label: '规格'
   },
   {
     span: 6,
-    field: 'TODO',
+    field: 'unit',
     label: '单位'
   },
   {
     span: 6,
-    field: 'TODO',
+    field: 'unit_price',
     label: '税前单价'
   },
   {
     span: 6,
-    field: 'TODO',
+    field: 'subunit_price',
     label: '税后单价'
   },
   {
     span: 6,
-    field: 'TODO',
+    field: 'unit_weight',
     label: '重量'
   },
   {
     span: 6,
-    field: 'TODO',
+    field: 'spectral',
     label: '分光'
   },
   {
-    field: 'TODO',
+    field: 'cat_name',
     label: '进项类目',
     span: 24
   }
 ]
+
+
+export const goodHasChildColumns = [
+  {
+    span: 12,
+    field: 'seller_name',
+    label: '销售方公司'
+  },
+  {
+    span: 12,
+    field: 'buyer_name',
+    label: '购买方公司'
+  },
+  {
+    span: 12,
+    field: 'goodName',
+    label: '订单商品名称'
+  },
+  {
+    span: 12,
+    field: 'inv_good_name',
+    label: '发票商品名称'
+  },
+  {
+    span: 6,
+    label: '商品类型',
+    render(_, { good_type }) {
+      return h(ElTag, { size: 'small' }, {
+        default: () => cg_order_type_options.find(item => item.value == good_type)?.label || '--'
+      })
+    }
+  },
+  {
+    span: 6,
+    field: 'good_code',
+    label: '商品代码'
+  },
+  {
+    span: 6,
+    field: 'spec',
+    label: '规格'
+  },
+  {
+    span: 6,
+    field: 'unit',
+    label: '单位'
+  },
+  {
+    span: 6,
+    field: 'unit_price',
+    label: '税前单价'
+  },
+  {
+    span: 6,
+    field: 'subunit_price',
+    label: '税后单价'
+  },
+  {
+    span: 6,
+    field: 'unit_weight',
+    label: '重量'
+  },
+  {
+    span: 6,
+    field: 'spectral',
+    label: '分光'
+  },
+  {
+    field: 'cat_name',
+    label: '进项类目',
+    span: 24
+  },
+  {
+    label: '子商品',
+    span: 24,
+    render(_, { ProductsCombind = [] }){
+      return h(ElTable, { size: 'small', data: ProductsCombind, border: true }, {
+        default: () => [
+          h(ElTableColumn, { label: '比例', prop: 'child_num', width: 100, showOverflowTooltip: true }),
+          h(ElTableColumn, { label: '商品编号', showOverflowTooltip: true }, { default: (scope) => scope.row.products?.skuCode }),
+          h(ElTableColumn, { label: '商品类型', showOverflowTooltip: true }, { default: (scope) =>
+            h(ElTag, { size: 'small' }, { default: () => cg_order_type_options.find(item => item.value == scope.row.products?.good_type)?.label || '--'  })
+          }),
+          h(ElTableColumn, { label: '商品名称' }, { default: (scope) => scope.row.products?.goodName }),
+        ]
+      })
+    }
+  }
+]

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

@@ -1,83 +1,94 @@
 import { ContentConfig } from "/@/components/PageContent";
-import { httpList } from "/@/api/invoiceInOut/productManager";
+import { httpList, httpStatus } from "/@/api/invoiceInOut/productManager";
 
-import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
+import { cg_order_type_options, statusList } from "/@/utils/status";
+import { ElTag } from "element-plus";
+import { h } from "vue";
 
 const columns = [
   {
     label: "商品编码",
-    prop: "TODO",
+    prop: "skuCode",
     width: 150
   },
   {
-    label: "商品代码",
-    prop: "TODO",
+    label: "销售方公司",
+    prop: "seller_name",
     width: 160
   },
   {
-    label: '供应商名称',
-    width: 160,
-    ...renderIconLabelLeft('supplierNo', 'supplierName', '供应商编码:')
+    label: "购买方公司",
+    prop: "buyer_name",
+    width: 160
   },
   {
     label: '商品类型',
-    prop: 'TODO',
-    width: 100
+    width: 100,
+    cellRenderer({ row }){
+      return h(ElTag, { size: 'small' }, {
+        default: () => cg_order_type_options.find(item => item.value == row.good_type)?.label || '--'
+      })
+    }
   },
   {
     label: '商品名称',
-    prop: 'TODO',
+    prop: 'goodName',
     width: 150
   },
   {
     label: "规格",
-    prop: "TODO",
+    prop: "spec",
     width: 80
   },
   {
     label: "单位",
-    prop: "TODO",
+    prop: "unit",
     width: 80
   },
   {
     label: "状态",
-    prop: "TODO",
-    width: 100
+    prop: "status",
+    width: 80,
+    cellRenderer({ row }){
+      return h(ElTag, { size: 'small', type: statusList.find(item => item.value == row.status)?.type || 'warning' }, {
+        default: () => statusList.find(item => item.value == row.status)?.label || '--'
+      })
+    }
   },
   {
     label: '税前单价',
-    prop: 'TODO',
+    prop: 'subunit_price',
     width: 100
   },
   {
     label: '税后单价',
-    prop: 'TODO',
+    prop: 'unit_price',
     width: 100
   },
   {
     label: '重量',
-    prop: 'TODO',
+    prop: 'unit_weight',
     width: 80
   },
   {
     label: '分光',
-    prop: 'TODO',
+    prop: 'spectral',
     width: 80
   },
   {
     label: '创建人',
-    prop: 'TODO',
+    prop: 'apply_name',
     width: 80
   },
   {
     label:'创建时间',
-    prop: 'TODO',
+    prop: 'create_time',
     width: 140
   },
   {
     label: "操作",
     fixed: "right",
-    width: 55,
+    width: 80,
     slot: "operation"
   }
 ];
@@ -85,10 +96,10 @@ const columns = [
 const contentConfig: ContentConfig = {
   columns,
   title: "商品管理",
-  permissions: ['003'],
-  // superUserNoAction: false,
+  permissions: ['003', '004', '007'],
   apis: { 
     httpList,
+    httpStatus,
     httpAdd: true
   }
 };

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

@@ -3,17 +3,6 @@ import { goodTypeOptions } from "/@/utils/status";
 
 const searchFormConfig: FormConfig = {
   formItems: [
-    {
-      field: 'TODO',
-      type: 'input',
-      placeholder: '商品编码'
-    },
-    {
-      field: 'TODO',
-      type: 'select',
-      options: goodTypeOptions,
-      placeholder: '商品类型'
-    },
     {
       field: "timer",
       type: "date_picker",
@@ -26,6 +15,17 @@ const searchFormConfig: FormConfig = {
         startPlaceholder: "开始时间",
         endPlaceholder: "结束时间"
       }
+    },
+    {
+      field: 'skuCode',
+      type: 'input',
+      placeholder: '商品编码'
+    },
+    {
+      field: 'good_type',
+      type: 'select',
+      options: goodTypeOptions,
+      placeholder: '商品类型'
     }
   ]
 };

src/views/invoiceInOut/productManager/detail.vue

@@ -1,21 +1,32 @@
 <script setup lang="ts">
+import BasicDescriptions from "/@/components/BasicDescriptions";
 import { useDetail } from "/@/hooks/core/useDetail";
-// import BasicDescriptions from "/@/components/BasicDescriptions";
-// import { goodColumns } from "./config/columns"
-
 import BaseForm from "./components/BaseForm.vue"
+import { goodColumns, goodHasChildColumns } from "./config/columns"
+
+import { httpDetail } from "/@/api/invoiceInOut/productManager";
+import { useTask } from "/@/hooks/core"
+
+
+const detailTask = useTask()
+const { title, isDetail, collapses, id } = useDetail({ baseName: '商品', collapseLen: 2 });
+
 
-const { id, title, isDetail, collapses } = useDetail({ baseName: '商品', collapseLen: 2 });
+id.value && detailTask.run(httpDetail({ id: id.value }))
 </script>
 
 <template>
-  <div class="padding__container">
+  <div class="padding__container" v-loading="detailTask.loading">
     <ElTabs>
       <ElTabPane :label="title">
         <ElCollapse v-model="collapses">
           <ElCollapseItem :title="title" name="1">
-            <BaseForm />
-            <!-- <BasicDescriptions :columns="goodColumns" :data="{}" /> -->
+            <BaseForm v-if="!isDetail" />
+            <BasicDescriptions 
+              v-if="isDetail && detailTask.data" 
+              :columns="detailTask.data.is_combind == '1' ? goodHasChildColumns : goodColumns" 
+              :data="detailTask.data" 
+            />
           </ElCollapseItem>
         </ElCollapse>
       </ElTabPane>