vue2-client 1.9.183 → 1.9.185

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 (4) hide show
  1. package/package.json +1 -1
  2. package/src/base-client/components/common/XTable/ExportExcel.vue +10 -0
  3. package/src/services/api/workFlow.js +63 -63
  4. package/src/utils/map-utils.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vue2-client",
3
- "version": "1.9.183",
3
+ "version": "1.9.185",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
package/src/base-client/components/common/XTable/ExportExcel.vue CHANGED
@@ -157,6 +157,16 @@ export default {
157
157
  handleExportByQuery (tHeader, tDataList) {
158
158
  const that = this
159
159
  const conditionParams = Object.assign(that.tableContext.form, that.tableContext.fixedQueryForm)
160
+ Object.keys(conditionParams).forEach(key => {
161
+ if (Array.isArray(conditionParams[key])) {
162
+ // 检查数组中是否包含 null
163
+ const hasNull = conditionParams[key].every(item => item === '') || conditionParams[key].length === 0
164
+ // 如果包含 null，则删除该属性
165
+ if (hasNull) {
166
+ delete conditionParams[key]
167
+ }
168
+ }
169
+ })
160
170
  that.exportFileName = null
161
171
  this.$confirm({
162
172
  title: '是否确认导出?',
package/src/services/api/workFlow.js CHANGED
@@ -1,63 +1,63 @@
1
- // 工单专用api
2
- const workFlowViewApi = {
3
- // 查询：获取工作流基本数据
4
- getWorkFlowBasicInfo: '/logic/getWorkFlowBasicInfo',
5
- // 保存工作流流程定义
6
- saveWorkFlowWorkflowDefine: '/logic/saveWorkFlowWorkflowDefine',
7
- // 获取工作流流程定义
8
- getWorkFlowDefine: '/logic/getWorkFlowDefine',
9
- // 获取工作流当前步骤
10
- getWorkFlowCurrentSubState: '/logic/getWorkFlowCurrentSubState',
11
- // 保存用户每一步输入的表单内容
12
- saveWorkFlowStepFormData: '/logic/saveWorkFlowStepFormData',
13
- // 获取已经完成步骤的用户填写数据
14
- getWorkFlowCompletedStepData: '/logic/getWorkFlowCompletedStepData',
15
- // 改变工作流进度
16
- updateWorkFlowState: '/logic/updateWorkFlowState',
17
- // 完工确认后更改工作流状态
18
- afterWorkFlowFinalStepSubmit: '/logic/afterWorkFlowFinalStepSubmit',
19
- // 获取步骤留言和表单填写人姓名
20
- getStepNoteAndHandler: '/logic/getStepNoteAndHandler',
21
- // 更新步骤信息
22
- updateWorkFlowStepData: '/logic/updateWorkFlowStepData',
23
- // 保存工作流日志
24
- saveWorkFlowLog: '/logic/saveWorkFlowLog',
25
- // 获取工作流日志
26
- getWorkFlowLog: '/logic/getWorkFlowLog',
27
- // 获取员工任务详情信息
28
- getEmployeeTaskDetail: '/logic/getEmployeeTaskDetail',
29
- // 根据条件查询任务
30
- getWorkFlowListByCondition: '/logic/getWorkFlowListByCondition',
31
- // 根据流程名称获取所有步骤名称
32
- getWorkFlowStepNames: '/logic/getWorkFlowStepNames',
33
- // 获取工作流任务留言
34
- getWorkFlowLeaveMessage: '/logic/getWorkFlowLeaveMessage',
35
- // 更新任务完成时间
36
- updateWorkFlowCompleteTime: '/logic/updateWorkFlowCompleteTime',
37
- // 获取任务完成时间更改记录
38
- getWorkFlowCompleteTimeChange: '/logic/getWorkFlowCompleteTimeChange',
39
- // 修改工单
40
- updateWorkFlow: '/logic/updateWorkFlow',
41
- // 获取工作流流程图设计
42
- getWorkFlowPaintWorkFlowDefine: '/logic/getWorkFlowPaintWorkFlowDefine',
43
- // 简单添加字典项
44
- simpleInsertIntoDictionary: '/logic/simpleInsertIntoDictionary',
45
- // 删除工作流项目
46
- deleteWorkFlow: '/logic/deleteWorkFlow',
47
- // 获取流程分类数据
48
- getWorkFlowCategoryTree: '/logic/getWorkFlowCategoryTree',
49
- // 创建任务
50
- createWorkflowTask: '/logic/createWorkflowTask',
51
- // 获取部门选择框数据
52
- getDepartmentList: '/logic/getDepartmentList',
53
- // 获取人员任务汇总数据
54
- getEmployeeSummary: '/logic/getEmployeeSummary',
55
- // 获取逾期任务排行榜
56
- getOverdueRanking: '/logic/getOverdueRanking',
57
- // 根据人查询对应的t_workflow_step中字段f_workflow_id的数据组
58
- getWorkFlowStepWorkFlowId: '/logic/getWorkFlowStepWorkFlowId',
59
- // 表单提交到下一步
60
- submitToNextStep: '/logic/submitToNextStep'
61
- }
62
-
63
- export { workFlowViewApi }
1
+ // 工单专用api
2
+ const workFlowViewApi = {
3
+ // 查询：获取工作流基本数据
4
+ getWorkFlowBasicInfo: '/logic/getWorkFlowBasicInfo',
5
+ // 保存工作流流程定义
6
+ saveWorkFlowWorkflowDefine: '/logic/saveWorkFlowWorkflowDefine',
7
+ // 获取工作流流程定义
8
+ getWorkFlowDefine: '/logic/getWorkFlowDefine',
9
+ // 获取工作流当前步骤
10
+ getWorkFlowCurrentSubState: '/logic/getWorkFlowCurrentSubState',
11
+ // 保存用户每一步输入的表单内容
12
+ saveWorkFlowStepFormData: '/logic/saveWorkFlowStepFormData',
13
+ // 获取已经完成步骤的用户填写数据
14
+ getWorkFlowCompletedStepData: '/logic/getWorkFlowCompletedStepData',
15
+ // 改变工作流进度
16
+ updateWorkFlowState: '/logic/updateWorkFlowState',
17
+ // 完工确认后更改工作流状态
18
+ afterWorkFlowFinalStepSubmit: '/logic/afterWorkFlowFinalStepSubmit',
19
+ // 获取步骤留言和表单填写人姓名
20
+ getStepNoteAndHandler: '/logic/getStepNoteAndHandler',
21
+ // 更新步骤信息
22
+ updateWorkFlowStepData: '/logic/updateWorkFlowStepData',
23
+ // 保存工作流日志
24
+ saveWorkFlowLog: '/logic/saveWorkFlowLog',
25
+ // 获取工作流日志
26
+ getWorkFlowLog: '/logic/getWorkFlowLog',
27
+ // 获取员工任务详情信息
28
+ getEmployeeTaskDetail: '/logic/getEmployeeTaskDetail',
29
+ // 根据条件查询任务
30
+ getWorkFlowListByCondition: '/logic/getWorkFlowListByCondition',
31
+ // 根据流程名称获取所有步骤名称
32
+ getWorkFlowStepNames: '/logic/getWorkFlowStepNames',
33
+ // 获取工作流任务留言
34
+ getWorkFlowLeaveMessage: '/logic/getWorkFlowLeaveMessage',
35
+ // 更新任务完成时间
36
+ updateWorkFlowCompleteTime: '/logic/updateWorkFlowCompleteTime',
37
+ // 获取任务完成时间更改记录
38
+ getWorkFlowCompleteTimeChange: '/logic/getWorkFlowCompleteTimeChange',
39
+ // 修改工单
40
+ updateWorkFlow: '/logic/updateWorkFlow',
41
+ // 获取工作流流程图设计
42
+ getWorkFlowPaintWorkFlowDefine: '/logic/getWorkFlowPaintWorkFlowDefine',
43
+ // 简单添加字典项
44
+ simpleInsertIntoDictionary: '/logic/simpleInsertIntoDictionary',
45
+ // 删除工作流项目
46
+ deleteWorkFlow: '/logic/deleteWorkFlow',
47
+ // 获取流程分类数据
48
+ getWorkFlowCategoryTree: '/logic/getWorkFlowCategoryTree',
49
+ // 创建任务
50
+ createWorkflowTask: '/logic/createWorkflowTask',
51
+ // 获取部门选择框数据
52
+ getDepartmentList: '/logic/getDepartmentList',
53
+ // 获取人员任务汇总数据
54
+ getEmployeeSummary: '/logic/getEmployeeSummary',
55
+ // 获取逾期任务排行榜
56
+ getOverdueRanking: '/logic/getOverdueRanking',
57
+ // 根据人查询对应的t_workflow_step中字段f_workflow_id的数据组
58
+ getWorkFlowStepWorkFlowId: '/logic/getWorkFlowStepWorkFlowId',
59
+ // 表单提交到下一步
60
+ submitToNextStep: '/logic/submitToNextStep'
61
+ }
62
+
63
+ export { workFlowViewApi }
package/src/utils/map-utils.js CHANGED
@@ -12,7 +12,7 @@ async function GetGDMap (secretKey, key) {
12
12
  version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
13
13
  plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
14
14
  'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
15
- 'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
15
+ 'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
16
16
  AMapUI: {
17
17
  version: '1.1', // AMapUI 缺省 1.1
18
18
  plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件