diff --git a/package.json b/package.json index c7cc7fa..c33fa19 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "vue-grid-layout": "^2.4.0", "vue-router": "3.0.6", "vuex": "3.1.0", + "vxe-pc-ui": "^3.1.0", "vxe-table": "^3.8.22", "wujie-vue2": "^1.0.22" }, diff --git a/src/main.js b/src/main.js index 9924559..38e479e 100644 --- a/src/main.js +++ b/src/main.js @@ -38,6 +38,10 @@ Vue.prototype.$moment = moment Vue.use(ElementUI) // vxetable +import { VxeUI, VxeUpload, VxeDatePicker } from 'vxe-pc-ui' +import 'vxe-pc-ui/lib/style.css' +Vue.use(VxeUpload) +Vue.use(VxeDatePicker) import { VxeIcon, VxeTable, VxeColumn, VxeColgroup, VxeTableEditModule, VxeTableValidatorModule, VxeModal, VxeToolbar } from 'vxe-table' // import vxeTable from 'vxe-table' import 'vxe-table/styles/index.scss' @@ -49,6 +53,8 @@ Vue.use(VxeColumn) Vue.use(VxeColgroup) Vue.use(VxeModal) Vue.use(VxeToolbar) + + // Vue.use(vxeTable) import domZIndex from 'dom-zindex' domZIndex.setCurrent(2000) diff --git a/src/views/jsc/allTable.vue b/src/views/jsc/allTable.vue index 7c0552b..4c267a0 100644 --- a/src/views/jsc/allTable.vue +++ b/src/views/jsc/allTable.vue @@ -15,7 +15,7 @@
- + @@ -229,7 +229,7 @@ }], - + changeSelect:false, dateRange: '', pickerOptions: { shortcuts: [{ @@ -318,8 +318,11 @@ async getChartOverallList() { try { this.loading = true - this.list = [] - this.total = 0 + if(this.changeSelect){ + this.list = [] + this.total = 0 + this.modalSelect.page = 1 + } const res = await axios.get(`${process.env.VUE_APP_BASE_API}/api/oa/chart/overall-list`, { headers: { 'Authorization': `Bearer ${getToken()}` @@ -337,6 +340,7 @@ console.log("res",res) this.table = this.tableList[this.modalSelect.searchTag] + this.changeSelect = false let list = res.data.data.data this.total = res.data.data.total if(this.modalSelect.searchTag==='yongche'){ @@ -351,6 +355,7 @@ } }) this.list = carList + this.total = carList.length }else{ this.list = list } @@ -370,15 +375,23 @@ console.log("e", e) if (e) { this.modalSelect.start_date = e[0] + ' 00:00:00' - this.modalSelect.end_date = e[1] + ' 23:59:59' + this.modalSelect.end_date = e[1] + ' 23:59:59' + this.changeSelect = true } else { this.modalSelect.start_date = '' this.modalSelect.end_date = '' } }, + changeDepartment(e){ + if(e || e==''){ + this.changeSelect = true + this.modalSelect.department_id = e + } + }, changeTag(e){ this.tagList.map(item=>{ if(item.id==e){ + this.changeSelect = true this.modalSelect.type = item.type } }) diff --git a/src/views/system/components/AddUser.vue b/src/views/system/components/AddUser.vue index 13243a6..850fc30 100644 --- a/src/views/system/components/AddUser.vue +++ b/src/views/system/components/AddUser.vue @@ -40,6 +40,24 @@ + + + + @@ -54,6 +72,9 @@ - -