Browse Source

汇总单

seimin 2 years ago
parent
commit
28b8083204

+ 3 - 3
src/router/index.js

@@ -99,7 +99,7 @@ export default new Router({
99
       },
99
       },
100
     },
100
     },
101
     {
101
     {
102
-      path: '/main/consumableList/:incidentId/:summaryId',
102
+      path: '/main/consumableList/:incidentId/:summaryId/:processInstanceId',
103
       name: 'ConsumableList',
103
       name: 'ConsumableList',
104
       component: ConsumableList,
104
       component: ConsumableList,
105
       meta: {
105
       meta: {
@@ -107,7 +107,7 @@ export default new Router({
107
       },
107
       },
108
     },
108
     },
109
     {
109
     {
110
-      path: '/main/workHourManagementOne/:incidentId/:summaryId',
110
+      path: '/main/workHourManagementOne/:incidentId/:summaryId/:processInstanceId',
111
       name: 'WorkHourManagementOne',
111
       name: 'WorkHourManagementOne',
112
       component: WorkHourManagementOne,
112
       component: WorkHourManagementOne,
113
       meta: {
113
       meta: {
@@ -115,7 +115,7 @@ export default new Router({
115
       },
115
       },
116
     },
116
     },
117
     {
117
     {
118
-      path: '/main/workHourManagementTwo/:incidentId/:summaryId/:parentId/:parentName',
118
+      path: '/main/workHourManagementTwo/:incidentId/:summaryId/:parentId/:parentName/:processInstanceId',
119
       name: 'WorkHourManagementTwo',
119
       name: 'WorkHourManagementTwo',
120
       component: WorkHourManagementTwo,
120
       component: WorkHourManagementTwo,
121
       meta: {
121
       meta: {

+ 2 - 2
src/views/ConsumableList.vue

@@ -224,7 +224,7 @@ export default {
224
                 this.items = [];
224
                 this.items = [];
225
                 this.idx = 0;
225
                 this.idx = 0;
226
                 this.$router.push({
226
                 this.$router.push({
227
-                  path: `/summaryOrder/${this.$route.params.incidentId}`
227
+                  path: `/summaryOrder/${this.$route.params.incidentId}/${this.$route.params.processInstanceId}`
228
                 })
228
                 })
229
               }
229
               }
230
             }).show();
230
             }).show();
@@ -238,7 +238,7 @@ export default {
238
                 this.items = [];
238
                 this.items = [];
239
                 this.idx = 0;
239
                 this.idx = 0;
240
                 this.$router.push({
240
                 this.$router.push({
241
-                  path: `/summaryOrder/${this.$route.params.incidentId}`
241
+                  path: `/summaryOrder/${this.$route.params.incidentId}/${this.$route.params.processInstanceId}`
242
                 })
242
                 })
243
               }
243
               }
244
             }).show();
244
             }).show();

+ 1 - 1
src/views/WorkHourManagementOne.vue

@@ -106,7 +106,7 @@ export default {
106
     // 弹窗
106
     // 弹窗
107
     toDetail(item) {
107
     toDetail(item) {
108
       this.$router.push({
108
       this.$router.push({
109
-        path: `/main/WorkHourManagementTwo/${this.$route.params.incidentId}/${this.$route.params.summaryId}/${item.id}/${item.workName}`
109
+        path: `/main/WorkHourManagementTwo/${this.$route.params.incidentId}/${this.$route.params.summaryId}/${item.id}/${item.workName}/${this.$route.params.processInstanceId}`
110
       });
110
       });
111
     },
111
     },
112
     // 获取列表
112
     // 获取列表

+ 3 - 3
src/views/WorkHourManagementTwo.vue

@@ -102,7 +102,7 @@ export default {
102
                 this.items = [];
102
                 this.items = [];
103
                 this.idx = 0;
103
                 this.idx = 0;
104
                 this.$router.push({
104
                 this.$router.push({
105
-                  path: `/summaryOrder/${this.$route.params.incidentId}`
105
+                  path: `/summaryOrder/${this.$route.params.incidentId}/${this.$route.params.processInstanceId}`
106
                 })
106
                 })
107
               }
107
               }
108
             }).show();
108
             }).show();
@@ -116,7 +116,7 @@ export default {
116
                 this.items = [];
116
                 this.items = [];
117
                 this.idx = 0;
117
                 this.idx = 0;
118
                 this.$router.push({
118
                 this.$router.push({
119
-                  path: `/summaryOrder/${this.$route.params.incidentId}`
119
+                  path: `/summaryOrder/${this.$route.params.incidentId}/${this.$route.params.processInstanceId}`
120
                 })
120
                 })
121
               }
121
               }
122
             }).show();
122
             }).show();
@@ -130,7 +130,7 @@ export default {
130
     // 弹窗
130
     // 弹窗
131
     toDetail(item) {
131
     toDetail(item) {
132
       this.$router.push({
132
       this.$router.push({
133
-        path: `/main/WorkHourManagementTwo/${this.$route.params.incidentId}/${this.summaryId}/${item.id}`
133
+        path: `/main/WorkHourManagementTwo/${this.$route.params.incidentId}/${this.summaryId}/${item.id}/${this.$route.params.processInstanceId}`
134
       });
134
       });
135
     },
135
     },
136
     // 获取列表
136
     // 获取列表

+ 1 - 1
src/views/indes.vue

@@ -391,7 +391,7 @@ export default {
391
         name = 'SummaryOrder';
391
         name = 'SummaryOrder';
392
         // 责任科室【是否需要填写汇总单】开启,并且工单状态是处理中
392
         // 责任科室【是否需要填写汇总单】开启,并且工单状态是处理中
393
         this.$router.push({
393
         this.$router.push({
394
-          path: `/summaryOrder/${data.id}`
394
+          path: `/summaryOrder/${data.id}/${data.processInstanceId}`
395
         });
395
         });
396
       }else{
396
       }else{
397
         this.$router.push({
397
         this.$router.push({

+ 2 - 2
src/views/summaryOrder.vue

@@ -152,13 +152,13 @@ export default {
152
     // 新增耗材
152
     // 新增耗材
153
     addConsumableMaterial() {
153
     addConsumableMaterial() {
154
       this.$router.push({
154
       this.$router.push({
155
-        path: `/main/ConsumableList/${this.$route.params.incidentId}/${this.summaryId}`
155
+        path: `/main/ConsumableList/${this.$route.params.incidentId}/${this.summaryId}/${this.$route.params.processInstanceId}`
156
       });
156
       });
157
     },
157
     },
158
     // 新增工时
158
     // 新增工时
159
     addWorkHourManagementOne() {
159
     addWorkHourManagementOne() {
160
       this.$router.push({
160
       this.$router.push({
161
-        path: `/main/WorkHourManagementOne/${this.$route.params.incidentId}/${this.summaryId}`
161
+        path: `/main/WorkHourManagementOne/${this.$route.params.incidentId}/${this.summaryId}/${this.$route.params.processInstanceId}`
162
       });
162
       });
163
     },
163
     },
164
     // 获取汇总单信息
164
     // 获取汇总单信息