From 72704cdea3cdc7afbd64cfe29dfc564a22e11567 Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Mon, 27 Mar 2023 18:40:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=B8=B8=E7=94=A8=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/workFlow/components/FlowBox.vue | 97 ++++++++++---------
 1 file changed, 50 insertions(+), 47 deletions(-)

diff --git a/SC-web/src/views/workFlow/components/FlowBox.vue b/SC-web/src/views/workFlow/components/FlowBox.vue
index 43420935..af1ac471 100644
--- a/SC-web/src/views/workFlow/components/FlowBox.vue
+++ b/SC-web/src/views/workFlow/components/FlowBox.vue
@@ -4,90 +4,87 @@
       <div class="JNPF-common-page-header">
         <el-page-header @back="goBack" :content="title" />
         <div class="options">
-          <el-button type="primary" @click="addComment" v-if="activeTab==='comment'">评 论</el-button>
-          <template v-if="setting.opType!=4&&setting.id">
-            <el-button type="primary" @click="printBrowseVisible=true"
+          <el-button type="primary" @click="addComment" v-if="activeTab === 'comment'">评 论</el-button>
+          <template v-if="setting.opType != 4 && setting.id">
+            <el-button type="primary" @click="printBrowseVisible = true"
               v-if="properties.hasPrintBtn && properties.printId">
-              {{properties.printBtnText||'打 印'}}</el-button>
+              {{ properties.printBtnText || '打 印' }}</el-button>
           </template>
-          <template v-if="setting.opType=='-1'">
+          <template v-if="setting.opType == '-1'">
             <el-button type="primary" @click="eventLauncher('submit')" :loading="candidateLoading"
-              :disabled="allBtnDisabled">{{properties.submitBtnText||'提 交'}}</el-button>
+              :disabled="allBtnDisabled">{{ properties.submitBtnText || '提 交' }}</el-button>
             <el-button type="warning" @click="eventLauncher('save')" :loading="btnLoading"
-              :disabled="allBtnDisabled">{{properties.saveBtnText||'暂 存'}}</el-button>
+              :disabled="allBtnDisabled">{{ properties.saveBtnText || '暂 存' }}</el-button>
           </template>
           <template v-if="setting.opType == 1">
             <el-button type="warning" @click="openUserBox('transfer')"
-              v-if="properties.hasTransferBtn">{{properties.transferBtnText||'转 审'}}</el-button>
+              v-if="properties.hasTransferBtn">{{ properties.transferBtnText || '转 审' }}</el-button>
             <el-button type="primary" @click="eventLauncher('audit')" :loading="candidateLoading"
-              v-if="properties.hasAuditBtn">{{properties.auditBtnText||'通 过'}}</el-button>
-            <el-button type="warning" @click="eventLauncher('saveAudit')"
-              v-if="properties.hasSaveBtn" :loading="btnLoading">{{properties.saveBtnText||'暂 存'}}
+              v-if="properties.hasAuditBtn">{{ properties.auditBtnText || '通 过' }}</el-button>
+            <el-button type="warning" @click="eventLauncher('saveAudit')" v-if="properties.hasSaveBtn"
+              :loading="btnLoading">{{ properties.saveBtnText || '暂 存' }}
             </el-button>
-            <el-button type="danger" @click="eventReceiver({},'reject')"
-              v-if="properties.hasRejectBtn">
-              {{properties.rejectBtnText||'拒 绝'}}</el-button>
+            <el-button type="danger" @click="eventReceiver({}, 'reject')" v-if="properties.hasRejectBtn">
+              {{ properties.rejectBtnText || '拒 绝' }}</el-button>
           </template>
           <template v-if="setting.opType == 0 && setting.status == 1">
             <el-button type="primary" @click="press()"
-              v-if="properties.hasPressBtn || properties.hasPressBtn===undefined">
-              {{properties.pressBtnText||'催 办'}}</el-button>
+              v-if="properties.hasPressBtn || properties.hasPressBtn === undefined">
+              {{ properties.pressBtnText || '催 办' }}</el-button>
             <el-button type="danger" @click="revoke()"
-              v-if="properties.hasRevokeBtn || properties.hasRevokeBtn===undefined">
-              {{properties.revokeBtnText||'撤 回'}}</el-button>
+              v-if="properties.hasRevokeBtn || properties.hasRevokeBtn === undefined">
+              {{ properties.revokeBtnText || '撤 回' }}</el-button>
           </template>
           <el-button type="danger" v-if="setting.opType == 2 && properties.hasRevokeBtn"
-            @click="recall()">{{properties.revokeBtnText||'撤 回'}}</el-button>
+            @click="recall()">{{ properties.revokeBtnText || '撤 回' }}</el-button>
           <template v-if="setting.opType == 4">
-            <el-button type="primary" @click="openAssignBox" v-if="setting.status ==1">指 派
+            <el-button type="primary" @click="openAssignBox" v-if="setting.status == 1">指 派
             </el-button>
-            <el-button type="danger" v-if="setting.status != 2 && setting.status != 5"
-              @click="cancel()">终 止</el-button>
+            <el-button type="danger" v-if="setting.status != 2 && setting.status != 5" @click="cancel()">终 止</el-button>
           </template>
           <el-button @click="goBack()" v-if="!setting.hideCancelBtn" :disabled="allBtnDisabled">
-            {{$t('common.cancelButton')}}
+            {{ $t('common.cancelButton') }}
           </el-button>
         </div>
       </div>
-      <div class="approve-result" v-if="(setting.opType==0||setting.opType==4) && activeTab==='0'">
+      <div class="approve-result" v-if="(setting.opType == 0 || setting.opType == 4) && activeTab === '0'">
         <div class="approve-result-img" :class="flowTaskInfo.status | flowStatus()"></div>
       </div>
       <el-tabs class="JNPF-el_tabs" v-model="activeTab">
         <el-tab-pane label="表单信息" v-loading="loading">
-          <component :is="currentView" @close="goBack" ref="form" @eventReceiver="eventReceiver"
-            @setLoad="setLoad" @setCandidateLoad="setCandidateLoad" @setPageLoad="setPageLoad" />
+          <component :is="currentView" @close="goBack" ref="form" @eventReceiver="eventReceiver" @setLoad="setLoad"
+            @setCandidateLoad="setCandidateLoad" @setPageLoad="setPageLoad" />
         </el-tab-pane>
         <el-tab-pane label="流程信息" v-loading="loading">
           <Process :conf="flowTemplateJson" v-if="flowTemplateJson.nodeId" />
         </el-tab-pane>
-        <el-tab-pane label="流转记录" v-if="setting.opType!='-1'" v-loading="loading">
+        <el-tab-pane label="流转记录" v-if="setting.opType != '-1'" v-loading="loading">
           <recordList :list='flowTaskOperatorRecordList' :endTime='endTime' />
         </el-tab-pane>
-        <el-tab-pane label="审批汇总" v-if="setting.opType!='-1' && isSummary" v-loading="loading"
-          name="recordSummary">
+        <el-tab-pane label="审批汇总" v-if="setting.opType != '-1' && isSummary" v-loading="loading" name="recordSummary">
           <RecordSummary :id='setting.id' :summaryType="summaryType" ref="recordSummary" />
         </el-tab-pane>
-        <el-tab-pane label="流程评论" v-if="setting.opType!='-1' && isComment" v-loading="loading"
-          name="comment">
+        <el-tab-pane label="流程评论" v-if="setting.opType != '-1' && isComment" v-loading="loading" name="comment">
           <Comment :id='setting.id' ref="comment" />
         </el-tab-pane>
       </el-tabs>
-      <el-dialog :title="eventType==='audit'?'审批通过':'审批拒绝'" :close-on-click-modal="false"
-        :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll append-to-body
-        width='600px'>
+      <el-dialog :title="eventType === 'audit' ? '审批通过' : '审批拒绝'" :close-on-click-modal="false" :visible.sync="visible"
+        class="JNPF-dialog JNPF-dialog_center" lock-scroll append-to-body width='600px'>
         <el-form label-width="80px" ref="candidateForm" :model="candidateForm">
-          <template v-if="eventType==='audit'">
-            <el-form-item :label="item.nodeName+item.label" :prop="'candidateList.' + i + '.value'"
-              v-for="(item,i) in candidateForm.candidateList" :key="i" :rules="item.rules">
-              <candidate-user-select v-model="item.value" multiple :placeholder="'请选择'+item.label"
+          <template v-if="eventType === 'audit'">
+            <el-form-item :label="item.nodeName + item.label" :prop="'candidateList.' + i + '.value'"
+              v-for="(item, i) in candidateForm.candidateList" :key="i" :rules="item.rules">
+              <candidate-user-select v-model="item.value" multiple :placeholder="'请选择' + item.label"
                 :taskId="setting.taskId" :formData="formData" :nodeId="item.nodeId" />
             </el-form-item>
           </template>
-          <el-form-item label="加签人员" v-if="eventType==='audit'&& properties.hasFreeApprover">
+          <el-form-item label="加签人员" v-if="eventType === 'audit' && properties.hasFreeApprover">
             <user-select v-model="handleId" placeholder="请选择加签人员,不选即该节点审核结束" />
           </el-form-item>
           <el-form-item label="审批意见">
             <el-input v-model="reason" placeholder="请输入审批意见（选填）" type="textarea" :rows="4" />
+            <el-radio v-model="reason" label="同意">同意</el-radio>
+            <el-radio v-model="reason" label="不同意">不同意</el-radio>
           </el-form-item>
           <el-form-item label="审批签名" v-if="properties.hasSign">
             <div class="sign-main">
@@ -95,8 +92,7 @@
                 <div class="sign-tip">请在这里输入你的签名</div>
                 <div class="sign-action">
                   <el-button class="clear-btn" size="mini" @click="handleReset">清空</el-button>
-                  <el-button class="sure-btn" size="mini" @click="handleGenerate"
-                    :disabled="!!signImg">确定签名</el-button>
+                  <el-button class="sure-btn" size="mini" @click="handleGenerate" :disabled="!!signImg">确定签名</el-button>
                 </div>
               </div>
               <div class="sign-box">
@@ -110,9 +106,9 @@
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
-          <el-button @click="visible = false">{{$t('common.cancelButton')}}</el-button>
+          <el-button @click="visible = false">{{ $t('common.cancelButton') }}</el-button>
           <el-button type="primary" @click="handleApproval()" :loading="approvalBtnLoading">
-            {{$t('common.confirmButton')}}
+            {{ $t('common.confirmButton') }}
           </el-button>
         </span>
       </el-dialog>
@@ -130,16 +126,16 @@
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
-          <el-button @click="assignVisible = false">{{$t('common.cancelButton')}}</el-button>
-          <el-button type="primary" @click="handleAssign()">{{$t('common.confirmButton')}}
+          <el-button @click="assignVisible = false">{{ $t('common.cancelButton') }}</el-button>
+          <el-button type="primary" @click="handleAssign()">{{ $t('common.confirmButton') }}
           </el-button>
         </span>
       </el-dialog>
       <UserBox v-if="userBoxVisible" ref="userBox" :title="userBoxTitle" @submit="handleTransfer" />
       <print-browse :visible.sync="printBrowseVisible" :id="properties.printId" :formId="setting.id"
         :fullName="setting.fullName" />
-      <candidate-form :visible.sync="candidateVisible" :candidateList="candidateList"
-        :taskId="setting.taskId" :formData="formData" @submitCandidate="submitCandidate" />
+      <candidate-form :visible.sync="candidateVisible" :candidateList="candidateList" :taskId="setting.taskId"
+        :formData="formData" @submitCandidate="submitCandidate" />
     </div>
   </transition>
 </template>
@@ -656,33 +652,40 @@ export default {
   border: 1px solid #dcdfe6;
   border-radius: 4px;
   overflow: hidden;
+
   .sign-head {
     display: flex;
     justify-content: space-between;
     align-items: center;
     padding: 8px;
     border-bottom: 1px solid #dcdfe6;
+
     .sign-tip {
       color: #a5a5a5;
       font-size: 12px;
     }
+
     .sign-action {
       display: flex;
       align-items: center;
+
       .clear-btn,
       .sure-btn {
         margin-left: 5px;
       }
     }
   }
+
   .sign-box {
     border-top: 0;
     height: 100px;
   }
+
   .sign-img {
     width: 100%;
   }
 }
+
 .flow-form-main {
   .JNPF-el_tabs {
     overflow: hidden;