bug

src/BIZComponents/inventoryTable.vue

@@ -1064,7 +1064,7 @@
           let categoryIds = productList
             .filter((item) => item.productId)
             .map((item) => item.productId);
-          if (categoryIds.lenght > 0) {
+          if (categoryIds.length > 0) {
             return await contactQueryByCategoryIdsAPI({
               categoryIds,
               isQueryEE: 1
@@ -1323,8 +1323,10 @@
             'packingSpecification',
             item.extField.packingSpecification
           );
-          console.log(this.customerMark, 'this.customerMark');
           this.$set(parasm, 'customerMark', this.customerMark);
+          if(item.purchaseOrigins?.length>0){
+            item.purchaseOrigins=item.purchaseOrigins.map(val=>val+'')
+          }
           this.$set(parasm, 'provenance', item.purchaseOrigins || []);
 
           if (idx == -1) {

src/views/contractManage/contractBook/components/addDialog.vue

@@ -952,7 +952,7 @@
               this.$refs.paymentListTable.putTableValue(
                 data.receiptPaymentList
               );
-            console.log(this.$refs.rawDetailListRef);
+              this.$refs.paymentListTable&&this.$refs.paymentListTable.setDiscountAmount(contractVO.discountTotalPrice);
             this.$refs.rawDetailListRef &&
               this.$refs.rawDetailListRef.putTableValueNew(contractVO.rawList); //原料
             this.$refs.outputDetailListRef &&
@@ -1322,6 +1322,7 @@
           this.$refs.inventoryTable.putTableValue(row);
         this.$refs.paymentListTable &&
           this.$refs.paymentListTable.putTableValue(row.receiptPaymentList);
+          this.$refs.paymentListTable&&this.$refs.paymentListTable.setDiscountAmount(contractVO.discountTotalPrice);
         this.getEnterprise();
         await this.getLinkInfo(
           contractVO.type == '2' ? contractVO.partbId : contractVO.partaId

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

@@ -580,7 +580,7 @@
         this.$set(this.form, 'quoteEmail', obj.email);
       },
       //选择客户回调
-      async changeParent(obj) {
+      async changeParent(obj,type) {
         const { base, other } = await contactDetail(obj.id);
         this.form = Object.assign({}, this.form, {
           contactId: base.id,
@@ -595,7 +595,9 @@
 
         this.getLinkInfo(obj.id);
         this.getBusinessList(base.id);
-
+        if(type=='init'){
+           return
+        }
         this.$nextTick(() => {
           if(this.form.opportunityType==1){
             this.$refs.inventoryTable.putTableValue([])
@@ -632,19 +634,19 @@
             this.form.quoteAddress = this.enterprisePage[0].address;
           }
           if (this.contactData.id) {
-            this.changeParent({ id: this.contactData.id });
+            this.changeParent({ id: this.contactData.id },'init');
           }
           if (this.businessOpportunityData.id) {
             this.form.opportunityId = this.businessOpportunityData.id;
             await this.opportunityChange(this.businessOpportunityData.id);
             this.form.opportunityType = 1;
-            this.changeParent({ id: this.businessOpportunityData.contactId });
+            this.changeParent({ id: this.businessOpportunityData.contactId },'init');
           }
           if (row.id) {
             this.form.opportunityId = row.id;
             await this.opportunityChange(row.id);
             this.form.opportunityType = 1;
-            this.changeParent({ id: row.contactId });
+            this.changeParent({ id: row.contactId },'init');
           }
         } else {
           this.isUpdate = true;