0.0 2 years ago
parent
commit
55fa7ea3e4
  1. 2
      src/components/jeecgbiz/JSelectDepart.vue
  2. 6
      src/views/dashboard/HomePage.vue
  3. 2
      src/views/system/UserList.vue
  4. 9
      src/views/system/modules/UserModal.vue

2
src/components/jeecgbiz/JSelectDepart.vue

@ -42,6 +42,7 @@
},
value:{
type:String,
default:'',
required:false
},
disabled:{
@ -64,6 +65,7 @@
}
},
mounted(){
console.log("this.valueXX",this.value)
this.departIds = this.value
},
watch:{

6
src/views/dashboard/HomePage.vue

@ -513,8 +513,8 @@ export default {
},
//
deWeight(arr) {
for (var i = 0; i < arr.length - 1; i++) {
for (var j = i + 1; j < arr.length; j++) {
for (let i = 0; i < arr.length - 1; i++) {
for (let j = i + 1; j < arr.length; j++) {
if (arr[i].id == arr[j].id) { // id
arr.splice(j, 1);
//1 j++ j--
@ -531,8 +531,6 @@ export default {
return {
on: {
click: () => {
console.log(record)
console.log(record.id)
this.$router.push({name:'activiti-todoManage',
params:{
id: record.id

2
src/views/system/UserList.vue

@ -29,7 +29,7 @@
</a-col>
<a-col :md="6" :sm="8">
<a-form-item label="部门">
<j-select-depart v-model="queryParam.departIds" :trigger-change="true" ></j-select-depart>
<j-select-depart v-model="queryParam.departIds" :multi="true" :trigger-change="true" ></j-select-depart>
</a-form-item>
</a-col>
<!-- <a-row :gutter="24">-->

9
src/views/system/modules/UserModal.vue

@ -81,6 +81,7 @@
@search="onSearch">
<a-button slot="enterButton" icon="search">选择</a-button>
</a-input-search>
<!-- <j-select-depart v-model="checkedDepartNameString" :multi="false" :value="checkedDepartNameString" :trigger-change="true" ></j-select-depart>-->
</a-form-item>
</a-col>
@ -256,6 +257,7 @@
import JImageUpload from '../../../components/jeecg/JImageUpload'
import FileMangement from "@/extends/FileMangement/fileMangement";
import signMd5Utils from '@/utils/encryption/signMd5Utils'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
export default {
name: "UserModal",
@ -263,6 +265,7 @@
FileMangement,
JImageUpload,
departWindow,
JSelectDepart,
JSelectPosition
},
data () {
@ -516,9 +519,7 @@
this.picUrl2 = record.autograph;//,model
this.model.img = record.avatar;
this.model.img2 = record.autograph;
console.log("图片路径>>>>>>>>>",record.avatar)
console.log("图片路径>>>>>>>>>",this.picUrl)
console.log("签名>>>>>>>>>",this.picUrl2)
let obj ={}
obj.url= record.avatar;
//
@ -615,8 +616,6 @@
}else{
formData.autograph = null;
}
console.log("that.fileList2>>>>>>>>>>>>>>>>>>>",that.fileList2)
console.log("that.fileList>>>>>>>>>>>>>>>>>>>",that.fileList)
//update-begin-author:taoyan date:2020710 for:
formData.relTenantIds = this.currentTenant.length>0?this.currentTenant.join(','):''
//update-end-author:taoyan date:2020710 for:

Loading…
Cancel
Save