Merge remote-tracking branch 'origin/master'

jnpf-java-boot/jnpf-web/src/views/example/order/form.vue

@@ -540,8 +540,8 @@ export default {
       ],
       ordTypeProps: { label: "fullName", value: "id" },
       paymentTermsOptions: [
-        { fullName: "款到发货", id: "1" },
-        { fullName: "月结", id: "2" },
+        { fullName: "预付", id: "1" },
+        { fullName: "月付", id: "2" },
         { fullName: "承兑", id: "3" },
       ],
       paymentTermsProps: { label: "fullName", value: "id" },
@@ -1030,7 +1030,7 @@ export default {
         }
       }
       let _data = this.dataForm
-      if (this.dataFormSubmitType == 0) {
+      if (this.dataFormSubmitType == 0&&isDetail!='change') {
         _data.ordStatus=1
       }else {
         _data.ordStatus=2