-
@@ -135,8 +135,8 @@
@@ -149,8 +149,8 @@
@@ -163,8 +163,8 @@
@@ -177,8 +177,8 @@
@@ -195,7 +195,7 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
>
-
-
-
-
+
-
查询
-
@@ -305,7 +305,7 @@
-
流程发起人
-
-
+
+
@@ -121,8 +121,8 @@
法规认证部部长
-
-
+
法规认证部副总监
-
-
+
责任部门领导
-
-
+
责任人
-
-
+
法规与认证部总监批准
-
-
+
-
+
- 带入
-
-
+
标准入库流程
- 批准
+ 批准
@@ -449,7 +449,7 @@ Vue.use(Form);
Vue.use(Field);
export default {
name: "phoneBzrkStep2",
- data() {
+ data() {
return {
commentText: '',
textStatusMap: {}, // 文本状态id与name对应
@@ -1052,6 +1052,6 @@ export default {
}
}
.wrap{
- white-space:normal;
+ white-space:normal;
}
diff --git a/src/pages/processCenter/pages/phone/qbfs/common/formList.vue b/src/pages/processCenter/pages/phone/qbfs/common/formList.vue
index 612e0ed4e..cd9c126a4 100644
--- a/src/pages/processCenter/pages/phone/qbfs/common/formList.vue
+++ b/src/pages/processCenter/pages/phone/qbfs/common/formList.vue
@@ -46,7 +46,7 @@
-
+
@@ -169,7 +169,7 @@
@@ -215,13 +215,13 @@
-
+
-
+
-
+
@@ -265,7 +265,7 @@
diff --git a/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue b/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue
index 77fa27e75..69afbdd4c 100644
--- a/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue
+++ b/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue
@@ -115,7 +115,7 @@
@@ -133,19 +133,19 @@
-
+
-
+
-
+
@@ -214,7 +214,7 @@
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/phone/qbrk-product/common/formEditList.vue
index 103c34cd5..e9f0ea1fe 100644
--- a/src/pages/processCenter/pages/phone/qbrk-product/common/formEditList.vue
+++ b/src/pages/processCenter/pages/phone/qbrk-product/common/formEditList.vue
@@ -55,7 +55,7 @@
-
+
@@ -273,7 +273,7 @@
@@ -333,13 +333,13 @@
-
+
-
+
-
+
@@ -441,7 +441,7 @@
v-model="form.XCSJBUSS"
placeholder=""
clearable
- :disabled="true"
+ disabled
>
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue b/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue
index f32af4fdd..0a6681e06 100644
--- a/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue
+++ b/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue
@@ -146,7 +146,7 @@
@@ -196,7 +196,7 @@
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/common/formListIn.vue b/src/pages/processCenter/pages/phone/qbrk-product/common/formListIn.vue
index ae15de933..3221d2f42 100644
--- a/src/pages/processCenter/pages/phone/qbrk-product/common/formListIn.vue
+++ b/src/pages/processCenter/pages/phone/qbrk-product/common/formListIn.vue
@@ -49,7 +49,7 @@
-
+
@@ -189,7 +189,7 @@
@@ -241,13 +241,13 @@
-
+
-
+
-
+
@@ -300,7 +300,7 @@
diff --git a/src/pages/processCenter/pages/phone/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/phone/qbrk/common/formEditList.vue
index ca6c6f17b..93adf5e78 100644
--- a/src/pages/processCenter/pages/phone/qbrk/common/formEditList.vue
+++ b/src/pages/processCenter/pages/phone/qbrk/common/formEditList.vue
@@ -53,7 +53,7 @@
-
+
@@ -255,7 +255,7 @@
@@ -318,16 +318,16 @@
-
+
-
+
-
+
-
+
@@ -404,7 +404,7 @@
v-model="form.XCSJBUSS"
placeholder=""
clearable
- :disabled="true"
+ disabled
>
diff --git a/src/pages/processCenter/pages/phone/qbrk/common/formList.vue b/src/pages/processCenter/pages/phone/qbrk/common/formList.vue
index 5629058e5..2b5ba1692 100644
--- a/src/pages/processCenter/pages/phone/qbrk/common/formList.vue
+++ b/src/pages/processCenter/pages/phone/qbrk/common/formList.vue
@@ -124,7 +124,7 @@
@@ -142,25 +142,25 @@
-
+
-
+
-
+
-
+
@@ -207,7 +207,7 @@
diff --git a/src/pages/processCenter/pages/phone/qbrk/common/formListIn.vue b/src/pages/processCenter/pages/phone/qbrk/common/formListIn.vue
index ddcacb8c7..b7ab40668 100644
--- a/src/pages/processCenter/pages/phone/qbrk/common/formListIn.vue
+++ b/src/pages/processCenter/pages/phone/qbrk/common/formListIn.vue
@@ -47,7 +47,7 @@
-
+
@@ -174,7 +174,7 @@
@@ -229,16 +229,16 @@
-
+
-
+
-
+
-
+
@@ -279,7 +279,7 @@
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 311faf9e8..0b532fb1d 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -202,18 +202,18 @@ export default {
seeProcessLast () {
let index = this.detailData.length - 1 // 当前流程任务最后一步index
let isEnd = true
- let row = {...this.detailData[index]}
+ let row = {...this.detailData[0]}
row.taskIds = row.id
row.taskInfo = row.name
row.tabsName = this.$route.query.tabsName
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
@@ -227,13 +227,13 @@ export default {
// 根据type判断跳转具体流程页面
if (prcType === '1') {
// 标准入库流程数据
- this.toProcessDetail('bzrkStep5',row)
+ this.toProcessDetail('bzrkStep1',row)
}else if(prcType === 'laws1'){
//政策入库
- this.toProcessDetail('zcrkStep5',row)
+ this.toProcessDetail('zcrkStep1',row)
}else if(prcType === 'laws2'){
- //政策入库
- this.toProcessDetail('zczqyjStep9Detil',row)
+ //政策征求意见流程
+ this.toProcessDetail('zczqyjStep1',row)
}else if(prcType === 'buss1'){
//企标入库
this.toProcessDetail('bussLibraryDetail',row)
@@ -242,51 +242,66 @@ export default {
this.toProcessDetail('bussLibraryProductDetail',row)
}else if(prcType === 'buss3'){
//企标复审
- this.toProcessDetail('bussFsDetail',row)
+ this.toProcessDetail('qbfsStep1',row)
}else if(prcType === '4'){
//标准清单发布流程数据
- this.toProcessDetail('bzqdfbStep1-4',row)
+ this.toProcessDetail('bzqdfbStep1',row)
}else if (prcType === '5'){
//标准项目合规评估
- this.toProcessDetail('bzpgStep8-1',row)
+ this.toProcessDetail('bzpgStep1',row)
}else if(prcType === '6'){
//标准项目合规评估 项目维度
- this.toProcessDetail('xmpgStep1-5',row)
+ this.toProcessDetail('xmpg2Step1',row)
} else if (prcType === '8') {
// 未符合项整改
- this.toProcessDetail('wfhxzgStep5-1',row)
+ this.toProcessDetail('wfhxzgStep1',row)
} else if(prcType === '9'){
- this.toProcessDetail('bzjdStep1-6',row)
+ this.toProcessDetail('bzjdStep1',row)
//标准调研流程
}else if(prcType === '2'){
- this.toProcessDetail('bzdyStep1-9',row)
+ this.toProcessDetail('bzdyStep1',row)
}else if(prcType === '3'){
//标准征求意见
- this.toProcessDetail('bzzqyjStep1-9',row)
+ this.toProcessDetail('bzzqyjStep1',row)
}else if(prcType === '10'){
//项目清单确认
- this.toProcessDetail('xmqdqrStep1-4',row, 'unShowReceipt')
+ 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-5',row)
+ this.toProcessDetail('wbsmStep1',row)
}else if(prcType === '20') {
// 入会流程
- this.toProcessDetail('bzrhStep6-1',row)
+ this.toProcessDetail('bzrhStep1',row)
} else if(prcType === '21') {
// 参会流程
- this.toProcessDetail('bzchStep6-1',row)
+ this.toProcessDetail('bzchStep1',row)
} else if(prcType === '23'){
//企标复审
- this.toProcessDetail('qbfsStep1-4',row)
+ this.toProcessDetail('qbfsStep1',row)
}else if(prcType === '24'){
//企标废止
- this.toProcessDetail('qbfzStep1-7',row)
+ this.toProcessDetail('qbfzStep1',row)
}else if(prcType === '25'){
//企标制修订计划管控
- this.toProcessDetail('qbzxdjhgkStep1-5',row)
+ this.toProcessDetail('qbzxdjhgkStep1',row)
}else if(prcType === '26'){
//企标制修订计划立项
- this.toProcessDetail('qbzxdlxStep1-2',row)
+ 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('当前流程未全部办理完成,无法查看')
@@ -296,11 +311,13 @@ export default {
let data = {
name: componentName,
query: {
+ bpnId: this.$route.query.bpnId,
taskIds: row.id,
prcId: row.processInstanceId,
prcNum: row.prcNum,
prcName: row.prcName,
- prcType: row.prcType
+ prcType: row.prcType,
+ disabledXX:true,
}
}
if (unShowReceipt) {
diff --git a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
index d81eadf51..68c483d7c 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
@@ -188,7 +188,7 @@ export default {
size: this.$store.getters.userInfo.configContent,
userId: this.$store.getters.userInfo.userId,
prcName: this.searchForm.prcName,
- prcType: parseInt(this.searchForm.prcType) || '',
+ prcType: this.searchForm.prcType || '',
prcNum: this.searchForm.prcNum
},
{
@@ -218,6 +218,7 @@ export default {
this.$router.push({
name: 'ProcessDetail',
query: {
+ bpnId: row.id,
prcNum: row.prcNum,
tabsName: 'MonitorProcess'
}
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 9d745ccb9..995f4cd54 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -435,19 +435,19 @@
>
-
+
-
+
-
+
-
+
-
+
@@ -487,10 +487,10 @@
-
+
-
+
基础信息
@@ -132,17 +132,17 @@
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 2e5c41fcb..e6ef135f0 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -715,7 +715,7 @@
@@ -723,7 +723,7 @@
:config="field"
v-if="field.attrField !== 'BDTBZBH'"
v-model="sarStandardsInfoEO[field.attrField]"
- :disabled="true"
+ disabled
>
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 3eb628ace..7160fabd5 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -651,7 +651,7 @@
@@ -775,14 +775,14 @@
diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
index 6f1360925..a1407e00b 100644
--- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
@@ -546,7 +546,7 @@
:key="field.attrField"
:config="field"
v-model="sarLawsStandEO[field.attrField]"
- :disabled="true"
+ disabled
>
@@ -592,7 +592,7 @@
:key="field.attrField"
:config="field"
v-model="sarLawsStandEO[field.attrField]"
- :disabled="true"
+ disabled
>
@@ -600,7 +600,7 @@
:key="field.attrField"
:config="field"
v-model="sarLawsStandEO[field.attrField]"
- :disabled="true"
+ disabled
>
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 2a9d1ff43..0797554c9 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -442,7 +442,7 @@
-
+
@@ -469,7 +469,7 @@