@logwire/logwire-wms-pda-ui 3.4.0 → 3.5.0

package/src/views/common/page/TaskFinish/index.vue

@@ -0,0 +1,295 @@
+<!--
+  已完成的任务
+  @author: 张文
+  @date: 2023-11-12
+-->
+<template>
+  <div>
+    <lw-nav-bar :title="$lwLanguage.get('', '已完成任务')"/>
+
+    <lw-page-body-module>
+
+      <div class="lw-global-model-box" style="padding-top: 3px">
+        <lw-cell
+          :title="$lwLanguage.get('', '日期')"
+          :value="dateStr"
+          required
+          @click="calendarPopup.show=true"
+        />
+
+        <lw-cell-popup-checkbox
+          :title="$lwLanguage.get('', '任务类型')"
+          :placeholder="$lwLanguage.get('', '为空时搜索全部')"
+          v-model="queryData.typeStr"
+          :columns="typeOption"
+        />
+
+        <lw-input
+          ref="keyword"
+          :title="$lwLanguage.get('', '关键字')"
+          :placeholder="$lwLanguage.get('', '可查询任务号、业务单据号、业务编号、业务编号1、业务编号2、业务编号3、业务编号4')"
+          v-model="queryData.keyword"
+          :create-rule="$lwScanRule.create('已完成任务-关键字','TASK')"
+          rule-key="container"
+          @confirm="keywordConfirm"
+        />
+
+        <lw-button
+          style="margin-top: 10px"
+          block
+          @click="btnClick"
+        >
+          {{ $lwLanguage.get('', '查询') }}
+        </lw-button>
+      </div>
+
+      <template v-if="searchConfirm">
+
+        <lw-title-value-cell
+          style="margin: 10px 0"
+          :title="$lwLanguage.get('', '完成任务数')"
+          :value="tabData.count"
+          val-red
+          val-bold
+          :is-row="false"
+        />
+
+        <lw-tab-box>
+          <van-tabs
+            type="card"
+            animated
+            v-model="tabData.active"
+            @change="pageChange"
+          >
+
+            <van-tab
+              v-for="(i,k) in tabData.tabs"
+              :key="k"
+              :name="i.value"
+            >
+
+              <template #title>
+                <lw-tip
+                  :title="i.label"
+                  :tip="i.count"
+                />
+              </template>
+
+            </van-tab>
+          </van-tabs>
+        </lw-tab-box>
+
+        <!-- 数据显示 -->
+        <template v-if="tabData.pageList.length">
+
+          <!-- 数据 -->
+          <task-item
+            v-for="item in tabData.pageList"
+            :key="item.taskId"
+            :item="item"
+            time-type="spend"
+            @click="taskItemClick(item)"
+          />
+
+          <!-- 分页 -->
+          <lw-pagination
+            v-model="tabData.pageNum"
+            :page-total="tabData.pageTotal"
+            :page-size.sync="tabData.pageSize"
+            @change="pageChange"
+          />
+        </template>
+        <lw-not-data v-else/>
+
+      </template>
+
+
+    </lw-page-body-module>
+
+
+    <lw-calendar-popup
+      v-model="calendarPopup.show"
+      :default-date="calendarPopup.date"
+      type="range"
+      time-type="spend"
+      @confirm="calendarConfirm"
+    />
+
+    <!-- 任务详情查看 -->
+    <look-task-content-popup
+      v-model="taskPopup.show"
+      :item="taskPopup.data"
+      :show-bottom-btn="false"
+      time-type="spend"
+    />
+  </div>
+</template>
+
+<script>
+import {
+  wmsMobileTaskGetStatByFinish,
+  wmsMobileTaskQueryPageListByFinish,
+  wmsMobileTaskQueryTypeByStaff,
+} from "./../../api/taskFinish"
+import lookTaskContentPopup from "../Task/components/lookTaskContentPopup.vue";
+import taskItem from "../Task/components/taskItem.vue";
+
+export default {
+  name: "lwTaskFinishPage",
+  components: {
+    lookTaskContentPopup,
+    taskItem,
+  },
+  data() {
+    return {
+
+      typeOption: [],
+
+      // 搜索数据
+      queryData: {
+        typeStr: '',
+        keyword: ''
+      },
+
+      // 日历弹框
+      calendarPopup: {
+        show: false,
+        date: [],
+      },
+
+      // 搜索已点击
+      searchConfirm: false,
+      // tab数据
+      tabData: {
+        active: '',
+        count: 0,
+        tabs: [],
+        pageList: [],
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0
+      },
+
+      // 查看任务弹出框
+      taskPopup: {
+        show: false,
+        data: {}
+      },
+    }
+  },
+  computed: {
+    // 显示的时间
+    dateStr() {
+      const [s, e] = this.calendarPopup.date
+      return this.$lwDate.format(s) + this.$lwLanguage.get('', '至') + this.$lwDate.format(e)
+    }
+  },
+  mounted() {
+    this.queryData.operateStaffNum = this.$lwUserInfo.get().staff.code
+    this.calendarPopup.date = [
+      new Date(Date.now() - (24 * 3600000)),
+      new Date()
+    ]
+
+
+    wmsMobileTaskQueryTypeByStaff({
+      operateStaffNum: this.queryData.operateStaffNum
+    }).then(res => {
+      this.typeOption = res
+    }).catch(() => {
+      this.$lwShowNoticeBar({
+        message: this.$lwLanguage.get('', '任务类型获取失败'),
+        type: 'warning'
+      })
+    })
+  },
+  methods: {
+    // 获取员工姓名
+    userName(i) {
+      if (!Array.isArray(i)) return
+
+      return i.map(item => item.staffName).join('/')
+    },
+    // 日期选择确认
+    calendarConfirm(date) {
+      this.calendarPopup.date = date
+      this.calendarPopup.show = false
+    },
+    // 关键字搜索框确认
+    keywordConfirm() {
+      this.searchConfirm = true
+      this.queryData.startTime = this.$lwTimezone.timezoneToUTC({date: this.calendarPopup.date[0]})
+      this.queryData.endTime = this.$lwTimezone.timezoneToUTC({date: this.calendarPopup.date[1]})
+
+
+      this.getTabData()
+    },
+    // 搜索按钮点击
+    btnClick() {
+      this.$refs.keyword.confirm()
+    },
+
+    // 获取tab数据
+    getTabData() {
+      this.tabData.tabs = []
+      wmsMobileTaskGetStatByFinish({
+        ...this.queryData,
+        types: this.queryData.typeStr ? this.queryData.typeStr.split(',') : []
+      }).then(res => {
+        let tabList = res.types || []
+        if (!this.queryData.typeStr) {
+          tabList.unshift({
+            label: this.$lwLanguage.get('', '全部'),
+            value: 'all',
+            count: res.count || 0
+          })
+        }
+
+        this.tabData.count = res.count
+        this.tabData.tabs = tabList
+        this.tabData.active = tabList[0].value
+        this.tabData.pageNum = 1
+        this.pageChange()
+      })
+    },
+
+    // 页码改变
+    pageChange() {
+      wmsMobileTaskQueryPageListByFinish({
+        ...this.queryData,
+        pageSize: this.tabData.pageSize,
+        pageNum: this.tabData.pageNum,
+        types: this.tabData.active === 'all' ? [] : [this.tabData.active]
+      }).then(res => {
+        this.tabData.pageList = res.datas || []
+        this.tabData.pageTotal = res.total || 0
+      })
+
+    },
+
+    // 任务被点击
+    taskItemClick(item) {
+      if (!item) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '任务详情数据为空，请确保数据配置正确！')
+        )
+        console.error('任务数据为空，不能有效展示:', item)
+        return
+      }
+
+      this.taskPopup.show = true
+      this.taskPopup.data = item
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+.lw-task-page-order-end {
+  font-size: 12px;
+  font-weight: bold;
+  padding-top: 10px;
+  border-top: 1px solid #F0F0F0;
+}
+</style>

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

@@ -30,6 +30,8 @@ import lwWarehousePage from './Warehouse';
 import lwTimezonePage from "./Timezone";
 // 任务控制台
 import lwTaskConsolePage from "./TaskConsole";
+// 已完成的任务
+import lwTaskFinishPage from "./TaskFinish";
 
 export default [
   lwDevicePage,
@@ -45,4 +47,5 @@ export default [
   lwWarehousePage,
   lwTimezonePage,
   lwTaskConsolePage,
+  lwTaskFinishPage,
 ]

package/src/views/common/router.js

@@ -0,0 +1,116 @@
+/*
+* 公共页面的路由
+* @author: 张文
+* @date  2023-09-04
+* */
+
+export default [
+  // 初始化页面
+  {
+    path: "/",
+    name: "LwNull",
+    component: () => import('./views/home/index.vue')
+  },
+  // 初始化页面
+  {
+    path: "/lwInit",
+    name: "LwInit",
+    component: () => import('./views/init/index.vue')
+  },
+
+  // 首页
+  {
+    path: "/lwHome",
+    name: "LwHome",
+    component: () => import('./views/home/index.vue')
+  },
+
+  // 菜单页1
+  {
+    path: "/lwMenuOne",
+    name: "LwMenuOne",
+    component: () => import('./views/menu/menuOne.vue')
+  },
+  // 菜单页2
+  {
+    path: "/lwMenuTwo",
+    name: "LwMenuTwo",
+    component: () => import('./views/menu/menuTwo.vue')
+  },
+
+  // 我的管理页
+  {
+    path: "/lwMy",
+    name: "LwMy",
+    component: () => import('./views/my/index.vue')
+  },
+
+  // 仓库选择
+  {
+    path: "/lwWarehouse",
+    name: "LwWarehouse",
+    component: () => import('./views/my/warehouse.vue')
+  },
+
+  // 设备管理
+  {
+    path: "/lwDevice",
+    name: "LwDevice",
+    component: () => import('./views/my/device.vue')
+  },
+
+  // 打印机管理
+  {
+    path: "/lwPrint",
+    name: "LwPrint",
+    component: () => import('./views/my/print.vue')
+  },
+
+  // 多语言
+  {
+    path: "/lwLanguage",
+    name: "LwLanguage",
+    component: () => import('./views/my/language.vue')
+  },
+
+  // 时区
+  {
+    path: "/lwTimezone",
+    name: "LwTimezone",
+    component: () => import('./views/my/timezone.vue')
+  },
+
+
+  // 消息
+  {
+    path: "/lwMsg",
+    name: "LwMsg",
+    component: () => import('./views/my/msg.vue'),
+    meta: {keepAlive: true}
+  },
+
+  // 任务
+  {
+    path: "/lwTask",
+    name: "LwTask",
+    component: () => import('./views/task/index.vue'),
+  },
+  // 任务搜索
+  {
+    path: "/lwSearchTask",
+    name: "LwSearchTask",
+    component: () => import('./views/task/search.vue'),
+  },
+  // 任务控制台
+  {
+    path: "/lwTaskConsole",
+    name: "LwTaskConsole",
+    component: () => import('./views/taskConsole/index.vue'),
+  },
+  // 已完成任务
+  {
+    path: "/lwTaskFinish",
+    name: "LwTaskFinish",
+    component: () => import('./views/taskFinish/index.vue'),
+  },
+]

package/src/views/common/views/init/index.vue

@@ -53,6 +53,7 @@ export default {
   },
   methods: {
     async init() {
+      this.$lwBarcodeResolve.clearRule()
 
       try {
 

package/src/views/common/views/taskFinish/index.vue

@@ -0,0 +1,23 @@
+<!--
+  已完成的任务
+  @author: 张文
+  @date: 2023-11-12
+-->
+<template>
+  <lw-task-finish-page/>
+</template>
+
+<script>
+
+export default {
+  name: "index",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/vin/page/quality/register/index.vue

@@ -44,28 +44,24 @@
           dict-key="VinQualityBusiness"
         />
 
-        <lw-search-cell-popup
+        <lw-search-select-popup-module
           :title="$lwLanguage.get('','货主')"
+          v-model="owner.id"
           :get-focus.sync="owner.focus"
           :create-rule="$lwScanRule.create('质检管理-质检登记-货主','OWNER')"
           rule-key="owner"
-          required
-          :api-fn="getOwner"
-          label-key="code,name"
-          need-show-clear
+          :api="$lwApi.common.searchOwner"
           @confirm="item=>ownerFactoryPopupConfirm('owner',item)"
           @clear="selectClear('owner')"
         />
 
-        <lw-search-cell-popup
-          :title="$lwLanguage.get('','工厂')"
-          v-model="factory.val"
+        <lw-search-select-popup-module
+          title="$lwLanguage.get('','工厂')"
+          v-model="factory.id"
           :get-focus.sync="factory.focus"
           :create-rule="$lwScanRule.create('质检管理-质检登记-工厂','CUSTOMER')"
           rule-key="factory"
-          :api-fn="getFactory"
-          label-key="code,name"
-          need-show-clear
+          :api="$lwApi.common.searchFactory"
           @confirm="item=>ownerFactoryPopupConfirm('factory',item)"
           @clear="selectClear('factory')"
         />
@@ -99,7 +95,6 @@ export default {
       qualityBusiness: '',
 
       owner: {
-        val: '',
         focus: false,
         code: '',
         name: '',
@@ -107,7 +102,6 @@ export default {
       },
 
       factory: {
-        val: '',
         focus: false,
         code: '',
         name: '',
@@ -119,15 +113,6 @@ export default {
     this.qualityTypeList = this.$lwDict.get('VinQualityType') || []
   },
   methods: {
-    // 获取货主数据
-    getOwner(val) {
-      return this.$lwApi.common.ownerList(val)
-    },
-
-    // 获取工厂数据
-    getFactory(val) {
-      return this.$lwApi.common.factoryList(val)
-    },
 
     // 货主、工厂 - 选择弹框 - 确认
     ownerFactoryPopupConfirm(type, item) {

package/src/views/vin/page/receive/noOrder/index.vue

@@ -33,22 +33,13 @@
         style="padding-top: 3px"
         class="lw-global-model-box"
       >
-
-        <lw-cell-popup-radio
+        <lw-search-select-popup-module
+          :api="$lwApi.common.searchOwner"
           :title="$lwLanguage.get('wms_project.pda.vin.page.receive.noOrder.index.bbwuqfhl','货主编码')"
           v-model="form.ownerCode"
-          :columns="ownerList"
-          label-key="code"
-          value-key="code"
           required
-          @confirm="item => form.ownerName = item.name"
-          @clear="form.ownerName = ''"
-        />
-
-        <lw-title-value-cell
-          :title="$lwLanguage.get('wms_project.pda.vin.page.receive.noOrder.index.ezpkychz','货主名称')"
-          :value="$lwCheckVal(form.ownerName)"
-          text-align="right"
+          value-key="code"
+          input-align="right"
         />
 
         <lw-cell-popup-radio
@@ -67,22 +58,12 @@
           dict-key="VinVehicleCondition"
         />
 
-        <lw-cell-popup-radio
+        <lw-search-select-popup-module
           :title="$lwLanguage.get('wms_project.pda.vin.page.receive.noOrder.index.svknglnq','工厂编码')"
           v-model="form.factoryCode"
-          :columns="factoryList"
-          label-key="code"
+          :api="$lwApi.common.searchFactory"
           value-key="code"
-          @confirm="item => form.factoryName = item.name"
-          @clear="form.factoryName = ''"
-        />
-
-
-        <lw-title-value-cell
-          :title="$lwLanguage.get('wms_project.pda.vin.page.receive.noOrder.index.qlnuabjg','工厂名称')"
-          :value="$lwCheckVal(form.factoryName)"
-          text-align="right"
-          is-row-end
+          input-align="right"
         />
 
 
@@ -90,20 +71,12 @@
 
       <div class="lw-global-model-box lw-global-model-box-3px">
 
-        <lw-cell-popup-radio
+        <lw-search-select-popup-module
           :title="$lwLanguage.get('wms_project.pda.vin.page.receive.noOrder.index.azpqvrjq','承运商编码')"
           v-model="form.carrierCode"
-          :columns="carrierList"
-          label-key="code"
+          :api="$lwApi.common.searchCarrier"
           value-key="code"
-          @confirm="item => form.carrierName = item.name"
-          @clear="form.carrierName = ''"
-        />
-
-        <lw-title-value-cell
-          :title="$lwLanguage.get('wms_project.pda.vin.page.receive.noOrder.index.jpljwdpu','承运商名称')"
-          :value="$lwCheckVal(form.carrierName)"
-          text-align="right"
+          input-align="right"
         />
 
         <lw-car-plate
@@ -121,19 +94,11 @@
           params="RECEIVE,RECEIVE_DELIVER"
         />
 
-        <lw-cell-popup-radio
+        <lw-search-select-popup-module
           :title="$lwLanguage.get('wms_project.pda.vin.page.receive.noOrder.index.dtdehuzg','供应商编码')"
           v-model="form.supplierCode"
-          :columns="supplierList"
-          label-key="code"
+          :api="$lwApi.common.searchSupplier"
           value-key="code"
-          @confirm="item => form.supplierName = item.name"
-          @clear="form.supplierName = ''"
-        />
-
-        <lw-input
-          :title="$lwLanguage.get('wms_project.pda.vin.page.receive.noOrder.index.plwbprqu','供应商名称')"
-          v-model="form.supplierName"
           input-align="right"
         />
 
@@ -188,43 +153,19 @@ export default {
       form: {
         // 货主编码
         ownerCode: '',
-        ownerName: '',
         type: '',
         typeLabel: '',
         factoryCode: '',
-        factoryName: '',
         carrierCode: '',
-        carrierName: '',
         carrierPlateNum: '',
         carrierTrailerNum: '',
         lanePortCode: '',
         supplierCode: '',
-        supplierName: '',
         supplierPhone: '',
       },
-      ownerList: [],
-      factoryList: [],
-      carrierList: [],
-      supplierList: [],
-      ownerName: ''
     }
   },
-  mounted() {
-    this.init()
-  },
   methods: {
-    async init() {
-      const [ownerList, factoryList, carrierList, supplierList] = await Promise.all([
-        this.$lwApi.common.ownerList(),
-        this.$lwApi.common.factoryList(),
-        this.$lwApi.common.carrierList(),
-        this.$lwApi.common.supplierList(),
-      ])
-      this.ownerList = ownerList
-      this.factoryList = factoryList
-      this.carrierList = carrierList
-      this.supplierList = supplierList
-    },
 
 
     // 当日收车点击