diff --git a/src/pages/new-purchase/accept/acceptDetails.vue b/src/pages/new-purchase/accept/acceptDetails.vue
index 6dfaea4..fbce08c 100644
--- a/src/pages/new-purchase/accept/acceptDetails.vue
+++ b/src/pages/new-purchase/accept/acceptDetails.vue
@@ -2,9 +2,7 @@
-
-
@@ -99,6 +97,7 @@ onShow(()=>{
.accept {
height: 100%;
word-break: break-all;
+ overflow-y: auto;
.complete-btn {
display: flex;
padding: 20rpx;
@@ -132,7 +131,7 @@ onShow(()=>{
}
.table-list-item {
margin: 20rpx 0;
- padding: 40rpx;
+ padding: 20rpx;
background-color: #fff;
min-height: 300rpx;
border-radius: 10rpx;
diff --git a/src/pages/new-purchase/accept/conclusion.vue b/src/pages/new-purchase/accept/conclusion.vue
index a0ff619..d0ef8b6 100644
--- a/src/pages/new-purchase/accept/conclusion.vue
+++ b/src/pages/new-purchase/accept/conclusion.vue
@@ -33,7 +33,7 @@
-
+
@@ -45,7 +45,7 @@ import { onLoad } from '@dcloudio/uni-app'
import { innerVerify } from '../../../services/purchase.js';
const formData = ref({})
const checkResult = ref("")
-
+//合格
const pass = () => {
let obj = {
"taskId":formData.value.taskId,
@@ -63,7 +63,37 @@ const pass = () => {
innerVerify(param).then(res => {
console.log(res)
if(res.code==200){
- uni.showToast({ title: '验证成功', icon: 'none' })
+ uni.showToast({ title: '验收成功', icon: 'none' })
+ uni.navigateBack({
+ delta: 1 // 返回到已存在的页面
+ });
+ }else{
+ uni.showToast({ title: res.msg, icon: 'none' })
+ }
+
+ }).catch(error => {
+ console.log(error)
+ })
+}
+//不合格
+const reject = () => {
+ let obj = {
+ "taskId":formData.value.taskId,
+ "typeId":formData.value.typeId,
+ "manageType":formData.value.manageType,
+ "status":1,
+ "checkResult":checkResult.value,
+ }
+ console.log(obj)
+ let param = {
+ purchaseCheckDetailsList:[obj],
+ verifyPass:false
+ }
+ console.log(param)
+ innerVerify(param).then(res => {
+ console.log(res)
+ if(res.code==200){
+ uni.showToast({ title: '操作成功', icon: 'none' })
uni.navigateBack({
delta: 1 // 返回到已存在的页面
});
@@ -75,8 +105,6 @@ const pass = () => {
console.log(error)
})
}
-
-
onLoad((options)=>{
console.log(options)
formData.value = JSON.parse(options.item)
diff --git a/src/pages/new-purchase/accept/index.vue b/src/pages/new-purchase/accept/index.vue
index 52c5ae4..b6c0b22 100644
--- a/src/pages/new-purchase/accept/index.vue
+++ b/src/pages/new-purchase/accept/index.vue
@@ -67,10 +67,10 @@
>
{{ item.purchaseMaNumber }}
-
+