From debfdfff3a0fdc56b29899e6cc0a760cb3916cd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Wed, 11 Oct 2023 17:32:22 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93/=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/less/common.less                   |  62 ++++++++
 src/common/lang/workCenter/en.js              |   2 +
 src/common/lang/workCenter/zh.js              |   2 +
 .../StandardEntryOrChangeProcess.vue          | 148 +++++++-----------
 4 files changed, 121 insertions(+), 93 deletions(-)

diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index d6574767..4e6fb11f 100644
--- a/src/assets/less/common.less
+++ b/src/assets/less/common.less
@@ -839,3 +839,65 @@
   overflow: auto;
   padding: 32px;
 }
+
+.form-flex-box {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.form-flex-item-line {
+  width: 100%;
+}
+
+.form-flex-item {
+  width: calc(100% / 3);
+}
+
+.collapsible-panel-form {
+  margin-top: 20px;
+
+  &-header {
+    height: 56px;
+    line-height: 56px;
+    background: rgba(245, 245, 245, 0.6);
+    border-radius: 8px 8px 0 0;
+    border: 1px solid #E5E6EB;
+    padding: 0 20px;
+    font-size: 16px;
+    font-family: PingFang SC-Medium, PingFang SC, sans-serif;
+    font-weight: 600;
+    color: #1D2129;
+    display: flex;
+    justify-content: space-between;
+
+    .retractable-btn {
+      cursor: pointer;
+      font-size: 14px;
+      font-family: PingFang SC-Regular, PingFang SC, sans-serif;
+      color: @primary-color;
+    }
+
+    .anticon {
+      margin-right: 8px;
+    }
+
+    .pack-up-btn {
+      transform: rotate(-90deg);
+    }
+
+    .unfold-btn {
+      transform: rotate(90deg);
+    }
+  }
+
+  &-content {
+    border: 1px solid #E5E6EB;
+    border-top: none;
+    border-radius: 0 0 8px 8px;
+    padding: 20px;
+  }
+}
+
+.p-0 {
+  padding: 0;
+}
diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js
index 57cc6590..aa5b3da2 100644
--- a/src/common/lang/workCenter/en.js
+++ b/src/common/lang/workCenter/en.js
@@ -1,4 +1,6 @@
 module.exports = {
+  basicInformation: '基础信息',
+  personalInformation: '人员信息',
   // 新建流程页
   newProcess: {
     externalStandardsManagementProcess: '外部标准管理流程',
diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js
index 57cc6590..aa5b3da2 100644
--- a/src/common/lang/workCenter/zh.js
+++ b/src/common/lang/workCenter/zh.js
@@ -1,4 +1,6 @@
 module.exports = {
+  basicInformation: '基础信息',
+  personalInformation: '人员信息',
   // 新建流程页
   newProcess: {
     externalStandardsManagementProcess: '外部标准管理流程',
diff --git a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
index 79dc5152..17d62e59 100644
--- a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
+++ b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
@@ -3,17 +3,20 @@
     <!--  标题右侧tab  -->
     <template v-slot:titleRightCustom>
       <div class="table-operator-tab">
+        <!--基础信息-->
         <a class="switch-item" :class="switchValue === 'base' ? 'table-operator-tab-active' : ''"
-           @click="switchChange('base')">基础信息
+           @click="switchChange('base')">{{ $t('workCenter.basicInformation') }}
         </a>
+        <!--人员信息-->
         <a class="switch-item" :class="switchValue === 'user' ? 'table-operator-tab-active' : ''"
-           @click="switchChange('user')">人员信息
+           @click="switchChange('user')">{{ $t('workCenter.personalInformation') }}
         </a>
       </div>
     </template>
     <!--基本信息-->
-    <div class="scroll-content" v-show="switchValue === 'base'">
-      <div class="process-part-title">流程信息</div>
+    <div class="detail-page-scroll-content" v-show="switchValue === 'base'">
+      <!--流程信息-->
+      <div class="process-part-title">{{ $t('processInformation') }}</div>
       <a-form :form="processInfoForm">
         <a-row>
           <a-col :span="12">
@@ -48,7 +51,8 @@
         </a-form-item>
       </a-form>
 
-      <div class="process-part-title">业务基本信息</div>
+      <!--业务基本信息-->
+      <div class="process-part-title">{{ $t('basicServiceInformation') }}</div>
       <a-form-model :model="basicFormInfo" v-if="isFormInline" class="form-add" :rules="rules" ref="ruleForm">
         <template v-for="(val,index) in formList">
           <div :key="index"
@@ -244,7 +248,8 @@
         </template>
       </a-form-model>
 
-      <div class="process-part-title">流程审批信息</div>
+      <!--流程审批信息-->
+      <div class="process-part-title">{{ $t('processApprovalInformation') }}</div>
       <a-form :form="approvalInfoForm">
         <!--备注-->
         <a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('remarks')">
@@ -261,21 +266,30 @@
       </a-form>
     </div>
     <!--人员信息-->
-    <div class="scroll-content p-0" v-show="switchValue === 'user'">
+    <div class="detail-page-scroll-content p-0" v-show="switchValue === 'user'">
       <process-detail-list>
         <template #personnelInfo>
           <personnel-info :data="personalInfoData" />
         </template>
       </process-detail-list>
     </div>
-    <div class="bottom-operate-box">
-      <!--保存-->
-      <a-button type="primary" :loading="loading" @click="handleSave">{{ $t('preservation') }}</a-button>
-      <!--提交-->
-      <a-button type="primary" :loading="loading" @click="handleSubmit">{{ $t('submit') }}</a-button>
+    <div class="detail-page-bottom-operate-box">
+      <!--转办 审批节点存在-->
+      <a-button type="primary" :loading="loading" ghost icon="arrow-up" @click="handleTurnTo">{{ $t('turnTo') }}</a-button>
+      <!--保存 发起节点、审批节点都存在-->
+      <a-button type="primary" :loading="loading" ghost @click="handleSave"><i class="iconfont icon-save" />{{ $t('preservation') }}</a-button>
+      <!--提交 发起节点存在-->
+      <a-button type="primary" :loading="loading" @click="handleSubmit" icon="upload">{{ $t('submit') }}</a-button>
+      <!--同意 审批节点存在-->
+      <a-button type="primary" :loading="loading" icon="check-circle" @click="handleSubmit">{{ $t('agree') }}</a-button>
+      <!--驳回 审批节点存在-->
+      <a-button type="primary" :loading="loading" icon="close-circle" @click="handleSubmit">{{ $t('reject') }}</a-button>
     </div>
 
     <upload-file ref="uploadFile" @change="uploadFileChange" :return-url="false"></upload-file>
+
+    <!--转办选人-->
+    <user-select-modal ref="userSelectModal" @change="continueTurnTo" />
   </internal-detail-page>
 </template>
 
@@ -291,10 +305,20 @@ import StandardSelection from '../../../components/selection/StandardSelection.v
 import UploadFile from '../../../components/UploadFile.vue'
 import PersonnelInfo from '../../../components/PersonnelInfo.vue'
 import ProcessDetailList from '../../../components/ProcessDetailList.vue'
+import UserSelectModal from '../../../components/selection/UserSelectModal.vue'
 
 export default {
   name: 'StandardEntryOrChangeProcess',
-  components: { PersonnelInfo, UploadFile, StandardSelection, UserSelection, JMultipleDatePicker, InternalDetailPage, ProcessDetailList },
+  components: {
+    PersonnelInfo,
+    UploadFile,
+    StandardSelection,
+    UserSelection,
+    JMultipleDatePicker,
+    InternalDetailPage,
+    ProcessDetailList,
+    UserSelectModal
+  },
   data () {
     return {
       FieldType,
@@ -374,7 +398,7 @@ export default {
           nodeRoleName: '发起人主管级领导',
           canChoose: true,
           chooseType: 'radio'
-        },
+        }
         // {
         //   id: 5,
         //   nodeName: '发起人主管级上级领导审批',
@@ -592,98 +616,36 @@ export default {
     switchChange (value) {
       this.switchValue = value
     },
+    /**
+     * 保存
+     */
     handleSave () {
 
     },
+    /**
+     * 提交
+     */
     handleSubmit () {
 
+    },
+    /**
+     * 转办
+     */
+    handleTurnTo () {
+      this.$refs.userSelectModal.open()
+    },
+    continueTurnTo () {
+
     }
   }
 }
 </script>
 
 <style scoped lang="less">
+@import '~@assets/less/common.less';
+
 /deep/ .ant-form-item-children {
   width: 100%;
   display: inline-block;
 }
-
-.form-flex-box {
-  display: flex;
-  flex-wrap: wrap;
-}
-
-.form-flex-item-line {
-  width: 100%;
-}
-
-.collapsible-panel-form {
-  margin-top: 20px;
-
-  &-header {
-    height: 56px;
-    line-height: 56px;
-    background: rgba(245, 245, 245, 0.6);
-    border-radius: 8px 8px 0 0;
-    border: 1px solid #E5E6EB;
-    padding: 0 20px;
-    font-size: 16px;
-    font-family: PingFang SC-Medium, PingFang SC, sans-serif;
-    font-weight: 600;
-    color: #1D2129;
-    display: flex;
-    justify-content: space-between;
-
-    .retractable-btn {
-      cursor: pointer;
-      font-size: 14px;
-      font-family: PingFang SC-Regular, PingFang SC, sans-serif;
-      color: @primary-color;
-    }
-
-    .anticon {
-      margin-right: 8px;
-    }
-
-    .pack-up-btn {
-      transform: rotate(-90deg);
-    }
-
-    .unfold-btn {
-      transform: rotate(90deg);
-    }
-  }
-
-  &-content {
-    border: 1px solid #E5E6EB;
-    border-top: none;
-    border-radius: 0 0 8px 8px;
-    padding: 20px;
-  }
-}
-
-.form-flex-item {
-  width: calc(100% / 3);
-}
-
-.bottom-operate-box {
-  height: 52px;
-  padding: 10px 32px;
-  text-align: right;
-
-  .ant-btn {
-    margin-left: 15px;
-  }
-}
-
-.scroll-content {
-  height: calc(100% - 52px);
-  box-sizing: border-box;
-  overflow: auto;
-  padding: 32px;
-}
-
-.p-0 {
-  padding: 0;
-}
 </style>