修改转件及退回功能页面分类

@@ -155,7 +155,7 @@ export default {
           }, '90%', true)
           break;
         case "back": //退回按钮
-          this.$popupDialog("退回", "workflow/components/th", {
+          this.$popupDialog("退回", "workflow/top/back/index", {
             bsmSlsq: this.bsmSlsq,
             bestepid: this.bestepid ? this.bestepid : ''
           }, '800px', true)

-<!--
- * @Description:
- * @Autor: renchao
- * @LastEditTime: 2023-08-02 14:24:20
--->
-<template>
-  <div class="from-clues">
-    <!-- 表单部分 -->
-    <div class="from-clues-header">
-      <div class="title">请选择要退回到的环节：</div>
-      <el-form ref="queryForm" label-width="90px">
-        <ul style="margin-bottom: 15px">
-          <li
-            v-for="(item, index) in dataList"
-            class="listDetail"
-            :key="index"
-            @click="changeSelectItem(item)">
-            <p class="icon">
-              <el-radio
-                v-model="selectActivity"
-                :label="item.activityId"
-                @change="changeSelectItem(item)"></el-radio>
-            </p>
-            <p>{{ item.activityName }}</p>
-            <p v-for="(child, childIndex) in item.assignee" :key="childIndex">
-              {{ child.name }}
-            </p>
-          </li>
-        </ul>
-        <div class="title">退回意见：</div>
-        <el-form-item>
-          <el-input
-            class="textArea"
-            type="textarea"
-            v-model="outstepopinion"
-            placeholder="请输入退回意见"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button style="float:right" @click="cancelBack">取消</el-button>
-          <el-button type="primary" @click="onSubmit" style="float:right">退回</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
-  </div>
-</template>
-
-<script>
-
-  import { getTaskBackNode, sendBackTask } from "@/api/workFlow.js"
-  import { popupCacel } from "@/utils/popup.js";
-
-  export default {
-    props: {
-      formData: {
-        type: Object,
-        default: {},
-      },
-    },
-    data () {
-      return {
-        selectActivity: "",
-        dataList: [],
-        outstepopinion: "",
-        selectItem: {},
-      };
-    },
-    created () {
-      this.getBackNode();
-    },
-    methods: {
-      /**
-       * @description: onSubmit
-       * @author: renchao
-       */
-      onSubmit () {
-        if (!this.outstepopinion) {
-          this.$message.error("请填写退回意见");
-        } else {
-          sendBackTask({
-            bsmSlsq: this.formData.bsmSlsq,
-            backNodeList: [this.selectItem],
-            message: this.outstepopinion
-          }).then((res) => {
-            if (res.code == 200) {
-              this.$message.success("退回成功");
-              setTimeout(() => {
-                if (window.opener && window.opener.getBpageList) {
-                  window.opener.getBpageList();
-                } else {
-                  window.opener.frames[0].getBpageList();
-                }
-                window.close();
-                this.$emit("input", false);
-              }, 1000);
-            } else {
-              this.$message.error(res.message);
-            }
-          });
-        }
-      },
-      /**
-       * @description: changeSelectItem
-       * @param {*} item
-       * @author: renchao
-       */
-      changeSelectItem (item) {
-        this.selectItem = item;
-        this.selectActivity = item.activityId;
-      },
-      //获取可回退环节信息
-      /**
-       * @description: 获取可回退环节信息
-       * @author: renchao
-       */
-      getBackNode () {
-        getTaskBackNode(this.formData).then((res) => {
-          if (res.code == 200) {
-            this.dataList = res.result;
-            console.log("this.dataList", this.dataList);
-            if (res.result) {
-              this.selectActivity = res.result[0].activityId;
-              this.selectItem = res.result[0];
-            }
-          }
-        });
-      },
-
-      /**
-       * @description: cancelBack
-       * @author: renchao
-       */
-      cancelBack () {
-        popupCacel();
-      }
-    }
-  }
-</script>
-<style scoped lang="scss">
-  @import "~@/styles/mixin.scss";
-
-  .listDetail {
-    display: flex;
-    align-items: center;
-    width: 100%;
-
-    p {
-      line-height: 30px;
-      height: 30px;
-      @include flex-center;
-      flex: 1;
-      width: 100%;
-      border: 1px solid rgb(233, 235, 237);
-      margin-top: -1px;
-      margin-left: -1px;
-    }
-
-    .icon {
-      flex: 0 0 60px;
-    }
-  }
-
-  .title {
-    margin-bottom: 10px;
-  }
-
-  .textArea {
-    /deep/.el-textarea__inner {
-      min-height: 90px !important;
-    }
-  }
-  /deep/.el-radio .el-radio__label {
-    display: none;
-  }
-</style>

@@ -175,7 +175,7 @@ export default {
           })
           break;
         case "back": //退回按钮
-          this.$popupDialog("退回", "workflow/components/th", {
+          this.$popupDialog("退回", "workflow/top/back/index", {
             bsmSlsq: this.bsmSlsq,
             bestepid: this.bestepid ? this.bestepid : ''
           }, '800px', true)
@@ -283,10 +283,11 @@ export default {
      * @author: renchao
      */
     sendToNext (obj) {
-      this.$popupDialog("转出", "djbworkflow/components/zc", {
+      this.$popupDialog("转出", "workflow/top/transfer/index", {
         obj: obj,
         bsmSlsq: this.bsmSlsq,
-        tabList: this.tabList
+        tabList: this.tabList,
+        tshowidea: this.showidea
       }, '800px', true)
     },
     /**
@@ -295,10 +296,11 @@ export default {
      * @author: renchao
      */
     sendToEnd (obj) {
-      this.$popupDialog("转出", "djbworkflow/components/zc", {
+      this.$popupDialog("转出", "workflow/top/transfer/index", {
         obj: "",
         bsmSlsq: this.bsmSlsq,
-        tabList: this.tabList
+        tabList: this.tabList,
+        showidea: this.showidea
       }, '800px', true)
     },
     /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-19 16:43:43
+ * @LastEditTime: 2024-01-19 16:48:37
 -->
 <template>
   <div class="from-clues">
-    <!-- 表单部分 -->
     <div class="from-clues-header">
       <el-form ref="queryForm" label-width="180px" v-if="this.formData.obj">
         <el-form-item label="下一环节名称:">
@@ -20,20 +19,19 @@
           此环节为流程最后环节，转出后流程将结束
         </el-form-item>
       </el-form>
-      <div class="invalid-reson">审批意见：</div>
-      <el-input
-        class="opinion"
-        v-model="shyj"
-        placeholder="请输入审批意见"
-        type="textarea"
-        :rows="4"></el-input>
-      <!-- <el-button
-        class="opinion_btn"
-        @click="commonOpinion"
-        >常用意见</el-button
-      > -->
-      <el-button style="float: right" @click="cancelBack">取消转出</el-button>
-      <el-button type="primary" @click="submitForm" :loading="loading" style="float: right">确定转出</el-button>
+      <div v-if="this.formData.showidea">
+        <div class="invalid-reson">审批意见：</div>
+        <el-input
+          class="opinion"
+          v-model="shyj"
+          placeholder="请输入审批意见"
+          type="textarea"
+          :rows="4"></el-input>
+      </div>
+      <div style="text-align:center">
+        <el-button @click="cancelBack">取消转出</el-button>
+        <el-button type="primary" @click="submitForm">确定转出</el-button>
+      </div>
     </div>
   </div>
 </template>
@@ -41,69 +39,49 @@
 <script>
   import { completeTask, getNextLinkInfo } from "@/api/workFlow.js";
   import { popupCacel } from "@/utils/popup.js";
-  import { mapGetters } from 'vuex'
+  import { mapGetters } from "vuex";
   export default {
-    components: {},
-
     props: {
       formData: {
         type: Object,
         default: {},
       },
     },
-    computed: {
-      ...mapGetters(['yjsqOptions'])
-    },
+
     data () {
       return {
-        loading: false,
         queryForm: {},
         shyj: "",
       };
     },
-
-    watch: {
-      // yjsqOptions: {
-      //   handler (val) {
-      //      if(val){
-      //          this.shyj = val
-      //      }
-
-      //   },
-      // },
-    },
-    mounted () {
-      //  this.queryForm= this.queryForm.obj
-    },
     methods: {
       /**
        * @description: submitForm
        * @author: renchao
        */
       commonOpinion () {
-        this.$popupDialog(
-          "常用意见",
-          "workflow/components/dialog/commonOpinion",
-          {},
-          "70%",
-          true
-        );
+        this.$popup('常用意见', "workflow/components/dialog/commonOpinion", {
+          title: "常用意见",
+          width: '75%', // 初始化75% 不需要改的话 可以直接不要
+          formData: {}, // 父组件传给子组件的参数
+          cancel: function () { }, //取消事件的回调 没有按钮可以不需要
+          confirm: function () { } //确认事件的回调 没有按钮可以不需要
+        })
       },
       submitForm () {
-        this.loading = true
+        let that = this
         this.queryForm = {
           bsmSlsq: this.formData.bsmSlsq,
           shyj: this.shyj,
           stepform: JSON.stringify(this.formData.tabList),
         };
         completeTask(this.queryForm).then((res) => {
-          this.loading = false
           if (res.code === 200) {
-            this.$message.success("转件成功");
             popupCacel();
+            that.$message.success("转件成功");
             setTimeout(() => {
               window.close();
-              this.$emit("input", false);
+              that.$emit("input", false);
               if (window.opener && window.opener.getBpageList) {
                 window.opener.getBpageList();
               } else {
@@ -113,11 +91,11 @@
           } else {
             this.$message.error(res.message);
           }
-        }).catch(() => {
-          this.loading = false
-        })
+        }).catch((error) => {
+          // 可以添加适当的错误处理
+          this.$message.error("提交任务失败");
+        });
       },
-
       /**
        * @description: closeDialog
        * @author: renchao