bding 1 年之前
父节点
当前提交
888251bbc6

+ 11 - 6
src/views/custom_manage/customList/applyTurn.vue

@@ -120,7 +120,7 @@
 								权限设置
 							</label>
 							<template  v-if="companyInfo.CompanyType=='权益' ||isRoleType== '权益'">
-								<raiPermissionbox v-for="item in authList" :key="item.ClassifyName" :data="item" :formData="formData"
+								<raiPermissionbox ref="raiPermissionboxRef" v-for="item in authList" :key="item.ClassifyName" :data="item" :formData="formData"
 								:hasNoChild="hasNoChild"></raiPermissionbox>
 							</template>
 							<ul class="menu_lists" style="width:100%" v-else>
@@ -259,7 +259,7 @@ export default {
 						/* 处理数据把复选框 拆分成三个*/
 						res.Data.Item.PermissionList.length&&res.Data.Item.PermissionList.forEach(item => {
 						let arr = item.Items.filter(key=> [22,21,20,19,23,30].includes(key.ChartPermissionId))
-						let ItemsPrivate = item.Items.filter(key=> [29,31,20031,20032].includes(key.ChartPermissionId))
+						let ItemsPrivate = item.Items.filter(key=> [29,31,20031,20032,52].includes(key.ChartPermissionId))
 						let ItemsUp = item.Items.filter(key=> key.PermissionName.includes('升级'))
 						let ItemsBig = item.Items.filter(key=> key.ChartPermissionId==0)
 							let obj = {
@@ -287,7 +287,9 @@ export default {
 			)},
 		/* 获取基本权限信息 */
 		getAuthBasic() {
-			customInterence.authList().then(res => {
+			customInterence.authList({
+				IsShowYanXuanKouDian:true
+			}).then(res => {
 				let newArr = [];
 				if(res.Ret === 200) {
 					if(this.companyInfo.CompanyType == '权益' || this.isRoleType== '权益') {
@@ -298,7 +300,7 @@ export default {
 						/* 处理数据把复选框 拆分成三个*/
 						res.Data.List.length&&res.Data.List.forEach(item => {
 						let arr = item.Items.filter(key=> [22,21,20,19,23,30].includes(key.ChartPermissionId))
-						let ItemsPrivate = item.Items.filter(key=> [29,31,20031,20032].includes(key.ChartPermissionId))
+						let ItemsPrivate = item.Items.filter(key=> [29,31,20031,20032,52].includes(key.ChartPermissionId))
 						let ItemsUp = item.Items.filter(key=> key.PermissionName.includes('升级'))
 						let ItemsBig = item.Items.filter(key=> key.ChartPermissionId==0)
 							let obj = {
@@ -340,7 +342,6 @@ export default {
 		saveHandle() {
 			this.$refs.formData.validate((valid) => {
 				if (valid) {
-					
 					/* 处理权限列表 */
 					let checkArr = [];
 					let checkArrName = [];
@@ -366,6 +367,9 @@ export default {
 						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),
@@ -380,7 +384,8 @@ export default {
 							PermissionIds,
 							PackageType:this.formData.setmeal ? this.formData.setmeal : 0,
 							PermissionNames:checkArrName.length? checkArrName.join(','):'',
-							RaiPackageType:this.formData.qyBigServeCheck||0
+							RaiPackageType:this.formData.qyBigServeCheck||0,
+							Points:hasMinusSignVal
 						}
 						// console.log(params);
 						customInterence.applyTurn(params).then(res => {

+ 33 - 4
src/views/custom_manage/customList/components/raiPermissionbox.vue

@@ -43,7 +43,12 @@
           <div class="rai-checkbox-upS-box" >
             <el-checkbox :label="itP.ChartPermissionId" v-for="(itP,inP) in data.ItemsPrivate" 
             :key="itP.ChartPermissionId" :disabled="itP.disabled" :style="{'height':hasNoChild?'48px':'95px','width':itemsPrivateWidth[inP]}"
-            class="rai-checkbox-item upS-item" @change="e => handlePrivateChecked(e,itP,data)">{{ itP.PermissionName }}</el-checkbox>
+            class="rai-checkbox-item upS-item" @change="e => handlePrivateChecked(e,itP,data)">
+            {{ itP.PermissionName }}
+            <p v-if="itP.ChartPermissionId == 31" class="checkbox-text">(30000元/年)</p>
+            <p v-if="itP.ChartPermissionId == 52" class="checkbox-text">(点/2000元)</p>
+            <input @click.stop @input="validateInteger"  style="margin-left:10px" v-if="itP.ChartPermissionId == 52 && data.CheckList.includes(52)" v-model="minus_sign_val" />
+            </el-checkbox>
           </div>
         </el-checkbox-group>
         <div class="rai-checkbox-notice-box">
@@ -60,9 +65,9 @@
   export default {
     name:'raiPermissionbox',
     data() {
-		  this.itemsPrivateWidth=['84px','146px','146px']
+		  this.itemsPrivateWidth=['84px','146px','260px']
       return {
-        
+        minus_sign_val:''
       }
     },
     props:{
@@ -80,7 +85,7 @@
       }
     },
     created(){
-      // console.log(this.data);
+      console.log(this.data);
       // 回显
       if(this.data.CheckList && this.data.CheckList.length>0){
         this.data.Items.map(item =>{
@@ -209,6 +214,15 @@
       },
       getQyBigServeCheckNumber(permissionName){
         return permissionName.includes('70')?1:2
+      },
+      // 只允许输入数字和删除键
+      validateInteger() {
+        this.minus_sign_val = this.minus_sign_val.replace(/[^0-9]/g, '');
+
+        // 如果输入不为空,则转换为整数
+        if (this.minus_sign_val !== '') {
+          this.minus_sign_val = parseInt(this.minus_sign_val, 10);
+        }
       }
     }
   }
@@ -269,7 +283,22 @@
 			.rai-checkbox-upS-box{
 				display: flex;
 				.upS-item{
+          position: relative;
 					justify-content: flex-start;
+          .checkbox-text {
+            position: absolute;
+            font-size: 12px;
+            color: #999;
+            bottom: 15px;
+            left: 20px;
+          }
+          input {
+            width: 80px;
+            height: 30px;
+            border-radius: 4px;
+            padding-left: 10px;
+            border: 1px solid #dcdfe6;
+          }
 				}
 			}
 			.rai-checkbox-item{

+ 10 - 4
src/views/custom_manage/customList/updateServe.vue

@@ -111,7 +111,7 @@
 								权限设置
 							</label>
 							<template  v-if="companyInfo.CompanyType=='权益' || isRoleType== '权益'">
-								<raiPermissionbox v-for="item in authList" :key="item.ClassifyName" :data="item" :formData="dataForm"
+								<raiPermissionbox  ref="raiPermissionboxRef" v-for="item in authList" :key="item.ClassifyName" :data="item" :formData="dataForm"
 								:hasNoChild="hasNoChild"></raiPermissionbox>
 							</template>
 							<ul v-else class="menu_lists" style="width:100%">
@@ -496,7 +496,9 @@ export default {
 		// },
 		/* 获取基本权限信息 */
 		getAuthBasic() {
-			customInterence.authList().then(res => {
+			customInterence.authList({
+				IsShowYanXuanKouDian:true,
+			}).then(res => {
 				if(res.Ret === 200) {
 					let newArr = [];
 					if(this.companyInfo.CompanyType == '权益' || this.isRoleType== '权益') {
@@ -698,6 +700,7 @@ 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 => {
@@ -715,7 +718,9 @@ export default {
 							this.$message.warning('同行业有重叠的合同期限,请核实后再提交')
 							return false
 						}
-						
+						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 = checkArr.flat(2).join(',');
 						let params = {
 							CompanyId:this.companyInfo.CompanyId,
@@ -730,7 +735,8 @@ export default {
 							PayMethod:this.dataForm.payway,
 							PermissionIds:PermissionIds,
 							PackageType:Number(this.dataForm.setmeal),
-							RaiPackageType:this.dataForm.qyBigServeCheck||0
+							RaiPackageType:this.dataForm.qyBigServeCheck||0,
+							Points:hasMinusSignVal
 						}
 
 						console.log(params);