:lipstick: Updating the UI and style files.

package.json

@@ -19,7 +19,7 @@
         "babel-polyfill": "^6.26.0",
         "classlist-polyfill": "^1.2.0",
         "driver.js": "^0.6.2",
-        "element-ui": "^2.4.5",
+        "element-ui": "^2.4.6",
         "file-saver": "^1.3.8",
         "html2canvas": "^1.0.0-alpha.12",
         "js-cookie": "^2.2.0",

src/const/crud/leavebill.js

@@ -25,7 +25,7 @@ export const tableOption = {
   'editBtn': false,
   'delBtn': false,
   'addBtn': false,
-  'dic': [],
+  'dicUrl': '/admin/dict/type/leave_status',
   'column': [
 	  {
       label: 'ID',
@@ -51,11 +51,19 @@ export const tableOption = {
     },
     {
         label: '备注',
-        prop: 'content'
+        prop: 'content',
+        type:'textarea',
+        minRows:2,
+        row:true,
+        span:24
     },
     {
         label: '状态',
-        prop: 'state'
+        prop: 'state',
+        type: 'select',
+        dicData: 'leave_status',
+        search: true,
+        addVisdiplay: false
     }
   ]
 }

src/const/crud/role.js

@@ -35,7 +35,6 @@ export const tableOption = {
         fixed: true,
         label: '角色名称',
         prop: 'roleName',
-        search: true,
         span: 24,
         rules: [{
                 required: true,
@@ -52,7 +51,6 @@ export const tableOption = {
     }, {
         label: '角色标识',
         prop: 'roleCode',
-        search: true,
         span: 24,
         rules: [{
                 required: true,
@@ -70,21 +68,8 @@ export const tableOption = {
         label: '所属部门',
         prop: 'roleDeptId',
         formsolt: true,
-        search: true,
         solt: true,
         span: 24,
-        rules: [{
-                required: true,
-                message: '所属部门不能为空',
-                trigger: 'blur'
-            },
-            {
-                min: 3,
-                max: 20,
-                message: '长度在 3 到 20 个字符',
-                trigger: 'blur'
-            }
-        ]
     }, {
         width: 180,
         label: '角色描述',
@@ -97,7 +82,6 @@ export const tableOption = {
         width: 180,
         label: '创建时间',
         prop: 'createTime',
-        search: true,
         more: true,
         type: 'datetime',
         format: 'yyyy-MM-dd HH:mm',
@@ -106,4 +90,4 @@ export const tableOption = {
         addVisdiplay: false,
         span: 24,
     }]
-}
+}

src/const/crud/user.js

@@ -40,7 +40,7 @@ export const tableOption = {
         span: 24,
         rules: [{
                 required: true,
-                message: "请输入账户",
+                message: "请输入用户名",
                 trigger: "blur"
             },
             {
@@ -54,13 +54,10 @@ export const tableOption = {
         label: '密码',
         prop: 'password',
         type: 'password',
+        value: '',
         hide: true,
         span: 24,
-        rules: [{
-                required: true,
-                message: "请输入密码",
-                trigger: "blur"
-            },
+        rules: [
             {
                 min: 6,
                 max: 20,
@@ -71,7 +68,6 @@ export const tableOption = {
     }, {
         label: '所属部门',
         prop: 'deptId',
-        search: true,
         formsolt: true,
         solt: true,
         span: 24,
@@ -85,7 +81,6 @@ export const tableOption = {
         prop: 'role',
         formsolt: true,
         solt: true,
-        search: true,
         span: 24,
         rules: [{
             required: true,
@@ -97,7 +92,6 @@ export const tableOption = {
         prop: 'delFlag',
         type: "select",
         solt: true,
-        search: true,
         span: 24,
         rules: [{
             required: true,
@@ -121,10 +115,9 @@ export const tableOption = {
         type: 'datetime',
         format: 'yyyy-MM-dd HH:mm',
         valueFormat: 'yyyy-MM-dd HH:mm:ss',
-        search: true,
         more: true,
         editDisabled: true,
         addVisdiplay: false,
         span: 24,
     }]
-}
+}

src/page/login/index.vue

@@ -2,8 +2,14 @@
   <div class="login-container pull-height"
        @keyup.enter.native="handleLogin">
     <div class="login-logo animated fadeIn">
-      <img src="/svg/logo.svg"
-           alt="">
+      <el-dropdown @command="handleCommand">
+        <span class="el-dropdown-link">
+          选择租户<i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="2">pigx</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
     </div>
     <div class="login-weaper">
       <div class="login-left animated fadeInLeft">
@@ -80,13 +86,18 @@ export default {
       }
     }
   },
-  created () { },
+  created () {
+  },
   mounted () { },
   computed: {
     ...mapGetters(["website"])
   },
   props: [],
-  methods: {}
+  methods: {
+      handleCommand(command) {
+          sessionStorage.setItem('tenantId',command)
+      }
+  }
 };
 </script>
 
@@ -123,8 +134,7 @@ export default {
 .login-logo {
   position: absolute;
   top: 0;
-  left: 0;
-  padding-top: 50px;
+  right: 0;
   font-size: 24px;
   color: #333;
 }
@@ -243,4 +253,4 @@ export default {
   text-indent: 5px;
   text-align: center;
 }
-</style>
+</style>

src/router/axios.js

@@ -24,9 +24,12 @@ NProgress.configure({ showSpinner: false }) // NProgress Configuration
 axios.interceptors.request.use(config => {
         NProgress.start() // start progress bar
         if (store.getters.access_token) {
-            config.headers['TENANT_ID'] = '1' // 租户ID
             config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带token--['X-Token']为自定义key 请根据实际情况自行修改
         }
+
+        if (sessionStorage.getItem('tenantId')){
+            config.headers['TENANT_ID'] =  sessionStorage.getItem('tenantId') // 租户ID
+        }
         return config
     }, error => {
         console.log('err' + error) // for debug

src/views/admin/activiti/process.vue

@@ -50,7 +50,7 @@
     </basic-container>
     <el-dialog title="流程图"
                :visible.sync="showPicDialog">
-      <img :src="actPicUrl">
+      <img :src="actPicUrl" width="100%">
     </el-dialog>
   </div>
 </template>

src/views/admin/activiti/task.vue

@@ -44,16 +44,10 @@
                :visible.sync="showTask">
       <avue-form ref="form" v-model="obj" :option="formOption">
         <template slot-scope="scope" slot="menuForm">
-          <el-button type="primary"
-                     icon="el-icon-check"
-                     size="small"
-                     @click="handleTask(scope.row,'1')"
-                     plain>同意</el-button>
-          <el-button type="danger"
-                     icon="el-icon-check"
-                     size="small"
-                     @click="handleTask(scope.row,'0')"
-                     plain>驳回</el-button>
+              <el-button size="small"
+                         v-for="flag in flagList" :key="flag"
+                         @click="handleTask(scope.row,flag)"
+                         plain>{{flag}}</el-button>
         </template>
       </avue-form>
     </el-dialog>
@@ -78,6 +72,7 @@
       return {
         actPicUrl:'',
         obj: {},
+        flagList:{},
         showTask: false,
         showComment: false,
         showPicDialog: false,
@@ -126,12 +121,11 @@
     audit:function(row, index) {
         fetchDetail(row.taskId).then(response => {
           this.obj = response.data.data
-        })
-        fetchComment(row.taskId).then(response => {
-            this.taskTableData = response.data.data
+            // 根据连线判断下次的流程
+          this.flagList = this.obj.flagList
+          this.showTask = true
         })
         this.obj = row
-        this.showTask = true
     },
     comment:function(row, index) {
         fetchComment(row.taskId).then(response => {
@@ -159,7 +153,7 @@
           .catch(function(err) { })
       },
     handleTask: function(row, result) {
-        this.obj.result = result
+        this.obj.taskFlag = result
         doTask(this.obj).then(response =>{
             this.$message({
                 showClose: true,

src/views/admin/user/index.vue

@@ -217,6 +217,7 @@ export default {
     },
     handleUpdate (row, index) {
       this.$refs.crud.rowEdit(row, index);
+      this.form.password = undefined
     },
     create (row, done, loading) {
       addObj(this.form).then(() => {

vue.config.js

@@ -1,4 +1,4 @@
-const url = 'http://192.168.0.20:9999'
+const url = 'http://localhost:9999'
 module.exports = {
     lintOnSave: true,
     productionSourceMap: false,

yarn.lock

@@ -1258,7 +1258,7 @@
     babel-helper-vue-jsx-merge-props "^2.0.0"
     dayjs "^1.7.5"
     deepmerge "^1.2.0"
-    element-ui "^2.3.6"
+    element-ui "^2.4.6"
     normalize-wheel "^1.0.1"
     resize-observer-polyfill "^1.5.0"
     throttle-debounce "^1.0.1"
@@ -3603,7 +3603,7 @@ elegant-spinner@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
 
-element-ui@^2.3.6, element-ui@^2.4.5, element-ui@^2.4.6:
+element-ui@^2.4.6:
   version "2.4.7"
   resolved "https://registry.yarnpkg.com/element-ui/-/element-ui-2.4.7.tgz#073b404222815c08ba2e68b39ec8e6ff7b7b13e0"
   dependencies: