From d474a981e7b34cb788218c26328a599dd98c4085 Mon Sep 17 00:00:00 2001 From: youyuzihan Date: Mon, 21 Jun 2021 12:20:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?update=EF=BC=9A=E5=A2=9E=E5=8A=A0tab?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/index.vue | 58 ++++++++++++------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index 7120ae3a5..bcf09c84c 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -71,7 +71,18 @@
+ + + +
+
+ + + + + +
- + + + - + - + - + @@ -234,6 +245,9 @@ export default { }, data () { return { + //默认返回已维护 + ifMaintaince:"Maintenance", + deptUser: [], // 查询条件 localProTableSearch: { @@ -710,7 +724,7 @@ export default { }, // 切换tabs handleClick (tab, event) { - this.localProEO.prodectCode = this.activeName + this.localProEO.prodectCode = this.ifMaintaince this.insideHandleClick() }, insideHandleClick (tab, event) { @@ -1077,13 +1091,15 @@ export default { }, // 查询本地产品 getLocalProductTable () { - this.localProTableSearch.prodectCode = this.activeName + this.localProTableSearch.prodectCode = this.ifMaintaince + console.log(this.localProTableSearch.prodectCode) this.localProTableSearch.dataType = this.insideTabsActiveName this.SarExportSearchEo = this.localProTableSearch - this.$http.get('lawss/sarProductInfo/getProductInfoPage', this.localProTableSearch, { + this.$http.get('sarStandProjectLibrary/queryProject', this.localProTableSearch, { _this: this, loading: 'loading' }, res => { - this.localProTableList = res.data.list + console.log(res.data) + this.localProTableList = res.data.Maintenance.records this.total = res.data.count // this.localProTableList.map((item) => { // this.xmztOptions.map((opr) => { From e5f18ec16c463805fe6f2054c2f5c8790fce4de7 Mon Sep 17 00:00:00 2001 From: yf <428080876@qq.com> Date: Mon, 21 Jun 2021 14:10:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=9A=84=E5=88=9D=E5=A7=8B=E5=8C=96=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tabComponents/alreadyProcess/index.vue | 16 ++++++++++++++++ .../tabComponents/alreadySend/index.vue | 17 +++++++++++++++++ .../tabComponents/monitorProcess/index.vue | 17 +++++++++++++++++ .../tabComponents/processCenter/index.vue | 1 - .../tabComponents/taskDraft/index.vue | 14 ++++++++++++++ 5 files changed, 64 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue index 4cfd649b2..e65b520ec 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue @@ -179,6 +179,22 @@ export default { this.queryProcess() }, queryProcess () { // 查询待办流程 + this.$http.postData('lawss/activiti/doneProcess', { + current: this.pageNo, + size: this.$store.getters.userInfo.configContent, + userId: this.$store.getters.userInfo.userId, + prcName: this.searchForm.prcName, + prcType: parseInt(this.searchForm.prcType) || '', + prcNum: this.searchForm.prcNum + }, { + loading: 'loading', + _this: this + }, res => { + console.log(res) + this.processList = res.list || [] + this.total = res.count + }, e => { + }) }, selectProcessBtn () { // 搜索按钮 this.pageNo = 1 diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue index f788dbf12..b23c1234a 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue @@ -179,6 +179,23 @@ export default { this.queryProcess() }, queryProcess () { // 查询待办流程 + this.$http.postData('lawss/activiti/IssuedProcess', + { + current: this.pageNo, + size: this.$store.getters.userInfo.configContent, + userId: this.$store.getters.userInfo.userId, + prcName: this.searchForm.prcName, + prcType: parseInt(this.searchForm.prcType) || '', + prcNum: this.searchForm.prcNum + }, + { + loading: 'loading', + _this: this + }, res => { + this.processList = res.list + this.total = res.count + }, e => { + }) }, selectProcessBtn () { // 搜索按钮 this.pageNo = 1 diff --git a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue index 492b68d1d..66a405294 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue @@ -179,6 +179,23 @@ export default { this.queryProcess() }, queryProcess () { // 查询待办流程 + this.$http.postData('lawss/activiti/allProcess', + { + current: this.pageNo, + size: this.$store.getters.userInfo.configContent, + userId: this.$store.getters.userInfo.userId, + prcName: this.searchForm.prcName, + prcType: parseInt(this.searchForm.prcType) || '', + prcNum: this.searchForm.prcNum + }, + { + loading: 'loading', + _this: this + }, res => { + this.processList = res.list || [] + this.total = res.count + }, e => { + }) }, selectProcessBtn () { // 搜索按钮 this.pageNo = 1 diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index e9a545f17..f55bc97d9 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -199,7 +199,6 @@ export default { }, e => { }) }, - selectProcessBtn () { // 搜索按钮 this.pageNo = 1 this.queryProcess() diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 42fbdb731..a666b610f 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -179,6 +179,20 @@ export default { this.queryProcess() }, queryProcess () { // 查询待办流程 + this.$http.postData('lawss/activiti/queryTaskDraft', { + current: this.pageNo, + size: parseInt(this.$store.getters.userInfo.configContent), + userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId, + prcName: this.searchForm.prcName, + prcType: parseInt(this.searchForm.prcType) || '' + }, + { + loading: 'loading', + _this: this + }, res => { + this.processList = res.list + this.total = res.count + }) }, selectProcessBtn () { // 搜索按钮 this.pageNo = 1 From 890b7ec2ba5e4c528862e22e1131f4dc132963b4 Mon Sep 17 00:00:00 2001 From: yf <428080876@qq.com> Date: Mon, 21 Jun 2021 16:49:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step2.vue | 3 +- .../pages/processDetail/index.vue | 1138 +++++++++++++++++ .../tabComponents/alreadyProcess/index.vue | 7 + .../tabComponents/alreadySend/index.vue | 7 + .../tabComponents/monitorProcess/index.vue | 11 +- 5 files changed, 1162 insertions(+), 4 deletions(-) create mode 100644 src/pages/processCenter/pages/processDetail/index.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 55f15899b..3fa77e054 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -703,8 +703,7 @@ pId: this.$route.query.prcId }).then(res => { if (res) { - console.log(res); - resolve() + this.form = JSON.parse(res.mesg) } }).catch(e => { }) diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue new file mode 100644 index 000000000..60d5e7e98 --- /dev/null +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -0,0 +1,1138 @@ + + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue index e65b520ec..2351d1a65 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue @@ -211,6 +211,13 @@ export default { this.queryProcess() }, dealWith (row) { // 办理 + this.$router.push({ + name: 'ProcessDetail', + query: { + prcNum: row.prcNum, + tabsName: 'AlreadyProcess' + } + }) }, ...mapMutations(['setProcess', 'setHandleInfo']), ...mapActions(['setMenu']) diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue index b23c1234a..446f7a84e 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue @@ -212,6 +212,13 @@ export default { this.queryProcess() }, dealWith (row) { // 办理 + this.$router.push({ + name: 'ProcessDetail', + query: { + prcNum: row.prcNum, + tabsName: 'AlreadySend' + } + }) }, ...mapMutations(['setProcess', 'setHandleInfo']), ...mapActions(['setMenu']) diff --git a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue index 66a405294..24bd71036 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue @@ -124,7 +124,7 @@ - 办理 + 查看
@@ -167,7 +167,7 @@ export default { methods: { handleCommand (command) { switch (command[1]) { - case '办理': + case '查看': this.dealWith(command[0]) break } @@ -212,6 +212,13 @@ export default { this.queryProcess() }, dealWith (row) { // 办理 + this.$router.push({ + name: 'ProcessDetail', + query: { + prcNum: row.prcNum, + tabsName: 'MonitorProcess' + } + }) }, ...mapMutations(['setProcess', 'setHandleInfo']), ...mapActions(['setMenu']) From fbfadb43e310400c049ae32803ea821326ad0105 Mon Sep 17 00:00:00 2001 From: yf <428080876@qq.com> Date: Mon, 21 Jun 2021 17:51:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=A0=87=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 3fa77e054..b936728b9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -3,7 +3,7 @@ - +
基础信息