build

src/components/ReconciliationForm/src/cpns/batch-mode.vue

@@ -58,7 +58,7 @@ function handleEnter() {
   }
 
   const parameter = { size: 100, companyNo: props.companyNo, supplierNo: props.supplierNo, is_comon: props.isComon  }
-  searchType.value[searchType.value == '2' ? 'cgdNoArr' : 'qrdNoArr'] = cgdNoArr
+  parameter[searchType.value == '2' ? 'cgdNoArr' : 'qrdNoArr'] = cgdNoArr
   run(httpBatch(parameter));
   sourceText.value = "";
 }

src/components/ReconciliationForm/src/cpns/purchase-table.vue

@@ -168,56 +168,6 @@ defineExpose({
         :prop="edit ? 'sequenceNo' : 'qrdCode'"
         width="150"
       />
-      
-      <template v-if="readonly">
-        <ElTableColumn 
-        label="类目编码"
-        show-overflow-tooltip
-        width="120"
-      >
-        <template #default="{ row }">
-          <span v-if="row.orderTax && row.orderTax.length !== 0">
-            {{ row.orderTax[0].cat_code }}
-          </span>
-        </template>
-       </ElTableColumn>
-
-      <ElTableColumn 
-        label="货物和劳务名称"
-        show-overflow-tooltip
-        width="130"
-      >
-        <template #default="{ row }">
-          <span v-if="row.orderTax && row.orderTax.length !== 0">
-            {{ row.orderTax[0].cat_name }}
-          </span>
-        </template>
-      </ElTableColumn>
-      
-      <ElTableColumn 
-        label="商品和服务分类简称"
-        show-overflow-tooltip
-        width="160"
-      >
-        <template #default="{ row }">
-          <span v-if="row.orderTax && row.orderTax.length !== 0">
-            {{ row.orderTax[0].short_name }}
-          </span>
-        </template>
-      </ElTableColumn>
-
-      <ElTableColumn 
-        label="开票商品名称"
-        show-overflow-tooltip
-        width="130"
-      >
-      <template #default="{ row }">
-          <span v-if="row.orderTax && row.orderTax.length !== 0">
-            {{ row.orderTax[0].inv_good_name }}
-          </span>
-        </template>
-     </ElTableColumn>
-      </template>
 
       <ElTableColumn
         :label="edit ? '销售主单号' : '采购主单号'"
@@ -234,6 +184,69 @@ defineExpose({
         width="165"
       />
 
+
+      <ElTableColumn label="类目信息">
+        <ElTableColumn 
+           label="类目编码"
+           show-overflow-tooltip
+           width="120"
+         >
+           <template #default="{ row }">
+             <span v-if="row.orderTax">
+               {{ row.orderTax.cat_code }}
+             </span>
+           </template>
+          </ElTableColumn>
+        
+         <ElTableColumn 
+           label="货物和劳务名称"
+           show-overflow-tooltip
+           width="130"
+         >
+           <template #default="{ row }">
+             <span v-if="row.orderTax">
+               {{ row.orderTax.cat_name }}
+             </span>
+           </template>
+         </ElTableColumn>
+
+         <ElTableColumn 
+           label="商品和服务分类简称"
+           show-overflow-tooltip
+           width="160"
+         >
+           <template #default="{ row }">
+             <span v-if="row.orderTax">
+               {{ row.orderTax.short_name }}
+             </span>
+           </template>
+         </ElTableColumn>
+       
+         <ElTableColumn 
+           label="开票商品名称"
+           show-overflow-tooltip
+           width="130"
+         >
+         <template #default="{ row }">
+             <span v-if="row.orderTax">
+               {{ row.orderTax.inv_good_name }}
+             </span>
+           </template>
+        </ElTableColumn>
+      
+        <ElTableColumn
+           label="开票税率"
+           show-overflow-tooltip
+           width="80"
+         >
+         <template #default="{ row }">
+             <span v-if="row.orderTax">
+               {{ row.orderTax.tax ?   row.orderTax.tax + '%' : '' }}
+             </span>
+           </template>
+        </ElTableColumn>
+      </ElTableColumn>
+
       <ElTableColumn label="采购单信息" v-if="!edit">
         <ElTableColumn
           v-if="!edit"

src/components/ReconciliationForm/src/cpns/single-mode.vue

@@ -278,6 +278,68 @@ onMounted(() => {
       show-overflow-tooltip
       width="150"
     />
+    <ElTableColumn label="类目信息">
+      <ElTableColumn 
+           label="类目编码"
+           show-overflow-tooltip
+           width="120"
+         >
+           <template #default="{ row }">
+             <span v-if="row.orderTax">
+               {{ row.orderTax.cat_code }}
+             </span>
+           </template>
+          </ElTableColumn>
+        
+         <ElTableColumn 
+           label="货物和劳务名称"
+           show-overflow-tooltip
+           width="130"
+         >
+           <template #default="{ row }">
+             <span v-if="row.orderTax">
+               {{ row.orderTax.cat_name }}
+             </span>
+           </template>
+         </ElTableColumn>
+
+         <ElTableColumn 
+           label="商品和服务分类简称"
+           show-overflow-tooltip
+           width="160"
+         >
+           <template #default="{ row }">
+             <span v-if="row.orderTax">
+               {{ row.orderTax.short_name }}
+             </span>
+           </template>
+         </ElTableColumn>
+       
+         <ElTableColumn 
+           label="开票商品名称"
+           show-overflow-tooltip
+           width="130"
+         >
+         <template #default="{ row }">
+             <span v-if="row.orderTax">
+               {{ row.orderTax.inv_good_name }}
+             </span>
+           </template>
+        </ElTableColumn>
+      
+        <ElTableColumn
+           label="开票税率"
+           show-overflow-tooltip
+           width="80"
+         >
+         <template #default="{ row }">
+             <span v-if="row.orderTax">
+               {{ row.orderTax.tax ?   row.orderTax.tax + '%' : '' }}
+             </span>
+           </template>
+        </ElTableColumn>
+      </ElTableColumn>
+
     <ElTableColumn label="采购单信息">
       <ElTableColumn
         label="供货商"
@@ -314,10 +376,7 @@ onMounted(() => {
         show-overflow-tooltip
       >
         <template #default="{ row }">
-          <ElTag size="small">{{
-            send_status_list.find(s => s.value === String(row.sendStatus))
-              ?.label
-          }}</ElTag>
+          <ElTag size="small">{{ send_status_list.find(s => s.value === String(row.sendStatus))?.label }}</ElTag>
         </template>
       </ElTableColumn>
 

src/utils/details/_purchase/porder.ts

@@ -284,7 +284,7 @@ export const purchaseOrderNotIncludeProduceColumns: DescriptionColumns = [
     render(_, context){
       if(!context || !context.orderTax) return ''
       if(context.orderTax.length === 0) return ''
-      const {cat_code, cat_name, tax, short_name } = context.orderTax[0] || {}
+      const {cat_code, cat_name, tax, short_name } = context.orderTax || {}
       return cat_code + '-' + cat_name + '-' +short_name  + '-' + tax + '%'
     }
   },
@@ -293,7 +293,7 @@ export const purchaseOrderNotIncludeProduceColumns: DescriptionColumns = [
     span: 18,
     render(_, context){
       if(!context || !context.orderTax) return ''
-      const { inv_good_name } = context.orderTax[0] || {}
+      const { inv_good_name } = context.orderTax || {}
       return inv_good_name
     }
   },

src/utils/details/inv-open.ts

@@ -364,6 +364,61 @@ export const INV_OPEN_COLUMNS: DescriptionColumns = [
                 default: ({ row }) => row.tax + "%"
               }
             ),
+            h(
+              ElTableColumn,
+              {
+                showOverflowTooltip: true,
+                label: "类目编码",
+                width: "120px"
+              },
+              {
+                default: ({ row }) => (row.orderTax && !Array.isArray(row.orderTax)) ? row.orderTax.cat_code : '--'
+              }
+            ),
+            h(
+              ElTableColumn,
+              {
+                showOverflowTooltip: true,
+                label: "货物和劳务名称",
+                width: "130px"
+              },
+              {
+                default: ({ row }) => (row.orderTax && !Array.isArray(row.orderTax)) ? row.orderTax.cat_name : '--'
+              }
+            ),
+            h(
+              ElTableColumn,
+              {
+                showOverflowTooltip: true,
+                label: "商品和服务分类简称",
+                width: "130px"
+              },
+              {
+                default: ({ row }) => (row.orderTax && !Array.isArray(row.orderTax)) ? row.orderTax.short_name : '--'
+              }
+            ),
+            h(
+              ElTableColumn,
+              {
+                showOverflowTooltip: true,
+                label: "开票商品名称",
+                width: "130px"
+              },
+              {
+                default: ({ row }) => (row.orderTax && !Array.isArray(row.orderTax)) ? row.orderTax.inv_good_name : '--'
+              }
+            ),
+            h(
+              ElTableColumn,
+              {
+                showOverflowTooltip: true,
+                label: "开票税率",
+                width: "130px"
+              },
+              {
+                default: ({ row }) => (row.orderTax && !Array.isArray(row.orderTax)) ? row.orderTax.tax : '--'
+              }
+            ),
             h(ElTableColumn, {
               prop: "goodPrice",
               label: "商品单价",

src/utils/details/sale.ts

@@ -229,7 +229,7 @@ export const ORDER_COLUMNS: DescriptionColumns = [
       render(_, context){
         if(!context || !context.orderTax) return ''
         if(context.orderTax.length === 0) return ''
-        const {cat_code, cat_name, tax, short_name } = context.orderTax[0] || {}
+        const {cat_code, cat_name, tax, short_name } = context.orderTax || {}
         return cat_code + '-' + cat_name + '-' +short_name  + '-' + tax + '%'
       }
     },
@@ -238,7 +238,7 @@ export const ORDER_COLUMNS: DescriptionColumns = [
       span: 18,
       render(_, context){
         if(!context || !context.orderTax) return ''
-        const { inv_good_name } = context.orderTax[0] || {}
+        const { inv_good_name } = context.orderTax || {}
         return inv_good_name
       }
     },

src/views/InvoiceSales/currentcyOrderRecord/components/order-form.vue

@@ -132,6 +132,27 @@ watch(() => platform_type.value, () => list.value = []);
         <ElTableColumn label="申请人" prop="apply_name" width="100px" show-overflow-tooltip />
         <ElTableColumn label="商品编号" min-width="160" prop="goodNo" show-overflow-tooltip />
         <ElTableColumn label="商品名称" min-width="160" prop="goodName" show-overflow-tooltip />
+        <ElTableColumn label="类目编码" min-width="130" show-overflow-tooltip>
+          <template #default="scope">
+            {{ scope.row.good ? scope.row.good.cgd_inv_cat_code : '' }}
+          </template>
+        </ElTableColumn>
+        <ElTableColumn label="货物和劳务名称" min-width="130" show-overflow-tooltip>
+          <template #default="scope">
+            {{ scope.row.good ? scope.row.good.cgd_inv_cat_name : '' }}
+          </template>
+        </ElTableColumn>
+        <ElTableColumn label="开票商品名称" min-width="160" show-overflow-tooltip>
+          <template #default="scope">
+            {{ scope.row.good ? scope.row.good.cgd_inv_good_name : '' }}
+          </template>
+        </ElTableColumn>
+        <ElTableColumn label="开票税率" min-width="80" show-overflow-tooltip>
+          <template #default="scope">
+            {{ scope.row.good ? scope.row.good.cgd_inv_tax : '' }}
+          </template>
+        </ElTableColumn>
+
         <ElTableColumn label="卖出方公司" min-width="160" prop="companyName" show-overflow-tooltip />
         <ElTableColumn label="下单数量" width="80" prop="goodNum" show-overflow-tooltip>
           <template #default="scope">{{ scope.row.qrd ? scope.row.qrd.goodNum : "" }}</template>

src/views/InvoiceSales/currentcyOrderRecord/components/single.vue

@@ -104,6 +104,27 @@ defineExpose({
     <ElTableColumn label="销售订单主编号" min-width="160" prop="cxCode" show-overflow-tooltip />
     <ElTableColumn label="商品编号" min-width="160" prop="goodNo" show-overflow-tooltip />
     <ElTableColumn label="商品名称" min-width="160" prop="goodName" show-overflow-tooltip />
+    <ElTableColumn label="类目编码" min-width="130" show-overflow-tooltip>
+      <template #default="scope">
+        {{ scope.row.good ? scope.row.good.cgd_inv_cat_code : '' }}
+      </template>
+    </ElTableColumn>
+    <ElTableColumn label="货物和劳务名称" min-width="130" show-overflow-tooltip>
+      <template #default="scope">
+        {{ scope.row.good ? scope.row.good.cgd_inv_cat_name : '' }}
+      </template>
+    </ElTableColumn>
+    <ElTableColumn label="开票商品名称" min-width="160" show-overflow-tooltip>
+      <template #default="scope">
+        {{ scope.row.good ? scope.row.good.cgd_inv_good_name : '' }}
+      </template>
+    </ElTableColumn>
+    <ElTableColumn label="开票税率" min-width="80" show-overflow-tooltip>
+      <template #default="scope">
+        {{ scope.row.good ? scope.row.good.cgd_inv_tax : '' }}
+      </template>
+    </ElTableColumn>
+
     <ElTableColumn label="申请人" prop="apply_name" width="100px" show-overflow-tooltip />
     <ElTableColumn label="买入方公司" min-width="160" prop="customerName" show-overflow-tooltip />
     <ElTableColumn label="卖出方公司" min-width="160" prop="companyName" show-overflow-tooltip />

src/views/purchase/porder/config/xls-template.ts

@@ -12,6 +12,11 @@ export const template = {
   商品编码: "",
   商品名称: "",
   税率: "",
+  类目编码: "",
+  货物和劳务名称: "",
+  商品和服务分类简称: "",
+  开票税率: "",
+  开票类型: "",
   商品数量: "",
   商品单价: "",
   商品总价: "",

src/views/purchase/porder/index.vue

@@ -77,10 +77,16 @@ async function handleExport() {
           .label || ""
       : "";
 
-    _template["支付方式"] = item.pay_type;
+
     _template["商品编码"] = item.goodNo;
     _template["商品名称"] = item.goodName;
+    _template["商品名称"] = item.goodName;
     _template["税率"] = item.tax;
+    _template["类目编码"] = item.orderTax ? item.orderTax.cat_code : '';
+    _template["货物和劳务名称"] = item.orderTax ? item.orderTax.cat_name : '';
+    _template["商品和服务分类简称"] = item.orderTax ? item.orderTax.short_name : '';
+    _template["开票税率"] = item.orderTax ? item.orderTax.tax ? item.orderTax.tax + '%' : '' : '';
+    _template["开票类型"] = item.orderTax ? item.open_type == '1' ? '原商品开票' : item.open_type === '2' ? '子商品开票' : '' : '';
     _template["商品数量"] = item.goodNum;
     _template["商品单价"] = item.goodPrice;
     _template["商品总价"] = item.totalPrice;