diff --git a/pages/backMaterialReceive/backMaterialReceive.vue b/pages/backMaterialReceive/backMaterialReceive.vue
index 2516f51..7c5b282 100644
--- a/pages/backMaterialReceive/backMaterialReceive.vue
+++ b/pages/backMaterialReceive/backMaterialReceive.vue
@@ -9,7 +9,7 @@
class="single-fetch"
v-for="(fetch, index) in fetchMaterialList"
:key="index"
- @click="optionClick($event, fetch.id)"
+ @click="optionClick($event, fetch.id, fetch.modelId)"
>
@@ -124,10 +124,10 @@ import { basePath } from '../../public'
}
},
methods: {
- optionClick (e, id) {
+ optionClick (e, id, modelId) {
console.log(id);
uni.navigateTo({
- url: `/pages/seeBackMaterialDetail/seeBackMaterialDetail?id=${id}`
+ url: `/pages/seeBackMaterialDetail/seeBackMaterialDetail?id=${id}&typeId=${modelId}`
})
},
seeDetail (item) {
diff --git a/pages/crashExam/crashExam.vue b/pages/crashExam/crashExam.vue
index a38f25d..c4b4ed3 100644
--- a/pages/crashExam/crashExam.vue
+++ b/pages/crashExam/crashExam.vue
@@ -91,13 +91,15 @@
+ 是否通过审批？
-
+ 通过
+ 驳回
+
@@ -208,7 +210,8 @@
for (let i = 0; i < that.taskIdList.length; i++) {
that.subArr.push(that.taskIdList[i].taskId)
}
- uni.showModal({
+ that.openPopup()
+ /* uni.showModal({
title: '审核通过',
content: '确认审核通过吗？',
confirmText: '通过',
@@ -222,7 +225,7 @@
that.subInStore(that.subObj)
}
}
- })
+ }) */
}
},
subInStore (obj) {
@@ -235,9 +238,7 @@
icon: 'none',
title: res.data.msg,
success: () => {
- /* uni.redirectTo({
- url: '/pages/repairTestInStore/repairTestInStore'
- }) */
+ that.closePopup()
uni.redirectTo({
url: '/pages/crashExam/crashExam'
})
@@ -251,12 +252,29 @@
}
})
},
+ openPopup () {
+ this.$refs.popup.open()
+ },
closePopup () {
this.$refs.popup.close()
},
- seeExam (name) {
- console.log(name);
- this.$refs.popup.open()
+ modalConfirm () {
+ let that = this
+ that.subObj = {
+ checkResult: '通过',
+ taskIdList: that.taskIdList
+ }
+ console.log(that.subObj);
+ that.subInStore(that.subObj)
+ },
+ modalReject () {
+ let that = this
+ that.subObj = {
+ checkResult: '驳回',
+ taskIdList: that.taskIdList
+ }
+ console.log(that.subObj);
+ that.subInStore(that.subObj)
},
formSubmit () {
let that = this
@@ -454,7 +472,7 @@
}
.popup{
width: 80vw;
- height: 60vh;
+ height: 20vh;
background-color: #fff;
border-radius: 15rpx;
overflow: hidden;
@@ -471,9 +489,16 @@
.select-area{
width: 85%;
margin: 40rpx auto;
- .submit-btn{
- background-color: #409EFF;
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+ view{
+ box-sizing: border-box;
+ font-size: 30rpx;
+ padding: 12rpx 24rpx;
+ background-color: #3788FF;
color: #fff;
+ border-radius: 20rpx;
}
}
}
diff --git a/pages/numLoanReceive/numLoanReceive.vue b/pages/numLoanReceive/numLoanReceive.vue
index 2803d89..fbfc18d 100644
--- a/pages/numLoanReceive/numLoanReceive.vue
+++ b/pages/numLoanReceive/numLoanReceive.vue
@@ -201,43 +201,6 @@
})
}
- /* if (!this.lowerIpt.passedNum && !this.lowerIpt.waitRepairNum && !this.lowerIpt.waitCrashNum) {
- uni.showToast({
- icon: 'none',
- title: '请至少填写一个数据！'
- })
- return
- }
- that.totalNum = Number(that.lowerIpt.passedNum) + Number(that.lowerIpt.waitRepairNum) + Number(that
- .lowerIpt.waitCrashNum)
- console.log(that.totalNum);
- if (that.totalNum > that.upperInfo.num) {
- uni.showToast({
- icon: 'none',
- title: '接收总量不能大于退库数量！'
- })
- } else if (that.totalNum == 0) {
- uni.showToast({
- icon: 'none',
- title: '请确保退料总量不为0！'
- })
- } else {
- console.log(this.handleSubmitData());
- that.$api.backMaterialReceive.backMaterialSetNumBack({
- taskId: this.upperInfo.taskId,
- arr: this.handleSubmitData()
- }).then(res => {
- console.log("res===", res)
- uni.showToast({
- icon: 'none',
- title: '接收成功'
- })
- setTimeout(() => {
- uni.navigateBack()
- },
- 300)
- })
- } */
},
handleSubmitData() {
let list = []
diff --git a/pages/seeBackMaterialDetail/seeBackMaterialDetail.vue b/pages/seeBackMaterialDetail/seeBackMaterialDetail.vue
index 54fca18..bdfaf27 100644
--- a/pages/seeBackMaterialDetail/seeBackMaterialDetail.vue
+++ b/pages/seeBackMaterialDetail/seeBackMaterialDetail.vue
@@ -49,7 +49,7 @@
},
onLoad(params) {
let that = this
- console.log(params.id);
+ console.log(params.id, params.typeId);
// 初始化查询退料明细
that.$api.backMaterialReceive.seeBackMaterialDetail({
parentId: params.id
diff --git a/pages/testExam/testExam.vue b/pages/testExam/testExam.vue
index 7677d9e..c6ab518 100644
--- a/pages/testExam/testExam.vue
+++ b/pages/testExam/testExam.vue
@@ -87,13 +87,15 @@
+ 是否通过审批？
-
+ 通过
+ 驳回
+
@@ -204,7 +206,8 @@
for (let i = 0; i < that.taskIdList.length; i++) {
that.subArr.push(that.taskIdList[i].taskId)
}
- uni.showModal({
+ that.openPopup()
+ /* uni.showModal({
title: '审核通过',
content: '确认审核通过吗？',
confirmText: '通过',
@@ -218,7 +221,7 @@
that.subInStore(that.subObj)
}
}
- })
+ }) */
}
},
subInStore (obj) {
@@ -231,9 +234,7 @@
icon: 'none',
title: res.data.msg,
success: () => {
- /* uni.redirectTo({
- url: '/pages/repairTestInStore/repairTestInStore'
- }) */
+ that.closePopup()
uni.redirectTo({
url: '/pages/testExam/testExam'
})
@@ -247,12 +248,29 @@
}
})
},
+ openPopup () {
+ this.$refs.popup.open()
+ },
closePopup () {
this.$refs.popup.close()
},
- seeExam (name) {
- console.log(name);
- this.$refs.popup.open()
+ modalConfirm () {
+ let that = this
+ that.subObj = {
+ checkResult: '通过',
+ taskIdList: that.subArr
+ }
+ console.log(that.subObj);
+ that.subInStore(that.subObj)
+ },
+ modalReject () {
+ let that = this
+ that.subObj = {
+ checkResult: '驳回',
+ taskIdList: that.taskIdList
+ }
+ console.log(that.subObj);
+ that.subInStore(that.subObj)
},
formSubmit () {
let that = this
@@ -450,7 +468,7 @@
}
.popup{
width: 80vw;
- height: 60vh;
+ height: 20vh;
background-color: #fff;
border-radius: 15rpx;
overflow: hidden;
@@ -467,9 +485,16 @@
.select-area{
width: 85%;
margin: 40rpx auto;
- .submit-btn{
- background-color: #409EFF;
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+ view{
+ box-sizing: border-box;
+ font-size: 30rpx;
+ padding: 12rpx 24rpx;
+ background-color: #3788FF;
color: #fff;
+ border-radius: 20rpx;
}
}
}