+
{{ item.name }}
-
+
{{ item.name }}
-
+
{{ item.name }}
Date: Fri, 25 Mar 2022 14:29:16 +0800
Subject: [PATCH 08/47] =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/qbfz/step1-7.vue | 27 ++++++++++---------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
index 663d44b14..b15be2dea 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
@@ -143,19 +143,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
From 5f980fdf6a2ff395f2cb1fa622dcfe0035735283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 25 Mar 2022 15:55:38 +0800
Subject: [PATCH 09/47] =?UTF-8?q?=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzzqyj/step1-1.vue | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
index 37634e781..79c79f8e8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
@@ -828,7 +828,17 @@ export default {
if (valid) {
this.isSubmit = true
this.$http.post('lawss/activiti/startProcessRollBack', {
- type: '3'
+ id: '',
+ createUser: this.$store.getters.userInfo.userId,
+ createUserName: this.$store.getters.userInfo.userName,
+ type: '3',
+ json: JSON.stringify({
+ form: this.form,
+ roleForm: this.roleForm,
+ commentText1: this.commentText1,
+ filesId: this.addFjList,
+ filesName: this.form.fjListName
+ })
}, {}, res => {
if (res.ok) {
var json = Object.assign(this.form, this.roleForm)
From 244e050edf3bcf2d0228e22fb96532c079452baa Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 25 Mar 2022 15:57:06 +0800
Subject: [PATCH 10/47] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
=?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2-=E6=8A=80?=
=?UTF-8?q?=E6=9C=AF=E6=A0=87=E5=87=86=20=E6=A8=A1=E5=9D=97=20=E9=80=89?=
=?UTF-8?q?=E6=8B=A9=20=E5=88=86=E4=B8=BA=20=E5=8D=A1=E8=BD=A6=E5=92=8C=20?=
=?UTF-8?q?=E4=B9=98=E7=94=A8=E8=BD=A6=E4=BF=A9=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../creatProcess/qbrk/common/formEditList.vue | 24 ++-
.../creatProcess/qbrk/common/formList.vue | 10 +-
.../creatProcess/qbrk/common/formListIn.vue | 10 +-
.../pages/creatProcess/qbrk/step1.vue | 86 +++++---
.../pages/creatProcess/qbrk/step12.vue | 160 ++++++++++----
.../pages/creatProcess/qbrk/step13.vue | 147 ++++++++++---
.../pages/creatProcess/qbrk/step3.vue | 149 ++++++++++---
.../pages/creatProcess/qbrk/step6.vue | 160 ++++++++++----
.../pages/creatProcess/qbrk/stepC3.vue | 199 ++++++++++++------
.../pages/creatProcess/qbrk/stepC6.vue | 194 +++++++++++------
.../pages/creatProcess/qbrk/stepDetail.vue | 2 +-
11 files changed, 806 insertions(+), 335 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
index 784622707..0a5c556e9 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
@@ -270,14 +270,17 @@
>
-
-
+
+
-
+
-
-
+
+
+
+
+
@@ -320,8 +323,11 @@
-
-
+
+
+
+
+
@@ -798,6 +804,10 @@ export default {
this.$emit('formChoiceZRR4',type,title,id)
},
+ choiceZRR5(type, title, id) {
+ this.$emit('formChoiceZRR5',type,title,id)
+ },
+
choiceQCDW(type, title, id) {
this.$emit('formChoiceQCDW',type,title,id)
},
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
index 1d81ef1d3..a13f3a1a7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
@@ -183,9 +183,12 @@
-
+
+
+
+
@@ -220,9 +223,12 @@
-
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
index 5da7364f7..403cb5269 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
@@ -194,9 +194,12 @@
-
+
+
+
+
@@ -231,9 +234,12 @@
-
+
+
+
+
@@ -1312,10 +1331,12 @@
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
modalShowFlag4: false, // drawer开关
+ modalShowFlag5: false, // drawer开关
drawerTitle1:'',
multipleFlag2:'',
url:'',
urlChild:'',
+ modelType:'',
drawerTitle: '', //drawer标题
showCheckBox: true, // 树形控件是否展示多选框
nodeKey: 'id',
@@ -1325,6 +1346,7 @@
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
+ defaultCheckedKeys4: [],
fileUrl: 'api/att/attFile/upload',
fileMadel: false,
fileType: '',
@@ -2266,9 +2288,19 @@
this.modalShowFlag4 = true
this.url = ''
this.urlChild = ''
+ this.modelType = type
this.url="sarModelTree/list"
this.urlChild="sarModelTree/childByList"
},
+ choiceZRR5(type, title, id) {
+ this.drawerTitle = title
+ this.modalShowFlag5 = true
+ this.url = ''
+ this.urlChild = ''
+ this.modelType = type
+ this.url = "sarModelTree/listByType"
+ this.urlChild = "sarModelTree/childByList"
+ },
getTree () {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
@@ -2598,19 +2630,6 @@
// }
},
- popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
- if(checkedData) {
- if(checkedData.length > 0){
- this.form.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
- this.form.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
- }else {
- this.form.VPPSBMBUSS = checkedData.code
- this.form.VPPSCNBUSS = checkedData.chineseName
- }
- }
- this.modalShowFlag2 = false
- this.$forceUpdate()
- },
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if (checkedData.length > 0) {
@@ -2634,19 +2653,6 @@
popoverHideCancel(){
this.modalShowFlag1 = false
},
- popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
- if(checkedData && checkedData.length != 0) {
- if(checkedData.length > 0 && checkedData.length != 0){
- this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
- this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
- }else {
- this.form.cycvppsbm = checkedData.code
- this.form.cycvppscn = checkedData.chineseName
- }
- this.modalShowFlag2 = false
- }
-
- },
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
@@ -2705,6 +2711,22 @@
popoverHideModelCancel(){
this.modalShowFlag4 = false
},
+ popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.CYCDYBXHBUSS = checkedData.map(item => item.model).join(",")
+ this.form.CYCDYMCBUSS = checkedData.map(item => item.name).join(",")
+ } else {
+ this.form.CYCDYBXHBUSS = checkedData.model
+ this.form.CYCDYMCBUSS = checkedData.name
+ }
+ this.modalShowFlag5 = false
+ }
+ this.$forceUpdate()
+ },
+ popoverCarHideModelCancel() {
+ this.modalShowFlag5 = false
+ },
closeDrawer() {
this.ListModel = false
},
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
index 816190dda..884c8216b 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
@@ -42,6 +42,7 @@
@formChoiceZRR2 = "formChoiceZRR2"
@formChoiceZRR3 = "formChoiceZRR3"
@formChoiceZRR4 = "formChoiceZRR4"
+ @formChoiceZRR5 = "formChoiceZRR5"
/>
@@ -569,16 +570,56 @@
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel">
+ :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"
+ @popoverHideCancel="popoverHideBusVsCancel">
+
+
+
正在加载数据
@@ -591,6 +632,7 @@
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+ import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
let Base64 = require('js-base64').Base64;
export default {
@@ -601,7 +643,8 @@
ProcessFooter,
ProcessTitle,
TreeSelect,
- TreeSelectNew
+ TreeSelectNew,
+ TreeSelectModule
},
data () {
const validateZrUserIdName = (rule, value, callback) => {
@@ -791,7 +834,9 @@
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
modalShowFlag4: false, // drawer开关
+ modalShowFlag5: false, // drawer开关
drawerTitle1:'',
+ modelType:'',
multipleFlag2:'',
url:'',
urlChild:'',
@@ -804,6 +849,7 @@
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
+ defaultCheckedKeys4: [],
fileUrl: 'api/att/attFile/upload',
fileMadel: false,
fileType: '',
@@ -1125,6 +1171,9 @@
formChoiceZRR4(type, title, id){
this.choiceZRR4(type, title, id)
},
+ formChoiceZRR5(type, title, id){
+ this.choiceZRR5(type, title, id)
+ },
formChoiceQCDW(type, title, id){
this.choiceQCDW(type, title, id)
},
@@ -1747,9 +1796,19 @@
this.modalShowFlag4 = true
this.url = ''
this.urlChild = ''
+ this.modelType = type
this.url="sarModelTree/list"
this.urlChild="sarModelTree/childByList"
},
+ choiceZRR5(type, title, id) {
+ this.drawerTitle = title
+ this.modalShowFlag5 = true
+ this.url = ''
+ this.urlChild = ''
+ this.modelType = type
+ this.url = "sarModelTree/listByType"
+ this.urlChild = "sarModelTree/childByList"
+ },
getTree () {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
@@ -2121,19 +2180,6 @@
default : ;
}
},
- popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
- if(checkedData) {
- if(checkedData.length > 0){
- this.form.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
- this.form.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
- }else {
- this.form.VPPSBMBUSS = checkedData.code
- this.form.VPPSCNBUSS = checkedData.chineseName
- }
- }
- this.modalShowFlag2 = false
- this.$forceUpdate()
- },
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if (checkedData.length > 0) {
@@ -2157,53 +2203,79 @@
this.modalShowFlag1 = false
},
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
- if(checkedData && checkedData.length != 0) {
- if(checkedData.length > 0 && checkedData.length != 0){
- this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
- this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
- }else {
- this.form.cycvppsbm = checkedData.code
- this.form.cycvppscn = checkedData.chineseName
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+ this.form.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+ } else {
+ this.form.CYCVPPSBMBUSS = checkedData.code
+ this.form.CYCVPPSCNBUSS = checkedData.chineseName
}
- this.modalShowFlag2 = false
+ }else {
+ this.form.CYCVPPSBMBUSS = ''
+ this.form.CYCVPPSCNBUSS = ''
}
-
+ this.modalShowFlag2 = false
+ this.$forceUpdate()
},
popoverHideBusVsCancel(){
this.modalShowFlag2 = false
},
popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
- if(checkedData && checkedData.length != 0) {
- if(checkedData.length > 0){
- this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
- this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
- }else {
- this.form.kccvppsbm = checkedData.code
- this.form.kccvppscn = checkedData.chineseName
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+ this.form.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+ } else {
+ this.form.KCVPPSBMBUSS = checkedData.code
+ this.form.KCVPPSCNBUSS = checkedData.chineseName
}
- this.modalShowFlag3 = false
-
+ }else {
+ this.form.KCVPPSBMBUSS = ''
+ this.form.KCVPPSCNBUSS = ''
}
+ this.modalShowFlag3 = false
+ this.$forceUpdate()
},
popoverHideCarVsCancel(){
this.modalShowFlag3 = false
},
popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
- if(checkedData && checkedData.length != 0) {
- if(checkedData.length > 0){
- this.form.dybxh = checkedData.map(item => item.model).join(",")
- this.form.dymc = checkedData.map(item => item.name).join(",")
- }else {
- this.form.dybxh = checkedData.model
- this.form.dymc = checkedData.name
+ console.log(checkedData)
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.DYBXHBUSS = checkedData.map(item => item.model).join(",")
+ this.form.DYMCBUSS = checkedData.map(item => item.name).join(",")
+ } else {
+ this.form.DYBXHBUSS = checkedData.model
+ this.form.DYMCBUSS = checkedData.name
}
- this.modalShowFlag4 = false
+ }else {
+ this.form.DYBXHBUSS = ''
+ this.form.DYMCBUSS = ''
}
-
+ this.modalShowFlag4 = false
+ this.$forceUpdate()
},
popoverHideModelCancel(){
this.modalShowFlag4 = false
},
+ popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.CYCDYBXHBUSS = checkedData.map(item => item.model).join(",")
+ this.form.CYCDYMCBUSS = checkedData.map(item => item.name).join(",")
+ } else {
+ this.form.CYCDYBXHBUSS = checkedData.model
+ this.form.CYCDYMCBUSS = checkedData.name
+ }
+ this.modalShowFlag5 = false
+ }
+ this.$forceUpdate()
+ },
+ popoverCarHideModelCancel() {
+ this.modalShowFlag5 = false
+ },
closeDrawer() {
this.ListModel = false
},
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
index e5362af54..84a552ce1 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
@@ -43,6 +43,7 @@
@formChoiceZRR2 = "formChoiceZRR2"
@formChoiceZRR3 = "formChoiceZRR3"
@formChoiceZRR4 = "formChoiceZRR4"
+ @formChoiceZRR5 = "formChoiceZRR5"
/>
@@ -570,16 +571,56 @@
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel">
+ :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"
+ @popoverHideCancel="popoverHideBusVsCancel">
+
+
+
正在加载数据
@@ -592,6 +633,7 @@
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+ import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
let Base64 = require('js-base64').Base64;
export default {
@@ -602,7 +644,8 @@
ProcessFooter,
ProcessTitle,
TreeSelect,
- TreeSelectNew
+ TreeSelectNew,
+ TreeSelectModule
},
data () {
const validateZrUserIdName = (rule, value, callback) => {
@@ -792,7 +835,9 @@
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
modalShowFlag4: false, // drawer开关
+ modalShowFlag5: false, // drawer开关
drawerTitle1:'',
+ modelType:'',
multipleFlag2:'',
url:'',
urlChild:'',
@@ -805,6 +850,7 @@
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
+ defaultCheckedKeys4: [],
fileUrl: 'api/att/attFile/upload',
fileMadel: false,
fileType: '',
@@ -1129,6 +1175,9 @@
formChoiceZRR4(type, title, id){
this.choiceZRR4(type, title, id)
},
+ formChoiceZRR5(type, title, id){
+ this.choiceZRR5(type, title, id)
+ },
formChoiceQCDW(type, title, id){
this.choiceQCDW(type, title, id)
},
@@ -1751,9 +1800,19 @@
this.modalShowFlag4 = true
this.url = ''
this.urlChild = ''
+ this.modelType = type
this.url="sarModelTree/list"
this.urlChild="sarModelTree/childByList"
},
+ choiceZRR5(type, title, id) {
+ this.drawerTitle = title
+ this.modalShowFlag5 = true
+ this.url = ''
+ this.urlChild = ''
+ this.modelType = type
+ this.url = "sarModelTree/listByType"
+ this.urlChild = "sarModelTree/childByList"
+ },
getTree () {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
@@ -2144,53 +2203,79 @@
this.modalShowFlag1 = false
},
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
- if(checkedData && checkedData.length != 0) {
- if(checkedData.length > 0 && checkedData.length != 0){
- this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
- this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
- }else {
- this.form.cycvppsbm = checkedData.code
- this.form.cycvppscn = checkedData.chineseName
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+ this.form.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+ } else {
+ this.form.CYCVPPSBMBUSS = checkedData.code
+ this.form.CYCVPPSCNBUSS = checkedData.chineseName
}
- this.modalShowFlag2 = false
+ }else {
+ this.form.CYCVPPSBMBUSS = ''
+ this.form.CYCVPPSCNBUSS = ''
}
-
+ this.modalShowFlag2 = false
+ this.$forceUpdate()
},
popoverHideBusVsCancel(){
this.modalShowFlag2 = false
},
popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
- if(checkedData && checkedData.length != 0) {
- if(checkedData.length > 0){
- this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
- this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
- }else {
- this.form.kccvppsbm = checkedData.code
- this.form.kccvppscn = checkedData.chineseName
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+ this.form.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+ } else {
+ this.form.KCVPPSBMBUSS = checkedData.code
+ this.form.KCVPPSCNBUSS = checkedData.chineseName
}
- this.modalShowFlag3 = false
-
+ }else {
+ this.form.KCVPPSBMBUSS = ''
+ this.form.KCVPPSCNBUSS = ''
}
+ this.modalShowFlag3 = false
+ this.$forceUpdate()
},
popoverHideCarVsCancel(){
this.modalShowFlag3 = false
},
popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
- if(checkedData && checkedData.length != 0) {
- if(checkedData.length > 0){
- this.form.dybxh = checkedData.map(item => item.model).join(",")
- this.form.dymc = checkedData.map(item => item.name).join(",")
- }else {
- this.form.dybxh = checkedData.model
- this.form.dymc = checkedData.name
+ console.log(checkedData)
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.DYBXHBUSS = checkedData.map(item => item.model).join(",")
+ this.form.DYMCBUSS = checkedData.map(item => item.name).join(",")
+ } else {
+ this.form.DYBXHBUSS = checkedData.model
+ this.form.DYMCBUSS = checkedData.name
}
- this.modalShowFlag4 = false
+ }else {
+ this.form.DYBXHBUSS = ''
+ this.form.DYMCBUSS = ''
}
-
+ this.modalShowFlag4 = false
+ this.$forceUpdate()
},
popoverHideModelCancel(){
this.modalShowFlag4 = false
},
+ popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.CYCDYBXHBUSS = checkedData.map(item => item.model).join(",")
+ this.form.CYCDYMCBUSS = checkedData.map(item => item.name).join(",")
+ } else {
+ this.form.CYCDYBXHBUSS = checkedData.model
+ this.form.CYCDYMCBUSS = checkedData.name
+ }
+ this.modalShowFlag5 = false
+ }
+ this.$forceUpdate()
+ },
+ popoverCarHideModelCancel() {
+ this.modalShowFlag5 = false
+ },
closeDrawer() {
this.ListModel = false
},
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
index 65de23ecb..d95000645 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
@@ -39,6 +39,7 @@
@formChoiceZRR2 = "formChoiceZRR2"
@formChoiceZRR3 = "formChoiceZRR3"
@formChoiceZRR4 = "formChoiceZRR4"
+ @formChoiceZRR5 = "formChoiceZRR5"
/>
文件汇总
@@ -608,22 +609,62 @@
:multiple=false
:lazy=false
:modalShowFlag="modalShowFlag1"
- :drawerTitle="drawerTitle1"
+ :drawerTitle="drawerTitle"
width = "500"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel">
+ :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"
+ @popoverHideCancel="popoverHideBusVsCancel">
+
+
+
正在加载数据
@@ -637,6 +678,7 @@
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+ import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
let Base64 = require('js-base64').Base64;
export default {
@@ -647,7 +689,8 @@
ProcessTitle,
TreeSelect,
TreeSelectNew,
- formEditList
+ formEditList,
+ TreeSelectModule
},
data () {
const validateZrUserIdName = (rule, value, callback) => {
@@ -838,8 +881,10 @@
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
modalShowFlag4: false, // drawer开关
+ modalShowFlag5: false, // drawer开关
drawerTitle1:'',
multipleFlag2:'',
+ modelType:'',
url:'',
urlChild:'',
drawerTitle: '', //drawer标题
@@ -851,6 +896,7 @@
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
+ defaultCheckedKeys4: [],
fileUrl: 'api/att/attFile/upload',
fileMadel: false,
fileType: '',
@@ -1167,6 +1213,9 @@
formChoiceZRR4(type, title, id){
this.choiceZRR4(type, title, id)
},
+ formChoiceZRR5(type, title, id){
+ this.choiceZRR5(type, title, id)
+ },
formChoiceQCDW(type, title, id){
this.choiceQCDW(type, title, id)
},
@@ -1801,9 +1850,19 @@
this.modalShowFlag4 = true
this.url = ''
this.urlChild = ''
+ this.modelType = type
this.url="sarModelTree/list"
this.urlChild="sarModelTree/childByList"
},
+ choiceZRR5(type, title, id) {
+ this.drawerTitle = title
+ this.modalShowFlag5 = true
+ this.url = ''
+ this.urlChild = ''
+ this.modelType = type
+ this.url = "sarModelTree/listByType"
+ this.urlChild = "sarModelTree/childByList"
+ },
getTree () {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
@@ -2184,53 +2243,79 @@
this.modalShowFlag1 = false
},
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
- if(checkedData && checkedData.length != 0) {
- if(checkedData.length > 0 && checkedData.length != 0){
- this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
- this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
- }else {
- this.form.cycvppsbm = checkedData.code
- this.form.cycvppscn = checkedData.chineseName
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+ this.form.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+ } else {
+ this.form.CYCVPPSBMBUSS = checkedData.code
+ this.form.CYCVPPSCNBUSS = checkedData.chineseName
}
- this.modalShowFlag2 = false
+ }else {
+ this.form.CYCVPPSBMBUSS = ''
+ this.form.CYCVPPSCNBUSS = ''
}
-
+ this.modalShowFlag2 = false
+ this.$forceUpdate()
},
popoverHideBusVsCancel(){
this.modalShowFlag2 = false
},
popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
- if(checkedData && checkedData.length != 0) {
- if(checkedData.length > 0){
- this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
- this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
- }else {
- this.form.kccvppsbm = checkedData.code
- this.form.kccvppscn = checkedData.chineseName
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+ this.form.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+ } else {
+ this.form.KCVPPSBMBUSS = checkedData.code
+ this.form.KCVPPSCNBUSS = checkedData.chineseName
}
- this.modalShowFlag3 = false
-
+ }else {
+ this.form.KCVPPSBMBUSS = ''
+ this.form.KCVPPSCNBUSS = ''
}
+ this.modalShowFlag3 = false
+ this.$forceUpdate()
},
popoverHideCarVsCancel(){
this.modalShowFlag3 = false
},
popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
- if(checkedData && checkedData.length != 0) {
- if(checkedData.length > 0){
- this.form.dybxh = checkedData.map(item => item.model).join(",")
- this.form.dymc = checkedData.map(item => item.name).join(",")
- }else {
- this.form.dybxh = checkedData.model
- this.form.dymc = checkedData.name
+ console.log(checkedData)
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.DYBXHBUSS = checkedData.map(item => item.model).join(",")
+ this.form.DYMCBUSS = checkedData.map(item => item.name).join(",")
+ } else {
+ this.form.DYBXHBUSS = checkedData.model
+ this.form.DYMCBUSS = checkedData.name
}
- this.modalShowFlag4 = false
+ }else {
+ this.form.DYBXHBUSS = ''
+ this.form.DYMCBUSS = ''
}
-
+ this.modalShowFlag4 = false
+ this.$forceUpdate()
},
popoverHideModelCancel(){
this.modalShowFlag4 = false
},
+ popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.CYCDYBXHBUSS = checkedData.map(item => item.model).join(",")
+ this.form.CYCDYMCBUSS = checkedData.map(item => item.name).join(",")
+ } else {
+ this.form.CYCDYBXHBUSS = checkedData.model
+ this.form.CYCDYMCBUSS = checkedData.name
+ }
+ this.modalShowFlag5 = false
+ }
+ this.$forceUpdate()
+ },
+ popoverCarHideModelCancel() {
+ this.modalShowFlag5 = false
+ },
closeDrawer() {
this.ListModel = false
},
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
index 1838ff59b..e43d77781 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
@@ -168,6 +168,7 @@
@formChoiceZRR2 = "formChoiceZRR2"
@formChoiceZRR3 = "formChoiceZRR3"
@formChoiceZRR4 = "formChoiceZRR4"
+ @formChoiceZRR5 = "formChoiceZRR5"
/>
意见信息
@@ -817,16 +818,56 @@
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel">
+ :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"
+ @popoverHideCancel="popoverHideBusVsCancel">
+
+
+
正在加载数据
@@ -637,6 +678,7 @@
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+ import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
let Base64 = require('js-base64').Base64;
export default {
@@ -647,7 +689,8 @@
ProcessTitle,
TreeSelect,
TreeSelectNew,
- formEditList
+ formEditList,
+ TreeSelectModule
},
data () {
const validateZrUserIdName = (rule, value, callback) => {
@@ -703,9 +746,9 @@
}
}]
},
- taskInfo:'重新企标编写汇总',
- loading: false,
+ taskInfo:'企标编写汇总',
dataLoading: true,
+ loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
@@ -838,8 +881,10 @@
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
modalShowFlag4: false, // drawer开关
+ modalShowFlag5: false, // drawer开关
drawerTitle1:'',
multipleFlag2:'',
+ modelType:'',
url:'',
urlChild:'',
drawerTitle: '', //drawer标题
@@ -851,6 +896,7 @@
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
+ defaultCheckedKeys4: [],
fileUrl: 'api/att/attFile/upload',
fileMadel: false,
fileType: '',
@@ -1037,9 +1083,6 @@
QCRBUSS: [
{ required: true, message: '请选择起草人', trigger: 'change' }
],
- DTQBBHBUSS: [
- { required: true, message: '请选择代替企标编号', trigger: 'change' }
- ],
},
zrUserIds: [], // 选择多个会签责任人
userType:'', // 选择用户ID判断
@@ -1170,6 +1213,9 @@
formChoiceZRR4(type, title, id){
this.choiceZRR4(type, title, id)
},
+ formChoiceZRR5(type, title, id){
+ this.choiceZRR5(type, title, id)
+ },
formChoiceQCDW(type, title, id){
this.choiceQCDW(type, title, id)
},
@@ -1804,9 +1850,19 @@
this.modalShowFlag4 = true
this.url = ''
this.urlChild = ''
+ this.modelType = type
this.url="sarModelTree/list"
this.urlChild="sarModelTree/childByList"
},
+ choiceZRR5(type, title, id) {
+ this.drawerTitle = title
+ this.modalShowFlag5 = true
+ this.url = ''
+ this.urlChild = ''
+ this.modelType = type
+ this.url = "sarModelTree/listByType"
+ this.urlChild = "sarModelTree/childByList"
+ },
getTree () {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
@@ -2187,53 +2243,79 @@
this.modalShowFlag1 = false
},
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
- if(checkedData && checkedData.length != 0) {
- if(checkedData.length > 0 && checkedData.length != 0){
- this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
- this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
- }else {
- this.form.cycvppsbm = checkedData.code
- this.form.cycvppscn = checkedData.chineseName
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+ this.form.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+ } else {
+ this.form.CYCVPPSBMBUSS = checkedData.code
+ this.form.CYCVPPSCNBUSS = checkedData.chineseName
}
- this.modalShowFlag2 = false
+ }else {
+ this.form.CYCVPPSBMBUSS = ''
+ this.form.CYCVPPSCNBUSS = ''
}
-
+ this.modalShowFlag2 = false
+ this.$forceUpdate()
},
popoverHideBusVsCancel(){
this.modalShowFlag2 = false
},
popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
- if(checkedData && checkedData.length != 0) {
- if(checkedData.length > 0){
- this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
- this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
- }else {
- this.form.kccvppsbm = checkedData.code
- this.form.kccvppscn = checkedData.chineseName
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+ this.form.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+ } else {
+ this.form.KCVPPSBMBUSS = checkedData.code
+ this.form.KCVPPSCNBUSS = checkedData.chineseName
}
- this.modalShowFlag3 = false
-
+ }else {
+ this.form.KCVPPSBMBUSS = ''
+ this.form.KCVPPSCNBUSS = ''
}
+ this.modalShowFlag3 = false
+ this.$forceUpdate()
},
popoverHideCarVsCancel(){
this.modalShowFlag3 = false
},
popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
- if(checkedData && checkedData.length != 0) {
- if(checkedData.length > 0){
- this.form.dybxh = checkedData.map(item => item.model).join(",")
- this.form.dymc = checkedData.map(item => item.name).join(",")
- }else {
- this.form.dybxh = checkedData.model
- this.form.dymc = checkedData.name
+ console.log(checkedData)
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.DYBXHBUSS = checkedData.map(item => item.model).join(",")
+ this.form.DYMCBUSS = checkedData.map(item => item.name).join(",")
+ } else {
+ this.form.DYBXHBUSS = checkedData.model
+ this.form.DYMCBUSS = checkedData.name
}
- this.modalShowFlag4 = false
+ }else {
+ this.form.DYBXHBUSS = ''
+ this.form.DYMCBUSS = ''
}
-
+ this.modalShowFlag4 = false
+ this.$forceUpdate()
},
popoverHideModelCancel(){
this.modalShowFlag4 = false
},
+ popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.CYCDYBXHBUSS = checkedData.map(item => item.model).join(",")
+ this.form.CYCDYMCBUSS = checkedData.map(item => item.name).join(",")
+ } else {
+ this.form.CYCDYBXHBUSS = checkedData.model
+ this.form.CYCDYMCBUSS = checkedData.name
+ }
+ this.modalShowFlag5 = false
+ }
+ this.$forceUpdate()
+ },
+ popoverCarHideModelCancel() {
+ this.modalShowFlag5 = false
+ },
closeDrawer() {
this.ListModel = false
},
@@ -2519,7 +2601,6 @@
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form['id'] = item.id
- this.formKey++
})
},
assemble(ids,names){
@@ -2593,43 +2674,21 @@
})
})
},
+ getDicTypeListCode(res,json) {
+ return new Promise((resolve, reject) => {
+ this.$http.get('sys/dictype/getDicTypeListCode', '', {
+ _this: this
+ }, res => {
+ const history = res;
+ resolve(history)
+ })
+ })
+ },
},
mounted () {
this.getTaskId()
this.getData()
this.processTable()
- this.$http.get('sys/dictype/getDicTypeListCode', '', {
- _this: this
- }, res => {
- this.countryOptions = res.data.COUNTRY
- this.applyCountryOptions = res.data.COUNTRY
- this.regionOptions = res.data.REGION // 区域
- this.standStateOptions = res.data.BUSSSTATE
- this.energyKindOptions = res.data.ENERGYTYPES
- this.standGeneraOptions = res.data.BUSSBIGCLASS
- this.standSubclassOptions = res.data.BUSSFINECLASS
- this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
- this.standNatureOptions = res.data.SARPROPERTY // 标准性质
- this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
- this.standSystemOptions = res.data.TXLBBUSS // 标准体系
- this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
- this.categoryOptions = res.data.NYLXCLASS // 能源类型
- this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
- this.cysdOptions = res.data.WSCYSD // 我司参与深度
- this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
- this.txlbOptions = res.data.TXLBCLASS // 体系类别
- this.qcdwOptions = res.data.QCDW // 起草单位
- this.qcrOptions = res.data.QCRBUSS // 起草人
- this.nylxOptions = res.data.NYLXCLASS // 能源类型
- this.syrzOptions = res.data.SYRZCLASS // 适用认证
- this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
- this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
- this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
- this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
- this.setMap(this.standStateOptions)
- })
- this.busVsFunc()
- this.modelFunc()
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
index d0a3799bc..6f94a0d9c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
@@ -2,7 +2,7 @@
企标制修订-技术标准
- 重新技术委员会评审、评审意见修改
+ 重新术委员会评审、评审意见修改
@@ -837,9 +878,10 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
- import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount,evaluationHisListByOne} from "api/process";
+ import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+ import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
import {getEvaluationIndex} from "api/businessApi";
let Base64 = require('js-base64').Base64;
@@ -851,7 +893,8 @@
ProcessTitle,
TreeSelect,
TreeSelectNew,
- formEditList
+ formEditList,
+ TreeSelectModule
},
filters: {
ellipsis (value) {
@@ -935,7 +978,7 @@
}
}]
},
- taskInfo:'重新技术委员会评审、评审意见修改',
+ taskInfo:'技术委员会评审、评审意见修改',
loading: false,
dataLoading: true,
disabledState: false,
@@ -1071,7 +1114,9 @@
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
modalShowFlag4: false, // drawer开关
+ modalShowFlag5: false, // drawer开关
drawerTitle1:'',
+ modelType:'',
multipleFlag2:'',
url:'',
urlChild:'',
@@ -1084,6 +1129,7 @@
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
+ defaultCheckedKeys4: [],
fileUrl: 'api/att/attFile/upload',
fileMadel: false,
fileType: '',
@@ -1516,6 +1562,9 @@
formChoiceZRR4(type, title, id){
this.choiceZRR4(type, title, id)
},
+ formChoiceZRR5(type, title, id){
+ this.choiceZRR5(type, title, id)
+ },
formChoiceZRRListCancel(type, title, id){
this.choiceZRRList(type, title, id)
},
@@ -2148,9 +2197,19 @@
this.modalShowFlag4 = true
this.url = ''
this.urlChild = ''
+ this.modelType = type
this.url="sarModelTree/list"
this.urlChild="sarModelTree/childByList"
},
+ choiceZRR5(type, title, id) {
+ this.drawerTitle = title
+ this.modalShowFlag5 = true
+ this.url = ''
+ this.urlChild = ''
+ this.modelType = type
+ this.url = "sarModelTree/listByType"
+ this.urlChild = "sarModelTree/childByList"
+ },
getTree () {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
@@ -2505,19 +2564,6 @@
}
this.formKey++
},
- popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
- if(checkedData) {
- if(checkedData.length > 0){
- this.form.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
- this.form.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
- }else {
- this.form.VPPSBMBUSS = checkedData.code
- this.form.VPPSCNBUSS = checkedData.chineseName
- }
- }
- this.modalShowFlag2 = false
- this.$forceUpdate()
- },
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if (checkedData.length > 0) {
@@ -2541,53 +2587,79 @@
this.modalShowFlag1 = false
},
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
- if(checkedData && checkedData.length != 0) {
- if(checkedData.length > 0 && checkedData.length != 0){
- this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
- this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
- }else {
- this.form.cycvppsbm = checkedData.code
- this.form.cycvppscn = checkedData.chineseName
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+ this.form.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+ } else {
+ this.form.CYCVPPSBMBUSS = checkedData.code
+ this.form.CYCVPPSCNBUSS = checkedData.chineseName
}
- this.modalShowFlag2 = false
+ }else {
+ this.form.CYCVPPSBMBUSS = ''
+ this.form.CYCVPPSCNBUSS = ''
}
-
+ this.modalShowFlag2 = false
+ this.$forceUpdate()
},
popoverHideBusVsCancel(){
this.modalShowFlag2 = false
},
popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
- if(checkedData && checkedData.length != 0) {
- if(checkedData.length > 0){
- this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
- this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
- }else {
- this.form.kccvppsbm = checkedData.code
- this.form.kccvppscn = checkedData.chineseName
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+ this.form.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+ } else {
+ this.form.KCVPPSBMBUSS = checkedData.code
+ this.form.KCVPPSCNBUSS = checkedData.chineseName
}
- this.modalShowFlag3 = false
-
+ }else {
+ this.form.KCVPPSBMBUSS = ''
+ this.form.KCVPPSCNBUSS = ''
}
+ this.modalShowFlag3 = false
+ this.$forceUpdate()
},
popoverHideCarVsCancel(){
this.modalShowFlag3 = false
},
popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
- if(checkedData && checkedData.length != 0) {
- if(checkedData.length > 0){
- this.form.dybxh = checkedData.map(item => item.model).join(",")
- this.form.dymc = checkedData.map(item => item.name).join(",")
- }else {
- this.form.dybxh = checkedData.model
- this.form.dymc = checkedData.name
+ console.log(checkedData)
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.DYBXHBUSS = checkedData.map(item => item.model).join(",")
+ this.form.DYMCBUSS = checkedData.map(item => item.name).join(",")
+ } else {
+ this.form.DYBXHBUSS = checkedData.model
+ this.form.DYMCBUSS = checkedData.name
}
- this.modalShowFlag4 = false
+ }else {
+ this.form.DYBXHBUSS = ''
+ this.form.DYMCBUSS = ''
}
-
+ this.modalShowFlag4 = false
+ this.$forceUpdate()
},
popoverHideModelCancel(){
this.modalShowFlag4 = false
},
+ popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.form.CYCDYBXHBUSS = checkedData.map(item => item.model).join(",")
+ this.form.CYCDYMCBUSS = checkedData.map(item => item.name).join(",")
+ } else {
+ this.form.CYCDYBXHBUSS = checkedData.model
+ this.form.CYCDYMCBUSS = checkedData.name
+ }
+ this.modalShowFlag5 = false
+ }
+ this.$forceUpdate()
+ },
+ popoverCarHideModelCancel() {
+ this.modalShowFlag5 = false
+ },
closeDrawer() {
this.ListModel = false
},
@@ -2873,13 +2945,8 @@
getFormFieldList (item) {
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item))
- console.log(this.form)
this.form.evaluationData = []
- if(this.form.fsRejectStatus === 1){
- this.evaluationHisListByOne()
- }else {
- this.getEvaluation()
- }
+ this.getEvaluation()
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form['id'] = item.id
@@ -2919,19 +2986,6 @@
})
})
},
- evaluationHisListByOne() {
- return new Promise((resolve, reject) => {
- evaluationHisListByOne({
- pid: this.pId,taskInfo:'技术委员会评审、评审意见修改'
- }).then(res => {
- if (res) {
- this.form.evaluationData = JSON.parse(res.mesg)
- this.$forceUpdate()
- }
- }).catch(e => {
- })
- })
- },
getData() {
if(this.taskIds && this.pId){
return new Promise((resolve, reject) => {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue
index 0ae80edc5..e0cc4ef97 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue
@@ -2,7 +2,7 @@
企标制修订-技术标准
- 企标制修订流程详情
+ 发布
From e697cfcca5961ce9824728817cce898fef93b32e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 25 Mar 2022 17:40:29 +0800
Subject: [PATCH 16/47] =?UTF-8?q?=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../domesticStandardsAndRegulations/index.vue | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 46523e1b6..7f760d98e 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -3718,6 +3718,7 @@ export default {
},
// 搜索
getDomesticStandardTableBtn(item) {
+ sessionStorage.setItem('tableFlag', JSON.stringify(item))
this.tableFlag = item
item.page = 1
this.getDomesticStandardTable(item)
@@ -4492,7 +4493,8 @@ export default {
// 分页每页显示数改变后方法
pageSizeChange(pageSize) {
this.sarStandardsSearch.pageSize = this.$store.getters.userInfo.configContent
- this.getDomesticStandardTable(this.tableFlag)
+ let tabFlag = JSON.parse(sessionStorage.getItem('tableFlag'))
+ this.getDomesticStandardTable(tabFlag)
this.selectConfiguraStand()
// 此处需要调用接口，修改个人配置
},
From b64b9f9da13327d56b9d94a8a51ee6ffd48f51e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 25 Mar 2022 17:49:19 +0800
Subject: [PATCH 17/47] =?UTF-8?q?=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../creatProcess/qbzxdjhgk/component/rename.vue | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
index 44c9314c1..5040111eb 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
@@ -427,18 +427,19 @@ export default {
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
reviseStatus: this.standardSearch.reviseStatus || '',
esName: this.standardSearch.standName,
+ planStatus: '0',
page: this.page,
pageSize: this.pageSize,
}, {
_this: this,
}, res => {
- this.standinfoList = []
+ this.standinfoList = res.data.list
//展示的数据只能是未开始的
- res.data.list.forEach(item => {
- if(item.planStatus === '0'){
- this.standinfoList.push(item)
- }
- })
+ // res.data.list.forEach(item => {
+ // if(item.planStatus === '0'){
+ // this.standinfoList.push(item)
+ // }
+ // })
this.total = this.standinfoList.length
})
From 46e5faaef6beb589441fc1c26c8e2ca03ae46037 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 25 Mar 2022 17:55:04 +0800
Subject: [PATCH 18/47] feat: There is no way the, BUG #52087
---
src/pages/processCenter/pages/creatProcess/qbfs/step5.vue | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue
index 853687fc8..89c5f8291 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue
@@ -654,7 +654,10 @@ export default {
}, res => {
if (res.success) {
this.isSubmit = false
- this.processCreateFsBuss(json)
+ if(this.qbfsForm.approvalOpinion === 0){
+ this.processCreateFsBuss(json)
+ }
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}
}, e => {
});
From d4c4dca983ccfaaa84f28cfe5ca4813d338d6f48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 25 Mar 2022 18:01:00 +0800
Subject: [PATCH 19/47] =?UTF-8?q?=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
index 6b602510f..b954c1731 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
@@ -427,6 +427,7 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
+ this.commentText5 = data.commentText5 || ''
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
this.form.date = data.date || data.form.date
From b79ac60bb78fe60e67d9415f3d477bdc9ac92d20 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 25 Mar 2022 20:37:00 +0800
Subject: [PATCH 20/47] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
=?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=80=89=E4=BA=BA=E7=BB=84=E4=BB=B6=E4=B8=8D?=
=?UTF-8?q?=E5=8F=AF=E5=86=8D=E6=AC=A1=E5=88=A0=E9=99=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/roleTree/index.vue | 3 +++
src/pages/processCenter/pages/creatProcess/qbfs/step1.vue | 8 +++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue
index 34cae976d..52e99ada9 100644
--- a/src/components/roleTree/index.vue
+++ b/src/components/roleTree/index.vue
@@ -248,6 +248,9 @@
this.visible = false
},
saveUserInfo () {
+ if(this.roleList.length === 0){
+ this.roleList.push({id:"",name:""});
+ }
if (this.checkBox) {
this.$emit('checkedRole', this.roleList)
this.nodeList2 = []
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
index 540247401..2f37a798e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
@@ -111,7 +111,7 @@
style="margin-left: 0;margin-bottom:0;"
:rules="formRules.bussFsSubUser1Name"
>
-
+
@@ -817,10 +817,8 @@ export default {
this.nodeList2 = []
this.zrIndex = index
this.zrType = type
- if(type === 'bussFsSubUser1'){
- if ( row.bussFsSubUser1.length > 0) {
- this.nodeList2 = row.bussFsSubUser1.split(',')
- }
+ if ( row.bussFsSubUser1.length > 0) {
+ this.nodeList2 = row.bussFsSubUser1.split(',')
}
this.modalShowRoleFlag = true
} else if (type === 2) {
From f2f620134e8811f2514e67de955b1d63f7e861a5 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 25 Mar 2022 20:45:25 +0800
Subject: [PATCH 21/47] feat: There is no way the, BUG #52083
---
src/pages/processCenter/pages/creatProcess/qbfs/step1.vue | 1 +
.../pages/processList/tabComponents/taskDraft/index.vue | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
index 2f37a798e..2165b1f48 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
@@ -1114,6 +1114,7 @@ export default {
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', 'buss3')
_formData.append('json', JSON.stringify({
+ taskInfo: '起草',
roleForm: this.roleForm,
qbfsForm: this.qbfsForm,
commentText: this.commentText
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index 989404319..1ef8151dd 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -569,7 +569,7 @@ export default {
if(mes !== null && mes.taskInfo !== null) {
if (mes.taskInfo === '起草'){
this.$router.push({
- name: 'bussLibraryProduct1',
+ name: 'qbfsStep1',
query: {
type: 'buss3',
processName: mes.taskInfo,
From 9dcb47eff4cd899a4621287c322988dc8c5d35e1 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 25 Mar 2022 20:52:06 +0800
Subject: [PATCH 22/47] feat: There is no way the, BUG #52083
---
src/pages/processCenter/pages/creatProcess/qbfs/step3.vue | 1 +
src/pages/processCenter/pages/creatProcess/qbfs/step4.vue | 1 +
src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue | 1 +
3 files changed, 3 insertions(+)
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
index f56f1d578..0f4f0b22c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
@@ -472,6 +472,7 @@ export default {
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', 'buss3')
_formData.append('json', JSON.stringify({
+ taskInfo: '复审',
qbfsForm: this.qbfsForm,
commentText: this.commentText
}))
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
index 05f693a4a..313f54a84 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
@@ -509,6 +509,7 @@ export default {
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', 'buss3')
_formData.append('json', JSON.stringify({
+ taskInfo: '汇总',
qbfsForm: this.qbfsForm,
commentText: this.commentText
}))
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue
index cfd0dd576..b0c545268 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue
@@ -509,6 +509,7 @@ export default {
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', 'buss3')
_formData.append('json', JSON.stringify({
+ taskInfo: '重新汇总',
qbfsForm: this.qbfsForm,
commentText: this.commentText
}))
From 053db707279e0304e32c8bb91aee9ac6a6159c29 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Sat, 26 Mar 2022 10:24:28 +0800
Subject: [PATCH 23/47] feat: There is no way the, BUG #52084
---
.../creatProcess/qbfs/common/formList.vue | 175 ++++++++++--------
.../qbfs/common/formListStep5.vue | 4 +-
.../pages/creatProcess/qbfs/step3.vue | 69 ++++++-
3 files changed, 168 insertions(+), 80 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
index ab57da038..e56515f05 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
@@ -174,7 +174,7 @@
>
-
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
@@ -268,9 +277,8 @@
:disabled="true"
>
-