wangziqian 5 жил өмнө
parent
commit
f629129c3c

+ 4 - 2
src/components/input/textArea.vue

@@ -122,8 +122,10 @@ export default {
       }
     },
     handlerText(val) {
-      const reg = new RegExp(/<\/?p[^>]*>/gi)
-      return val.replace(reg, '')
+      if (val) {
+        const reg = new RegExp(/<\/?p[^>]*>/gi)
+        return val.replace(reg, '')
+      }
     }
   }
 }

+ 1 - 0
src/views/projectManage/projectList/projectViewDetails.vue

@@ -290,6 +290,7 @@ export default {
     initRequirementCreateDialog() { // 初始化新建需求弹框
       this.requirement.belongingProject = this.projectId // 这里传入项目id
       this.requirement.bizId = localStorage.getItem('bizId') // 这里传入业务线id
+      this.requirement.dependOnRelease = 0 // 这里传入是否依赖发版
     },
     closeDioang() { // 关闭新建需求弹框
       this.need_open = false

+ 1 - 1
src/views/projectManage/requirement/list/create.vue

@@ -75,8 +75,8 @@
       <div style="display: flex;justify-content: space-between; align-items: center;">
         <el-form-item label="是否依赖发版" prop="dependOnRelease">
           <el-radio-group v-model="form.dependOnRelease" style="width:20vw">
-            <el-radio :label="1">是</el-radio>
             <el-radio :label="0">否</el-radio>
+            <el-radio :label="1">是</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item v-if="form.dependOnRelease" label="涉及的客户端" prop="referredClientType">

+ 18 - 4
src/views/projectManage/requirement/requirementDetail.vue

@@ -57,10 +57,9 @@
           </div>
           <div class="detail-info">
             <el-form :inline="true" :model="form_query" class="demo-form-inline" label-position="right" label-width="100px">
-              <el-form-item label="所属项目:">
-                <el-select v-model="form_query.belongingProject" placeholder="请选择" @change="changeArea">
-                  <el-option v-for="(item,index) in belongProjectList" :key="item.name + index" :label="item.name" :value="item.id" />
-                </el-select>
+              <el-form-item label="所属项目:" class="module">
+                <div v-if="form_query.belongingProject !== -1" @click="jump('项目详情',form_query.belongingProject)">{{ form_query.belongingProjectName }}</div>
+                <template v-else>{{ form_query.belongingProjectName }}</template>
               </el-form-item>
               <el-form-item label="所属迭代:">
                 <el-select v-model="form_query.iterationId" placeholder="请选择" @change="changeArea">
@@ -435,6 +434,9 @@ export default {
         this.$refs.createdBug.init(1)
       })
     },
+    jump(page, id) { // 跳转
+      this.$router.push({ name: page, query: { id: id }})
+    },
     reloadList() {
       this.getRequirementById()
       if (this.$refs['bugTableDialog']) {
@@ -540,6 +542,18 @@ export default {
     }
   }
 }
+>>>.module .el-form-item__content {
+    display: inline-block;
+    width: calc(100% - 100px);
+    div {
+      line-height: 18px;
+      padding-top: 12px;
+      cursor: pointer;
+    }
+    div:hover{
+      color: #409EFF;
+    }
+  }
 >>>.el-input--small {
   font-size: 14px;
 }

+ 20 - 10
src/views/projectManage/taskList/taskViewDetail.vue

@@ -71,22 +71,24 @@
           </div>
           <div class="detail-info">
             <el-form :inline="true" :model="form_query" class="demo-form-inline" label-position="right" label-width="100px">
-              <el-form-item label="所属项目:">
-                {{ form_query.projectName }}
+              <el-form-item label="所属项目:" class="module">
+                <div v-if="form_query.projectId !== -1" @click="jump('项目详情',form_query.projectId)">{{ form_query.projectName }}</div>
+                <template v-else>{{ form_query.projectName }}</template>
               </el-form-item>
-              <el-form-item label="所属需求:">
-                {{ form_query.requireName }}
+              <el-form-item label="所属需求:" class="module">
+                <div v-if="form_query.requireId !== -1" @click="jump('项目详情',form_query.requireId)">{{ form_query.projectName }}</div>
+                <template v-else>{{ form_query.requireName }}</template>
               </el-form-item>
               <el-form-item label="所属模块:" class="module">
-                <span>{{ form_query.moduleInfoName }}</span>
+                <div>{{ form_query.moduleInfoName }}</div>
               </el-form-item>
             </el-form>
             <el-form :inline="true" :model="form_query" class="demo-form-inline" label-position="right" label-width="100px">
               <el-form-item label="开发负责人:">
-                <search-people :value.sync="form_query.rdOwner" @change="changeArea" />
+                <search-people :value.sync="form_query.rdOwner || ''" @change="changeArea" />
               </el-form-item>
               <el-form-item label="测试负责人:">
-                <search-people :value.sync="form_query.qaOwner" @change="changeArea" />
+                <search-people :value.sync="form_query.qaOwner || ''" @change="changeArea" />
               </el-form-item>
               <el-form-item label="是否跟版:">
                 <el-select v-model="form_query.followVersion" size="small" filterable placeholder="请选择" @change="changeArea">
@@ -465,6 +467,9 @@ export default {
           break
       }
     },
+    jump(page, id) { // 跳转
+      this.$router.push({ name: page, query: { id: id }})
+    },
     reloadList() {
       this.taskGet()
       if (this.$refs['bugTableDialog']) {
@@ -595,9 +600,14 @@ export default {
 >>>.module .el-form-item__content {
     display: inline-block;
     width: calc(100% - 100px);
-    white-space:nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
+    div {
+      line-height: 18px;
+      padding-top: 12px;
+      cursor: pointer;
+    }
+    div:hover{
+      color: #409EFF;
+    }
   }
 .form-progress {
   width: 200px;

+ 1 - 0
src/views/workbench/person/components/myFullCalendar.vue

@@ -24,6 +24,7 @@
       v-show="activeName === '1'"
       :id="type + '-calendar'"
       ref="fullCalendar"
+      height="auto"
       :class="type + '-calendar'"
       default-view="dayGridMonth"
       theme-system="bootstrap"