From 00ec9138c5ebd2669642646a063da696092c0438 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 30 Nov 2023 17:09:22 +0800
Subject: [PATCH 1/6] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[10210435257794?=
 =?UTF-8?q?56]OEA=E5=AE=A1=E6=89=B9=E6=A8=A1=E6=9D=BF=20http://192.168.0.9?=
 =?UTF-8?q?6:8090/demo/rdm.html#/story-detail/939050947543040/939050947543?=
 =?UTF-8?q?042/1021043525779456?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PoptipSelect/PoptipSelect.vue  |  37 ++-
 .../pages/process/eoa/eoa-template-edit.vue   | 268 ++++++++++++++++++
 .../pages/process/eoa/eoa-template-manage.vue |  98 +++++++
 src/views/pages/process/router.js             |  32 ++-
 4 files changed, 418 insertions(+), 17 deletions(-)
 create mode 100644 src/views/pages/process/eoa/eoa-template-edit.vue
 create mode 100644 src/views/pages/process/eoa/eoa-template-manage.vue

diff --git a/src/resources/components/PoptipSelect/PoptipSelect.vue b/src/resources/components/PoptipSelect/PoptipSelect.vue
index f09fb4325..1e031cb06 100644
--- a/src/resources/components/PoptipSelect/PoptipSelect.vue
+++ b/src/resources/components/PoptipSelect/PoptipSelect.vue
@@ -13,8 +13,8 @@
         ref="pop"
         v-model="isshow"
         :trigger="trigger"
-        :width="popWidth"
-        placement="bottom-start"
+        :width="updateWidth()"
+        :placement="placement"
         transfer
         class="select-poptip"
       >
@@ -134,13 +134,20 @@ export default {
       default() {
         return this.$t('page.pleaseselect');
       }
+    },
+    placement: {
+      type: String,
+      default: 'bottom-start'
+    },
+    popWidth: {
+      type: Number,
+      default: 400
     }
   },
   data() {
     return {
       isshow: false,
       selectValue: '',
-      popWidth: 460,
       iconConfig: {
         text: 'tsfont-forminput', //文本输入
         password: 'tsfont-lock', //密码
@@ -166,9 +173,7 @@ export default {
   beforeCreate() {},
   created() {},
   beforeMount() {},
-  mounted() {
-    this.updatePosition();
-  },
+  mounted() {},
   beforeUpdate() {},
   updated() {},
   activated() {},
@@ -194,14 +199,6 @@ export default {
       }
       this.isshow = false;
     },
-    updatePosition() {
-      if (this.$el) {
-        let width = this.$el.querySelector('.type-select').clientWidth;
-        if (width > this.popWidth) {
-          this.popWidth = width;
-        }
-      }
-    },
     handleKeydown(e) {
       //切tab的时候隐藏
       if (e.key == 'Tab' && e.type == 'keydown') {
@@ -252,6 +249,18 @@ export default {
         resultJson.width = _this.width;
       }
       return resultJson;
+    },
+    updateWidth() {
+      return () => {
+        let width = this.popWidth;
+        if (this.$el) {
+          let clientWidth = this.$el.querySelector('.type-select').clientWidth;
+          if (clientWidth > width) {
+            width = clientWidth;
+          }
+        }
+        return width;
+      };
     }
   },
   watch: {
diff --git a/src/views/pages/process/eoa/eoa-template-edit.vue b/src/views/pages/process/eoa/eoa-template-edit.vue
new file mode 100644
index 000000000..494cb5960
--- /dev/null
+++ b/src/views/pages/process/eoa/eoa-template-edit.vue
@@ -0,0 +1,268 @@
+<template>
+  <div>
+    <TsContain>
+      <template v-slot:navigation>
+        <span class="tsfont-left text-action" @click="gotoManage()">{{ $t('page.back') }}</span>
+      </template>
+      <template v-slot:topLeft>
+        <div>
+          <span>修改人</span>
+          <span>时间</span>
+        </div>
+      </template>
+      <template v-slot:topRight>
+        <div class="action-group">
+          <div class="action-item" @click="deleteTemplate()">
+            <span class="tsfont-trash-o">{{ $t('page.delete') }}</span>
+          </div>
+          <div class="action-item" @click="saveTemplate()">
+            <Button type="primary" :disabled="saving">{{ $t('page.save') }}</Button>
+          </div>
+        </div>
+      </template>
+      <template v-slot:content>
+        <div>
+          <TsForm
+            :itemList="formConfig"
+          >
+            <template v-slot:flow>
+              <div class="eoa-flow">
+                <div class="step-list bg-op radius-sm mb-nm">
+                  <div class="pl-nm pr-nm flex-between">
+                    <div>#1</div>
+                    <div class="action-icon text-action" :class="isShow?'tsfont-down':'tsfont-up'" @click="isShow = !isShow"></div>
+                  </div>
+                  <div v-show="isShow" class="step-content border-color">
+                    <TsFormItem label="步骤名称" required>
+                      <div>创建签报</div>
+                      <div class="text-tip">
+                        所有审批流第1个步骤，均为创建签报步骤，不支持修改。创建签报的处理人，为流程中EOA节点的处理人，在流程管理中设置。
+                      </div>
+                    </TsFormItem>
+                  </div>
+                </div>
+                <Draggable
+                  tag="ul"
+                  :list="stepList"
+                  handle=".item-sort"
+                >
+                  <li
+                    v-for="(item,index) in stepList"
+                    :key="index"
+                    class="bg-op radius-sm mb-nm step-list"
+                    style="position: relative"
+                  >
+                    <div class="pl-nm pr-nm flex-between">
+                      <div>
+                        <span class="tsfont-bar item-sort"></span>
+                        <span class="item-index">#{{ index + 2 }}</span>
+                      </div>
+                      <div class="action-icon">
+                        <span class="tsfont-trash-o text-action pr-sm"></span>
+                        <span class="text-action" :class="item.isShow?'tsfont-up':'tsfont-down'" @click="toggleshow(item)"></span>
+                      </div>
+                    </div>
+                    <div v-show="item.isShow" class="step-content border-color">
+                      <TsRow>
+                        <Col span="12">
+                          <TsFormItem label="步骤名称" required>
+                            <TsFormInput v-model="item.name"></TsFormInput>
+                          </TsFormItem>
+                        </Col>
+                        <Col span="12">
+                          <TsFormItem label="审批策略" required>
+                            <PoptipSelect
+                              ref="policy"
+                              v-model="item.policy"
+                              :list="policyList"
+                              placement="bottom-end"
+                              isRequired
+                              transfer
+                            ></PoptipSelect>
+                          </TsFormItem>
+                        </Col>
+                        <Col span="12">
+                          <TsFormItem label="处理人" tooltip="模板设置处理人后，编辑流程时中不可修改处理人">
+                            <UserSelect
+                              v-model="item.user"
+                              :transfer="true"
+                              :groupList="['user']"
+                            ></UserSelect>
+                          </TsFormItem>
+                        </Col>
+                        <Col span="12">
+                          <TsFormItem label="回复模板">
+                            <TsFormInput v-model="item.content"></TsFormInput>
+                          </TsFormItem>
+                        </Col>
+                      </TsRow>
+                    </div>
+                  </li>
+                </Draggable>
+                <Button
+                  type="primary"
+                  icon="tsfont tsfont-plus"
+                  ghost
+                  @click="addStep()"
+                >审批步骤</Button>
+              </div>
+            </template>
+          </TsForm>
+        </div>  
+      </template>
+    </TsContain>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    Draggable: resolve => require(['vuedraggable'], resolve),
+    TsForm: resolve => require(['@/resources/plugins/TsForm/TsForm'], resolve),
+    TsFormItem: resolve => require(['@/resources/plugins/TsForm/TsFormItem'], resolve),
+    TsFormInput: resolve => require(['@/resources/plugins/TsForm/TsFormInput'], resolve),
+    PoptipSelect: resolve => require(['@/resources/components/PoptipSelect/PoptipSelect.vue'], resolve),
+    UserSelect: resolve => require(['@/resources/components/UserSelect/UserSelect.vue'], resolve)
+  },
+  props: {},
+  data() {
+    return {
+      isShow: true,
+      saving: false,
+      formConfig: {
+        name: {
+          type: 'text',
+          label: this.$t('page.name'),
+          maxlength: 50,
+          validateList: ['required']
+        },
+        desc: {
+          type: 'ckeditor',
+          label: this.$t('page.description')
+        },
+        flow: {
+          type: 'slot',
+          label: '审批流'
+        }
+      },
+      stepList: [
+        {
+          name: 'ooo',
+          isShow: true
+        },
+        {
+          name: 'sad',
+          isShow: true
+        }
+      ],
+      policyList: [
+        {
+          value: '1',
+          text: '单人',
+          description: '设置唯一审批人，同意后通过'
+        },
+        {
+          value: '2',
+          text: '会签',
+          description: '设置多位审批人，所有人同意后审批通过'
+        },
+        {
+          value: '3',
+          text: '或签',
+          description: '设置多位审批人，任意一人同意后审批通过'
+        },
+        {
+          value: '4',
+          text: '投票',
+          description: '设置多位审批人，超过半数同意后审批通过'
+        },
+        {
+          value: '5',
+          text: '传阅',
+          description: '审批人传阅审批流程，不参与否决，仅查看'
+        }
+      ]
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    gotoManage() {},
+    deleteTemplate() {
+      this.$createDialog({
+        title: this.$t('dialog.title.deleteconfirm'),
+        content: this.$t('dialog.content.deleteconfirm', {target: this.$t('page.template')}),
+        btnType: 'error',
+        'on-ok': vnode => {
+          let data = { id: this.id };
+          // this.$api.process.eoa.deleteEoaTemplate(data).then(res => {
+          //   if (res.Status == 'OK') {
+          //     this.$Message.success(this.$t('message.deletesuccess'));
+          //     this.$router.push({
+          //       path: './eoa-template-manage'
+          //     });
+          //   }
+          // });
+          vnode.isShow = false;
+        }
+      });
+    },
+    saveTemplate() {
+      let data = {};
+      // this.$api.process.eoa.saveEoaTemplate(data).then(res => {
+      //   if (res.Status == 'OK') {
+      //     this.$Message.success(this.$t('message.savesuccess'));
+      //   }
+      // });
+    },
+    addStep() {
+      this.stepList.push({
+        name: 'sad11',
+        isShow: true
+      });
+    },
+    toggleshow(item) {
+      this.$set(item, 'isShow', !item.isShow);
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less" scoped>
+.eoa-flow {
+  .item-sort{
+    display: none;
+    cursor: move;
+  }
+  .step-list{
+    &:hover{
+      .item-sort{
+        display: inline-block;
+      }
+      .item-index{
+        display: none;
+      }
+      .action-icon {
+        display: block;
+      }
+    }
+  }
+  .action-icon {
+    display: none;
+  }
+  .step-content {
+    border-top: 1px solid;
+    padding: 16px;
+  }
+}
+</style>
diff --git a/src/views/pages/process/eoa/eoa-template-manage.vue b/src/views/pages/process/eoa/eoa-template-manage.vue
new file mode 100644
index 000000000..6ca09569d
--- /dev/null
+++ b/src/views/pages/process/eoa/eoa-template-manage.vue
@@ -0,0 +1,98 @@
+<template>
+  <div>
+    <TsContain>
+      <template v-slot:topLeft>
+        <span class="tsfont-plus text-action" @click="addTemplate()">模板</span>
+      </template>
+      <template v-slot:topRight>
+        <InputSearcher
+          v-model="keyword"
+          @change="changeCurrent(1)"
+        ></InputSearcher>
+      </template>
+      <template v-slot:content>
+        <div style="">
+          <Loading :loadingShow="loadingShow" type="fix"></Loading>
+          <TsTable
+            v-if="!loadingShow"
+            v-bind="tableConfig"
+            :theadList="theadList"
+            @changeCurrent="changeCurrent"
+            @changePageSize="changePageSize(1, ...arguments)"
+          >
+            <template slot="" slot-scope="{row}">
+              {{ row }}
+            </template>
+          </TsTable>
+        </div>
+      </template>
+    </TsContain>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    InputSearcher: resolve => require(['@/resources/components/InputSearcher/InputSearcher.vue'], resolve),
+    TsTable: resolve => require(['@/resources/components/TsTable/TsTable.vue'], resolve)
+  },
+  props: {},
+  data() {
+    return {
+      loadingShow: false,
+      theadList: [
+        {
+          title: '名称',
+          key: 'name'
+        },
+        {
+          title: '描述',
+          key: 'des'
+        },
+        {
+          title: '修改人',
+          key: 'cdu'
+        },
+        {
+          title: '修改时间',
+          key: 'fcu'
+        },
+        {
+          key: 'action'
+        }
+      ],
+      tableConfig: {},
+      keyword: ''
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    changeCurrent(current) {},
+    changePageSize() {
+
+    },
+    addTemplate() {
+      this.$router.push({
+        path: './eoa-template-edit'
+      });
+    },
+    editTemplate() {
+
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less">
+</style>
diff --git a/src/views/pages/process/router.js b/src/views/pages/process/router.js
index 4d781fa1a..a5da88f86 100644
--- a/src/views/pages/process/router.js
+++ b/src/views/pages/process/router.js
@@ -25,7 +25,9 @@ const subtaskTypeManage = () => import('./subtask/subtasktype-manage.vue');
 const flowDemo = () => import('./flowdemo/flow-demo.vue');
 const replyManage = () => import('./replytemplate/reply-manage.vue');
 const ProcessTaskManage = () => import('./task/processtask-manage.vue');
-import {$t} from '@/resources/init.js';
+const eoaTemplateManage = () => import('./eoa/eoa-template-manage.vue');
+const eoaTemplateEdit = () => import('./eoa/eoa-template-edit.vue');
+import { $t } from '@/resources/init.js';
 
 let routerArr = [
   {
@@ -107,7 +109,7 @@ let routerArr = [
       icon: 'tsfont-star',
       authority: 'PROCESS_BASE',
       type: 'catalog'
-      
+
     }
   },
   {
@@ -325,7 +327,7 @@ let routerArr = [
       type: 'others'
     }
   },
-  
+
   {
     path: '/flow-demo',
     name: 'flow-demo',
@@ -346,6 +348,30 @@ let routerArr = [
       authority: 'PROCESS_BASE',
       type: 'others'
     }
+  },
+  {
+    path: '/eoa-template-manage',
+    name: 'eoa-template-manage',
+    component: eoaTemplateManage,
+    meta: {
+      title: 'EOA模板',
+      ismenu: true,
+      icon: 'tsfont-shitu',
+      authority: '',
+      type: 'flow'
+    }
+  },
+  {
+    path: '/eoa-template-edit',
+    name: 'eoa-template-edit',
+    component: eoaTemplateEdit,
+    meta: {
+      title: 'EOA模板编辑',
+      ismenu: false,
+      icon: 'tsfont-shitu',
+      authority: '',
+      type: 'flow'
+    }
   }
 ];
 
-- 
Gitee


From 7704734a669ffd1993bb6c20fd0b2451efa0d253 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 5 Dec 2023 17:08:04 +0800
Subject: [PATCH 2/6] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[10210435257794?=
 =?UTF-8?q?56]OEA=E5=AE=A1=E6=89=B9=E6=A8=A1=E6=9D=BF=20http://192.168.0.9?=
 =?UTF-8?q?6:8090/demo/rdm.html#/story-detail/939050947543040/939050947543?=
 =?UTF-8?q?042/1021043525779456?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/assets/languages/term/en.json   |   9 +-
 src/resources/assets/languages/term/zh.json   |   9 +-
 .../pages/process/eoa/eoa-template-edit.vue   | 185 ++++++++++++++----
 .../pages/process/eoa/eoa-template-manage.vue |  80 ++++++--
 4 files changed, 228 insertions(+), 55 deletions(-)

diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json
index 8f66fd9c0..83406c604 100644
--- a/src/resources/assets/languages/term/en.json
+++ b/src/resources/assets/languages/term/en.json
@@ -497,7 +497,14 @@
     "templateparametermapping": "Template parameter mapping",
     "targetparams": "Target parameters",
     "selecttask": "Select Work Order",
-    "savedraft": "Save Draft "
+    "savedraft": "Save Draft ",
+    "signreport": "Sign a report",
+    "signreporttip": "The first step of all approval processes is the creation and signing step, and modification is not supported. Create the handler for signing the report, which is the handler for the EOA node in the process, and set it in the process management.",
+    "approvalpolicy": "Approval strategy",
+    "eoadealwithusertip": "After setting the processor for the template, the processor cannot be modified during the editing process",
+    "approvalstep": "Approval steps",
+    "approvalprocess": "Approval process",
+    "approvalprocesstip": "At least one node must be added outside the [Create Sign off] node"
   },
   "autoexec": {
     "addrootdirectory": "Add root directory",
diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json
index a29153a62..61a020c92 100644
--- a/src/resources/assets/languages/term/zh.json
+++ b/src/resources/assets/languages/term/zh.json
@@ -496,7 +496,14 @@
     "templateparametermapping": "模板参数映射",
     "targetparams": "目标参数",
     "selecttask": "选中工单",
-    "savedraft": "保存草稿"
+    "savedraft": "保存草稿",
+    "signreport": "签报",
+    "signreporttip": "所有审批流第1个步骤，均为创建签报步骤，不支持修改。创建签报的处理人，为流程中EOA节点的处理人，在流程管理中设置。",
+    "approvalpolicy": "审批策略",
+    "eoadealwithusertip": "模板设置处理人后，编辑流程时中不可修改处理人",
+    "approvalstep": "审批步骤",
+    "approvalprocess": "审批流",
+    "approvalprocesstip": "在【创建签报】节点之外，至少要添加一个节点"
   },
   "autoexec": {
     "addrootdirectory": "添加根目录",
diff --git a/src/views/pages/process/eoa/eoa-template-edit.vue b/src/views/pages/process/eoa/eoa-template-edit.vue
index 494cb5960..926f401fb 100644
--- a/src/views/pages/process/eoa/eoa-template-edit.vue
+++ b/src/views/pages/process/eoa/eoa-template-edit.vue
@@ -2,11 +2,12 @@
   <div>
     <TsContain>
       <template v-slot:navigation>
-        <span class="tsfont-left text-action" @click="gotoManage()">{{ $t('page.back') }}</span>
+        <span v-if="$hasBack()" class="tsfont-left text-action" @click="$back()">{{ $getFromPage() }}</span>
+        <span v-else class="tsfont-left text-action" @click="back()">{{ $t('page.back') }}</span>
       </template>
       <template v-slot:topLeft>
-        <div>
-          <span>修改人</span>
+        <div class="text-title">
+          <span class="pr-xs">修改人</span>
           <span>时间</span>
         </div>
       </template>
@@ -23,9 +24,10 @@
       <template v-slot:content>
         <div>
           <TsForm
+            ref="eoaForm"
             :itemList="formConfig"
           >
-            <template v-slot:flow>
+            <template v-slot:stepList>
               <div class="eoa-flow">
                 <div class="step-list bg-op radius-sm mb-nm">
                   <div class="pl-nm pr-nm flex-between">
@@ -33,10 +35,10 @@
                     <div class="action-icon text-action" :class="isShow?'tsfont-down':'tsfont-up'" @click="isShow = !isShow"></div>
                   </div>
                   <div v-show="isShow" class="step-content border-color">
-                    <TsFormItem label="步骤名称" required>
-                      <div>创建签报</div>
+                    <TsFormItem :label="$t('term.process.stepname')" required>
+                      <div>{{ $t('dialog.title.createtarget',{'target':$t('term.process.signreport')}) }}</div>
                       <div class="text-tip">
-                        所有审批流第1个步骤，均为创建签报步骤，不支持修改。创建签报的处理人，为流程中EOA节点的处理人，在流程管理中设置。
+                        {{ $t('term.process.signreporttip') }}
                       </div>
                     </TsFormItem>
                   </div>
@@ -58,19 +60,25 @@
                         <span class="item-index">#{{ index + 2 }}</span>
                       </div>
                       <div class="action-icon">
-                        <span class="tsfont-trash-o text-action pr-sm"></span>
+                        <span class="tsfont-trash-o text-action pr-sm" @click="deleteStep(index)"></span>
                         <span class="text-action" :class="item.isShow?'tsfont-up':'tsfont-down'" @click="toggleshow(item)"></span>
                       </div>
                     </div>
                     <div v-show="item.isShow" class="step-content border-color">
                       <TsRow>
                         <Col span="12">
-                          <TsFormItem label="步骤名称" required>
-                            <TsFormInput v-model="item.name"></TsFormInput>
+                          <TsFormItem :label="$t('term.process.stepname')" required>
+                            <TsFormInput
+                              ref="name"
+                              v-model="item.name"
+                              :validateList="validateList"
+                              :errorMessage="item.errorMessage"
+                              @on-change="changeName(item)"
+                            ></TsFormInput>
                           </TsFormItem>
                         </Col>
                         <Col span="12">
-                          <TsFormItem label="审批策略" required>
+                          <TsFormItem :label="$t('term.process.approvalpolicy')" required>
                             <PoptipSelect
                               ref="policy"
                               v-model="item.policy"
@@ -82,7 +90,7 @@
                           </TsFormItem>
                         </Col>
                         <Col span="12">
-                          <TsFormItem label="处理人" tooltip="模板设置处理人后，编辑流程时中不可修改处理人">
+                          <TsFormItem :label="$t('term.process.dealwithuser')" :tooltip="$t('term.process.eoadealwithusertip')">
                             <UserSelect
                               v-model="item.user"
                               :transfer="true"
@@ -91,8 +99,8 @@
                           </TsFormItem>
                         </Col>
                         <Col span="12">
-                          <TsFormItem label="回复模板">
-                            <TsFormInput v-model="item.content"></TsFormInput>
+                          <TsFormItem :label="$t('page.replytemplate')">
+                            <TsFormInput v-model="item.commentTemplate"></TsFormInput>
                           </TsFormItem>
                         </Col>
                       </TsRow>
@@ -104,7 +112,7 @@
                   icon="tsfont tsfont-plus"
                   ghost
                   @click="addStep()"
-                >审批步骤</Button>
+                >{{ $t('term.process.approvalstep') }}</Button>
               </div>
             </template>
           </TsForm>
@@ -127,6 +135,7 @@ export default {
   props: {},
   data() {
     return {
+      id: null,
       isShow: true,
       saving: false,
       formConfig: {
@@ -136,22 +145,28 @@ export default {
           maxlength: 50,
           validateList: ['required']
         },
-        desc: {
+        description: {
           type: 'ckeditor',
           label: this.$t('page.description')
         },
-        flow: {
+        stepList: {
           type: 'slot',
-          label: '审批流'
+          label: this.$t('term.process.approvalprocess')
         }
       },
       stepList: [
         {
-          name: 'ooo',
+          name: 'qqq',
+          policy: '1',
+          user: [],
+          commentTemplate: '',
           isShow: true
         },
         {
-          name: 'sad',
+          name: 'qqq',
+          policy: '1',
+          user: [],
+          commentTemplate: '',
           isShow: true
         }
       ],
@@ -181,11 +196,17 @@ export default {
           text: '传阅',
           description: '审批人传阅审批流程，不参与否决，仅查看'
         }
-      ]
+      ],
+      validateList: ['required']
     };
   },
   beforeCreate() {},
-  created() {},
+  created() {
+    if (this.$route.query.id) {
+      this.id = parseInt(this.$route.query.id);
+      this.init();
+    }
+  },
   beforeMount() {},
   mounted() {},
   beforeUpdate() {},
@@ -195,7 +216,108 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
-    gotoManage() {},
+    init() {
+      this.$api.process.eoa.getEoaTemplate({id: this.id}).then(res => {
+        if (res.Status === 'OK') {
+          let eoaConfig = res.Return;
+        }
+      });
+    },
+    back() {
+      this.$router.push({
+        path: '/eoa-template-manage'
+      });
+    },
+    deleteStep(index) {
+      this.stepList.splice(index, 1);
+    },
+    addStep() {
+      this.stepList.push({
+        name: 'sad11',
+        isShow: true
+      });
+    },
+    toggleshow(item) {
+      this.$set(item, 'isShow', !item.isShow);
+    },
+    changeName(item) {
+      let findNameList = this.stepList.filter(s => {
+        return s.name && s.name === item.name;
+      });
+      if (findNameList.length > 1) {
+        this.$set(item, 'errorMessage', this.$t('message.cannotrepeat', {'target': this.$t('term.process.stepname')}));
+      } else {
+        this.stepList.forEach(p => {
+          this.$set(p, 'errorMessage', '');
+        });
+      }
+    },
+    valid() {
+      let isValid = true;
+      if (!this.$refs.eoaForm.valid()) {
+        isValid = false;
+      }
+      if (this.$utils.isEmpty(this.stepList)) {
+        isValid = false;
+        this.$Notice.warning({
+          title: this.$t('term.process.approvalprocess'),
+          desc: this.$t('term.process.approvalprocesstip')
+        });
+      } else {
+        //校验名称重复
+        this.stepList.forEach(item => {
+          if (item.name) {
+            this.changeName(item);
+          }
+          if (item.errorMessage) {
+            isValid = false;
+          }
+        });
+        let nameList = this.$refs.name;
+        let policyList = this.$refs.policy;
+        nameList.forEach(item => {
+          if (!item.valid()) {
+            isValid = false;
+          }
+        });
+        policyList.forEach(item => {
+          if (!item.valid()) {
+            isValid = false;
+          }
+        });
+      }
+      return isValid;
+    },
+    saveTemplate() {
+      if (!this.valid()) {
+        return;
+      }
+      let eoaFormData = this.$refs.eoaForm.getFormValue();
+      let data = {
+        name: eoaFormData.name,
+        description: eoaFormData.description || '',
+        config: {
+          stepList: []
+        }
+      };
+      if (this.id) {
+        this.$set(data, 'id', id);
+      }
+      this.stepList.forEach(item => {
+        data.config.stepList.push({
+          name: item.name,
+          policy: item.policy,
+          user: item.user || [],
+          commentTemplate: item.commentTemplate || ''
+        });
+      });
+      console.log(data);
+      // this.$api.process.eoa.saveEoaTemplate(data).then(res => {
+      //   if (res.Status == 'OK') {
+      //     this.$Message.success(this.$t('message.savesuccess'));
+      //   }
+      // });
+    },
     deleteTemplate() {
       this.$createDialog({
         title: this.$t('dialog.title.deleteconfirm'),
@@ -214,23 +336,6 @@ export default {
           vnode.isShow = false;
         }
       });
-    },
-    saveTemplate() {
-      let data = {};
-      // this.$api.process.eoa.saveEoaTemplate(data).then(res => {
-      //   if (res.Status == 'OK') {
-      //     this.$Message.success(this.$t('message.savesuccess'));
-      //   }
-      // });
-    },
-    addStep() {
-      this.stepList.push({
-        name: 'sad11',
-        isShow: true
-      });
-    },
-    toggleshow(item) {
-      this.$set(item, 'isShow', !item.isShow);
     }
   },
   filter: {},
diff --git a/src/views/pages/process/eoa/eoa-template-manage.vue b/src/views/pages/process/eoa/eoa-template-manage.vue
index 6ca09569d..b7b88515a 100644
--- a/src/views/pages/process/eoa/eoa-template-manage.vue
+++ b/src/views/pages/process/eoa/eoa-template-manage.vue
@@ -2,7 +2,7 @@
   <div>
     <TsContain>
       <template v-slot:topLeft>
-        <span class="tsfont-plus text-action" @click="addTemplate()">模板</span>
+        <span class="tsfont-plus text-action" @click="addTemplate()">{{ $t('page.template') }}</span>
       </template>
       <template v-slot:topRight>
         <InputSearcher
@@ -20,8 +20,43 @@
             @changeCurrent="changeCurrent"
             @changePageSize="changePageSize(1, ...arguments)"
           >
-            <template slot="" slot-scope="{row}">
-              {{ row }}
+            <template v-slot:name="{ row }">
+              <div class="text-htef" @click="editTemplate(row)">{{ row.name }}</div>
+            </template>
+            <template v-slot:action="{ row }">
+              <div class="tstable-action">
+                <ul class="tstable-action-ul">
+                  <li
+                    class="tsfont-trash-o"
+                    @click="deleteItem(row)"
+                  >{{ $t('page.delete') }}</li>
+                  <li class="reference-count">
+                    <Dropdown
+                      v-if="row.referenceCount > 0"
+                      ref="reference"
+                      transfer
+                      trigger="hover"
+                      placement="bottom-start"
+                    >
+                      <div class="text-action">
+                        {{ $t('page.referencelist') }}
+                        <span class="reference-number">{{ getAmount(row.referenceCount) }}</span>
+                      </div>
+                      <DropdownMenu v-if="row.referenceList.length > 0" slot="list">
+                        <DropdownItem
+                          v-for="(reference, rindex) in row.referenceList"
+                          :key="rindex"
+                          class="text-action"
+                          @click.native="openPage(reference.uuid)"
+                        >
+                          <div>{{ reference.name }}</div>
+                        </DropdownItem>
+                      </DropdownMenu>
+                    </Dropdown>
+                    <span v-else class="text-disabled">{{ $t('page.referencelist') }}</span>
+                  </li>
+                </ul>
+              </div>
             </template>
           </TsTable>
         </div>
@@ -42,20 +77,23 @@ export default {
       loadingShow: false,
       theadList: [
         {
-          title: '名称',
+          title: this.$t('page.name'),
           key: 'name'
         },
         {
-          title: '描述',
-          key: 'des'
+          title: this.$t('page.description'),
+          key: 'description'
         },
         {
-          title: '修改人',
-          key: 'cdu'
+          title: this.$t('page.fcu'),
+          key: 'fcu',
+          type: 'user',
+          uuid: 'uuid'
         },
         {
-          title: '修改时间',
-          key: 'fcu'
+          title: this.$t('page.fcd'),
+          key: 'fcd',
+          type: 'time'
         },
         {
           key: 'action'
@@ -85,12 +123,28 @@ export default {
         path: './eoa-template-edit'
       });
     },
-    editTemplate() {
-
+    editTemplate(row) {
+      this.$router.push({
+        path: './eoa-template-edit',
+        query: {
+          id: row.id
+        }
+      });
+    },
+    deleteItem(row) {},
+    openPage(item) {
+      window.open(HOME + '/process.html#/flow-edit?uuid=' + uuid, '_blank');
     }
   },
   filter: {},
-  computed: {},
+  computed: {
+    getAmount() {
+      return function(amount) {
+        let showamount = amount ? (Math.floor(amount) > 99 ? '99+' : Math.floor(amount)) : '';
+        return showamount;
+      };
+    }
+  },
   watch: {}
 };
 </script>
-- 
Gitee


From 2c1e6efb88c795c654acd8b3f4a7551857d8c40e Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Mon, 25 Dec 2023 09:49:00 +0800
Subject: [PATCH 3/6] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=20eoa=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=20=20=20-=20[=E5=85=B3=E8=81=94]=20#[1021043525779456?=
 =?UTF-8?q?]EOA=E5=AE=A1=E6=89=B9=E6=A8=A1=E6=9D=BF=20http://192.168.0.96:?=
 =?UTF-8?q?8090/demo/rdm.html#/story-detail/939050947543040/93905094754304?=
 =?UTF-8?q?2/1021043525779456?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/api/process/eoa/eoa.js          |  17 +++
 src/resources/api/process/index.js            |   4 +-
 src/resources/assets/css/common.less          |   2 +-
 .../pages/process/eoa/eoa-template-edit.vue   | 140 +++++++++---------
 .../pages/process/eoa/eoa-template-manage.vue |  56 ++++++-
 5 files changed, 140 insertions(+), 79 deletions(-)
 create mode 100644 src/resources/api/process/eoa/eoa.js

diff --git a/src/resources/api/process/eoa/eoa.js b/src/resources/api/process/eoa/eoa.js
new file mode 100644
index 000000000..97f41685e
--- /dev/null
+++ b/src/resources/api/process/eoa/eoa.js
@@ -0,0 +1,17 @@
+import axios from '../../http';
+
+const eoa = {
+  searchEoaTemplate(params) {
+    return axios.post('/api/rest/eoa/template/search', params);
+  },
+  getEoaTemplate(params) {
+    return axios.post('/api/rest/eoa/template/get', params);
+  },
+  saveEoaTemplate(params) {
+    return axios.post('/api/rest/eoa/template/save', params);
+  },
+  deleteEoaTemplate(params) {
+    return axios.post('/api/rest/eoa/template/delete', params);
+  }
+};
+export default eoa;
diff --git a/src/resources/api/process/index.js b/src/resources/api/process/index.js
index dc9cbfac0..dcc319e0e 100644
--- a/src/resources/api/process/index.js
+++ b/src/resources/api/process/index.js
@@ -18,6 +18,7 @@ import relation from './channeltype/relation'; //工单关联关系
 import reply from './reply/reply'; //回复模板
 import strategy from './strategy/strategy'; //子策略任务
 import integration from './integration/integration'; //集成
+import eoa from './eoa/eoa.js';
 
 //cmdb
 import ci from '../cmdb/ci/ci';
@@ -74,5 +75,6 @@ export default {
   relation,
   reply,
   strategy,
-  integration
+  integration,
+  eoa
 };
diff --git a/src/resources/assets/css/common.less b/src/resources/assets/css/common.less
index 651af9dc0..fc59d0093 100644
--- a/src/resources/assets/css/common.less
+++ b/src/resources/assets/css/common.less
@@ -1231,7 +1231,7 @@ span {
 
     &.last,
     &:last-of-type:not(:first-of-type) {
-      padding-right: 0;
+      padding-right: 0 !important;
       &:after {
         display: none;
       }
diff --git a/src/views/pages/process/eoa/eoa-template-edit.vue b/src/views/pages/process/eoa/eoa-template-edit.vue
index 926f401fb..e9424820d 100644
--- a/src/views/pages/process/eoa/eoa-template-edit.vue
+++ b/src/views/pages/process/eoa/eoa-template-edit.vue
@@ -1,22 +1,25 @@
 <template>
   <div>
+    <Loading :loadingShow="loadingShow" type="fix"></Loading>
     <TsContain>
       <template v-slot:navigation>
         <span v-if="$hasBack()" class="tsfont-left text-action" @click="$back()">{{ $getFromPage() }}</span>
         <span v-else class="tsfont-left text-action" @click="back()">{{ $t('page.back') }}</span>
       </template>
       <template v-slot:topLeft>
-        <div class="text-title">
-          <span class="pr-xs">修改人</span>
-          <span>时间</span>
+        <div v-if="!$utils.isEmpty(eoaConfig)" class="text-title">
+          <span class="pr-xs">
+            <UserCard :uuid="eoaConfig.fcu" :hideAvatar="true"></UserCard>
+          </span>
+          <span>{{ eoaConfig.fcd | formatDate }}</span>
         </div>
       </template>
       <template v-slot:topRight>
         <div class="action-group">
-          <div class="action-item" @click="deleteTemplate()">
+          <div v-if="id" class="action-item" @click="deleteTemplate()">
             <span class="tsfont-trash-o">{{ $t('page.delete') }}</span>
           </div>
-          <div class="action-item" @click="saveTemplate()">
+          <div class="action-item last" @click="saveTemplate()">
             <Button type="primary" :disabled="saving">{{ $t('page.save') }}</Button>
           </div>
         </div>
@@ -86,15 +89,17 @@
                               placement="bottom-end"
                               isRequired
                               transfer
+                              @change="changePolicy(item)"
                             ></PoptipSelect>
                           </TsFormItem>
                         </Col>
                         <Col span="12">
                           <TsFormItem :label="$t('term.process.dealwithuser')" :tooltip="$t('term.process.eoadealwithusertip')">
                             <UserSelect
-                              v-model="item.user"
+                              v-model="item.userList"
                               :transfer="true"
                               :groupList="['user']"
+                              :multiple="item.policy !== 'onePerson'"
                             ></UserSelect>
                           </TsFormItem>
                         </Col>
@@ -130,11 +135,13 @@ export default {
     TsFormItem: resolve => require(['@/resources/plugins/TsForm/TsFormItem'], resolve),
     TsFormInput: resolve => require(['@/resources/plugins/TsForm/TsFormInput'], resolve),
     PoptipSelect: resolve => require(['@/resources/components/PoptipSelect/PoptipSelect.vue'], resolve),
-    UserSelect: resolve => require(['@/resources/components/UserSelect/UserSelect.vue'], resolve)
+    UserSelect: resolve => require(['@/resources/components/UserSelect/UserSelect.vue'], resolve),
+    UserCard: resolve => require(['@/resources/components/UserCard/UserCard.vue'], resolve)
   },
   props: {},
   data() {
     return {
+      loadingShow: true,
       id: null,
       isShow: true,
       saving: false,
@@ -154,57 +161,20 @@ export default {
           label: this.$t('term.process.approvalprocess')
         }
       },
-      stepList: [
-        {
-          name: 'qqq',
-          policy: '1',
-          user: [],
-          commentTemplate: '',
-          isShow: true
-        },
-        {
-          name: 'qqq',
-          policy: '1',
-          user: [],
-          commentTemplate: '',
-          isShow: true
-        }
-      ],
-      policyList: [
-        {
-          value: '1',
-          text: '单人',
-          description: '设置唯一审批人，同意后通过'
-        },
-        {
-          value: '2',
-          text: '会签',
-          description: '设置多位审批人，所有人同意后审批通过'
-        },
-        {
-          value: '3',
-          text: '或签',
-          description: '设置多位审批人，任意一人同意后审批通过'
-        },
-        {
-          value: '4',
-          text: '投票',
-          description: '设置多位审批人，超过半数同意后审批通过'
-        },
-        {
-          value: '5',
-          text: '传阅',
-          description: '审批人传阅审批流程，不参与否决，仅查看'
-        }
-      ],
-      validateList: ['required']
+      stepList: [],
+      policyList: [],
+      validateList: ['required'],
+      eoaConfig: {}
     };
   },
   beforeCreate() {},
   created() {
+    this.getTypeLit();
     if (this.$route.query.id) {
       this.id = parseInt(this.$route.query.id);
       this.init();
+    } else {
+      this.loadingShow = false;
     }
   },
   beforeMount() {},
@@ -217,9 +187,32 @@ export default {
   destroyed() {},
   methods: {
     init() {
+      this.loadingShow = true;
+      this.stepList = [];
       this.$api.process.eoa.getEoaTemplate({id: this.id}).then(res => {
         if (res.Status === 'OK') {
-          let eoaConfig = res.Return;
+          this.eoaConfig = res.Return || {};
+          Object.keys(this.formConfig).forEach(key => {
+            if (this.eoaConfig[key]) {
+              this.$set(this.formConfig[key], 'value', this.eoaConfig[key]);
+            }
+          });
+          if (this.eoaConfig.config && !this.$utils.isEmpty(this.eoaConfig.config.stepList)) {
+            this.eoaConfig.config.stepList.forEach(item => {
+              this.$set(item, 'isShow', true);
+              this.stepList.push(item);
+            });
+          }
+        }
+      }).finally(() => {
+        this.loadingShow = false;
+      });
+    },
+    getTypeLit() {
+      let data = { enumClass: 'ApprovalPolicy' };
+      this.$api.common.getSelectList(data).then(res => {
+        if (res.Status == 'OK') {
+          this.policyList = res.Return;
         }
       });
     },
@@ -233,7 +226,10 @@ export default {
     },
     addStep() {
       this.stepList.push({
-        name: 'sad11',
+        name: '',
+        policy: '',
+        userList: [],
+        commentTemplate: '',
         isShow: true
       });
     },
@@ -252,6 +248,9 @@ export default {
         });
       }
     },
+    changePolicy(item) {
+      this.$set(item, 'user', []);
+    },
     valid() {
       let isValid = true;
       if (!this.$refs.eoaForm.valid()) {
@@ -301,22 +300,25 @@ export default {
         }
       };
       if (this.id) {
-        this.$set(data, 'id', id);
+        this.$set(data, 'id', this.id);
       }
       this.stepList.forEach(item => {
         data.config.stepList.push({
           name: item.name,
           policy: item.policy,
-          user: item.user || [],
+          userList: item.userList ? (Array.isArray(item.userList) ? item.userList : [item.userList]) : [],
           commentTemplate: item.commentTemplate || ''
         });
       });
-      console.log(data);
-      // this.$api.process.eoa.saveEoaTemplate(data).then(res => {
-      //   if (res.Status == 'OK') {
-      //     this.$Message.success(this.$t('message.savesuccess'));
-      //   }
-      // });
+      this.$api.process.eoa.saveEoaTemplate(data).then(res => {
+        if (res.Status == 'OK') {
+          this.$Message.success(this.$t('message.savesuccess'));
+          if (!this.id) {
+            this.id = res.Return;
+          }
+          this.init();
+        }
+      });
     },
     deleteTemplate() {
       this.$createDialog({
@@ -325,14 +327,14 @@ export default {
         btnType: 'error',
         'on-ok': vnode => {
           let data = { id: this.id };
-          // this.$api.process.eoa.deleteEoaTemplate(data).then(res => {
-          //   if (res.Status == 'OK') {
-          //     this.$Message.success(this.$t('message.deletesuccess'));
-          //     this.$router.push({
-          //       path: './eoa-template-manage'
-          //     });
-          //   }
-          // });
+          this.$api.process.eoa.deleteEoaTemplate(data).then(res => {
+            if (res.Status == 'OK') {
+              this.$Message.success(this.$t('message.deletesuccess'));
+              this.$router.push({
+                path: './eoa-template-manage'
+              });
+            }
+          });
           vnode.isShow = false;
         }
       });
diff --git a/src/views/pages/process/eoa/eoa-template-manage.vue b/src/views/pages/process/eoa/eoa-template-manage.vue
index b7b88515a..28bc20478 100644
--- a/src/views/pages/process/eoa/eoa-template-manage.vue
+++ b/src/views/pages/process/eoa/eoa-template-manage.vue
@@ -21,7 +21,7 @@
             @changePageSize="changePageSize(1, ...arguments)"
           >
             <template v-slot:name="{ row }">
-              <div class="text-htef" @click="editTemplate(row)">{{ row.name }}</div>
+              <div class="text-href" @click="editTemplate(row)">{{ row.name }}</div>
             </template>
             <template v-slot:action="{ row }">
               <div class="tstable-action">
@@ -75,6 +75,7 @@ export default {
   data() {
     return {
       loadingShow: false,
+      searchData: {},
       theadList: [
         {
           title: this.$t('page.name'),
@@ -82,7 +83,8 @@ export default {
         },
         {
           title: this.$t('page.description'),
-          key: 'description'
+          key: 'description',
+          type: 'html'
         },
         {
           title: this.$t('page.fcu'),
@@ -104,7 +106,9 @@ export default {
     };
   },
   beforeCreate() {},
-  created() {},
+  created() {
+    this.searchEoaTemplate();
+  },
   beforeMount() {},
   mounted() {},
   beforeUpdate() {},
@@ -114,9 +118,29 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
-    changeCurrent(current) {},
-    changePageSize() {
-
+    searchEoaTemplate() {
+      let data = {
+        keyword: this.keyword,
+        currentPage: this.searchData.currentPage,
+        pageSize: this.searchData.pageSize
+      };
+      this.loadingShow = true;
+      this.$api.process.eoa.searchEoaTemplate(data).then(res => {
+        if (res.Status === 'OK') {
+          this.tableConfig = res.Return;
+        }
+      })
+        .finally(() => {
+          this.loadingShow = false;
+        });
+    },
+    changeCurrent(currentPage) {
+      this.searchData.currentPage = currentPage;
+      this.searchEoaTemplate(); 
+    },
+    changePageSize(pageSize) {
+      this.searchData.pageSize = pageSize;
+      this.searchEoaTemplate(); 
     },
     addTemplate() {
       this.$router.push({
@@ -131,8 +155,24 @@ export default {
         }
       });
     },
-    deleteItem(row) {},
-    openPage(item) {
+    deleteItem(row) {
+      this.$createDialog({
+        title: this.$t('dialog.title.deleteconfirm'),
+        content: this.$t('dialog.content.deleteconfirm', {target: row.name}),
+        btnType: 'error',
+        'on-ok': vnode => {
+          let data = { id: row.id };
+          this.$api.process.eoa.deleteEoaTemplate(data).then(res => {
+            if (res.Status == 'OK') {
+              this.$Message.success(this.$t('message.deletesuccess'));
+              this.searchEoaTemplate();
+            }
+          });
+          vnode.isShow = false;
+        }
+      });
+    },
+    openPage(uuid) {
       window.open(HOME + '/process.html#/flow-edit?uuid=' + uuid, '_blank');
     }
   },
-- 
Gitee


From 07b2d3af54e45dba7521e6e63b7bdfcc971b46ac Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Mon, 25 Dec 2023 12:06:42 +0800
Subject: [PATCH 4/6] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=20eoa=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/assets/languages/router/en.json |  4 +-
 src/resources/assets/languages/router/zh.json |  4 +-
 .../pages/process/eoa/eoa-template-edit.vue   | 19 +++++-
 .../pages/process/eoa/eoa-template-manage.vue | 61 +++++++------------
 src/views/pages/process/router.js             |  4 +-
 5 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/src/resources/assets/languages/router/en.json b/src/resources/assets/languages/router/en.json
index 97de7d846..ec41b0546 100644
--- a/src/resources/assets/languages/router/en.json
+++ b/src/resources/assets/languages/router/en.json
@@ -75,7 +75,9 @@
     "flowedit": "Flow Edit",
     "slamanage": "SLA Sets",
     "eventsolutionedit": "Edit Event Solution",
-    "changeedit": "Change Edit"
+    "changeedit": "Change Edit",
+    "eoatemplate": "EOA template",
+    "eoatemplateedit": "EOA template editing"
   },
   "autoexec": {
     "detail": "Automation is obvious",
diff --git a/src/resources/assets/languages/router/zh.json b/src/resources/assets/languages/router/zh.json
index 784b80a0c..60d133cea 100644
--- a/src/resources/assets/languages/router/zh.json
+++ b/src/resources/assets/languages/router/zh.json
@@ -75,7 +75,9 @@
     "flowedit": "流程编辑",
     "slamanage": "时效管理",
     "eventsolutionedit": "编辑事件解决方案",
-    "changeedit": "变更编辑"
+    "changeedit": "变更编辑",
+    "eoatemplate": "EOA模板",
+    "eoatemplateedit": "EOA模板编辑"
   },
   "autoexec": {
     "detail": "自动化明显",
diff --git a/src/views/pages/process/eoa/eoa-template-edit.vue b/src/views/pages/process/eoa/eoa-template-edit.vue
index e9424820d..43e43bf79 100644
--- a/src/views/pages/process/eoa/eoa-template-edit.vue
+++ b/src/views/pages/process/eoa/eoa-template-edit.vue
@@ -150,7 +150,15 @@ export default {
           type: 'text',
           label: this.$t('page.name'),
           maxlength: 50,
-          validateList: ['required']
+          validateList: [
+            'required',
+            { name: 'searchUrl',
+              url: '/api/rest/eoa/template/save', 
+              key: 'name',
+              message: this.$t('message.targetisexists', {target: this.$t('page.name')}),
+              params: { id: null}
+            }
+          ]
         },
         description: {
           type: 'ckeditor',
@@ -189,6 +197,7 @@ export default {
     init() {
       this.loadingShow = true;
       this.stepList = [];
+      this.validName(this.id);
       this.$api.process.eoa.getEoaTemplate({id: this.id}).then(res => {
         if (res.Status === 'OK') {
           this.eoaConfig = res.Return || {};
@@ -208,6 +217,14 @@ export default {
         this.loadingShow = false;
       });
     },
+    validName(id = null) {
+      // 编辑名称时，名称改回自身，不需要校验
+      this.formConfig['name'].validateList.forEach((item) => {
+        if (item && item.hasOwnProperty('params')) {
+          item.params.id = id || '';
+        }
+      });
+    },
     getTypeLit() {
       let data = { enumClass: 'ApprovalPolicy' };
       this.$api.common.getSelectList(data).then(res => {
diff --git a/src/views/pages/process/eoa/eoa-template-manage.vue b/src/views/pages/process/eoa/eoa-template-manage.vue
index 28bc20478..9a65214df 100644
--- a/src/views/pages/process/eoa/eoa-template-manage.vue
+++ b/src/views/pages/process/eoa/eoa-template-manage.vue
@@ -18,43 +18,28 @@
             v-bind="tableConfig"
             :theadList="theadList"
             @changeCurrent="changeCurrent"
-            @changePageSize="changePageSize(1, ...arguments)"
+            @changePageSize="changePageSize"
           >
             <template v-slot:name="{ row }">
               <div class="text-href" @click="editTemplate(row)">{{ row.name }}</div>
             </template>
+            <template v-slot:referenceCount="{row}">
+              <ReferenceSelect
+                :id="row.id"
+                calleeType="eoaTemplate"
+                :isTable="true"
+                :referenceCount="row.referenceCount"
+              ></ReferenceSelect>
+            </template> 
             <template v-slot:action="{ row }">
               <div class="tstable-action">
                 <ul class="tstable-action-ul">
                   <li
                     class="tsfont-trash-o"
+                    :class="row.referenceCount > 0?'disable':''"
+                    :title="row.referenceCount > 0 ? $t('page.citetarget', {target:$t('page.template')}) : ''"
                     @click="deleteItem(row)"
                   >{{ $t('page.delete') }}</li>
-                  <li class="reference-count">
-                    <Dropdown
-                      v-if="row.referenceCount > 0"
-                      ref="reference"
-                      transfer
-                      trigger="hover"
-                      placement="bottom-start"
-                    >
-                      <div class="text-action">
-                        {{ $t('page.referencelist') }}
-                        <span class="reference-number">{{ getAmount(row.referenceCount) }}</span>
-                      </div>
-                      <DropdownMenu v-if="row.referenceList.length > 0" slot="list">
-                        <DropdownItem
-                          v-for="(reference, rindex) in row.referenceList"
-                          :key="rindex"
-                          class="text-action"
-                          @click.native="openPage(reference.uuid)"
-                        >
-                          <div>{{ reference.name }}</div>
-                        </DropdownItem>
-                      </DropdownMenu>
-                    </Dropdown>
-                    <span v-else class="text-disabled">{{ $t('page.referencelist') }}</span>
-                  </li>
                 </ul>
               </div>
             </template>
@@ -69,7 +54,9 @@ export default {
   name: '',
   components: {
     InputSearcher: resolve => require(['@/resources/components/InputSearcher/InputSearcher.vue'], resolve),
-    TsTable: resolve => require(['@/resources/components/TsTable/TsTable.vue'], resolve)
+    TsTable: resolve => require(['@/resources/components/TsTable/TsTable.vue'], resolve),
+    ReferenceSelect: resolve => require(['@/resources/components/ReferenceSelect/ReferenceSelect.vue'], resolve)
+    
   },
   props: {},
   data() {
@@ -86,6 +73,10 @@ export default {
           key: 'description',
           type: 'html'
         },
+        { 
+          title: this.$t('term.process.relprocess'), 
+          key: 'referenceCount'
+        },
         {
           title: this.$t('page.fcu'),
           key: 'fcu',
@@ -140,6 +131,7 @@ export default {
     },
     changePageSize(pageSize) {
       this.searchData.pageSize = pageSize;
+      this.searchData.currentPage = 1;
       this.searchEoaTemplate(); 
     },
     addTemplate() {
@@ -156,6 +148,9 @@ export default {
       });
     },
     deleteItem(row) {
+      if (row.referenceCount > 0) {
+        return;
+      }
       this.$createDialog({
         title: this.$t('dialog.title.deleteconfirm'),
         content: this.$t('dialog.content.deleteconfirm', {target: row.name}),
@@ -171,20 +166,10 @@ export default {
           vnode.isShow = false;
         }
       });
-    },
-    openPage(uuid) {
-      window.open(HOME + '/process.html#/flow-edit?uuid=' + uuid, '_blank');
     }
   },
   filter: {},
-  computed: {
-    getAmount() {
-      return function(amount) {
-        let showamount = amount ? (Math.floor(amount) > 99 ? '99+' : Math.floor(amount)) : '';
-        return showamount;
-      };
-    }
-  },
+  computed: {},
   watch: {}
 };
 </script>
diff --git a/src/views/pages/process/router.js b/src/views/pages/process/router.js
index 4c5149dc7..aa129535f 100644
--- a/src/views/pages/process/router.js
+++ b/src/views/pages/process/router.js
@@ -354,7 +354,7 @@ let routerArr = [
     name: 'eoa-template-manage',
     component: eoaTemplateManage,
     meta: {
-      title: 'EOA模板',
+      title: $t('router.process.eoatemplate'),
       ismenu: true,
       icon: 'tsfont-shitu',
       authority: '',
@@ -366,7 +366,7 @@ let routerArr = [
     name: 'eoa-template-edit',
     component: eoaTemplateEdit,
     meta: {
-      title: 'EOA模板编辑',
+      title: $t('router.process.eoatemplateedit'),
       ismenu: false,
       icon: 'tsfont-shitu',
       authority: '',
-- 
Gitee


From b152e97e5a9fc25500771a279bd54f55546ca1a2 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Mon, 25 Dec 2023 14:28:44 +0800
Subject: [PATCH 5/6] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=20=E9=A5=BF?=
 =?UTF-8?q?=E5=93=A6=E5=95=8A=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/process/router.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/pages/process/router.js b/src/views/pages/process/router.js
index aa129535f..7cdac8caf 100644
--- a/src/views/pages/process/router.js
+++ b/src/views/pages/process/router.js
@@ -357,7 +357,7 @@ let routerArr = [
       title: $t('router.process.eoatemplate'),
       ismenu: true,
       icon: 'tsfont-shitu',
-      authority: '',
+      authority: 'EOA_BASE',
       type: 'flow'
     }
   },
@@ -369,7 +369,7 @@ let routerArr = [
       title: $t('router.process.eoatemplateedit'),
       ismenu: false,
       icon: 'tsfont-shitu',
-      authority: '',
+      authority: 'EOA_BASE',
       type: 'flow'
     }
   }
-- 
Gitee


From 317157b04365a549f2c3c01615928f470a34f897 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Mon, 25 Dec 2023 14:32:42 +0800
Subject: [PATCH 6/6] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=20eoa=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/process/eoa/eoa-template-edit.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/views/pages/process/eoa/eoa-template-edit.vue b/src/views/pages/process/eoa/eoa-template-edit.vue
index 43e43bf79..8cea98381 100644
--- a/src/views/pages/process/eoa/eoa-template-edit.vue
+++ b/src/views/pages/process/eoa/eoa-template-edit.vue
@@ -4,7 +4,6 @@
     <TsContain>
       <template v-slot:navigation>
         <span v-if="$hasBack()" class="tsfont-left text-action" @click="$back()">{{ $getFromPage() }}</span>
-        <span v-else class="tsfont-left text-action" @click="back()">{{ $t('page.back') }}</span>
       </template>
       <template v-slot:topLeft>
         <div v-if="!$utils.isEmpty(eoaConfig)" class="text-title">
@@ -233,11 +232,6 @@ export default {
         }
       });
     },
-    back() {
-      this.$router.push({
-        path: '/eoa-template-manage'
-      });
-    },
     deleteStep(index) {
       this.stepList.splice(index, 1);
     },
-- 
Gitee