🐞 fix(【drp-采购订单维护】): 自由态支持修改付款协议

同一个供应商不同产品类别或不同项目，有不同的付款方式。 申请自由状态的采购订单支持编辑【付款协议】，审批通过订单发送nc付款协议保持一致，采购订单付款计划-展示的付款协议也一致。

20240626275

src/views/purchase/purchase-order/add/column.js

@@ -10,7 +10,6 @@ const PurColumns = [
     referName: "ORG_PARAM",
     dataMapping: {
       puOrg: "id",
-      puOrgName: "name",
     },
     queryParams: () => ({}),
     require: true,
@@ -42,11 +41,10 @@ const PurColumns = [
     referName: "PAYAGREEMENT_PARAM",
     dataMapping: {
       paymentAgreement: 'id',
-      paymentAgreementName: 'name'
     },
     queryParams: () => ({}),
     isShow: true,
-    disabled: true,
+    // disabled: true,
   },
   {
     key: "updateTime",
@@ -74,7 +72,6 @@ const PurColumns = [
     dataMapping: {
       supplier: "id",
       supplierCode: 'code',
-      supplierName: "name",
       paymentAgreement: 'paymentId',
       paymentAgreementName: 'paymentName',
     },
@@ -99,7 +96,6 @@ const PurColumns = [
     referName: "WAREHOUSE_PARAM",
     dataMapping: {
       warehouse: 'id',
-      warehouseName: 'name',
     },
     queryParams: (params) => ({
       pkOrg: params.puOrg,
@@ -154,7 +150,6 @@ const PurColumns = [
       address: 'address',
       // addressName: '',
       goodsWarehouse: 'id',
-      goodsWarehouseName: 'name',
       contacts: 'contactsName',
       contactsPhone: 'contactsPhone'
     },
@@ -180,7 +175,6 @@ const PurColumns = [
     referName: "CONTACTS_PARAM",
     dataMapping: {
       buyer: 'code',
-      buyerName: 'name'
     },
     queryParams: () => ({}),
     require: true,
@@ -257,7 +251,6 @@ const PurColumns = [
     referName: "RETREASON_PARAM",
     dataMapping: {
       retReason: 'id',
-      retReasonName: 'name'
     },
     isShow: true,
     queryParams: () => ({}),
@@ -279,7 +272,6 @@ const PurColumns = [
     referName: "DEPT_PARAM",
     dataMapping: {
       puDept: 'id',
-      puDeptName: 'name'
     },
     queryParams: (params) => ({
       drpOrg: params.puOrg,
@@ -303,7 +295,6 @@ const PurColumns = [
     referName: "PROCESSTYPE_PARAM",
     dataMapping: {
       processType: 'id',
-      processTypeName: 'name'
     },
     isShow: true,
     queryParams: () => ({}),
@@ -387,7 +378,6 @@ const PurchaseTabColumns = [
         clearable: true,
         dataMapping: {
           customer: 'id',
-          customerName: 'name',
         },
       },
       {
@@ -398,7 +388,6 @@ const PurchaseTabColumns = [
         referName: "ALLOCATION_PARAM",
         dataMapping: {
           goodsAllocation: 'id',
-          goodsAllocationName: 'name',
 
         },
         isShow: true,
@@ -429,7 +418,6 @@ const PurchaseTabColumns = [
         dataMapping: {
           material: "id",
           materialName: "name",
-          materialCode: "code",
           // materialClassify:'classifyIdName',
           materialManufacturersCode: 'manufacturersMaterialCode',
           specification: 'specification',
@@ -712,7 +700,6 @@ const PurchaseTabColumns = [
   //       referName: "MATERIAL_PARAM",
   //       dataMapping: {
   //         material: "id",
-  //         materialName: "name",
   //         materialCode: "code",
   //         // materialClassify:'classifyIdName',
   //         materialManufacturersCode:'manufacturersMaterialCode',
@@ -826,7 +813,6 @@ const CauseColumns = [
     referName: "ORG_PARAM",
     dataMapping: {
       puOrg: "id",
-      puOrgName: "name",
     },
     queryParams: () => ({}),
     require: true,
@@ -874,7 +860,6 @@ const CauseColumns = [
     dataMapping: {
       supplier: "id",
       supplierCode: 'code',
-      supplierName: "name",
       paymentAgreement: 'paymentId',
       paymentAgreementName: 'paymentName',
     },
@@ -890,7 +875,6 @@ const CauseColumns = [
     referName: "PAYAGREEMENT_PARAM",
     dataMapping: {
       paymentAgreement: 'id',
-      paymentAgreementName: 'name'
     },
     queryParams: () => ({}),
     isShow: true,
@@ -905,7 +889,6 @@ const CauseColumns = [
   //   referName: "CURRENCY_PARAM",
   //   dataMapping: {
   //     currency: 'id',
-  //     currencyName: 'name'
   //   },
   //   queryParams: () => ({}),
   //   width: 180,
@@ -918,7 +901,6 @@ const CauseColumns = [
     referName: "CONTACTS_PARAM",
     dataMapping: {
       buyer: 'code',
-      buyerName: 'name'
     },
     queryParams: () => ({}),
     require: true,
@@ -932,7 +914,6 @@ const CauseColumns = [
     referName: "DEPT_PARAM",
     dataMapping: {
       puDept: 'id',
-      puDeptName: 'name'
     },
     queryParams: (params) => ({
       drpOrg: params.puOrg,
@@ -949,7 +930,6 @@ const CauseColumns = [
     width: 180,
     dataMapping: {
       customer: 'id',
-      customerName: 'name',
     },
     isShow: true,
   },
@@ -1011,7 +991,6 @@ const CauseColumns = [
     referName: "WAREHOUSE_PARAM",
     dataMapping: {
       warehouse: 'id',
-      warehouseName: 'name',
     },
     queryParams: (params) => ({
       pkOrg: params.puOrg,
@@ -1031,7 +1010,6 @@ const CauseColumns = [
     referName: "CUSTOMERDEPT_PARAM",
     dataMapping: {
       customerDept: 'id',
-      customerDeptName: 'name'
     },
     isShow: true,
     queryParams: () => ({}),
@@ -1050,7 +1028,6 @@ const CauseColumns = [
     dataMapping: {
       address: 'address',
       goodsWarehouse: 'id',
-      goodsWarehouseName: 'name',
       contacts: 'contactsName',
       contactsPhone: 'contactsPhone'
     }
@@ -1087,7 +1064,6 @@ const CauseColumns = [
     referName: "SUPPLIERCONTACTS_PARAM",
     dataMapping: {
       supplierContacts: 'id',
-      supplierContactsName: 'name'
     },
     isShow: true,
     queryParams: (params) => ({
@@ -1110,7 +1086,6 @@ const CauseColumns = [
     referName: "CONTACTS_PARAM",
     dataMapping: {
       agent: 'code',
-      agentName: 'name'
     },
     isShow: true,
     queryParams: () => ({}),
@@ -1165,7 +1140,6 @@ const CauseColumns = [
     referName: "PSNLICENSE_PARAM",
     dataMapping: {
       supplierPersonal: 'id',
-      supplierPersonalName: 'name'
     },
     isShow: true,
     queryParams: (params) => ({
@@ -1224,7 +1198,6 @@ const CauseTabColumns = [
         width: 180,
         dataMapping: {
           customer: 'id',
-          customerName: 'name',
         },
         copy: true,
         clearable: true,
@@ -1237,7 +1210,6 @@ const CauseTabColumns = [
         referName: "ALLOCATION_PARAM",
         dataMapping: {
           goodsAllocation: 'id',
-          goodsAllocationName: 'name',
 
         },
         isShow: true,
@@ -1268,7 +1240,6 @@ const CauseTabColumns = [
         dataMapping: {
           material: "id",
           materialName: "name",
-          materialCode: "code",
           materialManufacturersCode: 'manufacturersMaterialCode',
           specification: 'specification',
           model: 'model',
@@ -1572,7 +1543,6 @@ const CauseTabColumns = [
   //       referName: "MATERIAL_PARAM",
   //       dataMapping: {
   //         material: "id",
-  //         materialName: "name",
   //         materialCode: "code",
   //         // materialClassify:'classifyIdName',
   //         materialManufacturersCode:'manufacturersMaterialCode',

src/views/purchase/purchase-order/add/index.vue

@@ -8,8 +8,8 @@ import {
 } from "@/utils/init/index.js";
 import judgeColumns from "./column";
 import { tax, currency } from "@/components/popover-select-v2/fetch";
-import VirtualScroll from "el-table-virtual-scroll";
-import { VirtualColumn } from "el-table-virtual-scroll";
+// import VirtualScroll from "el-table-virtual-scroll";
+// import { VirtualColumn } from "el-table-virtual-scroll";
 
 const { Columns, TabColumns } = judgeColumns();
 
@@ -36,8 +36,8 @@ export default {
   props: {},
   dicts: initDicts(SelectColumns),
   components: {
-    "virtual-scroll": VirtualScroll,
-    VirtualColumn,
+    // "virtual-scroll": VirtualScroll,
+    // VirtualColumn,
     FileUploadCenter: () => import("../components/FileUploadCenter/index.vue"),
     popDialog: () => import("@/components/PopDialog/index.vue"),
     BatchImport: () => import("@/components/BatchImport/index.vue"),
@@ -196,7 +196,6 @@ export default {
         this.params.puDeptName = deptName;
         this.params.billDate = new Date().Format("yyyy-MM-dd");
         this.params.createTime = new Date().Format("yyyy-MM-dd HH:mm:ss");
-        console.log(this.params, "this.params");
         // this.addTableRow();
       }
     },
@@ -293,7 +292,6 @@ export default {
           ).tableColumns;
 
           let rowData = initParams(arr, "key", "value");
-          // console.log(rowData, "rowData");
 
           "rowno" in rowData &&
             (rowData["rowno"] = this.params[key].length
@@ -583,9 +581,7 @@ export default {
 
     // 子表参照改变之后
     async handleTabReferChange(val, props, source) {
-      // let { type, copy, dataMapping } = props;
       let { params, tabName } = this;
-      console.log(val, "val", props, "props", source, "source");
 
       // // 复制
       // if (copy) {
@@ -637,7 +633,7 @@ export default {
       // 物料触发税率
       if (props == "MATERIAL_PARAM") {
         let { rateCode } = source;
-        console.log(rateCode, "rateCode-------");
+        // console.log(rateCode, "rateCode-------");
 
         const DPtime = val.deliveryPeriod * 24 * 60 * 60 * 1000;
         source.deliveryDate = new Date(
@@ -899,7 +895,6 @@ export default {
     },
   },
   created() {
-    console.log("ADD CREATED", this.params);
   },
   mounted() {},
   updated() {