xxxxx

public/locales/en-US.json

@@ -831,7 +831,7 @@
                 "accountname": "AccountName",
                 "accountid": "AccountID",
                 "accountstatus": "AccountStatus",
-                "operation": "操作员",
+                "operation": "Operator",
                 "rolemodifytime": "RoleModifyTime"
             },
             "goodscfg": {
@@ -852,7 +852,7 @@
                 "accountname": "AccountName",
                 "accountid": "AccountID",
                 "accountstatus": "AccountStatus",
-                "operation": "操作员",
+                "operation": "Operator",
                 "rolemodifytime": "RoleModifyTime"
             },
             "marketer": {
@@ -860,7 +860,7 @@
                 "accountname": "AccountName",
                 "accountid": "AccountID",
                 "accountstatus": "AccountStatus",
-                "operation": "操作员",
+                "operation": "Operator",
                 "rolemodifytime": "RoleModifyTime"
             },
             "marketing": {
@@ -868,7 +868,7 @@
                 "accountname": "AccountName",
                 "accountid": "AccountID",
                 "accountstatus": "AccountStatus",
-                "operation": "操作员",
+                "operation": "Operator",
                 "rolemodifytime": "RoleModifyTime"
             },
             "open": {
@@ -957,7 +957,7 @@
                 "accountname": "AccountName",
                 "accountid": "AccountID",
                 "accountstatus": "AccountStatus",
-                "operation": "操作员",
+                "operation": "Operator",
                 "rolemodifytime": "RoleModifyTime"
             },
             "riskcfg": {
@@ -979,20 +979,31 @@
                 "memberuserid": "机构代码",
                 "accountname": "机构名称",
                 "accountid": "资金账户",
-                "accountstatus": "机构状态",
-                "operation": "操作员",
+                "accountstatus": "AccountStatus",
+                "operation": "Operator",
                 "rolemodifytime": "RoleModifyTime"
             },
             "tradecfg": {},
             "user": {
-                
+                "enddate": "EndDate",
+                "startdate": "StartDate",
+                "roles": "角色",
+                "starttime": "创建时间",
+                "markets": "市场权限",
+                "userid": "机构代码",
+                "accountname": "机构名称",
+                "accountstatus": "AccountStatus",
+                "createtime": "创建时间",
+                "modifytime": "最后更新时间",
+                "roleIds": "机构角色",
+                "userName": "操作员"
             },
             "warehouse": {
                 "memberuserid": "机构代码",
                 "accountname": "AccountName",
                 "accountid": "AccountID",
                 "accountstatus": "AccountStatus",
-                "operation": "操作员",
+                "operation": "Operator",
                 "rolemodifytime": "RoleModifyTime"
             }
         },
@@ -1105,10 +1116,10 @@
                 "openmode": "机构名称",
                 "userstate": "所属机构",
                 "createtime": "所属会员",
-                "operate1": "机构状态",
+                "operate1": "AccountStatus",
                 "operate2": "机构类型",
                 "operate3": "所有者类型",
-                "operate4": "操作员",
+                "operate4": "Operator",
                 "operate5": "ModifyTime",
                 "username1": "机构",
                 "edit": {

public/locales/th-TH.json

@@ -985,7 +985,18 @@
             },
             "tradecfg": {},
             "user": {
-                
+                "enddate": "结束时间",
+                "startdate": "开始时间",
+                "roles": "角色",
+                "starttime": "创建时间",
+                "markets": "市场权限",
+                "userid": "机构代码",
+                "accountname": "机构名称",
+                "accountstatus": "机构状态",
+                "createtime": "创建时间",
+                "modifytime": "最后更新时间",
+                "roleIds": "机构角色",
+                "userName": "操作员"
             },
             "warehouse": {
                 "memberuserid": "机构代码",

public/locales/zh-CN.json

@@ -985,7 +985,18 @@
             },
             "tradecfg": {},
             "user": {
-                
+                "enddate": "结束时间",
+                "startdate": "开始时间",
+                "roles": "角色",
+                "starttime": "创建时间",
+                "markets": "市场权限",
+                "userid": "机构代码",
+                "accountname": "机构名称",
+                "accountstatus": "机构状态",
+                "createtime": "创建时间",
+                "modifytime": "最后更新时间",
+                "roleIds": "机构角色",
+                "userName": "操作员"
             },
             "warehouse": {
                 "memberuserid": "机构代码",

public/locales/zh-TW.json

@@ -985,7 +985,18 @@
             },
             "tradecfg": {},
             "user": {
-                
+                "enddate": "结束时间",
+                "startdate": "开始时间",
+                "roles": "角色",
+                "starttime": "创建时间",
+                "markets": "市场权限",
+                "userid": "机构代码",
+                "accountname": "机构名称",
+                "accountstatus": "机构状态",
+                "createtime": "创建时间",
+                "modifytime": "最后更新时间",
+                "roleIds": "机构角色",
+                "userName": "操作员"
             },
             "warehouse": {
                 "memberuserid": "机构代码",

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

@@ -1,6 +1,7 @@
 <!-- 会员机构管理-机构管理-运营机构管理-新增 -->
 <template>
     <app-drawer title="新增" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
+        
     </app-drawer>
 </template>
 

src/packages/pc/views/member/institution/user/index.vue

@@ -6,7 +6,7 @@
                 <template #starttime="{ item }">
                     <el-form-item :label="item.label" prop="date">
                         <el-date-picker type="daterange" v-model="dateValue" value-format="YYYYMMDD"
-                            start-placeholder="开始时间" end-placeholder="结束时间" />
+                            :start-placeholder="t('member.institution.user.startdate')" :end-placeholder="t('member.institution.user.enddate')" />
                     </el-form-item>
                 </template>
             </app-filter>
@@ -66,12 +66,12 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryO
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'userid', label: '机构代码' },
-    { field: 'accountname', label: '机构名称' },
-    { field: 'accountstatus', label: '机构状态', formatValue: (val) => areastatusEnum.getEnumTypeName(val) },
+    { field: 'userid', label: 'member.institution.user.userid' },
+    { field: 'accountname', label: 'member.institution.user.accountname' },
+    { field: 'accountstatus', label: 'member.institution.user.accountstatus', formatValue: (val) => areastatusEnum.getEnumTypeName(val) },
     {
         field: 'roleIds',
-        label: '机构角色',
+        label: 'member.institution.user.roleIds',
         formatValue: (val: string) => {
             if (val) {
                 const arr = val.split(',').map((id) => roleTypeEnum.getEnumTypeName(Number(id)))
@@ -80,35 +80,35 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
             return val
         }
     },
-    { field: 'userName', label: '操作员' },
-    { field: 'createtime', label: '创建时间', formatValue: (val) => formatDate(val) },
-    { field: 'modifytime', label: '最后更新时间', formatValue: (val) => formatDate(val) },
-    { field: 'operate', label: '操作', width: 200, fixed: 'right' }
+    { field: 'userName', label: 'member.institution.user.userName' },
+    { field: 'createtime', label: 'member.institution.user.createtime', formatValue: (val) => formatDate(val) },
+    { field: 'modifytime', label: 'member.institution.user.modifytime', formatValue: (val) => formatDate(val) },
+    { field: 'operate', label: 'common.operate', width: 200, fixed: 'right' }
 ])
 
 const { filterOption, getQueryParams, resetFilters } = useDataFilter<Model.OrganDetailListReq>({
     filters: [
         {
             field: 'accountName',
-            label: '机构'
+            label: t('member.institution.user.accountname')
         },
         {
             field: 'accountStatus',
-            label: '机构状态',
+            label: t('member.institution.user.accountstatus'),
             options: () => areastatusEnum.getEnumOptions()
         },
         {
             field: 'markets',
-            label: '市场权限',
+            label: t('member.institution.user.markets'),
             options: () => getMarketOptions()
         },
         {
             field: 'starttime',
-            label: '创建时间',
+            label: t('member.institution.user.starttime'),
         },
         {
             field: 'roles',
-            label: '角色',
+            label: t('member.institution.user.roles'),
             multiple: true,
             options: () => roleTypeEnum.getEnumOptions()
         },