diff --git a/src/pages/repair/equipAssessment/details.vue b/src/pages/repair/equipAssessment/details.vue
index 4f40f44..e4c1674 100644
--- a/src/pages/repair/equipAssessment/details.vue
+++ b/src/pages/repair/equipAssessment/details.vue
@@ -10,12 +10,12 @@
查询
-
+
+ 驳回
+
-
+
-
-
+
+
定损任务
-
- {{ index + 1 }}
+
+
物资名称：
{{ item.typeName }}
@@ -124,8 +124,8 @@
/>
-
-
+
+
@@ -214,31 +214,44 @@ const onQualified = async () => {
const isSelect = detailsList.value.some((e) => e.isChecked == true)
if (!isSelect) {
uni.showToast({
- title: '请勾选需要需要合格的数据！',
+ title: '请选择要驳回的数据！',
icon: 'none',
})
return
- }
- // 组装参数
- const ids = []
- detailsList.value.forEach((e) => {
- if (e.isChecked) {
+ }
+ // 提示
+ uni.showModal({
+ title: '提示',
+ content: '确定驳回吗？',
+ success: async function (res) {
+ if (res.confirm) {
+ // 获取选中数据
+ // 组装参数
+ const ids = []
+ detailsList.value.forEach((e) => {
+ if (e.isChecked) {
if (e.ids.length > 0) {
- e.ids.forEach((f) => {
- ids.push(f)
- })
+ e.ids.forEach((f) => {
+ ids.push(f)
+ })
}
+ }
+ })
+ console.log(ids)
+ const parm = {
+ ids: ids
}
- })
- console.log(ids)
- const res = await auditRepairPass(ids)
- if (res.code === 200) {
- uni.showToast({
+ const res = await repairRejectAPI(parm)
+ if (res.code === 200) {
+ uni.showToast({
title: '操作成功！',
icon: 'none',
- })
- getRepairDetailsData()
+ })
+ await getRepairDetailsData()
+ }
+ }
}
+ })
}
// 点击跳转维修页面
diff --git a/src/pages/repair/repairManage/details.vue b/src/pages/repair/repairManage/details.vue
index 4d96d94..27b83e3 100644
--- a/src/pages/repair/repairManage/details.vue
+++ b/src/pages/repair/repairManage/details.vue
@@ -129,6 +129,7 @@
import { ref, onUnmounted, computed } from 'vue'
import { getRepairDetailsAPI, auditRepairPass } from '@/services/repair/repair.js'
import { onLoad, onShow } from '@dcloudio/uni-app'
+import {repairRejectAPI} from "../../../services/repair/repair";
const detailsList = ref([])
// const query = defineProps() // 获取上级页面传递的路由参数
const taskId = ref('')
@@ -224,25 +225,48 @@ const onRepairItem = (item) => {
}
// 驳回
-const handleReject = () => {
- // 未选择 提示
- if (!detailsList.value.some(item => item.isChecked)) {
- uni.showToast({
- title: '请选择要驳回的数据',
- icon: 'none',
- })
- return
- }
+const handleReject = async () => {
+ const isSelect = detailsList.value.some((e) => e.isChecked == true)
+ if (!isSelect) {
+ uni.showToast({
+ title: '请选择要驳回的数据',
+ icon: 'none',
+ })
+ return
+ }
// 提示
uni.showModal({
title: '提示',
content: '确定驳回吗？',
- success: function (res) {
- if (res.confirm) {
- // 获取选中数据
- const checkedRows = detailsList.value.filter(item => item.isChecked)
- console.log('🚀 ~ handleReject ~ checkedRows:', checkedRows)
+ success: async function (res) {
+ if (res.confirm) {
+ // 获取选中数据
+ // const checkedRows = detailsList.value.filter(item => item.isChecked)
+ // console.log('🚀 ~ handleReject ~ checkedRows:', checkedRows)
+ // 组装参数
+ const ids = []
+ detailsList.value.forEach((e) => {
+ if (e.isChecked) {
+ if (e.ids.length > 0) {
+ e.ids.forEach((f) => {
+ ids.push(f)
+ })
+ }
+ }
+ })
+ console.log(ids)
+ const parm = {
+ ids: ids
}
+ const res = await repairRejectAPI(parm)
+ if (res.code === 200) {
+ uni.showToast({
+ title: '操作成功！',
+ icon: 'none',
+ })
+ await getRepairDetailsData()
+ }
+ }
}
})
}
diff --git a/src/pages/repair/repairManage/index.vue b/src/pages/repair/repairManage/index.vue
index 4784a7e..167d338 100644
--- a/src/pages/repair/repairManage/index.vue
+++ b/src/pages/repair/repairManage/index.vue
@@ -155,7 +155,12 @@ const onClick = async (e, item) => {
} else {
// 驳回逻辑
console.log('驳回')
- const res = await repairRejectAPI(item.taskId)
+ const parm ={
+ taskIds:[
+ item.taskId,
+ ]
+ }
+ const res = await repairRejectAPI(parm)
if (res.code === 200) {
uni.showToast({
title: '驳回成功！',
@@ -234,7 +239,7 @@ const changeTab = (index) => {
// 点击跳转详情
const handleItem = (item) => {
console.log(item)
- if(item.repairStatusCode=="0" || item.repairStatusCode=="4"){
+ if(item.repairStatusCode=="0" || item.repairStatusCode=="4" || item.repairStatusCode=="3"){
uni.navigateTo({ url: `/pages/repair/repairManage/details?taskId=${item.taskId}` })
}else{
uni.navigateTo({ url: `/pages/repair/repairManage/view?taskId=${item.taskId}` })