diff --git a/pages.json b/pages.json index 2106f8b..d566bae 100644 --- a/pages.json +++ b/pages.json @@ -908,7 +908,7 @@ "titleNView": { "buttons": [{ "fontSize": "14px", - "text": "取消作业", + "text": "终止作业", "width": "auto" }] } @@ -924,7 +924,7 @@ "titleNView": { "buttons": [{ "fontSize": "14px", - "text": "取消作业", + "text": "终止作业", "width": "auto" }] } @@ -947,7 +947,7 @@ "titleNView": { "buttons": [{ "fontSize": "14px", - "text": "取消作业", + "text": "终止作业", "width": "auto" }] } @@ -1086,7 +1086,7 @@ "titleNView": { "buttons": [{ "fontSize": "14px", - "text": "取消作业", + "text": "终止作业", "width": "auto" }] } diff --git a/pages/apply/subPages/FO2/jobEdit.vue b/pages/apply/subPages/FO2/jobEdit.vue index 22c7dea..5aecb0e 100644 --- a/pages/apply/subPages/FO2/jobEdit.vue +++ b/pages/apply/subPages/FO2/jobEdit.vue @@ -530,9 +530,6 @@ mounted() { // this.handleAddUser() }, - onNavigationBarButtonTap(e) { - this.stepSubmit() - }, methods: { handleWorkPerson() { this.showWorkPerson = !this.showWorkPerson diff --git a/pages/apply/subPages/FO2/jobEdit1.vue b/pages/apply/subPages/FO2/jobEdit1.vue index e6a60f2..a85986a 100644 --- a/pages/apply/subPages/FO2/jobEdit1.vue +++ b/pages/apply/subPages/FO2/jobEdit1.vue @@ -475,7 +475,8 @@ getDetailLists, getAllLists, getCertificateLists, - saveJobRecord + saveJobRecord, + getCancleJob } from '../../../../services/apply/FOServices/FOServices.js' import config from '../../../../config/common' import { @@ -676,9 +677,6 @@ mounted() { // this.handleAddUser() }, - onNavigationBarButtonTap(e) { - this.submit() - }, methods: { handleUnfoldUser() { this.thisUserShow = !this.thisUserShow @@ -1408,6 +1406,27 @@ uni.$showErrorInfo('请检查必填项,必填项不能为空') }) }, + cancleJob() { + let json = {}; + json.ID = this.ID; + json.TaskID = this.TaskID; + getCancleJob(json).then(res => { + uni.$showMsgFunc('操作成功!', () => { + uni.navigateBack() + }, 'success', 1000) + }) + }, + async onNavigationBarButtonTap() { + if (this.dataModel.IS_PUBLISH === 0) { + uni.$showMsgFunc('操作成功!', () => { + uni.navigateBack() + }, 'success', 1000) + } else if (this.dataModel.IS_PUBLISH === 9) { + this.cancleJob(); + } else { + uni.$showErrorInfo('非驳回状态的作业不可取消') + } + }, uploadFilePromise(url) { const appInfoData = uni.getStorageSync('appInfo') const userId = appInfoData?.User?.ID || '' diff --git a/pages/apply/subPages/FO2/jobEditJD.vue b/pages/apply/subPages/FO2/jobEditJD.vue index ffa05a0..b234e0b 100644 --- a/pages/apply/subPages/FO2/jobEditJD.vue +++ b/pages/apply/subPages/FO2/jobEditJD.vue @@ -442,9 +442,6 @@ mounted() { // this.handleAddUser() }, - onNavigationBarButtonTap(e) { - this.stepSubmit() - }, methods: { handleWorkPerson() { this.showWorkPerson = !this.showWorkPerson diff --git a/pages/apply/subPages/FO2/jobOutsourceEdit.vue b/pages/apply/subPages/FO2/jobOutsourceEdit.vue index 094077b..1f3b441 100644 --- a/pages/apply/subPages/FO2/jobOutsourceEdit.vue +++ b/pages/apply/subPages/FO2/jobOutsourceEdit.vue @@ -533,9 +533,6 @@ mounted() { // this.handleAddUser() }, - onNavigationBarButtonTap(e) { - this.stepSubmit() - }, methods: { handleWorkPerson() { this.showWorkPerson = !this.showWorkPerson diff --git a/services/apply/FOServices/FOServices.js b/services/apply/FOServices/FOServices.js index b7446f7..c48631e 100644 --- a/services/apply/FOServices/FOServices.js +++ b/services/apply/FOServices/FOServices.js @@ -260,7 +260,7 @@ export function getJobRecordSign(params) { export function getCancleJob(params) { params.IgnoreDataRule = true; return new Promise((resolve, reject) => { - request.post("/FO/FOCrucialLicenseJob/CancleJob", params).then((result) => { + request.post("/FO/FOCrucialLicenseJob/FullDelete", params).then((result) => { if (result.IsSuccessful) { resolve(result.Data); } @@ -272,7 +272,7 @@ export function getCancleJob(params) { export function getCancleJobOutsource(params) { params.IgnoreDataRule = true; return new Promise((resolve, reject) => { - request.post("/FO/FOCrucialLicenseJobOutsource/CancleJob", params).then((result) => { + request.post("/FO/FOCrucialLicenseJobOutsource/FullDelete", params).then((result) => { if (result.IsSuccessful) { resolve(result.Data); }