Merge remote-tracking branch 'origin/master'

@@ -150,7 +150,7 @@ export function jzxsbatchModify(data) {
  */
  */
 export function deleteZdInfoByBsm(data) {
 export function deleteZdInfoByBsm(data) {
     return request({
     return request({
-        url: '/zd/qjZdjbxx/deleteZdjbxxByBsm',
+        url: '/delete/deleteDyByBsm',
         method: 'delete',
         method: 'delete',
         data: data
         data: data
     })
     })
@@ -161,7 +161,7 @@ export function deleteZdInfoByBsm(data) {
  */
  */
 export function zdfg(data) {
 export function zdfg(data) {
     return request({
     return request({
-        url: '/fg/zdFg',
+        url: '/bg/zdSplitMerge/zdFg',
         method: 'post',
         method: 'post',
         data: data
         data: data
     })
     })

@@ -222,23 +222,23 @@ export default {
 		},
 		},
 		//右键菜单的删除
 		//右键菜单的删除
 		deleteByBsm(){
 		deleteByBsm(){
-			let zdBsm = this.zdData.zdbsm;
-			let type;
-			console.log(zdBsm);
-			switch (this.zdData.type){
-				case "zd":
-					type="0";
-					break;
-				case "zrz":
-					type="1";
-					break;
-				case "h":
-					type="2";
-					break;
-				default:
-					break;
-			}
-			let params={"id":zdBsm,"type":type}
+			//let zdBsm = this.zdData.zdbsm;
+			//let type;
+			console.log(this.zdData.zdbsm);
+			//switch (this.zdData.type){
+			//	case "zd":
+			//		type="0";
+			//		break;
+			//	case "zrz":
+			//		type="1";
+			//		break;
+			//	case "h":
+			//		type="2";
+			//		break;
+			//	default:
+			//		break;
+			//}
+			let params={"bsm":this.zdData.zdbsm,"type":this.zdData.type}
 			deleteZdInfoByBsm(params)
 			deleteZdInfoByBsm(params)
 				.then((res) => {
 				.then((res) => {
 					if(res.code=200){
 					if(res.code=200){