diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java index c00b372..d0034b0 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java @@ -68,7 +68,7 @@ public interface TaskDispatchDetailMapper extends BaseMapperX query = new MPJLambdaWrapper<>(); query.eq(TaskDispatchDetailDO::getDispatchId,id) - .eq(TaskDispatchDetailDO::getStatus,2); + .eq(TaskDispatchDetailDO::getProcedureStatus,2); Long aLong = selectCount(query); return aLong.compareTo(Long.valueOf(0))>0; } @@ -162,9 +162,12 @@ public interface TaskDispatchDetailMapper extends BaseMapperX i .and(j -> j.in(TaskDispatchDetailDO::getPostId, postIds)) diff --git a/mes-ui/mes-ui-admin-vue3/heli-web.tar b/mes-ui/mes-ui-admin-vue3/heli-web.tar deleted file mode 100644 index 98af501..0000000 Binary files a/mes-ui/mes-ui-admin-vue3/heli-web.tar and /dev/null differ diff --git a/mes-ui/mini-app/src/pages/approveOrder/approveOrder-detail.vue b/mes-ui/mini-app/src/pages/approveOrder/approveOrder-detail.vue index 539be3b..e81f13e 100644 --- a/mes-ui/mini-app/src/pages/approveOrder/approveOrder-detail.vue +++ b/mes-ui/mini-app/src/pages/approveOrder/approveOrder-detail.vue @@ -11,7 +11,7 @@ import { getFileAPI, getLogAPI, } from '@/services/approveOrder' -import {Base64} from '@/utils/base64.js'; +import {Base64} from '@/uni_modules/base64/base64.js'; const popup = ref() @@ -209,32 +209,10 @@ const handleDownload = (pdfUrl: any) => { window.open(fileUrl.value); // #endif //#ifdef MP-WEIXIN - uni.showLoading({ - title: '正在加载中..' - }) - uni.downloadFile({ - url: pdfUrl, - success: function(res) { - var filePath = res.tempFilePath; - uni.openDocument({ - filePath: filePath, - showMenu: true, - success: function(res) { - console.log('打开文档成功'); - uni.hideLoading() - }, - }); - }, - complete: function(r) { - uni.hideLoading() - } - }); - // fileUrl.value = 'https://star.hz-hl.com/FileServer/onlinePreview?url='+encodeURIComponent(Base64.encode(pdfUrl)); - - // uni.navigateTo({ - // url: './components/showFileWx?fileUrl=' + encodeURIComponent(fileUrl.value) - // }); - // #endif + uni.navigateTo({ + url: './components/showFileWx?fileUrl=' + encodeURIComponent(Base64.encode(pdfUrl)) + }); + //#endif // showFile.value = true; // if (pdfUrl) { diff --git a/mes-ui/mini-app/src/pages/approveOrder/components/showFileWx.vue b/mes-ui/mini-app/src/pages/approveOrder/components/showFileWx.vue index adb542d..5f211c5 100644 --- a/mes-ui/mini-app/src/pages/approveOrder/components/showFileWx.vue +++ b/mes-ui/mini-app/src/pages/approveOrder/components/showFileWx.vue @@ -1,30 +1,38 @@ - + - - \ No newline at end of file diff --git a/mes-ui/mini-app/src/services/constants.ts b/mes-ui/mini-app/src/services/constants.ts index 3d1eddf..1297d38 100644 --- a/mes-ui/mini-app/src/services/constants.ts +++ b/mes-ui/mini-app/src/services/constants.ts @@ -10,5 +10,5 @@ // export const serviceDomain = 'https://star.hz-hl.com' // export const serviceDomain = 'http://222.71.165.187:9010' -export const serviceDomain = 'http://localhost:8080' -// export const serviceDomain = 'https://nxhs.cjyx.cc' \ No newline at end of file +// export const serviceDomain = 'http://localhost:8080' +export const serviceDomain = 'https://nxhs.cjyx.cc' \ No newline at end of file diff --git a/mes-ui/mini-app/src/utils/base64.js b/mes-ui/mini-app/src/uni_modules/base64/base64.js similarity index 100% rename from mes-ui/mini-app/src/utils/base64.js rename to mes-ui/mini-app/src/uni_modules/base64/base64.js diff --git a/mes-ui/mini-app/src/utils/http.ts b/mes-ui/mini-app/src/utils/http.ts index 7007ffc..64815d6 100644 --- a/mes-ui/mini-app/src/utils/http.ts +++ b/mes-ui/mini-app/src/utils/http.ts @@ -86,7 +86,6 @@ export const http = (options: UniApp.RequestOptions) => { ...options, // 响应成功 success(res) { - console.log(res) // 状态码 2xx, axios 就是这样设计的 if (res.statusCode >= 200 && res.statusCode < 300) { if (res.data?.code == 0) {