diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index b6579017b..bed1dce20 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -317,13 +317,13 @@
menuId: 'asfdew33',
isChildren: true // 判断没有子菜单
},
- /*{
+ {
title: '资料中心',
path: '/dataCenter',
'icon-class': 'el-icon-s-order',
menuId: '',
isChildren: true // 判断没有子菜单
- },*/
+ },
// {
// title: '技术要求清单',
// path: '/skillReq',
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index 8d66b6d72..367e5e4fb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -152,7 +152,7 @@
技术委员会相关专委会主任/ 工程研究总院责任部门领导、事业部标准化员
-
+
@@ -164,7 +164,7 @@
标准法规部高级经理、责任部门高级经理
-
+
@@ -176,7 +176,7 @@
-
+
@@ -187,7 +187,7 @@
工程研究总院院长/标准法规业务主管副院长
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
index 3c582f085..68ac64b1a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
@@ -275,7 +275,7 @@
技术委员会分委会主任/技术主管部门负责人
-
+
@@ -323,7 +323,7 @@
标准法规部主管领导
-
+
@@ -335,7 +335,7 @@
费用管理部门
-
+
@@ -347,7 +347,7 @@
业务主管副院长
-
+
@@ -359,7 +359,7 @@
院长
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue
index a4061068a..1b62a1a0e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue
@@ -165,7 +165,7 @@
法规工程师
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
index 150ae2d03..ec5e59207 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
@@ -207,7 +207,7 @@
分委会主任/部门中心主任
-
+
@@ -255,7 +255,7 @@
标准法规部主管中心主任
-
+
@@ -267,7 +267,7 @@
管理推进部
-
+
@@ -279,7 +279,7 @@
业务主管副院长
-
+
@@ -291,7 +291,7 @@
院长
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index 1619e062f..d3aac7222 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -229,6 +229,7 @@
标准法规部法规分析业务经理
-
@@ -225,7 +225,7 @@
标准法规部高级经理
-
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
index 518a658d7..60768153f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
@@ -196,7 +196,7 @@
相关业务单位
-
@@ -210,7 +210,7 @@
标准法规工程师
-
@@ -223,7 +223,7 @@
标准法规部法规分析业务经理
-
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 3eba6e0cc..8f52060af 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -196,7 +196,7 @@
相关业务单位
-
@@ -210,7 +210,7 @@
标准法规工程师
-
@@ -223,7 +223,7 @@
标准法规部法规分析业务经理
-
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index b2a164b55..9cdf64e6e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1013,7 +1013,7 @@
责任工程师
-
+
@@ -1034,7 +1034,7 @@
标准法规部法规分析业务经理
-
+
@@ -2203,6 +2203,7 @@ export default {
dymc: '', // 模块结构单元名称
// 关联信息
dtbjh: '', // 代替标准号
+ bfbdtbzh: '',
cbbh: '', // 采标编号
cbcd: '', // 采标程度
yybj: '', // 引用标准
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index bcd2d3a5e..b1603a844 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -1168,7 +1168,7 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item))
- let wssmrName = this.form.wssmrname
+ let wssmrName = this.form.wssmrname || this.form.wssmr
this.form.wssmr = wssmrName
this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx.split(',') : ''
this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx.split(',') : ''
@@ -1261,6 +1261,7 @@ export default {
if (this.form.zrgcs.length === 0) {
this.form.zrgcs = "";
}
+ this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.menuIds = this.form.treeListId;
this.form.BBFDTBZ = this.form.bfbdtbzh
const json = JSON.stringify(this.form);
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 9b5301fa0..66878e1a4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -1127,9 +1127,10 @@ export default {
* @description: 动态表单读取
*/
getFormFieldList (item) {
+ console.log(item);
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item))
- let wssmrName = this.form.wssmrname
+ let wssmrName = this.form.wssmrname || this.form.wssmr
this.form.wssmr = wssmrName
this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx.split(',') : ''
this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx.split(',') : ''
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
index de60aaac3..c59d71d5b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
@@ -146,6 +146,7 @@
@@ -161,6 +162,7 @@
@@ -192,6 +195,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index a6f6510ba..3c294c844 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -145,6 +145,7 @@
@@ -160,6 +161,7 @@
责任部门对接人
-
@@ -49,7 +49,7 @@
标准法规部部长
-
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue
index 0e330888d..d7bfd5f2b 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue
@@ -35,7 +35,7 @@
标准化员
-
@@ -49,7 +49,7 @@
标准法规部部长
-
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
index dd91a649a..4697d037c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
@@ -283,7 +283,7 @@
标准法规部高级经理
-
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
index b8295d37f..58997d3e0 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
@@ -145,7 +145,7 @@
标准法规部部长
-
@@ -159,7 +159,7 @@
相关责任人
-
@@ -173,7 +173,7 @@
标准体系工作组组长
-
@@ -187,7 +187,7 @@
标准法规部高级经理
-
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
index 8654b9422..fd7326a58 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
@@ -84,7 +84,7 @@
标准立项单位整车/系统总工
-
@@ -103,7 +103,7 @@
海外相关人员(可选)
-
@@ -117,7 +117,7 @@
标准体系工作组组长
-
@@ -131,7 +131,7 @@
总院技术委员会覆盖领域企业标准:专委会主任/总院技术委员会未覆盖领域企业标准:总院院长或总院主管副院长
-
@@ -145,7 +145,7 @@
相关单位、工程研究总院标准法规部
-
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-2.vue
index 145735b1a..49c8cf357 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-2.vue
@@ -263,7 +263,7 @@
标准立项单位整车/系统总工
-
@@ -282,7 +282,7 @@
海外相关人员(可选)
-
@@ -296,7 +296,7 @@
标准体系工作组组长
-
@@ -310,7 +310,7 @@
标准法规部高级经理
-
@@ -324,7 +324,7 @@
相关单位、工程研究总院标准法规部
-
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
index fa1fe072f..51c8cf5c5 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
@@ -124,7 +124,7 @@
责任工程师
-
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
index 16e3def2b..e9fc3c681 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
@@ -263,7 +263,7 @@
标准立项单位整车/系统总工
-
@@ -282,7 +282,7 @@
海外相关人员(可选)
-
@@ -296,7 +296,7 @@
标准体系工作组组长
-
@@ -310,7 +310,7 @@
标准法规部高级经理
-
@@ -324,7 +324,7 @@
相关单位、工程研究总院标准法规部
-
diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue
index 68dd068cc..45e4aaba1 100644
--- a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue
@@ -129,7 +129,7 @@
署名人领导
-
@@ -143,7 +143,7 @@
标准法规部部长
-
@@ -156,7 +156,7 @@
技术管理中心主任
-
@@ -169,7 +169,7 @@
工程研究总院院长
-
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index a867741fe..7fda31441 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
@@ -90,7 +90,7 @@
标准法规部法规分析业务经理
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 9c95ed934..d2c3f09f5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -208,7 +208,7 @@
产品工程经理
-
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
index 8138cfef5..8320ea7d6 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
@@ -185,7 +185,7 @@
认证工程师
-
@@ -198,7 +198,7 @@
产品工程经理
-
diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue b/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue
index 09a5b3717..cc81f8035 100644
--- a/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue
@@ -307,7 +307,7 @@
法规认证部部长
-
+
@@ -318,7 +318,7 @@
公司副总
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step1.vue b/src/pages/processCenter/pages/creatProcess/zcch/step1.vue
index 74bceb0fb..b5f068561 100644
--- a/src/pages/processCenter/pages/creatProcess/zcch/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcch/step1.vue
@@ -307,7 +307,7 @@
法规认证部部长
-
+
@@ -318,7 +318,7 @@
公司副总
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/zchh/step1.vue b/src/pages/processCenter/pages/creatProcess/zchh/step1.vue
index fc0833f3b..330557bdb 100644
--- a/src/pages/processCenter/pages/creatProcess/zchh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zchh/step1.vue
@@ -289,7 +289,7 @@
法规认证部部长
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue
index 6c8116174..690f76424 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue
@@ -285,7 +285,7 @@
法规认证部部长
-
+
@@ -296,7 +296,7 @@
法规认证部副总监
-
+
@@ -307,7 +307,7 @@
公司副总
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step1.vue
index 6b8fb8359..812b8702b 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrh/step1.vue
@@ -285,7 +285,7 @@
法规认证部部长
-
+
@@ -296,7 +296,7 @@
法规认证部副总监
-
+
@@ -307,7 +307,7 @@
公司副总
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
index 2644b1e7f..a0854fad0 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
@@ -583,7 +583,7 @@
政策业务经理
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue
index af8dcf210..a565ee0b1 100644
--- a/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue
@@ -105,7 +105,7 @@
责任对接人
-
@@ -119,7 +119,7 @@
法规认证工程师
-
@@ -133,7 +133,7 @@
法规认证部部长
-
@@ -147,7 +147,7 @@
法规认证部副总监
-
@@ -160,7 +160,7 @@
法规认证部总监
-
diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue
index d07ed54d8..6d1cc80cb 100644
--- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue
@@ -122,7 +122,7 @@
法规认证部部长
-
@@ -136,7 +136,7 @@
法规认证部副总监
-
@@ -150,7 +150,7 @@
责任部门领导
-
@@ -164,7 +164,7 @@
责任人
-
@@ -178,7 +178,7 @@
法规与认证部总监批准
-
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index aa3f0ead1..7ec42cb0f 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -95,6 +95,7 @@
tooltip-effect="dark"
height="100%"
border
+ ref="nonListSelection"
max-height="100%"
class="table"
v-loading="myLoading.loadData"
@@ -944,6 +945,7 @@ export default {
window.open(exportURL);
this.$message.success("导出信息成功");
}
+ this.$refs.nonListSelection.clearSelection()
this.exportModelFlag = false;
this.selectedList = [];
},
diff --git a/src/router/index.js b/src/router/index.js
index 66da2af04..56078fa11 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3062,7 +3062,7 @@ const routes = [
menuId: 'ABCLRLJUQN44ENBS93CQ'
}
},
- /*{
+ {
path: '/dataCenter',
name: 'dataCenter',
component: () =>
@@ -3072,7 +3072,7 @@ const routes = [
title: '资料中心',
menuId: ''
}
- },*/
+ },
{
path: '/dataCenterDetail',
name: 'dataCenterDetail',