bding 1 سال پیش
والد
کامیت
22ac5b6652
2فایلهای تغییر یافته به همراه8 افزوده شده و 6 حذف شده
  1. 7 4
      src/views/custom_manage/customList/applyTurn.vue
  2. 1 2
      src/views/custom_manage/customList/updateServe.vue

+ 7 - 4
src/views/custom_manage/customList/applyTurn.vue

@@ -345,7 +345,9 @@ export default {
 					/* 处理权限列表 */
 					let checkArr = [];
 					let checkArrName = [];
+					let hasMinusSignVal = 0
 					if(this.companyInfo.CompanyType==='权益' || this.isRoleType== '权益'){
+					 	hasMinusSignVal = this.$refs.raiPermissionboxRef[0].minus_sign_val;		
 						this.authList.forEach(item => {
 								if(item.CheckList.length) {
 									checkArr.push(item.CheckList)
@@ -362,14 +364,15 @@ export default {
 									checkArr.push(item.CheckList)
 								}
 							})
-						}
+					}
+					const hasFiftyTwo = checkArr.flat(2).includes(52);
+					if(hasFiftyTwo && !hasMinusSignVal) return this.$message.error('请输入研选扣点数')
+
 					if(!checkArr.length && this.companyInfo.CompanyType === '权益') {
 						this.$message.warning('请选择权限!');
 						return
 					}else {
-						const hasFiftyTwo = checkArr.flat(2).includes(52);
-						const hasMinusSignVal = this.$refs.raiPermissionboxRef[0].minus_sign_val;		
-						if(hasFiftyTwo && !hasMinusSignVal) return this.$message.error('请输入研选扣点数')
+						
 						let PermissionIds = [... new Set(checkArr.flat(2))].join(',');
 						let params = {
 							CompanyId:Number(this.companyInfo.CompanyId),

+ 1 - 2
src/views/custom_manage/customList/updateServe.vue

@@ -700,7 +700,6 @@ export default {
 			}else {
 				this.$refs.dataForm.validate((valid) => {
 					if (valid) {
-						console.log(this.$refs.raiPermissionboxRef[0].minus_sign_val);
 						/* 处理权限列表 */
 						let checkArr = [];
 						this.authList.forEach(item => {
@@ -719,7 +718,7 @@ export default {
 							return false
 						}
 						const hasFiftyTwo = checkArr.flat(2).includes(52);
-						const hasMinusSignVal = this.$refs.raiPermissionboxRef[0].minus_sign_val;		
+						const hasMinusSignVal = this.companyInfo.CompanyType === '权益' ? this.$refs.raiPermissionboxRef[0].minus_sign_val : 0	
 						if(hasFiftyTwo && !hasMinusSignVal) return this.$message.error('请输入研选扣点数')
 						let PermissionIds = checkArr.flat(2).join(',');
 						let params = {