检查任务制定 取消

pages/apply/subPages/BS/plan.vue

@@ -199,7 +199,12 @@
 			@search="handleSearch" @select="handleSelected" @close="selectorInfo.showPopup=false" />
 
 		<view class="bottom-button">
-			<button type="primary" v-if='(isDIY||(isLoadOK && tableKey === "1"))' @click="FullCheckUpdate">提交</button>
+			<button type="primary"
+				style="background-color: #f7f7f7;color: black;width: 43%;float: left; margin-right: 10px;"
+				v-if='(isDIY||(isLoadOK && tableKey === "1"))' @click="btnCancel">取消</button>
+			<button type="primary" style="width: 43%; float: left;" v-if='(isDIY||(isLoadOK && tableKey === "1"))'
+				@click="FullCheckUpdate">提交</button>
+
 		</view>
 
 	</view>
@@ -220,6 +225,7 @@
 	import {
 		GetInfo,
 		FullUpdateBS032,
+		Cancel,
 		CheckTypeOrderPaged,
 		CheckTypeLevelOrderPaged,
 		OrderPagedAreaMineType,
@@ -485,6 +491,42 @@
 			handleTab(t) {
 				this.currentTab = t
 			},
+			btnCancel() {
+				var that=this
+				uni.showModal({
+					title: '提示',
+					content: '确定取消？',
+					success: function(res) {
+						if (res.confirm) {
+							
+							let json = initFilter(that.model.ORG_ID, that.model.ID, null, null, null, that.TaskID);
+							Cancel(json).then(res => {
+								uni.$showMsgFunc('操作成功!', () => {
+									uni.navigateBack()
+								}, 'success', 1000)
+							})
+						// } else {
+						// 	uni.$showErrorInfo('取消！')
+						}
+					}
+				})
+
+
+				// Cancel
+				// { record, onCancel, data, dispatch }
+				//    let json = initFilter(record.ORG_ID, record.ID, null, null, null, data.TaskID);
+				//    dispatch({
+				//      type: 'app/getDataByPost',
+				//      url: 'BS/BSSafeCheck/Cancel',
+				//      payload: json,
+				//      onlyData: false,
+				//      onComplete: (ret) => {
+				//        if (ret.IsSuccessful == true) {
+				//          message.success('执行成功', null, onCancel())
+				//        }
+				//      }
+				//    })
+			},
 			FullCheckUpdate() {
 				const ele = this.$refs
 				this.modelEdit = JSON.parse(JSON.stringify(this.model))

services/apply/subPages/BS/safeCheck.js

@@ -185,6 +185,18 @@ export function FullUpdateBS032(params) {
 	})
 }
 
+//检查任务制定取消 
+export function Cancel(params) {
+	return new Promise((resolve, reject) => {
+		request.post("/BS/BSSafeCheck/Cancel", params).then((result) => {
+			if (result.IsSuccessful) {
+				resolve(result.Data);
+			}
+		}).catch((error) => {
+			reject(error)
+		})
+	})
+}
 
 //获取检查类型
 export function CheckTypeOrderPaged(params) {