优化

src/components/AppealRewrite.vue

@@ -63,7 +63,6 @@
               >
                 <el-tag closable style="cursor: pointer" slot="reference" @close="deleteEvent(item)">{{item.remark}}</el-tag>
               </el-popover>
-
               <el-input type="textarea" :rows="2" v-model="item.appeal_remark" placeholder="申诉原因" maxlength="100" show-word-limit :disabled="!canRewrite" />
             </el-form-item>
           </el-scrollbar>

src/point/views/common/AppealPopup.vue

@@ -19,7 +19,14 @@
           <div>
             <p><el-tag>{{appealInfo.create_time}}</el-tag>&nbsp;发起申诉</p>
             <p>共&nbsp;<el-tag>{{appealInfo.events.length}}</el-tag>&nbsp;条积分事件</p>
-            <p v-if="appealInfo.global_remark">申请原因&nbsp;:&nbsp;<el-tag>{{appealInfo.global_remark}}</el-tag></p>
+            <div v-if="appealInfo.global_remark">
+              <p>申请原因:</p>
+              <el-alert
+                :title="appealInfo.global_remark"
+                type="info"
+                :closable="false"
+              />
+            </div>
             <template v-if="appealInfo.complete_time">
               <p><el-tag>{{appealInfo.complete_time}}</el-tag>&nbsp;审批结束</p>
             </template>
@@ -43,15 +50,11 @@
                   <el-descriptions-item label="发起时间">{{item.create_time}}</el-descriptions-item>
                   <el-descriptions-item label="审批人">{{item.reviewer_name}}</el-descriptions-item>
                   <el-descriptions-item label="审批意见" v-if="item.remark" >
-                    <el-popover
-                      placement="bottom"
-                      title="审批意见"
-                      width="300"
-                      trigger="click"
-                      :content="item.remark"
-                    >
-                      <el-tag style="cursor: pointer" slot="reference" >{{item.remark}}</el-tag>
-                    </el-popover>
+                    <el-alert
+                      :closable="false"
+                      :title="item.remark"
+                      type="info"
+                    />
                   </el-descriptions-item>
                   <el-descriptions-item label="完结时间" v-if="item.complete_time" >{{item.complete_time}}</el-descriptions-item>
                 </el-descriptions>
@@ -67,19 +70,27 @@
                 {{item.point + ' ' + ptName(item.pt_id)}}
                 <el-tag :type="pointStatusType(item.status)" v-if="pointStatusMap[item.status]">{{pointStatusMap[item.status]}}</el-tag>
               </el-descriptions-item>
-              <el-descriptions-item label="积分备注">{{item.event_remark}}</el-descriptions-item>
+              <el-descriptions-item label="积分备注">
+                <el-alert
+                  :title="item.event_remark"
+                  :closable="false"
+                  type="success"
+                />
+              </el-descriptions-item>
               <el-descriptions-item label="时间">{{item.event_time}}</el-descriptions-item>
               <el-descriptions-item v-if="item.appeal_remark" label="申诉原因">{{item.appeal_remark}}</el-descriptions-item>
               <el-descriptions-item v-if="item.delete_time" label="已删除">{{item.delete_time}}</el-descriptions-item>
             </el-descriptions>
           </el-collapse-item>
           <el-collapse-item :title="appealInfo.logs.length + '条操作日志'" name="logs">
-            <el-row class="detail_row" v-for="(item,index) in appealInfo.logs" :key="index" >
-              <el-col>
-                <el-tag v-if="item.create_time">{{item.create_time}}</el-tag>
-                {{item.msg}}
-              </el-col>
-            </el-row>
+            <el-alert
+              v-for="(item,index) in appealInfo.logs"
+              :key="index"
+              type="info"
+              show-icon
+              :title="item.create_time + ' ' + item.msg"
+              :closable="false"
+            />
           </el-collapse-item>
         </el-collapse>
       </el-main>

src/point/views/common/examinePopup.vue

@@ -121,13 +121,15 @@
             <Steps :process="detail_info.process"></Steps>
           </div>
           <el-collapse v-if="detail_info && detail_info.logs" v-model="infoActiveNames">
-            <el-collapse-item :title="detail_info.logs.length + '条操作日志'" name="logs">
-              <el-row class="detail_row" v-for="(item,index) in detail_info.logs" :key="index">
-                <el-col>
-                  <el-tag v-if="item.create_time">{{item.create_time}}</el-tag>
-                  {{item.msg}}
-                </el-col>
-              </el-row>
+            <el-collapse-item :disabled="detail_info.logs.length === 0" :title="detail_info.logs.length + '条操作日志'" name="logs">
+              <el-alert
+                v-for="(item,index) in detail_info.logs"
+                :key="index"
+                type="info"
+                show-icon
+                :title="item.create_time + ' ' + item.msg"
+                :closable="false"
+              />
             </el-collapse-item>
           </el-collapse>
         </div>

src/point/views/workbench/task/my_task.vue

@@ -154,9 +154,11 @@ export default {
       this.get_list();
     },
     'formData.pt_id'(val) {
+      this.formData.page = 1;
       this.get_list();
     },
     'formData.sort'(val) {
+      this.formData.page = 1;
       this.get_list();
     },
     'formData.status'(val) {