Browse Source

采购模块添加主单号 销售显示其他单号

xiaodai2017 2 years ago
parent
commit
c9ae27741a

+ 2 - 0
src/components/ReconciliationForm/src/cpns/purchase-modal.vue

@@ -187,6 +187,8 @@ defineExpose({
     >
       <ElTableColumn type="selection" width="55" />
       <ElTableColumn label="采购单编号" prop="sequenceNo" width="150" />
+      <ElTableColumn label="采购主单编号" prop="cxCode" width="150" />
+      <ElTableColumn label="采购单编号" prop="qrdCode" width="150" />
       <ElTableColumn label="采购单信息">
         <ElTableColumn
           label="供货商"

+ 6 - 0
src/views/InvoiceSales/invoiceApply/components/add-edit-form/add-edit-form.vue

@@ -340,6 +340,12 @@ watch(
                 show-overflow-tooltip
                 width="200"
               />
+              <el-table-column
+                prop="workCode"
+                label="其他编号"
+                show-overflow-tooltip
+                width="200"
+              />
               <el-table-column
                 prop="customerNo"
                 label="购买方公司编号"

+ 20 - 14
src/views/InvoiceSales/invoiceApply/components/add-edit-form/columns.tsx

@@ -10,14 +10,14 @@ export function useColumns() {
     {
       label: "业务订单编号",
       prop: "sequenceNo",
-      minWidth: 160,
+      width: 150,
       showOverflowTooltip: true,
       fixed: "left"
     },
     {
       label: "销售订单主编号",
       prop: "cxCode",
-      minWidth: 160,
+      width: 150,
       showOverflowTooltip: true
     },
     // {
@@ -29,12 +29,17 @@ export function useColumns() {
     {
       label: "po编号",
       prop: "poCode",
-      minWidth: 190
+      width: 190
+    },
+    {
+      label: "其他编号",
+      prop: "workCode",
+      width: 190
     },
     {
       label: "商品编码",
       prop: "goodNo",
-      minWidth: 160,
+      width: 150,
       showOverflowTooltip: true
     },
     {
@@ -46,7 +51,7 @@ export function useColumns() {
     {
       label: "客户编号",
       prop: "customerNo",
-      minWidth: 160,
+      width: 150,
       showOverflowTooltip: true
     },
     {
@@ -58,41 +63,42 @@ export function useColumns() {
     {
       label: "订单总金额",
       prop: "totalPrice",
-      minWidth: 110,
+      width: 110,
       showOverflowTooltip: true
     },
     {
       label: "商品数量",
       prop: "goodNum",
-      minWidth: 160,
+      width: 110,
       showOverflowTooltip: true
     },
     {
       label: "未开票数量",
-      prop: "winv_num"
+      prop: "winv_num",
+      width: 110
     },
     {
       label: "已开票金额",
       prop: "ainv_fee",
-      minWidth: 110,
+      width: 110,
       showOverflowTooltip: true
     },
     {
       label: "开票中金额",
       prop: "inv_fee",
-      minWidth: 110,
+      width: 110,
       showOverflowTooltip: true
     },
     {
       label: "未开票金额",
       prop: "winv_fee",
-      minWidth: 110,
+      width: 110,
       showOverflowTooltip: true
     },
     {
       label: "发货状态",
       prop: "sendStatus",
-      minWidth: 110,
+      width: 110,
       showOverflowTooltip: true,
       cellRenderer: ({ row, props }) => (
         <el-tag
@@ -116,12 +122,12 @@ export function useColumns() {
     {
       label: "业务员",
       prop: "ownerName",
-      minWidth: 80,
+      width: 80,
       showOverflowTooltip: true
     },
     {
       label: "创建时间",
-      minWidth: 145,
+      width: 130,
       prop: "createTime",
       showOverflowTooltip: true,
       formatter: ({ addtime }) => dayjs(addtime).format("YYYY-MM-DD HH:mm:ss")

+ 18 - 8
src/views/purchase/porder/config/content.config.ts

@@ -11,10 +11,20 @@ const columns = [
   {
     label: "采购单编号",
     prop: "sequenceNo",
-    width: "175px"
+    width: "150px"
   },
   {
-    label: "状态",
+    label: "采购主单编号",
+    prop: "cxCode",
+    width: "150px"
+  },
+  {
+    label: "确认单编号",
+    prop: "qrdCode",
+    width: "150px"
+  },
+  {
+    label: "对账状态",
     prop: "status",
     width: 95,
     ...renderProp(cgdStatusOptions, "status")
@@ -40,7 +50,7 @@ const columns = [
   {
     label: "商品编号",
     prop: "goodNo",
-    width: "175px"
+    width: "150px"
   },
   {
     label: "商品名称",
@@ -51,7 +61,7 @@ const columns = [
   {
     label: "卖出方公司编号",
     prop: "supplierNo",
-    width: "175px"
+    width: "150px"
   },
   {
     label: "卖出方公司名称",
@@ -61,12 +71,12 @@ const columns = [
   {
     label: "销售订单编号",
     prop: "qrdCode",
-    width: "160px"
+    width: "150px"
   },
   {
     label: "备库单编号",
     prop: "bkCode",
-    width: "160px"
+    width: "150px"
   },
   {
     label: "采购员",
@@ -82,12 +92,12 @@ const columns = [
   {
     label: "买入方公司编号",
     prop: "companyNo",
-    width: "175px"
+    width: "150px"
   },
   {
     label: "创建时间",
     prop: "addtime",
-    width: 155
+    width: 130
   },
   {
     label: "操作",

+ 1 - 0
src/views/purchase/porder/config/search.config.ts

@@ -15,6 +15,7 @@ const searchFormConfig: FormConfig = {
       otherOptions: {
         inputGroupOptions: [
           { value: "sequenceNo", label: "采购单编号" },
+          { value: "cxCode", label: "采购主编号" },
           { value: "qrdCode", label: "确认单编号" },
           // { value: "supplierNo", label: "卖出方公司编号" },
           // { value: "supplierName", label: "卖出方公司名称" },

+ 16 - 6
src/views/supply/porder/config/content.config.ts

@@ -23,7 +23,17 @@ const columns = [
   {
     label: "采购单编号",
     prop: "sequenceNo",
-    width: "175px"
+    width: "150px"
+  },
+  {
+    label: "采购主单编号",
+    prop: "cxCode",
+    width: "150px"
+  },
+  {
+    label: "确认单编号",
+    prop: "qrdCode",
+    width: "150px"
   },
   {
     label: "状态",
@@ -52,7 +62,7 @@ const columns = [
   {
     label: "商品编号",
     prop: "goodNo",
-    width: "175px"
+    width: "150px"
   },
   {
     label: "商品名称",
@@ -62,7 +72,7 @@ const columns = [
   {
     label: "买方公司编号",
     prop: "companyNo",
-    width: "175px"
+    width: "150px"
   },
   {
     label: "买方公司名称",
@@ -72,7 +82,7 @@ const columns = [
   {
     label: "卖方公司编号",
     prop: "supplierNo",
-    width: "175px"
+    width: "150px"
   },
   {
     label: "卖方公司名称",
@@ -82,7 +92,7 @@ const columns = [
   {
     label: "备库单",
     prop: "bkCode",
-    width: "175px"
+    width: "150px"
   },
   {
     label: "采购员",
@@ -93,7 +103,7 @@ const columns = [
   {
     label: "创建时间",
     prop: "addtime",
-    width: 155
+    width: 130
   },
   {
     label: "操作",

+ 1 - 0
src/views/supply/porder/config/search.config.ts

@@ -14,6 +14,7 @@ const searchFormConfig: FormConfig = {
       otherOptions: {
         inputGroupOptions: [
           { value: "sequenceNo", label: "采购单编号" },
+          { value: "cxCode", label: "采购主单编号" },
           { value: "qrdCode", label: "确认单编号" },
           // { value: "companyNo", label: "买入方公司编号" },
           // { value: "companyName", label: "买入方公司名称" },