d

1c7c6fd2 · 蒋勇 · 4da7d645 · 1c7c6fd2 · 1c7c6fd2 · 1c7c6fd2
Commit 1c7c6fd2 authored May 03, 2020 by 蒋勇
7 changed files
--- a/iview-admin/src/config/index.js
+++ b/iview-admin/src/config/index.js
@@ -3,7 +3,7 @@ export default {
   * @description 配置显示在浏览器标签的title
   */
  title: '智慧中台 ',
-  appkey:'7a7edc25-0363-48c1-bb8a-dbeb43be5264',
+  appkey:'90168bc6-0412-4274-bc02-117e052ca1fd',
  /**
   * @description token在Cookie中存储的天数，默认1天
   */

--- a/iview-admin/src/libs/axios.js
+++ b/iview-admin/src/libs/axios.js
@@ -30,7 +30,7 @@ class HttpRequest {
        regrole=params.get("regrole")
        this.confapp.regrole=regrole
        this.confapp.companykey=companykey
-        this.confapp.paramappkey=appkey;//为了区分当前切换应用上下文后，进入的应用非平台应用
+        this.confapp.fromappkey=appkey;//为了区分当前切换应用上下文后，进入的应用非平台应用
    }catch(e){
       console.log(e)
    }

--- a/iview-admin/src/libs/util.js
+++ b/iview-admin/src/libs/util.js
@@ -54,7 +54,7 @@ export const hasChild = (item) => {
 const showThisMenuEle = (item, access,user) => {
  if(item.name=="sysmg" && !user.isSuper && user.isAdmin){
-    if(!config.paramappkey){
+    if(!config.fromappkey){
       return false
    }
  }
@@ -93,9 +93,9 @@ export const getMenuByRouter = (list, access,user) => {
 export const getBreadCrumbList = (route, homeRoute) => {
  let homeItem = { ...homeRoute, icon: homeRoute.meta.icon }
  let routeMetched = route.matched
-  console.log(">>>>>>>>>>>>>>>>>===================")
+  // console.log(">>>>>>>>>>>>>>>>>===================")
-  console.log(routeMetched)
+  // console.log(routeMetched)
-  console.log(route)
+  // console.log(route)
  if (routeMetched.some(item => item.name === homeRoute.name)) return [homeItem]
  let res = routeMetched.filter(item => {
    return item.meta === undefined || !item.meta.hideInBread

--- a/iview-admin/src/store/module/user.js
+++ b/iview-admin/src/store/module/user.js
@@ -13,6 +13,7 @@ import { setToken, getToken } from '@/libs/util'
 export default {
  state: {
+    userobj:null,
    userName: '',
    userId: '',
    avatarImgPath: '',
@@ -28,6 +29,9 @@ export default {
    messageContentStore: {}
  },
  mutations: {
+    setUser(state, userobj){
+      state.userobj=userobj
+    },
    setAdmin(state, isadmin){
       state.isAdmin=isadmin
    },
@@ -97,7 +101,9 @@ export default {
             commit('setHasGetInfo', true)
             commit('setAdmin',rtn.data.user.isAdmin)
             commit('setSuper',rtn.data.user.isSuper)
+             commit('setUser',rtn.data.user)
             resolve(rtn.data)
          }else{
            reject(rtn.data)
          }
@@ -121,6 +127,7 @@ export default {
               commit('setAdmin',rtn.data.isAdmin)
               commit('setSuper',rtn.data.isSuper)
               rtn.data.access= ['super_admin', 'admin']
+               commit('setUser',rtn.data)
               resolve(rtn.data)
            }else{
              reject(rtn.data)

--- a/iview-admin/src/view/components/tables/forms/forms.vue
+++ b/iview-admin/src/view/components/tables/forms/forms.vue
@@ -83,6 +83,13 @@
                      <template v-if="ctl.type=='upload'">
                        <Uploads v-model="formModel[ctl.prop]"></Uploads>
                      </template>
+                      <template v-if="ctl.type=='password'">
+                        <input
+                          type="password"
+                          v-model="formModel[ctl.prop]"
+                          :placeholder="ctl.placeHolder"
+                        >
+                      </template>
                    </FormItem>
                  </Col>
                </Row>
@@ -110,7 +117,11 @@
            >
              <FormItem v-if="ctlVisable[ctl.prop]" :label="ctl.label" :prop="ctl.prop">
                <template v-if="ctl.type=='input'">
-                  <input v-model="formModel[ctl.prop]" :placeholder="ctl.placeHolder" :disabled="ctl.disabled">
+                  <input
+                    v-model="formModel[ctl.prop]"
+                    :placeholder="ctl.placeHolder"
+                    :disabled="ctl.disabled"
+                  >
                </template>
                <template v-if="ctl.type=='btn'">
                  <button :type="ctl.btncss" :icon="ctl.icon">{{ctl.label}}</button>
@@ -167,6 +178,13 @@
                <template v-if="ctl.type=='upload'">
                  <Uploads v-model="formModel[ctl.prop]"></Uploads>
                </template>
+                <template v-if="ctl.type=='password'">
+                  <input
+                    type="password"
+                    v-model="formModel[ctl.prop]"
+                    :placeholder="ctl.placeHolder"
+                  >
+                </template>
              </FormItem>
            </Col>
          </Row>
@@ -228,7 +246,7 @@ export default {
    fminfo(nf, of) {
      this.initFormModel();
    },
-    forminfo(nf){
+    forminfo(nf) {
      this.initFormModel();
    }
  },
@@ -288,7 +306,7 @@ export default {
            ) {
              this.$set(this.formModel, ctl.prop, []);
            } else {
-              console.log(ctl.prop);
+              // console.log(ctl.prop);
              if (ctl.type == "switch") {
                this.$set(this.formModel, ctl.prop, false);
              } else if (ctl.type == "number") {

--- a/iview-admin/src/view/userinfo/accountinfo_page.vue
+++ b/iview-admin/src/view/userinfo/accountinfo_page.vue
 <template>
  <div>
+    <FormAccount ref="entinfo" :fminfo="entforminfo" style="height:100%">
+      <template v-slot:default="slotProps">
+        <Button @click="upentinfo">保存</Button>
+      </template>
+    </FormAccount>
+    <br>
    <FormAccount ref="uinfo" :fminfo="forminfo">
      <template v-slot:default="slotProps">
        <Button @click="upuserinfo">保存</Button>
      </template>
    </FormAccount>
-    <br/>
+    <br>
-    <FormAccount ref="entinfo" :fminfo="entforminfo" style="height:100%">
+    <FormAccount ref="pwdinfo" :fminfo="pwdinfo" :refvalidatemethod="validmethod">
      <template v-slot:default="slotProps">
-        <Button @click="upentinfo">保存</Button>
+        <Button @click="uppwdinfo">保存</Button>
      </template>
    </FormAccount>
  </div>
 </template>
  <script>
 import FormAccount from "../components/tables/forms/forms";
+import { saveFormData } from "@/api/data";
 export default {
  name: "accountinfo_page",
  data() {
    return {
+      curuser: this.deepclone(this.$store.state.user.userobj),
      forminfo: {
        name: "用户资料",
        main: [
@@ -32,7 +40,7 @@ export default {
                prop: "userName",
                placeHolder: "请输入帐户名",
                style: "",
-                disabled:true,
+                disabled: true,
                rules: [{ required: true, message: "  ", trigger: "blur" }]
              },
              {
@@ -60,28 +68,34 @@ export default {
                rules: [{ required: true, message: "  ", trigger: "blur" }]
              }
            ]
+          }
+        ],
+        lists: []
      },
+      pwdinfo: {
+        name: "密码设置",
+        main: [
          {
            title: "密码修改",
            key: "baseinfo",
-            cols:1,
+            cols: 1,
            ctls: [
              {
-                type: "input",
+                type: "password",
                label: "新设密码",
                prop: "onepassword",
                placeHolder: "请输入新密码",
                style: "",
-                rules: [{ required: true, message: "  ", trigger: "blur" }]
+                rules: [{ required: true, message: "  ", trigger: "blur" },{ validator: "validatex", message: "  ", trigger: "blur" }]
              },
              {
-                type: "input",
+                type: "password",
                label: "密码确认",
                prop: "repeatpassword",
                placeHolder: "请重新输入新密码",
                style: "",
-                rules: [{ required: true, message: "  ", trigger: "blur" }]
+                rules: [{ required: true, message: "  ", trigger: "blur" },{ validator: "validatex", message: "  ", trigger: "blur" }]
-              },
+              }
            ]
          }
        ],
@@ -96,7 +110,7 @@ export default {
            ctls: [
              {
                type: "input",
-                label: "企业名称",
+                label: "名称",
                prop: "name",
                placeHolder: "请输入企业名称",
                style: "",
@@ -104,6 +118,15 @@ export default {
              },
              {
                type: "input",
+                label: "企业KEY",
+                prop: "companykey",
+                disabled: true,
+                placeHolder: "请输入昵称",
+                style: "",
+                rules: [{ required: true, message: "  ", trigger: "blur" }]
+              },
+              {
+                type: "input",
                label: "电话",
                prop: "phone",
                placeHolder: "请输入昵称",
@@ -121,7 +144,7 @@ export default {
              {
                type: "input",
                label: "地址",
-                prop: "mail",
+                prop: "address",
                placeHolder: "请输入邮件",
                style: "",
                rules: [{ required: true, message: "  ", trigger: "blur" }]
@@ -144,12 +167,65 @@ export default {
  components: {
    FormAccount
  },
-  mount() {},
+  created() {},
+  mounted() {
+    this.$refs.entinfo.formModel = this.entdata;
+    this.$refs.uinfo.formModel = this.userdata;
+  },
+  computed: {
+    entdata() {
+      return this.curuser.company;
+    },
+    userdata() {
+      return this.curuser;
+    }
+  },
  methods: {
-    upuserinfo(){
+    validmethod(rule,value,callback){
+        console.log(rule)
+        console.log(value)
+        return callback();
+    },
+    deepclone(objin) {
+      let rtnstr = JSON.stringify(objin);
+      return JSON.parse(rtnstr);
+    },
+    upuserinfo() {
+      this.$refs.uinfo.validate(v => {
+        let d=this.$refs.uinfo.formModel
+        saveFormData("/web/common/userCtl/update",d).then(res => {
+          let rtn = res.data;
+          if (rtn.status == 0) {
+            let u = rtn.data;
+            console.log("...........................user.",u)
+            this.$store.state.user.userobj = u;
+            this.$message.success("当前操作成功.");
+          } else {
+            this.$message.error("当前操作失败，请重试或联系管理员.");
+          }
+        });
+      });
+    },
+    upentinfo() {
+      this.$refs.entinfo.validate(v => {
+         let d=this.$refs.entinfo.formModel
+        saveFormData("/web/common/companyCtl/update",d).then(res => {
+          let rtn = res.data;
+          if (rtn.status == 0) {
+            let cmp = rtn.data;
+             console.log("............................cmp",cmp)
+            this.$store.state.user.userobj.company = cmp;
+            this.$message.success("当前操作成功.");
+          } else {
+            this.$message.error("当前操作失败，请重试或联系管理员.");
+          }
+        });
+      });
    },
-    upentinfo(){
+    uppwdinfo() {
+      this.$refs.pwdinfo.validate((v)=>{
+          console.log(v)
+      })
    }
  }

--- a/iview-admin/src/view/userinfo/tanentinfo_page.vue
+++ b/iview-admin/src/view/userinfo/tanentinfo_page.vue
@@ -24,6 +24,9 @@ export default {
  components: {
    BizTable
  },
+  mounted(){
+  },
  methods: {
    onexec(k, row, btninfo) {
      if (btninfo) {