Преглед изворни кода

增加显示外请打卡备注。

zhengqiang пре 5 година
родитељ
комит
382ca0dffa

+ 1 - 0
src/views/base/businessOut-list.vue

@@ -170,6 +170,7 @@
         width="150"
         show-overflow-tooltip
       ></el-table-column>
+      <el-table-column prop="remark" label="备注" width="120"></el-table-column>
       <el-table-column label="操作" width="100">
         <template slot-scope="{ row }">
           <el-row>

+ 1 - 0
src/views/business/clockOut-list.vue

@@ -73,6 +73,7 @@
       <el-table-column prop="content" label="内容" width="180" show-overflow-tooltip></el-table-column>
       <el-table-column prop="approvalPersonName" label="审批人" width="120"></el-table-column>
       <el-table-column prop="statusN" label="审批状态" width="80"></el-table-column>
+      <el-table-column prop="remark" label="备注" width="120"></el-table-column>
       <el-table-column prop="createTime" label="创建时间"></el-table-column>
       <el-table-column fixed="right" width="150" label="操作">
         <template slot-scope="{row}">

+ 4 - 0
src/views/business/workAttendance-list.vue

@@ -439,6 +439,10 @@ export default {
         fontColor = "#11A8CD";
       }
 
+      if(item.workOutRemark!=null){
+        content.push("(" + item.workOutRemark + ")");
+      }
+
       return `<font color='${fontColor}'>` + content.join("") + "</font>";
     },
     handleQuery() {