Merge branch 'master' of http://192.168.31.240:3000/MTP2.0_New/MTP2.0_NEWMANAGE_WEB

public/locales/en-US.json

@@ -3281,7 +3281,7 @@
             "tradedate": "Date",
             "quarter": "Quarter",
             "areaname": "Member Code/Name",
-            "areaname1": "会员/机构",
+            "areaname1": "Member/Organization",
             "yxareauserid": "Affiliated Marketing Center",
             "isson": "Include Sub-organizations",
             "areatype": "Role",

public/locales/th-TH.json

@@ -3281,7 +3281,7 @@
             "tradedate": "วันที่",
             "quarter": "ไตรมาส",
             "areaname": "รหัสสมาชิก/ชื่อ",
-            "areaname1": "会员/机构",
+            "areaname1": "สมาชิก/องค์กร",
             "yxareauserid": "ศูนย์การตลาดที่เป็นส่วนของ",
             "isson": "รวมองค์กรย่อยหรือไม่",
             "areatype": "บทบาท",

public/locales/vi-VN.json

@@ -3281,7 +3281,7 @@
             "tradedate": "Ngày",
             "quarter": "Qúy",
             "areaname": "Mã thành viên/Tên",
-            "areaname1": "会员/机构",
+            "areaname1": "Thành viên/tổ chức",
             "yxareauserid": "Trung tâm tiếp thị thuộc sở hữu",
             "isson": "Bao gồm tổ chức con？",
             "areatype": "Vai trò",

src/packages/pc/views/member/institution/marketer/components/edit/index.vue

@@ -105,16 +105,19 @@ const { run: runRoleDetail } = useRequest(queryRoleDetail, {
         ElMessage.error(err)
     },
     onSuccess: (res) => {
-        formData.value.customertype = res.data.customertype.customertype
-        // 查询数据
-        run({
-            riskcontrolmode: 2,
-            customertype: formData.value.customertype
-        })
-        // 获取资金账号信息
-        runAccountIdForMarket({
-            userid: props.record?.userid
-        })
+        const { customertype } = res.data
+        if (customertype) {
+            formData.value.customertype = customertype.customertype
+            // 查询数据
+            run({
+                riskcontrolmode: 2,
+                customertype: formData.value.customertype
+            })
+            // 获取资金账号信息
+            runAccountIdForMarket({
+                userid: props.record?.userid
+            })
+        }
     }
 })