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

@@ -21,7 +21,7 @@ Vue.prototype.$endLoading = endLoadingSubCount
 import { popupDialog, popupCacel } from "./utils/popup.js";
 // 全局加载
 Vue.prototype.$popupDialog = popupDialog
-Vue.prototype.$popupCacel = popupDialog
+Vue.prototype.$popupCacel = popupCacel
 
 
 import { theme } from "@/directive/theme.js"

+/deep/.el-dialog__header {
+  margin-bottom: 10px;
+  color: #4A4A4A;
+  background: linear-gradient(3deg, #409EFF, #a7cbee);
+  border-bottom: 1px solid #E4EBF4;
+}
+
+.el-dialog__body {
+  padding-top: 10px;
+  padding-bottom: 0;
+}
+
+/deep/.el-dialog__headerbtn .el-dialog__close {
+  color: #6B7A99 !important;
+  position: relative;
+  top: -6px;
+}

@@ -210,6 +210,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+@import "~@/styles/dialogBoxheader.scss";
 .submit-button {
   text-align: center;
   height: 52px;

@@ -191,12 +191,22 @@ export default {
 
     // 修改
     editClick (index, row) {
+      //   popupDialog("申请人信息", "workflow/components/addQlr", {
+      //     showButton: this.$route.query.viewtype ? false : true,
+      //   dataIndex :index,
+      //  details :row,
+      //  isaddupdate :false
+      // });
       this.dataIndex = index
       this.dialog = true
       this.details = row
       this.isaddupdate = false
     },
     queryViewClick (index, row) {
+      //   popupDialog("申请人信息", "workflow/components/addQlr", {
+      //     showButton: this.$route.query.viewtype ? false : true,
+      //   details: row,
+      // });
       this.dialog = true
       this.details = row
     }
@@ -205,4 +215,4 @@ export default {
 </script>
 <style scoped lang='scss'>
 
-</style>
\ No newline at end of file
+</style>