diff --git a/src/pages/package/job/overPackageJob.vue b/src/pages/package/job/overPackageJob.vue index 21bb9fb4..77c38a5c 100644 --- a/src/pages/package/job/overPackageJob.vue +++ b/src/pages/package/job/overPackageJob.vue @@ -122,7 +122,7 @@ var filters = [] if (this.checkedToday) { filters.push({ - column: "request_time", + column: "create_time", action: "betweeen", value: this.todayTime }) diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue index 76891c58..07f25663 100644 --- a/src/pages/repleinsh/job/repleinshDetail.vue +++ b/src/pages/repleinsh/job/repleinshDetail.vue @@ -214,26 +214,26 @@ submit() { var scanCount = this.getScanCount(this.subList); - //允许部分提交 - if (this.jobContent.allowPartialComplete == "TRUE") { - // 如果扫描数是0,提示扫描数为0,是否提交,点击确定提交,取消提示消失 - if (scanCount == 0) { - this.$refs.comMessage.showQuestionMessage("扫描数为0,是否提交?", res => { - if (res) { - this.setSubmitParamsAndSubmit(); - } - }) - } else { - this.setSubmitParamsAndSubmit(); - } - } else { + // //允许部分提交 + // if (this.jobContent.allowPartialComplete == "TRUE") { + // // 如果扫描数是0,提示扫描数为0,是否提交,点击确定提交,取消提示消失 + // if (scanCount == 0) { + // this.$refs.comMessage.showQuestionMessage("扫描数为0,是否提交?", res => { + // if (res) { + // this.setSubmitParamsAndSubmit(); + // } + // }) + // } else { + // this.setSubmitParamsAndSubmit(); + // } + // } else { //不允许部分提交,扫描数必须等于任务数量才可以提交 if (scanCount == 0) { - this.showErrorMessage("扫描数为0,当前补料任务不允许部分提交,请先扫描") + this.showErrorMessage("扫描数为0,请先扫描") } else { this.setSubmitParamsAndSubmit(); } - } + // } }, setSubmitParamsAndSubmit() {