@@ -310,7 +310,7 @@
diff --git a/src/pages/home1/components/todoList/index.vue b/src/pages/home1/components/todoList/index.vue
index 72814cde8..f7e585052 100644
--- a/src/pages/home1/components/todoList/index.vue
+++ b/src/pages/home1/components/todoList/index.vue
@@ -87,6 +87,7 @@ export default {
}
})
}
+ break
case '2':
if (row.taskInfo === '责任对接人选择责任人') {
this.$router.push({
@@ -110,9 +111,166 @@ export default {
prcType: row.prcType
}
})
+ } else if (row.taskInfo === '责任对接人审批') {
+ this.$router.push({
+ name: 'bzdyStep4',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '标准法规工程师调研汇总'){
+ this.$router.push({
+ name: 'bzdyStep5',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '责任人会签'){
+ this.$router.push({
+ name: 'bzdyStep6',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '部长+对接人审核') {
+ this.$router.push({
+ name: 'bzdyStep7',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo.indexOf('工程研究总院院长') == 0 ) {
+ this.$router.push({
+ name: 'bzdyStep9',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else {
+ this.$router.push({
+ name: 'bzdyStep8',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
}
break;
- //标准清单更新/发布流程
+ case '3':
+ if (row.taskInfo === '责任对接人选择责任人') {
+ this.$router.push({
+ name: 'bzzqyjStep2',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '责任人填写征求意见'){
+ this.$router.push({
+ name: 'bzzqyjStep3',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '责任对接人审批') {
+ this.$router.push({
+ name: 'bzzqyjStep4',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '标准法规工程师汇总填写处理意见') {
+ this.$router.push({
+ name: 'bzzqyjStep5',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '责任人会签') {
+ this.$router.push({
+ name: 'bzzqyjStep6',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '部长+对接人审核') {
+ this.$router.push({
+ name: 'bzzqyjStep7',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo.indexOf('技术委员会相关专委会主任') == 0 ) {
+ this.$router.push({
+ name: 'bzzqyjStep8',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else {
+ this.$router.push({
+ name: 'bzzqyjStep9',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }
+ break
+ //标准清单更新/发布流程
case'4' :
if (row.taskInfo === '进行会签,填写意见') {
this.$router.push({
@@ -148,8 +306,8 @@ export default {
}
})
}
- break;
- //项目合规评估流程
+ break
+ //项目合规评估流程
case '5' :
if(row.taskInfo === '标准法规部业务经理审批'){
this.$router.push({
@@ -162,8 +320,293 @@ export default {
prcType: row.prcType
}
})
+ }else if(row.taskInfo === '标准评估任务下发'){
+ this.$router.push({
+ name: 'xmpgStep3',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if(row.taskInfo === '合规性评估'){
+ this.$router.push({
+ name: 'xmpgStep4',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if(row.taskInfo === '分发责任人审核'){
+ this.$router.push({
+ name: 'xmpgStep5',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if(row.taskInfo === '汇总审核'){
+ this.$router.push({
+ name: 'xmpgStep6',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if(row.taskInfo === '标准法规部领导审核'){
+ this.$router.push({
+ name: 'xmpgStep7',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }
+ break
+ //项目评估流程-项目
+ case '6':
+ if(row.taskInfo === '标准法规部业务经理审批'){
+ this.$router.push({
+ name: 'xmpg2Step2',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if(row.taskInfo === '工程经理转办'){
+ this.$router.push({
+ name: 'xmpg2Step3',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if(row.taskInfo === '架构经理任务分发') {
+ this.$router.push({
+ name: 'xmpg2Step4',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if(row.taskInfo === '分发责任人下发') {
+ this.$router.push({
+ name: 'xmpg2Step5',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if(row.taskInfo === '合规性评估') {
+ this.$router.push({
+ name: 'xmpg2Step6',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if(row.taskInfo === '分发负责人审批') {
+ this.$router.push({
+ name: 'xmpg2Step7',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if(row.taskInfo === '架构经理审批') {
+ this.$router.push({
+ name: 'xmpg2Step8',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if(row.taskInfo === '工程经理审批') {
+ this.$router.push({
+ name: 'xmpg2Step9',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if(row.taskInfo === '标准法规部经理审批') {
+ this.$router.push({
+ name: 'xmpg2Step10',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if(row.taskInfo === '汇总审批') {
+ this.$router.push({
+ name: 'xmpg2Step11',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if(row.taskInfo === '标准法规部部长审批') {
+ this.$router.push({
+ name: 'xmpg2Step12',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }
+ break
+ //未符合项整改流程
+ case '8' :
+ if(row.taskInfo === '下发至标准法规工程师'){
+ this.$router.push({
+ name: 'wfhxzgStep2',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '确认+选择责任人') {
+ this.$router.push({
+ name: 'wfhxzgStep3',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if (row.taskInfo === '上传佐证材料填写信息') {
+ this.$router.push({
+ name: 'wfhxzgStep4',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else {
+ this.$router.push({
+ name: 'wfhxzgStep5',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }
+ break
+ case '9':
+ if (row.taskInfo === '选择执行人') {
+ this.$router.push({
+ name: 'bzjdStep2',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '填写解读分析') {
+ this.$router.push({
+ name: 'bzjdStep3',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '责任人审核') {
+ this.$router.push({
+ name: 'bzjdStep4',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '工程师审核') {
+ this.$router.push({
+ name: 'bzjdStep5',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '部长审批') {
+ this.$router.push({
+ name: 'bzjdStep6',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
}
-
}
},
},
diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue
index e4306b6ee..3f07616db 100644
--- a/src/pages/localTool/standAutoSplit/index.vue
+++ b/src/pages/localTool/standAutoSplit/index.vue
@@ -51,20 +51,12 @@
prop="showNumber"
label="标准号/政策号"
align="center">
-
- {{ scope.row.standNumSplit }}
- {{ scope.row.showNumber }}
-
-
- {{ scope.row.standNameSplit }}
- {{ scope.row.standName }}
-
-
-
- {{ scope.row.splitStatus == '0' ? '编辑中' : (scope.row.splitStatus == '1' ? '审核中' : '已完成' +
- '') }}
-
-
+
+ {{ scope.row.creationTime ? $moment(scope.row.creationTime).format('YYYY-MM-DD') : '' }}
+
失败
-
+
查看
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
删除
diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
index 7c38fa00b..a4035fe21 100644
--- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
@@ -2245,15 +2245,7 @@ export default {
})
},
jurisdictionCheck() {
- if (this.jurisdiction === '0') {
- this.$message.warning('审核中,不可操作')
- return false
- } else if (this.jurisdiction === '1') {
- this.$message.warning('编辑中,不可操作')
- return false
- } else {
- return true
- }
+ return true
}
},
props: {},
diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue
index f4ece4368..47590915f 100644
--- a/src/pages/localTool/standardRecognition/index.vue
+++ b/src/pages/localTool/standardRecognition/index.vue
@@ -291,158 +291,158 @@ export default {
label: "关联文件",
},
],
- // standRecoColumn: [
- // {
- // type: 'selection',
- // width: 60,
- // align: 'center'
- // },
- // {
- // title: '序号',
- // type: 'index',
- // align: 'center'
- // },
- // {
- // title: '资料类型',
- // key: 'fileType',
- // align: 'center',
- // render: (h, params) => {
- // let texts
- // if (params.row.fileType === '1') {
- // texts = '国内标准法规'
- // } else if (params.row.fileType === '2') {
- // texts = '海外标准法规'
- // } else if (params.row.fileType === '3') {
- // texts = '政策'
- // } else if (params.row.fileType === '4') {
- // texts = '企业标准'
- // } else {
- // texts = '标准'
- // }
- // return h('div', {
- // class: {
- // 'text-overflow-hidden': true
- // },
- // attrs: {
- // title: texts
- // }
- // }, texts)
- // }
- // },
- // {
- // title: '标准号/政策号',
- // key: 'standNumber',
- // align: 'center'
- // },
- // {
- // title: '标准名称/政策名称',
- // key: 'standName',
- // align: 'center'
- // },
- // {
- // title: '文本状态',
- // key: 'fileStatus',
- // align: 'center',
- // render: (h, params) => {
- // let texts
- // if (params.row.fileType === 'STAND_FILE') {
- // texts = '标准文本'
- // } else if (params.row.fileType === 'DRAFT_FILE') {
- // texts = '草案'
- // } else if (params.row.fileType === 'OPINION_FILE') {
- // texts = '征求意见稿'
- // } else if (params.row.fileType === 'SENT_SCREEN_FILE') {
- // texts = '送审稿'
- // } else if (params.row.fileType === 'APPROVAL_FILE') {
- // texts = '报批稿'
- // } else if (params.row.fileType === 'RELEVANCE_FILE') {
- // texts = '关联文件'
- // }
- // return h('div', {
- // class: {
- // 'text-overflow-hidden': true
- // },
- // attrs: {
- // title: texts
- // }
- // }, texts)
- // }
- // },
- // {
- // title: '转换结果',
- // key: 'resultContent',
- // align: 'center'
- // },
- // {
- // title: '消耗时间',
- // key: 'spendTime',
- // align: 'center'
- // },
- // {
- // title: '操作',
- // key: 'action',
- // width: 200,
- // align: 'center',
- // render: (h, params) => {
- // return h('div', [
- // h('Button', {
- // props: {
- // type: 'primary',
- // size: 'small'
- // },
- // style: {
- // marginRight: '5px'
- // },
- // on: {
- // click: () => {
- // this.downloadFile(params.row)
- // }
- // }
- // }, '获取文件'),
- // h('Button', {
- // props: {
- // type: 'warning',
- // size: 'small'
- // },
- // style: {
- // marginRight: '5px'
- // },
- // on: {
- // click: () => {
- // this.editOcrRecord(params.row)
- // }
- // }
- // }, '编辑'),
- // h('Dropdown', {
- // props: {
- // trigger: 'click'
- // },
- // on: {
- // 'on-click': (value) => {}
- // }
- // }, [
- // h('Button', {
- // props: {
- // type: 'primary',
- // size: 'small'
- // }
- // }, '更多'),
- // h('DropdownMenu', {
- // slot: 'list'
- // },
- // this.dropdownItems.map(function (type) {
- // return h('DropdownItem', {
- // props: {
- // name: type.val
- // }
- // }, type.val)
- // })
- // )
- // ])
- // ])
- // }
- // }
- // ],
+/* standRecoColumn: [
+ {
+ type: 'selection',
+ width: 60,
+ align: 'center'
+ },
+ {
+ title: '序号',
+ type: 'index',
+ align: 'center'
+ },
+ {
+ title: '资料类型',
+ key: 'fileType',
+ align: 'center',
+ render: (h, params) => {
+ let texts
+ if (params.row.fileType === '1') {
+ texts = '国内标准法规'
+ } else if (params.row.fileType === '2') {
+ texts = '海外标准法规'
+ } else if (params.row.fileType === '3') {
+ texts = '政策'
+ } else if (params.row.fileType === '4') {
+ texts = '企业标准'
+ } else {
+ texts = '标准'
+ }
+ return h('div', {
+ class: {
+ 'text-overflow-hidden': true
+ },
+ attrs: {
+ title: texts
+ }
+ }, texts)
+ }
+ },
+ {
+ title: '标准号/政策号',
+ key: 'standNumber',
+ align: 'center'
+ },
+ {
+ title: '标准名称/政策名称',
+ key: 'standName',
+ align: 'center'
+ },
+ {
+ title: '文本状态',
+ key: 'fileStatus',
+ align: 'center',
+ render: (h, params) => {
+ let texts
+ if (params.row.fileType === 'STAND_FILE') {
+ texts = '标准文本'
+ } else if (params.row.fileType === 'DRAFT_FILE') {
+ texts = '草案'
+ } else if (params.row.fileType === 'OPINION_FILE') {
+ texts = '征求意见稿'
+ } else if (params.row.fileType === 'SENT_SCREEN_FILE') {
+ texts = '送审稿'
+ } else if (params.row.fileType === 'APPROVAL_FILE') {
+ texts = '报批稿'
+ } else if (params.row.fileType === 'RELEVANCE_FILE') {
+ texts = '关联文件'
+ }
+ return h('div', {
+ class: {
+ 'text-overflow-hidden': true
+ },
+ attrs: {
+ title: texts
+ }
+ }, texts)
+ }
+ },
+ {
+ title: '转换结果',
+ key: 'resultContent',
+ align: 'center'
+ },
+ {
+ title: '消耗时间',
+ key: 'spendTime',
+ align: 'center'
+ },
+ {
+ title: '操作',
+ key: 'action',
+ width: 200,
+ align: 'center',
+ render: (h, params) => {
+ return h('div', [
+ h('Button', {
+ props: {
+ type: 'primary',
+ size: 'small'
+ },
+ style: {
+ marginRight: '5px'
+ },
+ on: {
+ click: () => {
+ this.downloadFile(params.row)
+ }
+ }
+ }, '获取文件'),
+ h('Button', {
+ props: {
+ type: 'warning',
+ size: 'small'
+ },
+ style: {
+ marginRight: '5px'
+ },
+ on: {
+ click: () => {
+ this.editOcrRecord(params.row)
+ }
+ }
+ }, '编辑'),
+ h('Dropdown', {
+ props: {
+ trigger: 'click'
+ },
+ on: {
+ 'on-click': (value) => {}
+ }
+ }, [
+ h('Button', {
+ props: {
+ type: 'primary',
+ size: 'small'
+ }
+ }, '更多'),
+ h('DropdownMenu', {
+ slot: 'list'
+ },
+ this.dropdownItems.map(function (type) {
+ return h('DropdownItem', {
+ props: {
+ name: type.val
+ }
+ }, type.val)
+ })
+ )
+ ])
+ ])
+ }
+ }
+ ],*/
modalType: "",
standRecoList: [],
selectTableData: [],
@@ -759,7 +759,7 @@ export default {
(res) => {
if (res.ok) {
this.standRecoList = res.data.list;
- this.total = res.data.count;
+ this.total = res.data.list.length;
}
},
e => {}
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
index 401babe87..e1c72c47a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
@@ -1273,6 +1273,15 @@ export default {
res.data = [];
}
this.dataList = res.data;
+ this.dataList.forEach(item => {
+ if (item.xcxssrqgj === null){
+ this.$set(item, "XCXSSRQ", '');
+ this.$set(item, "ZCCSSRQ", '');
+ }else{
+ this.$set(item, "XCXSSRQ", item.xcxssrqgj);
+ this.$set(item, "ZCCSSRQ", item.zccssrqgj);
+ }
+ })
this.listForm.dataList = res.data;
let formId = [];
this.dataList.map(item => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 576ce6803..09c935c54 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -125,6 +125,9 @@
prop="issueTime"
align="center"
label="发布日期">
+
+ {{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}
+
-
-
- {{ scope.row.applicationScope
- }}
-
-
-
-
- {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-D hh:mm:ss") : scope.row.updateTime
- }}
-
-
+
+ {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : "" }}
+
-
-
- {{ scope.row.applicationScope
- }}
-
-
-
- {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
- }}
-
+ {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : "" }}
{
+ if (item.xcxssrqgj === null){
+ this.$set(item, "XCXSSRQ", '');
+ this.$set(item, "ZCCSSRQ", '');
+ }else{
+ this.$set(item, "XCXSSRQ", item.xcxssrqgj);
+ this.$set(item, "ZCCSSRQ", item.zccssrqgj);
+ }
+ })
this.listForm.dataList = res.data;
let formId = [];
this.dataList.map(item => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 158a5e6b6..73e8b0114 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -638,8 +638,13 @@
-
-
+
@@ -711,6 +716,20 @@
+
+
+ {{'手动查找'}}
+
1) {
- fileList.splice(0, 1)
+ this.fileList = fileList.splice(0, 1)
}
if (response.ok) {
this.fileMadel = false
+ this.fileList = []
if(this.fileType === 'fbgbjbd'){
this.form.fbgbjbd = response.data.id;
this.form.fbgbjbdName = response.data.name;
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index d26ffa3b0..dd5c530aa 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -473,7 +473,15 @@
-
+
+
+
+
+
+
+
+
+
+ {{'手动查找'}}
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson }}
-
-
+
+
+ {{ scope.row.distributePerson }}
+
+
+
+
+
+
+
+
@@ -409,8 +409,8 @@ export default {
label: "name"
},
roleForm: {
- startUserName: this.$store.getters.userInfo.userName,
- startUser: this.$store.getters.userInfo.id,
+ prcCreateUserName: this.$store.getters.userInfo.userName,
+ prcCreateUser: this.$store.getters.userInfo.userId,
qualityEngineer: "",
certifiedEngineer: "",
qualityEngineerName: "",
@@ -446,6 +446,7 @@ export default {
ListModel: false, //选择拆分标准抽屉状态
treeData: [], // 人员数据
selectList: [], //选择标准的选择框
+ currentIndex: -1, // 当前操作行索引
isSubmit: false,
saveLoading: false,
selectedList: [], //拆分标准的选择框
@@ -521,18 +522,29 @@ export default {
this.listForm.certifiedEngineer = data[0].id;
this.listForm.certifiedEngineerName = data[0].name;
} else if (this.type === "distributePerson") {
- // this.dataList.distributePerson = data[0].id;
- // this.dataList.distributePersonName = data[0].name;
- this.listForm.dataList[this.dsadadadsada].distributePersonId = data[0].id;
- this.listForm.dataList[this.dsadadadsada].distributePerson = data[0].name;
- this.showColumn = false;
- this.$nextTick(() => {
- this.showColumn = true;
- });
+ // 如果有勾选,则视为批量选择责任人
+ if (this.selectList.length) {
+ this.dataList.forEach((item, index) => {
+ if (this.selectList.includes(item.productLine)) {
+ const newItem = JSON.parse(JSON.stringify(item))
+ newItem.distributePersonId = data[0].id
+ newItem.distributePerson = data[0].name
+ this.$set(this.dataList, index, newItem)
+ }
+ })
+ } else {
+ const newItem = JSON.parse(JSON.stringify(this.dataList[this.currentIndex]))
+ newItem.distributePersonId = data[0].id
+ newItem.distributePerson = data[0].name
+ this.$set(this.dataList, this.currentIndex, newItem)
+ this.listForm.dataList[this.currentIndex].distributePersonId = data[0].id;
+ this.listForm.dataList[this.currentIndex].distributePerson = data[0].name;
+ this.currentIndex = -1
+ }
}
this.modalshowflag = false;
},
- cancleUserInfo() {
+ cancelUserInfo() {
this.modalshowflag = false;
},
//tab发生变化
@@ -561,7 +573,9 @@ export default {
//点击添加事件
addList() {
this.standModel = true;
- this.$refs.projectTable.clearSelection();
+ this.$nextTick(() => {
+ this.$refs.projectTable.clearSelection();
+ })
},
// 点击批量删除事件
deleteList() {
@@ -652,6 +666,7 @@ export default {
this.$message.warning("请选择分发责任人");
} else {
var json = Object.assign(this.listForm, this.roleForm);
+ console.log(json);
this.$refs["listForm"].validate((valid) => {
if (valid) {
this.$refs["roleForm"].validate((valid) => {
@@ -742,7 +757,7 @@ export default {
},
choiceZRR(scope, type, title, id) {
if (scope != null) {
- this.dsadadadsada = scope.$index;
+ this.currentIndex = scope.$index;
}
this.nodeList = [];
this.nodeList.push(id);
@@ -809,6 +824,14 @@ export default {
}
},
computed: {},
+ watch: {
+ dataList: {
+ deep: true,
+ handler (val) {
+ console.log('dataList update', val)
+ }
+ }
+ },
mounted() {
this.getTree();
this.getProductData();
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index 123463a43..3acb8e4a7 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -324,37 +324,38 @@ export default {
this.listForm.breakdownList = item.breakdownList
})
},
-
-
//驳回事件
beforeBack () {
- this.listForm.passFlag = '1'
- this.handleSubmit()
+ if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+ this.$message.warning('请填写审批意见')
+ }else{
+ this.listForm.passFlag = '1'
+ this.handleSubmit()
+ }
},
//提交事件
handleSubmit() {
- this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
- this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
- this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
- this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
- this.listForm.commentText = this.commentText;
- this.listForm.standId = this.listForm.standId;
- this.listForm.breakdownList = this.listForm.breakdownList
- 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 => {
+ if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+ this.$message.warning('请填写审批意见')
+ }else{
+ 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 => {
+
+ });
+ }
- });
},
//标准表格选择框改变
selectStandChange(data) {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
index 517a91b42..4891306dc 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
@@ -46,7 +46,6 @@
row-key="standId"
height="70%"
border
- @selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
@@ -175,6 +174,12 @@
+
+
@@ -387,6 +392,7 @@ export default {
this.listForm.bzFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
+ console.log(json)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
index f560b2da8..ecd157571 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
@@ -46,7 +46,6 @@
row-key="standId"
height="70%"
border
- @selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
@@ -175,6 +174,12 @@
+
+
@@ -335,6 +340,7 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
+ console.log(res.mesg)
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
index 800bc166b..5cb4a140c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
@@ -46,7 +46,6 @@
row-key="standId"
height="70%"
border
- @selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
@@ -175,6 +174,12 @@
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
index f44146803..d00f00f00 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
@@ -312,42 +312,50 @@ export default {
},
//驳回事件
beforeBack() {
- this.listForm.BZFlag = "2";
- 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 => {
- });
+ if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+ this.$message.warning('审批意见不能为空')
+ }else{
+ this.listForm.BZFlag = "2";
+ 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 => {
+ });
+ }
},
//提交事件
handleSubmit() {
- this.listForm.BZFlag = "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 => {
- });
- }
+ if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+ this.$message.warning('审批意见不能为空')
+ }else{
+ this.listForm.BZFlag = "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 => {
+ });
+ }
+ }
},
computed: {
listNoDataText() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
index ac7e9a61e..1043c1f48 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
@@ -46,7 +46,6 @@
row-key="standId"
height="70%"
border
- @selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
@@ -175,6 +174,12 @@
+
+
@@ -335,6 +340,7 @@
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
+ console.log(res.mesg)
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
index 7b02fb449..06afbaec8 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
@@ -46,7 +46,6 @@
row-key="standId"
height="70%"
border
- @selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
@@ -175,6 +174,12 @@
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
index 5ab76b5c5..a88631f58 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
@@ -46,7 +46,6 @@
row-key="standId"
height="70%"
border
- @selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
@@ -175,6 +174,12 @@
+
+
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index 320976806..db1b4483f 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -4,7 +4,7 @@
标准法规管理流程
-
+
@@ -22,7 +22,7 @@
-
+
@@ -40,7 +40,7 @@
-
+
@@ -58,7 +58,7 @@
-
+
@@ -76,7 +76,7 @@
-
+
@@ -94,7 +94,7 @@
-
+
@@ -112,7 +112,7 @@
-
+
@@ -130,7 +130,7 @@
-
+
@@ -281,7 +281,8 @@ export default {
* @returns {boolean}
*/
bzfggllc() {
- return true
+ const idArray = ['2564bd61852551b99e0fe3d49a89b288', '2d0f99ba961c551b1d8cad8ad5223731', '7751d25f72d0a6515e4110ae41837db8', '90c7bae6308595f053c6f6f90167e493', '9adff72ab464793564c5d1de20b45620', 'a151f5e2ee44f8df81e201b8696fca31', 'f4eeb9ed48eac5686a456a5582508d9c', 'fc25b770ad3752cdec52f3bd7b35a6a1']
+ return this.checkPermission(idArray)
},
/**
* 政策管理流程
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 152f4d24b..ff4dd93eb 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -205,10 +205,18 @@ export default {
this.toProcessDetail('bzqdfbStep4',row)
}else if (prcType === '5'){
//标准项目合规评估 标准维度
- this.toProcessDetail('xmpgStep7',row)
+ if(row.taskInfo === '标准法规部部长审批'){
+ this.toProcessDetail('xmpgStep7',row)
+ }else{
+ this.toProcessDetail('xmpgStep2',row)
+ }
}else if(prcType === '6'){
//标准项目合规评估 项目维度
- this.toProcessDetail('xmpg2Step12',row)
+ if(row.taskInfo === '标准法规部领导审核'){
+ this.toProcessDetail('xmpg2Step12',row)
+ }else{
+ this.toProcessDetail('xmpg2Step2',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 b28ec60cb..3af975738 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -216,7 +216,6 @@ export default {
dealWith (row) { // 办理
this.setHandleInfo(JSON.stringify(row))
const prcType = row.prcType
- console.log(prcType);
switch(prcType) {
case '1':
if (row.taskInfo === '标准法规业务经理审批') {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index f2c52fcc1..c4cfc9b43 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -267,16 +267,16 @@ export default {
},
pageChange(page) {
this.sarSarAccessEOSearch.page = page;
- this.searchSarAccess();
+ // this.searchSarAccess();
},
pageSizeChange(pageSize) {
this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
- this.searchSarAccess();
+ // this.searchSarAccess();
},
clearSearch() {
this.sarSarAccessEOSearch.countryArea = ''
this.sarSarAccessEOSearch.detailedListName = ''
- this.searchSarAccess();
+ // this.searchSarAccess();
},
// 新增相关
openModal(row, optType) {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
index 1340cb86d..b0af84fa9 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
@@ -283,16 +283,16 @@ export default {
},
pageChange(page) {
this.sarSarAccessEOSearch.page = page;
- this.searchSarAccess();
+ // this.searchSarAccess();
},
pageSizeChange(pageSize) {
this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
- this.searchSarAccess();
+ // this.searchSarAccess();
},
clearSearch() {
this.sarSarAccessEOSearch.detailedList = ''
this.sarSarAccessEOSearch.detailedListName = ''
- this.searchSarAccess();
+ // this.searchSarAccess();
},
// 新增相关
openModal(row, optType) {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
index 9cb9ccc1f..d45f42401 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
@@ -283,17 +283,17 @@ export default {
},
pageChange(page) {
this.sarSarAccessEOSearch.page = page;
- this.searchSarAccess();
+ // this.searchSarAccess();
},
pageSizeChange(pageSize) {
this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
- this.searchSarAccess();
+ // this.searchSarAccess();
},
//清空
clearSearch() {
this.sarSarAccessEOSearch.projectName = ''
this.sarSarAccessEOSearch.detailedListName = ''
- this.searchSarAccess()
+ // this.searchSarAccess()
},
// 新增相关
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 853fa1c92..4a89f62c4 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -298,9 +298,6 @@
align="center"
width="210px"
label="标准实施日期">
-
- {{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}
-
- {{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}
+
+
+ {{ scope.row.zccssrqgj.slice(0,10) }}
- {{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}
+
+
+ {{ scope.row.xcxssrqgj.slice(0,10) }}
{
// 责任部门数据字典
this.zrbmOptions = res.data.ZRBMCLASS
@@ -889,6 +889,7 @@ export default {
methods: {
// 高级检索
selectMoreBtn () {
+ this.selectLawsStands()
this.showSelectBox = !this.showSelectBox
this.showTableFlag = false
if (!this.showSelectBox) {
@@ -985,6 +986,7 @@ export default {
},
// 点击显示隐藏数据列表 按钮事件
isShowTable () {
+ this.selectLawsStands()
this.showTableFlag = !this.showTableFlag
this.selectedAccInfoSearchList = [] // 清空
},
@@ -1171,10 +1173,10 @@ export default {
return items.id == item.id
})
if(addList > -1){
- this.$message.warning('请勿添加重复数据')
// this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
+ this.$message.warning('请勿添加重复数据')
} else{
this.sarAccessInfoList.push(item)
// this.$refs.accessTypeSelect.clearSelection()
@@ -1292,25 +1294,31 @@ 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 || this.sarAccessInfoList[i].zccssrqgj ===null || this.sarAccessInfoList[i].xcxssrqgj === null) {
- rowlist1.push(this.sarAccessInfoList[i].putTime)
- rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
- rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
+ if (this.sarAccessInfoList[i].putTime === null) {
+ rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
- rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
- rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
}
+ if (this.sarAccessInfoList[i].xcxssrqgj === null) {
+ rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
+ }else {
+ rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
+ }
+ if (this.sarAccessInfoList[i].zccssrqgj === null) {
+ rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
+ }else {
+ rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+ }
}
rowlist = rowlist.join(',')
rowlist1 = rowlist1.join(',')
rowlist2 = rowlist2.join(',')
rowlist3 = rowlist3.join(',')
let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
- sarAccessEO.inforlist = JSON.stringify(rowlist)
- sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
- sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
- sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
+ sarAccessEO.inforlist = rowlist
+ sarAccessEO.inforlist1 = rowlist1
+ sarAccessEO.inforlist2 = rowlist2
+ sarAccessEO.inforlist3 = rowlist3
sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
// sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
// 判断是否有附件
@@ -1391,8 +1399,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
- this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
- this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+ this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+ this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1433,8 +1441,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
- this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
- this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+ this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+ this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1469,8 +1477,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
- this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
- this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+ this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+ this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1571,7 +1579,7 @@ export default {
for (var accessInfo in exportList) {
accIdAndrestype.push(exportList[accessInfo].id)
}
- const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+ const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
window.open(exportURL)
this.$message.success('导出信息成功')
}
@@ -1984,7 +1992,7 @@ export default {
}, {
_this: this
}, res => {
- this.sarAccessInfoList = res.data
+ this.sarAccessInfoList = res.data.records
this.sarAccessInfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
@@ -2003,8 +2011,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
- this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
- this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+ this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+ this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
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/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index 65ae89739..a55938830 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -223,24 +223,12 @@
align="center"
width="180px"
label="适用车型">
-
-
- {{ scope.row.typeApplicable }}
-
- {{ typeApplicableMap[scope.row.typeApplicable] }}
-
-
-
- {{ scope.row.nylx }}
-
- {{ nylxMap[scope.row.nylx] }}
-
-
-
- {{ scope.row.zrbm }}
-
- {{ zrbmMap[scope.row.zrbm] }}
-
-
-
- {{ scope.row.sycpx }}
-
- {{ sycpxMap[scope.row.sycpx] }}
-
{
- this.standinfoList = res.data;
+ this.standinfoList = res.data.records;
+ this.standardFormTotal = res.data.total
this.standinfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
@@ -498,7 +479,6 @@ export default {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
- this.total = res.data.total;
}, e => {
});
@@ -517,8 +497,14 @@ export default {
},
// 重置搜索
resetSelect() {
+ this.standardForm.zrbm = ''
this.standardForm.standName = ''
this.standardForm.responseUnit = ''
+ this.standardFormList.standName = ''
+ this.standardFormList.typeApplicable = ''
+ this.standardFormList.nylx = ''
+ this.standardFormList.zrbm = ''
+ this.standardFormList.sycpx = ''
this.selectInfobyAccid()
},
exportStandard() {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 52da71b0b..76a9f2f86 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -290,9 +290,11 @@
width="210px"
align="center"
label="在产车实施日期">
-
- {{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}
-
+
+
+
+ {{ scope.row.zccssrqgj.slice(0,10) }}
+
-
- {{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}
-
+
+
+
+ {{ scope.row.xcxssrqgj.slice(0,10) }}
+
{
// 责任部门数据字典
this.zrbmOptions = res.data.ZRBMCLASS
@@ -944,11 +947,13 @@ export default {
return true
},
moreSearch () {
+ this.selectLawsStands()
this.moreSearchShow = !this.moreSearchShow
this.moreSearchBtn = !this.moreSearchBtn
},
// 点击显示隐藏数据列表 按钮事件
isShowTable () {
+ this.selectLawsStands()
this.showTableFlag = !this.showTableFlag
this.selectedAccInfoSearchList = [] // 清空
},
@@ -1137,10 +1142,10 @@ export default {
return items.id == item.id
})
if(addList > -1){
- this.$message.warning('请勿添加重复数据')
// this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
+ this.$message.warning('请勿添加重复数据')
} else{
this.sarAccessInfoList.push(item)
// this.$refs.accessTypeSelect.clearSelection()
@@ -1258,25 +1263,31 @@ 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 || this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === null) {
- rowlist1.push(this.sarAccessInfoList[i].putTime)
- rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
- rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
+ if (this.sarAccessInfoList[i].putTime === null) {
+ rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
- rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+ }
+ if (this.sarAccessInfoList[i].xcxssrqgj === null) {
+ rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
+ }else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
}
+ if (this.sarAccessInfoList[i].zccssrqgj === null) {
+ rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
+ }else {
+ rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+ }
}
rowlist = rowlist.join(',')
rowlist1 = rowlist1.join(',')
rowlist2 = rowlist2.join(',')
rowlist3 = rowlist3.join(',')
let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
- sarAccessEO.inforlist = JSON.stringify(rowlist)
- sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
- sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
- sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
+ sarAccessEO.inforlist = rowlist
+ sarAccessEO.inforlist1 = rowlist1
+ sarAccessEO.inforlist2 = rowlist2
+ sarAccessEO.inforlist3 = rowlist3
// sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
// sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
// 判断是否有附件
@@ -1315,7 +1326,6 @@ export default {
loading: 'loadData'
}, res => {
if (res.ok) {
- this.$message.success('编辑成功')
this.isNext = true
this.$router.push({
name: 'AccessStandardsAndRegulations'
@@ -1357,8 +1367,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
- this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
- this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+ this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+ this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1400,8 +1410,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
- this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
- this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+ this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+ this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1436,8 +1446,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
- this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
- this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+ this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+ this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1538,7 +1548,7 @@ export default {
for (var accessInfo in exportList) {
accIdAndrestype.push(exportList[accessInfo].id)
}
- const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+ const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
window.open(exportURL)
// window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
this.$message.success('导出信息成功')
@@ -1953,7 +1963,7 @@ export default {
}, {
_this: this
}, res => {
- this.sarAccessInfoList = res.data
+ this.sarAccessInfoList = res.data.records
this.sarAccessInfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
@@ -1972,8 +1982,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
- this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
- this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+ this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+ this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
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 4dfcc1846..1d4fe3bc6 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -291,7 +291,9 @@
align="center"
label="在产车实施日期">
- {{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}
+
+
+ {{ scope.row.zccssrqgj.slice(0,10) }}
- {{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}
+
+
+ {{ scope.row.xcxssrqgj.slice(0,10) }}
{
// 责任部门数据字典
this.zrbmOptions = res.data.ZRBMCLASS
@@ -944,11 +947,13 @@ export default {
return true
},
moreSearch () {
+ this.selectLawsStands()
this.moreSearchShow = !this.moreSearchShow
this.moreSearchBtn = !this.moreSearchBtn
},
// 点击显示隐藏数据列表 按钮事件
isShowTable () {
+ this.selectLawsStands()
this.showTableFlag = !this.showTableFlag
this.selectedAccInfoSearchList = [] // 清空
},
@@ -1136,10 +1141,10 @@ export default {
return items.id == item.id
})
if(addList > -1){
- this.$message.warning('请勿添加重复数据')
// this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
+ this.$message.warning('请勿添加重复数据')
} else{
this.sarAccessInfoList.push(item)
// this.$refs.accessTypeSelect.clearSelection()
@@ -1257,25 +1262,31 @@ 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 || this.sarAccessInfoList[i].zccssrqgj ===null || this.sarAccessInfoList[i].xcxssrqgj === null) {
- rowlist1.push(this.sarAccessInfoList[i].putTime)
- rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
- rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
+ if (this.sarAccessInfoList[i].putTime === null) {
+ rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
- rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+ }
+ if (this.sarAccessInfoList[i].xcxssrqgj === null) {
+ rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
+ }else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
}
+ if (this.sarAccessInfoList[i].zccssrqgj === null) {
+ rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
+ }else {
+ rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+ }
}
rowlist = rowlist.join(',')
rowlist1 = rowlist1.join(',')
rowlist2 = rowlist2.join(',')
rowlist3 = rowlist3.join(',')
let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
- sarAccessEO.inforlist = JSON.stringify(rowlist)
- sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
- sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
- sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
+ sarAccessEO.inforlist = rowlist
+ sarAccessEO.inforlist1 = rowlist1
+ sarAccessEO.inforlist2 = rowlist2
+ sarAccessEO.inforlist3 = rowlist3
// sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
// sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
// 判断是否有附件
@@ -1314,7 +1325,6 @@ export default {
loading: 'loadData'
}, res => {
if (res.ok) {
- this.$message.success('编辑成功')
this.isNext = true
this.$router.push({
name: 'AccessStandardsAndRegulations'
@@ -1356,8 +1366,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
- this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
- this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+ this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+ this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1399,8 +1409,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
- this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
- this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+ this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+ this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1435,8 +1445,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
- this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
- this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+ this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+ this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1537,7 +1547,7 @@ export default {
for (var accessInfo in exportList) {
accIdAndrestype.push(exportList[accessInfo].id)
}
- const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+ const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
window.open(exportURL)
// window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
this.$message.success('导出信息成功')
@@ -1954,7 +1964,7 @@ export default {
}, {
_this: this
}, res => {
- this.sarAccessInfoList = res.data
+ this.sarAccessInfoList = res.data.records
this.sarAccessInfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
@@ -1975,8 +1985,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
- this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
- this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+ this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+ this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
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/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 59bd2bd9f..b47761910 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -448,6 +448,7 @@
:class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
+ @popoverHide="popoverHideQuery"
>
@@ -1698,6 +1699,8 @@ export default {
svpps: '', // 关联模块-VPPS编码
replaceStandNum: '', // 代替标准号
replacedStandNum: '', // 被代替标准号
+ replacePartStandNum: '', // 代替标准号
+ replacedPartStandNum: '', // 被代替标准号
citeStand: '', // 引用标准
citedStand: '', // 被引用标准
synopsis: '', // 内容摘要
@@ -1744,6 +1747,8 @@ export default {
standNature: '',
replaceStandNum: '',
replacedStandNum: '',
+ replacePartStandNum: '', // 代替标准号
+ replacedPartStandNum: '', // 被代替标准号
interStandNum: '',
adoptExtent: '',
emergyKind: '',
@@ -1814,10 +1819,12 @@ export default {
standState: '',
standNature: '',
replaceStandNum: '',
+ replacePartStandNum: '',
replaceStandNumId: '',
// replaceStandNumCope: '',
replaceStandNumList: [],
replacedStandNum: '',
+ replacedPartStandNum: '',
interStandNum: '',
adoptExtent: '',
emergyKind: '',
@@ -2161,6 +2168,8 @@ export default {
synopsis: '',
// replaceStandNumCope: '',
replacedStandNum: '',
+ replacePartStandNum: '', // 代替标准号
+ replacedPartStandNum: '', // 被代替标准号
orderBy:'',
nowOrder: '',
nowOrderBy: '',
@@ -2223,6 +2232,11 @@ export default {
this.url="sarModelTree/list"
this.urlChild="sarModelTree/childByList"
},
+ popoverHideQuery(ids,attrField){
+ console.log(ids)
+ console.log("-----------------------------")
+ console.log(attrField)
+ },
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
@@ -2742,6 +2756,8 @@ export default {
this.sarStandardsSearch.applyArctic = ''
this.sarStandardsSearch.replaceStandNum = ''
this.sarStandardsSearch.replacedStandNum = ''
+ this.sarStandardsSearch.replacePartStandNum = ''
+ this.sarStandardsSearch.replacedPartStandNum = ''
this.sarStandardsSearch.synopsis = ''
this.sarStandardsSearch.category = ''
this.pageChange(1)
@@ -4035,6 +4051,8 @@ export default {
this.sarConfigStandSearch.applyArctic = ''
this.sarConfigStandSearch.replaceStandNum = ''
this.sarConfigStandSearch.replacedStandNum = ''
+ this.sarStandardsSearch.replacePartStandNum = ''
+ this.sarStandardsSearch.replacedPartStandNum = ''
this.selectConfiguraStand()
}
}
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index fe01550be..e145d5c08 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -4,7 +4,7 @@