build

src/utils/status.ts

@@ -312,6 +312,11 @@ export const orderTypeCgOptions = [
   { value: '2', label: '源头订单' }
 ]
 
+export const orderTypeCgOptions_2 = [
+  { value: '0', label: '采购订单' },
+  { value: '2', label: '源头订单' }
+]
+
 
 export const sendPurchPayStatusOptions = [
   { value: "1", label: "业务公司业务审核" },

src/views/InvoiceSaleSettings/commodityCost/config/configs.ts

@@ -117,16 +117,22 @@ export const good_detail_columns = [
   {
     field: "companyName",
     label: "业务公司名称",
-    render: (companyName, { companyNo }) =>
+    render: (_, { companyNo, companyName }) =>
       createTooltip(companyName, "业务公司编码 : " + companyNo, 270),
-    span: 12
+    span: 8
   },
   {
     field: "supplierName",
     label: "供应商名称",
-    render: (supplierName, { supplierNo }) =>
+    render: (_, { supplierNo, supplierName }) =>
       createTooltip(supplierName, "供应商编码 : " + supplierNo, 270),
-    span: 12
+    span: 8
+  },
+  {
+    label: "源头供应商",
+    render: (_, { cgd_supplierNo, cgd_supplierName }) =>
+      createTooltip(cgd_supplierName, "供应商编码 : " + cgd_supplierNo, 270),
+    span: 8
   },
 
   {

src/views/InvoiceSaleSettings/consultingChildCost/config/configs.ts

@@ -121,18 +121,23 @@ export const good_detail_columns = [
   {
     field: "companyName",
     label: "业务公司名称",
-    render: (_, { suppierName, supplierNo }) =>
-      createTooltip(suppierName, "业务公司编码 : " + supplierNo, 270),
-    span: 12
+    render: (_, { companyNo, companyName }) =>
+      createTooltip(companyName, "业务公司编码 : " + companyNo, 270),
+    span: 8
   },
   {
     field: "supplierName",
     label: "供应商名称",
+    render: (_, { supplierNo, supplierName }) =>
+      createTooltip(supplierName, "供应商编码 : " + supplierNo, 270),
+    span: 8
+  },
+  {
+    label: "源头供应商",
     render: (_, { cgd_supplierNo, cgd_supplierName }) =>
       createTooltip(cgd_supplierName, "供应商编码 : " + cgd_supplierNo, 270),
-    span: 12
+    span: 8
   },
-
   {
     field: "cat_name",
     span: 12,

src/views/InvoiceSaleSettings/consultingChildCost/detail.vue

@@ -29,12 +29,6 @@ onMounted(() => requesetGoodDetail());
 </script>
 
 <template>
-  <BasicSettings
-    title="咨询成交子商品类目设置"
-    back-route="/InvoiceSaleSettings/consultingCost"
-    :detail="goodDetail"
-    :columns="good_detail_columns"
-    @refresh="requesetGoodDetail()"
-    pageName="consultingChildCostDetail"
-  />
+  <BasicSettings title="咨询成交子商品类目设置" back-route="/InvoiceSaleSettings/consultingChildCost" :detail="goodDetail"
+    :columns="good_detail_columns" @refresh="requesetGoodDetail()" pageName="consultingChildCostDetail" />
 </template>

src/views/InvoiceSaleSettings/consultingChildCost/index.vue

@@ -39,7 +39,7 @@ const { currentCompany } = useCompany()
 
 function toDetail(spuCode) {
   push({
-    path: "/InvoiceSaleSettings/consultingCostDetail",
+    path: "/InvoiceSaleSettings/consultingChildCostDetail",
     query: { id: spuCode }
   });
 }

src/views/InvoiceSaleSettings/consultingCost/config/configs.ts

@@ -121,18 +121,23 @@ export const good_detail_columns = [
   {
     field: "companyName",
     label: "业务公司名称",
-    render: (companyName, { companyNo }) =>
+    render: (_, { companyNo, companyName }) =>
       createTooltip(companyName, "业务公司编码 : " + companyNo, 270),
-    span: 12
+    span: 8
   },
   {
     field: "supplierName",
     label: "供应商名称",
-    render: (supplierName, { supplierNo }) =>
+    render: (_, { supplierNo, supplierName }) =>
       createTooltip(supplierName, "供应商编码 : " + supplierNo, 270),
-    span: 12
+    span: 8
+  },
+  {
+    label: "源头供应商",
+    render: (_, { cgd_supplierNo, cgd_supplierName }) =>
+      createTooltip(cgd_supplierName, "供应商编码 : " + cgd_supplierNo, 270),
+    span: 8
   },
-
   {
     field: "cat_name",
     span: 12,

src/views/purchase/purchPay/component/choose-modal.vue

@@ -8,6 +8,8 @@ import { useCompany } from "/@/hooks/core/useCompany";
 import { payStatusOptions, tagOptions } from "/@/utils/status";
 import { SupplierQuery, DateRange } from "/@/components/BasicForm";
 
+import { orderTypeCgOptions } from "/@/utils/status";
+
 const emit = defineEmits(["choose"]);
 
 const visible = ref(false);
@@ -24,6 +26,7 @@ const pagination = reactive({
 });
 
 const formData = ref<Record<string, any>>({
+  is_comon: '0',
   pay_status: "0",
   supplierNo: "",
   currentValue: "",
@@ -92,6 +95,7 @@ function handleSizeChange() {
 function handleSearch(_isReset?: boolean) {
   if (_isReset) {
     formData.value = {
+      is_comon: '0',
       pay_status: "0",
       supplierNo: "",
       currentValue: "",
@@ -110,24 +114,13 @@ defineExpose({
 </script>
 
 <template>
-  <el-dialog
-    top="10vh"
-    :close-on-click-modal="false"
-    v-model="visible"
-    title="订单对账"
-    center
-    width="1040px"
-    @open="() => requestPaymentList()"
-  >
+  <el-dialog top="10vh" :close-on-click-modal="false" v-model="visible" title="订单对账" center width="1040px"
+    @open="() => requestPaymentList()">
     <el-form size="small">
       <el-row :gutter="8">
         <el-col :span="8">
           <el-form-item>
-            <el-input
-              clearable
-              v-model="formData.currentValue"
-              placeholder="请输入"
-            >
+            <el-input clearable v-model="formData.currentValue" placeholder="请输入">
               <template #prepend>
                 <el-select v-model="currentKey" style="width: 130px">
                   <el-option label="对账编码" value="payNo" />
@@ -142,19 +135,12 @@ defineExpose({
         </el-col>
 
         <el-col :span="8">
-          <supplier-query
-            v-model="formData.supplierNo"
-            placeholder="卖出方公司"
-          />
+          <supplier-query v-model="formData.supplierNo" placeholder="卖出方公司" />
         </el-col>
 
         <el-col :span="6">
           <el-form-item>
-            <el-select
-              w-80
-              v-model="formData.pay_status"
-              placeholder="付款状态"
-            >
+            <el-select w-80 v-model="formData.pay_status" placeholder="付款状态">
               <el-option value="0" label="未付款或部分付款" />
               <el-option value="1" label="未付款" />
               <el-option value="2" label="部分付款" />
@@ -165,50 +151,40 @@ defineExpose({
         <el-col :span="6">
           <el-form-item>
             <el-select w-80 v-model="formData.tag_id" placeholder="标签状态">
-              <el-option
-                v-for="tag in tagOptions"
-                :key="tag.value"
-                :value="tag.value"
-                :label="tag.label"
-              />
+              <el-option v-for="tag in tagOptions" :key="tag.value" :value="tag.value" :label="tag.label" />
             </el-select>
           </el-form-item>
         </el-col>
 
-        <el-col :span="12">
+        <el-col :span="6">
+          <el-select v-model="formData.is_comon" style="width: 155px" placeholder="业务类型">
+            <el-option v-for="option in orderTypeCgOptions" :label="option.label" :value="option.value" />
+          </el-select>
+        </el-col>
+
+        <el-col :span="6">
           <el-form-item>
-            <el-button type="primary" @click="() => handleSearch()"
-              >搜索</el-button
-            >
+            <el-button type="primary" @click="() => handleSearch()">搜索</el-button>
             <el-button @click="() => handleSearch(true)">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
 
-    <el-table
-      border
-      ref="tableRef"
-      :data="paymentList"
-      size="small"
-      row-key="id"
-      @selection-change="handleSelectionChange"
-      mb-2
-      v-loading="loading"
-      max-height="520px"
-    >
+    <el-table border ref="tableRef" :data="paymentList" size="small" row-key="id"
+      @selection-change="handleSelectionChange" mb-2 v-loading="loading" max-height="520px">
       <el-table-column type="selection" align="center" width="40" />
-      <el-table-column
-        v-for="(col, index) in columns"
-        :key="index"
-        v-bind="col"
-        show-overflow-tooltip
-      >
+      <el-table-column v-for="(col, index) in columns" :key="index" v-bind="col" show-overflow-tooltip>
         <template #="{ row }">
           <el-tag v-if="col.prop === 'pay_status'" size="small">{{
-            payStatusOptions.find(p => p.value === String(row.pay_status))
-              ?.label
-          }}</el-tag>
+    payStatusOptions.find(p => p.value === String(row.pay_status))
+      ?.label
+  }}</el-tag>
+
+
+          <el-tag v-else-if="col.prop === 'is_comon'">{{
+    orderTypeCgOptions.find(p => p.value === row.is_comon)?.label
+  }}</el-tag>
 
           <span v-else>{{ row[col.prop] }}</span>
         </template>
@@ -216,15 +192,9 @@ defineExpose({
     </el-table>
 
     <div flex>
-      <el-pagination
-        v-model:current-page="pagination.page"
-        v-model:page-size="pagination.size"
-        :total="pagination.total"
-        :page-sizes="[15, 50, 100]"
-        layout="sizes, prev, pager, next"
-        @current-change="requestPaymentList"
-        @size-change="handleSizeChange"
-      />
+      <el-pagination v-model:current-page="pagination.page" v-model:page-size="pagination.size"
+        :total="pagination.total" :page-sizes="[15, 50, 100]" layout="sizes, prev, pager, next"
+        @current-change="requestPaymentList" @size-change="handleSizeChange" />
 
       <div w-full flex justify-end mt-2>
         <el-button type="primary" size="small" @click="handleConfirm">

src/views/purchase/purchPay/config/_details.ts

@@ -5,6 +5,11 @@ export const columns = [
     minWidth: 160,
     align: "left"
   },
+  {
+    label: "业务类型",
+    prop: "is_comon",
+    minWidth: 100
+  },
   {
     label: "供应商编码",
     prop: "supplierNo",

src/views/purchase/ticketReturn/components/choose-modal.vue

@@ -8,6 +8,7 @@ import { useCompany } from "/@/hooks/core/useCompany";
 import { payStatusOptions, tagOptions } from "/@/utils/status";
 import { SupplierQuery, DateRange } from "/@/components/BasicForm";
 import { invStatusOptions } from "../../orderRecordQuery/config/_options";
+import { orderTypeCgOptions_2 } from "/@/utils/status";
 
 const emit = defineEmits(["choose"]);
 
@@ -94,6 +95,7 @@ function handleSizeChange() {
 function handleSearch(_isReset?: boolean) {
   if (_isReset) {
     formData.value = {
+      is_comon: '0',
       inv_status: "0",
       supplierNo: "",
       currentValue: "",
@@ -175,6 +177,16 @@ defineExpose({
           </el-form-item>
         </el-col>
 
+        <el-col :span="6">
+            <el-select v-model="formData.is_comon" style="width: 155px" placeholder="业务类型">
+               <el-option 
+                v-for="option in orderTypeCgOptions_2" 
+                :label="option.label" 
+                :value="option.value" 
+              />
+            </el-select>
+        </el-col>
+
         <el-col :span="12">
           <el-form-item>
             <el-button type="primary" @click="() => handleSearch()"
@@ -210,6 +222,10 @@ defineExpose({
               ?.label
           }}</el-tag>
 
+<el-tag v-else-if="col.prop === 'is_comon'">{{
+    orderTypeCgOptions_2.find(p => p.value === row.is_comon)?.label
+  }}</el-tag>
+
           <span v-else>{{ row[col.prop] }}</span>
         </template>
       </el-table-column>

src/views/purchase/ticketReturn/config/_details.ts

@@ -5,6 +5,11 @@ export const columns = [
     minWidth: 160,
     align: "left"
   },
+  {
+    label: "业务类型",
+    prop: "is_comon",
+    width: 100
+  },
   {
     label: "供应商编码",
     prop: "supplierNo",

src/views/purchase/ticketReturnRelive/components/choose-modal.vue

@@ -7,6 +7,7 @@ import { checkTypeOptions, payStatusOptions } from "/@/utils/status";
 import { httpList } from "/@/api/purchase/ticketReturn";
 import { useCompany } from "/@/hooks/core/useCompany";
 import { SupplierQuery, DateRange } from "/@/components/BasicForm";
+import { orderTypeCgOptions_2 } from "/@/utils/status"
 
 const emit = defineEmits(["choose"]);
 
@@ -22,6 +23,7 @@ const pagination = reactive({
 });
 
 const formData = ref<Record<string, any>>({
+  is_comon: '0',
   apply_name: "",
   currentValue: "",
   supplierNo: "",
@@ -46,7 +48,6 @@ async function requestPaymentList() {
 
   const { code, message, data } = await httpList({
     status: "4",
-    "is_comon": "0",
     [currentKey.value]: currentValue,
     companyNo: currentCompany.value.companyNo,
     open_start: openTimer[0],
@@ -96,6 +97,7 @@ function handleSizeChange() {
 function handleSearch(_isReset?: boolean) {
   if (_isReset) {
     formData.value = {
+      is_comon: '0',
       apply_name: "",
       currentValue: "",
       supplierNo: "",
@@ -115,14 +117,8 @@ defineExpose({
 </script>
 
 <template>
-  <el-dialog
-    :close-on-click-modal="false"
-    v-model="visible"
-    title="采购回票"
-    center
-    width="1040px"
-    @open="() => requestPaymentList()"
-  >
+  <el-dialog :close-on-click-modal="false" v-model="visible" title="采购回票" center width="1040px"
+    @open="() => requestPaymentList()">
     <el-form size="small">
       <el-row :gutter="10">
         <el-col :span="8">
@@ -134,18 +130,11 @@ defineExpose({
         </el-col>
 
         <el-col :span="8">
-          <supplier-query
-            v-model="formData.supplierNo"
-            placeholder="卖出方公司名称"
-          />
+          <supplier-query v-model="formData.supplierNo" placeholder="卖出方公司名称" />
         </el-col>
         <el-col :span="8">
           <el-form-item>
-            <el-input
-              clearable
-              v-model="formData.currentValue"
-              placeholder="关键字"
-            >
+            <el-input clearable v-model="formData.currentValue" placeholder="关键字">
               <template #prepend>
                 <el-select v-model="currentKey" style="width: 140px">
                   <el-option label="对账回票申请编码" value="hpNo" />
@@ -156,17 +145,8 @@ defineExpose({
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-select
-            style="width: 100%"
-            v-model="formData.checkApi"
-            placeholder="发票查验方式"
-          >
-            <el-option
-              v-for="opt in checkTypeOptions"
-              :key="opt.value"
-              :value="opt.value"
-              :label="opt.label"
-            />
+          <el-select style="width: 100%" v-model="formData.checkApi" placeholder="发票查验方式">
+            <el-option v-for="opt in checkTypeOptions" :key="opt.value" :value="opt.value" :label="opt.label" />
           </el-select>
         </el-col>
 
@@ -176,43 +156,36 @@ defineExpose({
           </el-form-item>
         </el-col>
 
+        <el-col :span="6">
+          <el-select v-model="formData.is_comon" style="width: 155px" placeholder="业务类型">
+            <el-option v-for="option in orderTypeCgOptions_2" :label="option.label" :value="option.value" />
+          </el-select>
+        </el-col>
+
         <el-col :span="4">
           <el-form-item>
-            <el-button type="primary" @click="() => handleSearch()"
-              >搜索</el-button
-            >
+            <el-button type="primary" @click="() => handleSearch()">搜索</el-button>
             <el-button @click="() => handleSearch(true)">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
-    <el-table
-      border
-      ref="tableRef"
-      :data="paymentList"
-      size="small"
-      row-key="id"
-      @selection-change="handleSelectionChange"
-      mb-2
-      max-height="520px"
-      v-loading="loading"
-    >
+    <el-table border ref="tableRef" :data="paymentList" size="small" row-key="id"
+      @selection-change="handleSelectionChange" mb-2 max-height="520px" v-loading="loading">
       <el-table-column type="selection" width="40" align="center" />
-      <el-table-column
-        v-for="(col, index) in columns"
-        :key="index"
-        v-bind="col"
-        show-overflow-tooltip
-      >
+      <el-table-column v-for="(col, index) in columns" :key="index" v-bind="col" show-overflow-tooltip>
         <template #="{ row }">
           <el-tag v-if="col.prop === 'pay_status'" size="small">{{
-            payStatusOptions.find(p => p.value === String(row.pay_status))
-              ?.label
-          }}</el-tag>
+    payStatusOptions.find(p => p.value === String(row.pay_status))
+      ?.label
+  }}</el-tag>
 
           <el-tag v-else-if="col.prop === 'checkApi'" size="small">{{
-            checkTypeOptions.find(p => p.value === String(row.checkApi))?.label
-          }}</el-tag>
+    checkTypeOptions.find(p => p.value === String(row.checkApi))?.label
+  }}</el-tag>
+          <el-tag v-else-if="col.prop === 'is_comon'">{{
+    orderTypeCgOptions_2.find(p => p.value === row.is_comon)?.label
+  }}</el-tag>
 
           <span v-else>{{ row[col.prop] }}</span>
         </template>
@@ -220,15 +193,9 @@ defineExpose({
     </el-table>
 
     <div flex>
-      <el-pagination
-        v-model:current-page="pagination.page"
-        v-model:page-size="pagination.size"
-        :total="pagination.total"
-        @current-change="requestPaymentList"
-        :page-sizes="[15, 50, 100]"
-        @size-change="handleSizeChange"
-        layout="sizes, prev, pager, next"
-      />
+      <el-pagination v-model:current-page="pagination.page" v-model:page-size="pagination.size"
+        :total="pagination.total" @current-change="requestPaymentList" :page-sizes="[15, 50, 100]"
+        @size-change="handleSizeChange" layout="sizes, prev, pager, next" />
 
       <div w-full flex justify-end mt-2>
         <el-button type="primary" @click="handleConfirm">保存</el-button>

src/views/purchase/ticketReturnRelive/config/_details.ts

@@ -11,6 +11,11 @@ export const columns = [
     minWidth: 160,
     align: "left"
   },
+  {
+    label: "业务类型",
+    prop: "is_comon",
+    width: 100
+  },
   {
     label: "卖方公司编码",
     prop: "supplierNo",

src/views/supply/purchPay/component/choose-modal.vue

@@ -7,6 +7,8 @@ import { httpList } from "/@/api/purchase/orderRecord";
 import { useCompany } from "/@/hooks/core/useCompany";
 import { payStatusOptions, tagOptions } from "/@/utils/status";
 import { BusinessQuery, DateRange } from "/@/components/BasicForm";
+import { orderTypeCgOptions } from "/@/utils/status";
+
 
 const emit = defineEmits(["choose"]);
 
@@ -24,6 +26,7 @@ const pagination = reactive({
 });
 
 const formData = ref<Record<string, any>>({
+  is_comon: '0',
   pay_status: "0",
   companyNo: "",
   currentValue: "",
@@ -44,7 +47,6 @@ async function requestPaymentList() {
   const { currentValue, timer, ...otherParams } = formData.value;
 
   const { code, message, data } = await httpList({
-    is_comon: "0",
     pay_status: "0",
     status: "2",
     [currentKey.value]: currentValue,
@@ -94,6 +96,7 @@ function handleSizeChange() {
 function handleSearch(_isReset?: boolean) {
   if (_isReset) {
     formData.value = {
+      is_comon: '0',
       pay_status: "0",
       companyNo: "",
       currentValue: "",
@@ -112,23 +115,13 @@ defineExpose({
 </script>
 
 <template>
-  <el-dialog
-    @open="() => requestPaymentList()"
-    :close-on-click-modal="false"
-    v-model="visible"
-    title="订单对账"
-    width="1040px"
-    center
-  >
+  <el-dialog @open="() => requestPaymentList()" :close-on-click-modal="false" v-model="visible" title="订单对账"
+    width="1040px" center>
     <el-form size="small">
       <el-row :gutter="8">
         <el-col :span="8">
           <el-form-item>
-            <el-input
-              clearable
-              v-model="formData.currentValue"
-              placeholder="请输入"
-            >
+            <el-input clearable v-model="formData.currentValue" placeholder="请输入">
               <template #prepend>
                 <el-select v-model="currentKey" style="width: 130px">
                   <el-option label="对账编码" value="payNo" />
@@ -143,19 +136,12 @@ defineExpose({
         </el-col>
 
         <el-col :span="8">
-          <business-query
-            v-model="formData.companyNo"
-            placeholder="买入方公司"
-          />
+          <business-query v-model="formData.companyNo" placeholder="买入方公司" />
         </el-col>
 
         <el-col :span="6">
           <el-form-item>
-            <el-select
-              w-80
-              v-model="formData.pay_status"
-              placeholder="付款状态"
-            >
+            <el-select w-80 v-model="formData.pay_status" placeholder="付款状态">
               <el-option value="0" label="未付款或部分付款" />
               <el-option value="1" label="未付款" />
               <el-option value="2" label="部分付款" />
@@ -166,50 +152,41 @@ defineExpose({
         <el-col :span="6">
           <el-form-item>
             <el-select w-80 v-model="formData.tag_id" placeholder="标签状态">
-              <el-option
-                v-for="tag in tagOptions"
-                :key="tag.value"
-                :value="tag.value"
-                :label="tag.label"
-              />
+              <el-option v-for="tag in tagOptions" :key="tag.value" :value="tag.value" :label="tag.label" />
             </el-select>
           </el-form-item>
         </el-col>
 
-        <el-col :span="12">
+        <el-col :span="6">
+          <el-select v-model="formData.is_comon" style="width: 155px" placeholder="业务类型">
+            <el-option v-for="option in orderTypeCgOptions" :label="option.label" :value="option.value" />
+          </el-select>
+        </el-col>
+
+        <el-col :span="6">
           <el-form-item>
-            <el-button type="primary" @click="() => handleSearch()"
-              >搜索</el-button
-            >
+            <el-button type="primary" @click="() => handleSearch()">搜索</el-button>
             <el-button @click="() => handleSearch(true)">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
 
-    <el-table
-      border
-      ref="tableRef"
-      :data="paymentList"
-      size="small"
-      row-key="id"
-      @selection-change="handleSelectionChange"
-      mb-2
-      v-loading="loading"
-      max-height="520px"
-    >
+    <el-table border ref="tableRef" :data="paymentList" size="small" row-key="id"
+      @selection-change="handleSelectionChange" mb-2 v-loading="loading" max-height="520px">
       <el-table-column type="selection" align="center" width="40" />
-      <el-table-column
-        v-for="(col, index) in columns"
-        :key="index"
-        v-bind="col"
-        show-overflow-tooltip
-      >
+      <el-table-column v-for="(col, index) in columns" :key="index" v-bind="col" show-overflow-tooltip>
         <template #="{ row }">
           <el-tag v-if="col.prop === 'pay_status'">{{
-            payStatusOptions.find(p => p.value === String(row.pay_status))
-              ?.label
-          }}</el-tag>
+    payStatusOptions.find(p => p.value === String(row.pay_status))
+      ?.label
+  }}</el-tag>
+
+
+          <el-tag v-else-if="col.prop === 'is_comon'">{{
+    orderTypeCgOptions.find(p => p.value === row.is_comon)?.label
+  }}</el-tag>
+
 
           <span v-else>{{ row[col.prop] }}</span>
         </template>
@@ -217,20 +194,12 @@ defineExpose({
     </el-table>
 
     <div flex>
-      <el-pagination
-        v-model:current-page="pagination.page"
-        v-model:page-size="pagination.size"
-        :total="pagination.total"
-        :page-sizes="[15, 50, 100]"
-        layout="sizes, prev, pager, next"
-        @current-change="requestPaymentList"
-        @size-change="handleSizeChange"
-      />
+      <el-pagination v-model:current-page="pagination.page" v-model:page-size="pagination.size"
+        :total="pagination.total" :page-sizes="[15, 50, 100]" layout="sizes, prev, pager, next"
+        @current-change="requestPaymentList" @size-change="handleSizeChange" />
 
       <div w-full flex justify-end mt-2>
-        <el-button type="primary" size="small" @click="handleConfirm"
-          >保存</el-button
-        >
+        <el-button type="primary" size="small" @click="handleConfirm">保存</el-button>
       </div>
     </div>
   </el-dialog>

src/views/supply/purchPay/config/_details.ts

@@ -5,6 +5,11 @@ export const columns = [
     minWidth: 160,
     align: "left"
   },
+  {
+    label: "业务类型",
+    prop: "is_comon",
+    minWidth: 100
+  },
   {
     label: "供应商编码",
     prop: "supplierNo",

src/views/supply/purchPayRelive/component/choose-modal.vue

@@ -7,6 +7,7 @@ import { payStatusOptions } from "/@/utils/status";
 import { httpList } from "/@/api/purchase/orderPay";
 import { useCompany } from "/@/hooks/core/useCompany";
 import { BusinessQuery, DateRange } from "/@/components/BasicForm";
+import { orderTypeCgOptions } from "/@/utils/status";
 
 const emit = defineEmits(["choose"]);
 
@@ -22,6 +23,7 @@ const pagination = reactive({
 });
 
 const formData = ref<Record<string, any>>({
+  is_comon: "0",
   pay_status: "",
   currentValue: "",
   companyNo: "",
@@ -43,7 +45,6 @@ async function requestPaymentList() {
 
   const { code, message, data } = await httpList({
     status: "4",
-    "is_comon":"0",
     [currentKey.value]: currentValue,
     supplierNo: currentCompany.value.companyNo,
     startTime: timer[0],
@@ -91,6 +92,7 @@ function handleSizeChange() {
 function handleSearch(_isReset?: boolean) {
   if (_isReset) {
     formData.value = {
+      is_comon: "0",
       pay_status: "",
       currentValue: "",
       companyNo: "",
@@ -108,23 +110,13 @@ defineExpose({
 </script>
 
 <template>
-  <el-dialog
-    :close-on-click-modal="false"
-    v-model="visible"
-    title="采购付款"
-    center
-    width="1040px"
-    @open="() => requestPaymentList()"
-  >
+  <el-dialog :close-on-click-modal="false" v-model="visible" title="采购付款" center width="1040px"
+    @open="() => requestPaymentList()">
     <el-form size="small">
       <el-row :gutter="10">
         <el-col :span="8">
           <el-form-item>
-            <el-input
-              clearable
-              v-model="formData.currentValue"
-              placeholder="对账编码"
-            >
+            <el-input clearable v-model="formData.currentValue" placeholder="对账编码">
               <template #prepend>
                 <el-select v-model="currentKey" style="width: 135px">
                   <el-option label="对账付款编码" value="dzNo" />
@@ -140,52 +132,38 @@ defineExpose({
         </el-col>
 
         <el-col :span="8">
-          <BusinessQuery
-            v-model="formData.companyNo"
-            placeholder="买入方公司"
-          />
+          <BusinessQuery v-model="formData.companyNo" placeholder="买入方公司" />
+        </el-col>
+
+        <el-col :span="6">
+          <el-select v-model="formData.is_comon" style="width: 155px" placeholder="业务类型">
+            <el-option v-for="option in orderTypeCgOptions" :label="option.label" :value="option.value" />
+          </el-select>
         </el-col>
 
         <el-col :span="24">
           <div w-full flex justify-end>
             <el-form-item>
-              <el-button
-                size="small"
-                type="primary"
-                @click="() => handleSearch()"
-                >搜索</el-button
-              >
-              <el-button size="small" @click="() => handleSearch(true)"
-                >重置</el-button
-              >
+              <el-button size="small" type="primary" @click="() => handleSearch()">搜索</el-button>
+              <el-button size="small" @click="() => handleSearch(true)">重置</el-button>
             </el-form-item>
           </div>
         </el-col>
       </el-row>
     </el-form>
 
-    <el-table
-      border
-      ref="tableRef"
-      :data="paymentList"
-      size="small"
-      row-key="id"
-      @selection-change="handleSelectionChange"
-      mb-2
-      v-loading="loading"
-      max-height="520px"
-    >
+    <el-table border ref="tableRef" :data="paymentList" size="small" row-key="id"
+      @selection-change="handleSelectionChange" mb-2 v-loading="loading" max-height="520px">
       <el-table-column type="selection" align="center" width="40" />
-      <el-table-column
-        v-for="(col, index) in columns"
-        :key="index"
-        v-bind="col"
-        show-overflow-tooltip
-      >
+      <el-table-column v-for="(col, index) in columns" :key="index" v-bind="col" show-overflow-tooltip>
         <template #="{ row }">
           <el-tag v-if="col.prop === 'pay_status'">{{
-            payStatusOptions.find(p => p.value === row.pay_status)?.label
-          }}</el-tag>
+    payStatusOptions.find(p => p.value === row.pay_status)?.label
+  }}</el-tag>
+
+          <el-tag v-else-if="col.prop === 'is_comon'">{{
+    orderTypeCgOptions.find(p => p.value === row.is_comon)?.label
+  }}</el-tag>
 
           <span v-else>{{ row[col.prop] }}</span>
         </template>
@@ -193,15 +171,9 @@ defineExpose({
     </el-table>
 
     <div flex>
-      <el-pagination
-        v-model:current-page="pagination.page"
-        v-model:page-size="pagination.size"
-        :total="pagination.total"
-        :page-sizes="[15, 50, 100]"
-        layout="sizes, prev, pager, next"
-        @current-change="requestPaymentList"
-        @size-change="handleSizeChange"
-      />
+      <el-pagination v-model:current-page="pagination.page" v-model:page-size="pagination.size"
+        :total="pagination.total" :page-sizes="[15, 50, 100]" layout="sizes, prev, pager, next"
+        @current-change="requestPaymentList" @size-change="handleSizeChange" />
 
       <div w-full flex justify-end mt-2>
         <el-button type="primary" @click="handleConfirm">保存</el-button>

src/views/supply/purchPayRelive/config/_details.ts

@@ -11,6 +11,11 @@ export const columns = [
     minWidth: 160,
     align: "left"
   },
+  {
+    label: "业务类型",
+    prop: "is_comon",
+    minWidth: 100
+  },
   {
     label: "卖方公司编码",
     prop: "supplierNo",

src/views/supply/ticketReturn/components/choose-modal.vue

@@ -8,6 +8,7 @@ import { useCompany } from "/@/hooks/core/useCompany";
 import { tagOptions } from "/@/utils/status";
 import { BusinessQuery, DateRange } from "/@/components/BasicForm";
 import { invStatusOptions } from "../../orderRecordQuery/config/_options";
+import { orderTypeCgOptions_2 } from "/@/utils/status";
 
 const emit = defineEmits(["choose"]);
 
@@ -25,7 +26,7 @@ const pagination = reactive({
 });
 
 const formData = ref<Record<string, any>>({
-  is_comon: "0",
+  is_comon: '0',
   inv_status: "0",
   companyNo: "",
   currentValue: "",
@@ -46,7 +47,6 @@ async function requestPaymentList() {
   const { currentValue, timer, ...otherParams } = formData.value;
 
   const { code, message, data } = await httpList({
-    is_comon: "0",
     inv_status: "0",
     status: "2",
     [currentKey.value]: currentValue,
@@ -95,6 +95,7 @@ function handleSizeChange() {
 function handleSearch(_isReset?: boolean) {
   if (_isReset) {
     formData.value = {
+      is_comon: '0',
       inv_status: "0",
       companyNo: "",
       currentValue: "",
@@ -177,7 +178,17 @@ defineExpose({
           </el-form-item>
         </el-col>
 
-        <el-col :span="12">
+        <el-col :span="6">
+            <el-select v-model="formData.is_comon" style="width: 155px" placeholder="业务类型">
+               <el-option 
+                v-for="option in orderTypeCgOptions_2" 
+                :label="option.label" 
+                :value="option.value" 
+              />
+            </el-select>
+        </el-col>
+
+        <el-col :span="6">
           <el-form-item>
             <el-button type="primary" @click="() => handleSearch()"
               >搜索</el-button
@@ -212,6 +223,11 @@ defineExpose({
               ?.label
           }}</el-tag>
 
+          
+<el-tag v-else-if="col.prop === 'is_comon'">{{
+    orderTypeCgOptions_2.find(p => p.value === row.is_comon)?.label
+  }}</el-tag>
+
           <span v-else>{{ row[col.prop] }}</span>
         </template>
       </el-table-column>

src/views/supply/ticketReturn/config/_details.ts

@@ -5,6 +5,11 @@ export const columns = [
     minWidth: 160,
     align: "left"
   },
+  {
+    label: "业务类型",
+    prop: "is_comon",
+    width: 100
+  },
   {
     label: "供应商编码",
     prop: "supplierNo",

src/views/supply/ticketReturnRelive/components/choose-modal.vue

@@ -7,6 +7,7 @@ import { checkTypeOptions, payStatusOptions } from "/@/utils/status";
 import { httpList } from "/@/api/purchase/ticketReturn";
 import { useCompany } from "/@/hooks/core/useCompany";
 import { BusinessQuery, DateRange } from "/@/components/BasicForm";
+import { orderTypeCgOptions_2 } from "/@/utils/status";
 
 const emit = defineEmits(["choose"]);
 
@@ -22,6 +23,7 @@ const pagination = reactive({
 });
 
 const formData = ref<Record<string, any>>({
+  is_comon: '0',
   apply_name: "",
   currentValue: "",
   checkApi: "",
@@ -46,7 +48,6 @@ async function requestPaymentList() {
 
   const { code, message, data } = await httpList({
     status: "4",
-    is_comon: "0",
     [currentKey.value]: currentValue,
     supplierNo: currentCompany.value.companyNo,
     open_start: openTimer[0],
@@ -96,6 +97,7 @@ function handleSizeChange() {
 function handleSearch(_isReset?: boolean) {
   if (_isReset) {
     formData.value = {
+      is_comon: '0',
       companyNo: "",
       apply_name: "",
       currentValue: "",
@@ -178,6 +180,16 @@ defineExpose({
           </el-form-item>
         </el-col>
 
+        <el-col :span="6">
+            <el-select v-model="formData.is_comon" style="width: 155px" placeholder="业务类型">
+               <el-option 
+                v-for="option in orderTypeCgOptions_2" 
+                :label="option.label" 
+                :value="option.value" 
+              />
+            </el-select>
+        </el-col>
+
         <el-col :span="4">
           <el-form-item>
             <el-button type="primary" @click="() => handleSearch()"
@@ -216,6 +228,11 @@ defineExpose({
             checkTypeOptions.find(p => p.value === String(row.checkApi))?.label
           }}</el-tag>
 
+          
+<el-tag v-else-if="col.prop === 'is_comon'">{{
+    orderTypeCgOptions_2.find(p => p.value === row.is_comon)?.label
+  }}</el-tag>
+
           <span v-else>{{ row[col.prop] }}</span>
         </template>
       </el-table-column>

src/views/supply/ticketReturnRelive/config/_details.ts

@@ -11,6 +11,11 @@ export const columns = [
     minWidth: 160,
     align: "left"
   },
+  {
+    label: "业务类型",
+    prop: "is_comon",
+    width: 100
+  },
   {
     label: "卖方公司编码",
     prop: "supplierNo",

src/views/supplyInvoiceSaleSettings/supplyConsultingChildCost/config/configs.ts

@@ -121,16 +121,22 @@ export const good_detail_columns = [
   {
     field: "companyName",
     label: "业务公司名称",
-    render: (_, { suppierName, supplierNo }) =>
-      createTooltip(suppierName, "业务公司编码 : " + supplierNo, 270),
-    span: 12
+    render: (_, { companyNo, companyName }) =>
+      createTooltip(companyName, "业务公司编码 : " + companyNo, 270),
+    span: 8
   },
   {
     field: "supplierName",
     label: "供应商名称",
+    render: (_, { supplierNo, supplierName }) =>
+      createTooltip(supplierName, "供应商编码 : " + supplierNo, 270),
+    span: 8
+  },
+  {
+    label: "源头供应商",
     render: (_, { cgd_supplierNo, cgd_supplierName }) =>
       createTooltip(cgd_supplierName, "供应商编码 : " + cgd_supplierNo, 270),
-    span: 12
+    span: 8
   },
 
   {

src/views/supplyInvoiceSaleSettings/supplyConsultingChildCost/config/search.config.ts

@@ -18,7 +18,8 @@ const searchFormConfig: FormConfig = {
     },
     {
       field: "companyNo",
-      type: "supplier-query"
+      type: "supplier-query",
+      placeholder: '买入方公司'
     },
     {
       field: "status",

src/views/supplyInvoiceSaleSettings/supplyConsultingChildCost/detail.vue

@@ -29,12 +29,6 @@ onMounted(() => requesetGoodDetail());
 </script>
 
 <template>
-  <BasicSettings
-    title="咨询成交类目设置"
-    back-route="/supplyInvoiceSaleSettings/supplyConsultingCostDetail"
-    :detail="goodDetail"
-    :columns="good_detail_columns"
-    @refresh="requesetGoodDetail()"
-    pageName="supplyConsultingCostDetail"
-  />
+  <BasicSettings title="咨询成交类目设置" back-route="/supplyInvoiceSaleSettings/supplyConsultingChildCost" :detail="goodDetail"
+    :columns="good_detail_columns" @refresh="requesetGoodDetail()" pageName="supplyConsultingChildCostDetail" />
 </template>

src/views/supplyInvoiceSaleSettings/supplyConsultingChildCost/index.vue

@@ -18,7 +18,7 @@ import { useUserInfo } from "/@/hooks/core/useUser";
 const execlUploadModalRef = ref<InstanceType<typeof ExeclUploadModal>>(null);
 const procureUploadModalRef = ref<InstanceType<typeof ProcureImport>>(null);
 
-const { permissions, hasPermissionWithCode } = usePermission("supplyConsultingCost");
+const { permissions, hasPermissionWithCode } = usePermission("supplyConsultingChildCost");
 const selects = ref([]);
 
 const { pageContentRef, handleResetClick, handleSearchClick } = usePageSearch(
@@ -31,7 +31,7 @@ const { isSuperUser } = useUserInfo();
 
 function toDetail(spuCode) {
   push({
-    path: "/supplyInvoiceSaleSettings/supplyConsultingCostDetail",
+    path: "/supplyInvoiceSaleSettings/supplyConsultingChildCostDetail",
     query: { id: spuCode }
   });
 }

src/views/supplyInvoiceSaleSettings/supplyConsultingCost/config/configs.ts

@@ -121,16 +121,22 @@ export const good_detail_columns = [
   {
     field: "companyName",
     label: "业务公司名称",
-    render: (companyName, { companyNo }) =>
+    render: (_, { companyNo, companyName }) =>
       createTooltip(companyName, "业务公司编码 : " + companyNo, 270),
-    span: 12
+    span: 8
   },
   {
     field: "supplierName",
     label: "供应商名称",
-    render: (supplierName, { supplierNo }) =>
+    render: (_, { supplierNo, supplierName }) =>
       createTooltip(supplierName, "供应商编码 : " + supplierNo, 270),
-    span: 12
+    span: 8
+  },
+  {
+    label: "源头供应商",
+    render: (_, { cgd_supplierNo, cgd_supplierName }) =>
+      createTooltip(cgd_supplierName, "供应商编码 : " + cgd_supplierNo, 270),
+    span: 8
   },
 
   {

src/views/supplyInvoiceSaleSettings/supplyModifyRecord/config/configs.ts

@@ -81,16 +81,22 @@ export const good_detail_columns = [
   {
     field: "companyName",
     label: "业务公司名称",
-    render: (companyName, { companyNo }) =>
+    render: (_, { companyNo, companyName }) =>
       createTooltip(companyName, "业务公司编码 : " + companyNo, 270),
-    span: 12
+    span: 8
   },
   {
     field: "supplierName",
     label: "供应商名称",
-    render: (supplierName, { supplierNo }) =>
+    render: (_, { supplierNo, supplierName }) =>
       createTooltip(supplierName, "供应商编码 : " + supplierNo, 270),
-    span: 12
+    span: 8
+  },
+  {
+    label: "源头供应商",
+    render: (_, { cgd_supplierNo, cgd_supplierName }) =>
+      createTooltip(cgd_supplierName, "供应商编码 : " + cgd_supplierNo, 270),
+    span: 8
   },
 
   {