zhuliu 7 months ago
parent
commit
b08337c542

+ 1 - 1
src/views/report/InvalidResponse/components/IPREmail/components/dialog/addOrEditIPREmail.vue

@@ -13,7 +13,7 @@
             <el-input v-model="form.email" placeholder="请输入邮箱"></el-input>
         </el-form-item>
         <el-form-item label="关联账号:" prop="assoAccountId">
-          <el-select style="width:100%" v-model="form.assoAccountId" placeholder="请选择账号" filterable remote @focus="focusPerson(form.userName)"
+          <el-select style="width:100%" v-model="form.assoAccountId" placeholder="请选择账号" filterable remote @focus="focusPerson(form.accountUserName)"
             :popper-append-to-body="false" :remote-method="remoteMethodPerson" v-SelectLazyLoading="lazyLoadingPerson"
             :loading="personnelList.loading">
             <el-option v-for="item in personnelList.data" :key="Number(item.id)" :label="item.name"

+ 4 - 1
src/views/report/InvalidResponse/components/table/IPREmail.vue

@@ -51,7 +51,10 @@ const defaultColumnList = [
         name:'账号',
         ifSort:false,
         width:'150px',
-        type:"string",
+        type:"function",
+        useFunction:(data)=>{
+            return `${data.accountName}(${data.accountUserName})`
+        }
     },
     {
         field:'remark',

+ 2 - 2
src/views/report/components/dialog/components/handelPersonTable.vue

@@ -73,10 +73,10 @@
                 <template slot-scope="scope">
                     <div>
                         <div v-if="scope.row.id  && editMessage.id!=scope.row.id">
-                            {{ scope.row.assoAccountId }}
+                            {{ scope.row.accountName + '('+ scope.row.accountUserName +')' }}
                         </div>
                         <div v-else>
-                            <el-select style="width:100%" v-model="scope.row.assoAccountId" placeholder="请选择账号" filterable remote @focus="focusPerson(scope.row.userName)"
+                            <el-select style="width:100%" v-model="scope.row.assoAccountId" placeholder="请选择账号" filterable remote @focus="focusPerson(scope.row.accountUserName)"
                                 :popper-append-to-body="false" :remote-method="remoteMethodPerson" v-SelectLazyLoading="lazyLoadingPerson" :disabled="currentEditField && currentEditField!='assoAccountId'"
                                 :loading="personnelList.loading">
                                 <el-option v-for="item in personnelList.data" :key="Number(item.id)" :label="item.name"