From 32bb4068227038f637d47baf67c4e045c1e543f1 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Tue, 27 Feb 2024 17:04:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85-=E6=9F=A5=E7=9C=8B=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9D=83=E9=99=90=E6=B2=A1=E6=9C=89=E7=94=9F?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1097114266861568]工单详情-查看节点信息权限没有生效 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1097114266861568
---
 .../workorder/taskstep/step-overview.vue      | 239 +++++++++---------
 1 file changed, 121 insertions(+), 118 deletions(-)

diff --git a/src/views/pages/process/task/processdetail/workorder/taskstep/step-overview.vue b/src/views/pages/process/task/processdetail/workorder/taskstep/step-overview.vue
index 648135e7..f4d4a17c 100644
--- a/src/views/pages/process/task/processdetail/workorder/taskstep/step-overview.vue
+++ b/src/views/pages/process/task/processdetail/workorder/taskstep/step-overview.vue
@@ -75,139 +75,140 @@
             </ButtonGroup>
           </div>
           <div v-show="item.expand">
-            <div v-show="!item.isShow" class="step-comment" :class="!isTabShow(item) ? 'mt-md' : '' ">
-              <div v-if="item.handler == 'autoexec' && item.handlerStepInfo" class="sub-description border-color">
-                <JobDetail :handlerStepInfo="item.handlerStepInfo"></JobDetail>
-              </div>
-              <div v-else class="description step-auditList">
-                <stepitems
-                  :is="getSteptype(item)"
-                  :item="item"
-                ></stepitems>
+            <div v-if="item.isView == 1">
+              <div v-show="!item.isShow" class="step-comment" :class="!isTabShow(item) ? 'mt-md' : '' ">
+                <div v-if="item.handler == 'autoexec' && item.handlerStepInfo" class="sub-description border-color">
+                  <JobDetail :handlerStepInfo="item.handlerStepInfo"></JobDetail>
+                </div>
+                <div v-else class="description step-auditList">
+                  <stepitems
+                    :is="getSteptype(item)"
+                    :item="item"
+                  ></stepitems>
+                </div>
               </div>
-            </div>
-            <!-- 子任务策略节点 -->
-            <div v-show="item.isShow == 1" class="sub-description border-color padding" :class="!isTabShow(item) ? 'mt-md' : '' ">
-              <div v-if="item.taskConfigList && getTaskConfigList(item.taskConfigList).length > 0">
-                <Tabs                  
-                  class="block-span"
-                  :animated="false"
-                  name="tab2"
-                >
-                  <TabPane      
-                    v-for="subStep in getTaskConfigList(item.taskConfigList)"
-                    :key="subStep.id"   
-                    :label="subStep.name"
-                    :name="'subTask' + subStep.id"
-                    tab="tab2"
+              <!-- 子任务策略节点 -->
+              <div v-show="item.isShow == 1" class="sub-description border-color padding" :class="!isTabShow(item) ? 'mt-md' : '' ">
+                <div v-if="item.taskConfigList && getTaskConfigList(item.taskConfigList).length > 0">
+                  <Tabs                  
+                    class="block-span"
+                    :animated="false"
+                    name="tab2"
                   >
-                    <StrategyDetailReadonly
-                      :processTaskId="processTaskId"
-                      :processTaskStepId="processTaskStepId"
-                      :config="subStep"
-                    ></StrategyDetailReadonly>
-                  </TabPane>
-                </Tabs>
+                    <TabPane      
+                      v-for="subStep in getTaskConfigList(item.taskConfigList)"
+                      :key="subStep.id"   
+                      :label="subStep.name"
+                      :name="'subTask' + subStep.id"
+                      tab="tab2"
+                    >
+                      <StrategyDetailReadonly
+                        :processTaskId="processTaskId"
+                        :processTaskStepId="processTaskStepId"
+                        :config="subStep"
+                      ></StrategyDetailReadonly>
+                    </TabPane>
+                  </Tabs>
+                </div>
               </div>
-            </div>
-            <div v-show="item.isShow == 2" class="sub-description border-color pb-sm" :class="!isTabShow(item) ? 'mt-md' : '' ">
-              <div v-if="item.handlerStepInfo && item.handlerStepInfo.changeStepList && item.handlerStepInfo.changeStepList.length>0">
-                <div v-for="change in item.handlerStepInfo.changeStepList" :key="change.id" class="step-auditList sub-list dividing-color">
-                  <div class="padding">
-                    <div class="pb-sm flex-between">
-                      <div>
-                        <span class="step-handler-icon" :class="item.handler =='changecreate'?'tsfont-addchange':'tsfont-changing'"></span>
-                        <span>{{ change.name }}</span>
-                        <span class="text-grey">.{{ change.code }}</span>
+              <div v-show="item.isShow == 2" class="sub-description border-color pb-sm" :class="!isTabShow(item) ? 'mt-md' : '' ">
+                <div v-if="item.handlerStepInfo && item.handlerStepInfo.changeStepList && item.handlerStepInfo.changeStepList.length>0">
+                  <div v-for="change in item.handlerStepInfo.changeStepList" :key="change.id" class="step-auditList sub-list dividing-color">
+                    <div class="padding">
+                      <div class="pb-sm flex-between">
+                        <div>
+                          <span class="step-handler-icon" :class="item.handler =='changecreate'?'tsfont-addchange':'tsfont-changing'"></span>
+                          <span>{{ change.name }}</span>
+                          <span class="text-grey">.{{ change.code }}</span>
+                        </div>
+                        <CommonStatus
+                          v-if="change.statusVo"
+                          :statusName="change.statusVo.text"
+                          :statusValue="change.statusVo.status"
+                        ></CommonStatus>
                       </div>
-                      <CommonStatus
-                        v-if="change.statusVo"
-                        :statusName="change.statusVo.text"
-                        :statusValue="change.statusVo.status"
-                      ></CommonStatus>
-                    </div>
-                    <div class="step-infor">
-                      <TsRow>
-                        <Col span="8">
-                          <span class="text-grey pr-sm">{{ $t('term.process.dealwithuser') }}</span>
-                          <span>
-                            <UserCard v-bind="change.workerVo" style="display: inline-block;" hideAvatar></UserCard>
-                          </span>
-                        </Col>
-                        <Col span="8">
-                          <span class="text-grey pr-sm">{{ $t('term.process.planstartdate') }}</span>
-                          <span>{{ change.planStartDate || '-' }}</span>
-                        </Col>
-                        <Col span="8">
-                          <span class="text-grey pr-sm">{{ $t('term.process.startTimeWindow') }}</span>
-                          <span v-if="change.startTimeWindow || change.endTimeWindow">{{ change.startTimeWindow || '~' }} - {{ change.endTimeWindow || '~' }}</span>
-                          <span v-else>-</span>
-                        </Col>
-                      </TsRow>
-                      <TsRow>
-                        <Col span="8">
-                          <span class="text-grey pr-sm">{{ $t('term.process.actualstarttime') }}</span>
-                          <span v-if="change.startTime">{{ change.startTime | formatDate }}</span>
-                          <span v-else>-</span>
-                        </Col>
-                        <Col span="8">
-                          <span class="text-grey pr-sm">{{ $t('term.process.actualendtime') }}</span>
-                          <span v-if="change.endTime">{{ change.endTime | formatDate }}</span>
-                          <span v-else>-</span>
-                        </Col>
-                      </TsRow>
-                      <div class="change-commet">
-                        <span class="change-commet-label text-grey pr-sm">{{ $t('page.accessory') }}</span>
-                        <div v-if="change.fileList && change.fileList.length>0">
-                          <div
-                            v-for="changeFile in change.fileList"
-                            :key="changeFile.id"
-                            v-download="downurl('/api/binary/file/download',changeFile.id)"
-                            class="text-action"
-                          >
-                            {{ changeFile.name }}
-                            <i class="tsfont-download text-padding"></i>
+                      <div class="step-infor">
+                        <TsRow>
+                          <Col span="8">
+                            <span class="text-grey pr-sm">{{ $t('term.process.dealwithuser') }}</span>
+                            <span>
+                              <UserCard v-bind="change.workerVo" style="display: inline-block;" hideAvatar></UserCard>
+                            </span>
+                          </Col>
+                          <Col span="8">
+                            <span class="text-grey pr-sm">{{ $t('term.process.planstartdate') }}</span>
+                            <span>{{ change.planStartDate || '-' }}</span>
+                          </Col>
+                          <Col span="8">
+                            <span class="text-grey pr-sm">{{ $t('term.process.startTimeWindow') }}</span>
+                            <span v-if="change.startTimeWindow || change.endTimeWindow">{{ change.startTimeWindow || '~' }} - {{ change.endTimeWindow || '~' }}</span>
+                            <span v-else>-</span>
+                          </Col>
+                        </TsRow>
+                        <TsRow>
+                          <Col span="8">
+                            <span class="text-grey pr-sm">{{ $t('term.process.actualstarttime') }}</span>
+                            <span v-if="change.startTime">{{ change.startTime | formatDate }}</span>
+                            <span v-else>-</span>
+                          </Col>
+                          <Col span="8">
+                            <span class="text-grey pr-sm">{{ $t('term.process.actualendtime') }}</span>
+                            <span v-if="change.endTime">{{ change.endTime | formatDate }}</span>
+                            <span v-else>-</span>
+                          </Col>
+                        </TsRow>
+                        <div class="change-commet">
+                          <span class="change-commet-label text-grey pr-sm">{{ $t('page.accessory') }}</span>
+                          <div v-if="change.fileList && change.fileList.length>0">
+                            <div
+                              v-for="changeFile in change.fileList"
+                              :key="changeFile.id"
+                              v-download="downurl('/api/binary/file/download',changeFile.id)"
+                              class="text-action"
+                            >
+                              {{ changeFile.name }}
+                              <i class="tsfont-download text-padding"></i>
+                            </div>
                           </div>
+                          <div v-else>-</div>
                         </div>
-                        <div v-else>-</div>
-                      </div>
-                      <div class="change-commet">
-                        <span class="change-commet-label text-grey pr-sm">{{ $t('page.description') }}</span>
-                        <div v-if="change.content">
-                          <div v-html="change.content"></div>
+                        <div class="change-commet">
+                          <span class="change-commet-label text-grey pr-sm">{{ $t('page.description') }}</span>
+                          <div v-if="change.content">
+                            <div v-html="change.content"></div>
+                          </div>
+                          <div v-else>-</div>
                         </div>
-                        <div v-else>-</div>
                       </div>
                     </div>
-                  </div>
 
-                  <div class="ml-40">
-                    <Timeline>
-                      <TimelineItem
-                        v-for="scomment in change.commentList"
-                        :key="scomment.id"
-                        class="comment-list"
-                      >
-                        <div class="avatar-date-box ">
-                          <div class="avatar-box inb pb-xs">
-                            <UserCard v-bind="scomment.fcuVo" class="user-name parent" hideAvatar></UserCard>
-                            <UserCard
-                              v-bind="scomment.fcuVo"
-                              class="avatar child-avatar"
-                              :iconSize="24"
-                              hideName
-                            ></UserCard>
+                    <div class="ml-40">
+                      <Timeline>
+                        <TimelineItem
+                          v-for="scomment in change.commentList"
+                          :key="scomment.id"
+                          class="comment-list"
+                        >
+                          <div class="avatar-date-box ">
+                            <div class="avatar-box inb pb-xs">
+                              <UserCard v-bind="scomment.fcuVo" class="user-name parent" hideAvatar></UserCard>
+                              <UserCard
+                                v-bind="scomment.fcuVo"
+                                class="avatar child-avatar"
+                                :iconSize="24"
+                                hideName
+                              ></UserCard>
+                            </div>
+                            <div class="text-grey ml-md inb">{{ scomment.fcd | formatDate }}</div>
                           </div>
-                          <div class="text-grey ml-md inb">{{ scomment.fcd | formatDate }}</div>
-                        </div>
-                        <div style="margin-left:20px;" v-html="scomment.content"></div>
-                      </TimelineItem>
-                    </Timeline>
+                          <div style="margin-left:20px;" v-html="scomment.content"></div>
+                        </TimelineItem>
+                      </Timeline>
+                    </div>
                   </div>
                 </div>
               </div>
             </div>
-          
           </div>
         </TimelineItem>
       </Timeline>
@@ -339,11 +340,13 @@ export default {
     hasUnassigned() {
       // 是否有分配处理人
       return (item) => {
+        console.log(item.isView, 'item.isView');
         let hasHandlerMan = false;
         if (((item.majorUser && item.majorUser.userVo) || (item.workerList && item.workerList.length == 1)) || item.isView != 1) {
           // 没有分配处理或者没有当前步骤查看权限时
           hasHandlerMan = true;
         }
+        console.log(hasHandlerMan, 'hasHandlerMan');
         return hasHandlerMan;
       };
     }
-- 
Gitee


From b235015348efb332582509be4b1bca3e3f440155 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Tue, 27 Feb 2024 17:06:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85-=E6=9F=A5=E7=9C=8B=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9D=83=E9=99=90=E6=B2=A1=E6=9C=89=E7=94=9F?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1097114266861568]工单详情-查看节点信息权限没有生效 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1097114266861568
---
 .../task/processdetail/workorder/taskstep/step-overview.vue     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/pages/process/task/processdetail/workorder/taskstep/step-overview.vue b/src/views/pages/process/task/processdetail/workorder/taskstep/step-overview.vue
index f4d4a17c..3f3783f8 100644
--- a/src/views/pages/process/task/processdetail/workorder/taskstep/step-overview.vue
+++ b/src/views/pages/process/task/processdetail/workorder/taskstep/step-overview.vue
@@ -340,13 +340,11 @@ export default {
     hasUnassigned() {
       // 是否有分配处理人
       return (item) => {
-        console.log(item.isView, 'item.isView');
         let hasHandlerMan = false;
         if (((item.majorUser && item.majorUser.userVo) || (item.workerList && item.workerList.length == 1)) || item.isView != 1) {
           // 没有分配处理或者没有当前步骤查看权限时
           hasHandlerMan = true;
         }
-        console.log(hasHandlerMan, 'hasHandlerMan');
         return hasHandlerMan;
       };
     }
-- 
Gitee