feat

src/components/productDetail/columns.ts

@@ -0,0 +1,245 @@
+import { h } from "vue"
+import { createTooltip } from "/@/utils/tootip"
+import { ElTable, ElTableColumn, ElTag } from "element-plus"
+import { cg_order_type_options, statusList } from "/@/utils/status"
+import { basicStatusOptions } from "/@/views/invoiceInOut/productManager/config/columns"
+
+export const goodColumns = [
+    {
+        field: 'id',
+        label: '商品ID',
+        span: 6
+    },
+    {
+        span: 6,
+        label: '状态',
+        render(_, { status }) {
+            return h(ElTag, { size: 'small', type: statusList.find(item => item.value == status)?.type || 'warning' }, {
+                default: () => statusList.find(item => item.value == status)?.label || '--'
+            })
+        }
+    },
+    {
+        span: 6,
+        field: 'apply_name',
+        label: '创建人'
+    },
+    {
+        span: 6,
+        field: 'create_time',
+        label: '创建时间'
+    },
+    {
+        span: 12,
+        field: 'seller_name',
+        label: '销售方公司',
+        render(_, { seller_code, seller_name }) {
+            return createTooltip(seller_name, '销售方公司编号:' + seller_code, 300)
+        }
+    },
+    {
+        span: 12,
+        field: 'buyer_name',
+        label: '购买方公司',
+        render(_, { buyer_code, buyer_name }) {
+            return createTooltip(buyer_name, '购买方公司编号:' + buyer_code, 300)
+        }
+    },
+    {
+        span: 6,
+        label: '商品来源',
+        render(_, { good_source }) {
+            return good_source == '1' ? '采销商品' : '非采销商品'
+        }
+    },
+    {
+        span: 6,
+        label: '组合类型',
+        render(_, { is_combind }) {
+            return is_combind == '0' ? '非组合商品' : '组合商品'
+        }
+    },
+    {
+        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,
+        label: '进项成本状态',
+        render(_, { basic_status }) {
+            return h(ElTag, { size: 'small' }, {
+                default: () => basicStatusOptions.find(item => item.value == basic_status)?.label || '--'
+            })
+        }
+    },
+    {
+        span: 12,
+        field: 'inv_good_name',
+        label: '发票商品名称'
+    },
+    {
+        span: 12,
+        field: 'goodName',
+        label: '订单商品名称'
+    },
+    {
+        field: 'skuCode',
+        label: '商品编号',
+        span: 6
+    },
+    {
+        span: 6,
+        field: 'unit',
+        label: '单位'
+    },
+    {
+        span: 6,
+        field: 'spec',
+        label: '规格'
+    },
+    {
+        span: 6,
+        // field: 'unit_weight',
+        label: '重量',
+        render(_, { unit_weight }) {
+            return unit_weight + 'g'
+        }
+    },
+    {
+        span: 6,
+        label: '发票类型',
+        render(_, { inv_type }) {
+            return inv_type.includes('special') ? '专票' : '普票'
+        }
+    },
+    {
+        span: 6,
+        field: 'subunit_price',
+        label: '税前单价'
+    },
+    {
+        span: 6,
+        field: 'unit_price',
+        label: '税后单价'
+    },
+    {
+        span: 6,
+        field: 'good_code',
+        label: '商品代码'
+    },
+    {
+        field: 'cat_name',
+        label: '进项类目',
+        span: 12,
+        render(_, { cat_code, cat_name, short_name }) {
+            return `${cat_code}-${cat_name}-${short_name}`
+        }
+    },
+    {
+        label: '进项税率',
+        span: 6,
+        render(_, { cat_tax }) {
+            return cat_tax + '%'
+        }
+    },
+    {
+        span: 6,
+        field: 'spectral',
+        label: '分光'
+    },
+]
+
+
+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/components/productDetail/index.vue

@@ -0,0 +1,15 @@
+<script setup lang="ts">
+import BasicDescriptions from '../BasicDescriptions';
+import { goodColumns, goodHasChildColumns } from './columns';
+
+ defineProps<{ data?: any }>()
+</script>
+
+
+<template>
+    <BasicDescriptions
+        v-if="data"
+        :columns="data?.is_combind == '1' ? goodHasChildColumns : goodColumns"
+        :data="data"
+    />
+</template>

src/store/modules/user.ts

@@ -268,8 +268,8 @@ export const useUserStore = defineStore({
           code: 0,
           data: [
             createMenu('商品管理', 'productManager', 'invoiceInOut/productManager'),
-            createMenu('出库管理', 'outManager', 'invoiceInOut/outManager'),
             createMenu('入库管理', 'inManager', 'invoiceInOut/inManager'),
+            createMenu('出库管理', 'outManager', 'invoiceInOut/outManager'),
             createMenu('盘点', 'inventoryCheck', 'invoiceInOut/inventoryCheck'),
             createMenu('计提出库明细处理', 'provisionOut', 'invoiceInOut/provisionOut'),
             createMenu('调整单', 'adjustOrder', 'invoiceInOut/adjustOrder'),

src/utils/status.ts

@@ -1,7 +1,7 @@
 export const goodTypeOptions = [
   { value: "1", label: "库存品" },
   { value: "2", label: "非库存品" },
-  { value: "3", label: "采返商品" }
+  { value: "3", label: "反馈商品" }
 ];
 
 const statusList = [
@@ -34,14 +34,25 @@ export const checkTypeOptions = [
 const cg_order_type_options = [
   { value: "1", label: "库存商品" },
   { value: "2", label: "非库存商品" },
-  { value: "3", label: "反馈商品" },
+  { value: "3", label: "咨询商品" },
   // { value: "4", label: "报备商品" }
 ];
 
+
+export const mapGoodTypeToLabel = cg_order_type_options.reduce((prev, current) => ({
+  ...prev,
+  [current.label]: current.value
+}), {})
+
+export const mapGoodLabelToType = cg_order_type_options.reduce((prev, current) => ({
+  ...prev,
+  [current.label]: current.value
+}), {})
+
 const xs_order_type_options = [
   { value: "1", label: "库存商品" },
   { value: "2", label: "非库存商品" },
-  { value: "3", label: "反馈商品" },
+  { value: "3", label: "咨询商品" },
   // { value: "4", label: "报备商品" }
 ];
 

src/utils/tootip.ts

@@ -13,7 +13,6 @@ export function createTooltip(left: string, reference: string, width = 200) {
     },
     {
       default: () => [
-        h("span", null, left),
         h(
           ElPopover,
           {
@@ -28,7 +27,8 @@ export function createTooltip(left: string, reference: string, width = 200) {
                 icon: useRenderIcon("information-line")
               })
           }
-        )
+        ),
+        h("span", null, left)
       ]
     }
   );

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

@@ -67,6 +67,13 @@ const columns = [
     minWidth: '120px',
     defaultData: '',
   },
+  {
+    label: '商品类型',
+    prop: 'goodType',
+    minWidth: '120px',
+    defaultData: '',
+    required: true
+  },
   {
     label: '商品编号',
     prop: 'goodNo',

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

@@ -8,7 +8,7 @@ import { useVModel } from "@vueuse/core";
 import { mapLabelToSource, mapLabelToType } from "../../config/shared";
 import { httpAdd } from "/@/api/invoiceInOut/inOutManager";
 import { columns, mapLabelToProp } from "./columns-config";
-import { mapLabelToInvtype } from "/@/utils/status";
+import { mapGoodLabelToType, mapLabelToInvtype } from "/@/utils/status";
 import { isImportDataValid } from "./validator";
 
 
@@ -30,6 +30,8 @@ const Uploadsuccess = ({ results, header }) => {
   }
 
   let headok = true;
+  console.log(header.length, columns.length - 1)
+
   if (header.length !== columns.length - 1) {
     headok = false;
   } else {
@@ -97,6 +99,7 @@ const handleSubmit = async () => {
         inv_type: mapLabelToInvtype[item.inv_type],
         source: mapLabelToSource[item.source], 
         type: mapLabelToType[item.type],
+        goodType: mapGoodLabelToType[item.goodType],
 
         inv_num: Number(item.inv_num).toFixed(8),
         inv_subprice: Number(item.inv_subprice).toFixed(8),
@@ -105,7 +108,6 @@ const handleSubmit = async () => {
         inv_total: Number(item.inv_tax_total).toFixed(8),
 
         platform_type: "1",
-        goodType: "1",
         channel: "2",
         relaArr: [{  
           id: item.relaGoodNo, 

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

@@ -2,7 +2,7 @@ import { h } from "vue"
 import { ElMessageBox } from "element-plus"
 import { mapPropertyToLabel, requiredProps } from "./columns-config"
 import { diffOptions, mapDiffOptions, mapLabelToSource, mapLabelToType, sourceOptions, typeOptions } from "../../config/shared"
-import { mapLabelToInvtype, xs_inv_type_list } from "/@/utils/status"
+import { mapGoodTypeToLabel, mapLabelToInvtype, xs_inv_type_list } from "/@/utils/status"
 
 function onDisplayErrorMessage(errors) {
     ElMessageBox({
@@ -28,6 +28,7 @@ export function isValidRequired(results: any[]) {
     let isInvError = false
     let isTaxDiffError = false
     let isCatDiffError = false
+    let isGoodType = false
 
     for (const sourceIndex in results) {
         const item = results[sourceIndex];
@@ -51,6 +52,8 @@ export function isValidRequired(results: any[]) {
                 isTaxDiffError = true
             } else if (key === 'cat_diff' && !mapDiffOptions[value]) {
                 isCatDiffError = true
+            } else if (key === 'goodType' && mapGoodTypeToLabel[value]){
+                isGoodType =  false
             }
         }
 
@@ -60,12 +63,15 @@ export function isValidRequired(results: any[]) {
             if (isSourceError) errors[index] += ' ,订单来源必须为' + sourceOptions.map(({ label }) => label).join('、')
             if (isInvError) errors[index] += ' ,发票类型必须为' + xs_inv_type_list.map(({ label }) => label).join('、')
             if (isTaxDiffError) errors[index] += ' ,类目编号状态必须为' + diffOptions.map(({ label }) => label).join('、')
+            if (isCatDiffError) errors[index] += ' ,税率状态必须为' + diffOptions.map(({ label }) => label).join('、')
             if (isCatDiffError) errors[index] += ' ,税率状态' + diffOptions.map(({ label }) => label).join('、')
+            if (isGoodType) errors[index] += ' ,商品类型必须为' + diffOptions.map(({ label }) => label).join('、')
         } else {
             if (isTypeError) errors[index] = '类型必须为' + typeOptions.map(({ label }) => label).join('、')
             if (isSourceError) errors[index] = ' 订单来源必须为' + sourceOptions.map(({ label }) => label).join('、')
             if (isInvError) errors[index] = ' 类目编号状态必须为' + diffOptions.map(({ label }) => label).join('、')
-            if (isCatDiffError) errors[index] = ' 税率状态' + diffOptions.map(({ label }) => label).join('、')
+            if (isCatDiffError) errors[index] = ' 税率状态必须为' + diffOptions.map(({ label }) => label).join('、')
+            if (isGoodType) errors[index] = ' 商品类型必须为' + diffOptions.map(({ label }) => label).join('、')
         }
     }
 

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

@@ -67,6 +67,19 @@ const columns = [
     minWidth: '120px',
     defaultData: '',
   },
+  // {
+  //   label: '订单主单号',
+  //   prop: 'cxCode',
+  //   minWidth: '120px',
+  //   defaultData: '',
+  // },
+  {
+    label: '商品类型',
+    prop: 'goodType',
+    minWidth: '120px',
+    defaultData: '',
+    required: true
+  },
   {
     label: '商品编号',
     prop: 'goodNo',
@@ -287,14 +300,14 @@ const columns = [
     prop: 'remark',
     minWidth: '80px',
     defaultData: '',
+  },
+  {
+    label: '入账月份',
+    prop: 'fz_date',
+    minWidth: '80px',
+    defaultData: '',
+    required: true
   }
-  // {
-  //   label: '入账月份',
-  //   prop: 'TODO37',
-  //   minWidth: '80px',
-  //   defaultData: '',
-  //   required: true
-  // }
 ]
 
 const orderTemplate = [columns.slice(1).reduce((prev, current) => {

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

@@ -9,7 +9,7 @@ import { columns, mapLabelToProp } from "./columns-config";
 import { isImportDataValid } from "./validator";
 import { httpAdd } from "/@/api/invoiceInOut/inOutManager";
 import { mapLabelToSource, mapLabelToType } from "../../config/shared";
-import { mapLabelToInvtype } from "/@/utils/status";
+import { mapGoodLabelToType, mapLabelToInvtype } from "/@/utils/status";
 
 
 
@@ -90,6 +90,7 @@ const handleSubmit = async () => {
         inv_type: mapLabelToInvtype[item.inv_type],
         source: mapLabelToSource[item.source], 
         type: mapLabelToType[item.type],
+        goodType: mapGoodLabelToType[item.goodType],
         
         inv_num: Number(item.inv_num).toFixed(8),
         inv_subprice: Number(item.inv_subprice).toFixed(8),
@@ -98,8 +99,7 @@ const handleSubmit = async () => {
         inv_total: Number(item.inv_tax_total).toFixed(8),
 
         platform_type: '1',
-        channel: '1',
-        goodType: '1'
+        channel: '1'
       })
     })
 

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

@@ -2,7 +2,7 @@ import { h } from "vue"
 import { ElMessageBox } from "element-plus"
 import { mapPropertyToLabel, requiredProps } from "./columns-config"
 import { diffOptions, mapDiffOptions, mapLabelToSource, mapLabelToType, sourceOptions, typeOptions } from "../../config/shared"
-import { mapLabelToInvtype, xs_inv_type_list } from "/@/utils/status"
+import { mapGoodTypeToLabel, mapLabelToInvtype, xs_inv_type_list } from "/@/utils/status"
 
 function onDisplayErrorMessage(errors) {
     ElMessageBox({
@@ -12,7 +12,7 @@ function onDisplayErrorMessage(errors) {
             default: () => Object.keys(errors).reduce((prev, index) => {
                 return [
                     ...prev,
-                    h('p', {}, '第' + index  + '行,' + errors[index])
+                    h('p', {}, '第' + index + '行,' + errors[index])
                 ]
             }, [])
         })
@@ -28,6 +28,7 @@ export function isValidRequired(results: any[]) {
     let isInvError = false
     let isTaxDiffError = false
     let isCatDiffError = false
+    let isGoodType = false
 
     for (const sourceIndex in results) {
         const item = results[sourceIndex];
@@ -41,16 +42,18 @@ export function isValidRequired(results: any[]) {
                 } else {
                     errors[index] = mapPropertyToLabel[key]
                 }
-            } else if (key === 'type' && !mapLabelToType[value]){
+            } else if (key === 'type' && !mapLabelToType[value]) {
                 isTypeError = true
             } else if (key === 'source' && !mapLabelToSource[value]) {
                 isSourceError = true
-            } else if (key === 'inv_type' && !mapLabelToInvtype[value]){
+            } else if (key === 'inv_type' && !mapLabelToInvtype[value]) {
                 isInvError = true
             } else if (key === 'tax_diff' && !mapDiffOptions[value]) {
                 isTaxDiffError = true
             } else if (key === 'cat_diff' && !mapDiffOptions[value]) {
                 isCatDiffError = true
+            } else if (key === 'goodType' && mapGoodTypeToLabel[value]) {
+                isGoodType = false
             }
         }
 
@@ -60,12 +63,15 @@ export function isValidRequired(results: any[]) {
             if (isSourceError) errors[index] += ' ,订单来源必须为' + sourceOptions.map(({ label }) => label).join('、')
             if (isInvError) errors[index] += ' ,发票类型必须为' + xs_inv_type_list.map(({ label }) => label).join('、')
             if (isTaxDiffError) errors[index] += ' ,类目编号状态必须为' + diffOptions.map(({ label }) => label).join('、')
+            if (isCatDiffError) errors[index] += ' ,税率状态必须为' + diffOptions.map(({ label }) => label).join('、')
             if (isCatDiffError) errors[index] += ' ,税率状态' + diffOptions.map(({ label }) => label).join('、')
+            if (isGoodType) errors[index] += ' ,商品类型必须为' + diffOptions.map(({ label }) => label).join('、')
         } else {
             if (isTypeError) errors[index] = '类型必须为' + typeOptions.map(({ label }) => label).join('、')
             if (isSourceError) errors[index] = ' 订单来源必须为' + sourceOptions.map(({ label }) => label).join('、')
             if (isInvError) errors[index] = ' 类目编号状态必须为' + diffOptions.map(({ label }) => label).join('、')
-            if (isCatDiffError) errors[index] = ' 税率状态' + diffOptions.map(({ label }) => label).join('、')
+            if (isCatDiffError) errors[index] = ' 税率状态必须为' + diffOptions.map(({ label }) => label).join('、')
+            if (isGoodType) errors[index] = ' 商品类型必须为' + diffOptions.map(({ label }) => label).join('、')
         }
     }
 

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

@@ -1,7 +1,7 @@
 import { ElTag } from "element-plus"
 import { cg_order_type_options, xs_inv_type_list } from "/@/utils/status"
 import { h } from "vue"
-import { managerStatusOptions, sourceOptions, statusOptions, typeOptions } from "./shared"
+import { channelOptions, managerStatusOptions, sourceOptions, statusOptions, typeOptions } from "./shared"
 import { createTooltip } from "/@/utils/tootip"
 
 export const goodColumns = [
@@ -81,7 +81,16 @@ export const orderGoodColumns = [
   {
     field: 'invoiceCode',
     label: '业务编号',
-    span: 12
+    span: 6
+  },
+  {
+    label: '导入方式',
+    width: 100,
+    render(_, row) {
+      return h(ElTag, { type: 'primary', size: 'small' }, {
+        default: () => channelOptions.find(item => item.value == row.channel)?.label
+      })
+    }
   },
   {
     label: '类型',
@@ -101,6 +110,56 @@ export const orderGoodColumns = [
       })
     }
   },
+  {
+    label: '业务类型',
+    span: 6,
+    render(_, row) {
+      return managerStatusOptions.find((item) => item.value == row.manager_status)?.label
+    }
+  },
+  {
+    label: '关联金额',
+    span: 6,
+    field: 'inv_fee'
+  },
+  {
+    label: '创建人',
+    span: 6,
+    field: 'apply_name'
+  },
+  {
+    label: '创建时间',
+    span: 6,
+    field: 'create_time'
+  },
+  {
+    label: '类目编号状态',
+    span: 6,
+    render(_, row){
+      return h(ElTag, { size: 'small', type: row.cat_diff == '0' ? 'danger' : 'success' }, {
+        default: () => row.cat_diff == '0' ? '不一致' : '一致'
+      })
+    }
+  },
+  {
+    label: '税率状态',
+    span: 6,
+    render(_, row) {
+      return h(ElTag, { size: 'small', type: row.tax_diff == '0' ? 'danger' : 'success' }, {
+        default: () => row.tax_diff == '0' ? '不一致' : '一致'
+      })
+    }
+  },
+  {
+    label: '备注',
+    span: 12,
+    field: 'remark'
+  },
+  {
+    label: '入账月份',
+    span: 6,
+    field: 'fz_date'
+  },
   {
     label: '状态',
     span: 6,
@@ -112,12 +171,23 @@ export const orderGoodColumns = [
   },
   {
     label: '异常原因',
-    span: 18,
+    span: 12,
   },
+
+]
+
+export const importOrderGoodColumns = [
   {
-    label: '销售方公司',
+    label: '订单购买方公司',
     span: 12,
-    render(_, row){
+    render(_, row) {
+      return createTooltip(row.buyer_name, "购买方公司纳税识别号 : " + row.buyer_code, 340)
+    }
+  },
+  {
+    label: '订单销售方公司',
+    span: 12,
+    render(_, row) {
       return createTooltip(row.seller_name, "销售方公司纳税识别号 : " + row.seller_code, 340)
     }
   },
@@ -132,12 +202,34 @@ export const orderGoodColumns = [
     span: 6
   },
   {
-    label: '商品名称',
+    label: '类目编码',
     span: 12,
-    render(_, row){
-      return createTooltip(row.goodName, "商品编号 : " + row.goodNo, 340)
+    render(_, { cat_code, cat_name, tax }) {
+      return `${cat_code}-${cat_name}-${(Number(tax)) + '%'}`
+    }
+  },
+  {
+    label: '商品类型',
+    span: 6,
+    render(_, { goodType }){
+      return h(ElTag, { size: 'small' }, {
+        default: () => cg_order_type_options.find(item => item.value == goodType)?.label
+      })
     }
   },
+  {
+    label: '商品编号',
+    span: 6,
+    field: 'goodNo'
+  },
+  {
+    label: '商品名称',
+    span: 12,
+    field: 'goodName'
+  },
+
+
+
   {
     label: '单位',
     field: 'unit',
@@ -158,29 +250,25 @@ export const orderGoodColumns = [
     field: 'totalPrice',
     span: 6
   },
-  {
-    label: '税目',
-    field: 'cat_code',
-    span: 6
-  },
-  {
-    label: '税率',
-    span: 6,
-    render(_, row){
-      return (Number(row.tax)) + '%'
-    }
-  },
+
+
+]
+
+
+export const importInvoiceGoodColumns = [
   {
     label: '购买方公司',
     span: 12,
-    render(_, row){
-      return createTooltip(row.buyer_name, "购买方公司纳税识别号 : " + row.buyer_code, 340)
+    render(_, row) {
+      return createTooltip(row.inv_buyer_name, "购买方公司纳税识别号 : " + row.inv_buyer_code, 340)
     }
   },
   {
-    label: '关联金额',
-    field: 'inv_fee',
-    span: 6
+    label: '销售方公司',
+    span: 12,
+    render(_, row) {
+      return createTooltip(row.inv_seller_name, "销售方公司纳税识别号 : " + row.inv_seller_code, 340)
+    }
   },
   {
     label: '发票号码',
@@ -188,28 +276,31 @@ export const orderGoodColumns = [
     span: 6
   },
   {
-    label: '发票销售方公司',
-    span: 12,
-    render(_, row){
-      return createTooltip(row.inv_seller_name, "发票销售方公司编号 : " + row.inv_seller_code, 340)
-    }
-  },
-  {
-    label: '发票明细ID',
-    span: 6,
-    field: 'inv_item_id'
+    label: '开票日期',
+    field: 'inv_open_date',
+    span: 6
   },
   {
     label: '发票类型',
     span: 6,
-    render(_, row){
+    render(_, row) {
       return xs_inv_type_list.find(item => item.value == row.inv_type)?.label
     }
   },
+  {
+    label: '发票明细ID',
+    field: 'inv_item_id',
+    span: 6
+  },
   {
     label: '货物或应税劳务、服务名称',
+    field: 'inv_good_name',
     span: 12,
-    field: 'inv_good_name'
+  },
+  {
+    label: '类目编号',
+    span: 6,
+    render(_, row) { return row.inv_cat_code }
   },
   {
     label: '规格型号',
@@ -217,12 +308,12 @@ export const orderGoodColumns = [
     field: 'inv_spec'
   },
   {
-    label: '发票商品单位',
+    label: '单位',
     span: 6,
     field: 'inv_unit'
   },
   {
-    label: '发票商品数量',
+    label: '数量',
     span: 6,
     field: 'inv_num'
   },
@@ -237,53 +328,60 @@ export const orderGoodColumns = [
     field: 'inv_subtotal'
   },
   {
-    label: '发票税率',
+    label: '税率',
+    span: 6,
     field: 'inv_tax',
-    span: 6
-  },
-  {
-    label: '发票税额',
-    field: 'inv_tax_total',
-    span: 6
-  },
-  {
-    label: '税后单价',
-    field: 'inv_price',
-    span: 6
-  },
-  {
-    label: '税后单价',
-    field: 'inv_total',
-    span: 6
+    render(_, { inv_tax }){
+      return Number(inv_tax) + '%'
+    }
   },
   {
-    label: '类目编号状态',
     span: 6,
-    render(_, row){
-      return h(ElTag, { size: 'small', type: row.cat_diff == '0' ? 'danger' : 'success' }, {
-        default: () => row.cat_diff == '0' ? '不一致' : '一致'
-      })
-    }
+    label: '税额',
+    field: 'inv_tax_total'
   },
   {
-    label: '税率状态',
+    label: '税后单价',
     span: 6,
-    render(_, row) {
-      return h(ElTag, { size: 'small', type: row.tax_diff == '0' ? 'danger' : 'success' }, {
-        default: () => row.tax_diff == '0' ? '不一致' : '一致'
-      })
-    }
+    field: 'inv_price'
   },
   {
-    label: '业务类型',
+    label: '税后总额',
     span: 6,
-    render(_, row) {
-      return managerStatusOptions.find((item) => item.value == row.manager_status)?.label
-    }
+    field: 'inv_subtotal'
   },
-  {
-    label: '备注',
-    span: 12,
-    field: 'remark'
-  }
+  // {
+  //   label: '单位',
+  //   field: 'unit',
+  //   span: 6
+  // },
+  // {
+  //   label: '商品数量',
+  //   field: 'num',
+  //   span: 6
+  // },
+  // {
+  //   label: '商品单价',
+  //   field: 'goodPrice',
+  //   span: 6
+  // },
+  // {
+  //   label: '订单总金额',
+  //   field: 'totalPrice',
+  //   span: 6
+  // },
+  // {
+  //   label: '税目',
+  //   span: 12,
+  //   render(_, { cat_name, cat_code, tax }) {
+  //     return `${cat_code}-${cat_name}-${tax}%`
+  //   }
+  // },
+  // {
+  //   label: '税率',
+  //   span: 6,
+  //   render(_, row) {
+  //     return (Number(row.tax)) + '%'
+  //   }
+  // }
 ]

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

@@ -2,7 +2,7 @@ import { ContentConfig } from "/@/components/PageContent";
 import { httpList } from "/@/api/invoiceInOut/inOutManager";
 import { h } from "vue";
 import { ElTag } from "element-plus";
-import { typeOptions, sourceOptions, statusOptions, managerStatusOptions } from "./shared";
+import { typeOptions, sourceOptions, statusOptions, managerStatusOptions, channelOptions } from "./shared";
 import { xs_inv_type_list } from "/@/utils/status";
 import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
@@ -12,7 +12,6 @@ const columns = [
     prop: "invoiceCode", 
     width: 150 
   },
-
   { 
     label: "类型", 
     width: 80,
@@ -22,7 +21,15 @@ const columns = [
       })
     } 
   },
-
+  {
+    label: '导入方式',
+    width: 100,
+    cellRenderer({ row }) {
+      return h(ElTag, { type: 'primary', size: 'small' }, {
+        default: () => channelOptions.find(item => item.value == row.channel)?.label
+      })
+    } 
+  },
   { 
     label: '数据来源', 
     width: 90,
@@ -32,8 +39,6 @@ const columns = [
       })
     } 
   },
-
-
   { 
     label: "状态", 
     width: 90,

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

@@ -43,6 +43,11 @@ export const diffOptions = [
 ]
 
 
+export const channelOptions = [
+    { value: '1', label: '订单商品' },
+    { value: '2', label: '非订单商品' },
+]
+
 export const mapDiffOptions =diffOptions.reduce((prev, current) => ({
     ...prev,
     [current.label]: current.value

src/views/invoiceInOut/inManager/detail.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, reactive, ref } from "vue";
 
-import { orderGoodColumns } from "./config/columns"
+import { importOrderGoodColumns, importInvoiceGoodColumns ,orderGoodColumns } from "./config/columns"
 import { useDetail } from "/@/hooks/core/useDetail";
 import BasicDescriptions from "/@/components/BasicDescriptions";
 import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
@@ -9,17 +9,30 @@ import ChooseGoodModal from "./components/ChooseGoodModal/index.vue"
 import ChildGoodEditModal from "./components/ChildGoodEditModal.vue";
 
 import { httpDetail, httpStatus } from "/@/api/invoiceInOut/inOutManager";
-import { ElForm, ElMessage } from "element-plus";
+import { httpDetail as httpProductDetail } from "/@/api/invoiceInOut/productManager";
+import { ElCollapse, ElCollapseItem, ElForm, ElMessage, ElTable, ElTableColumn } from "element-plus";
+import ProductDetail from "/@/components/ProductDetail/index.vue"
 import { useTask } from "/@/hooks/core";
 
 import SealMonthPicker from "/@/components/SealMonthPicker/index.vue"
 
 
-const { title, collapses, id } = useDetail({ baseName: '入库', collapseLen: 2 });
+const { title, collapses, id } = useDetail({ baseName: '入库', collapseLen: 4 });
 
 const visible = ref(false)
 
-const detailTask = useTask()
+
+const productDetailTask = useTask()
+
+const detailTask = useTask({ success(data) {
+  const { ProductRela, channel } = data
+  if(channel == 1){
+    const { product_id } = ProductRela[0]
+    productDetailTask.run(httpProductDetail({ id: product_id }))
+  } else {
+
+  }
+}})
 
 const state = reactive({
   editVisible: false,
@@ -43,11 +56,6 @@ const rules = {
   month: [{ required: true, message: '请选择入账月份' }]
 }
 
-const disabledTomorrow = (time) => {
-  const now = new Date();
-  return time.getTime() > now.setHours(0, 0, 0, 0);
-};
-
 function handleGoodComfirm(values: any[]){
   const ids = formData.value.goods.map(({ id }) => id)
   const list = []
@@ -152,8 +160,20 @@ id.value && detailTask.run(httpDetail({ id: id.value }))
             <BasicDescriptions :columns="orderGoodColumns" :data="detailTask.data" v-if="detailTask.data" />
           </ElCollapseItem>
 
-          <!-- && detailTask.data.type == '1' -->
-          <ElCollapseItem title="出入库信息确认" name="2" v-if="detailTask.data && detailTask.data.status == '1'">
+          <!-- importInvoiceGoodColumns -->
+          <ElCollapseItem :title="'订单详情'" name="2">
+            <BasicDescriptions v-if="detailTask.data" :columns="importOrderGoodColumns" :data="detailTask.data" />
+          </ElCollapseItem>
+
+          <ElCollapseItem :title="'发票详情'" name="3">
+            <BasicDescriptions v-if="detailTask.data" :columns="importInvoiceGoodColumns" :data="detailTask.data" />
+          </ElCollapseItem>
+
+          <ElCollapseItem title="商品信息" name="4" v-if="productDetailTask.data">
+            <ProductDetail :data="productDetailTask.data" />
+          </ElCollapseItem>
+
+          <ElCollapseItem title="出入库信息确认" name="5" v-if="detailTask.data && detailTask.data.status == '1'">
             <ElForm ref="formRef" :rules="rules" :model="formData">
               <ElFormItem label="操作商品" prop="goods">
                 <ElTable :span-method="spanMethod" border size="small" :data="formData.goods">
@@ -208,11 +228,7 @@ id.value && detailTask.run(httpDetail({ id: id.value }))
 
     <ChooseGoodModal v-model:visible="visible" :otherSearchParameter="searchParameter" @submit="handleGoodComfirm" />
 
-    <ChildGoodEditModal 
-      :data="state.data" 
-      :index="state.index" 
-      v-model:visible="state.editVisible"
-      @submit="handleEditGood" 
-    />
+    <ChildGoodEditModal :data="state.data" :index="state.index" v-model:visible="state.editVisible"
+      @submit="handleEditGood" />
   </div>
 </template>

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

@@ -171,7 +171,6 @@ function handleGoodSourceChange(value){
             placeholder="销售方公司抬头" v-model:value="formData.seller_code" response-label-prop="name"
             @item-change="setSellerInvoiceTitle" />
         </ElFormItem>
-
         <InvoiceTitle :detail="sellerInvoiceTitle" />
       </ElCol>
 
@@ -183,7 +182,6 @@ function handleGoodSourceChange(value){
             <ElOption v-for="item in state.companies" :label="item.company_name" :value="item.company_license" />
           </ElSelect>
         </ElFormItem>
-
         <InvoiceTitle :detail="purchaserInvoiceTitle" />
       </ElCol>
 

src/views/invoiceInOut/productManager/components/query-category.vue

@@ -56,9 +56,9 @@ async function requesetSupplierAll(name: string) {
   state.noMore = false;
   const api = getCategories
   const { data, message, code } = await api({
-    cat_name: name,
-    size:10,
-    page: state.page
+    [searchKey.value]: name,
+    page: state.page,
+    size: 10
   });
 
   responseHandle({
@@ -205,7 +205,7 @@ defineExpose({
 
 <template>
   <div class="flex w-full">
-    <ElSelect style="width: 160px;background: #f5f7fa;border-top-right-radius: 0% !important;" v-model="searchKey">
+    <ElSelect style="width: 260px;background: #f5f7fa;border-top-right-radius: 0% !important;" v-model="searchKey">
       <ElOption label="类目编码" value="cat_code" />
       <ElOption label="货物和劳务名称" value="cat_name" />
       <ElOption label="商品和服务分类简称" value="short_name" />

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

@@ -2,32 +2,67 @@ import { render } from "nprogress";
 import { cg_order_type_options, statusList } from "/@/utils/status";
 import { h } from "vue";
 import { ElTable, ElTableColumn, ElTag } from "element-plus";
+import { createTooltip } from "/@/utils/tootip";
 
 export const goodColumns = [
+  {
+    field: 'id',
+    label: '商品ID',
+    span: 6
+  },
+  {
+    span: 6,
+    label: '状态',
+    render(_ , { status }){
+      return h(ElTag, { size: 'small', type: statusList.find(item => item.value == status)?.type || 'warning' }, {
+        default: () => statusList.find(item => item.value == status)?.label || '--'
+      })
+    }
+  },
+  {
+    span: 6,
+    field: 'apply_name',
+    label: '创建人'
+  },
+  {
+    span: 6,
+    field: 'create_time',
+    label: '创建时间'
+  },
   {
     span: 12,
     field: 'seller_name',
-    label: '销售方公司'
+    label: '销售方公司',
+    render(_, { seller_code, seller_name }) {
+      return createTooltip(seller_name, '销售方公司编号:' + seller_code, 300)
+    }
   },
   {
     span: 12,
     field: 'buyer_name',
-    label: '购买方公司'
+    label: '购买方公司',
+    render(_, { buyer_code, buyer_name }) {
+      return createTooltip(buyer_name, '购买方公司编号:' + buyer_code, 300)
+    }
   },
   {
-    span: 12,
-    field: 'goodName',
-    label: '订单商品名称'
+    span: 6,
+    label: '商品来源',
+    render(_, { good_source  }){
+      return good_source == '1' ? '采销商品' : '非采销商品'
+    }
   },
   {
-    span: 12,
-    field: 'inv_good_name',
-    label: '发票商品名称'
+    span: 6,
+    label: '组合类型',
+    render(_, { is_combind }) {
+      return is_combind == '0' ? '非组合商品' : '组合商品'
+    }
   },
   {
     span: 6,
     label: '商品类型',
-    render(_, { good_type }){
+    render(_, { good_type }) {
       return h(ElTag, { size: 'small' }, {
         default: () => cg_order_type_options.find(item => item.value == good_type)?.label || '--'
       })
@@ -35,8 +70,32 @@ export const goodColumns = [
   },
   {
     span: 6,
-    field: 'good_code',
-    label: '商品代码'
+    label: '进项成本状态',
+    render(_, { basic_status }) {
+      return h(ElTag, { size: 'small' }, {
+        default: () => basicStatusOptions.find(item => item.value == basic_status)?.label || '--'
+      })
+    }
+  },
+  {
+    span: 12,
+    field: 'inv_good_name',
+    label: '发票商品名称'
+  },
+  {
+    span: 12,
+    field: 'goodName',
+    label: '订单商品名称'
+  },
+  {
+    field: 'skuCode',
+    label: '商品编号',
+    span: 6
+  },
+  {
+    span: 6,
+    field: 'unit',
+    label: '单位'
   },
   {
     span: 6,
@@ -45,34 +104,54 @@ export const goodColumns = [
   },
   {
     span: 6,
-    field: 'unit',
-    label: '单位'
+    // field: 'unit_weight',
+    label: '重量',
+    render(_, { unit_weight }){
+      return unit_weight + 'g'
+    }
   },
   {
     span: 6,
-    field: 'unit_price',
-    label: '税前单价'
+    label: '发票类型',
+    render(_, { inv_type }) {
+      return inv_type.includes('special') ? '专票' : '普票'
+    }
   },
   {
     span: 6,
     field: 'subunit_price',
-    label: '税后单价'
+    label: '税前单价'
   },
   {
     span: 6,
-    field: 'unit_weight',
-    label: '重量'
+    field: 'unit_price',
+    label: '税后单价'
   },
   {
     span: 6,
-    field: 'spectral',
-    label: '分光'
+    field: 'good_code',
+    label: '商品代码'
   },
   {
     field: 'cat_name',
     label: '进项类目',
-    span: 24
-  }
+    span: 12,
+    render(_, { cat_code, cat_name, short_name}) {
+      return `${cat_code}-${cat_name}-${short_name}`
+    }
+  },
+  {
+    label: '进项税率',
+    span: 6,
+    render(_, { cat_tax }){
+      return cat_tax + '%'
+    }
+  },
+  {
+    span: 6,
+    field: 'spectral',
+    label: '分光'
+  },
 ]
 
 

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

@@ -58,6 +58,7 @@ const contentConfig: ContentConfig = {
   columns,
   title: "商品管理",
   permissions: ["007"],
+  companyProp: 'company_code',
   apis: {
     httpList: (parameter = {}) => {
       let { fz_date, ...other } = parameter