vue2-client 1.8.430 → 1.8.432

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (29) hide show
  1. package/.env.gaslink +19 -0
  2. package/package.json +2 -1
  3. package/src/base-client/components/common/XFormGroup/demo.vue +40 -40
  4. package/src/base-client/components/common/XReport/index.js +3 -3
  5. package/src/base-client/components/common/XReportGrid/XReport.vue +9 -3
  6. package/src/base-client/components/common/XReportGrid/XReportDesign.vue +14 -1
  7. package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue +6 -1
  8. package/src/pages/DynamicStatistics/FavoriteList.vue +51 -51
  9. package/src/pages/WorkflowDetail/WorkFlowDemo.vue +21 -0
  10. package/src/pages/WorkflowDetail/WorkflowDetail.vue +44 -119
  11. package/src/pages/WorkflowDetail/WorkflowPageDetail/LeaveMessage.vue +28 -104
  12. package/src/pages/WorkflowDetail/WorkflowPageDetail/{ApplyBaseInformation.vue → WorkFlowBaseInformation.vue} +11 -11
  13. package/src/pages/WorkflowDetail/WorkflowPageDetail/{ApplyBaseInformationDetails.vue → WorkFlowBaseInformationDetails.vue} +8 -17
  14. package/src/pages/WorkflowDetail/WorkflowPageDetail/{ApplyHandle.vue → WorkFlowHandle.vue} +62 -416
  15. package/src/pages/WorkflowDetail/WorkflowPageDetail/{ApplyHandleReso.vue → WorkFlowHandleReso.vue} +37 -232
  16. package/src/pages/WorkflowDetail/WorkflowPageDetail/{ApplyTimeline.vue → WorkFlowTimeline.vue} +2 -2
  17. package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkOrderParentDetails.vue +43 -70
  18. package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkflowDetailResso.vue +42 -72
  19. package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkflowListResolution.vue +37 -113
  20. package/src/pages/WorkflowDetail/WorkflowPageDetail/{ApplyWorkflowLog.vue → WorkflowLog.vue} +6 -6
  21. package/src/router/async/router.map.js +2 -1
  22. package/src/services/api/common.js +3 -1
  23. package/src/services/api/entity.js +18 -18
  24. package/src/services/api/index.js +2 -2
  25. package/src/services/api/restTools.js +22 -1
  26. package/src/services/api/workFlow.js +63 -0
  27. package/src/utils/waterMark.js +31 -31
  28. package/vue.config.js +5 -0
  29. package/src/services/api/applyService/apiApply.js +0 -187
@@ -10,44 +10,25 @@
10
10
  >
11
11
  <div>
12
12
  <!-- 基础信息 -->
13
- <apply-base-information-details
13
+ <workflow-base-information-details
14
14
  v-if="details"
15
15
  ref="baseInformation"
16
- :apply-id="applyId"
16
+ :workflow-id="workflowId"
17
17
  :details="details"
18
18
  :visible="visible"
19
19
  />
20
20
  <div :style="{ height: screenHeight * 0.9 + 'px' }">
21
21
  <a-card style="margin-top: 20px">
22
22
  <a-tabs :activeKey="activeKey" @change="changeTab">
23
- <!-- 暂时不需要 -->
24
- <!-- 第一个标签页,显示基本信息和流程图 -->
25
- <!-- <a-tab-pane key="1" tab="基础信息">
26
- <div v-if="activeKey === '1'">
27
- <apply-statistics :loading="!(details.f_sub_state && steps)" :chart-data="chartData"/>
28
- <apply-process-view
29
- :loading="!(details.f_sub_state && steps)"
30
- >
31
- <apply-timeline
32
- :apply-id="applyId"
33
- :steps="steps"
34
- :current-step-id="details.f_step_id"
35
- :state="details.f_state === 1"/>
36
- </apply-process-view>
37
- </div>
38
- </a-tab-pane> -->
39
23
  <!-- 第二个标签页,显示流程信息,根据当前节点显示历史记录、填写表单、控制流程按钮 -->
40
- <a-tab-pane key="2" tab="查看 / 编辑进度">
41
- <apply-handle-reso
24
+ <a-tab-pane key="1" tab="查看 / 编辑进度">
25
+ <WorkFlowHandleReso
42
26
  v-if="
43
- activeKey === '2' &&
44
- details.f_state !== undefined &&
45
- steps !== undefined
27
+ activeKey === '1' && details.f_state && steps
46
28
  "
47
- ref="applyHandle"
48
- :apply-id="applyId"
49
- :workflow-id="details.f_workflow_define_id"
50
- :applyState="details.f_state === 1"
29
+ ref="workflowHandle"
30
+ :workflow-id="workflowId"
31
+ :workflowState="details.f_state === 1"
51
32
  :complete-time="details.f_complete_time"
52
33
  :stepsForChild="steps"
53
34
  :visible="visible"
@@ -56,8 +37,8 @@
56
37
  @refresh="stepChanged"
57
38
  />
58
39
  </a-tab-pane>
59
- <a-tab-pane key="3" tab="任务流转记录">
60
- <apply-workflow-log v-if="activeKey === '3'" :apply-id="applyId" />
40
+ <a-tab-pane key="2" tab="任务流转记录">
41
+ <workflow-log v-if="activeKey === '2'" :workflow-id="workflowId" />
61
42
  </a-tab-pane>
62
43
  <a-tab-pane key="4">
63
44
  <span slot="tab">
@@ -66,30 +47,17 @@
66
47
  </span>
67
48
  <a-row>
68
49
  <a-col :span="14">
69
- <leave-message :projectName="details.f_task_name" :data="messageList" :loading="messageLoading" :submit-message="submitMessage" @refresh="getMessage" />
50
+ <leave-message
51
+ :projectName="details.f_task_name"
52
+ :data="messageList"
53
+ :loading="messageLoading"
54
+ :submit-message="submitMessage"
55
+ @refresh="getMessage"
56
+ :workflow-id="workflowId"
57
+ />
70
58
  </a-col>
71
59
  </a-row>
72
60
  </a-tab-pane>
73
- <!-- 第三个标签页,显示用户表 -->
74
- <!-- <a-tab-pane key="3" tab="用户">
75
- <x-form-table
76
- v-if="fixedAddForm && activeKey === '3'"
77
- ref="xFormTableOne"
78
- :fixed-add-form="fixedAddForm"
79
- :fixed-query-form="fixedQueryForm"
80
- queryParamsName="applyCustomerQueryParams"
81
- />
82
- </a-tab-pane> -->
83
- <!-- 第四个标签页,显示表具表 -->
84
- <!-- <a-tab-pane key="4" tab="表具">
85
- <x-form-table
86
- v-if="fixedAddForm && activeKey === '4'"
87
- ref="xFormTableTwo"
88
- :fixed-add-form="fixedAddForm"
89
- :fixed-query-form="fixedQueryForm"
90
- queryParamsName="applyMetersQueryParams"
91
- />
92
- </a-tab-pane> -->
93
61
  </a-tabs>
94
62
  </a-card>
95
63
  </div>
@@ -99,18 +67,22 @@
99
67
 
100
68
  <script>
101
69
  import { mapState } from 'vuex'
102
- import applyBaseInformationDetails from './ApplyBaseInformationDetails'
103
- import ApplyHandleReso from './ApplyHandleReso'
70
+ import workflowBaseInformationDetails from './WorkFlowBaseInformationDetails.vue'
71
+ import WorkFlowHandleReso from './WorkFlowHandleReso.vue'
104
72
  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
105
- import { post } from 'vue2-client/src/services/api/restTools'
106
- import { applyDetailViewApi } from '../../../services/api/applyService/apiApply'
107
- import ApplyWorkflowLog from './ApplyWorkflowLog'
73
+ import { postByServiceName } from '@vue2-client/services/api/restTools'
74
+ import { workFlowViewApi } from '@/services/api/workFlow'
75
+ import ApplyWorkflowLog from './WorkflowLog.vue'
76
+ import WorkflowLog from '@/pages/WorkflowDetail/WorkflowPageDetail/WorkflowLog.vue'
77
+ import LeaveMessage from '@/pages/WorkflowDetail/WorkflowPageDetail/LeaveMessage.vue'
108
78
 
109
79
  export default {
110
80
  name: 'WorkflowDetail',
111
81
  components: {
112
- applyBaseInformationDetails,
113
- ApplyHandleReso,
82
+ LeaveMessage,
83
+ WorkflowLog,
84
+ workflowBaseInformationDetails,
85
+ WorkFlowHandleReso,
114
86
  XFormTable,
115
87
  ApplyWorkflowLog
116
88
  // LeaveMessage
@@ -147,7 +119,7 @@ export default {
147
119
  ...mapState('setting', ['isMobile'])
148
120
  },
149
121
  props: {
150
- applyId: {
122
+ workflowId: {
151
123
  type: String,
152
124
  required: true
153
125
  },
@@ -172,8 +144,8 @@ export default {
172
144
  },
173
145
  // 获取所有步骤
174
146
  getSteps () {
175
- return post(applyDetailViewApi.getStepNoteAndHandler, {
176
- applyId: this.applyId
147
+ return postByServiceName(workFlowViewApi.getStepNoteAndHandler, {
148
+ workflowId: this.workflowId
177
149
  })
178
150
  .then(res => {
179
151
  this.steps = res
@@ -184,8 +156,8 @@ export default {
184
156
  },
185
157
  // 关闭抽屉的回调
186
158
  onClose () {
187
- if (this.$refs.applyHandle !== undefined) {
188
- this.$refs.applyHandle.onClose()
159
+ if (this.$refs.workflowHandle !== undefined) {
160
+ this.$refs.workflowHandle.onClose()
189
161
  }
190
162
  this.$emit('update:visible', false)
191
163
  this.activeKey = '2'
@@ -199,8 +171,8 @@ export default {
199
171
  // 获取基础信息
200
172
  getBaseInfo () {
201
173
  this.loading = true
202
- return post(applyDetailViewApi.getApplyBasicInfo, {
203
- applyId: this.applyId
174
+ return postByServiceName(workFlowViewApi.getWorkFlowBasicInfo, {
175
+ workflowId: this.workflowId
204
176
  })
205
177
  .then(res => {
206
178
  res.f_sub_state = this.steps[res.f_step_id - 1].name
@@ -218,8 +190,8 @@ export default {
218
190
  this.getMessage()
219
191
  await this.getSteps()
220
192
  await this.getBaseInfo()
221
- this.fixedQueryForm.a_f_apply_id = this.applyId
222
- this.fixedAddForm.a_f_apply_id = this.applyId
193
+ this.fixedQueryForm.a_f_workflow_id = this.workflowId
194
+ this.fixedAddForm.a_f_workflow_id = this.workflowId
223
195
  if (this.$refs.xFormTableOne !== undefined) {
224
196
  this.$refs.xFormTableOne.$refs.xTable.refresh(true)
225
197
  }
@@ -233,11 +205,9 @@ export default {
233
205
  },
234
206
  // 获取留言
235
207
  getMessage () {
236
- console.log('数据', this.details)
237
- console.log('流程', this.steps)
238
208
  this.messageLoading = true
239
- post(applyDetailViewApi.getApplyLeaveMessage, {
240
- applyId: this.applyId
209
+ postByServiceName(workFlowViewApi.getWorkFlowLeaveMessage, {
210
+ workflowId: this.workflowId
241
211
  }).then(res => {
242
212
  this.messageList = res
243
213
  this.messageLoading = false
@@ -245,8 +215,8 @@ export default {
245
215
  },
246
216
  // 提交留言
247
217
  submitMessage (data) {
248
- data.f_apply_id = this.applyId
249
- return post('/api/af-apply/entity/t_apply_leave_message', data)
218
+ data.f_workflow_id = this.workflowId
219
+ return postByServiceName('/entity/t_workflow_leave_message', data)
250
220
  }
251
221
  },
252
222
  watch: {
@@ -1,15 +1,10 @@
1
1
  <template>
2
2
  <a-card :bordered="false">
3
- <!-- <workflow-detail-->
4
- <!-- :visible.sync="detailVisible"-->
5
- <!-- :applyId="applyId"-->
6
- <!-- direction="left"-->
7
- <!-- v-if="applyId"/>-->
8
3
  <workflow-detail-resso
9
4
  :visible.sync="detailVisible"
10
- :applyId="applyId"
5
+ :workflowId="workflowId"
11
6
  direction="left"
12
- v-if="applyId"/>
7
+ v-if="workflowId"/>
13
8
  <x-form-table
14
9
  ref="xFormTableTodo"
15
10
  title="流程查询"
@@ -21,48 +16,11 @@
21
16
  <a-popconfirm
22
17
  :title="'确定删除' + selectedRowKeys.length + '条数据吗?'"
23
18
  :disabled="!selectedRowKeys.length"
24
- @confirm="deleteItem(selectedRowKeys)" >
19
+ @confirm="deleteItem(selectedRowKeys)">
25
20
  <a-button type="danger" icon="delete" :disabled="!selectedRowKeys.length">删除</a-button>
26
21
  </a-popconfirm>
27
22
  </template>
28
23
  </x-form-table>
29
- <!-- <a-modal v-model="addItemVisible" title="创建任务" ok-text="提交" @ok="onAddItemSubmit" @cancel="onAddItemCancel" >-->
30
- <!-- <a-form-model ref="addItemFormRef" :model="addItemForm" :rules="addItemFormRules" :label-col="{ span: 4 }" :wrapper-col="{ span: 16 }">-->
31
- <!-- <a-form-model-item label="任务名称" prop="taskName">-->
32
- <!-- <a-input v-model="addItemForm.taskName" placeholder="请输入任务名称"></a-input>-->
33
- <!-- </a-form-model-item>-->
34
- <!-- <a-form-model-item label="项目名称" prop="projectName">-->
35
- <!-- <a-select-->
36
- <!-- v-model="addItemForm.projectName"-->
37
- <!-- :options="projectOptions"-->
38
- <!-- :filter-option="false"-->
39
- <!-- :default-active-first-option="false"-->
40
- <!-- placeholder="请搜索项目名称"-->
41
- <!-- show-search-->
42
- <!-- @search="onProjectSearch"-->
43
- <!-- ></a-select>-->
44
- <!-- </a-form-model-item>-->
45
- <!--&lt;!&ndash; <a-form-model-item label="流程名称" prop="processName">&ndash;&gt;-->
46
- <!--&lt;!&ndash; <a-cascader&ndash;&gt;-->
47
- <!--&lt;!&ndash; v-model="processChecked"&ndash;&gt;-->
48
- <!--&lt;!&ndash; :options="processOptions"&ndash;&gt;-->
49
- <!--&lt;!&ndash; :allow-clear="false"&ndash;&gt;-->
50
- <!--&lt;!&ndash; :show-search="true"&ndash;&gt;-->
51
- <!--&lt;!&ndash; placeholder="请搜索或选择流程名称"&ndash;&gt;-->
52
- <!--&lt;!&ndash; @change="onProcessNameChange"&ndash;&gt;-->
53
- <!--&lt;!&ndash; />&ndash;&gt;-->
54
- <!--&lt;!&ndash; </a-form-model-item>&ndash;&gt;-->
55
- <!-- <a-form-model-item label="完成时间" prop="completeTime">-->
56
- <!-- <a-date-picker-->
57
- <!-- v-model="addItemForm.completeTime"-->
58
- <!-- value-format="YYYY-MM-DD HH:mm:ss"-->
59
- <!-- :disabled-date="disabledDate"-->
60
- <!-- :allow-clear="false"-->
61
- <!-- style="width:100%"-->
62
- <!-- />-->
63
- <!-- </a-form-model-item>-->
64
- <!-- </a-form-model>-->
65
- <!-- </a-modal>-->
66
24
  </a-card>
67
25
  </template>
68
26
 
@@ -72,8 +30,8 @@ import WorkflowDetail from '../WorkflowDetail.vue'
72
30
  import WorkflowDetailResso from './WorkflowDetailResso'
73
31
  import { mapState } from 'vuex'
74
32
  import moment from 'moment'
75
- import { applyDetailViewApi } from '../../../services/api/applyService/apiApply'
76
- import { post } from '@vue2-client/services/api'
33
+ import { workFlowViewApi } from '@/services/api/workFlow'
34
+ import { postByServiceName } from '@vue2-client/services/api'
77
35
 
78
36
  export default {
79
37
  name: 'WorkflowListResolution',
@@ -87,7 +45,7 @@ export default {
87
45
  // 控制组件可见
88
46
  detailVisible: false,
89
47
  // 当前报建编号
90
- applyId: undefined,
48
+ workflowId: undefined,
91
49
  // 查询条件
92
50
  todoFixedQueryForm: undefined,
93
51
  // 是否显示新增表单
@@ -116,7 +74,7 @@ export default {
116
74
  // 当前页签
117
75
  tabsKey: '0',
118
76
  projectExceptionList: [],
119
- // 获取f_apply_id的数据组
77
+ // 获取f_workflow_id的数据组
120
78
  fApplyId: [],
121
79
  Apply: [],
122
80
  // 查询的数据
@@ -128,7 +86,7 @@ export default {
128
86
  ...mapState('account', ['user'])
129
87
  },
130
88
  props: {
131
- applyProjectId: {
89
+ workflowProjectId: {
132
90
  type: String,
133
91
  required: true
134
92
  },
@@ -141,9 +99,9 @@ export default {
141
99
  detailVisible: function (newVal) {
142
100
  // 关闭详情抽屉刷新表格
143
101
  if (!newVal) {
144
- if (this.details.f_apply_dataid) {
145
- this.dataForm = this.details.f_apply_dataid.split(',')
146
- this.todoFixedQueryForm = { a_id: this.details.f_apply_dataid }
102
+ if (this.details.f_workflow_dataid) {
103
+ this.dataForm = this.details.f_workflow_dataid.split(',')
104
+ this.todoFixedQueryForm = { a_id: this.details.f_workflow_dataid }
147
105
  } else {
148
106
  this.todoFixedQueryForm = { a_id: null }
149
107
  }
@@ -152,26 +110,26 @@ export default {
152
110
  }
153
111
  },
154
112
  created () {
155
- post(applyDetailViewApi.getApplyCategoryTree, {}).then(res => {
113
+ postByServiceName(workFlowViewApi.getWorkFlowCategoryTree, {}).then(res => {
156
114
  this.processOptions = res
157
115
  })
158
- post(applyDetailViewApi.getApplyStepApplyId,
116
+ postByServiceName(workFlowViewApi.getWorkFlowStepWorkFlowId,
159
117
  { name: this.user.name }).then(res => {
160
118
  this.Apply = res
161
119
  this.Apply.forEach(all => {
162
- this.fApplyId.push(all.f_apply_id)
120
+ this.fApplyId.push(all.f_workflow_id)
163
121
  })
164
122
  })
165
- if (this.details.f_apply_dataid) {
166
- this.dataForm = this.details.f_apply_dataid.split(',')
167
- this.todoFixedQueryForm = { a_id: this.details.f_apply_dataid }
123
+ if (this.details.f_workflow_dataid) {
124
+ this.dataForm = this.details.f_workflow_dataid.split(',')
125
+ this.todoFixedQueryForm = { a_id: this.details.f_workflow_dataid }
168
126
  } else {
169
127
  this.todoFixedQueryForm = { a_id: null }
170
128
  }
171
129
  },
172
130
  methods: {
173
131
  toDetail (record, id) {
174
- this.applyId = id + ''
132
+ this.workflowId = id + ''
175
133
  this.detailVisible = true
176
134
  },
177
135
  addItem () {
@@ -182,87 +140,47 @@ export default {
182
140
  const saveData = {
183
141
  handler: this.user.name,
184
142
  createdBy: this.user.name,
185
- applyparentid: this.applyProjectId,
143
+ workflowparentid: this.workflowProjectId,
186
144
  ...this.addItemForm
187
145
  }
188
146
  if (!saveData.projectName) {
189
147
  saveData.projectName = '公共项目(适用无具体项目登记)'
190
148
  }
191
- post(applyDetailViewApi.createWorkflowTask, saveData).then(res => {
149
+ postByServiceName(workFlowViewApi.createWorkflowTask, saveData).then(res => {
192
150
  if (res && res.msg === 'ok') {
193
151
  this.$message.success('创建成功')
194
- // this.$refs.addItemFormRef.resetFields()
195
152
  this.processChecked = undefined
196
153
  this.addItemVisible = false
197
- this.updataFromdas(res.applyId)
198
- this.toDetail(undefined, res.applyId)
154
+ this.updataFromdas(res.workflowId)
155
+ this.toDetail(undefined, res.workflowId)
199
156
  } else {
200
157
  this.$message.success('创建失败,请重试')
201
158
  }
202
159
  })
203
- // this.$refs.addItemFormRef.validate().then(() => {
204
- // const saveData = {
205
- // handler: this.user.name,
206
- // createdBy: this.user.name,
207
- // applyparentid: this.applyProjectId,
208
- // ...this.addItemForm
209
- // }
210
- // if (!saveData.projectName) {
211
- // saveData.projectName = '公共项目(适用无具体项目登记)'
212
- // }
213
- // post(applyDetailViewApi.createWorkflowTask, saveData).then(res => {
214
- // if (res && res.msg === 'ok') {
215
- // this.$message.success('创建成功')
216
- // this.$refs.addItemFormRef.resetFields()
217
- // this.processChecked = undefined
218
- // this.addItemVisible = false
219
- // this.updataFromdas(res.applyId)
220
- // this.toDetail(undefined, res.applyId)
221
- // } else {
222
- // this.$message.success('创建失败,请重试')
223
- // }
224
- // })
225
- // })
226
- },
227
- // 关闭创建任务
228
- onAddItemCancel () {
229
- this.$refs.addItemFormRef.resetFields()
230
- this.processChecked = undefined
231
160
  },
232
161
  updataFromdas (datv) {
233
162
  this.dataForm.push(datv)
234
163
  let ataFo = null
235
164
  if (this.dataForm.length === 1) {
236
165
  ataFo = datv
237
- this.details.f_apply_dataid = ataFo
166
+ this.details.f_workflow_dataid = ataFo
238
167
  } else {
239
168
  ataFo = this.dataForm.join(',')
240
- this.details.f_apply_dataid = ataFo
169
+ this.details.f_workflow_dataid = ataFo
241
170
  }
242
- post(applyDetailViewApi.updateApply, {
243
- idStr: this.applyProjectId,
171
+ postByServiceName(workFlowViewApi.updateWorkFlow, {
172
+ idStr: this.workflowProjectId,
244
173
  dataid: ataFo
245
174
  }).then(res => {
246
175
  this.datres = res
247
176
  })
248
177
  },
249
- // 按关键字搜索项目
250
- onProjectSearch (value) {
251
- post(applyDetailViewApi.getProjectListBySearch, {
252
- word: value
253
- }).then(res => {
254
- this.projectOptions = res
255
- })
256
- },
257
- onProcessNameChange (value) {
258
- this.addItemForm.processName = value[1]
259
- },
260
178
  // 删除任务
261
179
  deleteItem (idList) {
262
- post('/api/af-system/logic/getApplyListByIds', { applyIds: idList }).then(res => {
180
+ postByServiceName('/logic/getApplyListByIds', { workflowIds: idList }).then(res => {
263
181
  if (res.every(ele => ele.f_created_by === this.user.name)) {
264
182
  console.log(idList)
265
- post(applyDetailViewApi.deleteApply, { idList }).then(() => {
183
+ postByServiceName(workFlowViewApi.deleteWorkFlow, { idList }).then(() => {
266
184
  if (this.$refs.xFormTableTodo) {
267
185
  this.$refs.xFormTableTodo.refreshTable(false)
268
186
  }
@@ -286,16 +204,18 @@ export default {
286
204
  }
287
205
  </script>
288
206
  <style lang="less" scoped>
289
- .overdue-header{
207
+ .overdue-header {
290
208
  margin: 0;
291
209
  display: inline-block;
292
- padding:0 5px;
210
+ padding: 0 5px;
293
211
  }
294
- .overdue-header-danger{
212
+
213
+ .overdue-header-danger {
295
214
  background: #EF573D;
296
215
  color: #fff;
297
216
  border-radius: 2px;
298
217
  }
218
+
299
219
  .overdue-ranking {
300
220
  .icon {
301
221
  margin-right: 6px;
@@ -304,19 +224,23 @@ export default {
304
224
  //background: #EF573D;
305
225
  background: #aaa;
306
226
  }
227
+
307
228
  &:nth-of-type(n+4) {
308
229
  .icon {
309
230
  background: #aaa;
310
231
  }
311
232
  }
233
+
312
234
  &:nth-of-type(n+10) {
313
235
  .icon {
314
236
  padding: 0 2px;
315
237
  }
316
238
  }
239
+
317
240
  .name {
318
241
  margin-right: 6px;
319
242
  }
243
+
320
244
  display: inline-block;
321
245
  min-width: 94px;
322
246
  margin: 8px 0;
@@ -24,13 +24,13 @@
24
24
  </template>
25
25
 
26
26
  <script>
27
- import { post } from '@vue2-client/services/api/restTools'
28
- import { applyDetailViewApi } from '../../../services/api/applyService/apiApply'
27
+ import { postByServiceName } from '@vue2-client/services/api/restTools'
28
+ import { workFlowViewApi } from '@/services/api/workFlow'
29
29
 
30
30
  export default {
31
- name: 'ApplyWorkflowLog',
31
+ name: 'WorkflowLog',
32
32
  props: {
33
- applyId: {
33
+ workflowId: {
34
34
  type: String,
35
35
  required: true
36
36
  }
@@ -42,8 +42,8 @@ export default {
42
42
  }
43
43
  },
44
44
  mounted () {
45
- post(applyDetailViewApi.getApplyWorkflowLog, {
46
- applyId: this.applyId
45
+ postByServiceName(workFlowViewApi.getWorkFlowLog, {
46
+ workflowId: this.workflowId
47
47
  }).then(res => {
48
48
  this.logList = res
49
49
  this.spinning = false
@@ -78,7 +78,8 @@ routerResource.example = {
78
78
  {
79
79
  path: 'default',
80
80
  name: '示例页面',
81
- component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
81
+ // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
82
+ component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
82
83
  meta: {
83
84
  // 菜单中不显示
84
85
  invisible: true,
@@ -42,7 +42,9 @@ const commonApi = {
42
42
  // v4文件删除
43
43
  deleteFile: 'resource/delete',
44
44
  // 异步任务执行
45
- asyncRunTask: 'logic/clientTaskSend'
45
+ asyncRunTask: 'logic/clientTaskSend',
46
+ // 获取所有用户信息
47
+ getAllUserOptionList: '/api/af-system/logic/getAllUserOptionList'
46
48
  }
47
49
 
48
50
  /**
@@ -1,18 +1,18 @@
1
- import { post } from '@vue2-client/services/api/restTools'
2
-
3
- const entityApi = {
4
- // 根据ID查询数据
5
- getById: (entityName, id, data = {}, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
6
- return post(`/api/${serviceName}/entity/query/${entityName}/${id}`, data)
7
- },
8
- // 根据ID集合查询所有数据
9
- findAllByIds: (entityName, data, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
10
- return post(`/api/${serviceName}/entity/query/${entityName}`, data)
11
- },
12
- // 查询实体的总数量
13
- getCount: (entityName, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
14
- return post(`/api/${serviceName}/entity/queryCount/${entityName}`, {})
15
- }
16
- }
17
-
18
- export { entityApi }
1
+ import { post } from '@vue2-client/services/api/restTools'
2
+
3
+ const entityApi = {
4
+ // 根据ID查询数据
5
+ getById: (entityName, id, data = {}, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
6
+ return post(`/api/${serviceName}/entity/query/${entityName}/${id}`, data)
7
+ },
8
+ // 根据ID集合查询所有数据
9
+ findAllByIds: (entityName, data, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
10
+ return post(`/api/${serviceName}/entity/query/${entityName}`, data)
11
+ },
12
+ // 查询实体的总数量
13
+ getCount: (entityName, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
14
+ return post(`/api/${serviceName}/entity/queryCount/${entityName}`, {})
15
+ }
16
+ }
17
+
18
+ export { entityApi }
@@ -3,7 +3,7 @@ import { QueryParamsDetailsViewApi } from '@vue2-client/services/api/QueryParams
3
3
  import { DictionaryDetailsViewApi } from '@vue2-client/services/api/DictionaryDetailsViewApi'
4
4
  import { LogDetailsViewApi } from '@vue2-client/services/api/LogDetailsViewApi'
5
5
  import { manageApi } from '@vue2-client/services/api/manage'
6
- import { get, post } from '@vue2-client/services/api/restTools'
6
+ import { get, post, postByServiceName } from '@vue2-client/services/api/restTools'
7
7
  import { TicketDetailsViewApi } from '@vue2-client/services/api/TicketDetailsViewApi'
8
8
 
9
9
  export {
@@ -12,6 +12,6 @@ export {
12
12
  LogDetailsViewApi,
13
13
  manageApi,
14
14
  QueryParamsDetailsViewApi,
15
- get, post,
15
+ get, post, postByServiceName,
16
16
  TicketDetailsViewApi
17
17
  }
@@ -21,6 +21,27 @@ function post (url, parameter, config = {}) {
21
21
  return request(url, METHOD.POST, parameter, config)
22
22
  }
23
23
 
24
+ /**
25
+ * POST请求
26
+ * @param url 请求地址
27
+ * @param parameter 请求参数
28
+ * @param serviceName
29
+ * @param isDev
30
+ * @param config
31
+ * @returns {Promise<AxiosResponse<T>>}
32
+ */
33
+ function postByServiceName (url, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev, config = {}) {
34
+ if (url.startsWith('api/') || url.startsWith('/api/')) {
35
+ return request(url, METHOD.POST, parameter, config)
36
+ }
37
+ let apiPre = '/api/'
38
+ if (isDev) {
39
+ apiPre = '/devApi/'
40
+ }
41
+ url = apiPre + serviceName + '/' + url
42
+ return request(url, METHOD.POST, parameter, config)
43
+ }
44
+
24
45
  /**
25
46
  * DELETE请求
26
47
  * @param url 请求地址
@@ -43,4 +64,4 @@ function put (url, parameter, config = {}) {
43
64
  return request(url, METHOD.PUT, parameter, config)
44
65
  }
45
66
 
46
- export { get, post, del, put }
67
+ export { get, post, del, put, postByServiceName }