-
+
-
+
@@ -177,7 +201,7 @@
- {{ $t('turnTo') }}
+ {{ $t('turnTo') }}
{{ $t('preservation') }}
@@ -189,13 +213,13 @@
- {{ $t('turnTo') }}
+ {{ $t('turnTo') }}
{{ $t('preservation') }}
{{ $t('agree') }}
- {{ $t('reject') }}
+ {{ $t('reject') }}
@@ -216,7 +240,11 @@ import {
enterprisePlanApprovalDetermine
} from '@/api/workCenter'
import ApprovalBaseInfo from './modules/ApprovalBaseInfo'
-import ChangeBaseInfo from './modules/ChangeBaseInfo'
+import FinishTimeChangeBaseInfo from './modules/FinishTimeChangeBaseInfo'
+import ProcessDetailList from '../../../components/ProcessDetailList'
+import JobEndBaseInfo from './modules/JobEndBaseInfo'
+import DutyDepartChangeBaseInfo from './modules/DutyDepartChangeBaseInfo'
+import MergeBaseInfo from './modules/MergeBaseInfo'
// 标准立项的人员信息
const approvalPersonalInfo = [ // 人员信息的数据
@@ -338,7 +366,11 @@ const changePersonalInfo = [
export default {
name: 'PlanApprovalFlow',
components: {
- ChangeBaseInfo,
+ MergeBaseInfo,
+ DutyDepartChangeBaseInfo,
+ JobEndBaseInfo,
+ ProcessDetailList,
+ FinishTimeChangeBaseInfo,
ApprovalBaseInfo,
UserSelectModal,
PersonnelInfo,
@@ -354,9 +386,21 @@ export default {
'formInline.applicationType' (value) {
if (value) {
if (this.formInline.applicationType === 1) {
- this.personnelInfoData = approvalPersonalInfo
+ if (this.currentNode === 1) {
+ this.personnelInfoData = approvalPersonalInfo
+ } else {
+ this.personnelInfoData = approvalPersonalInfo.map(item => {
+ return { ...item, canChoose: false }
+ })
+ }
} else {
- this.personnelInfoData = changePersonalInfo
+ if (this.currentNode === 1) {
+ this.personnelInfoData = changePersonalInfo
+ } else {
+ this.personnelInfoData = changePersonalInfo.map(item => {
+ return { ...item, canChoose: false }
+ })
+ }
}
}
if (this.formInline.itemCategory) {
@@ -365,14 +409,26 @@ export default {
}
},
mounted () {
- this.personnelInfoData = approvalPersonalInfo
+ if (this.currentNode === 1) {
+ this.personnelInfoData = approvalPersonalInfo
+ } else {
+ this.personnelInfoData = approvalPersonalInfo.map(item => {
+ return { ...item, canChoose: false }
+ })
+ }
+ // 如果是查看进入的,不可编辑
+ if (this.$route.query.onlyLook) {
+ this.onlyLook = this.$route.query.onlyLook
+ this.disabled = this.$route.query.onlyLook
+ }
},
data () {
return {
loading: false,
switchValue: 'base', // 头部tab选中值
disabled: false,
- currentNode: 1, // 当前节点
+ onlyLook: false, // 是否仅查看
+ currentNode: 2, // 当前节点
model: {},
processInfoForm: this.$form.createForm(this),
labelCol: {
@@ -441,7 +497,10 @@ export default {
},
userForm: this.$form.createForm(this), // 部分节点需要选人的表单
approvalInfoForm: this.$form.createForm(this), // 审批信息表单
- personnelInfoData: []
+ personnelInfoData: [],
+ url: {
+ list: '' // 人员信息的右侧表格获取接口
+ }
}
},
methods: {
@@ -681,10 +740,4 @@ export default {
}
}
-// 人员信息
-.personnel-info-wrapper {
- /deep/ .ant-steps {
- width: 400px;
- }
-}
diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
index 7659ee4f..32198826 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
@@ -12,7 +12,7 @@
-
+
*
@@ -28,7 +28,7 @@
:placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')" />
-
+
*
@@ -274,7 +274,7 @@
-
+
{{
(formInline.compilationIllustration === 'null' || formInline.compilationIllustration === ''
|| formInline.compilationIllustration === null || formInline.compilationIllustration === undefined)
@@ -577,7 +577,7 @@
-
+
{{
(formInline.uploadAttachment === 'null' || formInline.uploadAttachment === ''
|| formInline.uploadAttachment === null || formInline.uploadAttachment === undefined)
@@ -591,7 +591,7 @@
-
+
@@ -862,73 +862,13 @@ export default {
diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/ChangeBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfo.vue
similarity index 95%
rename from src/views/workCenter/enterpriseStandardInitChange/modules/ChangeBaseInfo.vue
rename to src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfo.vue
index 6d36b81c..f975a5ef 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/modules/ChangeBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfo.vue
@@ -42,17 +42,17 @@
-
+
+
+
diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/JobEndBaseInfoDrawer.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/JobEndBaseInfoDrawer.vue
new file mode 100644
index 00000000..ea25b43b
--- /dev/null
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/JobEndBaseInfoDrawer.vue
@@ -0,0 +1,212 @@
+
+
+
+
+
{{ $t('cancel') }}
+
{{ $t('submit') }}
+
+
+
+
+
+
+
diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue
new file mode 100644
index 00000000..e1cc9861
--- /dev/null
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue
@@ -0,0 +1,701 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workCenter/processCenter/ProcessCenter.vue b/src/views/workCenter/processCenter/ProcessCenter.vue
new file mode 100644
index 00000000..5f8a3f9f
--- /dev/null
+++ b/src/views/workCenter/processCenter/ProcessCenter.vue
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+ {{ tab.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workCenter/processCenter/table/DoneList.vue b/src/views/workCenter/processCenter/table/DoneList.vue
new file mode 100644
index 00000000..7835242d
--- /dev/null
+++ b/src/views/workCenter/processCenter/table/DoneList.vue
@@ -0,0 +1,171 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ $t('query') }}
+
{{ $t('reset') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workCenter/processCenter/table/DraftList.vue b/src/views/workCenter/processCenter/table/DraftList.vue
new file mode 100644
index 00000000..9bc0e423
--- /dev/null
+++ b/src/views/workCenter/processCenter/table/DraftList.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ $t('query') }}
+
{{ $t('reset') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workCenter/processCenter/table/MonitorList.vue b/src/views/workCenter/processCenter/table/MonitorList.vue
new file mode 100644
index 00000000..b63635c9
--- /dev/null
+++ b/src/views/workCenter/processCenter/table/MonitorList.vue
@@ -0,0 +1,195 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ $t('query') }}
+
{{ $t('reset') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workCenter/processCenter/table/SentList.vue b/src/views/workCenter/processCenter/table/SentList.vue
new file mode 100644
index 00000000..1638e033
--- /dev/null
+++ b/src/views/workCenter/processCenter/table/SentList.vue
@@ -0,0 +1,205 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workCenter/processCenter/table/TodoList.vue b/src/views/workCenter/processCenter/table/TodoList.vue
new file mode 100644
index 00000000..8188553f
--- /dev/null
+++ b/src/views/workCenter/processCenter/table/TodoList.vue
@@ -0,0 +1,180 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ $t('query') }}
+
{{ $t('reset') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yarn.lock b/yarn.lock
index ac6d1e44..2a24ab08 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -301,6 +301,82 @@
dependencies:
"@antv/g6-pc" "0.8.22"
+"@antv/g6-core@0.8.21":
+ version "0.8.21"
+ resolved "https://registry.yarnpkg.com/@antv/g6-core/-/g6-core-0.8.21.tgz#efb55365e047f304a178eccc1249cd4feedb30c4"
+ integrity sha512-zgOn/OW6/RSCPopiNseiLJc0oVV10yoJYS6phcQxceQQHSfwofFkEN2OQvpCCCQ2aMZ9rOkeYNvSdLnAzYyCKg==
+ dependencies:
+ "@antv/algorithm" "^0.1.8"
+ "@antv/dom-util" "^2.0.1"
+ "@antv/event-emitter" "~0.1.0"
+ "@antv/g-base" "^0.5.1"
+ "@antv/g-math" "^0.1.1"
+ "@antv/matrix-util" "^3.1.0-beta.3"
+ "@antv/path-util" "^2.0.3"
+ "@antv/util" "~2.0.5"
+ ml-matrix "^6.5.0"
+ tslib "^2.1.0"
+
+"@antv/g6-element@0.8.21":
+ version "0.8.21"
+ resolved "https://registry.yarnpkg.com/@antv/g6-element/-/g6-element-0.8.21.tgz#a1406a4afc203d6de7fa4d81b70acd5633547f24"
+ integrity sha512-tf+aHYUdbmF1qCCKf15HXJnyV0VZHaE5sxG04caKkF3AB5gXjvYCp+f9cD1lKVy1nfZHUcGCPaWPK8lz/H/9gQ==
+ dependencies:
+ "@antv/g-base" "^0.5.1"
+ "@antv/g6-core" "0.8.21"
+ "@antv/util" "~2.0.5"
+
+"@antv/g6-pc@0.8.21":
+ version "0.8.21"
+ resolved "https://registry.yarnpkg.com/@antv/g6-pc/-/g6-pc-0.8.21.tgz#5d25d60d740c74d5fe6f3a641eec337d0a4db256"
+ integrity sha512-x2+JcLkjToZ4U06aa1W9qJHB3UERqYPqUsFs/POSsFtwF80HmG7iBKeu53k3XfqZ9N2/W4WeoDvx20/NgLolCg==
+ dependencies:
+ "@ant-design/colors" "^4.0.5"
+ "@antv/algorithm" "^0.1.8"
+ "@antv/dom-util" "^2.0.1"
+ "@antv/event-emitter" "~0.1.0"
+ "@antv/g-base" "^0.5.1"
+ "@antv/g-canvas" "^0.5.2"
+ "@antv/g-math" "^0.1.1"
+ "@antv/g-svg" "^0.5.1"
+ "@antv/g6-core" "0.8.21"
+ "@antv/g6-element" "0.8.21"
+ "@antv/g6-plugin" "0.8.21"
+ "@antv/hierarchy" "^0.6.10"
+ "@antv/layout" "^0.3.0"
+ "@antv/matrix-util" "^3.1.0-beta.3"
+ "@antv/path-util" "^2.0.3"
+ "@antv/util" "~2.0.5"
+ color "^3.1.3"
+ d3-force "^2.0.1"
+ dagre "^0.8.5"
+ insert-css "^2.0.0"
+ ml-matrix "^6.5.0"
+
+"@antv/g6-plugin@0.8.21":
+ version "0.8.21"
+ resolved "https://registry.yarnpkg.com/@antv/g6-plugin/-/g6-plugin-0.8.21.tgz#ac35eeba410573d87eeb1e49915f5595cdaedab6"
+ integrity sha512-gRRR8d+F/8CChwwH1rPkAESwLlW8c+ZbuszFn3WOiu7SjSQqNk4LGoNAHgCEUO+jDvAj4xeRZDGl0vlY2oqaSQ==
+ dependencies:
+ "@antv/dom-util" "^2.0.2"
+ "@antv/g-base" "^0.5.1"
+ "@antv/g-canvas" "^0.5.2"
+ "@antv/g-svg" "^0.5.2"
+ "@antv/g6-core" "0.8.21"
+ "@antv/g6-element" "0.8.21"
+ "@antv/matrix-util" "^3.1.0-beta.3"
+ "@antv/path-util" "^2.0.3"
+ "@antv/scale" "^0.3.4"
+ "@antv/util" "^2.0.9"
+ insert-css "^2.0.0"
+
+"@antv/g6@^4.8.21":
+ version "4.8.21"
+ resolved "https://registry.yarnpkg.com/@antv/g6/-/g6-4.8.21.tgz#a79b0692c0debe0331e0c02af0b420c9aec06c93"
+ integrity sha512-0MQT9cU3bKTpFTzcZsR2tQAsDy/FGIzQwCiSR9BhVkDgtwg6bs176ZdWia+/QflWOAg5tQ/C82wnqBXAzpGZnQ==
+ dependencies:
+ "@antv/g6-pc" "0.8.21"
+
"@antv/g@~3.3.5":
version "3.3.6"
resolved "https://registry.npmmirror.com/@antv/g/-/g-3.3.6.tgz#11fed9ddc9ed4e5a2aa244b7c8abb982a003f201"
@@ -417,6 +493,15 @@
gl-matrix "^3.3.0"
tslib "^2.3.1"
+"@antv/util@^3.3.2":
+ version "3.3.4"
+ resolved "https://registry.yarnpkg.com/@antv/util/-/util-3.3.4.tgz#305090df484a45f3c6fbab1c80a2e1885a452fab"
+ integrity sha512-NGRjPCPje8GIC14Ye7sjebamFIjxoZ+mCIqfXz6wD/M6fA9SgJivzmLB3Ry01Wq8PI36oOVv9BwrAGV1JD8vjA==
+ dependencies:
+ fast-deep-equal "^3.1.3"
+ gl-matrix "^3.3.0"
+ tslib "^2.3.1"
+
"@antv/util@~1.3.1":
version "1.3.1"
resolved "https://registry.npmmirror.com/@antv/util/-/util-1.3.1.tgz#30a34b201ff9126ec0d58c72c8166a9c3e644ccd"
@@ -7034,6 +7119,11 @@ is-any-array@^2.0.0, is-any-array@^2.0.1:
resolved "https://registry.yarnpkg.com/is-any-array/-/is-any-array-2.0.1.tgz#9233242a9c098220290aa2ec28f82ca7fa79899e"
integrity sha512-UtilS7hLRu++wb/WBAw9bNuP1Eg04Ivn1vERJck8zJthEvXCBEBpGR/33u/xLKWEQf95803oalHrVDptcAvFdQ==
+is-any-array@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/is-any-array/-/is-any-array-2.0.1.tgz#9233242a9c098220290aa2ec28f82ca7fa79899e"
+ integrity sha512-UtilS7hLRu++wb/WBAw9bNuP1Eg04Ivn1vERJck8zJthEvXCBEBpGR/33u/xLKWEQf95803oalHrVDptcAvFdQ==
+
is-arguments@^1.0.4:
version "1.1.1"
resolved "https://registry.npmmirror.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
@@ -8371,6 +8461,37 @@ ml-matrix@^6.5.0:
is-any-array "^2.0.1"
ml-array-rescale "^1.3.7"
+ml-array-max@^1.2.4:
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/ml-array-max/-/ml-array-max-1.2.4.tgz#2373e2b7e51c8807e456cc0ef364c5863713623b"
+ integrity sha512-BlEeg80jI0tW6WaPyGxf5Sa4sqvcyY6lbSn5Vcv44lp1I2GR6AWojfUvLnGTNsIXrZ8uqWmo8VcG1WpkI2ONMQ==
+ dependencies:
+ is-any-array "^2.0.0"
+
+ml-array-min@^1.2.3:
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/ml-array-min/-/ml-array-min-1.2.3.tgz#662f027c400105816b849cc3cd786915d0801495"
+ integrity sha512-VcZ5f3VZ1iihtrGvgfh/q0XlMobG6GQ8FsNyQXD3T+IlstDv85g8kfV0xUG1QPRO/t21aukaJowDzMTc7j5V6Q==
+ dependencies:
+ is-any-array "^2.0.0"
+
+ml-array-rescale@^1.3.7:
+ version "1.3.7"
+ resolved "https://registry.yarnpkg.com/ml-array-rescale/-/ml-array-rescale-1.3.7.tgz#c4d129320d113a732e62dd963dc1695bba9a5340"
+ integrity sha512-48NGChTouvEo9KBctDfHC3udWnQKNKEWN0ziELvY3KG25GR5cA8K8wNVzracsqSW1QEkAXjTNx+ycgAv06/1mQ==
+ dependencies:
+ is-any-array "^2.0.0"
+ ml-array-max "^1.2.4"
+ ml-array-min "^1.2.3"
+
+ml-matrix@^6.5.0:
+ version "6.10.4"
+ resolved "https://registry.yarnpkg.com/ml-matrix/-/ml-matrix-6.10.4.tgz#babee344b20062d9c123aa801c2e5d0d0c7477f6"
+ integrity sha512-rUyEhfNPzqFsltYwvjNeYQXlYEaVea3KgzcJKJteQUj2WVAGFx9fLNRjtMR9mg2B6bd5buxlmkZmxM4hmO+SKg==
+ dependencies:
+ is-any-array "^2.0.0"
+ ml-array-rescale "^1.3.7"
+
moment-timezone@^0.5.31:
version "0.5.43"
resolved "https://registry.npmmirror.com/moment-timezone/-/moment-timezone-0.5.43.tgz#3dd7f3d0c67f78c23cd1906b9b2137a09b3c4790"