账户明细

src/common/components/commonDes/commonDes.vue

@@ -47,5 +47,18 @@ export default defineComponent({
 
 <style lang="less">
 .commom-des {
+    .ant-descriptions-item-label {
+        display: inline-block;
+        width: 130px;
+        line-height: 30px;
+        padding-left: 16px;
+        color: @m-grey1;
+        &::after {
+            content: '';
+        }
+    }
+    .ant-descriptions-item-content {
+        color: @m-grey1;
+    }
 }
 </style>;

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 账号详情-->
+  <!-- 账户明细-->
   <a-modal class="commonModal custom-detail"
            title="账户明细"
            v-model:visible="visible"
@@ -14,61 +14,22 @@
     </template>
     <a-form class="inlineForm"
             :model="formState">
-      <!-- <Des :list="desList"
+      <Des :list="desList"
            :slotDesName="'账户角色'">
         <a-checkbox-group class="commonCheckboxGroup"
-                          v-model:value="formState.roleids">
+                          v-model:value="roles">
           <a-row>
-            <a-col :span="12">
-              <a-checkbox :value="22">业务员</a-checkbox>
-            </a-col>
-            <a-col :span="12">
-              <a-checkbox :value="23">跟单员</a-checkbox>
+            <a-col :span="12"
+                   v-for="item in roleTypeList"
+                   :key="item.key">
+              <a-checkbox disabled
+                          :value="item.key">
+                {{item.value}}
+              </a-checkbox>
             </a-col>
           </a-row>
         </a-checkbox-group>
-<<<<<<< HEAD
       </Des>
-      <!-- <a-row :gutter="24">
-=======
-      </Des> -->
-      <a-row :gutter="24">
->>>>>>> e29e164b2d8593fdcda06ef0111c8f6d22d2cec9
-        <a-col :span="12">
-          <a-form-item label="登录账号"
-                       name="">
-            <span class="white">{{formState.logincode}}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="账户名称"
-                       name="">
-            <span class="white">{{formState.accountname}}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="手机号码"
-                       name="">
-            <span class="white">{{formState.mobile}}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="账户角色"
-                       name="userinfotype">
-            <a-checkbox-group class="commonCheckboxGroup"
-                              v-model:value="formState.roleids">
-              <a-row>
-                <a-col :span="12">
-                  <a-checkbox :value="22">业务员</a-checkbox>
-                </a-col>
-                <a-col :span="12">
-                  <a-checkbox :value="23">跟单员</a-checkbox>
-                </a-col>
-              </a-row>
-            </a-checkbox-group>
-          </a-form-item>
-        </a-col>
-      </a-row> -->
     </a-form>
   </a-modal>
 </template>
@@ -76,7 +37,6 @@
 <script lang="ts">
 import { defineComponent, PropType, ref, watchEffect } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
-import { mergeTwoObj } from '@/utils/objHandle';
 import { handleBusinessForm } from '../setup';
 import { ErmcpLoginUser } from '@/services/go/ermcp/account/interface';
 import { Des, handleDesList } from '@/common/components/commonDes';
@@ -96,6 +56,11 @@ export default defineComponent({
         const { visible, cancel } = closeModal('detail');
         const { formState } = handleBusinessForm();
         const { desList, getDesList } = handleDesList();
+        const roleTypeList = [
+            { key: 22, value: '业务员' },
+            { key: 23, value: '跟单员' },
+        ];
+        const roles = ref<number[]>([]);
         watchEffect(() => {
             if (visible.value) {
                 const data = props.selectedData;
@@ -104,14 +69,15 @@ export default defineComponent({
                     { label: '账户名称', value: data.accountname },
                     { label: '手机号码', value: data.mobile },
                 ]);
-                mergeTwoObj(formState, props.selectedData);
                 // roletype	:string;//角色类型(逗号隔开,如22,23), 22:业务员 23:跟单员 24:交易员
-                formState.roleids = props.selectedData.roletype.split(',').map((e) => +e);
+                roles.value = props.selectedData.roletype.split(',').map((e) => +e);
             }
         });
         return {
             visible,
             cancel,
+            roleTypeList,
+            roles,
             formState,
             desList,
             maskClosableFlag: false,
@@ -125,20 +91,5 @@ export default defineComponent({
     .ant-form.inlineForm {
         margin-top: 20px;
     }
-    .ant-descriptions.commom-des {
-      .ant-descriptions-item-label {
-            display: inline-block;
-            width: 130px;
-            line-height: 30px;
-            padding-left: 16px;
-            color: @m-grey1;
-            &::after{
-              content: ''
-            }
-      }
-      .ant-descriptions-item-content {
-
-      }
-    }
 }
 </style>;