页面优化

src/views/HomeView/EarnPoints.vue

@@ -20,7 +20,11 @@
             <el-table-column align="center" prop="integral" min-width="100" label="积分"></el-table-column>
             <el-table-column min-width="60" align="center" prop="statusName" label="状态"></el-table-column>
             <el-table-column min-width="150" align="center" prop="createTime" label="上传时间"></el-table-column>
-            <el-table-column min-width="150" align="center" prop="content" label="备注"></el-table-column>
+            <el-table-column min-width="80" align="center" label="备注">
+              <template slot-scope="props">
+                <div :title="props.row.content" class="text-overflow">{{ props.row.content }}</div>
+              </template>
+            </el-table-column>
           </el-table>
           <!-- 分页 -->
           <div class="myPage">
@@ -42,18 +46,35 @@
 
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="typeName" min-width="100" label="表彰类型"></el-table-column>
+            <el-table-column align="center" prop="typeName" min-width="80" label="表彰类型"></el-table-column>
             <el-table-column align="center" min-width="100" label="表彰人员">
               <template slot-scope="props">
-                <div v-for="(item, index) in props.row.groupUsers" :key="index">
-                    {{ item.userName }}
-                </div>
+                <el-popover trigger="hover">
+                  <el-table :data="props.row.groupUsers" border size="mini">
+                    <el-table-column min-width="200" align="center" prop="deptName" label="部门"></el-table-column>
+                    <el-table-column min-width="100" align="center" prop="userName" label="姓名"></el-table-column>
+                    <el-table-column min-width="100" align="center" prop="employeNo" label="员工号"></el-table-column>
+                  </el-table>
+                  <span style="color: #1e80ff;cursor: pointer;" slot="reference">查看</span>
+                </el-popover>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" min-width="100" label="客户名称">
+              <template slot-scope="props">
+                <div :title="props.row.customerName" class="text-overflow">{{ props.row.customerName }}</div>
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="customerName" min-width="100" label="客户名称"></el-table-column>
-            <el-table-column align="center" prop="title" min-width="100" label="表彰名称"></el-table-column>
-            <el-table-column min-width="150" align="center" prop="content" label="表彰描述"></el-table-column>
-            <el-table-column min-width="120" align="center" label="状态">
+            <el-table-column align="center" min-width="100" label="表彰名称">
+              <template slot-scope="props">
+                <div :title="props.row.title" class="text-overflow">{{ props.row.title }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column min-width="100" align="center" label="表彰描述">
+              <template slot-scope="props">
+                <div :title="props.row.content" class="text-overflow">{{ props.row.content }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column min-width="100" align="center" label="状态">
               <template slot-scope="props">
                 <el-popover trigger="hover">
                   <el-table :data="props.row.logs" border size="mini">
@@ -62,17 +83,17 @@
                     <!-- <el-table-column min-width="120" align="center" prop="statusName" label="状态"></el-table-column> -->
                     <el-table-column min-width="180" align="center" prop="createTime" label="处理时间"></el-table-column>
                   </el-table>
-                  <span style="color: #1e80ff;cursor: pointer;" slot="reference">{{ props.row.statusName }}</span>
+                  <span style="cursor: pointer;" slot="reference">{{ props.row.statusName }}</span>
                 </el-popover>
               </template>
             </el-table-column>
-            <el-table-column min-width="150" align="center" prop="createTime" label="上传时间"></el-table-column>
+            <el-table-column min-width="120" align="center" prop="createTime" label="上传时间"></el-table-column>
           </el-table>
           <!-- 分页 -->
           <div class="myPage">
             <el-pagination @size-change="handleSizeChangeCite" @current-change="handleCurrentChangeCite"
               :current-page="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10"
-              layout="total, sizes, prev, pager, next, jumper" :totalCite="totalCite">
+              layout="total, sizes, prev, pager, next, jumper" :total="totalCite">
             </el-pagination>
           </div>
         </el-tab-pane>
@@ -125,8 +146,8 @@
         <el-form-item label="表彰名称:" prop="title">
           <el-input clearable style="width: 95%;" size="small" v-model="dataFormCite.title"></el-input>
         </el-form-item>
-        <el-form-item label="表彰描述:" prop="title">
-          <el-input  type="textarea" :rows="2" clearable style="width: 95%;" size="small" v-model="dataFormCite.content"></el-input>
+        <el-form-item label="表彰描述:" prop="content">
+          <el-input  type="textarea" :rows="5" maxlength="500" show-word-limit style="width: 95%;" size="small" v-model="dataFormCite.content"></el-input>
         </el-form-item>
         <el-form-item label="表彰附件:" prop="fileIds">
           <el-upload :action="fileUrl" :file-list="dataFormCite.files" :on-success="handleAvatarSuccessCite"
@@ -180,7 +201,7 @@ export default {
         customerName: [{ required: true, message: "请填写客户名称", trigger: "blur" }],
         title: [{ required: true, message: "请填写表彰名称", trigger: "blur" }],
         fileIds: [{ required: true, message: "请上传附件", trigger: "blur" }],
-        content: [{ required: true, message: "请填写表彰描述", trigger: "blur" }],
+        content: [{ required: true, message: '请填写表彰描述', trigger: 'blur' }],
       },
       totalCite: 0,
       listQueryCite: {
@@ -378,7 +399,7 @@ export default {
     getDataListCite() {
       citeList(this.listQueryCite).then(response => {
         this.dataListCite = response.data.data.items;
-        this.totalCite = response.data.data.totalCite;
+        this.totalCite = response.data.data.total;
       })
     },
     handleSizeChangeCite(val) {
@@ -394,6 +415,14 @@ export default {
 };
 </script>
 <style scoped>
+
+.text-overflow {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+}
 .right-wrap {
   width: 100%;
 }

src/views/HomeView/RedeemView.vue

@@ -224,7 +224,7 @@
         </el-dialog>
         <el-dialog title="手机充值" :visible.sync="dialogFormPhoneNumber" width="500px">
             <el-form :model="dataFormPhoneNumber" ref="dataFormPhoneNumber" :rules="rules">
-                <el-form-item label="充值手机号" :label-width="formLabelWidth" prop="phoneNumber">
+                <el-form-item label="充值手机" :label-width="formLabelWidth" prop="phoneNumber">
                     <el-input size="medium" v-model="dataFormPhoneNumber.phoneNumber" placeholder="请输入11位手机号码"></el-input>
                 </el-form-item>
             </el-form>