diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
index c3510330d..413b3df22 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
@@ -24,11 +24,21 @@
-
-
+
+
+
+
+
+
+
+
@@ -1113,6 +1124,8 @@
callback()
};
return {
+ ccc:false,
+ planDisabled:true,
disabledXX:!!this.$route.query.disabledXX,
opinionsStand:[
{value: '1',label: '制定'},
@@ -1290,7 +1303,7 @@
selListRep2:[],
id:'',
standNum:'',
- standStatus:'', // 标准状态
+ standStatus:'1', // 标准状态
planId:'',
planStatus:'',
reviseStatus:'',
@@ -1644,6 +1657,7 @@
// }, e => {
// })
}
+ this.$forceUpdate()
},
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
@@ -1929,6 +1943,7 @@
},
getTaskId () {
if(this.$route.query.bpnId){
+ this.ccc = true
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
@@ -1951,6 +1966,7 @@
this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
this.roleForm = mes.roleForm
this.commentText = mes.commentText
+ this.ccc = false
})
}else {
this.form.XCSJBUSS = this.dateFormatter()
@@ -2078,8 +2094,6 @@
this.form.modelDataZrUserVerify=[]
this.form.QCDWID= ''
this.form.menuId = this.form['TXLBBUSSMenuId']
- console.log(this.form)
- console.log(this.form.menuId)
this.form.WJSCRYBUSS= this.$store.getters.userInfo.userId
this.form.WJSCRYBUSSName= this.$store.getters.userInfo.userName
this.form['id'] = bringData.id
@@ -2092,6 +2106,7 @@
this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
this.standardDrawer = false
this.verifySarStandard = true
+ this.planDisabled = false
if(standStatus && standStatus === '2'){
let date = new Date();
let year = date.getFullYear();
@@ -2106,7 +2121,6 @@
this.form.standStatus = "3"
this.getStandInfoByReviseStatus('dr')
}
- console.log(this.form)
this.$forceUpdate()
}
// 遍历对象初始化文件信息
@@ -2942,10 +2956,6 @@
this.isSubmit = false
this.saveLoading = false
- if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.standardCheckedList === undefined ||this.standardCheckedList.length === 0)) {
- this.$message.warning("请选择一条企标标准")
- return
- }
// this.changeTree(this.form.modelData)
this.$refs['form'].validate((valid) => {
if (valid) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
index bd6a658cd..f81ec874d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
@@ -1959,7 +1959,6 @@
this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'BDTQBBHBUSS'){
this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(','))
- this.form.standNum = this.filterSetData(textArr2.join(','))
}else {
this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
}
@@ -2530,6 +2529,8 @@
}
})
}})
+ }else{
+ this.$message.warning('请检查基础信息表单是否填写完整')
}
})
},
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index cb1ba3ea3..95deef6a6 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -1106,6 +1106,7 @@
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
:nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
@popoverHideCancel="popoverCarHideModelCancel()">
+
@@ -1214,6 +1215,7 @@
}
}]
},
+ ccc:false,
disabledXX:!!this.$route.query.disabledXX,
bpnId: this.$route.query.bpnId,
fileList: [],
@@ -1858,6 +1860,7 @@
},
getTaskId () {
if(this.$route.query.bpnId){
+ this.ccc = true
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
@@ -1873,6 +1876,7 @@
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.roleForm = mes.roleForm
this.commentText = mes.commentText
+ this.ccc = false
})
}else {
this.form.XCSJBUSS = this.dateFormatter()
@@ -2387,6 +2391,7 @@
// 代替政策编号确定
replaceLawsNumModelBt () {
let textArr = []
+ let textArr2 = []
if (typeof this.value === 'string') {
if (this.value) {
@@ -2399,11 +2404,16 @@
type: 'warning'
})
}
- if (this.selectedListRep.length + textArr.length > 20) {
+ if ( this.form.reviseStatus === '1' && this.selectedListRep.length + textArr.length > 20) {
return this.$message({
message: '标准最多选择20项',
type: 'warning'
})
+ }else if(this.form.reviseStatus === '2' && this.selectedListRep.length + textArr.length > 1){
+ return this.$message({
+ message: '标准最多选择1项',
+ type: 'warning'
+ })
}
this.selectedListRep.map((item) => {
let texts = ''
@@ -2418,6 +2428,8 @@
}
textArr.push(texts)
textArr = [...new Set(textArr)]
+ textArr2.push(item.standNumber)
+ textArr2 = [...new Set(textArr2)]
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
@@ -2425,6 +2437,7 @@
if(this.replaceLawType === 'DTQBBHBUSS'){
let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ this.form.standNum = this.filterSetData(textArr2.join(','))
}else if(this.replaceLawType === 'CYBZ'){
let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
this.form.CYBZ = this.filterSetData(arr1)
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
index 1647257d6..1c27298d1 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
@@ -1897,6 +1897,7 @@
// 代替政策编号确定
replaceLawsNumModelBt () {
let textArr = []
+ let textArr2 = []
if (typeof this.value === 'string') {
if (this.value) {
@@ -1909,11 +1910,16 @@
type: 'warning'
})
}
- if (this.selectedListRep.length + textArr.length > 20) {
+ if ( this.form.reviseStatus === '1' && this.selectedListRep.length + textArr.length > 20) {
return this.$message({
message: '标准最多选择20项',
type: 'warning'
})
+ }else if(this.form.reviseStatus === '2' && this.selectedListRep.length + textArr.length > 1){
+ return this.$message({
+ message: '标准最多选择1项',
+ type: 'warning'
+ })
}
this.selectedListRep.map((item) => {
let texts = ''
@@ -1928,13 +1934,22 @@
}
textArr.push(texts)
textArr = [...new Set(textArr)]
+ textArr2.push(item.standNumber)
+ textArr2 = [...new Set(textArr2)]
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){
- let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
- this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ if(this.form.reviseStatus === '1'){
+ let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+ this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ this.form.standNum = this.filterSetData(textArr2.join(','))
+ }else if(this.form.reviseStatus === '2'){
+ let arr1 = textArr.join(',')
+ this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ this.form.standNum = this.filterSetData(textArr2.join(','))
+ }
}else if(this.replaceLawType === 'CYBZ'){
let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
this.form.CYBZ = this.filterSetData(arr1)
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
index 73a5f1927..9503c7270 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
@@ -1945,6 +1945,7 @@
// 代替政策编号确定
replaceLawsNumModelBt () {
let textArr = []
+ let textArr2 = []
if (typeof this.value === 'string') {
if (this.value) {
@@ -1957,11 +1958,16 @@
type: 'warning'
})
}
- if (this.selectedListRep.length + textArr.length > 20) {
+ if ( this.form.reviseStatus === '1' && this.selectedListRep.length + textArr.length > 20) {
return this.$message({
message: '标准最多选择20项',
type: 'warning'
})
+ }else if(this.form.reviseStatus === '2' && this.selectedListRep.length + textArr.length > 1){
+ return this.$message({
+ message: '标准最多选择1项',
+ type: 'warning'
+ })
}
this.selectedListRep.map((item) => {
let texts = ''
@@ -1976,13 +1982,22 @@
}
textArr.push(texts)
textArr = [...new Set(textArr)]
+ textArr2.push(item.standNumber)
+ textArr2 = [...new Set(textArr2)]
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){
- let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
- this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ if(this.form.reviseStatus === '1'){
+ let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+ this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ }else if(this.form.reviseStatus === '2'){
+ let arr1 = textArr.join(',')
+ this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ this.form.standNum = this.filterSetData(textArr2.join(','))
+ this.getStandInfoByReviseStatus()
+ }
// this.getStandInfoByReviseStatus()
}else if(this.replaceLawType === 'CYBZ'){
let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
@@ -2558,7 +2573,10 @@
this.$message.success(res.message)
}
})
- }})
+ }else{
+ this.$message.warning('请检查基础信息表单是否填写完整')
+ }
+ })
}
})
},
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
index 1a3857e00..473eeb77a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
@@ -1963,6 +1963,7 @@
// 代替政策编号确定
replaceLawsNumModelBt () {
let textArr = []
+ let textArr2 = []
if (typeof this.value === 'string') {
if (this.value) {
@@ -1975,11 +1976,16 @@
type: 'warning'
})
}
- if (this.selectedListRep.length + textArr.length > 20) {
+ if ( this.form.reviseStatus === '1' && this.selectedListRep.length + textArr.length > 20) {
return this.$message({
message: '标准最多选择20项',
type: 'warning'
})
+ }else if(this.form.reviseStatus === '2' && this.selectedListRep.length + textArr.length > 1){
+ return this.$message({
+ message: '标准最多选择1项',
+ type: 'warning'
+ })
}
this.selectedListRep.map((item) => {
let texts = ''
@@ -1994,13 +2000,22 @@
}
textArr.push(texts)
textArr = [...new Set(textArr)]
+ textArr2.push(item.standNumber)
+ textArr2 = [...new Set(textArr2)]
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){
- let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
- this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ if(this.form.reviseStatus === '1'){
+ let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+ this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ this.form.standNum = this.filterSetData(textArr2.join(','))
+ }else if(this.form.reviseStatus === '2'){
+ let arr1 = textArr.join(',')
+ this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ this.form.standNum = this.filterSetData(textArr2.join(','))
+ }
}else if(this.replaceLawType === 'CYBZ'){
let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
this.form.CYBZ = this.filterSetData(arr1)
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
index 30fa57398..31617d72c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
@@ -2300,6 +2300,7 @@
// 代替政策编号确定
replaceLawsNumModelBt () {
let textArr = []
+ let textArr2 = []
if (typeof this.value === 'string') {
if (this.value) {
@@ -2312,11 +2313,16 @@
type: 'warning'
})
}
- if (this.selectedListRep.length + textArr.length > 20) {
+ if ( this.form.reviseStatus === '1' && this.selectedListRep.length + textArr.length > 20) {
return this.$message({
message: '标准最多选择20项',
type: 'warning'
})
+ }else if(this.form.reviseStatus === '2' && this.selectedListRep.length + textArr.length > 1){
+ return this.$message({
+ message: '标准最多选择1项',
+ type: 'warning'
+ })
}
this.selectedListRep.map((item) => {
let texts = ''
@@ -2331,13 +2337,22 @@
}
textArr.push(texts)
textArr = [...new Set(textArr)]
+ textArr2.push(item.standNumber)
+ textArr2 = [...new Set(textArr2)]
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){
- let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
- this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ if(this.form.reviseStatus === '1'){
+ let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+ this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ this.form.standNum = this.filterSetData(textArr2.join(','))
+ }else if(this.form.reviseStatus === '2'){
+ let arr1 = textArr.join(',')
+ this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ this.form.standNum = this.filterSetData(textArr2.join(','))
+ }
}else if(this.replaceLawType === 'CYBZ'){
let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
this.form.CYBZ = this.filterSetData(arr1)
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
index 4779f4cc8..e378edc5a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
@@ -2175,6 +2175,7 @@
// 代替政策编号确定
replaceLawsNumModelBt () {
let textArr = []
+ let textArr2 = []
if (typeof this.value === 'string') {
if (this.value) {
@@ -2187,31 +2188,52 @@
type: 'warning'
})
}
- if (this.selectedListRep.length + textArr.length > 20) {
+ if ( this.form.reviseStatus === '1' && this.selectedListRep.length + textArr.length > 20) {
return this.$message({
message: '标准最多选择20项',
type: 'warning'
})
+ }else if(this.form.reviseStatus === '2' && this.selectedListRep.length + textArr.length > 1){
+ return this.$message({
+ message: '标准最多选择1项',
+ type: 'warning'
+ })
}
this.selectedListRep.map((item) => {
let texts = ''
- if (item.standYear != null && item.standYear !== '') {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
- } else {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ if(item.standCode !== null && item.standCode !== ''){
+ texts = item.standCode
+ }else {
+ if (item.standYear != null && item.standYear !== '') {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+ } else {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ }
}
textArr.push(texts)
textArr = [...new Set(textArr)]
+ textArr2.push(item.standNumber)
+ textArr2 = [...new Set(textArr2)]
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){
- this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+ if(this.form.reviseStatus === '1'){
+ let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+ this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ this.form.standNum = this.filterSetData(textArr2.join(','))
+ }else if(this.form.reviseStatus === '2'){
+ let arr1 = textArr.join(',')
+ this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ this.form.standNum = this.filterSetData(textArr2.join(','))
+ }
}else if(this.replaceLawType === 'CYBZ'){
- this.form.CYBZ = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
+ let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
+ this.form.CYBZ = this.filterSetData(arr1)
}else if(this.replaceLawType === 'YYBZ'){
- this.form.YYBZ = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',')
+ let arr1 = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',')
+ this.form.YYBZ = this.filterSetData(arr1)
}else if(this.replaceLawType === 'bfbdtbzh'){
this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
}else {
@@ -2220,6 +2242,14 @@
// this.$emit('input', textArr.join(','))
this.$refs.selections.clearSelection()
},
+ filterSetData(data){
+ const arr=new Set()
+ let permission = data.split(",");
+ permission.forEach((item, index) => {
+ arr.add(item)
+ })
+ return Array.from(arr).join(',');
+ },
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
index d215e44f0..c38ee1501 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
@@ -1951,6 +1951,7 @@
// 代替政策编号确定
replaceLawsNumModelBt () {
let textArr = []
+ let textArr2 = []
if (typeof this.value === 'string') {
if (this.value) {
@@ -1963,11 +1964,16 @@
type: 'warning'
})
}
- if (this.selectedListRep.length + textArr.length > 20) {
+ if ( this.form.reviseStatus === '1' && this.selectedListRep.length + textArr.length > 20) {
return this.$message({
message: '标准最多选择20项',
type: 'warning'
})
+ }else if(this.form.reviseStatus === '2' && this.selectedListRep.length + textArr.length > 1){
+ return this.$message({
+ message: '标准最多选择1项',
+ type: 'warning'
+ })
}
this.selectedListRep.map((item) => {
let texts = ''
@@ -1982,13 +1988,22 @@
}
textArr.push(texts)
textArr = [...new Set(textArr)]
+ textArr2.push(item.standNumber)
+ textArr2 = [...new Set(textArr2)]
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){
- let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
- this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ if(this.form.reviseStatus === '1'){
+ let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+ this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ this.form.standNum = this.filterSetData(textArr2.join(','))
+ }else if(this.form.reviseStatus === '2'){
+ let arr1 = textArr.join(',')
+ this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ this.form.standNum = this.filterSetData(textArr2.join(','))
+ }
}else if(this.replaceLawType === 'CYBZ'){
let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
this.form.CYBZ = this.filterSetData(arr1)
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
index 3bf2284f8..8eaef631c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
@@ -2298,6 +2298,7 @@
// 代替政策编号确定
replaceLawsNumModelBt () {
let textArr = []
+ let textArr2 = []
if (typeof this.value === 'string') {
if (this.value) {
@@ -2310,11 +2311,16 @@
type: 'warning'
})
}
- if (this.selectedListRep.length + textArr.length > 20) {
+ if ( this.form.reviseStatus === '1' && this.selectedListRep.length + textArr.length > 20) {
return this.$message({
message: '标准最多选择20项',
type: 'warning'
})
+ }else if(this.form.reviseStatus === '2' && this.selectedListRep.length + textArr.length > 1){
+ return this.$message({
+ message: '标准最多选择1项',
+ type: 'warning'
+ })
}
this.selectedListRep.map((item) => {
let texts = ''
@@ -2329,13 +2335,22 @@
}
textArr.push(texts)
textArr = [...new Set(textArr)]
+ textArr2.push(item.standNumber)
+ textArr2 = [...new Set(textArr2)]
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){
- let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
- this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ if(this.form.reviseStatus === '1'){
+ let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+ this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ this.form.standNum = this.filterSetData(textArr2.join(','))
+ }else if(this.form.reviseStatus === '2'){
+ let arr1 = textArr.join(',')
+ this.form.DTQBBHBUSS = this.filterSetData(arr1)
+ this.form.standNum = this.filterSetData(textArr2.join(','))
+ }
}else if(this.replaceLawType === 'CYBZ'){
let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
this.form.CYBZ = this.filterSetData(arr1)
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 3b695b419..9c051d20d 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -209,11 +209,11 @@ export default {
let prcType = this.detailData[index].prcType // 流程类型
console.log(prcType);
// 判断当前流程是否已全部办理完成
- // this.detailData.map(item => {
- // if (!item.endTime) {
- // isEnd = false
- // }
- // })
+ this.detailData.map(item => {
+ if (!item.endTime) {
+ isEnd = false
+ }
+ })
if (isEnd) {
if (this.$store.state.detailMap !== '') {
let lastDetailMap = this.$store.getters.getLastDetailMap
@@ -225,86 +225,161 @@ export default {
this.setHandleInfo((JSON.stringify(row)))
this.setPrcLastDetail((JSON.stringify(row)))
// 根据type判断跳转具体流程页面
+ // 根据type判断跳转具体流程页面
if (prcType === '1') {
// 标准入库流程数据
- this.toProcessDetail('bzrkStep1',row)
+ this.toProcessDetail('bzrkStep5',row)
}else if(prcType === 'laws1'){
//政策入库
- this.toProcessDetail('zcrkStep1',row)
+ this.toProcessDetail('zcrkStep5',row)
}else if(prcType === 'laws2'){
- //政策征求意见流程
- this.toProcessDetail('zczqyjStep1',row)
+ //政策入库
+ this.toProcessDetail('zczqyjStep9Detil',row)
}else if(prcType === 'buss1'){
//企标入库
- this.toProcessDetail('bussLibraryDetail',row)
+ this.toProcessDetail('bussLibrary1',row)
}else if(prcType === 'buss2'){
//企标入库
- this.toProcessDetail('bussLibraryProductDetail',row)
+ this.toProcessDetail('bussLibraryProduct1',row)
}else if(prcType === 'buss3'){
- //企标复审
- this.toProcessDetail('qbfsStep1',row)
- }else if(prcType === '4'){
- //标准清单发布流程数据
- this.toProcessDetail('bzqdfbStep1',row)
- }else if (prcType === '5'){
- //标准项目合规评估
- this.toProcessDetail('bzpgStep1',row)
- }else if(prcType === '6'){
- //标准项目合规评估 项目维度
- this.toProcessDetail('xmpg2Step1',row)
- } else if (prcType === '8') {
- // 未符合项整改
- this.toProcessDetail('wfhxzgStep1',row)
- } else if(prcType === '9'){
- this.toProcessDetail('bzjdStep1',row)
- //标准调研流程
- }else if(prcType === '2'){
- this.toProcessDetail('bzdyStep1',row)
- }else if(prcType === '3'){
- //标准征求意见
- this.toProcessDetail('bzzqyjStep1',row)
- }else if(prcType === '10'){
- //项目清单确认
- this.toProcessDetail('xmqdqrStep1',row, 'unShowReceipt')
- }else if(prcType === '14'){
- //加入标准化协会信息备案流程
- this.toProcessDetail('cywbbzzxdStep1',row,)
- }else if(prcType === '15'){
- //加入标准化协会信息备案流程
- this.toProcessDetail('jrbzhxhStep1',row,)
- } else if(prcType === '16'){
- //外部署名
- this.toProcessDetail('wbsmStep1',row)
- }else if(prcType === '20') {
- // 入会流程
- this.toProcessDetail('bzrhStep1',row)
- } else if(prcType === '21') {
- // 参会流程
- this.toProcessDetail('bzchStep1',row)
- } else if(prcType === '23'){
//企标复审
this.toProcessDetail('qbfsStep1',row)
+ }else if(prcType === '4'){
+ //标准清单发布流程数据
+ this.toProcessDetail('bzqdfbStep1-4',row)
+ }else if (prcType === '5'){
+ //标准项目合规评估
+ this.toProcessDetail('bzpgStep8-1',row)
+ }else if(prcType === '6'){
+ //标准项目合规评估 项目维度
+ this.toProcessDetail('xmpgStep1-5',row)
+ } else if (prcType === '8') {
+ // 未符合项整改
+ this.toProcessDetail('wfhxzgStep5-1',row)
+ } else if(prcType === '9'){
+ this.toProcessDetail('bzjdStep1-6',row)
+ //标准调研流程
+ }else if(prcType === '2'){
+ this.toProcessDetail('bzdyStep1-9',row)
+ }else if(prcType === '3'){
+ //标准征求意见
+ this.toProcessDetail('bzzqyjStep1-9',row)
+ }else if(prcType === '10'){
+ //项目清单确认
+ this.toProcessDetail('xmqdqrStep1-4',row, 'unShowReceipt')
+ } else if(prcType === '16'){
+ //外部署名
+ this.toProcessDetail('wbsmStep1-5',row)
+ }else if(prcType === '20') {
+ // 入会流程
+ this.toProcessDetail('bzrhStep6-1',row)
+ } else if(prcType === '21') {
+ // 参会流程
+ this.toProcessDetail('bzchStep6-1',row)
+ } else if(prcType === '23'){
+ //企标复审
+ this.toProcessDetail('qbfsStep1-4',row)
}else if(prcType === '24'){
//企标废止
- this.toProcessDetail('qbfzStep1',row)
+ this.toProcessDetail('qbfzStep1-7',row)
}else if(prcType === '25'){
//企标制修订计划管控
- this.toProcessDetail('qbzxdjhgkStep1',row)
+ this.toProcessDetail('qbzxdjhgkStep1-5',row)
}else if(prcType === '26'){
//企标制修订计划立项
- this.toProcessDetail('qbzxdlxStep1',row)
- }else if(prcType === '17'){
- //政策课题入会发起流程
- this.toProcessDetail('zcrhStep1',row)
- }else if(prcType === '18'){
- //政策课题参会发起流程
- this.toProcessDetail('zcchStep1',row)
- }else if(prcType === '12'){
- //政策课题参会发起流程
- this.toProcessDetail('zdrzbzORzchgxxmscStep1',row)
+ this.toProcessDetail('qbzxdlxStep1-2',row)
}
+ // if (prcType === '1') {
+ // // 标准入库流程数据
+ // this.toProcessDetail('bzrkStep1',row)
+ // }else if(prcType === 'laws1'){
+ // //政策入库
+ // this.toProcessDetail('zcrkStep1',row)
+ // }else if(prcType === 'laws2'){
+ // //政策征求意见流程
+ // this.toProcessDetail('zczqyjStep1',row)
+ // }else if(prcType === 'buss1'){
+ // //企标入库
+ // this.toProcessDetail('bussLibraryDetail',row)
+ // }else if(prcType === 'buss2'){
+ // //企标入库
+ // this.toProcessDetail('bussLibraryProductDetail',row)
+ // }else if(prcType === 'buss3'){
+ // //企标复审
+ // this.toProcessDetail('qbfsStep1',row)
+ // }else if(prcType === '4'){
+ // //标准清单发布流程数据
+ // this.toProcessDetail('bzqdfbStep1',row)
+ // }else if (prcType === '5'){
+ // //标准项目合规评估
+ // this.toProcessDetail('bzpgStep1',row)
+ // }else if(prcType === '6'){
+ // //标准项目合规评估 项目维度
+ // this.toProcessDetail('xmpg2Step1',row)
+ // } else if (prcType === '8') {
+ // // 未符合项整改
+ // this.toProcessDetail('wfhxzgStep1',row)
+ // } else if(prcType === '9'){
+ // this.toProcessDetail('bzjdStep1',row)
+ // //标准调研流程
+ // }else if(prcType === '2'){
+ // this.toProcessDetail('bzdyStep1',row)
+ // }else if(prcType === '3'){
+ // //标准征求意见
+ // this.toProcessDetail('bzzqyjStep1',row)
+ // }else if(prcType === '10'){
+ // //项目清单确认
+ // this.toProcessDetail('xmqdqrStep1',row, 'unShowReceipt')
+ // }else if(prcType === '14'){
+ // //加入标准化协会信息备案流程
+ // this.toProcessDetail('cywbbzzxdStep1',row,)
+ // }else if(prcType === '15'){
+ // //加入标准化协会信息备案流程
+ // this.toProcessDetail('jrbzhxhStep1',row,)
+ // } else if(prcType === '16'){
+ // //外部署名
+ // this.toProcessDetail('wbsmStep1',row)
+ // }else if(prcType === '20') {
+ // // 入会流程
+ // this.toProcessDetail('bzrhStep1',row)
+ // } else if(prcType === '21') {
+ // // 参会流程
+ // this.toProcessDetail('bzchStep1',row)
+ // } else if(prcType === '23'){
+ // //企标复审
+ // this.toProcessDetail('qbfsStep1',row)
+ // }else if(prcType === '24'){
+ // //企标废止
+ // this.toProcessDetail('qbfzStep1',row)
+ // }else if(prcType === '25'){
+ // //企标制修订计划管控
+ // this.toProcessDetail('qbzxdjhgkStep1',row)
+ // }else if(prcType === '26'){
+ // //企标制修订计划立项
+ // this.toProcessDetail('qbzxdlxStep1',row)
+ // }else if(prcType === '17'){
+ // //政策课题入会发起流程
+ // this.toProcessDetail('zcrhStep1',row)
+ // }else if(prcType === '18'){
+ // //政策课题参会发起流程
+ // this.toProcessDetail('zcchStep1',row)
+ // }else if(prcType === '12'){
+ // //政策课题参会发起流程
+ // this.toProcessDetail('zdrzbzORzchgxxmscStep1',row)
+ // }
} else {
- this.$message.warning('当前流程未全部办理完成，无法查看')
+ if(prcType === 'buss1'){
+ //企标入库
+ this.toProcessDetail('bussLibrary1',row)
+ }else if(prcType === 'buss2'){
+ //企标入库
+ this.toProcessDetail('bussLibraryProduct1',row)
+ }else if(prcType === 'buss3'){
+ //企标复审
+ this.toProcessDetail('qbfsStep1',row)
+ }else {
+ this.$message.warning('当前流程未全部办理完成，无法查看')
+ }
}
},
toProcessDetail(componentName,row,unShowReceipt) {