diff --git a/src/pages/picking/outbound/details.vue b/src/pages/picking/outbound/details.vue
index 9358a82..4f00f53 100644
--- a/src/pages/picking/outbound/details.vue
+++ b/src/pages/picking/outbound/details.vue
@@ -334,20 +334,7 @@ const onClick = (e, item) => {
}
}
if (e.content.text == '查看') {
- if (item.status == 2) {//已完成
- console.log(312)
- checkViewDetail(item)//查看
- }else{
- console.log(31)//退回
- leaseOutBack(item)
- }
- }
- if (e.index === 2) {
- if (item.status == 2) {//已完成
- }else{
- console.log(32)
- checkViewDetail(item)//查看
- }
+ checkViewDetail(item)//查看
}
}
if(taskStatus.value==4){//出库已完成
diff --git a/src/pages/repair/wsMaInfo/index.vue b/src/pages/repair/wsMaInfo/index.vue
index 82c56a3..53f48c6 100644
--- a/src/pages/repair/wsMaInfo/index.vue
+++ b/src/pages/repair/wsMaInfo/index.vue
@@ -20,7 +20,7 @@
+ :key="maName" @change="onSupplierChange" @clear="onSupplierClear" />
@@ -209,7 +209,7 @@
}
if (maCode.value.length === 0) {
return uni.showToast({
- title: '请输入机具编码',
+ title: '请生成机具编码',
icon: 'none'
})
}
diff --git a/src/pages/standardBox/codeEntering.vue b/src/pages/standardBox/codeEntering.vue
index 1cff8a1..4ddefab 100644
--- a/src/pages/standardBox/codeEntering.vue
+++ b/src/pages/standardBox/codeEntering.vue
@@ -48,7 +48,7 @@
编码
- 状态
+
录入人
操作
@@ -56,15 +56,13 @@
{{ item.maCode }}
- {{ item.maStatus }}
+
{{ item.createBy }}
-
- 删除
-
+ 删除
@@ -83,7 +81,7 @@
import { ref, reactive } from 'vue'
import { onLoad, onShow } from '@dcloudio/uni-app'
import {
- getAppBoxDetailListApi,
+ getBoxDetailListApi,
appUnbindMaCodeApi,
getMaCodeListApi,
appCodeBindApi,
@@ -117,7 +115,7 @@ const getCodeList = () => {
let param = {
boxId: boxInfo.value.boxId,
}
- getAppBoxDetailListApi(param)
+ getBoxDetailListApi(param)
.then((res) => {
console.log(res)
if ((res.code = 200)) {
diff --git a/src/services/standard.js b/src/services/standard.js
index 3e94004..177e135 100644
--- a/src/services/standard.js
+++ b/src/services/standard.js
@@ -31,6 +31,13 @@ export const getAppBoxDetailListApi = (data) => {
url: '/material/bm_qrcode_box/app_box_bind_list',
data:data,
})
+}
+export const getBoxDetailListApi = (data) => {
+ return http({
+ method: 'GET',
+ url: '/material/bm_qrcode_box/app_box_bind_wsList',
+ data,
+ })
}
// 标准箱绑定编码
export const appBindMaCodeApi = (data)=> {