@logwire/logwire-wms-pda-ui 3.1.0 → 3.1.2

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

@@ -0,0 +1,445 @@
+<!--
+  任务控制台
+  @author: 张文
+  @date: 2023-01-10
+-->
+<template>
+  <div>
+
+    <lw-nav-bar :title="title"/>
+
+    <div class="lw-global-page-box">
+
+      <template v-if="taskTypeList.length">
+
+        <!-- 任务类型tab -->
+        <lw-tab-box
+          v-if="taskTypeList.length !== 1"
+          :fixed="fixedTypeTab"
+        >
+          <van-tabs
+            type="card"
+            animated
+            v-model="taskTypeActive"
+            @change="taskTypeChange"
+          >
+
+            <van-tab
+              v-for="(i, k) in taskTypeList"
+              :key="i.type"
+              :name="i.type"
+              :title="k.toString()"
+            >
+              <template #title>
+                <div class="lw-global-tip-box">
+                  <span>{{ i.name }}</span>
+                  <span
+                    v-if="$lwTip(i.taskCount)"
+                    class="lw-global-tip"
+                  >{{ $lwTip(i.taskCount) }}</span>
+                </div>
+              </template>
+            </van-tab>
+
+          </van-tabs>
+        </lw-tab-box>
+
+
+        <!-- 任务状态tab -->
+        <lw-tab-box
+          v-if="taskStatus.list.length"
+          class="lw-global-tab-box"
+          :fixed="fixedStatusTab"
+        >
+          <van-tabs
+            type="card"
+            animated
+            v-model="taskStatus.active"
+            @change="taskStatusChange"
+          >
+
+            <van-tab
+              v-for="(i, k) in taskStatus.list"
+              :key="k"
+              :name="i.type"
+            >
+              <template #title>
+                <div class="lw-global-tip-box">
+                  <span>{{ i.name }}</span>
+                  <span
+                    v-if="$lwTip(i.taskCount)"
+                    class="lw-global-tip"
+                  >{{ $lwTip(i.taskCount) }}</span>
+                </div>
+              </template>
+            </van-tab>
+          </van-tabs>
+        </lw-tab-box>
+
+
+        <!-- 数据显示 -->
+        <template v-if="taskData.list.length">
+
+          <!-- 数据 -->
+          <task-item
+            v-for="i in taskData.list"
+            :key="i.taskId"
+            :item="i"
+            @click="taskItemClick(i)"
+          />
+
+          <!-- 分页 -->
+          <lw-pagination
+            v-model="taskData.pageNum"
+            :page-total="taskData.pageTotal"
+            :page-size.sync="taskData.pageSize"
+            @change="pageChange"
+          />
+        </template>
+        <lw-not-data v-else/>
+      </template>
+
+      <lw-not-data
+        v-else
+        :content="errorMsg"
+      />
+
+
+    </div>
+
+    <!-- 任务详情查看 -->
+    <look-task-content-popup
+      v-model="taskPopup.show"
+      :item="taskPopup.data"
+      @open="popupOpen"
+      @closed="popupClosed"
+      @acceptTask="acceptTask"
+      @claimTask="claimTask"
+      @startTask="startTask"
+    />
+
+  </div>
+</template>
+
+<script>
+import taskItem from "../Task/components/taskItem.vue";
+import lookTaskContentPopup from "../Task/components/lookTaskContentPopup.vue";
+
+export default {
+  name: "lwTaskConsolePage",
+  components:{
+    taskItem,
+    lookTaskContentPopup,
+  },
+  data() {
+    return {
+      // 标题
+      title: '',
+      // 需要显示的类型
+      typeList: [],
+      // 是否需要保存上一次的tab
+      saveTab: false,
+      // 是否需要固定状态tab
+      fixedTypeTab: false,
+      // 是否需要固定状态tab
+      fixedStatusTab: false,
+      // 错误信息
+      errorMsg: '',
+
+      // 任务看板数据及类型
+      taskInfo:{},
+      // 需要显示的任务tab
+      taskTypeList:[],
+      // 任务类型tabs
+      taskTypeActive:'',
+      // 任务状态tabs
+      taskStatus:{
+        active:'',
+        list:[]
+      },
+      // 任务数据
+      taskData:{
+        list:[],
+        pageNum: 1,
+        pageTotal: 0,
+        pageSize: 10
+      },
+
+      // 是否自动更新
+      autoUpdate: false,
+      // 自动刷新的定时器
+      autoTimer: null,
+      // 自动刷新的间隔周期
+      refreshTime:15,
+
+      // 查看任务弹出框
+      taskPopup:{
+        show:false,
+        data:{}
+      },
+
+      // 结束任务弹框
+      overTaskPopup:{
+        show:false,
+      }
+    }
+  },
+  mounted() {
+    /*
+    * lwTitle：页面标题，默认：任务控制台
+    * lwType：显示的tab类型，多个类型用英文逗号链接，值为空的时显示全部，值为一个时将不显示tab
+    * lwAutoUpdate：是否自动刷新，值为1时开启
+    * lwSaveTab：是否保存当前页激活tab，值为1时开启
+    * lwFixedTypeTab：是否在滚动时固定类型tab栏，值为1时开启
+    * lwFixedStatusTab：是否在滚动时固定状态tab栏，值为1时开启
+    * */
+    const {
+      lwTitle,
+      lwType,
+      lwAutoUpdate,
+      lwSaveTab,
+      lwFixedTypeTab,
+      lwFixedStatusTab
+    } = this.$route.query
+
+    this.title = lwTitle || this.$lwLanguage.get('','任务控制台')
+    this.typeList = lwType ? lwType.split(',') : []
+
+    this.autoUpdate = lwAutoUpdate === '1'
+    this.saveTab = lwSaveTab === '1'
+    this.fixedTypeTab = lwFixedTypeTab === '1'
+    this.fixedStatusTab = lwFixedStatusTab === '1'
+    this.showNowTab()
+    this.init()
+  },
+  methods: {
+    // 是否记录当前tab
+    showNowTab(){
+      this.sessionKey = this.$route.fullPath
+      if (!this.saveTab){
+        sessionStorage.removeItem(this.sessionKey)
+        return
+      }
+
+      const {taskTypeActive, taskStatusActive} = JSON.parse(sessionStorage.getItem(this.sessionKey) || '{}')
+      this.taskTypeActive = taskTypeActive
+      this.taskStatus.active = taskStatusActive
+    },
+
+    // 初始化任务数据
+    initTaskData(){
+      this.taskData.list=[]
+      this.taskData.pageNum=1
+      this.taskData.pageTotal=0
+    },
+
+    // 自动刷新
+    autoRefresh(){
+      this.autoTimer = setTimeout(() => {
+        this.init(false)
+      },this.refreshTime * 1000)
+    },
+
+    // 获取任务类型及任务数据
+    init(loading=true){
+      this.$lwApi.task.getTaskType({},{loading}).then(res=>{
+        this.taskInfo = res
+
+        // 找到传入的tab类型
+        this.taskTypeList =
+          this.typeList.length ?
+          res.typeList.filter(item=>this.typeList.includes(item.type)) :
+          res.typeList
+
+        if (!this.taskTypeList.length) {
+          this.errorMsg = this.$lwLanguage.get('','你没有查看任务类型为【{type}】的权限，请联系系统管理员添加',{type: this.typeList.join(',')})
+          return
+        }
+
+        let index = 0
+        if (this.saveTab && this.taskTypeActive){
+          for (let i = 0; i < this.taskTypeList.length; i++) {
+            if (this.taskTypeList[i].type === this.taskTypeActive ){
+              index = i
+              break
+            }
+          }
+        }
+
+        this.taskTypeActive = this.taskTypeList[index].type
+        this.taskNextType(this.taskTypeList[index],loading)
+
+      })
+    },
+
+    // 判断当前任务的子类型
+    taskNextType(item, loading=true){
+      // 判断当前任务的子类型
+      let taskStatus = []
+      switch (item.assignType){
+        case 'ACT_RECEIVE':
+          taskStatus = [
+            {
+              name: this.$lwLanguage.get('','领取'),
+              type: 1,
+              taskCount: item.unClaimTaskCount
+            },
+            {
+              name: this.$lwLanguage.get('','进行中'),
+              type: 2,
+              taskCount: item.receivedTaskCount
+            }
+          ]
+          break;
+        case 'AUTO_ASSIGN':
+          taskStatus = [
+            {
+              name: this.$lwLanguage.get('','待接收'),
+              type: 0,
+              taskCount: item.waitAcceptTaskCount
+            },
+            {
+              name: this.$lwLanguage.get('','进行中'),
+              type: 2,
+              taskCount: item.receivedTaskCount
+            }
+          ]
+          break;
+        default:
+          taskStatus = []
+      }
+
+      this.taskStatus.list = taskStatus
+
+      // 判断当前是否默认选择了子类型
+      if (this.taskStatus.list.length){
+
+        // 当前子类型如果为空 或者没有在现有子类型中找到
+        const has =this.taskStatus.active === '' || !this.taskStatus.list.some(item=>item.type === this.taskStatus.active)
+
+        // 如果没有就默认取第一项，否则不变
+        has ? this.taskStatus.active = this.taskStatus.list[0].type : ''
+
+      }else {
+        this.taskStatus.active = 2
+      }
+
+
+      this.getTaskTypeList(loading)
+    },
+
+    // 获取当前任务的数据
+    getTaskTypeList(loading=true){
+      clearTimeout(this.autoTimer)
+
+      // 找到当前任务类型的数据值
+      let item={}
+      for (let i = 0; i < this.taskTypeList.length; i++) {
+        if (this.taskTypeList[i].type === this.taskTypeActive){
+          item = this.taskTypeList[i]
+          break
+        }
+      }
+
+      // 分页总条数
+      switch (this.taskStatus.active){
+        case 0:
+          this.taskData.pageTotal = item.waitAcceptTaskCount || 0
+          break;
+        case 1:
+          this.taskData.pageTotal = item.unClaimTaskCount || 0
+          break;
+        case 2:
+          this.taskData.pageTotal = item.receivedTaskCount || 0
+          break;
+        default:
+          this.taskData.pageTotal = item.receivedTaskCount || 0
+          break;
+      }
+
+      this.$lwApi.task.getTaskList({
+        type:this.taskTypeActive,
+        queryType:this.taskStatus.active,
+        pageNum:this.taskData.pageNum - 1,
+        pageSize:this.taskData.pageSize
+      },{loading}).then(res=>{
+        this.taskData.list = res
+        this.autoUpdate && this.autoRefresh()
+      })
+    },
+
+
+    // 任务类型tabs切换
+    taskTypeChange(name,title){
+      this.initTaskData()
+      this.taskStatus.active=''
+      this.taskNextType(this.taskTypeList[title])
+    },
+    // 任务状态tabs切换
+    taskStatusChange(){
+
+      this.initTaskData()
+      this.getTaskTypeList()
+
+    },
+    // 页码切换
+    pageChange(){
+      this.getTaskTypeList()
+    },
+    // 任务被点击
+    taskItemClick(item){
+
+      if (!item || !item.content){
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('','任务详情数据为空，请确保数据配置正确！')
+        )
+        console.error('任务数据为空，不能有效展示:', item)
+        return
+      }
+
+      this.taskPopup.show = true
+      this.taskPopup.data = item
+    },
+
+
+    // 弹出框打开
+    popupOpen(){
+      clearTimeout(this.autoTimer)
+    },
+    // 弹出框关闭
+    popupClosed(){
+      this.init(false)
+    },
+    // 接受任务
+    acceptTask(res){
+      this.taskPopup.data.canRefuse=res.canRefuse
+      this.taskPopup.data.canAccept=res.canAccept
+      this.taskPopup.data.canReceive=res.canReceive
+    },
+    // 领取任务
+    claimTask(res){
+      this.taskPopup.data.canRefuse=res.canRefuse
+      this.taskPopup.data.canAccept=res.canAccept
+      this.taskPopup.data.canReceive=res.canReceive
+    },
+    // 执行任务
+    startTask({jump, query}){
+      if (!jump) return
+
+      this.$router.push(query)
+    },
+
+  },
+  destroyed(){
+    this.saveTab && window.sessionStorage.setItem(this.sessionKey,JSON.stringify({
+      taskTypeActive: this.taskTypeActive,
+      taskStatusActive: this.taskStatus.active
+    }))
+    clearTimeout(this.autoTimer)
+  },
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

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

@@ -202,6 +202,9 @@ export default {
       // 获取当前配置了的打印机
       await this.getSystemInitData()
 
+      // 获取当前用户数据
+      await this.$lwUserInfo.asyncGet()
+
       if (!this.routerConfirmBack && this.path){
         this.$router.push({
           path: this.path

package/src/components/page/common/index.js

@@ -28,6 +28,8 @@ import lwSearchTaskPage from './Task/searchTask';
 import lwWarehousePage from './Warehouse';
 // 选择时区
 import lwTimezonePage from "./Timezone";
+// 任务控制台
+import lwTaskConsolePage from "./TaskConsole";
 
 export const common = [
   lwDevicePage,
@@ -42,4 +44,5 @@ export const common = [
   lwSearchTaskPage,
   lwWarehousePage,
   lwTimezonePage,
+  lwTaskConsolePage,
 ]

package/src/components/page/config/masterLocation/masterLocationConfig/action/index.vue

@@ -187,7 +187,7 @@
       </div>
 
 
-      <div class="lw-global-tab-box">
+      <lw-tab-box>
         <van-tabs
           style="margin-top: 10px"
           type="card"
@@ -331,7 +331,7 @@
 
         </van-tabs>
 
-      </div>
+      </lw-tab-box>
 
 
     </div>

package/src/components/page/config/masterLocation/masterLocationQuery/action/queryByLocationCode.vue

@@ -29,7 +29,7 @@
       </span>
         </div>
 
-        <div style="margin-top: 10px" class="lw-global-tab-box ">
+        <lw-tab-box style="margin-top: 10px">
           <van-tabs
             type="card"
             animated
@@ -85,7 +85,7 @@
 
           </van-tabs>
 
-        </div>
+        </lw-tab-box>
 
 
       </div>

package/src/components/page/config/masterLocation/masterLocationQuery/action/queryBySkuCode.vue

@@ -9,7 +9,7 @@
 
     <div class="lw-global-page-box">
       <div v-if="masterLocationConfig&&masterLocationConfig.length>0">
-        <div class="lw-global-tab-box">
+        <lw-tab-box>
 
           <van-tabs
             type="card"
@@ -104,7 +104,7 @@
 
 
           </van-tabs>
-        </div>
+        </lw-tab-box>
 
       </div>
       <lw-not-data v-else/>

package/src/components/page/config/masterLocation/masterLocationQuery/index/index.vue

@@ -12,7 +12,7 @@
 
     <div class="lw-global-page-box">
 
-      <div class="lw-global-tab-box">
+      <lw-tab-box>
         <van-tabs type="card" animated v-model="tabActive" @change="tabChange">
           <van-tab name="read" :title="$lwLanguage.get('','商品')">
             <div class="lw-global-model-box">
@@ -52,7 +52,7 @@
 
 
         </van-tabs>
-      </div>
+      </lw-tab-box>
 
 
 

package/src/components/page/config/newProject/action/index.vue

@@ -9,7 +9,7 @@
 
     <lw-nav-bar
 
-      :title="$lwLanguage.get('', '新品配置')"/>
+      :title="$lwLanguage.get('', '商品配置')"/>
 
 
     <div class="lw-global-page-box">
@@ -43,7 +43,7 @@
 
       </div>
 
-      <div class="lw-global-tab-box" style="margin-top: 10px;">
+      <lw-tab-box style="margin-top: 10px;">
         <van-tabs type="card" animated v-model="tabActive">
 
           <!-- 基础信息 -->
@@ -775,7 +775,7 @@
 
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
     </div>
 
 

package/src/components/page/config/newProject/index/index.vue

@@ -7,7 +7,7 @@
 <template>
   <div>
 
-    <lw-nav-bar title="新品配置"/>
+    <lw-nav-bar title="商品配置"/>
 
     <div class="lw-global-page-box">
 

package/src/components/page/container/components/backStatusRow.vue

@@ -0,0 +1,77 @@
+<!--
+  归还状态行
+  @author: 张文
+  @date: 2023-02-16
+-->
+<template>
+
+  <div class="lw-global-flex-between lw-global-row">
+
+    <div class="lw-global-title lw-global-required">
+      {{ $lwLanguage.get('','归还结果') }}
+    </div>
+
+    <div class="radio-box">
+      <van-radio-group
+        v-model="status"
+        direction="horizontal"
+        @change="$emit('change')"
+      >
+        <van-radio
+          v-for="i in returnStatusList"
+          :key="i.value"
+          :name="i.value"
+        >{{ i.label }}</van-radio>
+      </van-radio-group>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "backStatusRow",
+  props:{
+    value:{
+      type: String,
+      default: ''
+    }
+  },
+  computed:{
+    status:{
+      get(){
+        return this.value
+      },
+      set(v){
+        this.$emit('input',v)
+      }
+    }
+  },
+  data() {
+    return {
+
+      // 归还结果
+      returnStatusList:[
+        {
+          label: this.$lwLanguage.get('','正常'),
+          value: 'NORMAL'
+        },
+        {
+          label: this.$lwLanguage.get('','异常'),
+          value: 'ABNORMAL'
+        },
+      ],
+    }
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+.radio-box{
+  /deep/.van-radio__label{
+    font-size: 14px;
+  }
+}
+</style>