@logwire/logwire-wms-pda-ui 1.1.19 → 1.2.0

package/src/components/page/common/Msg/index.vue

@@ -9,34 +9,80 @@
 
     <div class="lw-global-page-box">
       <div class="lw-global-tab-box">
+
+        <!-- 消息类型tab -->
         <van-tabs
           type="card"
           animated
-          v-model="tabActive"
-          @change="tabChange"
+          v-model="typeTab.active"
+          @change="typeTabChange"
         >
 
-          <slot name="topTabItem"/>
-
-          <van-tab name="unread" :title="$lwLanguage.get('wms_project.pda.common.message.unread','未读')">
-            <lw-msg-item-module
-              ref="unread"
-              type="unread"
-              @click="msgClick"
-            />
-          </van-tab>
-
-          <van-tab name="read" :title="$lwLanguage.get('wms_project.pda.common.message.read','已读')">
-            <lw-msg-item-module
-              ref="read"
-              :page-size="5"
-              type="read"
-              @click="msgClick"
-            />
+          <van-tab
+            v-for="(i,k) in typeTab.obj"
+            :key="k"
+            :name="i.bizType"
+            :title="k.toString()"
+          >
+            <template #title>
+              <div class="lw-global-tip-box">
+                <span>{{ i.bizTypeLabel }}</span>
+                <span class="lw-global-tip">{{ $lwTip(i.unreadCount) }}</span>
+              </div>
+            </template>
           </van-tab>
 
-          <slot name="endTabItem"/>
         </van-tabs>
+
+        <!-- 已读未读tab -->
+        <template v-if="Object.keys(readTab.data).length">
+          <van-tabs
+            type="card"
+            animated
+            v-model="readTab.action"
+            @change="readTabChange"
+          >
+
+            <van-tab name="unread">
+              <template #title>
+                <div class="lw-global-tip-box">
+                <span>
+                  {{ $lwLanguage.get('wms_project.pda.common.message.unread', '未读') }}
+                </span>
+                  <span
+                    v-if="$lwTip(readTab.data.unreadCount)"
+                    class="lw-global-tip"
+                  >{{ $lwTip(readTab.data.unreadCount) }}</span>
+                </div>
+              </template>
+            </van-tab>
+
+            <van-tab name="read">
+              <template #title>
+                <div class="lw-global-tip-box">
+                <span>
+                  {{ $lwLanguage.get('wms_project.pda.common.message.read', '已读') }}
+                </span>
+                  <span
+                    v-if="$lwTip(readTab.data.readCount)"
+                    class="lw-global-tip"
+                  >{{ $lwTip(readTab.data.readCount) }}</span>
+                </div>
+              </template>
+            </van-tab>
+
+          </van-tabs>
+
+          <lw-msg-item-module
+            v-model="msg.pageNum"
+            :page-size.sync="msg.pageSize"
+            :page-total="msg.pageTotal"
+            :msg-list="msg.list"
+            @change="pageChange"
+            @click="msgClick"
+          />
+        </template>
+
       </div>
     </div>
 
@@ -55,10 +101,10 @@
         <div class=lw-global-title>{{ $lwDate.format(msgItem.publishTime) }}</div>
 
         <lw-tag
-          :type="tabActive==='unread'? 'danger' : 'primary'"
+          :type="readTab.action==='unread'? 'danger' : 'primary'"
           plain
           round
-        >{{ tabActive==='unread' ?
+        >{{ readTab.action==='unread' ?
             $lwLanguage.get('wms_project.pda.common.message.unread','未读') :
             $lwLanguage.get('wms_project.pda.common.message.read','已读') }}
         </lw-tag>
@@ -68,7 +114,7 @@
 
       <template #button>
         <lw-button
-          v-if="msgItem.handleable"
+          v-if="msgItem.appBtnUrl"
           @click="goPage"
         >{{ $lwLanguage.get('wms_project.pda.common.message.dispose','去处理') }}</lw-button>
       </template>
@@ -82,8 +128,28 @@ export default {
   name: "lwMsgPage",
   data() {
     return {
-      // 当前激活项
-      tabActive:'unread',
+      // 类型tab
+      typeTab:{
+        active:'',
+        obj:[]
+      },
+
+      // 读取状态tab
+      readTab:{
+        action: '',
+        // 读取数据
+        data:{},
+        list:[]
+      },
+
+      // 数据显示
+      msg:{
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
+        list: []
+      },
+
       // 显示弹框
       popupShow: false,
       // 显示数据
@@ -94,20 +160,62 @@ export default {
       update: false
     }
   },
+  activated(){
+    this.init()
+  },
   methods: {
-    // tab切换
-    tabChange(name, title){
-      if (name === 'read' && this.update){
-        this.$refs.read && this.$refs.read.getMsg()
-        this.update = false
-      }
-      this.$emit('change', name, title)
+    // 初始化数据
+    init(){
+      this.typeTab.obj = {}
+      this.$lwApi.msg.getBizType().then(res=>{
+
+        res.bizTypeList.forEach(item=>{
+          this.typeTab.obj[item.bizType] = item
+        })
+
+        const active = this.typeTab.active
+
+        // 判断是否存在已有消息类型项，如果有就看当前数据中是否有该项的值
+        if (!active || !this.typeTab.obj[active]){
+
+          this.typeTab.active = this.typeTab.obj[Object.keys(this.typeTab.obj)[0]].bizType
+        }
+
+        this.typeTabChange(this.typeTab.active)
+      })
+    },
+
+    // 消息类型切换
+    typeTabChange(name){
+      this.readTab.action = 'unread'
+      this.readTab.data = this.typeTab.obj[name]
+      this.$nextTick(()=>{
+        this.readTabChange()
+      })
+    },
+
+    // 已读未读切换
+    readTabChange(){
+      this.msg.pageNum = 1
+      this.pageChange()
+    },
+    // 分页切换
+    pageChange(){
+      this.$lwApi.msg.getList({
+        pageNum:this.msg.pageNum - 1,
+        pageSize:this.msg.pageSize,
+        flag: this.readTab.action === 'unread' ? 0 : 1,
+        bizType: this.readTab.data.bizType
+      }).then(res=>{
+        this.msg.list = res.messages || []
+        this.msg.pageTotal = res.messageCount || 0
+      })
     },
 
     // 消息点击
     async msgClick(item){
 
-      if (this.tabActive === 'unread'){
+      if (this.readTab.action === 'unread'){
         await this.$lwApi.msg.read({
           messageId:item.id
         })
@@ -122,14 +230,14 @@ export default {
     // 去处理被点击
     goPage(){
       this.$router.push({
-        path:this.msgItem.relatedLink
+        path:this.msgItem.appBtnUrl
       })
     },
 
     // 关闭弹出层
     popupClosed(){
-      if (this.tabActive === 'unread'){
-        this.$refs.unread.getMsg()
+      if (this.readTab.action === 'unread'){
+        this.init()
         this.update = true
       }
       this.showContent = false

package/src/components/page/common/My/index.vue

@@ -149,6 +149,25 @@
       </lw-cell>
 
 
+      <!-- 时区 -->
+      <lw-cell
+        class="lw-global-animation-out"
+        style="animation-delay: 300ms"
+        v-if="showTimezone"
+        :value="timezone"
+        @click="cellClick('timezone')"
+      >
+        <template #title>
+          <div class="lw-global-flex-start">
+            <img class="lw-my-page-set-img" src="../../../../assets/img/my/timezone.png" alt="">
+            <span class="lw-my-page-set-title">
+              {{ $lwLanguage.get('wms_project.pda.page.common.timezone.select','时区选择') }}
+            </span>
+          </div>
+        </template>
+      </lw-cell>
+
+
       <!-- 版本号 -->
       <lw-cell
         class="lw-global-animation-out"
@@ -160,7 +179,7 @@
           <div class="lw-global-flex-start">
             <img class="lw-my-page-set-img" src="../../../../assets/img/my/versions.png" alt="">
             <span class="lw-my-page-set-title">
-              {{ $lwLanguage.get('','版本号') }}
+              {{ $lwLanguage.get('wms_project.pda.components.page.common.My.tskysabk','版本号') }}
             </span>
           </div>
         </template>
@@ -188,6 +207,10 @@
 
 <script>
 import config from "./../../../../../package.json";
+
+import myBackgroundImg from '../../../../assets/img/my/myBackground.png'
+import userImg from '../../../../assets/img/my/user.png'
+
 export default {
   name: "lwMyPage",
   props:{
@@ -198,11 +221,11 @@ export default {
     },
     // 用户基础信息背景图
     bgImg:{
-      default: require('../../../../assets/img/my/myBackground.png')
+      default: myBackgroundImg
     },
     // 用户头像
     userPhoto:{
-      default: require('../../../../assets/img/my/user.png')
+      default: userImg
     },
 
     // 是否显示系统信息
@@ -276,12 +299,23 @@ export default {
       type: Boolean,
       default: true
     },
-    // 点击消息跳转的页面
+    // 点击语言跳转的页面
     languagePath: {
       type: String,
       default: '/lwLanguage'
     },
 
+    // 是否显示时区选择
+    showTimezone: {
+      type: Boolean,
+      default: true
+    },
+    // 点击时区跳转的页面
+    timezonePath: {
+      type: String,
+      default: '/lwTimezone'
+    },
+
     // 是否显示退出按钮
     showLogout:{
       type: Boolean,
@@ -317,6 +351,9 @@ export default {
       // 当前语言
       language:'',
 
+      // 当前时区
+      timezone:'',
+
       // 版本号
       version:''
     }
@@ -358,6 +395,12 @@ export default {
       this.language = data.length ? data[0].label : languageKey
     })
 
+    const lwTimezone = this.$lwLocalStorag.get('lwTimezone')
+
+    // 当前时区
+    this.timezone = lwTimezone ? lwTimezone.timezone : '-'
+
+    // 版本号
     this.version = 'v ' + config.version
   },
   methods: {