Merge branch 'master' of http://47.122.43.22:3000/ykx/lm-safe-app

pages/apply/subPages/BS/plan.vue

@@ -179,6 +179,12 @@
 											border="surround"></u--textarea>
 									</u-form-item> -->
 
+									<u-form-item borderBottom style="text-align: center;">
+										<button type="primary" class="btnSubDel"
+											style="width: 35%; background-color: red;"
+											v-if='(isDIY||(isLoadOK && tableKey === "1"))'
+											@click.stop="DetailDel(item)">删除</button>
+									</u-form-item>
 								</uni-collapse-item>
 							</uni-card>
 						</uni-collapse>
@@ -492,21 +498,21 @@
 				this.currentTab = t
 			},
 			btnCancel() {
-				var that=this
+				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
-							let json = initFilter(that.model.ORG_ID, that.model.ID, null, null, null, that.TaskID);
+								.TaskID);
 							Cancel(json).then(res => {
 								uni.$showMsgFunc('操作成功!', () => {
 									uni.navigateBack()
 								}, 'success', 1000)
 							})
-						// } else {
+							// } else {
-						// 	uni.$showErrorInfo('取消！')
+							// 	uni.$showErrorInfo('取消！')
 						}
 					}
 				})