Merge branch 'dev' into zwg

src/page/main/system/organization/org-user/index.vue

@@ -133,6 +133,7 @@ const getOrgPersonFormData = (data) => {
                 ...formData,
                 logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : '',
             }
+            params.document_type = params.document_type == "" ? 0 : params.document_type
             $axios.put(`/apaas/system/v5/org/update/user/${route.query.id}`,params)
                 .then((res) => {
                 if (res.data.code == 200) {

src/page/main/system/organization/user-detail/index.vue

@@ -163,12 +163,12 @@ const getDetail = () => {
         personInfo[1].value = detail.contact_email;
         personInfo[2].value = detail.document_type === 1 ? '身份证' : '';
         personInfo[3].value = detail.document_number;
-        personInfo[4].value = detail.rem
+        personInfo[4].value = detail.remark;
         personInfo2[0].value = detail.contact_name;
         personInfo2[1].value = detail.contact_email;
-        personInfo2[2].value = detail.rem
+        personInfo2[2].value = detail.remark;
         logo.value = detail.logo;
-        accountType.value = detail.is_ad
+        accountType.value = detail.is_admin;
       }else {
           $message.error(res.data.data)
       }