+
@@ -58,6 +58,8 @@
+
隐藏基础信息
+
展开基础信息
调研信息
@@ -76,6 +78,7 @@
基础信息
-
+
@@ -58,6 +58,8 @@
+
隐藏基础信息
+
展开基础信息
调研信息
@@ -76,6 +78,7 @@
0) {
- this.$message.warning('请输入核心技术要求')
- } else if (num2 > 0) {
- if (this.sarType === 'INLAND') {
- this.$message.warning('请输入国内标准的差异点')
- } else {
- this.$message.warning('请输入基于上一版本差异')
+ if (this.form.itemsNum1) {
+ if (num1 > 0) {
+ this.$message.warning('请输入核心技术要求')
+ return
}
- } else if (num3 > 0) {
+ } else {
+ if (num2 > 0) {
+ if (this.sarType === 'INLAND') {
+ this.$message.warning('请输入国内标准的差异点')
+ return
+ } else {
+ this.$message.warning('请输入基于上一版本差异')
+ return
+ }
+ }
+ }
+ if (num3 > 0) {
this.$message.warning('请输入符合性要求')
} else if (num4 > 0) {
this.$message.warning('请输入新车型实施日期')
@@ -634,11 +642,15 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
- console.log(data);
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
- this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
- this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+ if (data.form) {
+ this.form.itemsName1 = data.form.itemsName1 || ''
+ this.form.itemsNum1 = data.form.itemsNum1 || ''
+ } else {
+ this.form.itemsName1 = data.itemsName1 || ''
+ this.form.itemsNum1 = data.itemsNum1 || ''
+ }
this.sarType = data.standInData || data.sarType
this.json = data
let itemList
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index 48fc0eb8f..11505e1e4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -438,8 +438,13 @@
let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
- this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
- this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+ if (data.form) {
+ this.form.itemsName1 = data.form.itemsName1 || ''
+ this.form.itemsNum1 = data.form.itemsNum1 || ''
+ } else {
+ this.form.itemsName1 = data.itemsName1 || ''
+ this.form.itemsNum1 = data.itemsNum1 || ''
+ }
this.sarType = data.standInData || data.sarType
this.json = data
this.itemList = data.itemList
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index 2c45b91da..578af61fe 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -438,8 +438,13 @@
let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
- this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
- this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+ if (data.form) {
+ this.form.itemsName1 = data.form.itemsName1 || ''
+ this.form.itemsNum1 = data.form.itemsNum1 || ''
+ } else {
+ this.form.itemsName1 = data.itemsName1 || ''
+ this.form.itemsNum1 = data.itemsNum1 || ''
+ }
this.sarType = data.standInData || data.sarType
this.json = data
this.itemList = data.itemList
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index efca7cbaf..1b7eb099a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -437,8 +437,13 @@
let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
- this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
- this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+ if (data.form) {
+ this.form.itemsName1 = data.form.itemsName1 || ''
+ this.form.itemsNum1 = data.form.itemsNum1 || ''
+ } else {
+ this.form.itemsName1 = data.itemsName1 || ''
+ this.form.itemsNum1 = data.itemsNum1 || ''
+ }
this.sarType = data.standInData || data.sarType
this.json = data
this.itemList = data.itemList
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index 1a8b1978f..703b60f80 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -370,6 +370,8 @@ export default {
},
data() {
return {
+ nodeList:[],
+ drawerTitle:'',
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index 93a09b3d9..b838b003b 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -334,6 +334,8 @@ export default {
},
data() {
return {
+ nodeList:[],
+ drawerTitle:'',
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
index 255d7c4e4..51123b86d 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
@@ -333,6 +333,8 @@ export default {
},
data() {
return {
+ nodeList:[],
+ drawerTitle:'',
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
index 66108ec28..d7f86783d 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
@@ -333,6 +333,8 @@ export default {
},
data() {
return {
+ nodeList:[],
+ drawerTitle:'',
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
index b9672a366..42ee80131 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
@@ -318,6 +318,8 @@ export default {
},
data() {
return {
+ nodeList:[],
+ drawerTitle:'',
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
index 152d68422..6129cbca3 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
@@ -316,6 +316,8 @@ export default {
},
data() {
return {
+ nodeList:[],
+ drawerTitle:'',
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
index 04a6c9f54..f5ba8d935 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
@@ -318,6 +318,8 @@ export default {
},
data() {
return {
+ nodeList:[],
+ drawerTitle:'',
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
index b2797122b..dcd9cb57d 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
@@ -271,6 +271,8 @@ export default {
},
data() {
return {
+ nodeList:[],
+ drawerTitle:'',
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 64fa1fda8..d5d1f6c90 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -444,6 +444,7 @@ export default {
},
data() {
return {
+ nodeList:[],
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
index 43d8be633..d0f81fbdf 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
@@ -318,6 +318,8 @@ export default {
},
data() {
return {
+ nodeList:[],
+ drawerTitle:'',
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
index 670eb9990..4c1f58735 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
@@ -316,6 +316,8 @@ export default {
},
data() {
return {
+ nodeList:[],
+ drawerTitle:'',
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
index d17811e59..af43983f0 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
@@ -318,6 +318,8 @@ export default {
},
data() {
return {
+ nodeList:[],
+ drawerTitle:'',
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue
index d1f2a26ed..0a6ea27a5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue
@@ -106,6 +106,19 @@
+
+
+
+ 审批人
+
+
+
+
+
+
+
@@ -412,7 +425,9 @@ export default {
startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.userId,
confirmId: "",
- confirmName: ""
+ confirmName: "",
+ approveId: "",
+ approveName: "",
},
//表单验证
formRules: {
@@ -579,6 +594,9 @@ export default {
if (this.type === "confirmId") {
this.roleForm.confirmId = data[0].id;
this.roleForm.confirmName = data[0].name;
+ }else if(this.type === "approveId"){
+ this.roleForm.approveId = data[0].id;
+ this.roleForm.approveName = data[0].name;
}
this.modalshowflag = false;
},
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue
similarity index 94%
rename from src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue
rename to src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue
index 2b0c6bf74..3d84e860f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue
@@ -2,7 +2,7 @@
项目清单确认流程
- 确认人确认
+ 法规部经理审批
@@ -412,7 +425,9 @@ export default {
startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.userId,
confirmId: "",
- confirmName: ""
+ confirmName: "",
+ approveId: "",
+ approveName:"",
},
//表单验证
formRules: {
@@ -430,6 +445,9 @@ export default {
roleFormRules: {
confirmName: [
{ required: true, message: "请选择确认人", trigger: "change" }
+ ],
+ approveName: [
+ { required: true, message: "请选择审批人", trigger: "change" }
]
}
};
@@ -577,6 +595,9 @@ export default {
if (this.type === "confirmId") {
this.roleForm.confirmId = data[0].id;
this.roleForm.confirmName = data[0].name;
+ }else if(this.type === "approveId"){
+ this.roleForm.approveId = data[0].id;
+ this.roleForm.approveName = data[0].name;
}
this.modalshowflag = false;
},
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
index 57afe1297..6917d8890 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
@@ -340,7 +340,7 @@
@@ -349,7 +349,7 @@
@@ -423,7 +423,9 @@ export default {
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
+ drawerTitle:'',
active: "1",
+ nodeList: [],
loading: false,
// 当前流程类型(1待办/2已办)
processType: 1,
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
new file mode 100644
index 000000000..893d865fc
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
@@ -0,0 +1,671 @@
+
+
+
+ 项目清单确认流程
+ 法规部经理审批
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 40c5d9a12..b4ed07c11 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -257,7 +257,7 @@ export default {
this.toProcessDetail('bzzqyjStep1-9',row)
}else if(prcType === '10'){
//项目清单确认
- this.toProcessDetail('xmqdqrStep1-2',row)
+ this.toProcessDetail('xmqdqrStep1-3',row)
}
} else {
this.$message.warning('当前流程未全部办理完成,无法查看')
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index a3a901222..3d2d0dde1 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -856,6 +856,17 @@ export default {
prcType: row.prcType
}
})
+ } else if(row.taskInfo === '标准法规部经理审批'){
+ this.$router.push({
+ name: 'xmqdqrStep3',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
}
break
}
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index bac781c97..3e3113724 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -182,9 +182,10 @@
- {{ scope.row.standSortShow }} {{
scope.row.standNumber
}}-{{ scope.row.standYear }}
@@ -200,9 +201,10 @@
- {{ scope.row.standName }}
+ {{ scope.row.standName }}
{{ scope.row.standName }}
@@ -212,18 +214,18 @@
width="110px"
label="发布日期">
- {{ formatIssueDate(scope.row.issueTime) }}
+ {{ formatIssueDate(scope.row.issueTime) }}
{{ formatIssueDate(scope.row.issueTime) }}
- {{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}
+ {{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}
{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}
@@ -235,7 +237,7 @@
width="150px"
label="新车型实施日期">
- {{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}
+ {{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}
{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}
@@ -245,7 +247,7 @@
width="150px"
label="在产车实施日期">
- {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}
+ {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}
{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}
@@ -260,7 +262,7 @@
- {{ textStatusMap[scope.row.textStatus] }}
+ {{ textStatusMap[scope.row.textStatus] }}
{{ textStatusMap[scope.row.textStatus] }}
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 3f5a410f6..bf92cb8d4 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -297,7 +297,7 @@
>
- {{ scope.row.standCode }}
+ {{ scope.row.standCode }}
{{ scope.row.standCode }}
{{ scope.row.standCode }}
@@ -308,7 +308,7 @@
label="中文名称"
>
- {{ scope.row.standName }}
+ {{ scope.row.standName }}
{{ scope.row.standName }}
{{ scope.row.standName }}
@@ -319,7 +319,7 @@
label="英文名称"
>
- {{ scope.row.standEnName }}
+ {{ scope.row.standEnName }}
{{ scope.row.standEnName }}
{{ scope.row.standEnName }}
@@ -331,7 +331,7 @@
width="110"
>
- {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
+ {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
@@ -343,7 +343,7 @@
width="110"
>
- {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
+ {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
@@ -357,7 +357,7 @@
>
-
+
{{scope.row.standStatusShow}}
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index d8f118bf8..5d77bdf93 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -169,6 +169,7 @@
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
@@ -178,6 +179,7 @@
{{ scope.row.standName }}
@@ -186,7 +188,7 @@
@@ -199,7 +201,7 @@
@@ -210,7 +212,7 @@
{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}
diff --git a/src/router/index.js b/src/router/index.js
index 40b714995..946409ed6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -557,9 +557,18 @@ const routes = [
}
},
{
- path: '/xmqdqrStep1-2',
- name: 'xmqdqrStep1-2',
- component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue'),
+ path: '/xmqdqrStep1-3',
+ name: 'xmqdqrStep1-3',
+ component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue'),
+ meta: {
+ requireAuth: true,
+ title: '项目清单确认流程'
+ }
+ },
+ {
+ path: '/xmqdqrStep3',
+ name: 'xmqdqrStep3',
+ component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue'),
meta: {
requireAuth: true,
title: '项目清单确认流程'