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

-/*
- * @Description: api请求配置文件
- * @Autor: renchao
- * @LastEditTime: 2023-04-18 14:14:07
- * 这个文件不需要，谁提交谁记得改回来，不改回来，就是脑残。
- * 这个文件不需要，谁提交谁记得改回来，不改回来，就是脑残。
- * 这个文件不需要，谁提交谁记得改回来，不改回来，就是脑残。
- * 这个文件不需要，谁提交谁记得改回来，不改回来，就是脑残。
- * 这个文件不需要，谁提交谁记得改回来，不改回来，就是脑残。
- */
-export default {
-  SERVERAPI: 'bdcdj'
-}
\ No newline at end of file

@@ -178,4 +178,3 @@ export default {
   background: none;
 }
 </style>
-  
\ No newline at end of file

@@ -8,11 +8,16 @@
     <lb-table :column="columns" :data="formData.dataList" :maxHeight="460" :heightNumSetting="true" :pagination="false"
       @selection-change="handleSelectionChange">
     </lb-table>
+    <div class="text-center">
+      <el-button @click="$popupCacel">取消</el-button>
+      <el-button type="primary" @click="childFn" plain>确定</el-button>
+    </div>
   </div>
 </template>
 <script>
-import { deleteFlow } from "@/api/ywbl.js"
-export default {
+  import { deleteFlow } from "@/api/ywbl.js"
+  import store from '@/store/index.js'
+  export default {
     components: {},
     props: {
       formData: {
@@ -49,9 +54,11 @@ export default {
       childFn () {
         var formdata = new FormData();
         formdata.append("bsmSldyList", this.selectBdcdy);
-      formdata.append("bsmSlsq",this.formData.bsmSlsq);
+        formdata.append("bsmSlsq", this.formData.bsmSlsq);
         deleteFlow(formdata).then(res => {
           if (res.code == 200) {
+            this.$popupCacel();
+            store.dispatch('user/refreshPage', true);
             this.$message.success("删除成功");
           } else {
             this.$message.error(res.message)
@@ -65,8 +72,7 @@ export default {
         })
       }
     }
-}
+  }
 </script>
 <style scoped lang='scss'>
-
 </style>

@@ -167,7 +167,6 @@
       },
       // 下拉列表切换
       handleSelect (val) {
-
         this.taskCommentList = (this.formData.allCommentList || []).filter(item => {
           return item.taskDefKey === val
         })
@@ -235,7 +234,6 @@
         }
         if (Array.isArray(finishedTaskSet)) {
           finishedTaskSet.forEach(item => canvas.addMarker(item, 'success'))
-          console.log(finishedTaskSet, 'finishedTaskSet');
         }
         if (Array.isArray(unfinishedTaskSet)) {
           unfinishedTaskSet.forEach(item => canvas.addMarker(item, 'primary'))

@@ -11,6 +11,7 @@ import {
   completeTask,
   getNextLinkInfo,
 } from "@/api/fqsq.js";
+import { mapGetters } from 'vuex'
 import { log } from "bpmn-js-token-simulation";
 export default {
   data () {
@@ -29,6 +30,16 @@ export default {
       batchButtonName: '',
     }
   },
+  computed: {
+    ...mapGetters(['isRefresh'])
+  },
+  watch: {
+    isRefresh: {
+      handler (newVal, oldVal) {
+        if (newVal) this.loadBdcdylist()
+      }
+    }
+  },
   mounted () {
     this.flowInitParam();
     this.loadBdcdylist();
@@ -361,18 +372,12 @@ export default {
     },
     //批量操作
     handleBatchDel () {
-      let that = this;
-      this.$popup("批量删除", "workflow/components/batchDel", {
+      this.$popupDialog("批量删除", "workflow/components/batchDel", {
         width: "50%",
-        btnShow: true,
-        height: "600px",
-        formData: {
+        btnShow: false,
         bsmSlsq: this.bsmSlsq,
         dataList: this.unitData,
-        },
-        confirm: function () {
-          that.loadBdcdylist();
-        }
+
       })
     },
     handleChange (file) {