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

package/src/components/page/common/Task/components/lookTaskContentPopup.vue

@@ -4,81 +4,104 @@
   @date: 2022-11-25
 -->
 <template>
-  <lw-popup
-    v-model="show"
-    :show-off-btn="false"
-    height="auto"
-    :title="$lwLanguage.get('', '任务详情')"
-    @open="$emit('open')"
-    @closed="$emit('closed')"
-  >
-    <template v-if="Object.keys(item).length">
-      <!-- 头部 -->
-      <item-header
-        :time="item.taskReceiveTime || item.taskCreateTime"
-        :task-no="item.task.taskNo"
-      />
-
-      <!-- 数据显示 -->
-      <item-content
-        :tags="item.content.tags"
-        :content="item.content.detailContent"
-      />
-    </template>
-
-    <template #button>
-      <lw-button
-        class="lw-global-animation-rotate"
-        v-if="item.canRefuse"
-        type="last"
-        plain
-        @click="refuse"
-      >{{ $lwLanguage.get('', '拒绝任务') }}</lw-button>
-
-      <lw-button
-        class="lw-global-animation-rotate"
-        v-if="item.canAccept"
-        @click="acceptTask"
-      >{{ $lwLanguage.get('', '接受任务') }}</lw-button>
-
-      <lw-button
-        class="lw-global-animation-rotate"
-        v-if="item.canReceive"
-        @click="claimTask"
-      >{{ $lwLanguage.get('', '领取任务') }}</lw-button>
-
-      <template v-if="!item.canRefuse && !item.canAccept && !item.canReceive">
+  <div>
+    <lw-popup
+      v-model="show"
+      :show-off-btn="false"
+      height="auto"
+      :title="$lwLanguage.get('', '任务详情')"
+      @open="$emit('open')"
+      @closed="$emit('closed')"
+    >
+      <template v-if="Object.keys(item).length">
+        <!-- 头部 -->
+        <item-header
+          :time="item.taskReceiveTime || item.taskCreateTime"
+          :task-no="item.task.taskNo"
+        />
+
+        <!-- 数据显示 -->
+        <item-content
+          v-if="item.content"
+          :tags="item.content.tags"
+          :content="item.content.detailContent"
+        />
+      </template>
+
+      <template #button>
         <lw-button
-          v-if="item.canEndAssign"
           class="lw-global-animation-rotate"
+          v-if="item.canRefuse"
           type="last"
           plain
-          @click="overTask"
-        >
-          {{ $lwLanguage.get('','回退任务') }}
-        </lw-button>
+          @click="refuseTaskPopupShow=true"
+        >{{ $lwLanguage.get('', '拒绝任务') }}</lw-button>
+
         <lw-button
           class="lw-global-animation-rotate"
-          @click="startTask"
-        >
-          {{ $lwLanguage.get('', '执行任务') }}
-        </lw-button>
-      </template>
+          v-if="item.canAccept"
+          @click="acceptTask"
+        >{{ $lwLanguage.get('', '接受任务') }}</lw-button>
+
+        <lw-button
+          class="lw-global-animation-rotate"
+          v-if="item.canReceive"
+          @click="claimTask"
+        >{{ $lwLanguage.get('', '领取任务') }}</lw-button>
+
+        <template v-if="!item.canRefuse && !item.canAccept && !item.canReceive">
+          <lw-button
+            v-if="item.canEndAssign"
+            class="lw-global-animation-rotate"
+            type="last"
+            plain
+            @click="overTaskPopupShow=true"
+          >
+            {{ $lwLanguage.get('','回退任务') }}
+          </lw-button>
+          <lw-button
+            v-if="item.task && item.task.taskPage"
+            class="lw-global-animation-rotate"
+            @click="startTask"
+          >
+            {{ $lwLanguage.get('', '执行任务') }}
+          </lw-button>
+        </template>
+
 
+      </template>
+    </lw-popup>
+
+    <!-- 回退任务填写弹框 -->
+    <over-task-popup
+      v-model="overTaskPopupShow"
+      :task-id="item.taskId"
+      @backConfirm="overTaskConfirm"
+    />
+
+    <!-- 拒绝任务填写弹框 -->
+    <refuse-task-popup
+      v-model="refuseTaskPopupShow"
+      :task-id="item.taskId"
+      @refuseConfirm="refuseTaskConfirm"
+    />
+  </div>
 
-    </template>
-  </lw-popup>
 </template>
 
 <script>
 import itemHeader from "./itemHeader.vue";
 import itemContent from "./itemContent.vue";
+import overTaskPopup from "./overTaskPopup.vue";
+import refuseTaskPopup from "./refuseTaskPopup.vue"
 
 export default {
   name: "lookTaskContentPopup",
   components:{
     itemHeader,
     itemContent,
+    overTaskPopup,
+    refuseTaskPopup,
   },
   props:{
     item:{
@@ -101,24 +124,20 @@ export default {
     }
   },
   data() {
-    return {}
+    return {
+      overTaskPopupShow: false,
+      refuseTaskPopupShow: false,
+
+    }
   },
   methods: {
 
     // 拒绝任务
-    refuse(){
-      this.$lwDialog.confirm({
-        title: this.$lwLanguage.get('', '警告'),
-        message: this.$lwLanguage.get('', '确认拒绝当前任务?')
-      }).then(()=>{
-        this.$lwApi.task.refuseTask({
-          taskId: this.item.taskId
-        }).then(()=>{
-          this.$lwToast.success(this.$lwLanguage.get('', '已拒绝'))
-          this.show = false
-        })
-      }).catch(()=>{})
+    refuseTaskConfirm(){
+      this.show = false
+      this.$emit('refuseTask')
     },
+
     // 接受任务
     acceptTask(){
       this.$lwApi.task.acceptTask({
@@ -128,6 +147,7 @@ export default {
         this.$lwToast.success(this.$lwLanguage.get('', '已接受'))
       })
     },
+
     // 领取任务
     claimTask(){
       this.$lwApi.task.claimTask({
@@ -141,6 +161,7 @@ export default {
 
       })
     },
+
     // 执行任务
     startTask(){
       if (!this.item.task.taskPage){
@@ -167,8 +188,10 @@ export default {
         })
       })
     },
+
     // 回退任务
-    overTask(){
+    overTaskConfirm(){
+      this.show = false
       this.$emit('overTask')
     }
   }

package/src/components/page/common/Task/components/overTaskPopup.vue

@@ -89,6 +89,9 @@ export default {
         taskId: this.taskId
       }).then(()=>{
         this.show = false
+        this.$lwToast.success(
+          this.$lwLanguage.get('','已回退')
+        )
         this.$emit('backConfirm')
       })
     },

package/src/components/page/{count/console/components/overTaskPopup.vue → common/Task/components/refuseTaskPopup.vue}

@@ -1,11 +1,11 @@
 <!--
-  回退任务弹框
+  拒绝任务弹框
   @author: 张文
-  @date: 2022-11-25
+  @date: 2023-02-15
 -->
 <template>
   <lw-popup
-    :title="$lwLanguage.get('', '回退任务')"
+    :title="$lwLanguage.get('', '拒绝任务')"
     v-model="show"
     @closed="closed"
   >
@@ -36,7 +36,7 @@
 <script>
 
 export default {
-  name: "overTaskPopup",
+  name: "refuseTaskPopup",
   props: {
     taskId: String,
     value:{
@@ -58,16 +58,20 @@ export default {
     return {
       causeOption:[
         {
-          label: this.$lwLanguage.get('', '业务完成'),
-          value: 'BY_BIZ_FINISH'
+          label: this.$lwLanguage.get('','中途休息'),
+          value: this.$lwLanguage.get('','中途休息'),
         },
         {
-          label: this.$lwLanguage.get('', '别人已接收'),
-          value: 'OTHER_RECEIVED'
+          label: this.$lwLanguage.get('','下班'),
+          value: this.$lwLanguage.get('','下班')
         },
         {
-          label: this.$lwLanguage.get('', '其他原因'),
-          value: 'OTHER'
+          label: this.$lwLanguage.get('','设备不匹配'),
+          value: this.$lwLanguage.get('','设备不匹配'),
+        },
+        {
+          label: this.$lwLanguage.get('','其他'),
+          value: this.$lwLanguage.get('','其他')
         },
       ],
       reasonCode:'',
@@ -78,18 +82,21 @@ export default {
     confirm(){
       if (!this.reasonCode){
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('', '结束原因不能为空')
+          this.$lwLanguage.get('', '拒绝原因不能为空')
         )
         return
       }
 
-      this.$lwApi.task.overTask({
-        reasonCode: this.reasonCode,
-        remark: this.remark,
+      this.$lwApi.task.refuseTask({
+        backReasonCode: this.reasonCode,
+        backOtherReason: this.remark,
         taskId: this.taskId
       }).then(()=>{
         this.show = false
-        this.$emit('backConfirm')
+        this.$lwToast.success(
+          this.$lwLanguage.get('','已拒绝')
+        )
+        this.$emit('refuseConfirm')
       })
     },
 

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

@@ -77,10 +77,7 @@
 
 
         <!-- 任务类型tab -->
-        <div
-          style="margin-top: 10px"
-          class="lw-global-tab-box"
-        >
+        <lw-tab-box style="margin-top: 10px">
           <van-tabs
             type="card"
             animated
@@ -106,7 +103,7 @@
             </van-tab>
 
           </van-tabs>
-        </div>
+        </lw-tab-box>
 
 
         <!-- 任务状态tab -->
@@ -173,14 +170,6 @@
       @acceptTask="acceptTask"
       @claimTask="claimTask"
       @startTask="startTask"
-      @overTask="overTask"
-    />
-
-    <!-- 结束任务弹框 -->
-    <over-task-popup
-      v-model="overTaskPopup.show"
-      :task-id="this.taskPopup.data.taskId"
-      @backConfirm="overTaskConfirm"
     />
   </div>
 </template>
@@ -189,14 +178,12 @@
 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:{
     // 背景图片
@@ -416,7 +403,7 @@ export default {
     // 任务被点击
     taskItemClick(item){
 
-      if (!item || !item.content){
+      if (!item){
         this.$lwShowErrorMsg(
           this.$lwLanguage.get('wms_project.pda.common.task.taskNull','任务详情数据为空，请确保数据配置正确！')
         )
@@ -456,15 +443,6 @@ export default {
       this.$router.push(query)
     },
 
-
-    // 结束任务
-    overTask(){
-      this.overTaskPopup.show = true
-    },
-    // 结束任务 - 确认结束
-    overTaskConfirm(){
-      this.taskPopup.show = false
-    },
   },
   destroyed(){
 

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

@@ -22,9 +22,8 @@
 
       </div>
 
-      <div
+      <lw-tab-box
         v-if="show"
-        class="lw-global-tab-box"
         style="margin-top: 10px;"
       >
         <van-tabs type="card" animated v-model="tabActive">
@@ -70,7 +69,7 @@
             <lw-not-data v-if="!taskList.length"/>
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
 
 
 
@@ -83,14 +82,6 @@
       @acceptTask="acceptTask"
       @claimTask="claimTask"
       @startTask="startTask"
-      @overTask="overTask"
-    />
-
-    <!-- 结束任务弹框 -->
-    <over-task-popup
-      v-model="overTaskPopup.show"
-      :task-id="this.taskPopup.data.taskId"
-      @backConfirm="overTaskConfirm"
     />
 
   </div>
@@ -99,7 +90,6 @@
 <script>
 import taskItem from "../components/taskItem.vue";
 import lookTaskContentPopup from "../components/lookTaskContentPopup.vue";
-import overTaskPopup from "../components/overTaskPopup.vue";
 
 
 export default {
@@ -107,7 +97,6 @@ export default {
   components:{
     taskItem,
     lookTaskContentPopup,
-    overTaskPopup,
   },
   data() {
     return {
@@ -177,16 +166,6 @@ export default {
 
       this.$router.replace(query)
     },
-
-
-    // 结束任务
-    overTask(){
-      this.overTaskPopup.show = true
-    },
-    // 结束任务 - 确认结束
-    overTaskConfirm(){
-      this.taskPopup.show = false
-    },
   }
 }
 </script>

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

@@ -0,0 +1,11 @@
+/*
+* 任务控制台
+* @author: 张文
+* @date: 2023-01-10
+* */
+
+import lwTaskConsolePage from "./index.vue";
+
+lwTaskConsolePage.install = Vue => Vue.component(lwTaskConsolePage.name, lwTaskConsolePage)
+
+export default lwTaskConsolePage