3
0

2 Ревизии 5b41636a22 ... b42321b68f

Автор SHA1 Съобщение Дата
  qiny b42321b68f Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA преди 11 месеца
  qiny d6711f0cc4 fix: 小改动 преди 11 месеца
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 2 2
      client/src/views/OaSystem/mineCenter/rightChild/index.ts
  2. 1 1
      client_h5/src/pages/myLogs/Receive/index.vue

+ 2 - 2
client/src/views/OaSystem/mineCenter/rightChild/index.ts

@@ -205,7 +205,7 @@ const additionalConfig = [
 const getDictList = () => {
   const dictOptionsObj: any = {}
   // 性别
-  // const sex = getDictOptions('system_user_sex')
+  const sex = getDictOptions('system_user_sex')
   // 状态
   const state = getDictOptions('staff_state_type')
   // 在岗职位
@@ -225,7 +225,7 @@ const getDictList = () => {
   // 紧急联系人关系
   const jjlxrgx = getDictOptions('contact_type')
 
-  // dictOptionsObj.sex = sex
+  dictOptionsObj.sex = sex
   dictOptionsObj.state = state
   dictOptionsObj.drzw = drzw
   dictOptionsObj.nation = nation

+ 1 - 1
client_h5/src/pages/myLogs/Receive/index.vue

@@ -13,7 +13,7 @@
           :key="index"
           @click="toDetail(item)"
         >
-          <div class="time-box" v-if="isSameDay(item, index)">
+          <div class="time-box">
             <span class="timer">{{ timeFont(item.fillingDate) }}</span>
           </div>
           <div class="card-box">