Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/views/information/account_info/compoments/add-business/index.vue

@@ -36,19 +36,19 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="账户名称"
-                       name="logincode">
+                       name="accountname">
             <a-input class="dialogInput"
                      style="width: 200px"
-                     v-model:value="formState.logincode"
+                     v-model:value="formState.accountname"
                      placeholder="请输入账户名称" />
           </a-form-item>
         </a-col>
         <a-col :span="12">
           <a-form-item label="登录账号"
-                       name="accountname">
+                       name="logincode">
             <a-input class="dialogInput"
                      style="width: 200px"
-                     v-model:value="formState.accountname"
+                     v-model:value="formState.logincode"
                      placeholder="请输入登录账号" />
           </a-form-item>
         </a-col>

src/views/information/account_info/compoments/cancel-business/index.vue

@@ -25,13 +25,13 @@
         <a-col :span="12">
           <a-form-item label="登录账号"
                        name="">
-            <span class="white">{{formState.accountname}}</span>
+            <span class="white">{{formState.logincode}}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
           <a-form-item label="账户名称"
                        name="">
-            <span class="white">{{formState.logincode}}</span>
+            <span class="white">{{formState.accountname}}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">

src/views/information/account_info/compoments/locked-business/index.vue

@@ -19,13 +19,13 @@
         <a-col :span="12">
           <a-form-item label="登录账号"
                        name="">
-            <span class="white">{{formState.accountname}}</span>
+            <span class="white">{{formState.logincode}}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
           <a-form-item label="账户名称"
                        name="">
-            <span class="white">{{formState.logincode}}</span>
+            <span class="white">{{formState.accountname}}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">

src/views/information/account_info/compoments/modify-business/index.vue

@@ -36,7 +36,7 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="账户名称"
-                       name="logincode">
+                       name="accountname">
             <a-input class="dialogInput"
                      style="width: 200px"
                      v-model:value="formState.accountname"
@@ -45,7 +45,7 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="登录账号"
-                       name="accountname">
+                       name="logincode">
             <a-input class="dialogInput"
                      style="width: 200px"
                      readonly
@@ -106,11 +106,14 @@ export default defineComponent({
                     operatetype: 2,
                     userid: props.selectedData.userid,
                     loginid: props.selectedData.loginid,
+                    logincode: param.logincode,
                     areauserid: Number(getUserId()),
+                    accountname: param.accountname,
                     password: '',
                     logintaaccounts: [],
                 };
                 Object.assign(reqParam, param);
+                debugger
                 requestResultLoadingAndInfo(loginAccountOperate, reqParam, loading, ['修改账户成功', '修改账户失败:']).then(() => {
                     cancel();
                     context.emit('refresh');

src/views/information/account_info/compoments/reset-business/index.vue

@@ -96,7 +96,7 @@ export default defineComponent({
                 let reqParam: LoginaccountOperateReq = {
                     userid: props.selectedData.userid,
                     loginid: props.selectedData.loginid,
-                    operatetype: 7, // 5: 锁定 6：解锁
+                    operatetype: 9, // 5: 锁定 6：解锁
                     logintaaccounts: [],
                     password: res.password,
                 };