Merge branch 'master' of http://139.196.39.194:9021/yuansh/global-web

src/views/platformBusiness/commissionOrder/commissionOrderForm.data.ts

@@ -101,6 +101,14 @@ export const ProductColumns: JVxeColumn[] = [
       width:"200px",
       defaultValue:'',
     },
+    {
+      title: '备件号(partno)',
+      key: 'partno',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
     {
       title: '订货号(orderno)',
       key: 'orderno',

src/views/purchase/purchaseOrder/components/PurchaseOrderFormForm.vue

@@ -736,6 +736,7 @@
         purOrderFormShipFormProductTable.dataSource = arrProduct;
         notAllowEdit.value = true;
         formData.sourceCode = data[0].billCode;
+        formData.paymentTerms = data[0].paymentTerm;
         if (formData.sourceCode2 == '') {
           formData.project = data[0].inquiryProject;
           formData.projectName = data[0].projectName;