Merge pull request #30 from lanyulei/dev

可配置默认登陆方式。

src/views/login/index.vue

@@ -89,7 +89,7 @@
               <img style="height: 48px;width: 100%;border: 1px solid rgba(0,0,0, 0.1);border-radius:5px;" :src="codeUrl" @click="getCode">
             </div>
             <div prop="code" style="width: 100%;float: left;margin-bottom: 13px">
-              <el-checkbox v-model="loginTypeStatus">LDAP登陆</el-checkbox>
+              <el-checkbox v-model="sysInfo.is_ldap">LDAP登陆</el-checkbox>
             </div>
             <el-button :loading="loading" type="primary" style="width:100%;padding:12px 20px;margin-bottom:30px;" @click.native.prevent="handleLogin">
               <span v-if="!loading">登 录</span>
@@ -113,7 +113,6 @@ export default {
   name: 'Login',
   data() {
     return {
-      loginTypeStatus: true,
       codeUrl: '',
       cookiePassword: '',
       loginForm: {
@@ -141,7 +140,8 @@ export default {
       currentTime: null,
       sysInfo: {
         logo: '',
-        name: ''
+        name: '',
+        is_ldap: false
       }
     }
   },
@@ -220,7 +220,7 @@ export default {
     handleLogin() {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
-          if (this.loginTypeStatus) {
+          if (this.sysInfo.is_ldap) {
             this.loginForm.loginType = 1
           } else {
             this.loginForm.loginType = 0

src/views/process/list/create.vue

 <template>
   <div class="app-container">
     <el-card class="box-card">
-      <div class="text item">
-        <el-steps :active="active" finish-status="success">
-          <template v-for="(item, index) in processStructureValue.nodes">
-            <el-step
-              v-if="item.isHideNode === false ||
-                item.isHideNode === undefined ||
-                item.isHideNode == null"
-              :key="index"
-              :title="item.label"
-            />
-          </template>
-        </el-steps>
-      </div>
-    </el-card>
-
-    <el-card class="box-card" style="margin-top: 15px">
       <div slot="header" class="clearfix">
         <span>公共信息</span>
       </div>
@@ -36,7 +20,7 @@
       </div>
     </el-card>
 
-    <el-card class="box-card" style="margin-top: 15px">
+    <el-card class="box-card" style="margin-top: 10px">
       <div slot="header" class="clearfix">
         <span>表单信息</span>
       </div>

src/views/system/settings/index.vue

@@ -5,7 +5,7 @@
         <span>配置信息</span>
       </div>
       <div class="text item">
-        <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px">
+        <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="120px">
           <el-form-item label="系统名称：" prop="name">
             <el-input v-model="ruleForm.name" />
           </el-form-item>
@@ -22,6 +22,10 @@
               <i v-else class="el-icon-plus avatar-uploader-icon" />
             </el-upload>
           </el-form-item>
+          <el-form-item label="默认LDAP登陆：">
+            <el-radio v-model="ruleForm.is_ldap" :label="true">是</el-radio>
+            <el-radio v-model="ruleForm.is_ldap" :label="false">否</el-radio>
+          </el-form-item>
           <el-form-item style="margin-bottom: 0">
             <el-button v-permisaction="['system:settings:index:config']" type="primary" @click="submitForm('ruleForm', 1)">确定</el-button>
           </el-form-item>
@@ -85,7 +89,8 @@ export default {
       editable: [],
       ruleForm: {
         name: '',
-        logo: ''
+        logo: '',
+        is_ldap: false
       },
       rules: {
         name: [
@@ -99,7 +104,7 @@ export default {
       tableData: []
     }
   },
-  mounted() {
+  created() {
     this.getSettingsInfo()
   },
   methods: {
@@ -110,9 +115,13 @@ export default {
             if (v.content === undefined || v.content === null) {
               this.ruleForm = {
                 name: '',
-                logo: ''
+                logo: '',
+                is_ldap: false
               }
             } else {
+              if (v.content.is_ldap === undefined || v.content.is_ldap === null) {
+                v.content.is_ldap = false
+              }
               this.ruleForm = v.content
             }
           } else if (v.classify === 2) {