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

package/src/utils/Permissions.js

@@ -1,65 +1,65 @@
-/*
-* 权限
-* @author: 张文
-* @date  2022-02-14
-* */
-
-import {permissions} from "../api/common/Permissions";
-
-export const Permissions = {
-
-  /**
-   * 设置权限数据
-   * @author 张文
-   * @param {Array} data 需要设置的权限数据
-   * */
-  set(data) {
-    window.lwWindowGlobalData.set('permissions.data', data)
-  },
-
-
-  /**
-   * 获取权限数据
-   * @author 张文
-   * @return {Array} 权限列表
-   * */
-  get() {
-    return window.lwWindowGlobalData.get('permissions.data')
-  },
-
-
-  /**
-   * 异步获取权限数据
-   * @author 张文
-   * @return {Promise} 权限数据
-   */
-  asyncGet() {
-    return new Promise((PR, PE) => {
-      permissions.get(this.getQuery()).then(res => {
-        this.set(res)
-        PR(this.get())
-      }).catch(err => PE(err))
-    })
-  },
-
-
-  /**
-   * 设置权限获取的参数
-   * @author 张文
-   * @param {*} data 参数
-   */
-  setQuery(data) {
-    window.lwWindowGlobalData.set('permissions.query', data)
-  },
-
-
-  /**
-   * 获取权限获取的参数
-   * @author 张文
-   * @return {*} 设置的值
-   */
-  getQuery() {
-    return window.lwWindowGlobalData.get('permissions.query')
-  }
-
-}
+/*
+* 权限
+* @author: 张文
+* @date  2022-02-14
+* */
+
+import {permissions} from "../api/common/Permissions";
+
+export const Permissions = {
+
+  /**
+   * 设置权限数据
+   * @author 张文
+   * @param {Array} data 需要设置的权限数据
+   * */
+  set(data) {
+    window.lwWindowGlobalData.set('permissions.data', data)
+  },
+
+
+  /**
+   * 获取权限数据
+   * @author 张文
+   * @return {Array} 权限列表
+   * */
+  get() {
+    return window.lwWindowGlobalData.get('permissions.data')
+  },
+
+
+  /**
+   * 异步获取权限数据
+   * @author 张文
+   * @return {Promise} 权限数据
+   */
+  asyncGet(loading) {
+    return new Promise((PR, PE) => {
+      permissions.get(this.getQuery(), loading).then(res => {
+        this.set(res)
+        PR(this.get())
+      }).catch(err => PE(err))
+    })
+  },
+
+
+  /**
+   * 设置权限获取的参数
+   * @author 张文
+   * @param {*} data 参数
+   */
+  setQuery(data) {
+    window.lwWindowGlobalData.set('permissions.query', data)
+  },
+
+
+  /**
+   * 获取权限获取的参数
+   * @author 张文
+   * @return {*} 设置的值
+   */
+  getQuery() {
+    return window.lwWindowGlobalData.get('permissions.query')
+  }
+
+}

package/src/utils/Print.js

@@ -1,177 +1,232 @@
-/*
-* 打印服务
-* @author 张文
-* @date  2022-02-15
-* */
-
-import {AppPower} from "./AppPower";
-import {lwToast} from "./Toast";
-import {print} from "../api/common/Print";
-import {lwCloseLoading, lwShowLoading} from "../components/ui/Loading";
-import {lwShowErrorMsg} from "../components/ui/ErrorMsg";
-import {Language} from "./Language";
-
-export const Print = {
-  /**
-   * 设置当前已经配置了的打印机列表
-   * @author 张文
-   * @param {Array} list 当前配置的打印机列表
-   * */
-  set(list) {
-    window.lwWindowGlobalData.set('printList', list)
-  },
-
-
-  /**
-   * 获取当前已经配置了的打印机列表
-   * @author 张文
-   * @return {Array} 返回当前储存的全部打印机列表
-   * */
-  get() {
-    return window.lwWindowGlobalData.get('printList')
-  },
-
-
-  /**
-   * 调用服务端接口获取当前已经配置了的打印机列表，并更新当前储存的数据
-   * @author 张文
-   * @return {Promise} 返回获取到的打印机数据
-   * */
-  asyncGet() {
-
-    return new Promise((PR, PE) => {
-      print.getList(false).then(res => {
-        let printList = res ? res.map(item => {
-          const devices = item.devices[0]
-          return {
-            // 模板code
-            templateCode: item.code,
-            // 模板id
-            templateId: item.id,
-            // 模板名称
-            templateName: item.name,
-            // 打印机id
-            printId: devices.id,
-            // 打印机类型  PRINT_SERVICE-服务打印机，BLUETOOTH-蓝牙打印机
-            printType: devices.type,
-            // 打印机类型
-            printCode: devices.code,
-            // 打印机名字
-            printName: devices.name,
-          }
-        }) : []
-        this.set(printList)
-        PR(this.get())
-      }).catch(err => PE(err))
-    })
-
-  },
-
-
-  /**
-   * 校验打印配置是否正确
-   * @author 张文
-   * @param {String} templateCode 需要判断的模板数据Code
-   * @param {String} msg 描述文字，默认“当前”
-   * @return {Object} 返回判断后的结果{success:'成功-true，失败-false',printData:{'包含打印模板和打印机类型的数据'}}
-   * */
-  test(templateCode, msg = '当前') {
-    for (let i of this.get()) {
-      // 判断当前模板是否配置，没配置就弹出对话框提示去配置
-      if (i.templateCode.trim() === templateCode.trim()) {
-
-        return {success: true, printData: i}
-
-      }
-    }
-    lwShowErrorMsg({message: msg + '打印模板未配置，请前往"打印设置"配置打印模板'})
-    return {success: false, printData: {}}
-  },
-
-
-  /**
-   * 调用蓝牙打印服务，完成后更新打印状态
-   * @author 张文
-   * @date 2022-02-15
-   * @param {Array} dataList 后端返回的全部数据
-   * @return {Promise} {success:'成功-true，失败-false',message：失败原因}}
-   * */
-  bluetoothPrint(dataList) {
-
-    return new Promise(function (RES, ERR) {
-
-      if (!dataList || !dataList.length) {
-        const msg = Language.get('wms_project.pda.utils.print.error', '打印数据有误')
-        lwShowErrorMsg(msg)
-        console.error('打印数据有误！！！')
-        ERR({success: false, message: msg})
-        return
-      }
-
-      lwShowLoading(Language.get('wms_project.pda.utils.print.printing', '正在打印') + '...')
-
-      const ids = []
-
-      dataList.forEach(item => {
-        if (item.bluetooth) {
-          try {
-            AppPower.bluePrint(item.template.code, item.data)
-          } catch (err) {
-            console.error('调用打印服务失败，错误信息：')
-            console.error(err)
-          }
-          ids.push(item.id)
-        }
-      })
-
-      lwCloseLoading()
-
-      // 如果没有蓝牙打印就不需要更新状态
-      if (!ids.length) {
-        lwToast.success({
-          message: Language.get('wms_project.pda.utils.print.success', '打印成功'),
-          duration: 1000
-        })
-        RES({success: true})
-      }
-
-
-      // 更新打印状态
-      this.asyncPrintTypeUpdate(ids).then(() => {
-        RES({success: true})
-      }).catch(() => {
-        ERR({
-          success: false,
-          message: Language.get('wms_project.pda.utils.print.updateDataError', '打印数据更新接口调用失败')
-        })
-      })
-    })
-
-  },
-
-
-  /**
-   * 更新打印状态
-   * @author 张文
-   * @date 2022-02-15
-   * @param {Array} taskIdList 任务id的集合
-   * @return {Promise}
-   * */
-  asyncPrintTypeUpdate(taskIdList) {
-    let obj = {}
-    if (taskIdList.length > 1) {
-      obj.taskIds = taskIdList
-    } else {
-      obj.taskId = taskIdList[0]
-    }
-    print.update({
-      printed: true,
-      ...obj
-    }).then(() => {
-      lwToast.success({
-        message: Language.get('wms_project.pda.utils.print.success', '打印成功'),
-        duration: 1000
-      })
-    })
-  }
-}
+/*
+* 打印服务
+* @author 张文
+* @date  2022-02-15
+* */
+
+import {AppPower} from "./AppPower";
+import {lwToast} from "./Toast";
+import {print} from "../api/common/Print";
+import {lwCloseLoading, lwShowLoading} from "../components/ui/Loading";
+import {lwShowErrorMsg} from "../components/ui/ErrorMsg";
+import {lwShowNoticeBar} from "../components/ui/NoticeBar";
+import {Language} from "./Language";
+
+export const Print = {
+  /**
+   * 设置当前已经配置了的打印机列表
+   * @author 张文
+   * @param {Array} list 当前配置的打印机列表
+   * */
+  set(list) {
+    window.lwWindowGlobalData.set('printList', list)
+  },
+
+
+  /**
+   * 获取当前已经配置了的打印机列表
+   * @author 张文
+   * @return {Array} 返回当前储存的全部打印机列表
+   * */
+  get() {
+    return window.lwWindowGlobalData.get('printList')
+  },
+
+
+  /**
+   * 调用服务端接口获取当前已经配置了的打印机列表，并更新当前储存的数据
+   * @author 张文
+   * @return {Promise} 返回获取到的打印机数据
+   * */
+  asyncGet(loading) {
+
+    return new Promise((PR, PE) => {
+      print.getList(loading).then(res => {
+        let printList = res ? res.map(item => {
+          const devices = item.devices[0]
+          return {
+            // 模板code
+            templateCode: item.code,
+            // 模板id
+            templateId: item.id,
+            // 模板名称
+            templateName: item.name,
+            // 打印机id
+            printId: devices.id,
+            // 打印机类型  PRINT_SERVICE-服务打印机，BLUETOOTH-蓝牙打印机
+            printType: devices.type,
+            // 打印机类型
+            printCode: devices.code,
+            // 打印机名字
+            printName: devices.name,
+          }
+        }) : []
+        this.set(printList)
+        PR(this.get())
+      }).catch(err => PE(err))
+    })
+
+  },
+
+
+  /**
+   * 校验打印配置是否正确
+   * @author 张文
+   * @param {String} templateCode 需要判断的模板数据Code
+   * @param {String} msg 描述文字，默认“当前”
+   * @param {Boolean} needWarn 是否显示强警告
+   * @return {Object} 返回判断后的结果{success:'成功-true，失败-false',printData:{'包含打印模板和打印机类型的数据'}}
+   * */
+  test(templateCode, msg = '当前', needWarn = true) {
+    for (let i of this.get()) {
+      // 判断当前模板是否配置，没配置就弹出对话框提示去配置
+      if (i.templateCode.trim() === templateCode.trim()) {
+
+        return {success: true, printData: i}
+
+      }
+    }
+    const message = msg + Language.get('','打印模板未配置！请前往【打印设置栏】配置模板。模板编码：') + templateCode
+    needWarn ? lwShowErrorMsg(message) : lwShowNoticeBar({message, showTime: 8, type:'warning'})
+    return {success: false, printData: {}}
+  },
+
+
+  /**
+   * 调用蓝牙打印服务，完成后更新打印状态
+   * @author 张文
+   * @date 2022-02-15
+   * @return {Promise} {success:'成功-true，失败-false',message：失败原因}}
+   * @param obj
+   * */
+  async bluetoothPrint({
+   taskId,
+   taskNo,
+   pageNum = 1,
+   pageSize = 10,
+   deviceType = 'BLUETOOTH',
+   billStatusList = ['100'],
+  }) {
+
+    let msg = ''
+
+    if (!taskId && !taskNo) {
+      msg = Language.get('wms_project.pda.utils.print.error', '打印数据有误')
+      lwShowErrorMsg(msg)
+      throw new Error(msg)
+    }
+
+    lwShowLoading(Language.get('wms_project.pda.utils.print.printing', '正在打印') + '...')
+
+    try {
+      await this.asyncGeyPrintData({
+        taskId,
+        taskNo,
+        pageNum,
+        pageSize,
+        deviceType,
+        billStatusList,
+      })
+
+      lwCloseLoading()
+
+      lwToast.success({
+        message: Language.get('wms_project.pda.utils.print.success', '打印成功'),
+        duration: 1000
+      })
+    }catch (e){
+      console.log(e,'方法错误')
+      if (e.msg){
+        lwShowErrorMsg(e.msg)
+      }
+      lwCloseLoading()
+      throw new Error(e)
+    }
+
+  },
+
+
+  /**
+   * 更新打印状态
+   * @author 张文
+   * @date 2022-02-15
+   * @param {Array} taskDataIds 任务id的集合
+   * @param {Boolean} showToast 是否显示成功的提示框
+   * @return {Promise}
+   * */
+  asyncPrintTypeUpdate(taskDataIds, showToast = false) {
+    return new Promise((res,err)=>{
+      print.update({
+        taskDataIds,
+        printed: true
+      }).then(()=>{
+        showToast && lwToast.success({
+          message: Language.get('wms_project.pda.utils.print.success', '打印成功'),
+          duration: 1000
+        })
+        res(true)
+      }).catch(()=>err(false))
+    })
+  },
+
+
+  /**
+   * 获取打印数据
+   * @author 张文
+   * @date 2022-12-09
+   * @param {Object} param 请求接口的参数
+   * @return {Object} 获取的打印数据
+   * */
+  async asyncGeyPrintData(param){
+
+    const res = await print.getPrintData(param)
+    // 获取总页数
+    const pageTotal = Math.ceil(Number(res.printData?.total || 0) / param.pageSize)
+
+    const bluetooth = []
+    const ids = []
+    if (res.printData.datas && res.printData.datas.length) {
+
+      res.printData.datas.forEach(item=>{
+        ids.push(item.id)
+        // 判断是否在app环境
+        window.androidApp && bluetooth.push(AppPower.newBluePrint([{
+          language: res.task.device.languageType,
+          formatType: item.printFormat,
+          width: res.task.device.width || '100',
+          height: res.task.device.height || '100',
+          skipPage:res.task.device.skipPage,
+          data:[
+            {
+              data: item.data,
+              count: res.task.copies || 1
+            }
+          ]
+        }]))
+      })
+
+    }
+
+    try{
+      await Promise.all(bluetooth)
+    }catch {
+      throw new Error({msg:Language.get('', '调用打印服务失败')})
+    }
+
+    // 更新打印状态
+    try{
+      await this.asyncPrintTypeUpdate(ids)
+
+      // 检查当前打印id的所有数据是否全部打印完成
+      if (pageTotal > param.pageNum){
+        return await this.asyncGeyPrintData({
+          ...param,
+          pageNum:param.pageNum++
+        })
+      }
+
+    }catch{
+      throw new Error({msg:Language.get('', '调用打印数据更新接口调用失败')})
+    }
+  }
+}

package/src/utils/README.md

@@ -1,60 +1,60 @@
-
-
-> 请求相关 - ApiUtils [查看文档](https://www.yuque.com/docs/share/471d711d-a121-4fb2-b5ad-505c1c05ece7)
-
-
-> App退出路由 - AppBack [查看文档](https://www.yuque.com/docs/share/e9c934bd-fbe1-4156-a957-5b62d4d6f37c)
-
-
-> App壳子提供的方法 - AppPower [查看文档](https://www.yuque.com/docs/share/fe2b9910-9c25-4491-8a4c-323070481ed0)
-
-
-> 数据请求 - Axios [查看文档](https://www.yuque.com/docs/share/03df1181-2e74-4bc0-bf41-5e5eeb8087a4)
-
-
-> 条码解析 - BarcodeResolve [查看文档](https://www.yuque.com/docs/share/310a3a8f-6c18-423d-8c08-21bb0b49bcec)
-
-
-> 时间处理 - DateTime [查看文档](https://www.yuque.com/docs/share/2c12dede-b8e8-49cb-9095-0c518319dc37)
-
-
-> 弹出框 - Dialog [查看文档](https://www.yuque.com/docs/share/327c142e-3d56-4fec-84bb-23db541a7c46)
-
-
-> 深拷贝 - DeepCopy [查看文档](https://www.yuque.com/docs/share/b48b41e5-2a20-4acf-946a-c32a2c21c9c0)
-
-
-> 字典数据 - Dict [查看文档](https://www.yuque.com/docs/share/19cd8306-55bb-4ee3-b152-ad2aafd06bc3)
-
-
-> 获取图片路径 - GetImgSrc [查看文档](https://www.yuque.com/docs/share/b8c553c7-49bf-4745-95a8-29a17343d0c6)
-
-
-> 多语言 - Language [查看文档](https://www.yuque.com/docs/share/4cebcd6b-04f8-4800-aab1-e4a646e65c31)
-
-
-> 本地存储 - LocalStorage [查看文档](https://www.yuque.com/docs/share/18b3a0a4-cb7c-478b-aa60-e216fe1daca0)
-
-
-> 权限 - Permissions [查看文档](https://www.yuque.com/docs/share/23730f3c-46be-4835-bd14-a582c8e6d35b)
-
-
-> 打印服务 - Print [查看文档](https://www.yuque.com/docs/share/f500a7d5-6ef9-48ac-967c-bbb2d393dc0e)
-
-
-> 设置系统颜色 - SetColor [查看文档](https://www.yuque.com/docs/share/789ceb12-5705-40bc-9de8-cf2de99c572e)
-
-
-> 底部导航栏数据 - TabBar [查看文档](https://www.yuque.com/docs/share/6e0f6457-97c2-4395-ad8f-9395b349d9ba)
-
-
-> 格式化数字角标 - Tip [查看文档](https://www.yuque.com/docs/share/e60d0326-9a32-41de-b2c4-4e565d6961c9)
-
-
-> 轻提醒 - Toast [查看文档](https://www.yuque.com/docs/share/1cdaf85c-0f6d-4761-963c-769d19826cbe)
-
-
-> 绑定UUID - UUID [查看文档](https://www.yuque.com/docs/share/3c5f5579-d7c2-4c63-8b8d-f19d9e5c6a9c)
-
-
-> 当前仓库数据 - Warehouse [查看文档](https://www.yuque.com/docs/share/20733314-a4ed-4f32-89a5-b2cf57f0e2f5)
+
+
+> 请求相关 - ApiUtils [查看文档](https://www.yuque.com/docs/share/471d711d-a121-4fb2-b5ad-505c1c05ece7)
+
+
+> App退出路由 - AppBack [查看文档](https://www.yuque.com/docs/share/e9c934bd-fbe1-4156-a957-5b62d4d6f37c)
+
+
+> App壳子提供的方法 - AppPower [查看文档](https://www.yuque.com/docs/share/fe2b9910-9c25-4491-8a4c-323070481ed0)
+
+
+> 数据请求 - Axios [查看文档](https://www.yuque.com/docs/share/03df1181-2e74-4bc0-bf41-5e5eeb8087a4)
+
+
+> 条码解析 - BarcodeResolve [查看文档](https://www.yuque.com/docs/share/310a3a8f-6c18-423d-8c08-21bb0b49bcec)
+
+
+> 时间处理 - DateTime [查看文档](https://www.yuque.com/docs/share/2c12dede-b8e8-49cb-9095-0c518319dc37)
+
+
+> 弹出框 - Dialog [查看文档](https://www.yuque.com/docs/share/327c142e-3d56-4fec-84bb-23db541a7c46)
+
+
+> 深拷贝 - DeepCopy [查看文档](https://www.yuque.com/docs/share/b48b41e5-2a20-4acf-946a-c32a2c21c9c0)
+
+
+> 字典数据 - Dict [查看文档](https://www.yuque.com/docs/share/19cd8306-55bb-4ee3-b152-ad2aafd06bc3)
+
+
+> 获取图片路径 - GetImgSrc [查看文档](https://www.yuque.com/docs/share/b8c553c7-49bf-4745-95a8-29a17343d0c6)
+
+
+> 多语言 - Language [查看文档](https://www.yuque.com/docs/share/4cebcd6b-04f8-4800-aab1-e4a646e65c31)
+
+
+> 本地存储 - LocalStorage [查看文档](https://www.yuque.com/docs/share/18b3a0a4-cb7c-478b-aa60-e216fe1daca0)
+
+
+> 权限 - Permissions [查看文档](https://www.yuque.com/docs/share/23730f3c-46be-4835-bd14-a582c8e6d35b)
+
+
+> 打印服务 - Print [查看文档](https://www.yuque.com/docs/share/f500a7d5-6ef9-48ac-967c-bbb2d393dc0e)
+
+
+> 设置系统颜色 - SetColor [查看文档](https://www.yuque.com/docs/share/789ceb12-5705-40bc-9de8-cf2de99c572e)
+
+
+> 底部导航栏数据 - TabBar [查看文档](https://www.yuque.com/docs/share/6e0f6457-97c2-4395-ad8f-9395b349d9ba)
+
+
+> 格式化数字角标 - Tip [查看文档](https://www.yuque.com/docs/share/e60d0326-9a32-41de-b2c4-4e565d6961c9)
+
+
+> 轻提醒 - Toast [查看文档](https://www.yuque.com/docs/share/1cdaf85c-0f6d-4761-963c-769d19826cbe)
+
+
+> 绑定UUID - UUID [查看文档](https://www.yuque.com/docs/share/3c5f5579-d7c2-4c63-8b8d-f19d9e5c6a9c)
+
+
+> 当前仓库数据 - Warehouse [查看文档](https://www.yuque.com/docs/share/20733314-a4ed-4f32-89a5-b2cf57f0e2f5)