-
-
- 项目合规评估流程-项目
- 分发责任人审批
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ 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 ? "已完成" : "未完成" }}
-
-
-
- 流程列表加载中
-
-
-
-
+
+
+ 项目合规评估流程-项目
+ 分发责任人审批
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 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/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
index ac0b3d801..e3bdd9493 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
@@ -433,6 +433,7 @@ export default {
},
//提交事件
handleSubmit() {
+ this.isSubmit = true;
this.listForm.jgFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -447,6 +448,7 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
+ this.isSubmit = false;
}, e => {
});
},
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
index a4f75f956..605a15c74 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
@@ -43,25 +43,25 @@
填写信息
+ type="selection"
+ width="55"
+ align="center">
{{ scope.row.standName }}
+ prop="itemsNum"
+ align="center"
+ width="200"
+ label="条款号">
+ prop="itemsName"
+ width="200"
+ align="center"
+ label="条款名称">
+ prop="xcxssrqgj"
+ width="200"
+ align="center"
+ label="新车型实施日期">
{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}
+ prop="zccssrqgj"
+ width="200"
+ align="center"
+ label="在产车实施日期">
{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}
+ prop="productType"
+ align="center"
+ label="在研产品">
+ prop="complianceReasons"
+ align="center"
+ width="160"
+ label="合规">
+ align="center"
+ width="160"
+ prop="researchNonCompliance"
+ label="不合规">
+ prop="noCompliance"
+ align="center"
+ width="160"
+ label="不合规项目">
+ prop="countermeasures"
+ align="center"
+ width="160"
+ label="应对措施">
+ prop="completionTime"
+ align="center"
+ width="160"
+ label="完成时间">
- {{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
+ }}
+ align="center"
+ label="在产产品">
+ prop="zcComplianceReasons"
+ align="center"
+ width="160"
+ label="合规(具体情况)">
+ align="center"
+ width="160"
+ label="不合规">
+ prop="zcNoCompliance"
+ align="center"
+ width="160"
+ label="不合规项目">
+ prop="zcCountermeasures"
+ align="center"
+ width="160"
+ label="应对措施">
+ prop="zcCompletionTime"
+ align="center"
+ width="160"
+ label="完成时间">
- {{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
+ }}
-
-
+
+
@@ -351,14 +353,14 @@ export default {
}, res => {
this.standardData = res.data.list;
this.standardData.forEach(item => {
- if(item.attrInfoMap === null){
- this.$set(item, "ZCCSSRQ", '');
- this.$set(item, "XCXSSRQ", '');
- }else{
+ if (item.attrInfoMap === null) {
+ this.$set(item, "ZCCSSRQ", "");
+ this.$set(item, "XCXSSRQ", "");
+ } else {
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
}
- })
+ });
this.totalNo = res.data.count;
}, e => {
});
@@ -410,9 +412,9 @@ export default {
},
//驳回事件
beforeBack() {
- if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
- this.$message.warning('请填写审批意见')
- }else{
+ if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
+ this.$message.warning("请填写审批意见");
+ } else {
this.listForm.gcFlag = "2";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -433,23 +435,25 @@ export default {
},
//提交事件
handleSubmit() {
- this.listForm.gcFlag = "1";
- this.listForm.commentText = this.commentText;
- const json = JSON.stringify(this.listForm);
- this.$http.post("lawss/activiti/completeTask", {
- taskIds: this.taskIds,
- userId: this.userId,
- json: json
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message);
- this.$router.push("/processCenter");
- }
- }, e => {
- });
- },
+ this.isSubmit = true;
+ this.listForm.gcFlag = "1";
+ this.listForm.commentText = this.commentText;
+ const json = JSON.stringify(this.listForm);
+ this.$http.post("lawss/activiti/completeTask", {
+ taskIds: this.taskIds,
+ userId: this.userId,
+ json: json
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message);
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false;
+ }, e => {
+ });
+ }
},
computed: {
listNoDataText() {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index b1bbd0aed..0b3225713 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -304,11 +304,14 @@
label="能源类型">
+
+ {{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}
+
@@ -582,7 +585,7 @@ export default {
standEnName: '',
typeApplicable: '',
nylx: '',
- putTime: '',
+ ssrq: '',
zccssrqgj: '',
xcxssrqgj: '',
zrbm: '',
@@ -1245,10 +1248,10 @@ export default {
let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
- if (this.sarAccessInfoList[i].putTime === null) {
- rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
+ if (this.sarAccessInfoList[i].ssrq === null) {
+ rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
}else {
- rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
+ rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
@@ -1335,6 +1338,7 @@ export default {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'sycpx', '')
+ this.$set(item, 'ssrq', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
this.$set(item, 'zrbm', '')
@@ -1346,6 +1350,7 @@ export default {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+ this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
@@ -1382,6 +1387,7 @@ export default {
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
+ this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
@@ -1393,6 +1399,7 @@ export default {
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+ this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1427,6 +1434,7 @@ export default {
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
+ this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
@@ -1438,6 +1446,7 @@ export default {
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+ this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1526,7 +1535,6 @@ export default {
},
// 导出确定功能
exportTestItem () {
- let exportNames = this.exportName
let exportList = []
if (this.sarAccessInfoListArry.length > 0) {
exportList = this.sarAccessInfoListArry
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index bb19c111f..6ee8ff256 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -150,11 +150,17 @@
label="能源类型">
+
+
+ {{ scope.row.ssrq }}
+
+ {{ scope.row.ssrq.slice(0, 10) }}
+
{
this.$set(this.textStatusMap, item.value, item.label)
- this.$set(this.typeApplicableMap, item.value, item.label)
- this.$set(this.nylxMap, item.value, item.label)
- this.$set(this.zrbmMap, item.value, item.label)
- this.$set(this.sycpxMap, item.value, item.label)
- this.$set(this.countryAreaMap, item.value, item.label)
})
}
},
@@ -797,12 +798,6 @@ export default {
this.textStatusOptions = res.data.WBZTCLASS
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.setMap(this.textStatusOptions)
- this.setMap(this.zrbmOptions)
- this.setMap(this.categoryOptions)
- this.setMap(this.sycpxOptions)
- this.setMap(this.energyKindOptions)
- this.setMap(this.drawerCountryOptions)
- this.setMap(this.applyArcticOptions)
this.getGzzOption();
}, e => {
});
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 5a1df3685..ce62849a4 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -288,11 +288,14 @@
label="能源类型">
+
+ {{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}
+
-
+
@@ -566,7 +569,7 @@ export default {
standEnName: '',
typeApplicable: '',
nylx: '',
- putTime: '',
+ ssrq: '',
zccssrqgj: '',
xcxssrqgj: '',
zrbm: '',
@@ -1214,10 +1217,10 @@ export default {
let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
- if (this.sarAccessInfoList[i].putTime === null) {
- rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
+ if (this.sarAccessInfoList[i].ssrq === null) {
+ rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
}else {
- rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
+ rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
@@ -1302,6 +1305,7 @@ export default {
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
+ this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
@@ -1313,6 +1317,7 @@ export default {
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+ this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1349,6 +1354,7 @@ export default {
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
+ this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
@@ -1360,6 +1366,7 @@ export default {
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+ this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1395,6 +1402,7 @@ export default {
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
+ this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
@@ -1406,6 +1414,7 @@ export default {
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+ this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index f75c5adfc..31fa260f8 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -288,11 +288,14 @@
label="能源类型">
+
+ {{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}
+
-
+
@@ -580,7 +583,7 @@ export default {
standEnName: '',
typeApplicable: '',
nylx: '',
- putTime: '',
+ ssrq: '',
zccssrqgj: '',
xcxssrqgj: '',
zrbm: '',
@@ -1213,10 +1216,10 @@ export default {
let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
- if (this.sarAccessInfoList[i].putTime === null) {
- rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
+ if (this.sarAccessInfoList[i].ssrq === null) {
+ rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
}else {
- rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
+ rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
@@ -1302,6 +1305,7 @@ export default {
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
+ this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
@@ -1313,6 +1317,7 @@ export default {
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+ this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1349,6 +1354,7 @@ export default {
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
+ this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
@@ -1360,6 +1366,7 @@ export default {
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+ this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1394,6 +1401,7 @@ export default {
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
+ this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
@@ -1405,6 +1413,7 @@ export default {
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+ this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 28376ae89..c191cc4b6 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -391,8 +391,8 @@
-
-
+
+
@@ -437,7 +437,7 @@
- {{ opt.label}}
+ {{ opt.label}}
@@ -530,6 +530,23 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ opt.label}}
+
+
-
发布日期11: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }}
+
发布日期: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }}