Merge branch 'master' of http://dev.sohomall.jp:3000/lizhuang/DOAS

src/views/daka/attendanceteam/index.vue

@@ -182,6 +182,7 @@
           >
             <el-table-column prop="userName" label="姓名"></el-table-column>
             <el-table-column prop="userId" label="工号"></el-table-column>
+            <el-table-column prop="nickName" label="用户昵称"></el-table-column>
             <el-table-column prop="deptName" label="部门"></el-table-column>
             <el-table-column label="操作" width="80">
               <template #default="scope">

src/views/daka/record/index.vue

@@ -116,23 +116,18 @@
     >
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column v-if="false" label="主键ID" align="center" prop="id" />
-      <el-table-column
-        label="员工姓名"
-        align="center"
-        prop="sysUserName"
-      >
+      <el-table-column label="员工姓名" align="center" prop="sysUserName" >
+      </el-table-column>
+      <!-- <el-table-column label="姓名昵称" align="center" prop="nickName" >
+      </el-table-column> -->
+      <el-table-column label="考勤组" align="center" prop="attendanceGroupName" >
       </el-table-column>
       <el-table-column   label="打卡时间" align="center" prop="checkInTime">
-        
       </el-table-column>
-      <el-table-column
-        label="上班打卡状态"
-        align="center"
-        prop="clockInStatus"
-      >
+      <el-table-column label="上班打卡状态" align="center" prop="clockInStatus" >
         <template slot-scope="scope">
           <span
-            v-if="scope.row.clockInStatus == '0'"
+            v-if="scope.row.checkInStatus == '0'"
             style="
               display: inline-flex;
               align-items: center;
@@ -143,7 +138,7 @@
             未打卡
           </span>
           <span
-            v-if="scope.row.checkInStatus == '1'"
+            v-if="scope.row.clockInStatus == '1'"
             style="
               display: inline-flex;
               align-items: center;
@@ -154,7 +149,7 @@
             上班已打卡
           </span>
           <span
-            v-if="scope.row.checkInStatus == '2'"
+            v-if="scope.row.clockInStatus == '2'"
             style="
               display: inline-flex;
               align-items: center;
@@ -165,7 +160,7 @@
             下班已打卡
           </span>
           <span
-            v-if="scope.row.checkInStatus == '3'"
+            v-if="scope.row.clockInStatus == '3'"
             style="
               display: inline-flex;
               align-items: center;
@@ -176,7 +171,7 @@
             迟到打卡
           </span>
           <span
-            v-if="scope.row.checkInStatus == '4'"
+            v-if="scope.row.clockInStatus == '4'"
             style="
               display: inline-flex;
               align-items: center;
@@ -187,7 +182,7 @@
             早退打卡
           </span>
           <span
-            v-if="scope.row.checkInStatus == '5'"
+            v-if="scope.row.clockInStatus == '5'"
             style="
               display: inline-flex;
               align-items: center;
@@ -199,14 +194,10 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="下班打卡状态"
-        align="center"
-        prop="clockOutStatus"
-      >
+      <el-table-column label="下班打卡状态" align="center" prop="clockOutStatus" >
         <template slot-scope="scope">
           <span
-            v-if="scope.row.clockOutStatus == '0'"
+            v-if="scope.row.checkInStatus == '0'"
             style="
               display: inline-flex;
               align-items: center;
@@ -217,7 +208,7 @@
             未打卡
           </span>
           <span
-            v-if="scope.row.checkInStatus == '1'"
+            v-if="scope.row.clockOutStatus == '1'"
             style="
               display: inline-flex;
               align-items: center;
@@ -228,7 +219,7 @@
             上班已打卡
           </span>
           <span
-            v-if="scope.row.checkInStatus == '2'"
+            v-if="scope.row.clockOutStatus == '2'"
             style="
               display: inline-flex;
               align-items: center;
@@ -239,7 +230,7 @@
             下班已打卡
           </span>
           <span
-            v-if="scope.row.checkInStatus == '3'"
+            v-if="scope.row.clockOutStatus == '3'"
             style="
               display: inline-flex;
               align-items: center;
@@ -250,7 +241,7 @@
             迟到打卡
           </span>
           <span
-            v-if="scope.row.checkInStatus == '4'"
+            v-if="scope.row.clockOutStatus == '4'"
             style="
               display: inline-flex;
               align-items: center;
@@ -261,7 +252,7 @@
             早退打卡
           </span>
           <span
-            v-if="scope.row.checkInStatus == '5'"
+            v-if="scope.row.clockOutStatus == '5'"
             style="
               display: inline-flex;
               align-items: center;

vue.config.js

@@ -33,7 +33,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.1.107:8080`,
+        target: `http://127.0.0.1:8080`,
+        // target: `http://172.17.0.1:4001`,
+        // target: `https://digital.sohomall.jp/prod-api`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''