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

@@ -127,6 +127,7 @@
       // 单选
       singleElection (row) {
         this.selected = this.data.indexOf(row);
+        this.$emit('row-click', val)
       },
 
       tableRowClassName ({ row, rowIndex }) {

@@ -130,8 +130,8 @@
 
   .ls-title {
     padding: 16px;
-    color: #ffffff;
-    background: linear-gradient(3deg, #409eff, #a7cbee);
+    color: #4a4e56;
+    // background: linear-gradient(3deg, #edf0f7, #f4f5f6);
     font-size: 16px;
   }
 
@@ -167,7 +167,7 @@
     right: 26px;
     font-size: 24px;
     cursor: pointer;
-    color: #409eff;
+    color: #4a4e56;
   }
 
   /deep/.el-loading-mask {

+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-07-12 16:33:18
+-->
+<template>
+  <div class='dblistDialog'>
+    <el-table
+      v-if="formData.result"
+      :data="formData.result"
+      height="200">
+      <el-table-column
+        prop="ywh"
+        width="110"
+        label="业务号">
+      </el-table-column>
+      <el-table-column
+        prop="msg"
+        label="详细信息">
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+  export default {
+    props: {
+      formData: {
+        type: Object,
+        default: {}
+      }
+    }
+  }
+</script>
+<style scoped lang='scss'>
+  @import "~@/styles/public.scss";
+</style>
\ No newline at end of file

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-12 14:23:25
+ * @LastEditTime: 2023-07-12 16:37:53
  */
 import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js";
 import { getPrintTemplateByCode } from "@/api/system";
@@ -16,8 +16,8 @@ import {
   getNextLinkInfo,
 } from "@/api/fqsq.js";
 import { mapGetters } from 'vuex'
-import { log } from "bpmn-js-token-simulation";
 import { getZrzbsm } from "@/api/lpb";
+import { ywPopupDialog } from "@/utils/popup.js";
 export default {
   data () {
     return {
@@ -115,7 +115,6 @@ export default {
           getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => {
             if (res.code == 200) {
               getPrintApplicationInfo(this.currentSelectProps).then(infoRes => {
-                console.log(infoRes, 'infoRes');
                 if (infoRes.code == 200) {
                   //打开模板设计
                   let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
@@ -193,7 +192,7 @@ export default {
           formdata.append("bsmSlsq", this.bsmSlsq);
           formdata.append("bestepid", this.bestepid);
           this.$confirm("请确认是否登簿", "提示", {
-            iconClass: "el-icon-question", //自定义图标样式
+            iconClass: "el-icon-info", //自定义图标样式
             confirmButtonText: "确认", //确认按钮文字更换
             cancelButtonText: "取消", //取消按钮文字更换
             showClose: true, //是否显示右上角关闭按钮
@@ -202,18 +201,20 @@ export default {
             record(formdata).then((res) => {
               if (res.code === 200) {
                 if (res.result.length === 1) {
-                  res.result[0].state ? that.$alert("登簿成功!") : that.$alert(res.result[0].msg);;
+                  console.log(res.result, 'res.result');
+                  res.result[0].state ? that.$message({
+                    message: '登簿成功',
+                    type: 'success'
+                  }) : ywPopupDialog("登簿错误明细", "workflow/components/dialog/dblist", { result: res.result }, '30%')
                 }
                 else {
-                  that.$alert('<div>' + res.result[0].ywh + ',' + res.result[0].msg + '</div>', '登簿明细', {
-                    dangerouslyUseHTMLString: true
-                  });
+                  ywPopupDialog("登簿错误明细", "workflow/components/dialog/dblist", { result: res.result }, '30%')
                 }
               } else {
-                that.$alert(res.message);
+                that.$message.error(res.message)
               }
-            });
-          });
+            })
+          })
           break;
         case "rm":
           this.del()

@@ -139,7 +139,7 @@
               this.$popupCacel()
 
             } else {
-              ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
             }
           })
         } else {

@@ -120,7 +120,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
         })
       },

@@ -242,7 +242,7 @@
               }
               this.$popupCacel()
             } else {
-              ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
             }
           })
         } else {
@@ -259,7 +259,7 @@
               store.dispatch('user/refreshPage', true);
               this.$popupCacel()
             } else {
-              ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
             }
           })
         }

@@ -109,7 +109,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
         })
       },

@@ -106,7 +106,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
         })
       },

@@ -134,7 +134,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
         })
       },

@@ -162,7 +162,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
         })
       },

@@ -111,7 +111,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
         })
       },

@@ -111,7 +111,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
         })
       },

@@ -119,7 +119,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
         })
       },

@@ -247,7 +247,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
         })
       },

@@ -116,7 +116,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
         })
       },

@@ -119,7 +119,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
         })
       },

@@ -111,7 +111,7 @@
               this.$popupCacel()
             }
           } else {
-            ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
         })
       },

@@ -111,7 +111,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
         })
       },

@@ -112,7 +112,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
         })
       },