hd-idevvue3 3.0.0 → 3.0.1

package/src/views/privilege/orgDept/authorgnform.vue

@@ -0,0 +1,145 @@
+<template>
+  <el-dialog title="编辑" :visible.sync="visible" width='65%' top="10vh">
+    <!--:hdform.sync 对应的form对象 formRef对应的是el-form的 ref="hdform"-->
+    <hd-form saveoneUrl="webresources/login/privilege/AuthOrgn/save"
+             removeUrl="webresources/login/privilege/AuthOrgn/entity/remove"
+             :findoneUrl="findoneUrl"
+             noCopy="orgnId" @saveCall="saveCall" @delCall="delCall"
+             label-width="100px" :model.sync="hdform" ref="hdform">
+      <el-row>
+        <el-col :span="8" :xs="16">
+          <el-form-item label="组织名称" prop="name"
+                        :rules="$r(1,0,200)">
+            <el-input type="text" v-model="hdform.name"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" :xs="16">
+          <el-form-item label="组织编码" prop="orgnCod"
+                        :rules="$r(0,0,300)">
+            <el-input type="text" v-model="hdform.orgnCod"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" :xs="16">
+          <el-form-item label="英文名" prop="enName"
+                        :rules="$r(0,0,200)">
+            <el-input type="text" v-model="hdform.enName"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" :xs="16">
+          <el-form-item label="组织简称" prop="shortNam"
+                        :rules="$r(0,0,100)">
+            <el-input type="text" v-model="hdform.shortNam"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" :xs="16">
+          <el-form-item label="组织类型" prop="orgnTyp"
+                        :rules="$r(1)">
+            <hd-drop field="ORGN_TYP" v-model="hdform.orgnTyp"></hd-drop>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" :xs="16">
+          <el-form-item label="上级部门" prop="parentId"
+                        :rules="$r(1)">
+            <orgnselect style="width: 100%" :txtVal.sync="hdform.parentName"
+                        :idVal.sync="hdform.parentId"></orgnselect>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" :xs="16">
+          <el-form-item label="描述" prop="description"
+                        :rules="$r(0,0,255)">
+            <el-input type="text" v-model="hdform.description"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8" :xs="16">
+          <el-form-item label="排序" prop="sorter" :rules="$r(0,0,99999,'number',0)">
+            <hd-num v-model="hdform.sorter"></hd-num>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" :xs="16">
+          <el-form-item label="创建人" prop="recNam">
+            <el-input type="text" v-model="hdform.recNam" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" :xs="16">
+          <el-form-item label="创建时间" prop="recTim">
+            <el-input type="text" v-model="hdform.recTim" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" :xs="16">
+          <el-form-item label="更新人" prop="updNam">
+            <el-input type="text" v-model="hdform.updNam" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" :xs="16">
+          <el-form-item label="更新时间" prop="updTim">
+            <el-input type="text" v-model="hdform.updTim" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </hd-form>
+    <div slot="footer" class="dialog-footer">
+      <hd-form-btn ref="hdformbtn" style="float: left"></hd-form-btn>
+      <el-button @click="visible = false">{{$t('取 消')}}</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import orgnselect from './orgnselect'
+import orgTree from '../orgDept/orgTree'
+import HdFormBtn from '../../../hdcom/HdFormBtn.vue'
+
+export default {
+  name: 'authorgnform',
+  components: {
+    HdFormBtn,
+    orgnselect, orgTree
+  },
+  data: function() {
+    return {
+      hdform: {},
+      parentId: '',
+      findoneUrl: '',
+      visible: false
+    }
+  },
+  props: {
+    hdQuery: Object
+  },
+  methods: {
+    show(row, parentId) { // 换为本表主键
+      this.parentId = parentId
+      this.hdform.parentId = parentId
+      this.visible = true
+      this.findoneUrl = 'webresources/login/privilege/AuthOrgn/findone?parentId=' + parentId
+      this.$nextTick(() => {
+        this.$refs.hdform.show(row, this.$vnode.context.$refs.grid)// form
+        this.$refs.hdformbtn.show(this.$vnode.context.$refs.grid, this.$refs.hdform)// 按钮
+      })
+    },
+    saveCall(row, isAdd) {
+      this.$emit('change', {
+        type: isAdd ? 'add' : 'edit',
+        parentId: row.parentId,
+        data: { id: row.orgnId, text: row.name }
+      })
+    },
+    delCall(row) {
+      if (!row.orgnId) { // 新增就删除
+        return false
+      }
+      this.$emit('change', {
+        type: 'remove',
+        parentId: this.parentId,
+        data: { id: row.orgnId }
+      })
+    },
+    handleNodeClick(data) {
+      //        this.$emit('org-node-click', data)
+      //        this.currentNodeData = data
+    }
+  }
+}
+</script>
+

package/src/views/privilege/orgDept/orgDept.vue

@@ -0,0 +1,37 @@
+
+<template>
+  <el-container>
+    <el-aside>
+      <orgTree ref='orgTree' @org-node-click='query'></orgTree>
+    </el-aside>
+    <el-main>
+      <authOrgn ref='authOrgn' @change="change"></authOrgn>
+    </el-main>
+  </el-container>
+</template>
+<script>
+import orgTree from './orgTree'
+import authOrgn from './authOrgn'
+
+export default {
+  name: 'orgDept',
+  components: {
+    orgTree, authOrgn
+  },
+  data() {
+    return {
+      parentId: '0'
+    }
+  },
+  methods: {
+    query: function(data) {
+      this.$refs['authOrgn'].queryOrg(data.id)
+      this.parentId = data.id
+    },
+    change: function(data) {
+      // console.log('change', data)
+      this.$refs['orgTree'].refresh(data)
+    }
+  }
+}
+</script>

package/src/views/privilege/orgDept/orgTree.vue

@@ -0,0 +1,88 @@
+<template>
+  <hd-tree ref="tree" :show-checkbox="false" :highlight-current="true" :expand-on-click-node="false" :data="hdResult"
+           :props="opts" @node-click="handleNodeClick" node-key="id" :filter-node-method="filterNode"
+           :default-expanded-keys="defaultExpandedKeys"></hd-tree>
+</template>
+
+<script>
+
+export default {
+  name: 'orgTree',
+  data() {
+    return {
+      hdQuery: new HdQuery(this),
+      hdResult: [],
+      listLoading: true,
+      visible: false,
+      opts: {
+        label: 'text'
+      },
+      currentNodeData: {}
+    }
+  },
+  props: { idVal: String }, // 设置value为props属性-必须
+  mounted() {
+    this.doQuery()
+  },
+  methods: {
+    doQuery() {
+      // 显示loading框
+      this.listLoading = true
+      this.$http.post('/webresources/login/privilege/AuthOrgn/gentree', this.hdQuery).then(response => {
+        const data = response.data
+        this.hdResult = data
+        this.listLoading = false
+      })
+    },
+    handleNodeClick(data) {
+      this.$emit('org-node-click', data)
+      this.currentNodeData = data
+    },
+    refresh: function(data) {
+      const tree = this.$refs.tree.$refs.eltree
+      if (data.type === 'add') {
+        this.currentNodeData.children.push(data.data)
+      } else if (data.type === 'edit') {
+        const array = this.currentNodeData.children
+        for (let i = 0; i < array.length; i++) {
+          const obj = array[i]
+          if (obj.id === data.data.id) {
+            Object.assign(array[i], data.data)
+            break
+          }
+        }
+      } else if (data.type === 'remove') {
+        const array = this.currentNodeData.children
+        for (let i = 0; i < array.length; i++) {
+          const obj = array[i]
+          if (obj.id === data.data.id) {
+            array.splice(i, 1)
+            break
+          }
+        }
+      }
+    },
+    filterNode(value, data) {
+      if (!value) return true
+      return data.text.indexOf(value) !== -1
+    },
+    filter(val) {
+      this.$refs.tree.$refs.eltree.filter(val)
+    }
+  },
+  watch: {
+    // 都有值才适合查询
+    idVal: function(newVal) {
+      this.$refs.tree.$refs.eltree.setCurrentKey(this.idVal)
+    }
+  },
+  computed: {// 给外层v-model赋值
+    defaultExpandedKeys() {
+      if (this.idVal) {
+        return [this.idVal]
+      }
+      return []
+    }
+  }
+}
+</script>

package/src/views/privilege/orgDept/orgnselect.vue

@@ -0,0 +1,134 @@
+<template>
+  <div>
+    <el-popover :disabled="disabled" placement="bottom-start" ref="popSel" v-model="visible">
+      <div :style="{height: height}">
+        <orgTree :idVal="idVal" @org-node-click='doSel' ref='orgTree'></orgTree>
+      </div>
+    </el-popover>
+    <div>
+      <!--readonly 在选择区隐藏时,不能输入-->
+      <el-input :clearable="false" :disabled="disabled"
+                :placeholder="placeholder?this.$t(placeholder):this.$t('请选择')" :readonly="!visible"
+                @focus="focus" @mouseenter.native="doMouseEnter"
+                @mouseleave.native="doMouseLeave" ref="sel" v-model="searchVal" v-popover:popSel>
+        <i @click.stop="doClear" class="el-input__icon el-icon-circle-close" slot="suffix" style="cursor:pointer "
+           v-if="!threePointShow"></i>
+        <i @click="$emit('pop')" class="el-input__icon el-icon-more" slot="suffix" style="cursor:pointer"
+           v-if="threePointShow"></i>
+      </el-input>
+    </div>
+  </div>
+</template>
+<style>
+  .lucencyInput .el-input__inner {
+    border: 0px;
+  }
+</style>
+<script>
+  import orgTree from './orgTree'
+
+  /**
+   * 自定义列表下拉
+   * @module orgnselect
+   */
+  export default {
+    name: 'orgnselect',
+    components: {
+      orgTree
+    },
+    data() {
+      return {
+        threePointShow: true,
+        searchVal: this.txtVal,
+        // isFocus: false,
+        visible: false,
+        isFirst: true, // 是否第一次打开
+        searchHandler: Object,
+        isSoftFocus: false // 点击弹窗内容时,input重新获得焦点,但是不能触发focus
+        // focusTime: 0
+      }
+    },
+    inheritAttrs: false,
+    /**
+     * Props  继承hd-com-grid的属性和事件
+     * @prop {String} txtVal 双向绑定 这里是为了clear清空用
+     * @prop {String} idVal 双向绑定 这里是为了clear清空用
+     * @prop {String} placeholder
+     * @prop {String} disabled 只读
+     * @prop {Object} hdQuery  查询封装类
+     * @prop {String} height  默认为40vh
+     * @prop {Function} beforeQuery  查询前的事件,通常需要绑定anyQuery
+     */
+    props: {
+      txtVal: String,
+      idVal: String,
+      placeholder: String,
+      disabled: Boolean,
+      hdQuery: Object,
+      url: String, // 全路径
+      height: {// 高度
+        type: String,
+        default: '40vh'
+      },
+      beforeQuery: Function
+    }, // 设置value为props属性-必须
+    mounted() {
+      $(this.$parent.$el).find('.el-popover__reference').removeAttr('tabIndex')// 焦点用
+    },
+    methods: {
+      focus() {
+        // this.focusTime = new Date().getTime()
+        this.$emit('focus')
+        if (this.isSoftFocus) { // click时
+          this.isSoftFocus = false // 点击时,防止焦点触发
+          return false
+        }
+        setTimeout(() => { // 否则会和默认的冲突
+          this.visible = true
+        }, 150)
+        // this.isFocus = true
+      },
+      doClear() {
+        this.$emit('update:txtVal', '')
+        this.$emit('update:idVal', '')
+        this.$emit('clear')
+      },
+      doMouseEnter() {
+        if (this.disabled) {
+          return false
+        }
+        if (this.idVal) {
+          this.threePointShow = false
+        }
+      },
+      doMouseLeave() {
+        this.threePointShow = true
+      },
+      doSel(data) {
+        this.$emit('update:txtVal', data.text)
+        this.$emit('update:idVal', data.id)
+        this.visible = false
+      }
+    },
+
+    watch: {
+      // searchVal: function(newVal) {
+      //   this.$refs.orgTree.filter(newVal)
+      //   // this.visible = true
+      // },
+      txtVal: function (newVal) {
+        this.searchVal = this.txtVal
+      },
+      visible: function (newVal) {
+        console.log('newVal', newVal)
+        console.log(this.$refs.orgTree)
+        if (newVal) {
+          this.$refs.orgTree.filter('')
+        } else {
+          this.searchVal = this.txtVal
+        }
+      }
+    }
+  }
+
+</script>

package/src/views/privilege/personDept/authuser.vue

@@ -0,0 +1,123 @@
+<template>
+  <el-container>
+    <el-main>
+      <hd-com-grid :hdQuery="hdQuery" :removeUrl="removeUrl" imExcel notInit
+                   ref="grid" url="/webresources/login/privilege/AuthUser" visualScroll :exField="exField"
+                   :excelFormatter="doExcelFormatter">
+        <div class="filter-container" slot="query">
+          <el-input @keyup.enter.native="$refs.grid.doQuery()" class="filter-item" :placeholder="$t('姓名、账号')"
+                    style="width: 200px;"
+                    v-model="hdQuery.query.name">
+          </el-input>
+          <el-button @click="$refs.grid.doQuery()" class="filter-item" keyType="query">
+            {{$t('搜索')}}
+          </el-button>
+          <el-button @click="doEdit('')" class="filter-item" keyType="add" type="primary" vid="add">{{$t('新增')}}
+          </el-button>
+          <el-button @click="$refs.grid.doRemoveAll()" class="filter-item" keyType="remove" type="danger">{{$t('删除')}}
+          </el-button>
+        </div>
+        <el-table-column align="center" fixed="right" label="操作" width="110px">
+          <template slot-scope="scope">
+            <hd-btn @click.stop="doResetPsw(scope.row)" class="fa fa-asterisk" hint="重置密码" vid="resetpassword"></hd-btn>
+            <hd-btn @click.stop="doEdit(scope.row.userId)" hint="编辑" icon="el-icon-edit"></hd-btn>
+            <hd-btn @click.stop="doRemove(scope.row)" hint="删除" icon="el-icon-delete"></hd-btn>
+            <hd-btn @click.stop="doFaceRec(scope.row)" class="fa fa-vcard-o" hint="人脸识别">
+            </hd-btn>
+          </template>
+        </el-table-column>
+        <el-table-column align="left" header-align="center" label="姓名" prop="name" sortable width="100px">
+        </el-table-column>
+        <el-table-column align="left" header-align="center" label="账号" prop="account" sortable width="100px">
+        </el-table-column>
+        <el-table-column :input="require('../orgDept/orgnselect').default" :inputFormat="(result, row)=>row.orgnName"
+                         align="left" header-align="center" label="部门" prop="orgnId"
+                         sortable width="180px">
+        </el-table-column>
+        <el-table-column align="center" label="账号过期日期" prop="accountPassDate" sortable width="auto">
+        </el-table-column>
+        <el-table-column align="center" label="密码修改时间" prop="pwModifyTim" sortable width="auto">
+        </el-table-column>
+      </hd-com-grid>
+    </el-main>
+    <authuserform @save-ok="$refs.grid.doQuery()" ref="authuserform" :exFieldCode="exField.gridCode"></authuserform>
+    <facerec ref="facerec"></facerec>
+  </el-container>
+</template>
+<script>
+  import authuserform from './authuserform'
+  import facerec from './facerec'
+
+  export default {
+    name: 'authuser',
+    components: {authuserform, facerec},
+    data() {
+      return {
+        removeUrl: '',
+        hdQuery: new HdQuery(this),
+        orgnName: '',
+        orgnId: '',
+        exField: {
+          open: true,
+          table: 'AUTH_USER',
+          columnList: ['EX_FIELD1', 'EX_FIELD2', 'EX_FIELD3', 'EX_FIELD4', 'EX_FIELD5'],
+          gridCode: 'authUserGrid'
+        },
+      }
+    },
+    mounted() {
+      if (this.$route.query.q) {
+        this.$set(this.hdQuery.query, 'name', this.$route.query.q);
+      }
+    },
+    methods: {
+      queryUser(orgnId, orgnName) {
+        this.orgnId = orgnId
+        this.hdQuery.query.orgnId = orgnId
+        this.orgnName = orgnName
+        this.$refs.grid.doQuery()
+      },
+      doResetPsw(row) { // 增加或编辑
+        this.$confirm(this.$t('此操作将重置密码为888888, 是否继续?'), this.$t('提示'), {
+          confirmButtonText: this.$t('确定'),
+          cancelButtonText: this.$t('取消'),
+          type: 'warning'
+        }).then(() => {
+          this.$http.post('/webresources/login/privilege/AuthUser/resetPassword?userId=' + row.userId).then(response => {
+            const data = response.data
+            this.$message({
+              type: data.code === '-1' ? 'error' : 'success',
+              message: data.message
+            })
+            if (data.code === '-1') {
+              return
+            }
+            this.$refs.grid.doQuery()
+          })
+        }).catch(() => {
+        })
+      },
+      doEdit(userId) { // 增加或编辑
+        this.$refs['authuserform'].show(userId, this.orgnId, this.orgnName)
+      },
+      doRemove(row) {
+        this.removeUrl = '/webresources/login/privilege/AuthUser/remove?userId=' + row.userId
+        this.$refs.grid.doRemove(row)
+      },
+      doFaceRec(row) {
+        this.$refs.facerec.show(row)
+      },
+      doExcelFormatter(excelData) {
+        let r = {
+          multiHeader : [['用户管理', '', '', '', '', '', '', '', '']],
+          header : excelData.merdata[0],
+          data : excelData.merdata.slice(1),
+          filename : excelData.title,
+          merges : ['A1:I1']
+        }
+        console.log(r)
+        return r;
+      }
+    }
+  }
+</script>

package/src/views/privilege/personDept/authuserform.vue

@@ -0,0 +1,154 @@
+<template>
+  <el-dialog :visible.sync="visible" title="编辑" width='90%'>
+
+    <hd-form :model="hdform" label-width="100px" ref="hdform" :exFieldCode="exFieldCode">
+      <el-row>
+        <el-col :span="24">
+          <HdTempSave :auto="true" :saveFun="saveFunTemp" @reload="loadFromTemp" ref="hdTempSave"
+                      style="float: right" v-if="visible"></HdTempSave>
+        </el-col>
+        <el-col :span="24" :xs="16">
+          <el-form-item :rules="$r(1,2,20)" label="姓名" prop="name">
+            <el-input type="text" v-model="hdform.name"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :xs="16">
+          <el-form-item :rules="$r(1,3,20)" label="账户" prop="account">
+            <el-input type="text" v-model="hdform.account"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" :xs="16">
+          <el-form-item :rules="$r(1)" label="部门" prop="orgnName">
+            <!--<el-input type="text" v-model="hdform.orgnId" ></el-input>-->
+            <orgncascader :idVal.sync="hdform.orgnId" :txtVal.sync="hdform.orgnName"
+                        style="width: 100%"></orgncascader>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :xs="16">
+          <el-form-item label="账号过期日期" prop="accountPassDate">
+            <el-date-picker v-bind="$date" v-model="hdform.accountPassDate"></el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :xs="16">
+          <el-form-item :rules="$r(0,0,255)" label="描述" prop="description">
+            <el-input type="text" v-model="hdform.description"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8" :xs="16">
+          <el-form-item label="账户锁定标志">
+            <el-switch active-value="1" inactive-value="0" v-model="hdform.lockId"></el-switch>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" :xs="16">
+          <el-form-item label="账户停用标志">
+            <el-switch active-value="1" inactive-value="0" v-model="hdform.stopId"></el-switch>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8" :xs="16">
+          <el-form-item label="密码永不过期">
+            <el-switch active-value="1" inactive-value="0" v-model="hdform.pwNeverPassId"></el-switch>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8" :xs="16">
+          <el-form-item label="个人不可改密">
+            <el-switch active-value="1" inactive-value="0" v-model="hdform.donotChgId"></el-switch>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" :xs="16">
+          <el-form-item label="登录先改密">
+            <el-switch active-value="1" inactive-value="0" v-model="hdform.nextChgId"></el-switch>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </hd-form>
+    <div class="dialog-footer" slot="footer">
+      <el-button @click="visible = false">{{$t('取 消')}}</el-button>
+      <el-button :hotKeyRange="$options.name" :loading="loading" @click="submit" keyType="save" type="primary">
+        {{$t('确 定')}}
+      </el-button>
+    </div>
+  </el-dialog>
+
+</template>
+
+<script>
+  import orgncascader from './orgncascader'
+  import ExtendForm from "../../../hdcom/ExtendForm";
+
+  export default {
+    name: 'authuserform',
+    components: {
+        ExtendForm,
+      orgncascader
+    },
+    data() {
+      return {
+        hdform: {},
+        visible: false,
+        tsLoading: false,
+        loading: false
+      }
+    },
+    props: {
+      orgnId: String,
+      orgnName: String,
+      exFieldCode: String,
+    },
+    methods: {
+      show(userId, orgnId, orgnName) { // 换为本表主键
+
+        this.visible = true
+        this.$http.post('/webresources/login/privilege/AuthUser/findone?userId=' + userId + '&orgnId=' + orgnId).then(response => {
+          const data = response.data
+          this.hdform = data
+          if (!userId) {//这块代码已经没用,后端已经赋值,而且推荐后端写
+            this.hdform.orgnId = orgnId
+            this.hdform.orgnName = orgnName
+          }
+          // 弹窗重复使用时,清除校验项目
+          if (this.$refs['hdform']) {
+              this.$refs['hdform'].$refs.hdform.resetFields()
+          }
+        })
+
+      },
+
+      submit() {
+        // console.debug(this.hdform)
+        this.$refs['hdform'].$refs.hdform.validate((valid) => {
+          if (!valid) {
+            return false
+          }
+          this.loading = true
+          // this.hdform.orgnId = this.parentId
+          this.$http.post('/webresources/login/privilege/AuthUser/save', this.hdform).then(response => {
+            this.loading = false
+            const data = response.data
+            this.$message({
+              type: data.code === '-1' ? 'error' : 'success',
+              message: data.message
+            })
+            if (data.code === '-1') {
+              return
+            }
+            this.$emit('save-ok') // 主页面调用弹窗时添加
+            this.visible = false
+          }).catch(() => {//数据同步的校验,时,会从这里触发
+            this.loading = false
+          })
+        })
+      },
+      saveFunTemp() {
+        return this.hdform
+      },
+      loadFromTemp(storeFrom) {
+        Object.assign(this.hdform, storeFrom)
+      },
+    }
+  }
+</script>
+