Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -303,7 +303,7 @@
                   <h4>标准法规部人员</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="选择标准法规部人员" @click.native="choiceZRR('dockUser', '选择标准法规部人员', roleForm.dockUser)">
+                    <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="选择标准法规部人员">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -351,7 +351,7 @@
                   <h4>总院技术委员会主任</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="选择总院技术委员会主任" @click.native="choiceZRROne('startUser', '选择总院技术委员会主任', roleForm.startUser)">
+                    <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="选择总院技术委员会主任">
                     </el-input>
                   </div>
                 </el-form-item>

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue

@@ -68,7 +68,10 @@
                 <el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
                   <span v-if="infoSourcesLength === 0">{{ '-' }}</span>
                   <span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
-                    {{ item.name }} {{ ';' }}
+                    <a v-if="item.name.length > 30">
+                      {{ item.name.slice(0,30) + '...' }} {{ ';' }}
+                    </a>
+                    <a v-else>{{ item.name }} {{ ';' }}</a>
                    </span>
                 </el-form-item>
               </el-col>
@@ -256,7 +259,8 @@ export default {
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
 
-      infoSourcesLength: ''
+      infoSourcesLength: '',
+      showHover: false
     }
   },
   computed: {
@@ -463,6 +467,20 @@ export default {
     /deep/ .el-table th {
       padding: 0px;
     }
+
+    .hover_container{
+      width: 50%;
+      color: #fff;
+      background-color: #8b8c89;
+      border: 1px solid #ccc;
+      border-radius: 8px;
+      text-align: center;
+      line-height: 20px;
+      position: absolute;
+      left: 50px;
+      z-index: 99;
+      transform: translateY(-88%);
+    }
   }
 }
 </style>

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue

@@ -68,7 +68,10 @@
                 <el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
                   <span v-if="infoSourcesLength < 1">{{ '-' }}</span>
                   <span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
-                    {{ item.name }} {{ ';' }}
+                    <a v-if="item.name.length > 30">
+                      {{ item.name.slice(0,30) + '...' }} {{ ';' }}
+                    </a>
+                    <a v-else>{{ item.name }} {{ ';' }}</a>
                    </span>
                 </el-form-item>
               </el-col>

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue

@@ -68,7 +68,10 @@
                 <el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
                   <span v-if="infoSourcesLength === 0">{{ '-' }}</span>
                   <span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
-                    {{ item.name }} {{ ';' }}
+                    <a v-if="item.name.length > 30">
+                      {{ item.name.slice(0,30) + '...' }} {{ ';' }}
+                    </a>
+                    <a v-else>{{ item.name }} {{ ';' }}</a>
                    </span>
                 </el-form-item>
               </el-col>

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue

@@ -68,7 +68,10 @@
                 <el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
                   <span v-if="infoSourcesLength === 0">{{ '-' }}</span>
                   <span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
-                    {{ item.name }} {{ ';' }}
+                    <a v-if="item.name.length > 30">
+                      {{ item.name.slice(0,30) + '...' }} {{ ';' }}
+                    </a>
+                    <a v-else>{{ item.name }} {{ ';' }}</a>
                    </span>
                 </el-form-item>
               </el-col>

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue

@@ -68,7 +68,10 @@
                 <el-form-item  class="add-form-item"  label="信息来源:" prop="infoSources">
                   <span v-if="infoSourcesLength < 1">{{ '-' }}</span>
                   <span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
-                    {{ item.name }} {{ ';'}}
+                    <a v-if="item.name.length > 30">
+                      {{ item.name.slice(0,30) + '...' }} {{ ';' }}
+                    </a>
+                    <a v-else>{{ item.name }} {{ ';' }}</a>
                    </span>
                 </el-form-item>
               </el-col>

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue

@@ -71,7 +71,10 @@
                 <el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
                   <span v-if="infoSourcesLength < 1">{{ '-' }}</span>
                   <span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
-                    {{ item.name }} {{ ';' }}
+                   <a v-if="item.name.length > 30">
+                      {{ item.name.slice(0,30) + '...' }} {{ ';' }}
+                    </a>
+                    <a v-else>{{ item.name }} {{ ';' }}</a>
                    </span>
                 </el-form-item>
               </el-col>

src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue

@@ -625,6 +625,8 @@ export default {
               })
             }
           })
+        } else {
+          this.$message.warning('请完成流程信息的人员选择')
         }
       })
     }

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -645,6 +645,8 @@ export default {
                   this.isSubmit = false
                 })
               })
+            } else {
+              this.$message.warning('请完成流程信息的人员选择')
             }
           })
         }