diff --git a/components/staffTabBer/tabBar.vue b/components/staffTabBer/tabBar.vue index 4acb947..22ee428 100644 --- a/components/staffTabBer/tabBar.vue +++ b/components/staffTabBer/tabBar.vue @@ -106,10 +106,16 @@ getgogo(index) { if (index == 1) { this.aindex = index - uni.reLaunch({ - url: '/pages/staff/staff' - }); - + let chooseIdx = uni.getStorageSync("chooseIdx") + if (chooseIdx == 3) { + uni.reLaunch({ + url: '/pages/businessManager/businessManager' + }); + } else { + uni.reLaunch({ + url: '/pages/staff/staff' + }); + } } if (index == 3) { this.aindex = index diff --git a/pages.json b/pages.json index 9ea1b60..1f557b4 100644 --- a/pages.json +++ b/pages.json @@ -532,6 +532,13 @@ "navigationBarTitleText": "", "navigationStyle": "custom" } + }, + { + "path": "pages/businessManager/businessManager", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } } ], "globalStyle": { diff --git a/pages/Login/launcherPage.vue b/pages/Login/launcherPage.vue index 65a221c..a409db3 100644 --- a/pages/Login/launcherPage.vue +++ b/pages/Login/launcherPage.vue @@ -11,97 +11,106 @@ + \ No newline at end of file diff --git a/pages/Login/login.vue b/pages/Login/login.vue index 767ad7b..5b7010e 100644 --- a/pages/Login/login.vue +++ b/pages/Login/login.vue @@ -34,6 +34,9 @@ 员工登录 + + 业务登录 + @@ -231,7 +234,7 @@ }).then((res) => { if (res.code == 200) { - uni.setStorageSync('staffinfo', res.data.user) + uni.setStorageSync('staffinfo', res.data) uni.setStorageSync('partnerId', res.data.partnerId) uni.setStorageSync('roleSelect', 'worker') uni.setStorageSync('userId', res.data.user.id) @@ -243,6 +246,29 @@ } }) + } + if (this.shopinfo == 3) { + uni.showLoading({ + title: '加载中' + }); + request({ + url: '/rescue/getJcWorkerInfo', + method: 'get', + + }).then((res) => { + if (res.code == 200) { + uni.setStorageSync('staffinfo', res.data) + uni.setStorageSync('partnerId', res.data.partnerId) + uni.setStorageSync('roleSelect', 'businessManager') + uni.setStorageSync('userId', res.data.user.id) + uni.hideLoading(); + this.$startSocketConnect(res.data.user.id) + uni.redirectTo({ + url: '/pages/businessManager/businessManager' + }) + } + }) + } if (this.shopinfo == 1) { uni.showLoading({ diff --git a/pages/businessManager/businessManager.vue b/pages/businessManager/businessManager.vue new file mode 100644 index 0000000..669bf54 --- /dev/null +++ b/pages/businessManager/businessManager.vue @@ -0,0 +1,1526 @@ + + + + + + \ No newline at end of file diff --git a/pages/index/meetCarOrder.vue b/pages/index/meetCarOrder.vue index 74e25c7..4aa2777 100644 --- a/pages/index/meetCarOrder.vue +++ b/pages/index/meetCarOrder.vue @@ -255,6 +255,7 @@ xinlist: [], zhilist: [], isLoading: false, + userInfo: {}, recordTime: Number(new Date()), baseUrl: this.$baseImageUrl, goodsId: '', @@ -266,6 +267,10 @@ { name: '上门取车', label: 1 + }, + { + name: '业务接车', + label: 2 } ], radiovalue1: 0, @@ -299,6 +304,46 @@ async onLoad(options) { this.isLoading = true await this.getinitialize() + this.userInfo = uni.getStorageSync('staffinfo') + if (!this.userInfo || !this.userInfo.userInfo) { + request({ + url: '/rescue/getJcWorkerInfo', + method: 'get', + + }).then((res) => { + if (res.code == 200) { + uni.setStorageSync('staffinfo', res.data) + uni.setStorageSync('userId', res.data.user.id) + } + }) + } + console.log('当前用户信息', this.userInfo); + if (this.userInfo.userInfo) { + this.otherPhone = this.userInfo.userInfo.mobile + this.otherName = this.userInfo.userInfo.nickname + } + if (options.type) { + if (options.type === 'business') { + // 业务经理接车 + //1.设置默认接车为业务接车 + this.radiovalue1 = 2 + + //2.找出对应的客户来源和业务 + console.log('客户来源', this.columns); + console.log('当前userId', uni.getStorageSync('userId')); + const result = this.findUserWithParent(this.columns, uni.getStorageSync('userId')) + console.log('查询出来的shuju ', result) + if (result) { + this.customerSource = result.child.name + this.customerSourceId = result.child.id + this.businessChannel = result.parent.name + this.businessChannelId = result.parent.id + this.cssj = this.customerSourceId + } + console.log(this.customerSource, this.businessChannel); + } + } + this.isLoading = false }, onShow() { @@ -322,13 +367,30 @@ this.customerSourceId = e.detail.value[1].value this.businessChannel = e.detail.value[0].text this.businessChannelId = e.detail.value[0].value - console.log('客户来源', this.customerSource); - console.log('bangding', this.cssj); }, onnodeclick(e) { console.log('选择的内容', e); console.log('bangding', this.cssj); }, + /** + * @param {Object} data + * @param {Object} userId + */ + findUserWithParent(data, userId) { + for (const parent of data) { + if (Array.isArray(parent.children)) { + for (const child of parent.children) { + if (child.userIds && child.userIds.includes(userId)) { + return { + parent, + child + }; + } + } + } + } + return null; // 未找到 + }, async getCustomerSource(searchValue) { console.log('搜索内容', searchValue); let res = await request({ diff --git a/pages/index/ordermanage.vue b/pages/index/ordermanage.vue index cdc3d09..91e598d 100644 --- a/pages/index/ordermanage.vue +++ b/pages/index/ordermanage.vue @@ -81,7 +81,7 @@ - 需复检项目: + 需复检|重检项目: 异常项目: {{ item.nodeNames }} @@ -148,17 +148,16 @@ text: "进行中", value: "0" }, - { text: "已完成", value: "1", }, + // { + // text: "待重检", + // value: "2" + // }, { - text: "待重检", - value: "2" - }, - { - text: "待复检", + text: "待审核", value: "4" }, { @@ -293,8 +292,7 @@ method: 'get', params: { ids: ids.join(','), - status: 3, - type: this.tapValue == '7' ? '0' : '' + type: this.tapValue == '4' ? '0' : '' } }) } else if (this.tapValue == '5') { diff --git a/pages/manage/workReport/reportDetals.vue b/pages/manage/workReport/reportDetals.vue index dca0e68..325bf5c 100644 --- a/pages/manage/workReport/reportDetals.vue +++ b/pages/manage/workReport/reportDetals.vue @@ -259,8 +259,14 @@ console.log('当前选择的汇报对象', this.reportTosStr) if (res.data.filePath) { this.fileList1 = res.data.filePath.split(',').map(item => { - return { - url: this.baseImageUrl + "/" + item + if (!item.includes('http')) { + return { + url: this.baseImageUrl + "/" + item + } + } else { + return { + url: item + } } }) } diff --git a/pages/staff/staff-my.vue b/pages/staff/staff-my.vue index 400c865..2ad4e29 100644 --- a/pages/staff/staff-my.vue +++ b/pages/staff/staff-my.vue @@ -131,6 +131,18 @@ + + + + + + + {{chooseIdx == 3 ? '切换员工端' : '切换业务经理端'}} + + + + + @@ -157,13 +169,15 @@ msg: '3', user: {}, baseUrl: '', + chooseIdx: undefined, partnerId: '', myindex: {}, lookAppointment: false } }, onLoad() { - this.baseUrl = this.$baseImageUrl + '/' + this.baseUrl = this.$baseImageUrl + '/', + this.chooseIdx = uni.getStorageSync("chooseIdx") }, onShow() { this.user = uni.getStorageSync('staffinfo') @@ -207,6 +221,20 @@ url: `/pages/editUserInfo/editUserInfo` }); }, + checkoutRole() { + uni.showLoading({ + title: '加载中' + }); + if (this.chooseIdx == 3) { + uni.setStorageSync("chooseIdx", 2) + } else { + uni.setStorageSync("chooseIdx", 3) + } + setTimeout(function() { + uni.hideLoading(); + }, 1000); + this.chooseIdx = uni.getStorageSync("chooseIdx") + }, dialogClose() { this.$refs.alertDialog.close() console.log('点击关闭') diff --git a/pages/statistics/business.vue b/pages/statistics/business.vue index c9cbe0b..ba99d0c 100644 --- a/pages/statistics/business.vue +++ b/pages/statistics/business.vue @@ -69,11 +69,11 @@ 资料统计 - + 新增 {{fileRes.addCount || 0}} - + 修改 {{fileRes.updateCount || 0}} @@ -467,6 +467,12 @@ }) } }, + // + goxiangqing2(id, type) { + uni.navigateTo({ + url: '/pages/statistics/statislist?id=' + id + '&type=' + type + }) + }, goOrderList() { uni.navigateTo({ url: '/pages/index/ordermanage' diff --git a/pages/statistics/statislist.vue b/pages/statistics/statislist.vue index 0f1e4ed..e398ccc 100644 --- a/pages/statistics/statislist.vue +++ b/pages/statistics/statislist.vue @@ -93,7 +93,7 @@ - + {{ item.name || '' }}: @@ -103,15 +103,35 @@ + + + + + + + + + + 资料名称:{{ item.fileName || '' }} + + {{ type=='add' ? '新增时间' : '修改时间' }} + {{formatDate(item.createTime)}} + + 类型: {{ item.type == 2 ?'文件' :'文件夹' }} + + 查看文件 + + + - -