Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

liuyg

2021-04-28 33298bf2b94d3e100e82aa1a1d41c7a414193e3b

Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

 src/page/login/codelogin.vue

@@ -51,15 +51,17 @@
        <i slot="prefix" class="icon-shouji"/>
      </el-input>
    </el-form-item>
    <el-select v-model="loginForm.deptid" placeholder="请选择部门" style="width: 580px;">
      <el-option
        v-for="item in options"
        :key="item.code"
        :label="item.deptname"
        :value="item.deptid">
      </el-option>
      <i slot="prefix" class="icon-yonghu"/>
    </el-select>
    <!--    <el-select v-model="loginForm.deptid" placeholder="请选择部门" style="width: 580px;">-->
    <!--      <el-option-->
    <!--        v-for="item in options"-->
    <!--        :key="item.code"-->
    <!--        :label="item.deptname"-->
    <!--        :value="item.deptid">-->
    <!--      </el-option>-->
    <!--      <i slot="prefix" class="icon-yonghu"/>-->
    <!--    </el-select>-->
    <avue-input-tree style="width:580px !important" default-expand-all v-model="loginForm.deptid" placeholder="请选择部门" type="tree"
                     :dic="dic"></avue-input-tree>
    <div style="margin-top: 16px">
      <el-radio v-model="loginForm.sex" label="0" border size="medium">男</el-radio>
      <el-radio v-model="loginForm.sex" label="1" border size="medium">女</el-radio>
@@ -68,10 +70,12 @@
      <el-button size="small"
                 type="primary"
                 @click.native.prevent="handleLogin"
                 class="z-login-submit">{{$t('login.zc')}}</el-button>
                 class="z-login-submit">{{ $t('login.zc') }}
      </el-button>
      <el-button size="small"
                 @click.native.prevent="gbs"
                 class="z-login-submit">{{$t('login.gb')}}</el-button>
                 class="z-login-submit">{{ $t('login.gb') }}
      </el-button>
    </el-form-item>
  </el-form>
</template>
@@ -81,6 +85,7 @@
  import {inster} from "@/api/zc/zc";
  import {fetch,ss} from "@/api/system/dept";
  import { mapGetters } from "vuex";

  export default {
    name: "codelogin",
    data() {
@@ -117,6 +122,7 @@
      return {
        msgText: "",
        msgTime: "",
      dic: [],
        msgKey: false,
        loginForm: {
          phone: "",
@@ -147,7 +153,12 @@
      this.msgTime = this.config.MSGTIME;
    },
    mounted() {
      this.allmedia();
    var that = this;

    //this.allmedia();
    ss().then(res => {
      that.dic = that.ergodicData(res.data.data)
    });
    },
    computed: {
      ...mapGetters(["tagWel"]),
@@ -161,6 +172,38 @@
    },
    props: [],
    methods: {
    ergodicData(val) {
      var arr = [];
      arr.push({label: val[0].title, value: val[0].value, id: val[0].id, parent_id: val[0].parent_id});
      if (val.length > 1) {
        val.forEach((item, index) => {
          if (index > 0) {
            var ind = true;
            var arrInd = 0;
            arr.forEach((it, i) => {
              if (item.parent_id == it.id) {
                ind = false;
                arrInd = i;
                return
              }
            })
            if (ind == false) {
              if (arr[arrInd].children && arr[arrInd].children.length > 0) {
                arr[arrInd].children.push({label: item.title, value: item.value, id: item.id, parent_id: item.parent_id});
              } else {
                arr[arrInd].children = [];
                arr[arrInd].children.push({label: item.title, value: item.value, id: item.id, parent_id: item.parent_id});
              }
            } else {
              arr.push({label: item.title, value: item.value, id: item.id, parent_id: item.parent_id});
            }
          }
        })
      }

      return arr;
    },

      clearValidate(formName) {
        this.$refs[formName].clearValidate();
      },
@@ -177,6 +220,7 @@
        // })
      },
      refreshCode(row) {
      console.log(this.loginForm)
        inster(row).then(res => {
          this.loginForm.phone=""
          this.loginForm.username=""
@@ -234,6 +278,7 @@
      },
      handleLogin() {
        this.$refs.loginForm.validate(valid => {
        console.log(valid)
          if (valid) {
            this.refreshCode(this.loginForm);
            this.message('dahsiofhiusa');
@@ -257,6 +302,7 @@
    text-align: center;
    cursor: pointer;
  }

  .msg-text.display {
    color: #ccc;
  }