|
|
@@ -732,28 +732,31 @@
|
|
|
confirmText: '确定',
|
|
|
success: function(res) {
|
|
|
if (res.confirm) {
|
|
|
+ uni.showLoading({
|
|
|
+ title: "审核中"
|
|
|
+ })
|
|
|
console.log(that.OutList,that.EnterList)
|
|
|
that.OutList.inOutFlag = 1
|
|
|
that.EnterList.inOutFlag = 2
|
|
|
- // if (that.OutList.taskTypeKey == 1) {
|
|
|
- // that.requestadd(that.OutList)
|
|
|
- // } else if (that.EnterList.taskTypeKey == 2) {
|
|
|
- // that.requestadd(that.EnterList)
|
|
|
- // } else if (
|
|
|
- // that.OutList.taskTypeKey == 3 ||
|
|
|
- // that.OutList.taskTypeKey == 4
|
|
|
- // ) {
|
|
|
- // that.requestadd(that.OutList, 'repetition')
|
|
|
- // if (!that.deletetask) {
|
|
|
- // that.requestadd(that.EnterList, 'repetition')
|
|
|
- // }
|
|
|
- // }
|
|
|
- // if (that.retreatList.taskTypeKey == 1 || that.retreatList.taskTypeKey == 2) {
|
|
|
- // that.requestadd(that.retreatList)
|
|
|
- // } else if (that.retreatList.taskTypeKey == 3 || that.retreatList.taskTypeKey ==
|
|
|
- // 4) {
|
|
|
- // that.requestadd(that.retreatList, 'repetition')
|
|
|
- // }
|
|
|
+ if (that.OutList.taskTypeKey == 1) {
|
|
|
+ that.requestadd(that.OutList)
|
|
|
+ } else if (that.EnterList.taskTypeKey == 2) {
|
|
|
+ that.requestadd(that.EnterList)
|
|
|
+ } else if (
|
|
|
+ that.OutList.taskTypeKey == 3 ||
|
|
|
+ that.OutList.taskTypeKey == 4
|
|
|
+ ) {
|
|
|
+ that.requestadd(that.OutList, 'repetition')
|
|
|
+ if (!that.deletetask) {
|
|
|
+ that.requestadd(that.EnterList, 'repetition')
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (that.retreatList.taskTypeKey == 1 || that.retreatList.taskTypeKey == 2) {
|
|
|
+ that.requestadd(that.retreatList)
|
|
|
+ } else if (that.retreatList.taskTypeKey == 3 || that.retreatList.taskTypeKey ==
|
|
|
+ 4) {
|
|
|
+ that.requestadd(that.retreatList, 'repetition')
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
})
|
|
|
@@ -772,6 +775,9 @@
|
|
|
confirmText: '确定',
|
|
|
success: function(res) {
|
|
|
if (res.confirm) {
|
|
|
+ uni.showLoading({
|
|
|
+ title: "审核中"
|
|
|
+ })
|
|
|
if (that.OutList.taskTypeKey == 1) {
|
|
|
that.requestaudit(that.OutList)
|
|
|
} else if (that.OutList.taskTypeKey == 2) {
|
|
|
@@ -813,9 +819,6 @@
|
|
|
key: 'pcUserInfo',
|
|
|
success(e) {
|
|
|
list.compId = e.data.compId //这就是你想要取的token
|
|
|
- uni.showLoading({
|
|
|
- title: "审核中"
|
|
|
- })
|
|
|
that.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(
|
|
|
res => {
|
|
|
if (res.data.code == 200) {
|
|
|
@@ -830,6 +833,7 @@
|
|
|
needReapply: false
|
|
|
}).then(res => {
|
|
|
if (res.data.code == 200) {
|
|
|
+ that.show1=true
|
|
|
that.$api.msg('审核成功！')
|
|
|
that.count++
|
|
|
if (that.everyCheck) {
|
