Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -4,82 +4,109 @@
  * @LastEditTime: 2023-05-17 10:42:01
  * @LastEditTime: 2023-05-17 10:42:01
 -->
 -->
 <template>
 <template>
-  <dialogBox title="转出" @submitForm="submitForm" saveButton="确认转出" width="45%" height='30%' @closeDialog="closeDialog"
-    v-model="value">
   <div class="from-clues">
   <div class="from-clues">
     <!-- 表单部分 -->
     <!-- 表单部分 -->
     <div class="from-clues-header">
     <div class="from-clues-header">
-        <el-form :model="queryForm" ref="queryForm" label-width="120px">
+      <el-form ref="queryForm" label-width="180px" v-if="this.formData.obj">
         <el-form-item label="下一环节名称:">
         <el-form-item label="下一环节名称:">
-            {{this.tableData.taskName}}
+          {{ this.formData.obj.taskName }}
         </el-form-item>
         </el-form-item>
         <el-form-item label="下一环节办理人:">
         <el-form-item label="下一环节办理人:">
-            {{this.usernames}}
+          {{ this.formData.obj.usernames.join("，") }}
+        </el-form-item>
+      </el-form>
+      <el-form ref="queryForm" label-width="180px" v-else>
+        <el-form-item label="">
+        此环节为流程最后环节，转出后流程将结束
         </el-form-item>
         </el-form-item>
-
       </el-form>
       </el-form>
+      <div class="invalid-reson">转出原因：</div>
+      <el-input
+        v-model="shyj"
+        placeholder="请输入转出原因"
+        type="textarea"
+        :rows="4"
+      ></el-input>
+      <el-button style="float: right" @click="cancelBack">取消转出</el-button>
+      <el-button type="primary" @click="submitForm" style="float: right"
+        >确定转出</el-button
+      >
     </div>
     </div>
   </div>
   </div>
-  </dialogBox>
 </template>
 </template>
 
 
 <script>
 <script>
-  import { completeTask, getNextLinkInfo } from "@/api/workFlow.js"
-  export default {
-    components: {
-    },
+import { completeTask, getNextLinkInfo } from "@/api/workFlow.js";
+import { popupCacel } from "@/utils/popup.js";
+export default {
+  components: {},
   props: {
   props: {
-      value: { type: Boolean, default: false },
-      queryForm: { type: Object, default: false }
+    formData: {
+      type: Object,
+      default: {},
+    },
   },
   },
-    data () {
+  data() {
     return {
     return {
-        tableData: {},
-        usernames: '',
-      }
+      queryForm: {},
+      shyj: "",
+    };
   },
   },
-    methods: {
-      /**
-       * @description: tablelistFn
-       * @author: renchao
-       */
-      tablelistFn () {
-        getNextLinkInfo(this.queryForm).then(res => {
-          if (res.code === 200) {
-            this.tableData = res.result
-            if (res.result.usernames) {
-              this.usernames = String(res.result.usernames)
-            }
-          }
-        })
+  mounted() {
+    //  this.queryForm= this.queryForm.obj
+    console.log("formDataformDataformData", this.formData);
   },
   },
+  methods: {
     /**
     /**
      * @description: submitForm
      * @description: submitForm
      * @author: renchao
      * @author: renchao
      */
      */
-      submitForm () {
-        completeTask(this.queryForm).then(res => {
+    submitForm() {
+      this.queryForm = {
+        bsmSlsq: this.formData.bsmSlsq,
+        shyj: this.shyj,
+        stepform: JSON.stringify(this.formData.tabList),
+      };
+      console.log("this.queryForm", this.queryForm);
+      completeTask(this.queryForm).then((res) => {
         if (res.code === 200) {
         if (res.code === 200) {
-            this.$message.success('转件成功')
+          this.$message.success("转件成功");
+          // setTimeout(() => {
+          //   window.opener = null;
+          //   window.open("about:blank", "_self");
+          //   window.close();
+          //   this.$emit("input", false);
+          // }, 1000);
+            popupCacel();
                setTimeout(() => {
                setTimeout(() => {
-              window.opener = null;
-              window.open("about:blank", "_self");
+            // window.opener.location.reload(); //刷新父窗口
+            if (window.opener && window.opener.getBpageList) {
+              window.opener.getBpageList();
+            } else {
+              window.opener.frames[0].getBpageList();
+            }
             window.close();
             window.close();
-              this.$emit('input', false)
+            this.$emit("input", false);
           }, 1000);
           }, 1000);
+        }else{
+          this.$message.error(res.message);
         }
         }
-        })
+      });
     },
     },
     /**
     /**
      * @description: closeDialog
      * @description: closeDialog
      * @author: renchao
      * @author: renchao
      */
      */
-      closeDialog () {
-        this.$emit("input", false);
+    cancelBack() {
+      popupCacel();
     },
     },
-    }
-  }
+  },
+};
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
-  @import "~@/styles/mixin.scss";
+@import "~@/styles/mixin.scss";
+.el-button {
+  margin-top: 20px;
+  margin-right: 10px;
+}
 </style>
 </style>

@@ -403,7 +403,7 @@ export default {
         djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
         djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
         dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
         dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
         djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
         djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
-        djlxrules: [{ required: true, message: "登记类型", trigger: "blur" }],
+        djlxrules: [{ required: true, message: "登记类型", trigger: "change" }],
       },
       },
     };
     };
   },
   },

@@ -325,18 +325,25 @@ export default {
      * @author: renchao
      * @author: renchao
      */
      */
     sendToNext (obj) {
     sendToNext (obj) {
-      this.$popupDialog("转出", "workflow/components/zc", {
+      this.$popupDialog("转出", "djbworkflow/components/zc", {
+        obj:obj,
         bsmSlsq: this.bsmSlsq,
         bsmSlsq: this.bsmSlsq,
-        bestepid: this.bestepid
+        tabList: this.tabList
       }, '800px', true)
       }, '800px', true)
     },
     },
+    //转出最后一个流程
     /**
     /**
-     * @description: sendToEnd
+     * @description: 转出最后一个流程
      * @author: renchao
      * @author: renchao
      */
      */
     sendToEnd () {
     sendToEnd () {
-
+      this.$popupDialog("转出", "djbworkflow/components/zc", {
+        obj:"",
+        bsmSlsq: this.bsmSlsq,
+        tabList: this.tabList
+      }, '800px', true)
     },
     },
+
     //批量操作
     //批量操作
     /**
     /**
      * @description: 批量操作
      * @description: 批量操作

@@ -154,18 +154,10 @@
                 }
                 }
               })
               })
                }
                }
-
-
-
             });
             });
-
-
-
-
           });
           });
         }
         }
       },
       },
-
       // 获取右侧选项卡
       // 获取右侧选项卡
       /**
       /**
        * @description: 获取右侧选项卡
        * @description: 获取右侧选项卡

@@ -4,82 +4,109 @@
  * @LastEditTime: 2023-05-17 10:42:01
  * @LastEditTime: 2023-05-17 10:42:01
 -->
 -->
 <template>
 <template>
-  <dialogBox title="转出" @submitForm="submitForm" saveButton="确认转出" width="45%" height='30%' @closeDialog="closeDialog"
-    v-model="value">
   <div class="from-clues">
   <div class="from-clues">
     <!-- 表单部分 -->
     <!-- 表单部分 -->
     <div class="from-clues-header">
     <div class="from-clues-header">
-        <el-form :model="queryForm" ref="queryForm" label-width="120px">
+      <el-form ref="queryForm" label-width="180px" v-if="this.formData.obj">
         <el-form-item label="下一环节名称:">
         <el-form-item label="下一环节名称:">
-            {{this.tableData.taskName}}
+          {{ this.formData.obj.taskName }}
         </el-form-item>
         </el-form-item>
         <el-form-item label="下一环节办理人:">
         <el-form-item label="下一环节办理人:">
-            {{this.usernames}}
+          {{ this.formData.obj.usernames.join("，") }}
+        </el-form-item>
+      </el-form>
+      <el-form ref="queryForm" label-width="180px" v-else>
+        <el-form-item label="">
+        此环节为流程最后环节，转出后流程将结束
         </el-form-item>
         </el-form-item>
-
       </el-form>
       </el-form>
+      <div class="invalid-reson">转出原因：</div>
+      <el-input
+        v-model="shyj"
+        placeholder="请输入转出原因"
+        type="textarea"
+        :rows="4"
+      ></el-input>
+      <el-button style="float: right" @click="cancelBack">取消转出</el-button>
+      <el-button type="primary" @click="submitForm" style="float: right"
+        >确定转出</el-button
+      >
     </div>
     </div>
   </div>
   </div>
-  </dialogBox>
 </template>
 </template>
 
 
 <script>
 <script>
-  import { completeTask, getNextLinkInfo } from "@/api/workFlow.js"
-  export default {
-    components: {
-    },
+import { completeTask, getNextLinkInfo } from "@/api/workFlow.js";
+import { popupCacel } from "@/utils/popup.js";
+export default {
+  components: {},
   props: {
   props: {
-      value: { type: Boolean, default: false },
-      queryForm: { type: Object, default: false }
+    formData: {
+      type: Object,
+      default: {},
+    },
   },
   },
-    data () {
+  data() {
     return {
     return {
-        tableData: {},
-        usernames: '',
-      }
+      queryForm: {},
+      shyj: "",
+    };
   },
   },
-    methods: {
-      /**
-       * @description: tablelistFn
-       * @author: renchao
-       */
-      tablelistFn () {
-        getNextLinkInfo(this.queryForm).then(res => {
-          if (res.code === 200) {
-            this.tableData = res.result
-            if (res.result.usernames) {
-              this.usernames = String(res.result.usernames)
-            }
-          }
-        })
+  mounted() {
+    //  this.queryForm= this.queryForm.obj
+    console.log("formDataformDataformData", this.formData);
   },
   },
+  methods: {
     /**
     /**
      * @description: submitForm
      * @description: submitForm
      * @author: renchao
      * @author: renchao
      */
      */
-      submitForm () {
-        completeTask(this.queryForm).then(res => {
+    submitForm() {
+      this.queryForm = {
+        bsmSlsq: this.formData.bsmSlsq,
+        shyj: this.shyj,
+        stepform: JSON.stringify(this.formData.tabList),
+      };
+      console.log("this.queryForm", this.queryForm);
+      completeTask(this.queryForm).then((res) => {
         if (res.code === 200) {
         if (res.code === 200) {
-            this.$message.success('转件成功')
+          this.$message.success("转件成功");
+          // setTimeout(() => {
+          //   window.opener = null;
+          //   window.open("about:blank", "_self");
+          //   window.close();
+          //   this.$emit("input", false);
+          // }, 1000);
+            popupCacel();
                setTimeout(() => {
                setTimeout(() => {
-              window.opener = null;
-              window.open("about:blank", "_self");
+            // window.opener.location.reload(); //刷新父窗口
+            if (window.opener && window.opener.getBpageList) {
+              window.opener.getBpageList();
+            } else {
+              window.opener.frames[0].getBpageList();
+            }
             window.close();
             window.close();
-              this.$emit('input', false)
+            this.$emit("input", false);
           }, 1000);
           }, 1000);
+        }else{
+          this.$message.error(res.message);
         }
         }
-        })
+      });
     },
     },
     /**
     /**
      * @description: closeDialog
      * @description: closeDialog
      * @author: renchao
      * @author: renchao
      */
      */
-      closeDialog () {
-        this.$emit("input", false);
+    cancelBack() {
+      popupCacel();
     },
     },
-    }
-  }
+  },
+};
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
-  @import "~@/styles/mixin.scss";
+@import "~@/styles/mixin.scss";
+.el-button {
+  margin-top: 20px;
+  margin-right: 10px;
+}
 </style>
 </style>

@@ -274,109 +274,24 @@ export default {
      * @author: renchao
      * @author: renchao
      */
      */
      sendToNext (obj) {
      sendToNext (obj) {
-      const h = this.$createElement;
-      this.$msgbox({
-        title: "您确定转出吗?",
-        message: h("div", { style: "margin: auto" }, [
-          h("span", null, "下个环节名称："),
-          h("i", { style: "color: teal" }, obj.taskName),
-          h("div", null, ""),
-          h("span", null, "下个环节经办人： "),
-          h("i", { style: "color: teal" }, obj.usernames.join("，")),
-        ]),
-        showCancelButton: true,
-        beforeClose: (action, instance, done) => {
-          if (action === "confirm") {
-            instance.confirmButtonLoading = true;
-            instance.confirmButtonText = "执行中...";
-            completeTask({
+      this.$popupDialog("转出", "djbworkflow/components/zc", {
+        obj:obj,
         bsmSlsq: this.bsmSlsq,
         bsmSlsq: this.bsmSlsq,
-              shyj: "this.bestepid",
-              stepform: JSON.stringify(this.tabList),
-            }).then((res) => {
-              if (res.code === 200) {
-                instance.confirmButtonLoading = false;
-                this.$message.success("转件成功");
-                // window.opener.location.reload(); //刷新父窗口
-                if (window.opener && window.opener.getBpageList) {
-                  window.opener.getBpageList();
-                } else {
-                  window.opener.frames[0].getBpageList();
-                }
-                window.close();
-                this.$emit("input", false);
-              } else {
-                instance.confirmButtonLoading = false;
-                instance.confirmButtonText = "确定";
-                let msgArr = res.message.split('；'),
-                  listMsg = []
-                msgArr.forEach(item => {
-                  let parts = item.split('：')
-                  listMsg.push({ ywh: parts[0], msg: parts[1] })
-                })
-                this.$msgbox.close()
-                ywPopupDialog("转出错误明细", "workflow/components/dialog/dblist", { result: listMsg }, '33%', true)
-              }
-            });
-          } else {
-            done();
-          }
-        },
-      }).then((action) => {
-        this.$message({
-          type: "info",
-          message: "action: " + action,
-        });
-      });
+        tabList: this.tabList
+      }, '800px', true)
     },
     },
+    //转出最后一个流程
     /**
     /**
-     * @description: sendToEnd
+     * @description: 转出最后一个流程
+     * @param {*} obj
      * @author: renchao
      * @author: renchao
      */
      */
-    sendToEnd () {
-      let that = this
-      const h = this.$createElement;
-      this.$msgbox({
-        title: "您确定转出吗？",
-        message: "此环节为流程最后环节，转出后流程将结束",
-        showCancelButton: true,
-        beforeClose: (action, instance, done) => {
-          if (action === "confirm") {
-            instance.confirmButtonLoading = true;
-            instance.confirmButtonText = "执行中...";
-            completeTask({
+    sendToNext (obj) {
+      this.$popupDialog("转出", "djbworkflow/components/zc", {
+        obj:"",
         bsmSlsq: this.bsmSlsq,
         bsmSlsq: this.bsmSlsq,
-              shyj: "this.bestepid",
-              stepform: JSON.stringify(this.tabList),
-            }).then((res) => {
-              if (res.code === 200) {
-                instance.confirmButtonLoading = false;
-                that.$message.success("转件成功");
-                localStorage.setItem('transfer', true)
-                // window.opener.location.reload(); //刷新父窗口
-                if (window.opener && window.opener.getBpageList) {
-                  window.opener.getBpageList();
-                } else {
-                  window.opener.frames[0].getBpageList();
-                }
-                window.close();
-                that.$emit("input", false);
-              } else {
-                instance.confirmButtonLoading = false;
-                instance.confirmButtonText = "确定";
-                this.$message.error(res.message);
-              }
-            })
-          } else {
-            done();
-          }
-        },
-      }).then((action) => {
-        this.$message({
-          type: "info",
-          message: "action: " + action
-        })
-      })
+        tabList: this.tabList
+      }, '800px', true)
     },
     },
     //批量操作
     //批量操作
     /**
     /**