销售子表商品名称

jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue

@@ -1697,6 +1697,7 @@ export default {
         const e = list[i];
         let item = {
           productId: e.id,
+          name: e.name,
           spec: e.spec,
           inventoryUnitId: e.inventoryUnitIds,
           realBound: e.realBound,
@@ -1737,6 +1738,7 @@ export default {
         const e = list[i];
         let item = {
           productId: e.id,
+          name: e.name,
           spec: e.spec,
           inventoryUnitId: e.inventoryUnitIds,
           realBound: e.realBound,
@@ -1827,6 +1829,7 @@ export default {
           item.notTaxPrice = this.jnpf.floatDiv(item.businessPrice, this.jnpf.floatAdd(1, this.jnpf.floatDiv(item.tax, 100))).toFixed(6)  //采购不含税单价
           item.notTaxCount = this.jnpf.floatMul(item.businessNum, item.notTaxPrice).toFixed(2) //采购不含税总价
           item.inventoryUnitId = item.inventoryUnitId1
+          item.name = item.commodityName
           if (item.orderMainUnitId1) {
             var unitName = JSON.parse(item.orderMainUnitId1)
             var optArray = [];

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue

@@ -1220,6 +1220,7 @@ export default {
         version: 0,
         contractInfoList: [],
         saleContractNo: undefined,
+        businessType: "2",
       },
       tableRequiredData: {},
       dataRule:
@@ -1540,6 +1541,7 @@ export default {
         const e = list[i];
         let item = {
           productId: e.id,
+          name: e.name,
           spec: e.spec,
           inventoryUnitId: e.inventoryUnitIds,
           realBound: e.realBound,
@@ -1580,6 +1582,7 @@ export default {
         const e = list[i];
         let item = {
           productId: e.id,
+          name: e.name,
           spec: e.spec,
           inventoryUnitId: e.inventoryUnitIds,
           realBound: e.realBound,
@@ -1628,6 +1631,7 @@ export default {
       }
     },
     contractInfo(val, val2) {
+      debugger
       this.dataForm.expectArriveDate = [];
       if (val2.contractPeriodTime && val2.contractPeriodTimeEnd) {
         this.dataForm.expectArriveDate[0] = new Date(val2.contractPeriodTime)
@@ -1671,6 +1675,7 @@ export default {
           item.notTaxPrice = this.jnpf.floatDiv(item.businessPrice, this.jnpf.floatAdd(1, this.jnpf.floatDiv(item.tax, 100))).toFixed(6)  //销售不含税单价
           item.notTaxCount = this.jnpf.floatMul(item.businessNum, item.notTaxPrice).toFixed(2) //销售不含税总价
           item.inventoryUnitId = item.inventoryUnitId1
+          item.name = item.commodityName
           if (item.saleMainUnitId1) {
             var unitName = JSON.parse(item.saleMainUnitId1)
             var optArray = [];
@@ -2087,6 +2092,7 @@ export default {
     addbusinessorderproductrelationalList() {
       let item = {
         productId: '',
+        name: undefined,
         spec: undefined,
         inventoryUnitId: undefined,
         realBound: undefined,