Procházet zdrojové kódy

上下游字段带出问题

jingbb před 3 měsíci
rodič
revize
57cf4e1ed8

+ 1 - 0
src/views/purchase/purchaseOrder/components/PurchaseOrderFormForm.vue

@@ -614,6 +614,7 @@
           formData.isExport = data[0].isExport;
           formData.exchangeRate = data[0].exchangeRateGys;
           formData.currency = data[0].currencyGys;
+          formData.tradeTerms = data[0].deliveryTerms;
           getShipList(data[0].headId, 'contract');
         }
       }

+ 1 - 0
src/views/purchase/purchaseQuotationFrm/components/PurchaseQuotationFormForm.vue

@@ -568,6 +568,7 @@
         formData.priority = data[0].priority;
         formData.model = data[0].headModel;
         formData.maker = data[0].maker;
+        formData.placeDelivery = data[0].placeDelivery;
         // formData.inquiryTeam =  data[0].inquiryTeam
         formData.productionClass = data[0].productionClass;
         formData.productionClass_dictText = data[0].productionClass_dictText;

+ 1 - 6
src/views/saleCode/quotation/components/quotationFormForm.vue

@@ -29,12 +29,7 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item
-                label="报价项目(quotation project)"
-                v-bind="validateInfos.quotationProjectName"
-                id="quotationFormForm-quotationProjectName"
-                name="quotationProjectName"
-              >
+              <a-form-item  label="报价项目(quotation project)"     v-bind="validateInfos.quotationProjectName"  id="quotationFormForm-quotationProjectName"    name="quotationProjectName">
                 <a-input-search
                   v-model:value="formData.quotationProjectName"
                   readonly

+ 4 - 0
src/views/saleCode/saleContract/components/SaleContractModal.vue

@@ -292,10 +292,12 @@
     }
   }
   function addQuotation(data) {
+    var time = getFieldsValue()
     data.map((item) => {
       item.model = item.childModel;
       item.sourceId = item.childId;
       item.taxPrice = item.salePrice;
+      item.deliveryTime = moment(time.billDate).add(Number(item.deliveryDayChild), 'days').format('YYYY-MM-DD');
     });
     var arrProduct = data.concat(saleContractProductTable.dataSource);
     saleContractProductTable.dataSource = arrProduct;
@@ -312,6 +314,8 @@
       maker: data[0].maker,
       currency: data[0].currency,
       exchangeRate: data[0].exchangeRate,
+      paymentTerms:data[0].paymentTerms,
+      deliveryTerms:data[0].deliveryTerms
     });
     getShipList(data[0].headId);
   }

+ 4 - 2
src/views/saleCode/salesOrder/components/SlaeOrderFormForm.vue

@@ -727,7 +727,7 @@
         var allDiscountPrice = 0;
         data.map((item) => {
           item.model = item.childModel;
-          item.deliveryTime = formData.deliveryTime;
+          item.deliveryTime = formData.deliveryTime&&formData.deliveryTime!==''?formData.deliveryTime:moment(formData.billDate).add(Number(data[0].deliveryDayChild), 'days').format('YYYY-MM-DD');
           item.sourceId = item.childId;
           item.sourceType = 'Quo' + item.childId;
           item.taxPrice = item.salePrice;
@@ -763,6 +763,7 @@
           formData.paymentTerms = data[0].paymentTerms;
           formData.intermediator = data[0].intermediator;
           formData.intermediatorName = data[0].intermediatorName;
+          formData.deliveryAddress = data[0].placeDelivery;
           formData.deliveryTime = moment(formData.billDate).add(Number(data[0].deliveryDayHead), 'days').format('YYYY-MM-DD');
           getShipList(data[0].headId, 'quotation');
           var params = { id: formData.customer };
@@ -783,7 +784,7 @@
         var allDiscountPrice = 0;
         data.map((item) => {
           item.model = item.childModel;
-          item.deliveryTime = formData.deliveryTime;
+          item.deliveryTime = formData.deliveryTime&&formData.deliveryTime!==''?formData.deliveryTime:item.deliveryTime;
           item.sourceId = item.childId;
           item.sourceType = 'Con' + item.childId;
           if (formData.doubleDiscount && formData.doubleDiscount !== '') {
@@ -817,6 +818,7 @@
           formData.paymentTerms = data[0].paymentTerms;
           formData.intermediator = data[0].intermediator;
           formData.intermediatorName = data[0].intermediatorName;
+          formData.deliveryTime = data[0].deliveryTime;
           getShipList(data[0].headId, 'contract');
           var params = { id: formData.customer };
           var obj = await CustomerOption(params);