首页处理前往

src/views/system/component/Account.vue

@@ -39,6 +39,18 @@
             required: true,
             message: '请输入密码',
             trigger: 'blur',
+          },{
+            validator: (rule, value, callback) => {
+              let exg = /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[~!@#$%^&*])[\da-zA-Z~!@#$%^&*]{8,}$/
+              if (value === '') {
+                callback(new Error('请输入密码'));
+              } else if (!exg.test(value)) {
+                callback(new Error('需8位以上并且包含字母、数字和特殊符号'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'blur'
           }]
         },
       }

src/views/system/workerComponents/department.vue

@@ -7,7 +7,7 @@
       <i class="el-icon-more" style="float: right; font-size: 20px"></i>
     </div>
 
-    <div style="position: relative">
+    <div style="position: relative;height: 100%;width: 100%;">
       <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
         <Table :height="tableHeight" size="small" :data="departmentList" :columns="table"></Table>
       </div>
@@ -161,4 +161,8 @@ export default {
 ::v-deep .el-progress__text {
   word-break: keep-all;
 }
+::v-deep .el-card__body {
+  width: 100%;
+  height: calc(100% - 58px);
+}
 </style>

src/views/system/workerComponents/toDo.vue

@@ -7,7 +7,7 @@
       <i class="el-icon-more" style="float: right; font-size: 20px"></i>
     </div>
 
-    <div style="position: relative">
+    <div style="position: relative;height: 100%;width: 100%;">
       <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
         <Table
           :height="tableHeight"
@@ -89,37 +89,71 @@ export default {
         {
           title: "查看",
           key: "show",
-          width: 120,
+          width: 180,
           render: (h, { row }) => {
-            return h(
-              "Button",
-              {
-                props: {
-                  type: "primary",
-                  size: "small",
-                  ghost: true,
+            return h('div',[
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "primary",
+                    size: "small",
+                    ghost: true,
+                  },
+                  on: {
+                    ["click"]: (_) => {
+                      if(row.from_type === 'contract') {
+                        this.$router.push({
+                          path: '/contract/contract/contractList',
+                          query: {
+                            keyword:/\[(.*?)\]/.exec(row.title) ? /\[(.*?)\]/.exec(row.title)[1] : ''
+                          }
+                        })
+                      } else {
+                        window.open(
+                          `${process.env.VUE_APP_OUT_OLD}/flow/view/${row.id}?auth_token=${this.$store.getters.oa_token}`,
+                          "edit",
+                          `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
+                        );
+                      }
+                    },
+                  },
                 },
-                on: {
-                  ["click"]: (_) => {
-                    if(row.from_type === 'contract') {
-                      this.$router.push({
-                        path: '/contract/contract/contractList',
-                        query: {
-                          keyword:/\[(.*?)\]/.exec(row.title) ? /\[(.*?)\]/.exec(row.title)[1] : ''
-                        }
-                      })
-                    } else {
-                      window.open(
-                        `${process.env.VUE_APP_OUT_OLD}/flow/view/${row.id}?auth_token=${this.$store.getters.oa_token}`,
-                        "edit",
-                        `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
-                      );
-                    }
+                "查看"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "primary",
+                    size: "small",
+                    ghost: true,
+                  },
+                  style: {
+                    "margin-left": "6px"
+                  },
+                  on: {
+                    ["click"]: (_) => {
+                      if(row.from_type === 'contract') {
+                        this.$router.push({
+                          path: '/contract/contract/contractList',
+                          query: {
+                            keyword:/\[(.*?)\]/.exec(row.title) ? /\[(.*?)\]/.exec(row.title)[1] : ''
+                          }
+                        })
+                      } else {
+                        window.open(
+                          `${process.env.VUE_APP_OUT_OLD}/flow/deal/${row.id}?auth_token=${this.$store.getters.oa_token}`,
+                          "edit",
+                          `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
+                        );
+                      }
+                    },
                   },
                 },
-              },
-              "查看"
-            );
+                "办理"
+              )
+            ]);
           },
         },
         // {
@@ -211,4 +245,9 @@ export default {
 };
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+::v-deep .el-card__body {
+  width: 100%;
+  height: calc(100% - 58px);
+}
+</style>

src/views/system/workerComponents/type.vue

@@ -7,7 +7,7 @@
       <i class="el-icon-more" style="float: right; font-size: 20px"></i>
     </div>
 
-    <div id="type-card-body" style="position: relative">
+    <div id="type-card-body" style="position: relative;height: 100%;width: 100%;">
       <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
         <Table style="width: 100%;" :height="tableHeight" size="small" :data="departmentList" :columns="table"></Table>
       </div>
@@ -278,4 +278,9 @@ export default {
 };
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+::v-deep .el-card__body {
+  width: 100%;
+  height: calc(100% - 58px);
+}
+</style>