qinzhipeng_v@didiglobal.com 4 年之前
父节点
当前提交
f454c4eb52

+ 5 - 5
src/views/projectManage/requirement/components/BasicsCode.vue

@@ -51,7 +51,7 @@
             <el-cascader v-model="form_query.rqmtOrntIds" size="medium" collapse-tags :props="props" :options="demandDirection" placeholder="请选择" />
           </template>
           <template slot="overMouse">
-            <span v-if="form_query.rqmtOrntNames">{{ form_query.rqmtOrntNames.slice(0, 20) }}</span>
+            <span v-if="form_query.rqmtOrntNames">{{ form_query.rqmtOrntNames }}</span>
           </template>
         </over-click>
       </el-form-item>
@@ -123,7 +123,7 @@
             </el-select>
           </template>
           <template slot="overMouse">
-            <span v-if="form_query.referredClientTypeName === '无'" style="color: #C0C4CC;">不跟版</span>
+            <span v-if="form_query.referredClientTypeName === '无'" style="color: #333333;">不跟版</span>
             <span v-else>{{ form_query.referredClientTypeName }}</span>
           </template>
         </over-click>
@@ -239,8 +239,8 @@ export default {
           return false
         }
       }
-      if (requirementInfo.referredClientType !== null && requirementInfo.referredClientType !== []) {
-        if (requirementInfo.referredClientType === -1) {
+      if (requirementInfo.referredClientType !== null) {
+        if (requirementInfo.referredClientType === '-1') {
           requirementInfo.dependOnRelease = 0
           requirementInfo.referredClientType = []
         } else {
@@ -274,7 +274,7 @@ export default {
         this.appClient = res.data.appClient
         this.appClient.unshift({ msg: '不跟版', code: -1 })
         this.$nextTick(() => {
-          if (this.form_query.referredClientType[0] === -1) {
+          if (this.form_query.referredClientType[0] === -1 || this.form_query.referredClientType === '-1') {
             this.appClient.map(item => {
               if (item.code !== -1) {
                 item.dis = true

+ 19 - 2
src/views/projectManage/requirement/requirementDetail.vue

@@ -546,6 +546,24 @@ export default {
         requirementInfo.referredClientType = requirementInfo.referredClientType.join()
       }
       requirementInfo.status = this.statusValue
+      if (e === 1) {
+        const data = {
+          rdLeader: this.form_query.rdLeader.join(),
+          qaLeader: this.form_query.qaLeader.join(),
+          id: this.$route.query.id,
+          status: this.statusValue,
+          modifier: localStorage.getItem('username')
+        }
+        const res = await updateRequirementStatus(data)
+        if (res.code === 200) {
+          this.$refs.timeLine1.taskGetWorkFlow()
+          this.$refs.record.operationLogTask()
+          this.getRequirementById()
+          this.dialogStatusVisible = false
+          this.$message({ message: '修改成功', type: 'success', duration: 1000, offset: 150 })
+        }
+        return false
+      }
       const res = await updateRequirement(requirementInfo)
       if (res.code === 200) {
         this.dialogStatusVisible = false
@@ -553,7 +571,6 @@ export default {
         this.$refs.timeLine1.taskGetWorkFlow()
         this.$message({ message: '修改成功', type: 'success', duration: 1000, offset: 150 })
       }
-      this.getRequirementById()
     },
     // async showRequirementEnum() { // 获取需求状态列表,优先级列表,需求来源
     //   const res1 = await configShowRequireStatusEnum(localStorage.getItem('bizId'))
@@ -618,7 +635,7 @@ export default {
         }
         this.form_query.isDirectlyFromDpm === 1 ? this.toilp = this.form_query.relatedDpmRequirementInfo.requirementDisplayId + this.form_query.relatedDpmRequirementInfo.name : ''
         if (this.form_query.referredClientType !== null) {
-          if (this.form_query.referredClientType === -1) {
+          if (this.form_query.referredClientType === '-1') {
             this.form_query.dependOnRelease = 0
             this.form_query.referredClientType = [-1]
             this.form_query.referredClientTypes = []