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

package/src/components/page/common/Task/{index.vue → index/index.vue}

@@ -5,10 +5,15 @@
 -->
 <template>
   <div>
-    <lw-nav-bar
-      :title="$lwLanguage.get('wms_project.pda.common.task.task', '任务')"
-      :click-left="navBack"
-    />
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.common.task.task', '任务')">
+      <template #right>
+        <van-icon
+          name="search"
+          size="18"
+          @click="$router.push('/lwSearchTask')"
+        />
+      </template>
+    </lw-nav-bar>
 
     <div class="lw-global-page-box">
 
@@ -72,7 +77,10 @@
 
 
         <!-- 任务类型tab -->
-        <div style="margin-top: 10px" class="lw-global-tab-box">
+        <div
+          style="margin-top: 10px"
+          class="lw-global-tab-box"
+        >
           <van-tabs
             type="card"
             animated
@@ -89,7 +97,10 @@
               <template #title>
                 <div class="lw-global-tip-box">
                   <span>{{ i.name }}</span>
-                  <span class="lw-global-tip">{{ $lwTip(i.taskCount) }}</span>
+                  <span
+                    v-if="$lwTip(i.taskCount)"
+                    class="lw-global-tip"
+                  >{{ $lwTip(i.taskCount) }}</span>
                 </div>
               </template>
             </van-tab>
@@ -99,7 +110,7 @@
 
 
         <!-- 任务状态tab -->
-        <div v-if="taskStatus.list.length" class="lw-global-tab-box lw-global-animation-out">
+        <div v-if="taskStatus.list.length" class="lw-global-tab-box">
           <van-tabs
             type="card"
             animated
@@ -108,14 +119,17 @@
           >
 
             <van-tab
-              v-for="i in taskStatus.list"
-              :key="i.type"
+              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 class="lw-global-tip">{{ $lwTip(i.taskCount) }}</span>
+                  <span
+                    v-if="$lwTip(i.taskCount)"
+                    class="lw-global-tip"
+                  >{{ $lwTip(i.taskCount) }}</span>
                 </div>
               </template>
             </van-tab>
@@ -127,83 +141,18 @@
         <template v-if="taskData.list.length">
 
           <!-- 数据 -->
-          <div
-            class="lw-global-model-box lw-global-click-style lw-global-animation-out"
-            v-for="(i, k) in taskData.list"
+          <task-item
+            v-for="i in taskData.list"
             :key="i.taskId"
-            :style="{animationDelay: k * 50 + 'ms'}"
+            :item="i"
             @click="taskItemClick(i)"
-          >
-
-            <!-- 头部 -->
-            <div class="lw-global-flex-between lw-global-bottom-border lw-task-page-order-title">
-
-              <img style="width: 50px;margin-right: 5px" src="../../../../assets/img/taskOrder.png" alt="">
-
-              <div style="flex: 1">
-                <div style="font-weight: bold;margin-bottom: 5px">{{ i.task.taskNo }}</div>
-                <div style="font-size: 12px">
-                  <!--                <span style="margin-right: 10px">{{ $lwDate.format(i.taskReceiveTime || i.taskCreateTime, 'MM-dd hh:mm') }}</span>-->
-                  已过 <span class="lw-global-title">{{ $lwDate.timeToStr({l:i.taskReceiveTime || i.taskCreateTime}).text }}</span>
-                </div>
-              </div>
-
-
-              <van-icon name="arrow"/>
-            </div>
-
-            <!-- 数据显示 -->
-            <div
-              v-if="i.content"
-              class="lw-task-page-order-body"
-            >
-
-
-              <!-- 标签 -->
-              <div v-if="i.content.tags && i.content.tags.length" style="padding: 5px 0">
-                <lw-tag
-                  v-for="ini in i.content.tags"
-                  :key="ini"
-                  type="danger"
-                  plain
-                  round
-                >{{ ini }}</lw-tag>
-              </div>
-
-
-              <!-- 任务内容 -->
-              <div
-                class="lw-global-flex-start lw-task-page-task-box"
-                v-for="(ini,ink) in i.content.itemContent"
-                :key="ink"
-              >
-                <div class="lw-global-title lw-task-page-task-title">{{ ink }}:</div>
-                <div class="lw-global-value">{{ ini }}</div>
-              </div>
-
-            </div>
-
-            <!-- 基本信息 -->
-            <div class="lw-global-flex-between lw-task-page-order-end">
-              <div>{{ userName(i.staffList) }}</div>
-              <div>
-                <!-- <span style="margin-right: 5px">{{ $lwDate.format(i.taskStartTime, 'MM-dd hh:mm') }}</span>-->
-                <span v-if="i.taskStartTime" >
-                  <span style="font-weight: normal">{{ $lwLanguage.get('wms_project.pda.common.task.duration', '已耗时') }} </span>
-                  {{ $lwDate.timeToStr({l:i.taskStartTime}).text }}
-                </span>
-                <span v-else style="font-weight: normal">
-                  {{ $lwLanguage.get('wms_project.pda.common.task.notStart', '任务未开始') }}
-                </span>
-              </div>
-            </div>
-          </div>
+          />
 
           <!-- 分页 -->
-          <lw-pages
+          <lw-pagination
             v-model="taskData.pageNum"
             :page-total="taskData.pageTotal"
-            :page-size="pageSize"
+            :page-size.sync="taskData.pageSize"
             @change="pageChange"
           />
         </template>
@@ -216,106 +165,49 @@
     </div>
 
     <!-- 任务详情查看 -->
-    <lw-popup
+    <look-task-content-popup
       v-model="taskPopup.show"
-      :show-off-btn="false"
-      height="auto"
-      :title="$lwLanguage.get('wms_project.pda.common.task.details', '任务详情')"
+      :item="taskPopup.data"
       @open="popupOpen"
       @closed="popupClosed"
-    >
-      <template v-if="Object.keys(taskPopup.data).length">
-        <!-- 头部 -->
-        <div class="lw-global-flex-between lw-global-bottom-border lw-task-page-order-title">
-
-          <img style="width: 50px;margin-right: 5px" src="../../../../assets/img/taskOrder.png" alt="">
-
-          <div style="flex: 1">
-            <div style="font-weight: bold;margin-bottom: 5px">{{ taskPopup.data.task.taskNo }}</div>
-            <div style="font-size: 12px">
-              <!--                <span style="margin-right: 10px">{{ $lwDate.format(i.taskReceiveTime || i.taskCreateTime, 'MM-dd hh:mm') }}</span>-->
-              {{ $lwLanguage.get('wms_project.pda.common.task.formerly', '已过') }}
-              <span class="lw-global-title">
-                {{ $lwDate.timeToStr({l:taskPopup.data.taskReceiveTime || taskPopup.data.taskCreateTime}).text }}
-              </span>
-            </div>
-          </div>
-
-        </div>
-
-        <!-- 数据显示 -->
-        <div class="lw-task-page-order-body">
-
-
-          <!-- 标签 -->
-          <div v-if="taskPopup.data.content.tags.length" style="padding: 5px 0">
-            <lw-tag
-              v-for="ini in taskPopup.data.content.tags"
-              :key="ini"
-              type="danger"
-              plain
-              round
-            >{{ ini }}</lw-tag>
-          </div>
-
-
-          <!-- 任务内容 -->
-          <div
-            class="lw-global-flex-start lw-task-page-task-box"
-            v-for="(ini,k) in taskPopup.data.content.detailContent"
-            :key="k"
-          >
-            <div class="lw-global-title lw-task-page-task-title">{{ k }}:</div>
-            <div class="lw-global-value">{{ ini }}</div>
-          </div>
-
-        </div>
-      </template>
-
-      <template #button>
-        <lw-button
-          class="lw-global-animation-rotate"
-          v-if="taskPopup.data.canRefuse"
-          @click="refuse"
-        >{{ $lwLanguage.get('wms_project.pda.common.task.rejectTask', '拒绝任务') }}</lw-button>
-
-        <lw-button
-          class="lw-global-animation-rotate"
-          v-if="taskPopup.data.canAccept"
-          @click="acceptTask"
-        >{{ $lwLanguage.get('wms_project.pda.common.task.receiveTask', '接受任务') }}</lw-button>
-
-        <lw-button
-          class="lw-global-animation-rotate"
-          v-if="taskPopup.data.canReceive"
-          @click="claimTask"
-        >{{ $lwLanguage.get('wms_project.pda.common.task.getTask', '领取任务') }}</lw-button>
-
-        <lw-button
-          class="lw-global-animation-rotate"
-          v-if="!taskPopup.data.canRefuse && !taskPopup.data.canAccept && !taskPopup.data.canReceive"
-          @click="startTask"
-        >{{ $lwLanguage.get('wms_project.pda.common.task.startTask', '执行任务') }}</lw-button>
+      @acceptTask="acceptTask"
+      @claimTask="claimTask"
+      @startTask="startTask"
+      @overTask="overTask"
+    />
 
-      </template>
-    </lw-popup>
+    <!-- 结束任务弹框 -->
+    <over-task-popup
+      v-model="overTaskPopup.show"
+      :task-id="this.taskPopup.data.taskId"
+      @backConfirm="overTaskConfirm"
+    />
   </div>
 </template>
 
 <script>
+import taskBg from '../../../../../assets/img/taskBg.png'
+import taskItem from "../components/taskItem.vue";
+import lookTaskContentPopup from "../components/lookTaskContentPopup.vue";
+import overTaskPopup from "../components/overTaskPopup.vue";
 
 export default {
   name: "lwTaskPage",
+  components:{
+    taskItem,
+    lookTaskContentPopup,
+    overTaskPopup,
+  },
   props:{
     // 背景图片
     bgSrc:{
-      default: require('../../../../assets/img/taskBg.png')
+      default: taskBg
     },
-    // 页码大小
+    /*// 页码大小
     pageSize:{
       type: Number,
       default: 10
-    },
+    },*/
 
     // 是否定时刷新
     autoUpdate:{
@@ -343,7 +235,8 @@ export default {
       taskData:{
         list:[],
         pageNum: 1,
-        pageTotal: 0
+        pageTotal: 0,
+        pageSize: 10
       },
 
       // 自动刷新的定时器
@@ -352,21 +245,23 @@ export default {
       // 查看任务弹出框
       taskPopup:{
         show:false,
-        data:{},
-        isJump: false
+        data:{}
       },
+
+      // 结束任务弹框
+      overTaskPopup:{
+        show:false,
+      }
     }
   },
-  activated() {
+  mounted() {
+
+    const {taskTypeActive, taskStatusActive} = JSON.parse(sessionStorage.getItem('lwTaskTabsActive') || '{}')
+    this.taskTypeActive = taskTypeActive
+    this.taskStatus.active = taskStatusActive
     this.init()
   },
   methods: {
-    // 获取员工姓名
-    userName(i){
-      if (!Array.isArray(i)) return
-
-      return i.map(item=>item.staffName).join('/')
-    },
 
     // 初始化任务数据
     initTaskData(){
@@ -464,7 +359,7 @@ export default {
     getTaskTypeList(loading=true){
       clearTimeout(this.autoTimer)
 
-      // 找打当前任务类型的数据值
+      // 找到当前任务类型的数据值
       let item={}
       for (let i = 0; i < this.taskInfo.typeList.length; i++) {
         if (this.taskInfo.typeList[i].type === this.taskTypeActive){
@@ -493,7 +388,7 @@ export default {
         type:this.taskTypeActive,
         queryType:this.taskStatus.active,
         pageNum:this.taskData.pageNum - 1,
-        pageSize:this.pageSize
+        pageSize:this.taskData.pageSize
       },{loading}).then(res=>{
         this.taskData.list = res
         this.autoUpdate && this.autoRefresh()
@@ -540,91 +435,43 @@ export default {
     },
     // 弹出框关闭
     popupClosed(){
-      if (this.taskPopup.isJump){
-        this.taskPopup.isJump = false
-      }else {
-        this.init(false)
-      }
-    },
-    // 拒绝任务
-    refuse(){
-      this.$dialog.confirm({
-        title: this.$lwLanguage.get('wms_project.pda.common.warning', '警告'),
-        message: this.$lwLanguage.get('wms_project.pda.common.task.confirmReject', '确认拒绝当前任务') + '?'
-      }).then(()=>{
-        this.$lwApi.task.refuseTask({
-          taskId: this.taskPopup.data.taskId
-        }).then(()=>{
-          this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.common.task.reject', '已拒绝'))
-          this.taskPopup.show = false
-        })
-      }).catch(()=>{})
+      this.init(false)
     },
     // 接受任务
-    acceptTask(){
-      this.$lwApi.task.acceptTask({
-        taskId: this.taskPopup.data.taskId
-      }).then(res=>{
-        this.taskPopup.data.canRefuse=res.canRefuse
-        this.taskPopup.data.canAccept=res.canAccept
-        this.taskPopup.data.canReceive=res.canReceive
-        this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.common.task.receive', '已接受'))
-      })
+    acceptTask(res){
+      this.taskPopup.data.canRefuse=res.canRefuse
+      this.taskPopup.data.canAccept=res.canAccept
+      this.taskPopup.data.canReceive=res.canReceive
     },
     // 领取任务
-    claimTask(){
-      this.$lwApi.task.claimTask({
-        taskId: this.taskPopup.data.taskId
-      }).then(res=>{
-
-        this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.common.task.yiGet', '已领取'))
-
-        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(){
-      if (!this.taskPopup.data.task.taskPage){
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get(
-            'wms_project.pda.common.task.taskNotSet',
-            '作业任务配置项未配置'
-          ) + ':' + (this.taskPopup.data.task.operationTypeLabel || '当前')
-        )
-        return
-      }
+    startTask({jump, query}){
+      if (!jump) return
 
-      this.taskPopup.isJump = true
-
-      this.$lwApi.task.startTask({
-        taskId: this.taskPopup.data.taskId,
-        checkAssign:true
-      }).then(() => {
-        this.taskPopup.show = false
-        setTimeout(()=>{
-          this.$router.push({
-            path: this.taskPopup.data.task.taskPage,
-            query:{
-              lwTaskId: this.taskPopup.data.taskId,
-              lwComeFrom:'task',
-              lwTaskNo: this.taskPopup.data.task.taskNo
-            }
-          })
-        },1)
-      }).catch(()=>this.taskPopup.isJump = false)
+      this.$router.push(query)
     },
 
 
-    // 顶部点击返回
-    navBack(){
-      history.go(-1)
-    }
+    // 结束任务
+    overTask(){
+      this.overTaskPopup.show = true
+    },
+    // 结束任务 - 确认结束
+    overTaskConfirm(){
+      this.taskPopup.show = false
+    },
   },
-  deactivated(){
+  destroyed(){
+
+    window.sessionStorage.setItem('lwTaskTabsActive',JSON.stringify({
+      taskTypeActive: this.taskTypeActive,
+      taskStatusActive: this.taskStatus.active
+    }))
     clearTimeout(this.autoTimer)
   },
 
@@ -671,29 +518,4 @@ export default {
 }
 
 
-.lw-task-page-order-title{
-  font-size: 14px;
-}
-.lw-task-page-order-body{
-  padding: 10px 0;
-}
-.lw-task-page-order-end{
-  font-size: 12px;
-  font-weight: bold;
-  padding-top: 10px;
-  border-top: 1px solid #F0F0F0;
-}
-
-
-.lw-task-page-task-box{
-  margin: 5px 0;
-
-  .lw-task-page-task-title{
-    text-align: right;
-    width: 80px;
-    flex-shrink: 0;
-    align-self: self-start;
-  }
-}
-
 </style>

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

@@ -0,0 +1,11 @@
+/*
+* 任务搜索
+* @author: 张文
+* @date  2022-11-25
+* */
+
+import lwSearchTaskPage from "./index.vue";
+
+lwSearchTaskPage.install = Vue => Vue.component(lwSearchTaskPage.name, lwSearchTaskPage)
+
+export default lwSearchTaskPage