From 0ba77429b04d67d75a5d8b73a84cc4659c505357 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Tue, 19 Nov 2024 15:06:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E9=AA=8C=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 7 + src/pages/back/index.vue | 209 ++++++++++++++++++ .../new-purchase/accept/acceptDetails.vue | 1 + src/pages/new-purchase/accept/conclusion.vue | 86 ++++++- src/services/back.js | 19 ++ src/utils/http.js | 5 +- 6 files changed, 316 insertions(+), 11 deletions(-) create mode 100644 src/pages/back/index.vue create mode 100644 src/services/back.js diff --git a/src/pages.json b/src/pages.json index 431b25f..a8ccd95 100644 --- a/src/pages.json +++ b/src/pages.json @@ -69,6 +69,13 @@ "style": { "navigationBarTitleText": "领料出库" } + }, + + { + "path": "pages/back/index", + "style": { + "navigationBarTitleText": "退料任务" + } } ], "tabBar": { diff --git a/src/pages/back/index.vue b/src/pages/back/index.vue new file mode 100644 index 0000000..a0fd40a --- /dev/null +++ b/src/pages/back/index.vue @@ -0,0 +1,209 @@ + + + + + diff --git a/src/pages/new-purchase/accept/acceptDetails.vue b/src/pages/new-purchase/accept/acceptDetails.vue index fbce08c..c01a332 100644 --- a/src/pages/new-purchase/accept/acceptDetails.vue +++ b/src/pages/new-purchase/accept/acceptDetails.vue @@ -47,6 +47,7 @@ import { getPurchaseInfo } from '../../../services/purchase.js'; import { onLoad,onShow } from '@dcloudio/uni-app' + const searchValue = ref('') const id = ref('') const taskId = ref('') diff --git a/src/pages/new-purchase/accept/conclusion.vue b/src/pages/new-purchase/accept/conclusion.vue index d0ef8b6..6adacf9 100644 --- a/src/pages/new-purchase/accept/conclusion.vue +++ b/src/pages/new-purchase/accept/conclusion.vue @@ -14,12 +14,14 @@ {{ formData.purchaseNum }} - + + + - + + @@ -27,7 +29,11 @@ -
+
+ +
+
+
+ +
@@ -43,8 +49,18 @@ import { ref, reactive } from 'vue' import { onLoad } from '@dcloudio/uni-app' import { innerVerify } from '../../../services/purchase.js'; +import { baseURL } from '@/utils/http' const formData = ref({}) -const checkResult = ref("") +const checkResult = ref("合格") +const warnDocuments = ref("") +const reason = ref("") +const imgBeseUrl = ref("")//页面展示选中图片 +const bmFileInfos = ref([])//请求图片参数 + + +const range = reactive([{value:"合格",text:"合格"},{value:"不合格",text:"不合格" },]) + + //合格 const pass = () => { let obj = { @@ -53,6 +69,9 @@ const pass = () => { "manageType":formData.value.manageType, "status":3, "checkResult":checkResult.value, + "reason":reason.value, + "warnDocuments":warnDocuments.value, + "bmFileInfos":bmFileInfos.value } console.log(obj) let param = { @@ -83,6 +102,9 @@ const reject = () => { "manageType":formData.value.manageType, "status":1, "checkResult":checkResult.value, + "reason":reason.value, + "warnDocuments":warnDocuments.value, + "bmFileInfos":bmFileInfos.value } console.log(obj) let param = { @@ -105,6 +127,54 @@ const reject = () => { console.log(error) }) } + +//上传 +const uploadImg = () => { + uni.chooseImage({ + count: 1, //图片可选择数量 + sizeType: ['original', 'compressed'], //original 原图，compressed 压缩图，默认二者都有 + sourceType: ['album', 'camera',], //album 从相册选图，camera 使用相机，默认二者都有。 + success: res => { + console.log(res) + let imgFiles = res.tempFilePaths //图片的本地文件路径列表 + imgBeseUrl.value = imgFiles[0] + // console.log('本地地址', imgFiles) + // console.log('请求地址', baseURL+"/file/upload") + uni.uploadFile({ + // url: baseURL+"/file/upload",//app + url: "/file/upload",//h5 + filePath: imgFiles[0], + name: 'file', + success: (res) => { + res = JSON.parse(res.data) + console.log('上传成功', res.code); + console.log('上传成功', res.data); + if(res.code&&res.code==200){ + let obj = { + "name":res.data.name, + "url":res.data.url, + "taskType":"10" + } + // console.log(obj) + bmFileInfos.value = [obj] + uni.showToast({ title: '上传成功', icon: 'none' }) + }else{ + bmFileInfos.value = [] + uni.showToast({ title: '上传失败', icon: 'none' }) + } + }, + fail: (err) => { + console.error('上传失败', err); + } + }); + // this.$refs.vForm.clearValidate() + } + }) +} + + + + onLoad((options)=>{ console.log(options) formData.value = JSON.parse(options.item) @@ -124,8 +194,8 @@ onLoad((options)=>{ box-shadow: 0 2upx 4upx 0 rgba(0, 0, 0, 0.1); } .upload { - width: 60px; - height: 60px; + width: 80px; + height: 80px; background-color: #f5f5f5; border-radius: 6px; display: flex; diff --git a/src/services/back.js b/src/services/back.js new file mode 100644 index 0000000..2c55f5b --- /dev/null +++ b/src/services/back.js @@ -0,0 +1,19 @@ +import { http } from '@/utils/http' + + // 退料任务列表接口 + export const getBackList = (data) => { + return http({ + method: 'GET', + url: '/material/back_apply_info/list', + data:data, + }) +} + + + + + + + + + diff --git a/src/utils/http.js b/src/utils/http.js index b08770f..5ee699a 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -6,8 +6,7 @@ import { useMemberStore } from '@/stores' * baseURL 设置请求ip地址和端口 */ const ENV = process.env.NODE_ENV -const baseURL = ENV === 'development' ? 'http://192.168.2.246:18080' : '***' - +export const baseURL = ENV === 'development' ? '/api' : '***' /** * httpInterceptor 分别拦截 request 和 uploadFile 请求 */ @@ -96,4 +95,4 @@ export const http = (options) => { }, }) }) -} +} \ No newline at end of file