Merge branch 'master' of http://s.dev01.dkiboss.com:9001/iBOSS-2.0-Mini/iboss_wx_app

package-sales/pages/order-return/add/add.js

@@ -72,15 +72,7 @@ Page({
         type: 'str',
         required: true,
         title: mixins.$t('addressNo')
-      },
-      {
-        code: 'channelId',
-        name: 'channelName',
-        type: 'drop',
-        required: true,
-        dropType: 'saleChannel',
-        title: mixins.$t('saleChannel')
-      },
+      }, 
       {
         code: 'cusFrom',
         name: 'cusFromName',
@@ -1229,14 +1221,59 @@ Page({
         //   dropType: 'customerFrom',
         //   title: mixins.$t('customerSource')
         // },
-        ],
-    
-
-
+        ],  
           this.setData({
             buttonSaveList: buttonSaveList,
             contentObj: contentObj
           })
+      }else{
+        let contentObj = this.data.contentObj
+        contentObj.main = [{
+          code: 'cusName',
+          type: 'selectIcon',
+          urlKey: 'selectCustomers',
+          required: true,
+          readonly: false,
+          title: mixins.$t('customerName')
+        },
+        {
+          code: 'cusPhone',
+          type: 'phone',
+          title: mixins.$t('cusPhone'),
+          required: true
+        },
+        {
+          code: 'addressFull',
+          type: 'address',
+          title: mixins.$t('addressFull'),
+          required: true
+        },
+        {
+          code: 'addressNo',
+          type: 'str',
+          required: true,
+          title: mixins.$t('addressNo')
+        },
+        {
+          code: 'channelId',
+          name: 'channelName',
+          type: 'drop',
+          required: true,
+          dropType: 'saleChannel',
+          title: mixins.$t('saleChannel')
+        },
+        {
+          code: 'cusFrom',
+          name: 'cusFromName',
+          type: 'drop',
+          required: false,
+          dropType: 'customerFrom',
+          title: mixins.$t('customerSource')
+        },
+        ]
+        this.setData({ 
+          contentObj: contentObj
+        })
       }
 
       formData = this.setStaffOrg(formData)
@@ -1302,6 +1339,50 @@ Page({
         //   title: mixins.$t('customerSource')
         // },
         ]
+      }else{
+        contentObj.main = [{
+          code: 'cusName',
+          type: 'selectIcon',
+          urlKey: 'selectCustomers',
+          required: true,
+          readonly: false,
+          title: mixins.$t('customerName')
+        },
+        {
+          code: 'cusPhone',
+          type: 'phone',
+          title: mixins.$t('cusPhone'),
+          required: true
+        },
+        {
+          code: 'addressFull',
+          type: 'address',
+          title: mixins.$t('addressFull'),
+          required: true
+        },
+        {
+          code: 'addressNo',
+          type: 'str',
+          required: true,
+          title: mixins.$t('addressNo')
+        },
+        {
+          code: 'channelId',
+          name: 'channelName',
+          type: 'drop',
+          required: true,
+          dropType: 'saleChannel',
+          title: mixins.$t('saleChannel')
+        },
+        {
+          code: 'cusFrom',
+          name: 'cusFromName',
+          type: 'drop',
+          required: false,
+          dropType: 'customerFrom',
+          title: mixins.$t('customerSource')
+        },
+        ]
       }
       this.setData({
         contentObj:contentObj,
@@ -1312,7 +1393,53 @@ Page({
       wx.setNavigationBarTitle({
         title: '编辑销售退货'
       })
-
+      let contentObj = this.data.contentObj
+      contentObj.main = [{
+        code: 'cusName',
+        type: 'selectIcon',
+        urlKey: 'selectCustomers',
+        required: true,
+        readonly: false,
+        title: mixins.$t('customerName')
+      },
+      {
+        code: 'cusPhone',
+        type: 'phone',
+        title: mixins.$t('cusPhone'),
+        required: true
+      },
+      {
+        code: 'addressFull',
+        type: 'address',
+        title: mixins.$t('addressFull'),
+        required: true
+      },
+      {
+        code: 'addressNo',
+        type: 'str',
+        required: true,
+        title: mixins.$t('addressNo')
+      },
+      {
+        code: 'channelId',
+        name: 'channelName',
+        type: 'drop',
+        required: true,
+        dropType: 'saleChannel',
+        title: mixins.$t('saleChannel')
+      },
+      {
+        code: 'cusFrom',
+        name: 'cusFromName',
+        type: 'drop',
+        required: false,
+        dropType: 'customerFrom',
+        title: mixins.$t('customerSource')
+      },
+      ] 
+    this.setData({
+      contentObj:contentObj, 
+    })
       if (this.data.formMode == Constants.formMode.other) {
         this.setData({
           popContent: [{