From 1c87a990435087ebc79ebf8178fdcc359b28b6e2 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Mon, 25 Sep 2023 18:05:36 +0800 Subject: [PATCH] 2023-9-25 --- supervise-uniapp/App.vue | 1 + supervise-uniapp/common/request.api.js | 53 ++- supervise-uniapp/common/wxSilentLogin.js | 1 + .../ProcessButtons/ProcessButtons.vue | 202 +++++++++ .../ProcessRecords/ProcessRecords.vue | 371 ++++++++++++++++ supervise-uniapp/pages.json | 26 +- supervise-uniapp/pages/home/WorkFragment.vue | 6 +- .../pages/index/AlreadyProcessed.vue | 416 ++++-------------- .../pages/index/WaitingProcessed.vue | 381 ++++------------ .../pages/index/sealApplyDetail.vue | 337 ++++++++++++++ supervise-uniapp/pages/login/login.vue | 1 + supervise-uniapp/static/baseIcon/fqw.png | Bin 0 -> 800 bytes supervise-uniapp/static/baseIcon/jj.png | Bin 0 -> 881 bytes supervise-uniapp/static/baseIcon/spz.png | Bin 0 -> 805 bytes supervise-uniapp/static/baseIcon/ty.png | Bin 0 -> 1020 bytes 15 files changed, 1149 insertions(+), 646 deletions(-) create mode 100644 supervise-uniapp/components/ProcessButtons/ProcessButtons.vue create mode 100644 supervise-uniapp/components/ProcessRecords/ProcessRecords.vue create mode 100644 supervise-uniapp/pages/index/sealApplyDetail.vue create mode 100644 supervise-uniapp/static/baseIcon/fqw.png create mode 100644 supervise-uniapp/static/baseIcon/jj.png create mode 100644 supervise-uniapp/static/baseIcon/spz.png create mode 100644 supervise-uniapp/static/baseIcon/ty.png diff --git a/supervise-uniapp/App.vue b/supervise-uniapp/App.vue index cd0d74e5..32242828 100644 --- a/supervise-uniapp/App.vue +++ b/supervise-uniapp/App.vue @@ -12,6 +12,7 @@ sid: "", headImage: "", username: "", + orgSidPath: "", orgNamePath: "", organizationSid: "", }, //全局变量， diff --git a/supervise-uniapp/common/request.api.js b/supervise-uniapp/common/request.api.js index 807cb51f..ea62fbeb 100644 --- a/supervise-uniapp/common/request.api.js +++ b/supervise-uniapp/common/request.api.js @@ -84,19 +84,46 @@ export default { // 获取首页面数据 getWorkData: (params = {}) => request.get("/reportwxmpapi/messagepushlog/numberOfJobs/" + params, params), - + // 获取消息类型列表 messageTypeList: (params = {}) => request.post("/reportwxmpapi/MessageType/list ", params), - + // 获取风险预警消息 riskListPage: (params = {}) => request.post("/reportwxmpapi/ImgMessagesLog/listPage", params), - + // 获取待阅工作、已阅工作 messageListPage: (params = {}) => request.post("/reportwxmpapi/messagepushlog/listPage", params), - + // 获取设备状态 deviceListPage: (params = {}) => request.post("/reportwxmpapi/RiskMessagesLog/listPage", params), + + // 获取待办工作列表 + todoAllTaskList: (params = {}) => request.post("/api/portal/v1/flow/todoAllTaskList/" + params.params.userSid, + params), + + // 获取已办工作列表 + doneAllTaskList: (params = {}) => request.post("/api/portal/v1/flow/doneAllTaskList/" + params.params.userSid, + params), + + // 获取业务流转记录 + flowRecordList: (params = {}) => request.get("/api/portal/v1/flow/task/flowRecord/" + params.procInsId + "/" + + params.deployId, {}), + + // 同意申请 + completeProcess: (params = {}) => request.post("/enterprisecentre/v1/sealrecord/complete", params), + + // 终止申请 + breakProcess: (params = {}) => request.post("/enterprisecentre/v1/sealrecord/breakProcess", params), + + // 撤回申请 + revokeProcess: (params = {}) => request.post("/enterprisecentre/v1/sealrecord/revokeProcess", params), + + // 获取用章申请详情 + sealApplyDetail: (params = {}) => request.get("/enterprisecentre/v1/sealrecord/fetchDetailsBySid/" + params, + params), + + // 获取云仓列表 storeHouseListPage: (params = {}) => request.post("/api/portal/v1/flow/storeHouseListPage", params), // 获取云仓详情 @@ -119,17 +146,17 @@ export default { // 获取数据总览列表 projectListPage: (params = {}) => request.post("/reportwxmpapi/projectdaily/selectListPage", params), - - - - - - - + + + + + + + // 修改密码 updatePassword: (params = {}) => request.post("/api/portal/v1/sysuser/updatePassword", params), - + // 修改头像 uploadHandImage: (params = {}) => request.post("/api/portal/v1/sysuser/uploadImage", params), - + } \ No newline at end of file diff --git a/supervise-uniapp/common/wxSilentLogin.js b/supervise-uniapp/common/wxSilentLogin.js index 0c8d6139..de1ac3cc 100644 --- a/supervise-uniapp/common/wxSilentLogin.js +++ b/supervise-uniapp/common/wxSilentLogin.js @@ -82,6 +82,7 @@ const wxSilentLogin = () => { .mobile getApp().globalData.isAdmin = res.data.data.isAdmin + getApp().globalData.orgSidPath = res.data.data.orgSidPath getApp().globalData.orgNamePath = res.data.data.orgNamePath getApp().globalData.organizationSid = res.data.data.organizationSid getApp().globalData.headImage = res.data.data.headImage diff --git a/supervise-uniapp/components/ProcessButtons/ProcessButtons.vue b/supervise-uniapp/components/ProcessButtons/ProcessButtons.vue new file mode 100644 index 00000000..578612fb --- /dev/null +++ b/supervise-uniapp/components/ProcessButtons/ProcessButtons.vue @@ -0,0 +1,202 @@ + + + + + \ No newline at end of file diff --git a/supervise-uniapp/components/ProcessRecords/ProcessRecords.vue b/supervise-uniapp/components/ProcessRecords/ProcessRecords.vue new file mode 100644 index 00000000..3e6be72e --- /dev/null +++ b/supervise-uniapp/components/ProcessRecords/ProcessRecords.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/supervise-uniapp/pages.json b/supervise-uniapp/pages.json index 96b7aaaa..761ce2b3 100644 --- a/supervise-uniapp/pages.json +++ b/supervise-uniapp/pages.json @@ -33,6 +33,14 @@ "navigationBarTitleText": "工作台" } }, + { + "path": "pages/index/WaitingProcessed", + "style": { + "navigationBarTitleText": "待办工作", + "enablePullDownRefresh": true + } + + }, { "path": "pages/home/MessageFragment", @@ -69,14 +77,7 @@ }, - { - "path": "pages/index/WaitingProcessed", - "style": { - "navigationBarTitleText": "待办工作", - "enablePullDownRefresh": true - } - - }, + { @@ -363,6 +364,15 @@ } } + ,{ + "path" : "pages/index/sealApplyDetail", + "style" : + { + "navigationBarTitleText": "印鉴申请详情", + "enablePullDownRefresh": false + } + + } ], "lazyCodeLoading": "requiredComponents", "globalStyle": { diff --git a/supervise-uniapp/pages/home/WorkFragment.vue b/supervise-uniapp/pages/home/WorkFragment.vue index acb57571..5fc0d1b4 100644 --- a/supervise-uniapp/pages/home/WorkFragment.vue +++ b/supervise-uniapp/pages/home/WorkFragment.vue @@ -19,7 +19,7 @@ - + {{dyNum}} @@ -296,7 +296,7 @@ // if (resp.success) { console.log('1111', resp) this.isShow = msg; - this.dbNum = resp.todoNumber + this.dbNum = resp.toDo this.dyNum = resp.pendingMessages this.textArr = resp.notice this.swipers = resp.urls diff --git a/supervise-uniapp/pages/index/AlreadyProcessed.vue b/supervise-uniapp/pages/index/AlreadyProcessed.vue index 2e8d1c4d..d0cae543 100644 --- a/supervise-uniapp/pages/index/AlreadyProcessed.vue +++ b/supervise-uniapp/pages/index/AlreadyProcessed.vue @@ -17,44 +17,36 @@ @refresherrestore="onRestore" @refresherabort="onAbort" @scrolltolower="scrollBottem"> - + - {{item.workName}} - {{item.state}} + {{item.procDefName}} + {{item.endTime==null?item.taskName:"已办结"}} - + 发起人： - {{item.name}} + {{item.startUserName}} 发起部门： - {{item.department}} + {{item.startDeptName}} - + 发起日期： - {{item.startDate}} + {{item.createTime}} - + 当前处理人： - {{item.currentProcessor}} + {{item.assigneeName}} - - - - - - - {{item.submitDate}} - @@ -71,20 +63,20 @@ 申请日期 - + 至 - + - 发起人 + - + {{item.name}} - - + > @@ -132,111 +122,10 @@ export default { data() { return { - searchText: "", - search: { - startDate: "", - endDate: "", - promoter: "" - }, selectDate: "", datetimeShow: false, datetimeIndex: "1", - personnelList: [{ - id: "1", - name: "张安1", - department: "研发部", - checked: false - }, - { - id: "2", - name: "张安2", - department: "研发部", - checked: false - }, - { - id: "3", - name: "张安3", - department: "研发部", - checked: false - }, - { - id: "4", - name: "张安4", - department: "研发部", - checked: false - }, - { - id: "5", - name: "张安5", - department: "研发部", - checked: false - }, - { - id: "6", - name: "张安6", - department: "研发部", - checked: false - }, - { - id: "7", - name: "张安7", - department: "研发部", - checked: false - }, - { - id: "8", - name: "张安8", - department: "研发部", - checked: false - }, - { - id: "9", - name: "张安9", - department: "研发部", - checked: false - }, - { - id: "10", - name: "张安10", - department: "研发部", - checked: false - }, - { - id: "11", - name: "张安11", - department: "研发部", - checked: false - }, - { - id: "12", - name: "张安12", - department: "研发部", - checked: false - }, - { - id: "13", - name: "张安13", - department: "研发部", - checked: false - }, - { - id: "14", - name: "张安14", - department: "研发部", - checked: false - }, - { - id: "1", - name: "张安1", - department: "研发部", - checked: false - }, - { - id: "15", - name: "张安16", - department: "研发部", - checked: false - }, + personnelList: [ ], triggered: true, @@ -251,171 +140,43 @@ current: 1, size: 10, params: { + procDefName: "", + startDate: "", + endDate: "", + userSid: "", woekName: "", } }, loadingType: 'more', //加载更多状态 - dataList: [{ - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor:"张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor:"张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor:"张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor:"张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor:"张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor:"张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor:"张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor:"张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor:"张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor:"张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor:"张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor:"张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor:"张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - - ], + dataList: [], }; }, - + created() { this.$bus.$on('wholeSpin', msg => { //这里获取到http工具js文件中传过来的wholeSpin值 console.log(">>>>>", this.isShow) - + var userSid = getApp().globalData.sid console.log(">>>>>", userSid) this.loadData(); }); }, - - + + onLoad() { - + }, - + onShow() { console.log('onShow', getApp().globalData.isLogin) - + let token = uni.getStorageSync("Global-Auth-Token") if (token != null && token.length != 0) { getApp().globalData.token = token } - let isLogin =uni.getStorageSync("isLogin") + let isLogin = uni.getStorageSync("isLogin") if (isLogin != null && isLogin == 1) { getApp().globalData.isLogin = isLogin } @@ -423,26 +184,28 @@ if (sid != null && sid.length != 0) { getApp().globalData.sid = sid } - + console.log('用户Sid', getApp().globalData.sid) console.log('token', getApp().globalData.token) console.log('是否登陆', getApp().globalData.isLogin) - + // setTimeout(() => { if (getApp().globalData.isLogin) { var userSid = getApp().globalData.sid console.log(">>>>>", userSid) - this.loadData(); + this.listQuery.params.userSid = userSid + this.dataList = [] + this.loadData(); // uni.setTabBarBadge({ //显示数字 // index: 0, //tabbar下标 // text: '100' //数字 // }) } else { - + /* #ifdef MP-WEIXIN */ this.WxSilentLogin() /* #endif */ - + /* #ifdef APP-PLUS */ uni.redirectTo({ url: '../login/login' @@ -450,27 +213,7 @@ /* #endif */ } }, - - // onShow() { - // this.listQuery.current = 1 - // this.dataList = []; - // this.loadData(); - // }, - // onLoad() { - - // }, - // onPullDownRefresh() { - // this.listQuery.current = 1 - // this.loadData('refresh'); - // setTimeout(function() { - // uni.stopPullDownRefresh(); - // }, 2000); - // }, - // //加载更多 - // onReachBottom() { - // this.listQuery.current = this.listQuery.current + 1 - // this.loadData(); - // }, + onReady() { /* #ifdef MP-WEIXIN */ // 微信小程序需要用此写法 @@ -504,17 +247,21 @@ console.log("onAbort"); }, searchInput(e) { - console.log("searchText》》》", e.detail.value); - this.searchText = e.detail.value + this.listQuery.params.procDefName = e.detail.value + this.dataList = [] + this.listQuery.current = 1, + this.listQuery.size = 10, + + this.loadData() }, highLight(value) { console.log("highLight》》》", value); if (value == '' || value == undefined || value == null) return - if (value.includes(this.searchText)) { + if (value.includes(this.listQuery.params.procDefName)) { value = value.replace( - this.searchText, - "" + this.searchText + "" + this.listQuery.params.procDefName, + "" + this.listQuery.params.procDefName + "" ) return value } else { @@ -560,10 +307,10 @@ switch (this.datetimeIndex) { case "1": - this.search.startDate = formatTimeTwo(parseInt(date.value), "Y-M-D") + this.listQuery.params.startDate = formatTimeTwo(parseInt(date.value), "Y-M-D") break; case "2": - this.search.endDate = formatTimeTwo(parseInt(date.value), "Y-M-D") + this.listQuery.params.endDate = formatTimeTwo(parseInt(date.value), "Y-M-D") break; default: break; @@ -594,24 +341,21 @@ // this.personnelList[index].checked = !this.personnelList[index].checked }, resetClik() { - this.search = { - startDate: "", - endDate: "", - promoter: "" - } + this.listQuery.params.startDate = "" + this.listQuery.params.endDate = "" }, assignClick() { - console.log('confirm', this.search) + console.log('confirm', this.listQuery.params) this.datetimeShow = false this.$refs['drawer'].close() - - uni.showToast({ - icon: "none", - title: JSON.stringify( this.search), - duration: 5000, - }); + + this.dataList = [] + this.listQuery.current = 1, + this.listQuery.size = 10, + + this.loadData() }, //加载商品 ，带下拉刷新和上滑加载 @@ -627,18 +371,11 @@ } var list = [] - - this.$api.storeHouseListPage(this.listQuery).then((resp) => { + console.log('listQuery', this.listQuery) + this.$api.doneAllTaskList(this.listQuery).then((resp) => { // if (resp.success) { console.log('1111', resp) - this.listQuery = { - current: resp.current, - size: 10, - params: { - - } - } list = resp.records console.log("消息列表", list) @@ -665,6 +402,35 @@ }) }, + itemClick(item) { + console.log('item', item) + + var sid = item.processVariables.businessSid + var procInsId = item.procInsId + var deployId = item.deployId + var previousPersonSid = item.previousPersonSid + var taskId = item.taskId + var taskDefKey = item.taskDefKey + + var isFinish = item.endTime == null?"":item.endTime + + console.log('sid', sid) + console.log('procInsId', procInsId) + console.log('deployId', deployId) + console.log('previousPersonSid', previousPersonSid) + console.log('taskId', taskId) + console.log('taskDefKey', taskDefKey) + console.log('isFinish', isFinish) + + + + uni.navigateTo({ + url: 'sealApplyDetail?sid=' + sid + "&procInsId=" + procInsId + "&deployId=" + deployId + + "&previousPersonSid=" + previousPersonSid + "&type=2" + "&isFinish="+isFinish+ + "&taskId=" + taskId + "&taskDefKey=" + taskDefKey + }); + + } } } diff --git a/supervise-uniapp/pages/index/WaitingProcessed.vue b/supervise-uniapp/pages/index/WaitingProcessed.vue index b15740a5..11073706 100644 --- a/supervise-uniapp/pages/index/WaitingProcessed.vue +++ b/supervise-uniapp/pages/index/WaitingProcessed.vue @@ -17,27 +17,27 @@ @refresherrestore="onRestore" @refresherabort="onAbort" @scrolltolower="scrollBottem"> - + - {{item.workName}} - {{item.state}} + {{item.procDefName}} + {{item.taskName}} 发起人： - {{item.name}} + {{item.startUserName}} 发起部门： - {{item.department}} + {{item.startDeptName}} 发起日期： - {{item.startDate}} + {{item.createTime}} @@ -46,7 +46,7 @@ - {{item.submitDate}} + {{item.processCreateTime}} @@ -66,21 +66,21 @@ 申请日期 - + 至 - + - 发起人 + - - {{item.name}} - + --> @@ -127,111 +126,10 @@ export default { data() { return { - searchText: "", - search: { - startDate: "", - endDate: "", - promoter: "" - }, selectDate: "", datetimeShow: false, datetimeIndex: "1", - personnelList: [{ - id: "1", - name: "张安1", - department: "研发部", - checked: false - }, - { - id: "2", - name: "张安2", - department: "研发部", - checked: false - }, - { - id: "3", - name: "张安3", - department: "研发部", - checked: false - }, - { - id: "4", - name: "张安4", - department: "研发部", - checked: false - }, - { - id: "5", - name: "张安5", - department: "研发部", - checked: false - }, - { - id: "6", - name: "张安6", - department: "研发部", - checked: false - }, - { - id: "7", - name: "张安7", - department: "研发部", - checked: false - }, - { - id: "8", - name: "张安8", - department: "研发部", - checked: false - }, - { - id: "9", - name: "张安9", - department: "研发部", - checked: false - }, - { - id: "10", - name: "张安10", - department: "研发部", - checked: false - }, - { - id: "11", - name: "张安11", - department: "研发部", - checked: false - }, - { - id: "12", - name: "张安12", - department: "研发部", - checked: false - }, - { - id: "13", - name: "张安13", - department: "研发部", - checked: false - }, - { - id: "14", - name: "张安14", - department: "研发部", - checked: false - }, - { - id: "1", - name: "张安1", - department: "研发部", - checked: false - }, - { - id: "15", - name: "张安16", - department: "研发部", - checked: false - }, + personnelList: [ ], triggered: true, @@ -246,141 +144,15 @@ current: 1, size: 10, params: { + proDefName: "", + startDate: "", + endDate: "", + userSid: "", woekName: "", } }, loadingType: 'more', //加载更多状态 - dataList: [{ - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor: "张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor: "张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor: "张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor: "张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor: "张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor: "张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor: "张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor: "张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor: "张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor: "张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor: "张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor: "张衡、吴", - submitDate: "2022.01.28 10:28" - - }, - { - workName: "测试XXXX申请", - state: "经理审核", - name: "张磊", - department: "研发部", - startDate: "2022-01-23-10:26", - currentProcessor: "张衡、吴", - submitDate: "2022.01.28 10:28" - - }, + dataList: [ ], @@ -394,6 +166,7 @@ var userSid = getApp().globalData.sid console.log(">>>>>", userSid) + this.listQuery.params.userSid = userSid this.loadData(); }); }, @@ -427,6 +200,8 @@ if (getApp().globalData.isLogin) { var userSid = getApp().globalData.sid console.log(">>>>>", userSid) + this.listQuery.params.userSid = userSid + this.dataList=[] this.loadData(); // uni.setTabBarBadge({ //显示数字 // index: 0, //tabbar下标 @@ -446,26 +221,6 @@ } }, - // onShow() { - // this.listQuery.current = 1 - // this.dataList = []; - // this.loadData(); - // }, - // onLoad() { - - // }, - // onPullDownRefresh() { - // this.listQuery.current = 1 - // this.loadData('refresh'); - // setTimeout(function() { - // uni.stopPullDownRefresh(); - // }, 2000); - // }, - // //加载更多 - // onReachBottom() { - // this.listQuery.current = this.listQuery.current + 1 - // this.loadData(); - // }, onReady() { /* #ifdef MP-WEIXIN */ // 微信小程序需要用此写法 @@ -499,17 +254,21 @@ console.log("onAbort"); }, searchInput(e) { - console.log("searchText》》》", e.detail.value); - this.searchText = e.detail.value + this.listQuery.params.proDefName = e.detail.value + this.dataList = [] + this.listQuery.current = 1, + this.listQuery.size = 10, + + this.loadData() }, highLight(value) { console.log("highLight》》》", value); if (value == '' || value == undefined || value == null) return - if (value.includes(this.searchText)) { + if (value.includes(this.listQuery.params.proDefName)) { value = value.replace( - this.searchText, - "" + this.searchText + "" + this.listQuery.params.proDefName, + "" + this.listQuery.params.proDefName + "" ) return value } else { @@ -555,10 +314,10 @@ switch (this.datetimeIndex) { case "1": - this.search.startDate = formatTimeTwo(parseInt(date.value), "Y-M-D") + this.listQuery.params.startDate = formatTimeTwo(parseInt(date.value), "Y-M-D") break; case "2": - this.search.endDate = formatTimeTwo(parseInt(date.value), "Y-M-D") + this.listQuery.params.endDate = formatTimeTwo(parseInt(date.value), "Y-M-D") break; default: break; @@ -589,24 +348,27 @@ // this.personnelList[index].checked = !this.personnelList[index].checked }, resetClik() { - this.search = { - startDate: "", - endDate: "", - promoter: "" - } + this.listQuery.params.startDate = "" + this.listQuery.params.endDate = "" }, assignClick() { - console.log('confirm', this.search) + console.log('confirm', this.listQuery.params) this.datetimeShow = false this.$refs['drawer'].close() - uni.showToast({ - icon: "none", - title: JSON.stringify(this.search), - duration: 5000, - }); + this.dataList = [] + this.listQuery.current = 1, + this.listQuery.size = 10, + + this.loadData() + + // uni.showToast({ + // icon: "none", + // title: JSON.stringify(this.listQuery.params), + // duration: 5000, + // }); }, //加载商品 ，带下拉刷新和上滑加载 @@ -622,23 +384,23 @@ } var list = [] - - this.$api.storeHouseListPage(this.listQuery).then((resp) => { + console.log('listQuery', this.listQuery) + this.$api.todoAllTaskList(this.listQuery).then((resp) => { // if (resp.success) { console.log('1111', resp) - this.listQuery = { - current: resp.current, - size: 10, - params: { + // this.listQuery = { + // current: resp.current, + // size: 10, + // params: { + + // } + // } - } - } list = resp.records console.log("消息列表", list) - // this.goodsList = list; - // let goodsList = await this.$api.json('goodsList'); + if (type === 'refresh') { this.dataList = []; } @@ -660,6 +422,31 @@ }) }, + + itemClick(item) { + console.log('item', item) + + var sid = item.processVariables.businessSid + var procInsId = item.procInsId + var deployId = item.deployId + var previousPersonSid = item.previousPersonSid + var taskId = item.taskId + var taskDefKey = item.taskDefKey + + console.log('sid', sid) + console.log('procInsId', procInsId) + console.log('deployId', deployId) + console.log('previousPersonSid', previousPersonSid) + console.log('taskId', taskId) + console.log('taskDefKey', taskDefKey) + + uni.navigateTo({ + url: 'sealApplyDetail?sid=' + sid + "&procInsId=" + procInsId + "&deployId=" + deployId + + "&previousPersonSid=" +previousPersonSid + "&type=1" + + "&taskId=" +taskId + "&taskDefKey="+taskDefKey + }); + + } } } diff --git a/supervise-uniapp/pages/index/sealApplyDetail.vue b/supervise-uniapp/pages/index/sealApplyDetail.vue new file mode 100644 index 00000000..1bfd0e48 --- /dev/null +++ b/supervise-uniapp/pages/index/sealApplyDetail.vue @@ -0,0 +1,337 @@ + + + + + \ No newline at end of file diff --git a/supervise-uniapp/pages/login/login.vue b/supervise-uniapp/pages/login/login.vue index bec0266c..1e380ddb 100644 --- a/supervise-uniapp/pages/login/login.vue +++ b/supervise-uniapp/pages/login/login.vue @@ -216,6 +216,7 @@ getApp().globalData.sid = uinfo.sid getApp().globalData.mobile = uinfo.mobile getApp().globalData.isAdmin = uinfo.isAdmin + getApp().globalData.orgSidPath = uinfo.orgSidPath getApp().globalData.orgNamePath = uinfo.orgNamePath getApp().globalData.organizationSid = uinfo.organizationSid getApp().globalData.headImage = uinfo.headImage diff --git a/supervise-uniapp/static/baseIcon/fqw.png b/supervise-uniapp/static/baseIcon/fqw.png new file mode 100644 index 0000000000000000000000000000000000000000..1add124a59bdde0ff7a1638ee93deb5484fbee1d GIT binary patch literal 800 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw3=&b&bO2H<0X`wF3%JgyD2y zYW@A~K=!eZ_xHTJnR#pVtY^n6?``2YRPy%sSNBUZ<~=|8@y~azpD*ixF3>3n@(TvK z1*qQZ|9^q6EB>E4qyRRkc4x|y|Ii^%P6%TMQu4(`ClJ8-3l7~}*f1Kv0(9rx-k2l`Aa#c(J z&+eLn&GU=hpZ!h~m@_{{=*g7(t;I=KjNU(z$XjKgwdBw_<%-y2k>^gAa@>pDot9gE zPj6GsM%(hYXM*1BDfpOVCZiVImSSZo@$~fnosvJIq!-7w1u90SpSd0`uE(?c%L1Wz zsi@o6HhlYevrxkF{~Ful8~Q?}4OaJTx5#2xfAx_{8`sPgy#+}^c~^ekOXZC{l{0a} zsny@?PS5zX=TgDCB+#pS$5 zo6YyZABmc20cXuV?XKmy=aq4IfmEiN%R|;Hs@A90?_Z!dCw@;JO2g0Ne@fL98m^$34O0-p3^7YX&dj>aO`B?Mq64i^Z^X_}`D^F77zU%aoqswC7 zc_zEwa+qx9wUoEe^KtU62eZtK)cIa#o^Od0lGEt)Uwp)U=9I+q2kq^%6x|IXt(<^K OjKR~@&t;ucLK6Tbn5%LC literal 0 HcmV?d00001 diff --git a/supervise-uniapp/static/baseIcon/jj.png b/supervise-uniapp/static/baseIcon/jj.png new file mode 100644 index 0000000000000000000000000000000000000000..6c4bb542f8b51d721c6b28bedb87b6c0f9aad871 GIT binary patch literal 881 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw3=&b&bO2KG1AIbU|9G(e|NkGz`{T(DWI({b zJxhR$zXdix^55G2ztak!5-%V9fA{?VqZ@xBW&ear{fSrk|KZi2B#r;CpZtG%=TCwf zRQs*7|CY8uwScL=Bj4rzZadg0v4bJeY9MvJ%T{kUrvI?sr4uHNJIJCY%_a@j+VpQnEBjdFTw zI`KJE*wzOhH|sLrv2}{jjEg(Qw4&nrs%(kZ+c)+8yUy}PT=ChhxC5&H0uy!r&)>J> z&FL>0wxS+WO!pj&+8`o-zv<=N(`@--vPn~OvLx=Nw*L6Lx^CaUk{b#?s{U6u9+Zo9 zyi@k|r}G83?{`c8{wUmLrqO=9Vc)tr{xvK-_eY&9V3-;1;VzrBG7{X5?BcclwR z@X>*P7ia%_dH&zAroXE_|89x-yDs4Grig#%r~f@r_IHuVzc*L^OcMIL%HFmT^gtUog;t|GfnMfBnDW|0#t-ARB6TraYPczZ7WxhX4O1 zAaK<8!-D^=)Pl=QlC4&P^Zg9lB?~*z&Vk-XYH~ zQcs0uo|FDypp!1EF0-%c_|DL^CNF$BPf7XMVcV61wJ+c-qpBS9+ul zIah9uY%9t<)jGqFQQc^Nexz^vq9_)f*IKpbnLN%bvsN30Eq%ZG$kf2crRNfFa;p}e z^JWj*owfE1GNVtw!hlIAYsJ+>uUFF&4{$x1DDnaX6s43=O_?Y ztd=PanK9>cq=iiV+lGlju3ADtm6N2JuS{BUwqYCZL^Fp=*Sv3k@tiMxtG(|_=hE6c zp2@7a3l{bUZBgtqvAe_;e(Qvf%(cwpENU&xTpu%BY^HFoER*@e{I64SnbOxJMqrX+ N@O1TaS?83{1OOIYy88eC literal 0 HcmV?d00001 diff --git a/supervise-uniapp/static/baseIcon/ty.png b/supervise-uniapp/static/baseIcon/ty.png new file mode 100644 index 0000000000000000000000000000000000000000..9de10bb621f7438b81df8ecd60847dc45ef7ea73 GIT binary patch literal 1020 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw3=&b&bO2KK0(?ST84eWu|NkGzV>(a>Wb{7X z4G)mV-qchf09# zYhPb1cya3c-`^RxR^{Jb_wmp7o$qdl9j#gZ>YVQBuKn+CPkeIl!sjOq4|d2MZxlIN z^ZValjZQ~K^$4TGv&$j(*GO&{r@ik5g~%)f4jFG7+}qwE{-7;bCynjUiQj>r{Qf{yMq^3 ztI=(5@0V|P#g@On`@MeQscE@yj&NEY|K+%0F+b;8i3Zf1ZEyM;In!n4PwT|}Ng>AZ$9ygNUInU6e7T3Q|5DntOC=%f@|jV0ZC?9x zpVwaYSLc0}dEc6XiWMS!O?-w+gk@IDZoj=p^M^&CoAG&dE))KYZe8^>B@+e zPJN%oDLBtv=$q>rssHOm{9SslS~k1tn;eOp&X@IFK&*}ZZG@A{zJn$QZtTAs=2v`t z{e$$$EIBvtfy2WBQRD~N1W2}Q}*tC{swVr(UcH#!#74O3r zd|EI~>4D!99_~p^ClvO#dhi?CsuBmK$efKrj>aHVE^K`tvwB1?v@YCv3 zt3GWpYx_PscV66~_EMcw$2M$#@!U)=VE@4xIQtiE7rn{-$1o!@b;?aaNm15dpb zcwSOdV!dOR>`Yny*LmwX75MZu`qsPk>8Hlr+RL|(A!L>29qwaVF~CI5;OXk;vd$@? F2>{