add需求调整

src/views/education/edit-manager.vue

@@ -203,6 +203,16 @@
               <el-radio :label="1">使用小生态范围</el-radio>
             </el-radio-group>
           </el-form-item>
+          <el-form-item label="人员权限设定">
+            <el-radio-group
+              size="small"
+              v-model="formData.authorityType"
+              :disabled="showNoticeType()"
+            >
+              <el-radio :label="1">自定义</el-radio>
+              <el-radio :label="2">使用平台默认权限</el-radio>
+            </el-radio-group>
+          </el-form-item>
           <el-form-item label="项目范围外可见">
             <el-radio-group
               size="small"
@@ -981,6 +991,7 @@ export default {
         receiveOption: 1,
         visibleFlag: 1,
         learnableFlag: 2,
+        authorityType:1,
       },
       pickerOptions0: {
         disabledDate: time => {
@@ -1354,6 +1365,7 @@ export default {
         receiveOption: editData.notifyData.receiveOption,
         visibleFlag:　editData.projectData.visibleFlag,
         learnableFlag:　editData.projectData.learnableFlag,
+        authorityType:editData.projectData.authorityType,
       };
       this.organizationContent = editData.projectData.creatorOrganizationName;
       if (editData.attachmentData.length > 2) {
@@ -1442,6 +1454,7 @@ export default {
         organizationName: this.formData.organizationName,
         visibleFlag: this.formData.visibleFlag,
         learnableFlag: this.formData.learnableFlag,
+        authorityType:this.formData.authorityType,
       };
       let attachmentModel = [
         {

src/views/system/item-role.vue

@@ -4,7 +4,7 @@
     <div class="component-content screenSet" id="screenSet">
       <div class="header-title">
         查询条件
-        <el-upload
+        <!-- <el-upload
           v-if="activeUser == 'L1'"
           class="upload-excel"
           action="#"
@@ -15,7 +15,7 @@
         >
           <el-button size="small">导入角色权限</el-button>
           <el-button class="down-button" slot="tip" size="small" @click="download('model')">下载导入模板</el-button>
-        </el-upload>
+        </el-upload> -->
       </div>
       <el-row :gutter="30" class="row" type="flex" style="margin-top: 10px;">
         <el-form :model="formInline" ref="formInline" label-width="75px" class="form-inline">
@@ -108,6 +108,20 @@
         <el-table-column fixed="right" label="操作" width="350" align="left">
           <template slot-scope="scope">
             <el-button
+              class="button-text"
+              type="text"
+              size="small"
+              v-if="scope.row.projeceRole != 'L2'"
+              @click="proChange(scope.row,'L2')"
+            >升级项目负责人</el-button>
+            <el-button
+              class="button-text"
+              type="text"
+              size="small"
+              v-else
+              @click="proChange(scope.row,'')"
+            >取消项目负责人</el-button>
+            <!-- <el-button
               class="button-text"
               type="text"
               size="small"
@@ -127,8 +141,8 @@
               size="small"
               v-show="showButton(scope.row,'L3_2')"
               @click="openDialog(scope.row,'L3_2')"
-            >降为次级负责人</el-button>
-            <el-button
+            >降为次级负责人</el-button> -->
+            <!-- <el-button
               class="button-text"
               type="text"
               size="small"
@@ -141,7 +155,7 @@
               size="small"
               v-show="showAppend(scope.row.projeceRole)"
               @click="addArea(scope.row)"
-            >追加区域权限</el-button>
+            >追加区域权限</el-button> -->
           </template>
         </el-table-column>
         <div slot="empty">
@@ -163,6 +177,18 @@
           :total="totalRows"
         ></el-pagination>
       </div>
+      <el-dialog title :visible.sync="changeDialog.show" width="30%" center>
+
+        <p v-html="changeDialog.txt">
+
+        </p>
+
+        <span slot="footer" class="dialog-footer">
+          <el-button type="default" size="small" @click="changeDialog.show = false">取消</el-button>
+          <el-button type="primary" size="small" @click="changeFunRole()">确定</el-button>
+        </span>
+      </el-dialog>
+
       <el-dialog title :visible.sync="dialog.show" width="30%" center>
         <!-- <p v-if="numL3 > 1" class="dialog-p">
           确认将{{ dialog.role }}
@@ -359,7 +385,12 @@ export default {
         role: "项目负责人",
         name: "李雷",
         option: "升级为项目负责人",
-        full: false
+        full: false,
+
+      },
+      changeDialog:{
+        show: false,
+        txt:''
       },
       dialogFull: false,
       scopeRow: {},
@@ -384,7 +415,9 @@ export default {
       attachRegionId: "",
 
       creator: false,
-      hospitalMasterAdmin: false
+      hospitalMasterAdmin: false,
+      optionType:'',
+      optionItem:{}
     };
   },
   created() {
@@ -396,6 +429,45 @@ export default {
     commonUtil.resizeHeight();
   },
   methods: {
+    //add 升、降项目负责人
+    proChange(item,str){
+      this.optionType = str;
+      this.optionItem = item;
+      let s = ''
+      s = str != '' ? '确认将项目负责人 <span class="user-name">'+item.userName+'</span> 升级为项目负责人吗?' : '确认取消 <span class="user-name">'+ item.userName+'</span> 项目负责人权限吗?'
+      this.changeDialog = {
+        show: true,
+        txt:s
+      }
+    },
+    changeFunRole() {
+      let req = {
+        portalProjectId: this.formInline.portalProjectId,
+        updateL: this.optionType == '' ? 'L3' : 'L2',
+        userId: this.optionItem.userId,
+        numL2: this.numL2,
+        nowL: this.optionItem.projeceRole
+      };
+      // vm.GET("portal/portalProjectOrRole/roleLevelUpdate", req).then(res => {
+      vm.GET("portal/v2/role/roleLevelUpdate", req).then(res => {
+        vm.dialog.show = false;
+        if (res.code == "000000") {
+          console.log(res);
+          vm.queryRoleList();
+          vm.$message({
+            message: "设置成功！",
+            type: "success"
+          });
+          this.changeDialog = {
+            show: false,
+            txt:''
+          }
+        } else {
+          this.$message.error(res.code);
+        }
+      });
+    },
+
     updateAgain() {
       vm.dialogFail = false;
     },
@@ -1094,4 +1166,4 @@ export default {
         overflow-y: scroll;
     }
 }
-</style>
\ No newline at end of file
+</style>