2 Commit-ok 8b35f827db ... 6857f1da9f

Szerző SHA1 Üzenet Dátum
  jingbb 6857f1da9f 销售报价单的包装要求字段带入销售订单和发货通知单里 1 hónapja
  jingbb 7cfec9aab4 选择销售订单弹窗-增加图号订单号备件号字段 1 hónapja

+ 18 - 0
src/views/publicComponents/SelectSaleOrderModal.vue

@@ -262,6 +262,24 @@
             dataIndex: 'childModel',
             align:"center"
         },
+        {
+            title: '备件号(partno)',
+            key: 'partno',
+            dataIndex: 'partno',
+            align:"center"
+        },
+        {
+            title: '订货号(orderno)',
+            key: 'orderno',
+            dataIndex: 'partno',
+            align:"center",
+        },
+        {
+            title: '图号(drawingno)',
+            key: 'drawingno',
+            dataIndex: 'drawingno',
+            align:"center"
+        },
         {
             title: '厂家(factory)',
             key: 'factory',

+ 1 - 0
src/views/saleCode/deliveryNotice/components/deliveryNoticeForm.vue

@@ -680,6 +680,7 @@
         var arrProduct = xTable.data.concat(data);
         deliveryDetailFormProductTable.dataSource = arrProduct;
         notAllowEdit.value = true;
+        formData.packagebRequirement=data[0].packagebRequirement; 
         formData.sourceCode = data[0].billCode;
         formData.project = data[0].project;
         formData.projectName = data[0].projectName;

+ 1 - 0
src/views/saleCode/salesOrder/components/SlaeOrderFormForm.vue

@@ -754,6 +754,7 @@
         formData.convertedAmount = allDiscountPrice;
         formData.convertedAmount = Number(formData.convertedAmount).toFixed(2);
         if (!formData.sourceCode2 && formData.sourceCode2 == '') {
+          formData.packagebRequirement = data[0].packagingMethod;
           formData.project = data[0].quotationProject;
           formData.deliveryTerms = data[0].deliveryTerms;
           formData.projectName = data[0].quotationProjectName;