Merge branch 'dev-phrase2.5.1-0205' into 'release'

教培2.5.1新需求完成 code reviewer: 张平

教培2.5.1新需求完成 code reviewer: 张平

See merge request !139

src/utils-o/fetch.js

@@ -56,7 +56,7 @@ service.interceptors.request.use(config => {
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
       // config.headers['token'] = 'BFD804F3A3194FBBBE113962222839F6';
       // config.headers['token'] = 'F8209898391C40A0B8DBC1ED9E157291';
-      config.headers['token'] = '2E46B77D801C479DBA1C550CE70D348F';
+      config.headers['token'] = '3167CD6495A14C14AEF28AB99F69984D';
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/utils/fetch.js

@@ -55,6 +55,7 @@ service.interceptors.request.use(config => {
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
       // config.headers['token'] = '29D71EAAB92E4580AFB16A8011BE7206';
+      // config.headers['token'] = '3167CD6495A14C14AEF28AB99F69984D';
       config.headers['token'] = localStorage.getItem('storageToken')
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')

src/views/education/edit-entry.vue

@@ -20,28 +20,32 @@
               size="small"
               v-model="formData.entryName"
               placeholder="请输入名称"
-              style="width:83%;"
+              style="width:70%;"
               :disabled="peopleLevel == 'L3'"
             ></el-input>
             <span class="word-num">{{(formData.entryName).replace(/\s+/g,"").length}}/24</span>
           </el-col>
         </el-form-item>
-        <el-form-item label="发起机构：" prop="organizationName">
-          <el-col :span="13">
+        <!-- <el-form-item label="发起机构：" prop="organizationName"> -->
+        <el-form-item label="发起机构：">
+          <el-col :span="13" v-for="(item, index) in formData.organizationNameList" :key="index">
             <el-input
               size="small"
-              v-model="formData.organizationName"
+              v-model="formData.organizationNameList[index]"
               placeholder="请输入发起机构名称"
-              style="width:83%;"
+              style="width:70%;"
+              maxlength=16
               :disabled="peopleLevel == 'L3'"
               @input="changeOrganizationName"
               @blur="blurName"
-              @focus="focusName"
+              @focus="focusName(index)"
             ></el-input>
-            <span class="word-num">{{(formData.organizationName).replace(/\s+/g,"").length}}/12</span>
+            <span class="word-num">{{(formData.organizationNameList[index]).replace(/\s+/g,"").length}}/16</span>
+            <img @click="plusOrg(index)" class="edit-img" src="../../assets/image/plus.png" />
+            <img @click="deleteOrg(index)" v-if="index >= 1" class="edit-img" src="../../assets/image/trash.png" />
           </el-col>
           <el-popover
-            class="popover-content"
+            class="popover-content" :style="{'top': orgListIndex * 41 + 'px'}"
             placement="bottom"
             :content="organizationContent"
             v-model="visibleName"
@@ -270,6 +274,7 @@ export default {
         callback();
       }
     };
+
     return {
       curmbFirst: "教培项目",
       curmbSecond: "项目组件",
@@ -296,8 +301,10 @@ export default {
         attachmentMore1: {},
         attachmentMore2: {},
         organizationName: "",
+        organizationNameList: [''],
         project: []
       },
+      orgListIndex: 0,
       optionsProject: [],
       tagsProject: [],
       visibleName: false,
@@ -336,7 +343,7 @@ export default {
           { required: true, message: "请填写发起机构名称", trigger: "blur" },
           {
             min: 1,
-            max: 12,
+            max: 16,
             message: "超过12个最大字数限制，请精简字数或使用简称",
             trigger: "blur"
           }
@@ -391,6 +398,12 @@ export default {
     commonUtil.resizeHeight();
   },
   methods: {
+    plusOrg(index) {
+      vm.formData.organizationNameList.splice(index + 1, 0, '');
+    },
+    deleteOrg(index) {
+      vm.formData.organizationNameList.splice(index, 1);
+    },
     initTitle() {
       if (vm.entryId == null) {
         vm.title = "新建入口";
@@ -425,6 +438,26 @@ export default {
         }
       });
     },
+
+    checkOrgNameList() {
+      let nameList = this.formData.organizationNameList;
+      for(let i = 0; i < nameList.length; i ++) {
+        if(!nameList[i]) {
+          this.$message.error('发起机构名称不可以为空');
+          return false;
+        }
+      }
+      for(let i = 0; i < nameList.length - 1; i ++) {
+        for(let j = i + 1; j < nameList.length; j ++) {
+          if(nameList[i] == nameList[j]) {
+            this.$message.error('发起机构名称不能重复');
+            return false;
+          }
+        }        
+      }
+      return true;
+    },
+
     submitForm(formName) {
       let flag = null;
       this.$refs[formName].validate(valid => {
@@ -565,7 +598,10 @@ export default {
       }
     },
     checkDefault() {
-      vm.formData.organizationName = vm.organizationContent;
+      // vm.formData.organizationNameList[0] = vm.organizationContent;
+      vm.formData.organizationNameList.splice(this.orgListIndex, 1, vm.organizationContent);
+      // vm.formData.organizationNameList.push(vm.organizationContent);
+      // vm.formData.organizationName = vm.organizationContent;
       vm.visibleName = false;
     },
     blurName() {
@@ -575,9 +611,10 @@ export default {
         vm.submitForm("formData");
       }, 200);
     },
-    focusName() {
-      let textLength = vm.formData.organizationName.length;
+    focusName(index) {
+      let textLength = vm.formData.organizationNameList[index].length;
       if (textLength == 0) {
+        this.orgListIndex = index;
         vm.visibleName = true;
       } else {
         vm.visibleName = false;
@@ -585,7 +622,6 @@ export default {
     },
     changeOrganizationName() {
       let textLength = vm.formData.organizationName.length;
-      // console.log("文字长度", textLength);
       if (textLength == 0) {
         vm.visibleName = true;
       } else {
@@ -680,6 +716,7 @@ export default {
       vm.formData = {
         entryName: data.portalEntry.entryName,
         organizationName: data.portalEntry.organizationName,
+        organizationNameList: data.portalEntry.organizationNameList,
         entryBegintime: data.portalEntry.entryBegintime,
         entryEndtime: data.portalEntry.entryEndtime,
         entryIntro: data.portalEntry.entryIntro,
@@ -703,6 +740,7 @@ export default {
     complete(type) {
       //1是暂存，2是完成
       if (type == 2) {
+        if(!this.checkOrgNameList()) return;
         if (!vm.formData.attachmentUrl1) {
           vm.uploadImgMessage = true;
         } else {
@@ -745,7 +783,8 @@ export default {
             entryEndtime: vm.formData.entryEndtime,
             entryIntro: vm.formData.entryIntro,
             entryName: vm.formData.entryName,
-            organizationName: vm.formData.organizationName
+            organizationName: vm.formData.organizationName,
+            organizationNameList: vm.formData.organizationNameList
           },
           attachments: [
             {
@@ -790,7 +829,8 @@ export default {
             entryStatus: vm.entryOptionData.portalEntry.entryStatus,
             id: vm.entryOptionData.portalEntry.id,
             organizationId: 0,
-            organizationName: vm.formData.organizationName
+            organizationName: vm.formData.organizationName,
+            organizationNameList: vm.formData.organizationNameList
           },
           attachments: [
             {
@@ -980,4 +1020,9 @@ export default {
     }
   }
 }
+.popover-content {
+  position: relative;
+  top: 0;
+  left: 0;
+}
 </style>
\ No newline at end of file

src/views/education/item-manager.vue

@@ -244,6 +244,20 @@
           <el-button @click="handleCheckRight">不通过</el-button>
         </span>
       </el-dialog>
+      <!-- 删除 弹窗 -->
+      <el-dialog
+        title="确认删除"
+        :show-close=false
+        :visible.sync="deleteVisible"
+        :close-on-click-modal="false"
+        width="600px"
+        center>
+        <p style="text-align: center;">删除后将不可撤销，确认删除吗？</p>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="confirmDelete">删 除</el-button>
+          <el-button type="primary" @click="hideDeleteFrom">取 消</el-button>
+        </span>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -357,7 +371,8 @@ export default {
         }
       },
       idType: '',
-      masterAdministratorFlag: false
+      masterAdministratorFlag: false,
+      deleteVisible: false,
     };
   },
   computed: {
@@ -388,6 +403,10 @@ export default {
     ...mapActions([
     	'updateItemManager'
     ]),
+    hideDeleteFrom() {
+      this.deleteVisible = false;
+    },
+    
     openProject() {
       if(vm.masterAdministratorFlag == 'true') {
         this.centerDialogVisible = true;
@@ -649,19 +668,25 @@ export default {
       }
       return data;
     },
-    //删除项目
     delItem(row) {
+      this.deleteVisible = true
+      this.currentRow = row;
+    },
+    hideDeleteFrom() {
+      this.deleteVisible = false;
+    },
+    // 删除项目
+    confirmDelete() {
       let req = {};
-      console.log(row);
-      vm.DELETE("portal/portalInfo/delete/" + row.id, req).then(res => {
+      vm.DELETE("portal/portalInfo/delete/" + this.currentRow.id, req).then(res => {
         vm.$message.info(res.message);
         if (res.code == "000000") {
-          console.log(res);
+          this.deleteVisible = false;
           vm.getProjectList();
         }
       });
     },
-    //重置表单
+    // 重置表单
     resetForm() {
       vm.formInline = Object.assign(
         {},

src/views/system/item-role.vue

@@ -432,6 +432,7 @@ export default {
   created() {
     vm = this;
     this.queryRoleList();
+    this.curmbThird = this.$route.query && this.$route.query.projectName || ''
   },
   // 挂载到Dom完成时
   mounted: function() {

src/views/system/role.vue

@@ -176,7 +176,7 @@ export default {
       vm.search();
     },
     toPage(row) {
-      this.$router.push("item-role?portalProjectId=" + row.id);
+      this.$router.push("item-role?portalProjectId=" + row.id + '&projectName=' + row.projectName);
     },
     handleSizeChange(val) {
       this.formInline.pageSize = val;