bug

src/BIZComponents/inventoryTable.vue

@@ -1216,6 +1216,7 @@
             if (supplierObj[item.productId]?.length === 1) {
               item.entrustedEnterpriseId = supplierObj[item.productId][0].id;
             }
+            item['customerMark'] = item.customerMark||this.customerMark;
           });
           this.form.datasource = productList;
           if (this.isChangeCount) {

src/views/saleManage/saleOrder/accountstatement/components/inventoryTable.vue

@@ -152,17 +152,17 @@ export default {
           //   slot: 'orderNo',
           //   showOverflowTooltip: true
           // },
-          // {
-          //   minWidth: 100,
-          //   prop: 'pricingWay',
-          //   label: '计价方式',
-          //   align: 'center',
-          //   slot: 'pricingWay',
-          //   showOverflowTooltip: true,
-          //   formatter: (_row, _column, cellValue) => {
-          //     return _row.pricingWay == 1 ? '按数量计价' : '按重量计价'
-          //   }
-          // },
+          {
+            minWidth: 100,
+            prop: 'pricingWay',
+            label: '计价方式',
+            align: 'center',
+            slot: 'pricingWay',
+            showOverflowTooltip: true,
+            formatter: (_row, _column, cellValue) => {
+              return _row.pricingWay == 1 ? '按数量计价' :_row.pricingWay == 2? '按重量计价':''
+            }
+          },
           {
             minWidth: 100,
             prop: 'totalCount',

src/views/saleManage/saleOrder/components/addDialog.vue

@@ -488,6 +488,7 @@
       };
 
       return {
+        customerMark:'',
         projectData: {}, //项目数据
         clearing: false, //是否清除合同
         processSubmitDialogFlag: false,
@@ -603,6 +604,7 @@
         const data = await getDetail(id);
         this.loading = false;
         if (data) {
+          await this.changeParent({id:data.contractVO?.partaId},true)
           this.$nextTick(() => {
             let { contractVO } = data;
             let {
@@ -675,15 +677,16 @@
         this.loading = true;
         const data = await getSaleOrderDetail(id);
         this.loading = false;
+        this.form = data;
+        await this.changeParent({id:data.partaId},true)
+
         if (data) {
           data.saleType = +data.saleType;
-          this.form = data;
           this.$nextTick(() => {
             this.$refs.inventoryTable &&
               this.$refs.inventoryTable.putTableValue(data);
             this.getLinkInfo(data.partaId);
             this.$store.commit('order/setContractId', data.partaId);
-          this.changeParent({id:data.partaId},true)
           });
         }
       },
@@ -772,7 +775,7 @@
             this.$set(
               this.$refs.inventoryTable?.form?.datasource[index],
               'customerMark',
-              this.form.customerMark
+              this.customerMark
             );
           });
         }