qgb-process 0.1.87 → 0.1.91
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.
- package/lib/qgb-process.common.js +227 -176
- package/lib/qgb-process.umd.js +227 -176
- package/lib/qgb-process.umd.min.js +19 -19
- package/package.json +148 -148
- package/src/api/apiCarRecord.js +2 -2
- package/src/api/apiFund/index.js +2 -1
- package/src/api/apiMachine/api.js +2 -3
- package/src/api/apiMachine/apiRentInfo.js +2 -1
- package/src/api/apiMachine/index.js +2 -1
- package/src/api/apiMaterials/quill-config.js +2 -1
- package/src/views/formBuilder/components/conditionConfig.js +21 -5
- package/src/views/formBuilder/components/nodeConditionConfig.vue +17 -3
- package/src/views/formBuilder/process.vue +4 -2
- package/src/views/formBuilder/workflow/nodeWrap.vue +1 -1
package/package.json
CHANGED
|
@@ -1,148 +1,148 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "qgb-process",
|
|
3
|
-
"version": "0.1.
|
|
4
|
-
"private": false,
|
|
5
|
-
"description": "",
|
|
6
|
-
"author": "",
|
|
7
|
-
"scripts": {
|
|
8
|
-
"serve": "vue-cli-service serve",
|
|
9
|
-
"build": "node --max_old_space_size=10096 node_modules/@vue/cli-service/bin/vue-cli-service.js build",
|
|
10
|
-
"build:test": "node --max_old_space_size=10096 node_modules/@vue/cli-service/bin/vue-cli-service.js build --mode test",
|
|
11
|
-
"build:pre": "node --max_old_space_size=10096 node_modules/@vue/cli-service/bin/vue-cli-service.js build --mode pre",
|
|
12
|
-
"lib": "node --max_old_space_size=10096 node_modules/@vue/cli-service/bin/vue-cli-service.js build --target lib --name qgb-process --dest lib packages/index.js",
|
|
13
|
-
"lint": "vue-cli-service lint",
|
|
14
|
-
"lint-fix": "eslint src/ --fix",
|
|
15
|
-
"test:unit": "vue-cli-service test:unit",
|
|
16
|
-
"fix-memory-limit": "cross-env LIMIT=8192 increase-memory-limit",
|
|
17
|
-
"precommit": "lint-staged"
|
|
18
|
-
},
|
|
19
|
-
"main": "lib/qgb-process.common.js",
|
|
20
|
-
"dependencies": {
|
|
21
|
-
"@babel/plugin-transform-runtime": "^7.10.1",
|
|
22
|
-
"@fullcalendar/core": "^4.4.0",
|
|
23
|
-
"@fullcalendar/daygrid": "^4.4.0",
|
|
24
|
-
"@fullcalendar/interaction": "^4.4.0",
|
|
25
|
-
"@fullcalendar/timegrid": "^4.4.0",
|
|
26
|
-
"@fullcalendar/vue": "^4.4.0",
|
|
27
|
-
"axios": "^0.18.0",
|
|
28
|
-
"babel-plugin-dynamic-import-node": "2.3.0",
|
|
29
|
-
"babel-polyfill": "^6.26.0",
|
|
30
|
-
"core-js": "^3.6.5",
|
|
31
|
-
"cropperjs": "^1.5.2",
|
|
32
|
-
"echarts": "^4.5.0",
|
|
33
|
-
"el-tree-transfer": "^2.2.1",
|
|
34
|
-
"element-ui": "^2.15.1",
|
|
35
|
-
"fullcalendar": "^3.10.1",
|
|
36
|
-
"html2canvas": "^1.0.0-rc.5",
|
|
37
|
-
"jquery": "^3.5.1",
|
|
38
|
-
"js-cookie": "^2.2.0",
|
|
39
|
-
"jspdf": "^1.4.1",
|
|
40
|
-
"jsplumb": "^2.12.14",
|
|
41
|
-
"lodash-es": "^4.17.15",
|
|
42
|
-
"moment": "^2.24.0",
|
|
43
|
-
"qrcode": "^1.4.4",
|
|
44
|
-
"qs": "^6.9.0",
|
|
45
|
-
"quill": "^1.3.6",
|
|
46
|
-
"shigongbang-pc": "^1.0.22",
|
|
47
|
-
"svg-sprite-loader": "^5.2.1",
|
|
48
|
-
"video.js": "^7.5.4",
|
|
49
|
-
"vue": "^2.6.10",
|
|
50
|
-
"vue-amap": "^0.5.10",
|
|
51
|
-
"vue-ele-form-table-editor": "^0.1.3",
|
|
52
|
-
"vue-neditor-wrap": "^1.0.4",
|
|
53
|
-
"vue-photo-preview": "^1.1.3",
|
|
54
|
-
"vue-quill-editor": "^3.0.6",
|
|
55
|
-
"vue-resource": "^1.5.1",
|
|
56
|
-
"vue-router": "^3.0.3",
|
|
57
|
-
"vue-video-player": "^5.0.2",
|
|
58
|
-
"vuedraggable": "^2.24.3",
|
|
59
|
-
"vuex": "^3.0.1"
|
|
60
|
-
},
|
|
61
|
-
"devDependencies": {
|
|
62
|
-
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
|
|
63
|
-
"@commitlint/cli": "^11.0.0",
|
|
64
|
-
"@commitlint/config-conventional": "^11.0.0",
|
|
65
|
-
"@vue/cli-plugin-babel": "^4.5.12",
|
|
66
|
-
"@vue/cli-plugin-eslint": "^4.5.7",
|
|
67
|
-
"@vue/cli-plugin-unit-mocha": "^3.3.0",
|
|
68
|
-
"@vue/cli-service": "^3.3.0",
|
|
69
|
-
"@vue/eslint-config-standard": "^4.0.0",
|
|
70
|
-
"@vue/test-utils": "^1.0.0-beta.20",
|
|
71
|
-
"awe-dnd": "^0.3.4",
|
|
72
|
-
"babel-eslint": "^10.1.0",
|
|
73
|
-
"chai": "^4.1.2",
|
|
74
|
-
"compression-webpack-plugin": "^3.0.0",
|
|
75
|
-
"cross-env": "^7.0.2",
|
|
76
|
-
"eslint": "^7.11.0",
|
|
77
|
-
"eslint-plugin-vue": "^7.1.0",
|
|
78
|
-
"husky": "^4.3.0",
|
|
79
|
-
"image-webpack-loader": "^5.1.0",
|
|
80
|
-
"increase-memory-limit": "^1.0.7",
|
|
81
|
-
"lint-staged": "^10.4.0",
|
|
82
|
-
"lodash.clonedeep": "^4.5.0",
|
|
83
|
-
"lodash.get": "^4.4.2",
|
|
84
|
-
"lodash.set": "^4.3.2",
|
|
85
|
-
"node-sass": "^4.14.1",
|
|
86
|
-
"npx": "^10.2.0",
|
|
87
|
-
"sass-loader": "^7.1.0",
|
|
88
|
-
"simple-progress-webpack-plugin": "^1.1.2",
|
|
89
|
-
"sortablejs": "^1.10.2",
|
|
90
|
-
"terser-webpack-plugin": "^3.0.3",
|
|
91
|
-
"uglifyjs-webpack-plugin": "^1.3.0",
|
|
92
|
-
"vue-ele-form": "0.8.30",
|
|
93
|
-
"vue-ele-form-image-uploader": "^0.1.4",
|
|
94
|
-
"vue-ele-form-json-editor": "^0.1.2",
|
|
95
|
-
"vue-ele-form-quill-editor": "^0.1.0",
|
|
96
|
-
"vue-ele-form-tree-select": "^0.1.1",
|
|
97
|
-
"vue-ele-form-upload-file": "0.0.7",
|
|
98
|
-
"vue-multipane": "^0.9.5",
|
|
99
|
-
"vue-svg-loader": "^0.16.0",
|
|
100
|
-
"vue-template-compiler": "^2.6.11"
|
|
101
|
-
},
|
|
102
|
-
"eslintConfig": {
|
|
103
|
-
"root": true,
|
|
104
|
-
"env": {
|
|
105
|
-
"node": true
|
|
106
|
-
},
|
|
107
|
-
"extends": [
|
|
108
|
-
"plugin:vue/essential",
|
|
109
|
-
"@vue/standard"
|
|
110
|
-
],
|
|
111
|
-
"rules": {
|
|
112
|
-
"no-debugger": 0
|
|
113
|
-
},
|
|
114
|
-
"parserOptions": {
|
|
115
|
-
"parser": "babel-eslint"
|
|
116
|
-
}
|
|
117
|
-
},
|
|
118
|
-
"postcss": {
|
|
119
|
-
"plugins": {
|
|
120
|
-
"autoprefixer": {}
|
|
121
|
-
}
|
|
122
|
-
},
|
|
123
|
-
"browserslist": [
|
|
124
|
-
"> 1%",
|
|
125
|
-
"last 2 versions",
|
|
126
|
-
"not ie <= 8"
|
|
127
|
-
],
|
|
128
|
-
"directories": {
|
|
129
|
-
"test": "tests"
|
|
130
|
-
},
|
|
131
|
-
"husky": {
|
|
132
|
-
"hooks": {
|
|
133
|
-
"pre-commit": "lint-staged",
|
|
134
|
-
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
|
|
135
|
-
}
|
|
136
|
-
},
|
|
137
|
-
"license": "ISC",
|
|
138
|
-
"lint-staged": {
|
|
139
|
-
"src/**/*.{js,jsx,vue}": [
|
|
140
|
-
"eslint --fix",
|
|
141
|
-
"git add"
|
|
142
|
-
]
|
|
143
|
-
},
|
|
144
|
-
"repository": {
|
|
145
|
-
"type": "git",
|
|
146
|
-
"url": "https://code.aliyun.com/qg/pc.git"
|
|
147
|
-
}
|
|
148
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"name": "qgb-process",
|
|
3
|
+
"version": "0.1.91",
|
|
4
|
+
"private": false,
|
|
5
|
+
"description": "",
|
|
6
|
+
"author": "",
|
|
7
|
+
"scripts": {
|
|
8
|
+
"serve": "vue-cli-service serve",
|
|
9
|
+
"build": "node --max_old_space_size=10096 node_modules/@vue/cli-service/bin/vue-cli-service.js build",
|
|
10
|
+
"build:test": "node --max_old_space_size=10096 node_modules/@vue/cli-service/bin/vue-cli-service.js build --mode test",
|
|
11
|
+
"build:pre": "node --max_old_space_size=10096 node_modules/@vue/cli-service/bin/vue-cli-service.js build --mode pre",
|
|
12
|
+
"lib": "node --max_old_space_size=10096 node_modules/@vue/cli-service/bin/vue-cli-service.js build --target lib --name qgb-process --dest lib packages/index.js",
|
|
13
|
+
"lint": "vue-cli-service lint",
|
|
14
|
+
"lint-fix": "eslint src/ --fix",
|
|
15
|
+
"test:unit": "vue-cli-service test:unit",
|
|
16
|
+
"fix-memory-limit": "cross-env LIMIT=8192 increase-memory-limit",
|
|
17
|
+
"precommit": "lint-staged"
|
|
18
|
+
},
|
|
19
|
+
"main": "lib/qgb-process.common.js",
|
|
20
|
+
"dependencies": {
|
|
21
|
+
"@babel/plugin-transform-runtime": "^7.10.1",
|
|
22
|
+
"@fullcalendar/core": "^4.4.0",
|
|
23
|
+
"@fullcalendar/daygrid": "^4.4.0",
|
|
24
|
+
"@fullcalendar/interaction": "^4.4.0",
|
|
25
|
+
"@fullcalendar/timegrid": "^4.4.0",
|
|
26
|
+
"@fullcalendar/vue": "^4.4.0",
|
|
27
|
+
"axios": "^0.18.0",
|
|
28
|
+
"babel-plugin-dynamic-import-node": "2.3.0",
|
|
29
|
+
"babel-polyfill": "^6.26.0",
|
|
30
|
+
"core-js": "^3.6.5",
|
|
31
|
+
"cropperjs": "^1.5.2",
|
|
32
|
+
"echarts": "^4.5.0",
|
|
33
|
+
"el-tree-transfer": "^2.2.1",
|
|
34
|
+
"element-ui": "^2.15.1",
|
|
35
|
+
"fullcalendar": "^3.10.1",
|
|
36
|
+
"html2canvas": "^1.0.0-rc.5",
|
|
37
|
+
"jquery": "^3.5.1",
|
|
38
|
+
"js-cookie": "^2.2.0",
|
|
39
|
+
"jspdf": "^1.4.1",
|
|
40
|
+
"jsplumb": "^2.12.14",
|
|
41
|
+
"lodash-es": "^4.17.15",
|
|
42
|
+
"moment": "^2.24.0",
|
|
43
|
+
"qrcode": "^1.4.4",
|
|
44
|
+
"qs": "^6.9.0",
|
|
45
|
+
"quill": "^1.3.6",
|
|
46
|
+
"shigongbang-pc": "^1.0.22",
|
|
47
|
+
"svg-sprite-loader": "^5.2.1",
|
|
48
|
+
"video.js": "^7.5.4",
|
|
49
|
+
"vue": "^2.6.10",
|
|
50
|
+
"vue-amap": "^0.5.10",
|
|
51
|
+
"vue-ele-form-table-editor": "^0.1.3",
|
|
52
|
+
"vue-neditor-wrap": "^1.0.4",
|
|
53
|
+
"vue-photo-preview": "^1.1.3",
|
|
54
|
+
"vue-quill-editor": "^3.0.6",
|
|
55
|
+
"vue-resource": "^1.5.1",
|
|
56
|
+
"vue-router": "^3.0.3",
|
|
57
|
+
"vue-video-player": "^5.0.2",
|
|
58
|
+
"vuedraggable": "^2.24.3",
|
|
59
|
+
"vuex": "^3.0.1"
|
|
60
|
+
},
|
|
61
|
+
"devDependencies": {
|
|
62
|
+
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
|
|
63
|
+
"@commitlint/cli": "^11.0.0",
|
|
64
|
+
"@commitlint/config-conventional": "^11.0.0",
|
|
65
|
+
"@vue/cli-plugin-babel": "^4.5.12",
|
|
66
|
+
"@vue/cli-plugin-eslint": "^4.5.7",
|
|
67
|
+
"@vue/cli-plugin-unit-mocha": "^3.3.0",
|
|
68
|
+
"@vue/cli-service": "^3.3.0",
|
|
69
|
+
"@vue/eslint-config-standard": "^4.0.0",
|
|
70
|
+
"@vue/test-utils": "^1.0.0-beta.20",
|
|
71
|
+
"awe-dnd": "^0.3.4",
|
|
72
|
+
"babel-eslint": "^10.1.0",
|
|
73
|
+
"chai": "^4.1.2",
|
|
74
|
+
"compression-webpack-plugin": "^3.0.0",
|
|
75
|
+
"cross-env": "^7.0.2",
|
|
76
|
+
"eslint": "^7.11.0",
|
|
77
|
+
"eslint-plugin-vue": "^7.1.0",
|
|
78
|
+
"husky": "^4.3.0",
|
|
79
|
+
"image-webpack-loader": "^5.1.0",
|
|
80
|
+
"increase-memory-limit": "^1.0.7",
|
|
81
|
+
"lint-staged": "^10.4.0",
|
|
82
|
+
"lodash.clonedeep": "^4.5.0",
|
|
83
|
+
"lodash.get": "^4.4.2",
|
|
84
|
+
"lodash.set": "^4.3.2",
|
|
85
|
+
"node-sass": "^4.14.1",
|
|
86
|
+
"npx": "^10.2.0",
|
|
87
|
+
"sass-loader": "^7.1.0",
|
|
88
|
+
"simple-progress-webpack-plugin": "^1.1.2",
|
|
89
|
+
"sortablejs": "^1.10.2",
|
|
90
|
+
"terser-webpack-plugin": "^3.0.3",
|
|
91
|
+
"uglifyjs-webpack-plugin": "^1.3.0",
|
|
92
|
+
"vue-ele-form": "0.8.30",
|
|
93
|
+
"vue-ele-form-image-uploader": "^0.1.4",
|
|
94
|
+
"vue-ele-form-json-editor": "^0.1.2",
|
|
95
|
+
"vue-ele-form-quill-editor": "^0.1.0",
|
|
96
|
+
"vue-ele-form-tree-select": "^0.1.1",
|
|
97
|
+
"vue-ele-form-upload-file": "0.0.7",
|
|
98
|
+
"vue-multipane": "^0.9.5",
|
|
99
|
+
"vue-svg-loader": "^0.16.0",
|
|
100
|
+
"vue-template-compiler": "^2.6.11"
|
|
101
|
+
},
|
|
102
|
+
"eslintConfig": {
|
|
103
|
+
"root": true,
|
|
104
|
+
"env": {
|
|
105
|
+
"node": true
|
|
106
|
+
},
|
|
107
|
+
"extends": [
|
|
108
|
+
"plugin:vue/essential",
|
|
109
|
+
"@vue/standard"
|
|
110
|
+
],
|
|
111
|
+
"rules": {
|
|
112
|
+
"no-debugger": 0
|
|
113
|
+
},
|
|
114
|
+
"parserOptions": {
|
|
115
|
+
"parser": "babel-eslint"
|
|
116
|
+
}
|
|
117
|
+
},
|
|
118
|
+
"postcss": {
|
|
119
|
+
"plugins": {
|
|
120
|
+
"autoprefixer": {}
|
|
121
|
+
}
|
|
122
|
+
},
|
|
123
|
+
"browserslist": [
|
|
124
|
+
"> 1%",
|
|
125
|
+
"last 2 versions",
|
|
126
|
+
"not ie <= 8"
|
|
127
|
+
],
|
|
128
|
+
"directories": {
|
|
129
|
+
"test": "tests"
|
|
130
|
+
},
|
|
131
|
+
"husky": {
|
|
132
|
+
"hooks": {
|
|
133
|
+
"pre-commit": "lint-staged",
|
|
134
|
+
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
|
|
135
|
+
}
|
|
136
|
+
},
|
|
137
|
+
"license": "ISC",
|
|
138
|
+
"lint-staged": {
|
|
139
|
+
"src/**/*.{js,jsx,vue}": [
|
|
140
|
+
"eslint --fix",
|
|
141
|
+
"git add"
|
|
142
|
+
]
|
|
143
|
+
},
|
|
144
|
+
"repository": {
|
|
145
|
+
"type": "git",
|
|
146
|
+
"url": "https://code.aliyun.com/qg/pc.git"
|
|
147
|
+
}
|
|
148
|
+
}
|
package/src/api/apiCarRecord.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import request from "@/http"
|
|
2
|
-
|
|
3
|
-
const baseUrl =
|
|
2
|
+
const base = JSON.parse(localStorage.getItem("env"))
|
|
3
|
+
const baseUrl = base.VUE_APP_APIUSER
|
|
4
4
|
|
|
5
5
|
// 用车记录列表
|
|
6
6
|
export const getCarRecordList = async(params) => request.post(baseUrl + "/v3/api/carApply/applyCarList", params)
|
package/src/api/apiFund/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import request from "@/http"
|
|
2
|
-
const
|
|
2
|
+
const base = JSON.parse(localStorage.getItem("env"))
|
|
3
|
+
const url = base.VUE_APP_APIUSER
|
|
3
4
|
const apiFund = {
|
|
4
5
|
getFundRecordList: (data) => request.get(`${url}/v1/api/CurrentPayment/currentPaymentAccountlist`, data),
|
|
5
6
|
getFundRecordDetail: (no) => request.get(`${url}/v1/api/CurrentPayment/detail/${no}`),
|
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
// import api from '@/api/apiMachine/api'
|
|
3
3
|
import http from "@/http/type.js"
|
|
4
4
|
import api from "@/api/apiMachine/api"
|
|
5
|
-
const
|
|
5
|
+
const base = JSON.parse(localStorage.getItem("env"))
|
|
6
|
+
const menuUrl = base.VUE_APP_MENUURL
|
|
6
7
|
// getMachineryList: (params) => http.get(api + 'sysMachineryType/getMachineryList', params),
|
|
7
8
|
|
|
8
9
|
const apiRentInfoData = {
|
|
@@ -2,8 +2,9 @@ import cookie from "@/storage/cookies"
|
|
|
2
2
|
import { Message } from "element-ui"
|
|
3
3
|
// let that = this
|
|
4
4
|
/* 富文本编辑图片上传配置 */
|
|
5
|
+
const base = JSON.parse(localStorage.getItem("env"))
|
|
5
6
|
const uploadConfig = {
|
|
6
|
-
action:
|
|
7
|
+
action: base.VUE_APP_APIMATERIALS,
|
|
7
8
|
methods: "POST", // 必填参数 图片上传方式
|
|
8
9
|
token: cookie.cookieRead("token"), // 可选参数 如果需要token验证，假设你的token有存放在sessionStorage
|
|
9
10
|
name: "file", // 必填参数 文件的参数名
|
|
@@ -106,13 +106,13 @@ export const trip = async() => { // ok
|
|
|
106
106
|
export const projectApproval = async() => {
|
|
107
107
|
const projectAddApply = [
|
|
108
108
|
{ name: "申请单位", variable: "accountSubject", ele: "checkbox", data: [] },
|
|
109
|
-
{ name: "工程类型", variable: "type", ele: "checkbox", data:
|
|
109
|
+
{ name: "工程类型", variable: "type", ele: "checkbox", data: engineeringTypes },
|
|
110
110
|
{ name: "资金来源", variable: "fundSource", ele: "checkbox", data: capitalSourceList },
|
|
111
111
|
{ name: "项目造价", variable: "price", ele: "input" },
|
|
112
112
|
{
|
|
113
113
|
name: "经营类型", variable: "businessType", ele: "checkbox", data: [
|
|
114
|
-
{ name: "合作管理", no: "
|
|
115
|
-
{ name: "组织经营", no: "
|
|
114
|
+
{ name: "合作管理", no: "合作管理" },
|
|
115
|
+
{ name: "组织经营", no: "组织经营" }
|
|
116
116
|
]
|
|
117
117
|
}
|
|
118
118
|
]
|
|
@@ -120,11 +120,27 @@ export const projectApproval = async() => {
|
|
|
120
120
|
const res = await getApplyCompanyList();
|
|
121
121
|
projectAddApply[0].data = [...res.data.data];
|
|
122
122
|
// 工程类型
|
|
123
|
-
const { data } = await req.get("/sysTeamCategory/findCategoryListTree");
|
|
124
|
-
projectAddApply[1].data = data.data;
|
|
123
|
+
// const { data } = await req.get("/sysTeamCategory/findCategoryListTree");
|
|
124
|
+
// projectAddApply[1].data = data.data;
|
|
125
125
|
return projectAddApply
|
|
126
126
|
}
|
|
127
127
|
|
|
128
|
+
const engineeringTypes = [
|
|
129
|
+
{ name: "房建工程",no:"房建工程" },
|
|
130
|
+
{ name: "水利工程",no:"水利工程" },
|
|
131
|
+
{ name: "市政工程",no:"市政工程" },
|
|
132
|
+
{ name: "冶炼工程",no:"冶炼工程" },
|
|
133
|
+
{ name: "矿山工程",no:"矿山工程" },
|
|
134
|
+
{ name: "化工石油工程",no:"化工石油工程" },
|
|
135
|
+
{ name: "电力工程",no:"电力工程" },
|
|
136
|
+
{ name: "农林工程",no:"农林工程" },
|
|
137
|
+
{ name: "铁路工程",no:"铁路工程" },
|
|
138
|
+
{ name: "公路工程",no:"公路工程" },
|
|
139
|
+
{ name: "港口与航道工程",no:"港口与航道工程" },
|
|
140
|
+
{ name: "航天航空工程",no:"航天航空工程" },
|
|
141
|
+
{ name: "通信工程" ,no:"通信工程" },
|
|
142
|
+
{ name: "机电安装工程",no:"机电安装工程" }
|
|
143
|
+
]
|
|
128
144
|
const capitalSourceList = [
|
|
129
145
|
{
|
|
130
146
|
name: "国拨资金",
|
|
@@ -29,8 +29,11 @@
|
|
|
29
29
|
<div v-for="(item, index) in formConfig" :key="index">
|
|
30
30
|
<template v-if="item.ele == 'checkbox'">
|
|
31
31
|
<el-form-item :label="item.name + ': '">
|
|
32
|
-
<el-checkbox-group v-model="form[item.variable].value" @change="(val) => handlerChange(val, item)">
|
|
33
|
-
<el-checkbox :label="items.
|
|
32
|
+
<el-checkbox-group v-if="item.variable == 'accountSubject'" v-model="form[item.variable].value" @change="(val) => handlerChange(val, item)">
|
|
33
|
+
<el-checkbox :label="items.id" v-for="(items, indexs) in item.data" :key="indexs">{{ items.name }}321</el-checkbox>
|
|
34
|
+
</el-checkbox-group>
|
|
35
|
+
<el-checkbox-group v-else v-model="form[item.variable].value" @change="(val) => handlerChange(val, item)">
|
|
36
|
+
<el-checkbox :label="items.no+''" v-for="(items, indexs) in item.data" :key="indexs">{{ items.name }}123</el-checkbox>
|
|
34
37
|
</el-checkbox-group>
|
|
35
38
|
</el-form-item>
|
|
36
39
|
</template>
|
|
@@ -319,7 +322,18 @@ export default {
|
|
|
319
322
|
const data = this.configList.filter(i => i.variable == name)[0].data;
|
|
320
323
|
let descArr;
|
|
321
324
|
if (data && Array.isArray(this.form[name].value)) {
|
|
322
|
-
|
|
325
|
+
if(this.form[name].name == '申请单位'){
|
|
326
|
+
descArr = [];
|
|
327
|
+
this.form[name].value.forEach(item=>{
|
|
328
|
+
data.forEach(j=>{
|
|
329
|
+
if(item == j.id){
|
|
330
|
+
descArr.push(j.name)
|
|
331
|
+
}
|
|
332
|
+
})
|
|
333
|
+
})
|
|
334
|
+
} else{
|
|
335
|
+
descArr = this.form[name].value.map(item => data.filter(j => j.no == item)[0].name)
|
|
336
|
+
}
|
|
323
337
|
} else if (data && !Array.isArray(this.form[name].value)) {
|
|
324
338
|
const satff = data.filter(j => j.value == this.form[name].value)[0].name;
|
|
325
339
|
descArr = [satff];
|
|
@@ -365,9 +365,11 @@ export default {
|
|
|
365
365
|
"automaticPass": this.workFlowDef.automaticPass ? 1 : 0, // 重复审批人问题
|
|
366
366
|
"creator": this.userInfo.no, // 用户no this.$store.state.user.no
|
|
367
367
|
"companyId": this.userInfo.companyNo, // 公司id this.$store.state.user.companyNo
|
|
368
|
-
"type": this.
|
|
368
|
+
"type": this.type, // 流程类型 this.$route.query.type 或者表单类型
|
|
369
369
|
"processName": this.queryInfo.name, // 流程名称 ""this.$route.query.name
|
|
370
|
-
"describe": this.queryInfo.name // 流程描述 this.$route.query.name
|
|
370
|
+
"describe": this.queryInfo.name, // 流程描述 this.$route.query.name
|
|
371
|
+
"menuId": this.formBuilder.menuId,
|
|
372
|
+
"menuName": this.formBuilder.name || ""
|
|
371
373
|
}
|
|
372
374
|
|
|
373
375
|
|
|
@@ -372,7 +372,7 @@ export default {
|
|
|
372
372
|
// todo: 暂时判断输入框与发起人类型
|
|
373
373
|
if(!['input','sponsor'].includes(item.ele)){
|
|
374
374
|
item.value = item.value.split(',')
|
|
375
|
-
item.value.map((items,key)=>item.value[key] = parseInt(items))
|
|
375
|
+
// item.value.map((items,key)=>item.value[key] = parseInt(items))
|
|
376
376
|
}
|
|
377
377
|
|
|
378
378
|
json[item.variable] = item;
|