Merge branch 'new' into develop

src/views/supply/engin/components/commerce_form.vue

@@ -638,9 +638,9 @@ export default {
     this.getWarehouseList()
     this.getDealerList()
     if (this.websitNumber === 'GZ') {
-      this.isPlanOrder = false
+      this.isPlanOrder = 'false'
     } else if (this.websitNumber === 'FS') {
-      this.isPlanOrder = true
+      this.isPlanOrder = 'true'
     }
 
     if (this.listItem) {
@@ -864,7 +864,7 @@ export default {
         this.mainForm.geLiInerNote = data.geLiInerNote
         this.mainForm.geLiNote = data.geLiNote
         this.mainForm.fileNo = data.fileNo
-        this.isPlanOrder = String(data.isPlanOrder)
+        // this.isPlanOrder = String(data.isPlanOrder)
         if (!this.isDealer) {
           this.mainForm.jxsNum = data.customerNumber
           this.mainForm.jxsName = data.customerName