Merge branch 'master' of http://pqmcc.com:3000/frontend/admin-sjzx

src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue

@@ -331,7 +331,7 @@ const elementHover = (element) => {
             <p>Elemet type: ${element.value.type}</p>
           </div>` // 默认值
     if (element.value.type === 'bpmn:StartEvent' && processInstance.value) {
-      html = `<p>发起人：${processInstance.value.startUser.nickname}</p>
+      html = `<p>发起人：${processInstance.value.startUser.name}</p>
                   <p>部门：${processInstance.value.startUser.deptName}</p>
                   <p>创建时间：${formatDate(processInstance.value.createTime)}`
     } else if (element.value.type === 'bpmn:UserTask') {
@@ -346,7 +346,7 @@ const elementHover = (element) => {
           dataResult = element.label
         }
       })
-      html = `<p>审批人：${task.assigneeUser.nickname}</p>
+      html = `<p>审批人：${task.assigneeUser.name}</p>
                   <p>部门：${task.assigneeUser.deptName}</p>
                   <p>结果：${dataResult}</p>
                   <p>创建时间：${formatDate(task.createTime)}</p>`

src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue

@@ -20,7 +20,7 @@
             label-position="right"
         >
             <el-form-item label="原因：" prop="reason">
-                <el-input v-model="form.reason" autocomplete="off" placeholder="请输入填报人" />
+                <el-input v-model="form.reason" autocomplete="off" placeholder="请输入原因" />
             </el-form-item>
         </el-form>
         <template #footer>

src/views/system/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue

@@ -1,8 +1,5 @@
 <template>
     <el-card v-loading="loading" class="box-card">
-        <template #header>
-            <span class="el-icon-picture-outline">流程图</span>
-        </template>
         <MyProcessViewer
             key="designer"
             :activityData="activityList"

src/views/system/bpm/processInstance/detail/index.vue

@@ -117,7 +117,6 @@
                 />
             </el-tab-pane>
             <el-tab-pane label="流程图" name="流程图">
-                高亮流程图
                 <ProcessInstanceBpmnViewer
                 ref="mapRef"
                     :id="`${id}`"