diff --git a/pages/index/index.vue b/pages/index/index.vue index 3157ecc..cd08905 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -92,11 +92,11 @@ name: '空置托盘', router: '/pagesHome/pages/RemoveTray/RemoveTray', }, - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '复核', - // router: '/pagesHome/pages/Check/Check', - // }, + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '复核', + router: '/pagesHome/pages/Check/Check', + }, ] }, { diff --git a/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue b/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue index c4b90a9..c08a998 100644 --- a/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue +++ b/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue @@ -107,13 +107,11 @@ onUnload } from '@dcloudio/uni-app' import { distributionStockuporderInfo,distributionStockupstockupScan } from '@/api/user.js' - import {detailType} from '@/interfaces/pagesHome/StockUplistScandetails' - import { reactive, ref, toRefs,inject } from "vue"; + import { detailType } from '@/interfaces/pagesHome/StockUplistScandetails' + import { reactive, ref, toRefs, inject } from "vue"; const util = (inject('utils') as any) let details=reactive({ - dataList:[ - - ], + dataList:[], stockArticleId:'', orderStatus:'', reservationId:'', @@ -257,8 +255,8 @@ let res=await distributionStockupstockupScan(data) console.log(res); if(res.code==200){ - initpage() details.isscan=true + initpage() } } async function initpage(){ @@ -284,7 +282,7 @@ details.trays=response.data.trays details.warehouseArea=response.data.warehouseArea details.address=response.data.address - if(Number(details.scanNum)>0){ + if(Number(details.scanNum)>0&&details.isscan){ util.ttsspke(details.scanNum+'件') } } diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.js b/unpackage/dist/dev/mp-weixin/pages/index/index.js index 26a3054..e7e6fc5 100644 --- a/unpackage/dist/dev/mp-weixin/pages/index/index.js +++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js @@ -72,12 +72,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", name: "空置托盘", router: "/pagesHome/pages/RemoveTray/RemoveTray" + }, + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "复核", + router: "/pagesHome/pages/Check/Check" } - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '复核', - // router: '/pagesHome/pages/Check/Check', - // }, ] }, { diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.js index 94be617..8d1ab49 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.js @@ -132,8 +132,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ let res = await api_user.distributionStockupstockupScan(data); console.log(res); if (res.code == 200) { - initpage(); details.isscan = true; + initpage(); } } async function initpage() { @@ -159,7 +159,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ details.trays = response.data.trays; details.warehouseArea = response.data.warehouseArea; details.address = response.data.address; - if (Number(details.scanNum) > 0) { + if (Number(details.scanNum) > 0 && details.isscan) { util.ttsspke(details.scanNum + "件"); } } diff --git a/unpackage/dist/dev/mp-weixin/utils/utils.js b/unpackage/dist/dev/mp-weixin/utils/utils.js index 8218b09..87f1940 100644 --- a/unpackage/dist/dev/mp-weixin/utils/utils.js +++ b/unpackage/dist/dev/mp-weixin/utils/utils.js @@ -1,27 +1,38 @@ "use strict"; const utils = { + //一体机打印初始化 init: () => { }, + //检查打印机状态 getstate: () => { }, + //打印的内容 printxie: async (obj) => { }, + //蓝牙打印初始化 initbl: () => { }, + //给蓝牙打印机推送打印的内容 getbl: (dev, text) => { }, + //初始化tts语音引擎 inittts() { }, + //语音播报 ttsspke: (text) => { }, + //设置扫描的广播 setting: () => { }, + //获取当前APP的版本信息 getversion: () => { return new Promise((relove, reject) => { }); }, + //执行下载更新(apk和wgt都可以) updatefile: (file) => { }, + //执行下载更新(无感)(wgt) updatefile1: (file) => { } }; diff --git a/utils/utils.js b/utils/utils.js index 41c8c0f..a7f697c 100644 --- a/utils/utils.js +++ b/utils/utils.js @@ -3,6 +3,7 @@ const sunmi_print = uni.requireNativePlugin('Sunmi-Print-Inner') const TTSSpeech = uni.requireNativePlugin("MT-TTS-Speech"); // #endif const utils={ + //一体机打印初始化 init:()=>{ // #ifdef APP return new Promise((relove, reject)=>{ @@ -18,6 +19,7 @@ const utils={ }) // #endif }, + //检查打印机状态 getstate:()=>{ // #ifdef APP return new Promise((relove, reject)=>{ @@ -57,6 +59,7 @@ const utils={ }) // #endif }, + //打印的内容 printxie:async (obj)=>{ // #ifdef APP let res=await sunmi_print.labelLocate(); @@ -106,6 +109,7 @@ const utils={ },2000) // #endif }, + //蓝牙打印初始化 initbl:()=>{ // #ifdef APP let deviceList = []; @@ -134,6 +138,7 @@ const utils={ return deviceList // #endif }, + //给蓝牙打印机推送打印的内容 getbl:(dev,text)=>{ // #ifdef APP let main = plus.android.runtimeMainActivity(); @@ -174,6 +179,7 @@ const utils={ } // #endif }, + //初始化tts语音引擎 inittts(){ // #ifdef APP TTSSpeech.init((status) => { @@ -237,13 +243,15 @@ const utils={ }, 'com.iflytek.speechcloud') // #endif }, - ttsspke:(text)=>{ //语音播报 + //语音播报 + ttsspke:(text)=>{ // #ifdef APP console.log('语音播报'); if(!text){return} TTSSpeech.speak({ text }); // #endif }, + //设置扫描的广播 setting:()=>{ // #ifdef APP let main=plus.android.runtimeMainActivity() @@ -266,6 +274,7 @@ const utils={ main.sendBroadcast(intentSetting) // #endif }, + //获取当前APP的版本信息 getversion:()=>{ return new Promise((relove, reject)=>{ // #ifdef APP @@ -285,6 +294,7 @@ const utils={ }) }, + //执行下载更新(apk和wgt都可以) updatefile:(file)=>{ // #ifdef APP const downloadTask = uni.downloadFile({ //执行下载 @@ -319,6 +329,7 @@ const utils={ }); // #endif }, + //执行下载更新(无感)(wgt) updatefile1:(file)=>{ // #ifdef APP const downloadTask = uni.downloadFile({ //执行下载