From 93612da111454ab48796eefc9c817162726dae25 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Thu, 19 Dec 2024 09:06:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=AF=95=E5=85=A5=E5=BA=93=E3=80=82?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 15 + src/pages/back/backCodeDetail.vue | 2 +- src/pages/repair/testedInBound/codeList.vue | 196 +++++++++++ src/pages/repair/testedInBound/codeScan.vue | 230 +++++++++++++ src/pages/repair/testedInBound/details.vue | 39 ++- src/pages/repair/testedInBound/index.vue | 2 +- src/pages/standardBox/acceptBox.vue | 331 +++++++++++++++++++ src/pages/standardBox/codeList.vue | 196 +++++++++++ src/pages/standardBox/codeScan.vue | 229 +++++++++++++ src/pages/standardBox/index.vue | 348 ++++++++++++++++++++ src/pages/standardBox/transferBox.vue | 331 +++++++++++++++++++ src/services/standard.js | 50 +++ src/utils/http.js | 4 +- 13 files changed, 1952 insertions(+), 21 deletions(-) create mode 100644 src/pages/repair/testedInBound/codeList.vue create mode 100644 src/pages/repair/testedInBound/codeScan.vue create mode 100644 src/pages/standardBox/acceptBox.vue create mode 100644 src/pages/standardBox/codeList.vue create mode 100644 src/pages/standardBox/codeScan.vue create mode 100644 src/pages/standardBox/index.vue create mode 100644 src/pages/standardBox/transferBox.vue create mode 100644 src/services/standard.js diff --git a/src/pages.json b/src/pages.json index ff7b7fd..8a607bc 100644 --- a/src/pages.json +++ b/src/pages.json @@ -258,8 +258,23 @@ "style": { "navigationBarTitleText": "修试入库详情" } + }, + //修试审核-编码详情 + { + "path": "pages/repair/testedInBound/codeList", + "style": { + "navigationBarTitleText": "编码详情" + } + }, + //修试审核-编码扫描 + { + "path": "pages/repair/testedInBound/codeScan", + "style": { + "navigationBarTitleText": "编码扫描" + } } + ], "tabBar": { "color": "#2c2c2c", diff --git a/src/pages/back/backCodeDetail.vue b/src/pages/back/backCodeDetail.vue index a2c7495..b0b9be8 100644 --- a/src/pages/back/backCodeDetail.vue +++ b/src/pages/back/backCodeDetail.vue @@ -5,7 +5,7 @@ - 查询 + 查询 编码退料 diff --git a/src/pages/repair/testedInBound/codeList.vue b/src/pages/repair/testedInBound/codeList.vue new file mode 100644 index 0000000..5f276f0 --- /dev/null +++ b/src/pages/repair/testedInBound/codeList.vue @@ -0,0 +1,196 @@ + + + + + diff --git a/src/pages/repair/testedInBound/codeScan.vue b/src/pages/repair/testedInBound/codeScan.vue new file mode 100644 index 0000000..776529d --- /dev/null +++ b/src/pages/repair/testedInBound/codeScan.vue @@ -0,0 +1,230 @@ + + + + + diff --git a/src/pages/repair/testedInBound/details.vue b/src/pages/repair/testedInBound/details.vue index 12575d5..efc2ec7 100644 --- a/src/pages/repair/testedInBound/details.vue +++ b/src/pages/repair/testedInBound/details.vue @@ -35,10 +35,8 @@ -
@@ -74,18 +72,25 @@ {{ index + 1 }} - 数量: + 到货数量: {{ item.repairNum }} - + {{ index + 1 }} - 单位: + 已入库数: - {{ item.unitName }} + {{ item.repairNum }} - + + + {{ index + 1 }} + 待入库数: + + {{ item.repairNum }} + + {{ index + 1 }} 管理模式: @@ -121,11 +126,11 @@ import { ref, onUnmounted, computed } from 'vue' import { getRepairedDetailList } from '@/services/repair/testedInBound.js' import { onLoad,onShow } from '@dcloudio/uni-app' const detailsList = ref([]) -const query = defineProps() // 获取上级页面传递的路由参数 - +const query = defineProps() // 获取上级页面传递的路由参数 +const taskInfo = JSON.parse(query.taskInfo) // 获取列表详情 const getDetailsData = async () => { - const res = await getRepairedDetailList(query.taskId) + const res = await getRepairedDetailList(taskInfo.id) detailsList.value = res.rows detailsList.value = detailsList.value.map((e) => { return { ...e, isChecked: false } @@ -186,16 +191,16 @@ const onQualified = async () => { // 点击跳转维修页面 const onRepairItem = (item) => { console.log(item) - // let queryParams = null - // let codingUrl = '' + let queryParams = null + let codingUrl = '' // if (item.manageType === 0) { - // codingUrl = '/pages/repair/repairManage/code-view' // 编码维修 + codingUrl = '/pages/repair/testedInBound/codeList' // 编码维修 // } // if (item.manageType == 1) { // codingUrl = '/pages/repair/repairManage/num-operate' // 数量维修 // } - // queryParams = item - // uni.navigateTo({ url: `${codingUrl}?queryParams=${JSON.stringify(queryParams)}` }) + queryParams = item + uni.navigateTo({ url: `${codingUrl}?taskInfo=${JSON.stringify(taskInfo)}&rowData=${JSON.stringify(queryParams)}` }) } onShow(() => { getDetailsData() diff --git a/src/pages/repair/testedInBound/index.vue b/src/pages/repair/testedInBound/index.vue index 441fd56..1cd803f 100644 --- a/src/pages/repair/testedInBound/index.vue +++ b/src/pages/repair/testedInBound/index.vue @@ -241,7 +241,7 @@ const changeTab = (index) => { } // 点击跳转详情 const handleItem = (item) => { - uni.navigateTo({ url: `/pages/repair/testedInBound/details?taskId=${item.id}` }) + uni.navigateTo({ url: `/pages/repair/testedInBound/details?taskInfo=${JSON.stringify(item)}` }) } // 判断数据是否加载完毕 diff --git a/src/pages/standardBox/acceptBox.vue b/src/pages/standardBox/acceptBox.vue new file mode 100644 index 0000000..9daa195 --- /dev/null +++ b/src/pages/standardBox/acceptBox.vue @@ -0,0 +1,331 @@ + + + + + diff --git a/src/pages/standardBox/codeList.vue b/src/pages/standardBox/codeList.vue new file mode 100644 index 0000000..ddc4a01 --- /dev/null +++ b/src/pages/standardBox/codeList.vue @@ -0,0 +1,196 @@ + + + + + diff --git a/src/pages/standardBox/codeScan.vue b/src/pages/standardBox/codeScan.vue new file mode 100644 index 0000000..8b7bc80 --- /dev/null +++ b/src/pages/standardBox/codeScan.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/pages/standardBox/index.vue b/src/pages/standardBox/index.vue new file mode 100644 index 0000000..f2bbcdf --- /dev/null +++ b/src/pages/standardBox/index.vue @@ -0,0 +1,348 @@ + + + + + diff --git a/src/pages/standardBox/transferBox.vue b/src/pages/standardBox/transferBox.vue new file mode 100644 index 0000000..c6e7364 --- /dev/null +++ b/src/pages/standardBox/transferBox.vue @@ -0,0 +1,331 @@ + + + + + diff --git a/src/services/standard.js b/src/services/standard.js new file mode 100644 index 0000000..8e82b1a --- /dev/null +++ b/src/services/standard.js @@ -0,0 +1,50 @@ +import { http } from '@/utils/http' + + // 列表接口 + export const getQrCodeBoxListApi = (data) => { + return http({ + method: 'GET', + url: '/material/bm_qrcode_box/list', + data:data, + }) +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/utils/http.js b/src/utils/http.js index 3f882af..b00c2e0 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -6,8 +6,8 @@ import { useMemberStore } from '@/stores' * baseURL 设置请求ip地址和端口 */ const ENV = process.env.NODE_ENV -export const baseURL = ENV === 'development' ? 'http://192.168.2.246:18080' : '***' -// export const baseURL = ENV === 'development' ? '/api' : '***' +// export const baseURL = ENV === 'development' ? 'http://192.168.0.244:18580' : '***' +export const baseURL = ENV === 'development' ? '/api' : '***' /** * httpInterceptor 分别拦截 request 和 uploadFile 请求 */