@@ -17,7 +17,7 @@
v-for="(item, index) in detailsList"
:key="index"
class="table-list-item"
- @tap="onCodingItem(item)"
+
>
@@ -36,30 +36,23 @@
{{ index + 1 }}
- 预领数量：
+ 到货数量：
- {{ item.preNum }}
+ {{ }}
{{ index + 1 }}
- 已领数量：
+ 已入库数量：
- {{ item.alNum }}
+ {{ }}
-
+
{{ index + 1 }}
- 待领数量：
+ 待入库数量：
- {{ item.preNum - item.alNum }}
-
-
-
- {{ index + 1 }}
- 单位：
-
- {{ item.unitName }}
+ {{ }}
@@ -88,13 +81,13 @@
text="未完成"
type="warning"
size="small"
- v-if="item.status == 0 || item.status == 1"
+ v-if="item.status == 4"
/>
@@ -106,86 +99,38 @@
+
+
diff --git a/src/pages/new-purchase/entry/index.vue b/src/pages/new-purchase/entry/index.vue
index 45a0ce2..4888661 100644
--- a/src/pages/new-purchase/entry/index.vue
+++ b/src/pages/new-purchase/entry/index.vue
@@ -59,9 +59,13 @@
采购数量：
{{ item.purchaseMaNumber }}
-
- 物资厂家：
- {{ item.supplier }}
+
+ 已入库数量：
+ {{ }}
+
+
+ 待入库数量：
+ {{ }}
@@ -105,15 +109,21 @@ const onChangeDate = (val) => {
//点击事件
const onClick=(e,item)=> {
if(item.taskStatus==22){
- console.log(e.index)
if(e.index==0){
- uni.navigateTo({ url: `/pages/new-purchase/entry/details?id=${item.id}` })
+ uni.navigateTo({ url: `/pages/new-purchase/entry/details?id=${item.id}&taskId=${item.taskId}` })
}
// console.log(e,'item',item);
// console.log(e.index);
+ }else{
+ if(e.index==0){
+ uni.navigateTo({ url: `/pages/new-purchase/entry/details?id=${item.id}&taskId=${item.taskId}` })
+ }else{
+ uni.navigateTo({ url: `/pages/new-purchase/entry/inEntry?id=${item.id}&taskId=${item.taskId}` })
}
}
+ }
+
//左滑选择项1
const swipeOptions = ref([
{
@@ -121,11 +131,11 @@ const swipeOptions = ref([
style: { backgroundColor: '#34C759' },
onClick: () => { handleAction('查看'); }
},
- {
- text: '驳回',
- style: { backgroundColor: '#dd524d' },
- onClick: () => { handleAction('驳回'); }
- }
+ // {
+ // text: '驳回',
+ // style: { backgroundColor: '#dd524d' },
+ // onClick: () => { handleAction('驳回'); }
+ // }
])
//左滑选择项2
@@ -138,10 +148,10 @@ const swipeOptions = ref([
text: '入库',
style: { backgroundColor: '#007AFF' },
},
- {
- text: '驳回',
- style: { backgroundColor: '#dd524d' },
- }
+ // {
+ // text: '驳回',
+ // style: { backgroundColor: '#dd524d' },
+ // }
])
//左滑改变
@@ -153,10 +163,9 @@ const swipeOptions = ref([
// 获取列表数据
const getTableList = async (isTap = false) => {
- // console.log('queryParams.value查询参数', queryParams.value)
const res = await getPurchaseList(queryParams.value)
console.log('res列表数据', res)
- total.value = res.total
+ total.value = res.data.total
if (isTap) {
tableList.value = res.data.rows
} else {
@@ -182,10 +191,10 @@ const changeTab = (index) => {
}
const maskClick = () => {}
-// 页面加载完毕
-onLoad(() => {
- getTableList()
-})
+// // 页面加载完毕
+// onLoad(() => {
+// getTableList()
+// })
onShow(() => {
tableList.value = []
@@ -198,10 +207,12 @@ const onScrollTolower = debounce(() => {
queryParams.value.pageNum++
getTableList()
}
-})
+},500)
// 判断数据是否加载完毕
const finish = computed(() => {
+ console.log('total.value',total.value)
+ console.log('tableList.value.length',tableList.value.length)
if (total.value === tableList.value.length) return true
})
diff --git a/src/services/purchase.js b/src/services/purchase.js
index 6ff1acb..1da3978 100644
--- a/src/services/purchase.js
+++ b/src/services/purchase.js
@@ -18,6 +18,34 @@ export const getPurchaseInfo = (data) => {
})
}
+// 查询新购验收任务详细列表
+export const getPurchaseDetailsList = (data)=> {
+ return http({
+ url: '/material/purchase_check_info/getInfo',
+ method: 'GET',
+ data: data,
+ })
+}
+
+// 查询入库编码列表
+export const getMachineById = (data)=> {
+ return http({
+ url: '/material/purchase/storage/getMachineById',
+ method: 'POST',
+ data: data,
+ })
+ }
+
+// 查询入库编码列表 || 数量入库
+export const setInboundCodeAPI = (data)=> {
+ return http({
+ url: '/material/purchase/storage/warehouse',
+ method: 'POST',
+ data: data
+ })
+ }
+
+
// 验收接口
export const innerVerify = (data) => {
return http({
From 765f7bc70b5d1932f8cf929d4b89a0403552fbbe Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 21 Nov 2024 10:47:48 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=88=9D=E6=AD=A5?=
=?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages.json | 17 ++
src/pages/repair/details.vue | 258 +++++++++++++++++++++++++++
src/pages/repair/index.vue | 324 ++++++++++++++++++++++++++++++++++
src/pages/work/index.vue | 21 +++
src/services/repair/repair.js | 22 +++
src/static/workbench/fix.png | Bin 0 -> 2539 bytes
6 files changed, 642 insertions(+)
create mode 100644 src/pages/repair/details.vue
create mode 100644 src/pages/repair/index.vue
create mode 100644 src/services/repair/repair.js
create mode 100644 src/static/workbench/fix.png
diff --git a/src/pages.json b/src/pages.json
index 1be53f3..f95046e 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -138,6 +138,23 @@
"style": {
"navigationBarTitleText": "退料数量"
}
+ },
+
+ /* 维修及其页面 */
+
+ // 1. 维修列表
+ {
+ "path": "pages/repair/index",
+ "style": {
+ "navigationBarTitleText": "维修任务"
+ }
+ },
+ // 2. 维修详情
+ {
+ "path": "pages/repair/details",
+ "style": {
+ "navigationBarTitleText": "维修任务"
+ }
}
],
"tabBar": {
diff --git a/src/pages/repair/details.vue b/src/pages/repair/details.vue
new file mode 100644
index 0000000..ea61211
--- /dev/null
+++ b/src/pages/repair/details.vue
@@ -0,0 +1,258 @@
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 合格
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 物资名称：
+
+ {{ item.typeName }}
+
+
+
+ {{ index + 1 }}
+ 规格型号：
+
+ {{ item.type }}
+
+
+
+ {{ index + 1 }}
+ 已退数量：
+
+ {{ item.repairNum }}
+
+
+
+ {{ index + 1 }}
+ 单位：
+
+ {{ item.unitName }}
+
+
+
+ {{ index + 1 }}
+ 管理模式：
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/repair/index.vue b/src/pages/repair/index.vue
new file mode 100644
index 0000000..0661dd5
--- /dev/null
+++ b/src/pages/repair/index.vue
@@ -0,0 +1,324 @@
+
+
+
+
+
+ 已完成
+
+
+
+ 未完成
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+ 退料人：
+
+ {{ item.createBy }}
+
+
+
+ 任务时间：
+ {{ item.createTime }}
+
+
+
+ 维修单号：
+
+ {{ item.repairCode }}
+
+
+
+ 退料物资：
+
+ {{ item.type }}
+
+
+
+ 退料单位：
+
+ {{ item.backUnit }}
+
+
+
+ 工程名称：
+
+ {{ item.backPro }}
+
+
+
+ 任务创建人：
+
+ {{ item.createBy }}
+
+
+
+
+ 状态：
+
+
+
+
+
+
+
+
+
+
+
+ {{ finish ? '没有更多数据了~' : '正在加载...' }}
+
+
+
+
+
+
+
+
diff --git a/src/pages/work/index.vue b/src/pages/work/index.vue
index 816bbfa..df62993 100644
--- a/src/pages/work/index.vue
+++ b/src/pages/work/index.vue
@@ -27,6 +27,19 @@
+