diff --git a/components/down-select.vue b/components/down-select.vue new file mode 100644 index 0000000..9400ba5 --- /dev/null +++ b/components/down-select.vue @@ -0,0 +1,381 @@ + + + + + diff --git a/pages.json b/pages.json index 5aeed9f..fda17f6 100644 --- a/pages.json +++ b/pages.json @@ -148,6 +148,13 @@ "navigationStyle": "custom" } }, + { + "path": "pages/index/neworderStatistic", + "style": { + "navigationBarTitleText": "订单统计", + "navigationStyle": "custom" + } + }, { "path": "pages/index/addStaff", "style": { @@ -204,6 +211,13 @@ "navigationStyle": "custom" } }, + { + "path": "pages/statistics/business", + "style": { + "navigationBarTitleText": "业务统计二级页", + "navigationStyle": "custom" + } + }, { "path": "pages/staff/staff", "style": { diff --git a/pages/index/addStaff.vue b/pages/index/addStaff.vue index 822928c..8473639 100644 --- a/pages/index/addStaff.vue +++ b/pages/index/addStaff.vue @@ -61,36 +61,36 @@ {{ driverLicenseTypeArrStr != null ? this.driverLicenseTypeArrStr : '请选择驾照类型' }} > - + 岗位 {{ roleName != null ? this.roleName : '请选择岗位' }} > - + 附件 查看附件 - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -103,10 +103,6 @@ @confirm="chooseEducation" @cancel="showEducation = false" keyName="label"> - - + + + + + @@ -162,6 +174,7 @@ export default { joinDate: null, probationPeriod: null, socialSecurityBuyDate: null, + roleIds: [] }, fileList1: [], selectJoinDate: new Date().toString(), @@ -229,6 +242,7 @@ export default { }) }, submit() { + this.staff.roleIds = this.staff.roleIds.map(item => item.id) //判断是否是修改 if (this.userId) { this.update() @@ -260,10 +274,18 @@ export default { method: 'put', data: data }).then(res => { + let resp = request({ + url: '/system/permission/assign-user-role', + method: 'post', + data: { + userId: this.userId, + roleIds: this.staff.roleIds + } + }) uni.showToast({ title: "编辑成功" }) - this.getInfoByUserId() + uni.navigateBack() }) }, async add() { @@ -275,7 +297,7 @@ export default { let data = { nickname: this.staff.nickname, mobile: this.staff.mobile, - username: this.staff.nickname, + username: this.staff.mobile, status: 0, userType: '01', roleId: this.staff.roleId, @@ -294,14 +316,13 @@ export default { data: data }) if (res.code == 200) { - let roleIds = [] - roleIds.push(this.staff.roleId) + console.log('角色', data) let resp = await request({ url: '/system/permission/assign-user-role', method: 'post', data: { userId: res.data, - roleIds: roleIds + roleIds: this.staff.roleIds } }) uni.showToast({ @@ -309,6 +330,7 @@ export default { }) this.show = false this.getindex() + uni.navigateBack() } }, validData() { @@ -319,7 +341,7 @@ export default { }) return false } - if (!this.staff.roleId && !this.userId) { + if (!this.staff.roleIds && !this.userId) { uni.showToast({ title: '请选择岗位', icon: 'none' @@ -372,16 +394,21 @@ export default { this.driverLicenseTypeArr.push(temp) }) } - if (this?.staff?.fileList) { - this.fileList1 = [] - this.staff.fileList.forEach((item) => { - const temp = { - name: item.name, - url: item.url.startsWith("http") ? item.url : baseImageUrl + '/' + item.url - } - this.fileList1.push(temp) - }) - console.log('tupian', this.fileList1) + if (this?.staff?.roleIds) { + console.log('this.staff.roleIds', this.staff.roleIds) + this.staff.roleIds = this.staff.roleIds.map(roleId => { + return this.roles.find(role => role.id === roleId); + }); + this.roleName = this.staff.roleIds.map(item => item.name).join(',') + console.log(this.staff.roleIds) + // this.fileList1 = [] + // this.staff.fileList.forEach((item) => { + // const temp = { + // name: item.name, + // url: item.url.startsWith("http") ? item.url : baseImageUrl + '/' + item.url + // } + // this.fileList1.push(temp) + // }) } }, getEducation() { @@ -402,10 +429,8 @@ export default { this.staff.educational = e.value[0].label this.showEducation = false }, - chooseRole(e) { - console.log(e) - this.staff.roleId = e.value[0].id - this.roleName = e.value[0].name + chooseRole() { + this.roleName = this.staff.roleIds.map(item => item.name).join(',') this.showRole = false }, @@ -430,7 +455,7 @@ export default { url: '/pages/manage/deviceManage?type=staff&folderId=' + this.staff.folderId }) }) - }else { + } else { uni.navigateTo({ url: '/pages/manage/deviceManage?type=staff&folderId=' + this.staff.folderId }) diff --git a/pages/index/countEmployees.vue b/pages/index/countEmployees.vue index a857c8e..7617614 100644 --- a/pages/index/countEmployees.vue +++ b/pages/index/countEmployees.vue @@ -1,180 +1,283 @@ diff --git a/pages/index/newindex.vue b/pages/index/newindex.vue index bff09fa..8b67f4b 100644 --- a/pages/index/newindex.vue +++ b/pages/index/newindex.vue @@ -24,6 +24,7 @@ + {{ noReadNum }} @@ -32,7 +33,7 @@ - + 当日订单 {{ threenum.todayOrderNum }} @@ -56,7 +57,7 @@ 订单管理 - + 业务统计 @@ -94,6 +95,16 @@ 使用说明 + + + + 员工统计 + + + + 当日订单统计 + + @@ -235,6 +246,11 @@ export default { url: '/pages/xiaoxi/notice' }) }, + goordercount(){ + uni.navigateTo({ + url: '/pages/index/neworderStatistic' + }) + }, goback() { uni.navigateBack() }, @@ -288,6 +304,21 @@ export default { url: '/pages/Tollannouncement/Tollannouncement' }) }, + goemployees() { + uni.navigateTo({ + url: '/pages/index/countEmployees' + }) + }, + goneworderStatistic() { + uni.navigateTo({ + url: '/pages/index/orderStatistics' + }) + }, + gobusiness() { + uni.navigateTo({ + url: '/pages/statistics/business' + }) + }, gettel(num) { const value = num.buyPhoneNum uni.makePhoneCall({ @@ -528,9 +559,24 @@ image { } .icon1 { + position: relative; width: 56rpx; height: 56rpx; margin-left: 30rpx; + .msg-num { + position: absolute; + right: -15rpx; + color: white; + background: #d74a43; + width: 35rpx; + height: 35rpx; + line-height: 35rpx; + text-align: center; + font-weight: 800; + font-size: 11px; + border-radius: 50%; + top: -15rpx; + } } .three_ { diff --git a/pages/index/neworderStatistic.vue b/pages/index/neworderStatistic.vue new file mode 100644 index 0000000..53cacdc --- /dev/null +++ b/pages/index/neworderStatistic.vue @@ -0,0 +1,651 @@ + + + + + diff --git a/pages/index/oldOrderProject.vue.vue b/pages/index/oldOrderProject.vue.vue index 89c29aa..dd9ae47 100644 --- a/pages/index/oldOrderProject.vue.vue +++ b/pages/index/oldOrderProject.vue.vue @@ -39,7 +39,8 @@ - @@ -203,6 +204,7 @@ export default { display: flex; flex-wrap: wrap; } + .xixi { font-size: 12px; color: #0D2E8D; diff --git a/pages/staff/staff-my.vue b/pages/staff/staff-my.vue index 2741c9b..a8f7b28 100644 --- a/pages/staff/staff-my.vue +++ b/pages/staff/staff-my.vue @@ -48,20 +48,31 @@ - - - + - word + 工作汇报 + + + + + + + + + + + + + - + @@ -79,6 +79,7 @@ export default { pageSize: 20,//一页多少张 totalPages: 0,//总数 baseImageUrl: this.$baseImageUrl, + showTabBar:true, } }, components: { @@ -101,6 +102,9 @@ export default { this.getlistindex() this.getIfSend() } + if (data.type && data.type === 'staff') { + this.showTabBar = false + } }, methods: { setIndex(num) { diff --git a/static/imgs/clone.png b/static/imgs/clone.png new file mode 100644 index 0000000..5dc28b9 Binary files /dev/null and b/static/imgs/clone.png differ diff --git a/static/imgs/rq.png b/static/imgs/rq.png new file mode 100644 index 0000000..8960b14 Binary files /dev/null and b/static/imgs/rq.png differ diff --git a/static/imgs/staffxiaoxi.png b/static/imgs/staffxiaoxi.png new file mode 100644 index 0000000..31cc5fc Binary files /dev/null and b/static/imgs/staffxiaoxi.png differ