diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 9b0d791..4ccd172 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -13,7 +13,7 @@ "type" : "uniCloud" }, { - "playground" : "standard", + "playground" : "custom", "type" : "uni-app:app-android" } ] diff --git a/pages/workPlan/dayPlan/sub-user/index.vue b/pages/workPlan/dayPlan/sub-user/index.vue index 6a4c58d..5f4d625 100644 --- a/pages/workPlan/dayPlan/sub-user/index.vue +++ b/pages/workPlan/dayPlan/sub-user/index.vue @@ -40,7 +40,7 @@ activeBorderColor="#003778" activeBackgroundColor="#003778" style="transform: scale(0.7)" - @tap="onCheckBoxChangeAll()" + @tap="onCheckBoxChangeAll(isAllChecked)" /> @@ -324,14 +324,14 @@ export default { }, onCheckBoxChange(item) { item.isChecked = !item.isChecked - try { - this.subUserListAll.forEach(e => { - if (e.idNumber == item.idNumber) { - e.isChecked = !eisChecked - throw new Error() - } - }) - } catch (error) {} + // try { + // this.subUserListAll.forEach(e => { + // if (e.idNumber == item.idNumber) { + // e.isChecked = !eisChecked + // throw new Error() + // } + // }) + // } catch (error) {} this.subUserListTemp = [] this.subUserList.forEach(e => { @@ -419,12 +419,13 @@ export default { // } else { // } + this.fixedPersonList = [] + this.tempPersonList = [] + this.returnPersonList = [] this.subUserList.forEach(e => { console.log('选择的每一项', e) - this.fixedPersonList = [] - this.tempPersonList = [] - this.returnPersonList = [] + if (e.isChecked) { if (e.userState == 1) { // 固定人员 @@ -455,9 +456,10 @@ export default { }) }, // 全选 - onCheckBoxChangeAll() { + onCheckBoxChangeAll(isAllChecked) { + console.log(isAllChecked, 'isAllChecked') this.subUserList.forEach(e => { - e.isChecked = !e.isChecked + e.isChecked = !isAllChecked }) if (this.subUserList.every(e => e.isChecked == true)) { diff --git a/pages/workPlan/dayPlanAuditingDetails/inf-index.vue b/pages/workPlan/dayPlanAuditingDetails/inf-index.vue index 18628e1..400dee3 100644 --- a/pages/workPlan/dayPlanAuditingDetails/inf-index.vue +++ b/pages/workPlan/dayPlanAuditingDetails/inf-index.vue @@ -644,11 +644,11 @@ export default { } } }) - this.processList.forEach(e => { - if (e.auditingInfo.length > 1) { - e.auditingInfo = e.auditingInfo.splice(-1, 1) - } - }) + // this.processList.forEach(e => { + // if (e.auditingInfo.length > 1) { + // e.auditingInfo = e.auditingInfo.splice(-1, 1) + // } + // }) } }, /* 复选框事件 */ diff --git a/pages/workPlan/dayPlanAuditingDetails/pro-index.vue b/pages/workPlan/dayPlanAuditingDetails/pro-index.vue index 9f9e6a9..0a6f62b 100644 --- a/pages/workPlan/dayPlanAuditingDetails/pro-index.vue +++ b/pages/workPlan/dayPlanAuditingDetails/pro-index.vue @@ -647,11 +647,11 @@ export default { } } }) - this.processList.forEach(e => { - if (e.auditingInfo.length > 1) { - e.auditingInfo = e.auditingInfo.splice(-1, 1) - } - }) + // this.processList.forEach(e => { + // if (e.auditingInfo.length > 1) { + // e.auditingInfo = e.auditingInfo.splice(-1, 1) + // } + // }) } }, /* 复选框事件 */ diff --git a/pages/workPlan/dayPlanDetails/inf-index.vue b/pages/workPlan/dayPlanDetails/inf-index.vue index e109f5f..bd9496d 100644 --- a/pages/workPlan/dayPlanDetails/inf-index.vue +++ b/pages/workPlan/dayPlanDetails/inf-index.vue @@ -535,11 +535,11 @@ export default { } } }) - this.processList.forEach(e => { - if (e.auditingInfo.length > 1) { - e.auditingInfo = e.auditingInfo.splice(-1, 1) - } - }) + // this.processList.forEach(e => { + // if (e.auditingInfo.length > 1) { + // e.auditingInfo = e.auditingInfo.splice(-1, 1) + // } + // }) } }, /* 复选框事件 */ diff --git a/pages/workPlan/dayPlanDetails/pro-index.vue b/pages/workPlan/dayPlanDetails/pro-index.vue index af0c5b3..33b3dbc 100644 --- a/pages/workPlan/dayPlanDetails/pro-index.vue +++ b/pages/workPlan/dayPlanDetails/pro-index.vue @@ -539,11 +539,11 @@ export default { } } }) - this.processList.forEach(e => { - if (e.auditingInfo.length > 1) { - e.auditingInfo = e.auditingInfo.splice(-1, 1) - } - }) + // this.processList.forEach(e => { + // if (e.auditingInfo.length > 1) { + // e.auditingInfo = e.auditingInfo.splice(-1, 1) + // } + // }) } }, /* 复选框事件 */ diff --git a/pages/workPlan/monthPlanAuditingDetails/inf-index.vue b/pages/workPlan/monthPlanAuditingDetails/inf-index.vue index 06fc940..83eee1f 100644 --- a/pages/workPlan/monthPlanAuditingDetails/inf-index.vue +++ b/pages/workPlan/monthPlanAuditingDetails/inf-index.vue @@ -650,11 +650,11 @@ export default { } } }) - this.processList.forEach(e => { - if (e.auditingInfo.length > 1) { - e.auditingInfo = e.auditingInfo.splice(-1, 1) - } - }) + // this.processList.forEach(e => { + // if (e.auditingInfo.length > 1) { + // e.auditingInfo = e.auditingInfo.splice(-1, 1) + // } + // }) } }, /* 复选框事件 */ diff --git a/pages/workPlan/monthPlanAuditingDetails/pro-index.vue b/pages/workPlan/monthPlanAuditingDetails/pro-index.vue index d4e654e..ad6f27a 100644 --- a/pages/workPlan/monthPlanAuditingDetails/pro-index.vue +++ b/pages/workPlan/monthPlanAuditingDetails/pro-index.vue @@ -600,11 +600,11 @@ export default { } } }) - this.processList.forEach(e => { - if (e.auditingInfo.length > 1) { - e.auditingInfo = e.auditingInfo.splice(-1, 1) - } - }) + // this.processList.forEach(e => { + // if (e.auditingInfo.length > 1) { + // e.auditingInfo = e.auditingInfo.splice(-1, 1) + // } + // }) } }, /* 复选框事件 */ diff --git a/pages/workPlan/monthPlanDetails/inf-index.vue b/pages/workPlan/monthPlanDetails/inf-index.vue index 066e424..bbce316 100644 --- a/pages/workPlan/monthPlanDetails/inf-index.vue +++ b/pages/workPlan/monthPlanDetails/inf-index.vue @@ -544,11 +544,11 @@ export default { } } }) - this.processList.forEach(e => { - if (e.auditingInfo.length > 1) { - e.auditingInfo = e.auditingInfo.splice(-1, 1) - } - }) + // this.processList.forEach(e => { + // if (e.auditingInfo.length > 1) { + // e.auditingInfo = e.auditingInfo.splice(-1, 1) + // } + // }) } }, /* 复选框事件 */ diff --git a/pages/workPlan/monthPlanDetails/pro-index.vue b/pages/workPlan/monthPlanDetails/pro-index.vue index 83dbb48..cb4e271 100644 --- a/pages/workPlan/monthPlanDetails/pro-index.vue +++ b/pages/workPlan/monthPlanDetails/pro-index.vue @@ -640,11 +640,11 @@ export default { } } }) - this.processList.forEach(e => { - if (e.auditingInfo.length > 1) { - e.auditingInfo = e.auditingInfo.splice(-1, 1) - } - }) + // this.processList.forEach(e => { + // if (e.auditingInfo.length > 1) { + // e.auditingInfo = e.auditingInfo.splice(-1, 1) + // } + // }) } }, isSHowBtn(item) { diff --git a/pages/workPlan/networkPlanAuditingDetails/inf-index.vue b/pages/workPlan/networkPlanAuditingDetails/inf-index.vue index e527c3a..71c0886 100644 --- a/pages/workPlan/networkPlanAuditingDetails/inf-index.vue +++ b/pages/workPlan/networkPlanAuditingDetails/inf-index.vue @@ -604,11 +604,11 @@ export default { } } }) - this.processList.forEach(e => { - if (e.auditingInfo.length > 1) { - e.auditingInfo = e.auditingInfo.splice(-1, 1) - } - }) + // this.processList.forEach(e => { + // if (e.auditingInfo.length > 1) { + // e.auditingInfo = e.auditingInfo.splice(-1, 1) + // } + // }) } }, /* 复选框事件 */ diff --git a/pages/workPlan/tempPlanAuditingDetails/inf-index.vue b/pages/workPlan/tempPlanAuditingDetails/inf-index.vue index 46729b8..0ec087c 100644 --- a/pages/workPlan/tempPlanAuditingDetails/inf-index.vue +++ b/pages/workPlan/tempPlanAuditingDetails/inf-index.vue @@ -662,11 +662,11 @@ export default { } } }) - this.processList.forEach(e => { - if (e.auditingInfo.length > 1) { - e.auditingInfo = e.auditingInfo.splice(-1, 1) - } - }) + // this.processList.forEach(e => { + // if (e.auditingInfo.length > 1) { + // e.auditingInfo = e.auditingInfo.splice(-1, 1) + // } + // }) } }, /* 复选框事件 */ diff --git a/pages/workPlan/tempPlanAuditingDetails/pro-index.vue b/pages/workPlan/tempPlanAuditingDetails/pro-index.vue index 5e3432c..dd7178c 100644 --- a/pages/workPlan/tempPlanAuditingDetails/pro-index.vue +++ b/pages/workPlan/tempPlanAuditingDetails/pro-index.vue @@ -691,11 +691,11 @@ export default { } } }) - this.processList.forEach(e => { - if (e.auditingInfo.length > 1) { - e.auditingInfo = e.auditingInfo.splice(-1, 1) - } - }) + // this.processList.forEach(e => { + // if (e.auditingInfo.length > 1) { + // e.auditingInfo = e.auditingInfo.splice(-1, 1) + // } + // }) } }, /* 复选框事件 */ diff --git a/pages/workPlan/tempPlanDetails/inf-index.vue b/pages/workPlan/tempPlanDetails/inf-index.vue index 3d933e1..6d6ea34 100644 --- a/pages/workPlan/tempPlanDetails/inf-index.vue +++ b/pages/workPlan/tempPlanDetails/inf-index.vue @@ -556,11 +556,11 @@ export default { } } }) - this.processList.forEach(e => { - if (e.auditingInfo.length > 1) { - e.auditingInfo = e.auditingInfo.splice(-1, 1) - } - }) + // this.processList.forEach(e => { + // if (e.auditingInfo.length > 1) { + // e.auditingInfo = e.auditingInfo.splice(-1, 1) + // } + // }) } }, /* 复选框事件 */ diff --git a/pages/workPlan/tempPlanDetails/pro-index.vue b/pages/workPlan/tempPlanDetails/pro-index.vue index 15d36dd..08b6d0a 100644 --- a/pages/workPlan/tempPlanDetails/pro-index.vue +++ b/pages/workPlan/tempPlanDetails/pro-index.vue @@ -586,11 +586,11 @@ export default { } } }) - this.processList.forEach(e => { - if (e.auditingInfo.length > 1) { - e.auditingInfo = e.auditingInfo.splice(-1, 1) - } - }) + // this.processList.forEach(e => { + // if (e.auditingInfo.length > 1) { + // e.auditingInfo = e.auditingInfo.splice(-1, 1) + // } + // }) } }, /* 复选框事件 */ diff --git a/pages/workPlan/weekPlanAuditingDetails/inf-index.vue b/pages/workPlan/weekPlanAuditingDetails/inf-index.vue index 64b43d5..3cecf34 100644 --- a/pages/workPlan/weekPlanAuditingDetails/inf-index.vue +++ b/pages/workPlan/weekPlanAuditingDetails/inf-index.vue @@ -648,11 +648,11 @@ export default { } } }) - this.processList.forEach(e => { - if (e.auditingInfo.length > 1) { - e.auditingInfo = e.auditingInfo.splice(-1, 1) - } - }) + // this.processList.forEach(e => { + // if (e.auditingInfo.length > 1) { + // e.auditingInfo = e.auditingInfo.splice(-1, 1) + // } + // }) } }, /* 复选框事件 */ diff --git a/pages/workPlan/weekPlanAuditingDetails/pro-index.vue b/pages/workPlan/weekPlanAuditingDetails/pro-index.vue index 44f8c84..be8874c 100644 --- a/pages/workPlan/weekPlanAuditingDetails/pro-index.vue +++ b/pages/workPlan/weekPlanAuditingDetails/pro-index.vue @@ -745,11 +745,11 @@ export default { } } }) - this.processList.forEach(e => { + /* this.processList.forEach(e => { if (e.auditingInfo.length > 1) { e.auditingInfo = e.auditingInfo.splice(-1, 1) } - }) + }) */ } }, /* 复选框事件 */ diff --git a/pages/workPlan/weekPlanDetails/inf-index.vue b/pages/workPlan/weekPlanDetails/inf-index.vue index 36c1332..a235bc9 100644 --- a/pages/workPlan/weekPlanDetails/inf-index.vue +++ b/pages/workPlan/weekPlanDetails/inf-index.vue @@ -631,11 +631,11 @@ export default { } } }) - this.processList.forEach(e => { - if (e.auditingInfo.length > 1) { - e.auditingInfo = e.auditingInfo.splice(-1, 1) - } - }) + // this.processList.forEach(e => { + // if (e.auditingInfo.length > 1) { + // e.auditingInfo = e.auditingInfo.splice(-1, 1) + // } + // }) } }, /* 复选框事件 */ diff --git a/pages/workPlan/weekPlanDetails/pro-index.vue b/pages/workPlan/weekPlanDetails/pro-index.vue index e9e37a8..95297af 100644 --- a/pages/workPlan/weekPlanDetails/pro-index.vue +++ b/pages/workPlan/weekPlanDetails/pro-index.vue @@ -642,11 +642,11 @@ export default { } } }) - this.processList.forEach(e => { - if (e.auditingInfo.length > 1) { - e.auditingInfo = e.auditingInfo.splice(-1, 1) - } - }) + // this.processList.forEach(e => { + // if (e.auditingInfo.length > 1) { + // e.auditingInfo = e.auditingInfo.splice(-1, 1) + // } + // }) } }, /* 复选框事件 */ diff --git a/utils/request_new_yn.js b/utils/request_new_yn.js index 54879b7..83896f1 100644 --- a/utils/request_new_yn.js +++ b/utils/request_new_yn.js @@ -15,7 +15,7 @@ let isRequesting = false // 请求锁,防止重复请求 const request = config => { // 如果正在请求中,直接返回一个 rejected promise if (isRequesting) { - return uni.showToast({ title: '请求正在处理中...请稍后', icon: 'none' }) + // return uni.showToast({ title: '请求正在处理中...请稍后', icon: 'none' }) // return Promise.reject('请求正在处理中,请稍后再试') // uni.showToast({ title: '请求正在处理中...', icon: 'none' }) }