完善

app/pages/business-entering/business-edit.vue

@@ -437,9 +437,6 @@
 							if (item.itemTypeId == type.id) {
 								type.itemName = item.itemName;
 								let typeName = type.name;
-								if (typeName == '干杂货人工装卸' || typeName == '特殊车辆') {
-									this.checkItem = typeName;
-								}
 								type.num = item.num
 								break;
 							}
@@ -602,14 +599,7 @@
 			selectItemFn(item) {
 				let typeName = item.name;
 				let checkItem = this.checkItem;
-				if ((typeName == '干杂货人工装卸' && checkItem == '特殊车辆') ||
-					(typeName == '特殊车辆' && checkItem == '干杂货人工装卸')) {
-					this.$common.toast('不能同时选择干杂货人工装卸和特殊车辆');
-					return false;
-				}
-				if (typeName == '干杂货人工装卸' || typeName == '特殊车辆') {
-					this.checkItem = typeName;
-				}
+				
 				this.item = item;
 				this.show = true;
 
@@ -644,14 +634,13 @@
 					return false;
 				}
 				let filterItemList = this.filterItemList;
-				for (let j in this.needTypeId) {
-					let id = this.needTypeId[j];
-					for (let i in filterItemList) {
-						let type = filterItemList[i];
-						if (id == type.id && !type.itemName) {
-							this.$common.toast('[' + type.name + ']必选')
-							return;
-						}
+				let needIds=this.needTypeId;
+				console.log(needIds);
+				console.log(typeList);
+				for(let i in needIds){
+					if(typeList.map(obj=>obj.id).indexOf(needIds[i])==-1){
+						this.$common.toast('缺少必选业务');
+						return false;
 					}
 				}
 				let peopleList = this.hs.list;

app/pages/business-entering/business-entering.vue

@@ -544,16 +544,6 @@
 			},
 
 			selectItemFn(item) {
-				let typeName = item.name;
-				let checkItem = this.checkItem;
-				if ((typeName == '干杂货人工装卸' && checkItem == '特殊车辆') ||
-					(typeName == '特殊车辆' && checkItem == '干杂货人工装卸')) {
-					this.$common.toast('不能同时选择干杂货人工装卸和特殊车辆');
-					return false;
-				}
-				if (typeName == '干杂货人工装卸' || typeName == '特殊车辆') {
-					this.checkItem = typeName;
-				}
 				this.item = item;
 				this.show = true;
 			},
@@ -663,24 +653,15 @@
 					return false;
 				}
 				let noNeedIds = this.noNeedIds;
-				let chechItem = this.checkItem;
-				let filterItemList = this.filterItemList.filter(obj => noNeedIds.indexOf(obj.id) == -1);
-				for (let j in this.needTypeId) {
-					let id = this.needTypeId[j];
-					for (let i in filterItemList) {
-						let type = filterItemList[i];
-						let typeName = type.name;
-						if (id == type.id && !type.itemName && typeName !== '特殊车辆' && typeName !== '干杂货人工装卸') {
-							this.$common.toast('[' + type.name + ']必选')
-							return;
-						}
-
+				let needIds=this.needTypeId;
+				console.log(needIds);
+				console.log(typeList);
+				for(let i in needIds){
+					if(typeList.map(obj=>obj.id).indexOf(needIds[i])==-1){
+						this.$common.toast('缺少必选业务');
+						return false;
 					}
 				}
-				if (!chechItem && this.form.goodsName == '干杂货') {
-					this.$common.toast('请选择特殊车辆或干杂货人工装卸之一')
-					return;
-				}
 				let peopleList = this.hs.list;
 				if (typeList.filter(obj => obj.name.indexOf('人') !== -1 &&
 						obj.name.indexOf('核酸') !== -1).length > 0 &&

app/pages/index/index.vue

@@ -83,7 +83,13 @@
 					icon: '../../static/home-icon-04.png',
 					text: '用户管理',
 					url: '/pages/user/user-index',
-				},
+				},{
+					auth: false,
+					icon: '../../static/home-icon-06.jpg',
+					text: '车辆消杀',
+					url: '/pages/onely-disinfect/disinfect-Index',
+					customer:true
+				}
 				],
 				customerList: [{
 						id: 'tb-costomer-account',
@@ -133,7 +139,14 @@
 						icon: '../../static/home-icon-04.png',
 						text: '用户管理',
 						url: '/pages/user/user-index',
-					},
+					}
+					,{
+						auth: false,
+						icon: '../../static/home-icon-06.jpg',
+						text: '车辆消杀',
+						url: '/pages/onely-disinfect/disinfect-Index',
+						customer:true
+					}
 				],
 				adminList: [{
 						id: 'tb-business-add',
@@ -144,6 +157,13 @@
 						
 					},
 					{
+						auth: false,
+						icon: '../../static/home-icon-06.jpg',
+						text: '车辆消杀',
+						url: '/pages/onely-disinfect/disinfect-Index',
+						customer:true
+					},
+					{
 						id: 'tb-business-list',
 						auth: true,
 						icon: '../../static/home-icon-03.png',

sp-admin/sa-view/tb-business/tb-business-add.html

@@ -500,19 +500,7 @@
 						}
 					},
 					itemChange(itemId) {
-						let items = this.itemTypeList.flatMap(obj => obj.items);
-						let item = items.filter(obj => obj.id == itemId)[0];
-						let typeName = item.typeName;
-						let checkItem = this.checkItem;
-						if ((typeName == '干杂货人工装卸' && checkItem == '特殊车辆') ||
-							(typeName == '特殊车辆' && checkItem == '干杂货人工装卸')) {
-							this.itemTypeList.filter(obj => obj.id == item.typeId)[0].itemId = ''
-							sa.error('不能同时选择干杂货人工装卸和特殊车辆')
-							return false;
-						}
-						if (typeName == '干杂货人工装卸' || typeName == '特殊车辆') {
-							this.checkItem = typeName;
-						}
+						
 					},
 					addCar() {
 						this.china.visible = true;
@@ -728,24 +716,15 @@
 							sa.error('载重只能输入数字')
 							return;
 						}
-						let checkList = this.itemTypeList;
-						let chechItem = this.checkItem;
-						for (let j in this.needTypeId) {
-							let id = this.needTypeId[j];
-							for (let i in checkList) {
-								let type = checkList[i];
-								let typeName = type.name;
-								if (id == type.id && !type.itemId && typeName !== '特殊车辆' && typeName !== '干杂货人工装卸') {
-									sa.error('选择[' + this.m.goodsName + ']时，[' + typeName + ']必选')
-									return;
-								}
+					
+						let typeList = this.itemTypeList.filter(obj => obj.itemId);
+						let needIds=this.needTypeId;
+						for(let i in needIds){
+							if(typeList.map(obj=>obj.id).indexOf(needIds[i])==-1){
+								sa.error('缺少必选业务');
+								return false;
 							}
 						}
-						if (!chechItem && this.m.goodsName == '干杂货') {
-							sa.error('请选择特殊车辆或干杂货人工装卸之一')
-							return;
-						}
-						let typeList = this.itemTypeList.filter(obj => obj.itemId);
 						let list = [];
 						if (typeList.length == 0) {
 							sa.error('至少选择一项业务');

sp-admin/sa-view/tb-business/tb-business-edit.html

@@ -375,19 +375,6 @@
 						}
 					},
 					itemChange(itemId) {
-						let items = this.itemTypeList.flatMap(obj => obj.items);
-						let item = items.filter(obj => obj.id == itemId)[0];
-						let typeName = item.typeName;
-						let checkItem = this.checkItem;
-						if ((typeName == '干杂货人工装卸' && checkItem == '特殊车辆') ||
-							(typeName == '特殊车辆' && checkItem == '干杂货人工装卸')) {
-							this.itemTypeList.filter(obj => obj.id == item.typeId)[0].itemId = ''
-							sa.error('不能同时选择干杂货人工装卸和特殊车辆')
-							return false;
-						}
-						if (typeName == '干杂货人工装卸' || typeName == '特殊车辆') {
-							this.checkItem = typeName;
-						}
 					},
 					addCar() {
 						this.china.visible = true;
@@ -558,9 +545,6 @@
 								}
 								for (let i in items) {
 									let item = items[i];
-									if (item.itemTypeName == '特殊车辆' || item.itemTypeName == '干杂货人工装卸') {
-										this.checkItem = item.itemTypeName
-									}
 									for (let j in typeList) {
 										let type = typeList[j];
 										if (item.itemTypeId == type.id) {
@@ -647,6 +631,13 @@
 							}
 						}
 						let typeList = this.itemTypeList.filter(obj => obj.itemId);
+						let needIds=this.needTypeId;
+						for(let i in needIds){
+							if(typeList.map(obj=>obj.id).indexOf(needIds[i])==-1){
+								sa.error('缺少必选业务');
+								return false;
+							}
+						}
 						let list = [];
 						if (typeList.length == 0) {
 							sa.error('至少选择一项业务');

sp-server/app.pid

@@ -1 +1 @@
-18816
+8588

sp-server/src/main/java/com/pj/api/jh/api/JhController.java

@@ -29,14 +29,6 @@ public class JhController {
 
     @Resource
     JhService jhService;
-
-    @RequestMapping(value = "notify")
-    public void notify(HttpServletResponse response) throws Exception{
-        response.setContentType("application/json");
-        response.setCharacterEncoding("UTF-8");
-
-    }
-
     @RequestMapping(value = "init-pay")
     public AjaxJson prePay( HttpServletRequest request) throws Exception {
         return AjaxJson.getSuccessData(jhService.initPay(request));

sp-server/src/main/java/com/pj/api/jh/service/JhService.java

@@ -74,10 +74,8 @@ public class JhService {
         params.put("returnUrl", "");
         params.put("notifyUrl", myConfig.getDomain() + "/wx/notify");
         params.put("remark", "业务订单支付");
-
         String paySecrit = jhConfig.getPaySecret();
         String sign = MerchantApiUtil.getSign(params, paySecrit);
-
         params.put("sign", sign);
         String jsonParam = JSONUtil.toJsonStr(params);
         String initPayUrl = "http://116.252.74.15:8081/uaps-web-gateway/cnpPay/initPay";

sp-server/src/main/resources/application-dev.yml

@@ -45,8 +45,8 @@ spring:
     # 项目自定义配置
     myconfig:
         # 本项目部署到的服务器域名（文件上传等等模块  要用到）
-        domain: http://127.0.0.1:8099/pro
-        web-domain: https://127.0.0.1:8080
+        domain: https://192.168.1.7:8099/pro
+        web-domain: https://192.168.1.7:8080
 part-config:
     base-price: 30 #基础费用
     extra-price: 0.01 #过夜额外收费
@@ -60,8 +60,8 @@ car:
 wx-config:
     title: 场站管理系统
     flush-second: 12000 #token刷新时间 秒
-    app-id: wx04c8811edf4e3205
-    secret: fab1efb856912bfce3b7b1baaccd9313
+    app-id: wxd40a34141872bf0c
+    secret: 2e6a69fab1fbab60369ebd21b0882f3e
     mach-id: 1615645036
     key: dongxingkouanerqiao8888888888888
     token: dx1123