@dongkboy пре 7 месеци
родитељ
комит
f7eb7e4556

+ 5 - 3
src/api/modules/menu.ts

@@ -1,6 +1,6 @@
 import { ApiInstance } from '../type'
 interface menuData {
-  
+
   systemCode: string,
 
   [property:string]:any,
@@ -8,8 +8,10 @@ interface menuData {
 const menuApi = (axiosInstance: ApiInstance) => ({
   // 获取菜单
   getTenantConfig:(params:menuData) => axiosInstance.get('system/getInitConfig',{params}),
-  
- 
+  //获取菜单树
+  findMenuTree: () => axiosInstance.get('menu/findMenuTree'),
+  // 获取所有按钮权限
+  getAllButtons: () => axiosInstance.get('menu/getAllButtons'),
 })
 
 export default menuApi

+ 26 - 25
src/views/partnerManagement/LevelRule.vue

@@ -11,14 +11,14 @@
             </el-form-item>
             <el-form-item label="升级策略">
               <el-radio-group v-model="dataList[0].upgrade">
-                <el-radio disabled label="1">支持</el-radio>
-                <el-radio disabled label="2">不支持</el-radio>
+                <el-radio disabled value="1">支持</el-radio>
+                <el-radio disabled value="2">不支持</el-radio>
               </el-radio-group>
             </el-form-item>
             <el-form-item label="保级策略">
               <el-radio-group v-model="dataList[0].relegation">
-                <el-radio disabled label="1">支持</el-radio>
-                <el-radio disabled label="2">不支持</el-radio>
+                <el-radio disabled value="1">支持</el-radio>
+                <el-radio disabled value="2">不支持</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-form>
@@ -32,13 +32,13 @@
             <el-form-item label="升级策略">
               <div class="flex f-c ">
                 <el-radio-group v-model="dataList[1].upgrade">
-                  <el-radio label="1">支持</el-radio>
-                  <el-radio label="2">不支持</el-radio>
+                  <el-radio value="1">支持</el-radio>
+                  <el-radio value="2">不支持</el-radio>
                 </el-radio-group>
                 <el-form-item label="考核周期" class="m-top-10 spacing " v-if="dataList[1].upgrade === '1'">
                   <el-radio-group v-model="dataList[1].cycle.cycle" class="flex f-c a-start">
-                    <el-radio label="1">不限期</el-radio>
-                    <el-radio label="2">
+                    <el-radio value="1">不限期</el-radio>
+                    <el-radio value="2">
                       <span class="mr-2">固定天数</span>
                       成为该等级后,限期
                       <el-input class="width" :disabled="['1', '3'].includes(dataList[1].cycle.cycle)"
@@ -47,7 +47,7 @@
                         <template v-slot:append>天</template>
                       </el-input>
                     </el-radio>
-                    <el-radio label="3">
+                    <el-radio value="3">
                       <span class="mr-2">固定日期</span>
                       <el-date-picker class="width" v-model="dataList[1].cycle.min"
                         :disabled="['1', '2'].includes(dataList[1].cycle.cycle)" type="date" placeholder="选择日期"
@@ -124,13 +124,13 @@
             <el-form-item label="升级策略">
               <div class="flex f-c ">
                 <el-radio-group v-model="dataList[2].upgrade">
-                  <el-radio label="1">支持</el-radio>
-                  <el-radio label="2">不支持</el-radio>
+                  <el-radio value="1">支持</el-radio>
+                  <el-radio value="2">不支持</el-radio>
                 </el-radio-group>
                 <el-form-item label="考核周期" class="m-top-10 spacing " v-if="dataList[2].upgrade === '1'">
                   <el-radio-group v-model="dataList[2].cycle.cycle" class="flex f-c a-start">
-                    <el-radio label="1">不限期</el-radio>
-                    <el-radio label="2">
+                    <el-radio value="1">不限期</el-radio>
+                    <el-radio value="2">
                       <span class="mr-2">固定天数</span>
                       成为该等级后,限期
                       <el-input class="width" :disabled="['1', '3'].includes(dataList[2].cycle.cycle)"
@@ -139,7 +139,7 @@
                         <template v-slot:append>天</template>
                       </el-input>
                     </el-radio>
-                    <el-radio label="3">
+                    <el-radio value="3">
                       <span class="mr-2">固定日期</span>
                       <el-date-picker class="width" v-model="dataList[2].cycle.min"
                         :disabled="['1', '2'].includes(dataList[2].cycle.cycle)" type="date" placeholder="选择日期"
@@ -216,13 +216,13 @@
             <el-form-item label="升级策略">
               <div class="flex f-c ">
                 <el-radio-group v-model="dataList[3].upgrade">
-                  <el-radio label="1">支持</el-radio>
-                  <el-radio label="2">不支持</el-radio>
+                  <el-radio value="1">支持</el-radio>
+                  <el-radio value="2">不支持</el-radio>
                 </el-radio-group>
                 <el-form-item label="考核周期" class="m-top-10 spacing " v-if="dataList[3].upgrade === '1'">
                   <el-radio-group v-model="dataList[3].cycle.cycle" class="flex f-c a-start">
-                    <el-radio label="1">不限期</el-radio>
-                    <el-radio label="2">
+                    <el-radio value="1">不限期</el-radio>
+                    <el-radio value="2">
                       <span class="mr-2">固定天数</span>
                       成为该等级后,限期
                       <el-input class="width" :disabled="['1', '3'].includes(dataList[3].cycle.cycle)"
@@ -231,7 +231,7 @@
                         <template v-slot:append>天</template>
                       </el-input>
                     </el-radio>
-                    <el-radio label="3">
+                    <el-radio value="3">
                       <span class="mr-2">固定日期</span>
                       <el-date-picker class="width" v-model="dataList[3].cycle.min"
                         :disabled="['1', '2'].includes(dataList[3].cycle.cycle)" type="date" placeholder="选择日期"
@@ -308,13 +308,13 @@
             <el-form-item label="升级策略">
               <div class="flex f-c ">
                 <el-radio-group v-model="dataList[4].upgrade">
-                  <el-radio label="1">支持</el-radio>
-                  <el-radio label="2">不支持</el-radio>
+                  <el-radio value="1">支持</el-radio>
+                  <el-radio value="2">不支持</el-radio>
                 </el-radio-group>
                 <el-form-item label="考核周期" class="m-top-10 spacing " v-if="dataList[4].upgrade === '1'">
                   <el-radio-group v-model="dataList[4].cycle.cycle" class="flex f-c a-start">
-                    <el-radio label="1">不限期</el-radio>
-                    <el-radio label="2">
+                    <el-radio value="1">不限期</el-radio>
+                    <el-radio value="2">
                       <span class="mr-2">固定天数</span>
                       成为该等级后,限期
                       <el-input class="width" :disabled="['1', '3'].includes(dataList[4].cycle.cycle)"
@@ -323,7 +323,7 @@
                         <template v-slot:append>天</template>
                       </el-input>
                     </el-radio>
-                    <el-radio label="3">
+                    <el-radio value="3">
                       <span class="mr-2">固定日期</span>
                       <el-date-picker class="width" v-model="dataList[4].cycle.min"
                         :disabled="['1', '2'].includes(dataList[4].cycle.cycle)" type="date" placeholder="选择日期"
@@ -779,7 +779,8 @@ const saveRule = () => {
 // 查询等级规则
 const queryRule = () => {
   api.partnerApi.partnerqueryRule().then((res: any) => {
-    if (res.code === '200') {
+    if (res.code == '200') {
+
       // 合并数据,保持响应式
       res.data.forEach((item: DataItem, index: number) => {
         if (dataList[index]) {

+ 33 - 7
src/views/partnerManagement/commissionRule.vue

@@ -20,8 +20,8 @@
             <el-form-item label="佣金有效期" class="m-top-20 spacing " label-width="100px"
               prop="administrator.validityPeriod">
               <el-radio-group v-model="rulefrom.administrator.validityPeriod" class="flex f-c a-start">
-                <el-radio label="1">不限期</el-radio>
-                <el-radio label="2">
+                <el-radio value="1">不限期</el-radio>
+                <el-radio value="2">
                   <div class="flex a-c">
                     <span class="mr-2">固定天数</span>
                     <el-form-item v-if="rulefrom.administrator.validityPeriod === '2'" label=" 成为该等级后,限期"
@@ -33,7 +33,7 @@
                     </el-form-item>
                   </div>
                 </el-radio>
-                <el-radio label="3">
+                <el-radio value="3">
                   <div class="flex a-c">
                     <span>固定日期</span>
                     <div class="flex a-c" v-if="rulefrom.administrator.validityPeriod === '3'">
@@ -118,8 +118,8 @@
             </div>
             <el-form-item label="佣金有效期" class="m-top-20 spacing " prop="partner.validityPeriod">
               <el-radio-group v-model="rulefrom.partner.validityPeriod" class="flex f-c a-start">
-                <el-radio label="1">不限期</el-radio>
-                <el-radio label="2">
+                <el-radio value="1">不限期</el-radio>
+                <el-radio value="2">
                   <div class="flex a-c">
                     <span class="mr-2">固定天数</span>
                     <el-form-item v-if="rulefrom.partner.validityPeriod === '2'" label=" 成为该等级后,限期"
@@ -131,7 +131,7 @@
                     </el-form-item>
                   </div>
                 </el-radio>
-                <el-radio label="3">
+                <el-radio value="3">
                   <div class="flex a-c">
                     <span>固定日期</span>
                     <div class="flex a-c" v-if="rulefrom.partner.validityPeriod === '3'">
@@ -205,7 +205,7 @@
       </el-form>
     </PageMain>
     <FixedActionBar>
-      <ElButton type="primary">
+      <ElButton type="primary" @click="saveRule">
         保存
       </ElButton>
     </FixedActionBar>
@@ -401,6 +401,32 @@ const rulesAdd = (Name:any) => {
   }
 
 }
+// 保存等级规则
+const saveRule = () => {
+  ruleFormRef.value.validate().then((valid: any) => {
+    if (valid) {
+      api.partnerApi.commissionsave(rulefrom).then((res: any) => {
+        if (res.code == '200') {
+          ElMessage({
+            type: 'success',
+            message: res.msg,
+          });
+          Query()
+        } else {
+          ElMessage({
+            type: 'error',
+            message: res.msg,
+          });
+        }
+      });
+    } else {
+      ElMessage({
+        type: 'error',
+        message: '请填写完整信息',
+      });
+    }
+  });
+}
 </script>
 <!-- 样式区域 -->
 <style lang='scss' scoped>