diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index daadb9bce..b5526366e 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -14,12 +14,12 @@ size="mini" type="primary" class="common-button-primary" - v-btn-permission="'bcf0d05723689ced8f49fae7794ff0db'" + v-btn-permission="''" @click="searchStandList">查询 清空 @@ -28,10 +28,10 @@
- 拆分 - 上传 - 导入拆分结果 - 删除 + 拆分 + 上传 + 导入拆分结果 + 删除
@@ -109,24 +109,24 @@ - 查看 + 查看 收藏 取消收藏 - 分享 + 分享 - 删除 + 删除 @@ -1166,7 +1166,7 @@ export default { splitEo.fileType = this.selectedSplitStandList[0].standFileClassify splitEo.attId = this.selectedSplitStandList[0].attId splitEo.fileName = this.selectedSplitStandList[0].fileName - this.$http.get('lawss/sarFileSplitInfo/fileSplit', splitEo, { + this.$http.postData('lawss/sarFileSplitInfo/fileSplit', splitEo, { _this: this }, res => { if (res.ok) { @@ -1312,7 +1312,7 @@ export default { this.percent = 0 this.speedModal = true this.speedProgress() - this.$http.get('lawss/sarFileSplitInfo/fileSplit', this.uploadFilesplitEo, { + this.$http.postData('lawss/sarFileSplitInfo/fileSplit', this.uploadFilesplitEo, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue index e10c7dce3..628d45181 100644 --- a/src/pages/localTool/standardRecognition/index.vue +++ b/src/pages/localTool/standardRecognition/index.vue @@ -4,10 +4,10 @@
- 上传 - 删除
@@ -106,16 +106,16 @@ - 获取文件 - 编辑 - 删除 - 在线编辑 @@ -508,7 +508,7 @@ export default { if (res.data.standName != null && res.data.standName !== "") { this.uploadFilesdfEo.standName = res.data.standName; } - // this.uploadFilesdfEo.fileName = res.data.name + this.uploadFilesdfEo.fileName = res.data.name // this.getTableData() this.defaultFileList.push(file); this.$message({ diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 9d24c6e3c..29e7bb6c0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -105,85 +105,100 @@ align="center"> + + + + prop="issueTime" + sortable + label="发布日期"> + prop="xcxssrq" + sortable + label="新车型实施日期"> + show-overflow-tooltip + prop="zccssrq" + sortable + label="在产车实施日期"> - - - - - - + show-overflow-tooltip + prop="textStatus" + width="120px" + label="文本状态">
-
+
- - -

标准/政策法规工程师

-
- -
- - - - -

责任人

-
- - - -
- - - - -

标准/政策法规工程师

-
- -
- - - - -

业务经理

-
- -
- - + + + + +

标准/政策法规工程师

+
+ + +
+ + + + + + +

填写会签意见

+
+ + + +
+ + + + + + +

标准/政策法规工程师

+
+ + +
+ + + + + + +

业务经理

+
+ + +
+ + + +
@@ -521,6 +536,33 @@ @submit="handleSubmit" > + + + + + +
@@ -529,6 +571,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; import { saveTaskFirst } from "api/process"; +import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis"; export default { name: "bzqdfbStep1", @@ -539,63 +582,39 @@ export default { }, data() { return { - dataList: [ - { - standNumber: 123, - cnName: "中国", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl119a61sgmzk47d918pw5", - applyRegion: null, - textState: "已发布" - }, - { - standNumber: 123, - cnName: "日本", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk417d98pw15", - applyRegion: null, - textState: "已发布" - }, { - standNumber: 123, - cnName: "韩国", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk47d1918pw5", - applyRegion: null, - textState: "已发布" - }, { - standNumber: 123, - cnName: "没过", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk47d2331918pw5", - applyRegion: null, - textState: "已发布" - }, - { - standNumber: 123, - cnName: "德国", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk472344dt1918pw5", - applyRegion: null, - textState: "已发布" - } - - - ], //清单里的标准数据 + modalshowflag: false, // drawer开关 + drawerTitle: '', //drawer标题 + nodeList: [], + defaultProps: { + children: 'children', + label: 'name' + }, + roleForm: { + startUserName: this.$store.getters.userInfo.account, + startUser: this.$store.getters.userInfo.id, + dockUser: '', + responUserList: '', + ministerUser: '', + directorUser: '', + presidentUser: '', + dockUserName: '', + responUserListName: '', + ministerUserName: '', + directorUserName: '', + presidentUserName: '' + }, + roleFormRules: { + dockUserName: [ + { required: true, message: '请选择会签责任人', trigger: 'blur' }, + ], + ministerUserName: [ + { required: true, message: '请选择修订责任人', trigger: 'blur' }, + ], + directorUserName: [ + { required: true, message: '请选择审批责任人', trigger: 'blur' }, + ], + }, + dataList: [],//清单里的标准数据 sarAccessListDatas: [], //国家地区清单表格 uploadFileListPath: 'api/att/attFile/upload', // 上传的地址 fileInfoList: [], // 上传的附件 @@ -621,16 +640,15 @@ export default { descriptionList: "", //清单说明 enclosure: "", //附件 standId: "", //选择的清单的id - signFlag: "1", //是否会签 1为会签 2为不会签W + signFlag: "1", //是否会签 1为会签 2为不会签 + inforlist:"" , //用来存放标准列表的标准id dataList: [{ - standNumber: "", //标准号 - cnName: "", //中文名称 - enName: "", //英文名称 - isSubTime: "", //发布日期 - newCarTime: "", //新车型实施日期 - oldCarTime: "", //在产车实施日期 - applyCar: "", //适用车型 - textState: "", //文本状态 + code: "", //标准号 + standName: "", //标准名称 + issueTime: "", //发布日期 + xcxssrq: "", //新车型实施日期 + zccssrq: "", //在产车实施日期 + textStatus: "", //文本状态 id: "" }] }, @@ -645,6 +663,25 @@ export default { }; }, methods: { + saveUserInfo () { + if (this.type === 'dockUser') { + this.roleForm.dockUser = this.roleRow.id + this.roleForm.dockUserName = this.roleRow.name + } else if (this.type === 'ministerUser') { + this.roleForm.ministerUser = this.roleRow.id + this.roleForm.ministerUserName = this.roleRow.name + } else if (this.type === 'directorUser') { + this.roleForm.directorUser = this.roleRow.id + this.roleForm.directorUserName = this.roleRow.name + } else if (this.type === 'presidentUser') { + this.roleForm.presidentUser = this.roleRow.id + this.roleForm.presidentUserName = this.roleRow.name + } + this.modalshowflag = false + }, + cancleUserInfo () { + this.modalshowflag = false + }, //tab发生变化 handleTabs(name) { this.active = name; @@ -652,6 +689,15 @@ export default { choiceShow() { this.ListModel = true; }, + drawerCheck (data) { + // var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); + // if(getlist.length == 1) { + // this.roleRow = getlist[0] + // }else { + // this.$refs.tree.setCheckedKeys([data.id]); + // this.roleRow = this.$refs.tree.getCheckedNodes()[0] + // } + }, //判断当前是否会签 selectSign (type) { if(type ==='1'){ @@ -660,21 +706,9 @@ export default { this.listForm.signFlag = 2 } }, - //判断当前选中的是哪个清单 + // //判断当前选中的是哪个清单 selectionList(type) { - if (type === "country") { - this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", { - page: this.page, - pageSize: this.pageSize, - sortKey: 1 - }, { - _this: this - }, res => { - this.sarAccessListDatas = res.data.records; - this.total = res.data.total; - }, e => { - }); - } else if (type === "project") { + if (type === "project") { this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", { page: this.page, pageSize: this.pageSize, @@ -686,7 +720,7 @@ export default { this.total = res.data.total; }, e => { }); - } else { + } else if (type === "other") { this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", { page: this.page, pageSize: this.pageSize, @@ -698,6 +732,18 @@ export default { this.total = res.data.total; }, e => { }); + } else { + this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", { + page: this.page, + pageSize: this.pageSize, + sortKey: 1 + }, { + _this: this + }, res => { + this.sarAccessListDatas = res.data.records; + this.total = res.data.total; + }, e => { + }); } }, //点击新增事件 @@ -705,6 +751,7 @@ export default { this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", { _this: this }, res => { + console.log(res); this.standardData = res.data.list; }, e => { }); @@ -770,11 +817,11 @@ export default { json.prcCreateUserName = this.$store.getters.userInfo.account json.standName = this.listForm.listName json.standId = this.listForm.standId - this.$http.get('lawss/activiti/startProcess' , {type: '3'}, { + this.$http.get('lawss/activiti/startProcess' , {type: '4'}, { _this: this }, res => { if(res.ok){ - this.$http.postData('lawss/activiti/completeTask',{ + this.$http.post('lawss/activiti/completeTask',{ taskIds: res.data, userId : this.$store.getters.userInfo.userId, json: JSON.stringify(json) @@ -829,6 +876,21 @@ export default { this.listForm.descriptionList = bringData[0].remark; this.listForm.enclosure = bringData[0].detailedListName; this.ListModel = false; + this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: bringData[0].id}, { + _this: this + }, res => { + this.dataList = res.data + this.listForm.dataList = res.data + let formId = "" + this.dataList.forEach(item => { + if(this.dataList.length !== 0){ + formId += ',' + formId += item.id + } + }) + this.listForm.inforlist = formId + }, e => { + }) } else if (this.selectedList.length > 1) { this.$message.warning("只能选择一条数据进行带入"); } else { @@ -850,7 +912,18 @@ export default { } }, selectThree() { - + }, + choiceZRR (type, title, id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.drawerTitle = title + this.modalshowflag = true + }, + getTree () { + // this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { + // this.treeData = res.data + // }) }, pageChange(page) { this.page = page; @@ -863,12 +936,12 @@ export default { }, computed: {}, mounted() { - this.selectionList(); + this.selectionList() this.selectSign(); + this.getTree() for (let i = 0; i < this.dataList.length; i++) { this.standMap.set(this.dataList[i].id, this.dataList[i]); } - //从数据查询下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", "", { _this: this diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index e531094c0..1ed5b4e83 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -7,7 +7,7 @@
基础信息
-
审批历史
+
审批历史
@@ -75,44 +75,42 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> + + + + prop="issueTime" + sortable + label="发布日期"> + prop="xcxssrq" + sortable + label="新车型实施日期"> + show-overflow-tooltip + prop="zccssrq" + sortable + label="在产车实施日期"> - - - - - - + show-overflow-tooltip + prop="textStatus" + width="120px" + label="文本状态">
@@ -172,6 +170,75 @@
+
+
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中 +
+
{ + this.detailData = res + }, e => {}) + }, //tab发生变化 handleTabs(name) { this.active = name; @@ -324,10 +352,13 @@ export default { */ getFormFieldList (item) { this.$nextTick(() => { + console.log(item); this.listForm = JSON.parse(JSON.stringify(item)) this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName this.listForm['id'] = item.id + this.listForm.dataList = item.dataList + this.dataList = item.dataList }) }, @@ -347,7 +378,7 @@ export default { this.listForm.standId = this.listForm.standId; this.listForm.signFlag = ""; const json = JSON.stringify(this.listForm); - this.$http.postData('lawss/activiti/completeTask', { + this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, json: json, @@ -358,6 +389,8 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + }, e => { + }); }, //选择标准取消事件 @@ -383,8 +416,13 @@ export default { this.searchData(); } }, - computed: {}, + computed: { + listNoDataText () { + return this.processType === 1 ? '暂无待办流程' : '暂无已办流程' + }, + }, mounted() { + this.processTable() this.getData() // console.log(this.$store.getters.getHandleInfo); } diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 75fc4240b..819a98232 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -7,7 +7,7 @@
基础信息
-
审批历史
+
审批历史
@@ -52,10 +52,25 @@ > + + + 点击上传 + + @@ -84,86 +99,113 @@ align="center"> + + + + prop="issueTime" + sortable + label="发布日期"> + prop="xcxssrq" + sortable + label="新车型实施日期"> + show-overflow-tooltip + prop="zccssrq" + sortable + label="在产车实施日期"> - - - - - - + show-overflow-tooltip + prop="textStatus" + width="120px" + label="文本状态">
-
-
- - - -

标准/政策法规工程师

-
- -
- - - - -

责任人

-
- - - -
- - - - -

标准/政策法规工程师

-
- -
- - - - -

业务经理

-
- -
- - - +
+
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中
@@ -258,66 +300,16 @@ export default { }, data() { return { + detailData: [], + // 当前流程类型(1待办/2已办) + processType: 1, + loading: false, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, - dataList: [ - { - standNumber: 123, - cnName: "中国", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl119a61sgmzk47d918pw5", - applyRegion: null, - textState: "已发布" - }, - { - standNumber: 123, - cnName: "日本", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk417d98pw15", - applyRegion: null, - textState: "已发布" - }, { - standNumber: 123, - cnName: "韩国", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk47d1918pw5", - applyRegion: null, - textState: "已发布" - }, { - standNumber: 123, - cnName: "没过", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk47d2331918pw5", - applyRegion: null, - textState: "已发布" - }, - { - standNumber: 123, - cnName: "德国", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk472344dt1918pw5", - applyRegion: null, - textState: "已发布" - } - - - ], //清单里的标准数据 + uploadFileListPath: 'api/att/attFile/upload', // 上传的地址 + fileInfoList: [], // 上传的附件 + dataList: [],//清单里的标准数据 standardData: [], //添加标准数据 standModel: false, // 选择标准抽屉状态 active: "1", @@ -360,6 +352,18 @@ export default { }; }, methods: { + processTable () { + this.$http.get('lawss/activiti/get_list_by_instance', { + prcNum: this.$route.query.prcNum, + sortWord: this.shunxu ? this.paixu : '', + shunxu: this.shunxu + }, { + loading: 'loading', + _this: this + }, res => { + this.detailData = res + }, e => {}) + }, //tab发生变化 handleTabs(name) { this.active = name; @@ -400,6 +404,25 @@ export default { }).catch(() => { }); } + }, + // 删除上传的文件 + delFileInfo (file, fileList) { + // this.fileInfoList = fileList + }, + // 上传文件成功回调 + uploadBackSuccess (res, file, fileList) { + // if (res.ok) { + // this.fileInfoList = fileList + // this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id + // this.$message.success('上传成功') + // } else { + // this.$message.error(res.message) + // fileList.pop() + // } + }, + //上传之前的钩子 + beforeUpload () { + }, getData() { return new Promise((resolve, reject) => { @@ -424,6 +447,8 @@ export default { this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName this.listForm['id'] = item.id + this.listForm.dataList = item.dataList + this.dataList = item.dataList }) }, //保存事件 @@ -448,7 +473,7 @@ export default { this.listForm.approvalOpinion = ""; this.listForm.standId = this.listForm.standId; const json = JSON.stringify(this.listForm); - this.$http.postData('lawss/activiti/completeTask', { + this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, json: json, @@ -480,9 +505,14 @@ export default { this.searchData(); } }, - computed: {}, + computed: { + listNoDataText () { + return this.processType === 1 ? '暂无待办流程' : '暂无已办流程' + } + }, mounted() { this.getData() + this.processTable() }, }; diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 4ef8b6459..c8d40e32f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -7,7 +7,7 @@
基础信息
-
审批历史
+
审批历史
@@ -31,6 +31,7 @@ @@ -72,44 +75,42 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> + + + + prop="issueTime" + sortable + label="发布日期"> + prop="xcxssrq" + sortable + label="新车型实施日期"> + show-overflow-tooltip + prop="zccssrq" + sortable + label="在产车实施日期"> - - - - - - + show-overflow-tooltip + prop="textStatus" + width="120px" + label="文本状态">
@@ -129,44 +130,73 @@
-
-
- - - -

标准/政策法规工程师

-
- -
- - - - -

责任人

-
- - - -
- - - - -

标准/政策法规工程师

-
- -
- - - - -

业务经理

-
- -
- - - +
+
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中
@@ -198,63 +228,11 @@ export default { }, data() { return { - dataList: [ - { - standNumber: 123, - cnName: "中国", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl119a61sgmzk47d918pw5", - applyRegion: null, - textState: "已发布" - }, - { - standNumber: 123, - cnName: "日本", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk417d98pw15", - applyRegion: null, - textState: "已发布" - }, { - standNumber: 123, - cnName: "韩国", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk47d1918pw5", - applyRegion: null, - textState: "已发布" - }, { - standNumber: 123, - cnName: "没过", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk47d2331918pw5", - applyRegion: null, - textState: "已发布" - }, - { - standNumber: 123, - cnName: "德国", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk472344dt1918pw5", - applyRegion: null, - textState: "已发布" - } - - - ], //清单里的标准数据 + detailData: [], + // 当前流程类型(1待办/2已办) + processType: 1, + loading: false, + dataList: [],//清单里的标准数据 approvalOpinion: '', // 通过0/驳回1 active: "1", listType: "country", //选择的清单类型 @@ -303,6 +281,18 @@ export default { }; }, methods: { + processTable () { + this.$http.get('lawss/activiti/get_list_by_instance', { + prcNum: this.$route.query.prcNum, + sortWord: this.shunxu ? this.paixu : '', + shunxu: this.shunxu + }, { + loading: 'loading', + _this: this + }, res => { + this.detailData = res + }, e => {}) + }, //tab发生变化 handleTabs(name) { this.active = name; @@ -337,6 +327,8 @@ export default { this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName this.listForm['id'] = item.id + this.listForm.dataList = item.dataList + this.dataList = item.dataList }) }, //驳回事件 @@ -355,7 +347,7 @@ export default { this.listForm.signflag = ""; this.listForm.standId = this.listForm.standId; const json = JSON.stringify(this.listForm); - this.$http.postData('lawss/activiti/completeTask', { + this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, json: json, @@ -391,9 +383,14 @@ export default { this.searchData(); } }, - computed: {}, + computed: { + listNoDataText () { + return this.processType === 1 ? '暂无待办流程' : '暂无已办流程' + } + }, mounted() { this.getData() + this.processTable() }, }; diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue new file mode 100644 index 000000000..1f8c0c162 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -0,0 +1,525 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue new file mode 100644 index 000000000..c0fef385a --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -0,0 +1,523 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue new file mode 100644 index 000000000..ea7b9bd79 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -0,0 +1,452 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue new file mode 100644 index 000000000..c95f7e89c --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -0,0 +1,452 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue new file mode 100644 index 000000000..6b4411df1 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -0,0 +1,454 @@ + + + + + + diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 8f32c18a9..c7cc78e25 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -10,6 +10,7 @@
标准需求(翻译)申请流程
标准发放申请流程
标准清单发布/更新流程
+
未符合项整改流程
@@ -84,6 +85,10 @@ export default { }) break case '7': + //未符合项整改流程 + this.$router.push({ + name:'wfhxzgStep1' + }) break case '8': break diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index e29bc1cb6..827f9db53 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -277,7 +277,8 @@ export default { }) } break; - case'3' : { + //标准清单更新/发布流程 + case'4' : if (row.taskInfo === '进行会签，填写意见') { this.$router.push({ name: 'bzqdfbStep2', @@ -312,8 +313,22 @@ export default { } }) } + break; + //项目合规评估流程 + case '5' : + if(row.taskInfo === ''){ + this.$router.push({ + name: '', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } - break; + } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index 84d696c8e..67eb09919 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -31,7 +31,7 @@ export default { data() { return { list: [], - tabValue: "", + tabValue: "listProject", menuName: ["国家/地区清单", "项目类清单", "重点标准跟踪清单", "其他清单"] }; }, diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index c77d00327..962916e6d 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -102,8 +102,9 @@ label="清单状态" align="center"> - - - - - - - + + - - @@ -270,7 +253,7 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="accessSarTypeSelect" - ref="selection" + ref="searchTable" > 导出 删除
- - - - + label="发布日期"> + label="新车型实施日期"> - - + prop="zccssrq" + sortable + label="在产车实施日期"> @@ -487,25 +446,27 @@ export default { CustomRoleTree }, data () { - let validatePass = (rule, value, callback) => { - let list = [] - if (this.sarAccessInfoListADMIN.length > 0) { - for (let a = 0; a < this.sarAccessInfoListADMIN.length;a++) { - list.push(this.sarAccessInfoListADMIN[a].code) - } - } - if (this.sarAccessInfoList.length > 0) { - for (let b = 0; b < this.sarAccessInfoList.length;b++) { - list.push(this.sarAccessInfoList[b].code) - } - } - for (let c = 0; c < list.length; c++) { - if (value === list[c]) { - callback(new Error('此标准号已存在')) - } - } - } + // let validatePass = (rule, value, callback) => { + // let list = [] + // //sarAccessInfoListADMIN 可能不存在 + // if (this.sarAccessInfoListADMIN.length > 0) { + // for (let a = 0; a < this.sarAccessInfoListADMIN.length;a++) { + // list.push(this.sarAccessInfoListADMIN[a].code) + // } + // } + // if (this.sarAccessInfoList.length > 0) { + // for (let b = 0; b < this.sarAccessInfoList.length;b++) { + // list.push(this.sarAccessInfoList[b].code) + // } + // } + // for (let c = 0; c < list.length; c++) { + // if (value === list[c]) { + // callback(new Error('此标准号已存在')) + // } + // } + // } return { + selectSearch : [], // 新增、编辑 基础信息字段 sarAccessEO: { id: '', @@ -563,7 +524,6 @@ export default { applyArctic: '', // 能源种类 askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 - accessSarType: 'SKILL', // 清单类型 page: 1, pageSize: this.$store.getters.userInfo.configContent, validFlag: 0, @@ -575,9 +535,7 @@ export default { importmodalFlag: false, // 导入model 状态 searching: false, sarAccessInfoList: [], // 清单条目 技术要求table 数据 - sarAccessInfoListADMIN: [], // 清单条目 行政要求table数据 sarAccessInfoListArry: [], // 清单条目 table选中数据 - // sarAccessInfoListADMINArry: [], // 清单条目 行政要求table选中数据 moreSearchShow: false, // 多属性搜索 状态 loadData: false, // 提交按钮loading效果 drawerPage: 1, // 数据搜索table页码 @@ -640,56 +598,6 @@ export default { {required: true, type: 'string', message: '英文名称不能为空', trigger: 'blur'}, {type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change'} ], - // synopsis: [ - // {required: true, type: 'string', message: '法规说明不能为空', trigger: 'blur'}, - // {type: 'string', max: 1000, message: '法规说明不能超过1000个字符', trigger: 'change'} - // ], - // newPutTime: [ - // {required: true, message: '新车型实施日期不能为空', trigger: 'change'} - // ], - // prodPutTime: [ - // {required: true, message: '在产车实施日期不能为空', trigger: 'change'} - // ], - // eopPutTime: [ - // {required: true, message: 'eop实施日期不能为空', trigger: 'change'} - // ], - // newPutTextTime: [ - // {required: true, message: '新车型实施日期（项目）不能为空', trigger: 'change'} - // ], - // prodPutTextTime: [ - // {required: true, message: '在产车实施日期（项目）不能为空', trigger: 'change'} - // ], - // eopPutTextTime: [ - // {required: true, message: 'eop实施日期（项目）不能为空', trigger: 'change'} - // ], - performInfo: [ - // {required: true, type: 'string', message: '实施说明不能为空', trigger: 'blur'}, - {type: 'string', max: 1000, message: '实施说明不能超过1000个字符', trigger: 'change'} - ], - // ZRBM: [ - // {required: true, type: 'string', message: '责任部门不能为空', trigger: 'change'} - // ], - // XGBM: [ - // {required: true, message: '相关部门不能为空', trigger: 'change'} - // ], - // FO: [ - // {required: true, type: 'string', message: 'FO不能为空', trigger: 'change'} - // ], - // proEssessUserId: [ - // {required: true, type: 'string', message: '项目评估角色不能为空', trigger: 'change'} - // ], - askNature: [ - {required: true, message: '监管类型不能为空', trigger: 'change'} - ], - // applyArctic: [ - // {required: true, message: '适用车辆类型不能为空', trigger: 'change'} - // ], - accessType: [ - {required: true, type: 'string', message: '入库模块不能为空', trigger: 'change'} - ], - authObjId: [ - {required: true, type: 'string', message: '认证对象不能为空', trigger: 'change'} - ] }, // 认证对象下拉数据 authObjOptions: [ @@ -724,10 +632,6 @@ export default { addEditTitle: '新增', isDisabled: false, isListType: false, // 清单类型 - listTypeOptions: [ - {value: 'SKILL', label: '技术要求清单'}, - {value: 'ADMIN', label: '行政要求清单'} - ], reloadAddForm: false, formFieldList: [], orgData: [], @@ -932,7 +836,6 @@ export default { this.sarAccessInfoSearch.advanceSearchVOStr = '' this.sarAccessInfoSearch.applyArctic = '' // 能源种类 this.sarAccessInfoSearch.keywords = '' // 关键字 - this.sarAccessInfoSearch.accessSarType = 'SKILL' // 清单类型 this.sarAccessInfoSearch.askType = '' // 监管类型 this.sarAccessInfoSearch.detailedListName = '' // 清单名称 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 @@ -1098,168 +1001,36 @@ export default { * 判断是否添加重复数据 */ addSarAccess () { - if (this.isListType) { - if (this.accessSarTypeList.length > 0) { - let ids = [] - this.accessSarTypeList.map(item => { - ids.push(item.id) - }) - // 根据准入id查询标准法规详情 - this.$http.get('lawss/sarSarAccessInfo/selectSarAccessInfoByAccessId', { - accessId: ids.join(',') - }, { - _this: this - }, res => { - let SKLLLArr = [...this.sarAccessInfoList] - let ADMINArr = [...this.sarAccessInfoListADMIN] - // 循环追加数据 - res.data.SKILL.map(item => { - SKLLLArr.push(item) - }) - res.data.ADMIN.map(item => { - ADMINArr.push(item) - }) - if (this.sarAccessInfoSearch.accessSarType === 'SKILL') { - // 数组去重 - let hash = {} - SKLLLArr = SKLLLArr.reduce((preVal, curVal) => { - hash[curVal.resId] ? '' : hash[curVal.resId] = true && preVal.push(curVal) - return preVal - }, []) - this.sarAccessInfoList = SKLLLArr - } else { - // 数组去重 - let hash = {} - ADMINArr = ADMINArr.reduce((preVal, curVal) => { - hash[curVal.resId] ? '' : hash[curVal.resId] = true && preVal.push(curVal) - return preVal - }, []) - this.sarAccessInfoListADMIN = ADMINArr - } - this.$refs.selection.clearSelection() - }, e => { - }) - } else { - this.$message.error('请选中需要添加到 清单条目 的数据') - } - } else { + //判断是否是清单类型 if (this.selectedAccInfoSearchList.length > 0) { // 追加字段 this.selectedAccInfoSearchList.map(item => { - Object.keys(item.attrInfoMap || {}).forEach((key) => { - if (item.attrInfoMap[key]) { - // applyArctic - item[key] = item.attrInfoMap[key] - if (key === 'YQLX') { - item.askType = item.attrInfoMap[key] - } - if (key === 'CLLX') { - item.applyArctic = item.attrInfoMap[key] - } - if (key === 'ZRLX') { - item.askNature = item.attrInfoMap[key] - } - } + let addList; + addList = this.sarAccessInfoList.findIndex(items => { + return items.id == item.id }) - return item + if(addList > -1){ + this.$message.warning('请勿添加重复数据') + } else( + this.sarAccessInfoList.push(item) + ) }) - // 判断tab页 - if (this.activeName === 'SKILL') { - let repeatDataMsg = '不能添加重复数据:' - let repeatData = '' - if (this.sarAccessInfoList.length > 0) { - for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) { - for (let t in this.sarAccessInfoList) { - if (this.sarAccessInfoList[t].resId === this.selectedAccInfoSearchList[i].resId) { - repeatData += this.selectedAccInfoSearchList[i].code - break - } - } - } - } - if (repeatData !== '') { - this.$message.error(repeatDataMsg + repeatData) - } else { - if (this.sarAccessInfoList.length > 0) { - for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) { - this.sarAccessInfoList.push(this.selectedAccInfoSearchList[i]) - // this.pushFormItem(this.sarAccessInfoList, i) - this.sarAccessInfoList[this.sarAccessInfoList.length - 1].uuid = this.number - this.number++ - } - } else { - for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) { - this.sarAccessInfoList.push(this.selectedAccInfoSearchList[i]) - // this.pushFormItem(this.sarAccessInfoList, i) - this.sarAccessInfoList[i].uuid = this.number - this.number++ - } - } - this.selectedAccInfoSearchList = [] - this.$refs.selection.clearSelection() - this.selectLawsStands() - } - } else { - let repeatDataMsg = '不能添加重复数据:' - let repeatData = '' - if (this.sarAccessInfoListADMIN.length > 0) { - for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) { - for (let t in this.sarAccessInfoListADMIN) { - if (this.sarAccessInfoListADMIN[t].resId === this.selectedAccInfoSearchList[i].resId) { - repeatData += this.selectedAccInfoSearchList[i].code - break - } - } - } - } - if (repeatData !== '') { - this.$message.error(repeatDataMsg + repeatData) - } else { - if (this.sarAccessInfoListADMIN.length > 0) { - for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) { - this.sarAccessInfoListADMIN.push(this.selectedAccInfoSearchList[i]) - // this.pushFormItem(this.sarAccessInfoListADMIN, i) - this.sarAccessInfoListADMIN[this.sarAccessInfoListADMIN.length - 1].uuid = this.number - this.number++ - } - } else { - for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) { - this.sarAccessInfoListADMIN.push(this.selectedAccInfoSearchList[i]) - // this.pushFormItem(this.sarAccessInfoListADMIN, i) - this.sarAccessInfoListADMIN[i].uuid = this.number - this.number++ - } - } - this.selectedAccInfoSearchList = [] - this.$refs.selection.clearSelection() - this.selectLawsStands() - } - } + this.selectedAccInfoSearchList = [] + this.$refs.entryTable.clearSelection() + this.$refs.searchTable.clearSelection() } else { this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)') } - } - }, - // 追加 添加的数据 - pushFormItem (form, i) { - form[i].authDelive = this.addForm.authDelive // 认证交付物 - form[i].authObj = this.addForm.authObj // 认证对象 - form[i].authObjId = this.addForm.authObjId // 认证对象ID - form[i].authDepart = this.addForm.authDepart // 认证责任部门 - form[i].authDepartId = this.addForm.authDepartId // 认证责任部门Id - form[i].prodPutTime = this.$dateFormat(this.addForm.prodPutTime, 'yyyy-MM-dd') // 在产车实施日期 - // form[i].putTime = this.$dateFormat(this.addForm.putTime, 'yyyy-MM-dd') // 标准实施日期 - form[i].eopPutTime = this.$dateFormat(this.addForm.eopPutTime, 'yyyy-MM-dd') // eop实施日期 - form[i].askNature = this.addForm.askNature // askNature }, // 上移 事件 moveUp () { // i 全部对象数组的下标 // s 选中对象数组的下标 - // 判断上移的table - if (this.activeName === 'SKILL') { let sarAccessInfoListArry = JSON.parse(JSON.stringify(this.sarAccessInfoListArry)) if (sarAccessInfoListArry.length === 1) { + //数组交换下标 + console.log('s', sarAccessInfoListArry); + console.log('i',this.sarAccessInfoList); for (var s in sarAccessInfoListArry) { for (var i in this.sarAccessInfoList) { if (sarAccessInfoListArry[s].resId === this.sarAccessInfoList[i].resId) { @@ -1280,37 +1051,11 @@ export default { } else { this.$message.error('请选择单一数据进行移动!') } - } else { - let sarAccessInfoListArry = JSON.parse(JSON.stringify(this.sarAccessInfoListArry)) - if (sarAccessInfoListArry.length === 1) { - for (var z in sarAccessInfoListArry) { - for (var x in this.sarAccessInfoListADMIN) { - if (sarAccessInfoListArry[z].resId === this.sarAccessInfoListADMIN[x].resId) { - if (Number(x) !== 0) { - let tempOption = this.sarAccessInfoListADMIN[x - 1] - this.$set(this.sarAccessInfoListADMIN, x - 1, this.sarAccessInfoListADMIN[x]) - this.$set(this.sarAccessInfoListADMIN, x, tempOption) - // this.sarAccessInfoListArry = [] - return - } else { - this.$message.error('数据已经是第一个,请选择其他数据上移!') - } - } - } - } - } else if (this.sarAccessInfoListArry.length === 0) { - this.$message.error('请选择需要移动的数据!') - } else { - this.$message.error('请选择单一数据进行移动!') - } - } }, // 下移事件 moveDown () { // y 全部对象数组的下标 // t 选中对象数组的下标 - // 判断上移的table - if (this.activeName === 'SKILL') { if (this.sarAccessInfoListArry.length === 1) { for (var t in this.sarAccessInfoListArry) { for (var y in this.sarAccessInfoList) { @@ -1333,30 +1078,6 @@ export default { } else { this.$message.error('请选择单一数据进行移动!') } - } else { - if (this.sarAccessInfoListArry.length === 1) { - for (var u in this.sarAccessInfoListArry) { - for (var p in this.sarAccessInfoListADMIN) { - if (this.sarAccessInfoListArry[u].resId === this.sarAccessInfoListADMIN[p].resId) { - var a = this.sarAccessInfoListADMIN.length - 1 - if (Number(p) !== Number(a)) { - var q = parseInt(p) + 1 - var tempOption2 = this.sarAccessInfoListADMIN[parseInt(q)] - this.$set(this.sarAccessInfoListADMIN, parseInt(q), this.sarAccessInfoListADMIN[parseInt(p)]) - this.$set(this.sarAccessInfoListADMIN, parseInt(p), tempOption2) - return - } else { - this.$message.error('数据已经是最后一个,请选择其他数据进行移动!') - } - } - } - } - } else if (this.sarAccessInfoListArry.length === 0) { - this.$message.error('请选择需要移动的数据!') - } else { - this.$message.error('请选择单一数据进行移动!') - } - } }, // 点击清单条目导入按钮事件 importmodalFlags () { @@ -1374,8 +1095,6 @@ export default { * 删除不想添加的AccessInfo信息 */ deleteSelectSarAccessInfo () { - // 判断当前在哪个tab页 - if (this.activeName === 'SKILL') { if (this.sarAccessInfoListArry.length > 0) { this.$confirm('确认删除选中数据？', '确认删除', { confirmButtonText: '确定', @@ -1394,34 +1113,11 @@ export default { } } this.sarAccessInfoListArry = [] - this.$refs.tableSKILL.clearSelection() + this.$refs.entryTable.clearSelection() }).catch(() => {}) } else { this.$message.error('请选择需要删除的清单条目!') } - } else { - if (this.sarAccessInfoListArry.length > 0) { - this.$confirm('确认删除选中数据？', '确认删除', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - // i 全部对象数组的下标 - // s 选中对象数组的下标 - for (var s in this.sarAccessInfoListArry) { - for (var i in this.sarAccessInfoListADMIN) { - if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoListADMIN[i].uuid) { - this.sarAccessInfoListADMIN.splice(i, 1) - } - } - } - this.sarAccessInfoListArry = [] - this.$refs.tableADMIN.clearSelection() - }).catch(() => {}) - } else { - this.$message.error('请选择需要删除的清单条目!') - } - } }, // 清单条目 table select事件 sarAccessInfoSelect (selectData) { @@ -1437,111 +1133,70 @@ export default { saveSarAccess () { this.$refs['sarAccessForm'].validate((valid) => { if (valid) { - // 验证认证对象和监控类型不能为空 - for (let i = 0; i < this.sarAccessInfoList.length;i++){ - if (this.sarAccessInfoList[i].authObjId==null){ - return this.$message.error('认证对象不能为空'); - } else if(this.sarAccessInfoList[i].askNature==null){ - return this.$message.error('监管类型不能为空'); - } - } - for (let i = 0; i < this.sarAccessInfoListADMIN.length;i++){ - if (this.sarAccessInfoListADMIN[i].authObjId==null){ - return this.$message.error('认证对象不能为空'); - } else if(this.sarAccessInfoListADMIN[i].askNature==null){ - return this.$message.error('监管类型不能为空'); + let rowlist = [] + for (let i = 0; i < this.sarAccessInfoList.length; i++) { + rowlist.push(this.sarAccessInfoList[i].id) } - } - - // if (!this.sarAccessEO.id) { - let rowlist = [] - let rowList2 = [] - for (let i = 0; i < this.sarAccessInfoList.length; i++) { - rowlist.push(this.sarAccessInfoList[i]) - } - for (let i = 0; i < this.sarAccessInfoListADMIN.length; i++) { - rowList2.push(this.sarAccessInfoListADMIN[i]) - } - let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO)) - sarAccessEO.inforlist = JSON.stringify(rowlist) - sarAccessEO.adminInfoList = JSON.stringify(rowList2) - sarAccessEO.countryArea = sarAccessEO.countryArea.join(',') - sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',') - // 判断是否有附件 - if (this.fileInfoList.length > 0) { - let relateFile = [] - this.fileInfoList.map(item => { - relateFile.push(item.id) - }) - sarAccessEO.relateFile = relateFile.join(',') - } - if (!sarAccessEO.id) { - // 新增 - sarAccessEO.state = '1' - sarAccessEO.version = 0 - this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, { - _this: this, - loading: 'loadData' - }, res => { - if (res.ok) { - this.isNext = true - this.$router.push({ - name: 'AccessStandardsAndRegulations' - }) - } - }, e => { - }) - } else { - // 编辑 - this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, { - _this: this, - loading: 'loadData' - }, res => { - if (res.ok) { - this.isNext = true - this.$router.push({ - name: 'AccessStandardsAndRegulations' - }) - } - }, e => { - }) - } - } else { + rowlist = rowlist.join(',') + let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO)) + sarAccessEO.inforlist = JSON.stringify(rowlist) + sarAccessEO.countryArea = sarAccessEO.countryArea.join(',') + sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',') + // 判断是否有附件 + if (this.fileInfoList.length > 0) { + let relateFile = [] + this.fileInfoList.map(item => { + relateFile.push(item.id) + }) + sarAccessEO.relateFile = relateFile.join(',') + } + if (!sarAccessEO.id) { + // 新增 + sarAccessEO.state = '1' + sarAccessEO.version = 0 + this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, { + _this: this, + loading: 'loadData' + }, res => { + if (res.ok) { + this.isNext = true + this.$router.push({ + name: 'AccessStandardsAndRegulations' + }) + } + }, e => { + }) + } else { + // 编辑 + this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, { + _this: this, + loading: 'loadData' + }, res => { + if (res.ok) { + this.isNext = true + this.$router.push({ + name: 'AccessStandardsAndRegulations' + }) + } + }, e => { + }) + } + }else { this.$message.error('请检查表单是否填写正确') } }) }, // 查询数据搜索 table 数据 selectLawsStands () { - if (this.isListType) { - this.$http.get('lawss/sarSarAccess/page', this.sarAccessInfoSearch, { - _this: this, - loading: 'dataLoading' - }, res => { - this.sarAccessInfoSearchList = res.data.list - this.drawerTotal = res.data.count - }, e => { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, { + _this: this + }, res =>{ + this.sarAccessInfoSearchList = res.data.list + this.$nextTick(() => { }) - } else { - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, { - _this: this, - loading: 'dataLoading' - }, res => { - console.log(res.data); - res.data.list[0].list.map(item => { - item.newPutTextTime = null - item.prodPutTextTime = null - item.eopPutTextTime = null - item.ZRBMName = item.dutyDepart - item.ZRBM = item.dutyDepartId - item.FOName = item.foUser - item.FO = item.foUserId - }) - this.sarAccessInfoSearchList = res.data.list[0].list - this.drawerTotal = res.data.count - }, e => { - }) - } + }, e => { + + }) }, // 数据搜索table判断checked状态 selectable (row) { @@ -1550,6 +1205,10 @@ export default { // 数据搜索 table select事件 sarAccessInfoSearchSelect (selectData) { this.selectedAccInfoSearchList = selectData + this.selectSearch = [] + for(let i = 0; i 0) { exportList = this.sarAccessInfoListArry } else { - // 判断导出的是技术要求清单还是行政要求清单 - if (this.activeName === 'SKILL') { exportList = this.sarAccessInfoList - } else { - exportList = this.sarAccessInfoListADMIN - } } if (exportList != null && exportList.length > 0) { let accIdAndrestype = [] @@ -1639,15 +1279,6 @@ export default { var a var b = '' if (response.data) { - // for (var s in this.sarAccessInfoList) { - // for (var i in response.data) { - // if (this.sarAccessInfoList[s].resId === response.data[i].resId) { - // // ('在全部对象中的位置' + i) - // response.data.splice(i, 1) - // b = '数据重复添加,现已自动清除! 2' - // } - // } - // } for (var sADMIN in this.sarAccessInfoListADMIN) { for (var iADMIN in response.data) { if (this.sarAccessInfoListADMIN[sADMIN].code === response.data[iADMIN].code) { @@ -1659,17 +1290,8 @@ export default { } if (response.data.length > 0) { for (let i = 0; i < response.data.length; i++) { - if (response.data[i].accessSarType === 'ADMIN') { - this.sarAccessInfoListADMIN.push(response.data[i]) - } else if (response.data[i].accessSarType === 'SKILL') { this.sarAccessInfoList.push(response.data[i]) } - // if (this.activeName === 'SKILL') { - // this.sarAccessInfoList.push(response.data[i]) - // } else { - // this.sarAccessInfoListADMIN.push(response.data[i]) - // } - } } a = response.data.length } @@ -1678,7 +1300,6 @@ export default { this.importmodalFlag = false } else { this.$message.success(response.message + b + '导入' + a + '条数据！') - // this.$message.success(b + '共导入' + a + '条数据!') this.importmodalFlag = false this.selectLawsStands() } @@ -1719,73 +1340,6 @@ export default { this.$refs['addEntryForm'].resetFields() }) }, - // 点击清单条目 编辑按钮 事件 - editEntry () { - if (this.sarAccessInfoListArry.length === 0) { - this.$message.warning('请选择要编辑的数据') - } else if (this.sarAccessInfoListArry.length > 1) { - this.$message.warning('只能选择一条数据') - } else { - this.editAddType = 2 - this.addEditTitle = '编辑' - this.$nextTick(() => { - // this.addEntryForm = - const formData = JSON.parse(JSON.stringify(this.sarAccessInfoListArry[0])) - const gxhbq = formData.GXHBQ - delete formData.GXHBQ - this.addEntryForm = { - ...formData, - GXHBQ: gxhbq ? gxhbq.split(',') : [], - askNature: formData.askNature ? formData.askNature.split(',') : [] - } - if (!this.addEntryForm.resId && this.addEntryForm.sarType === 'TEMP') { - this.isDisabled = false - } else { - this.isDisabled = true - } - // 转换因后台无法返回大写字段，重新赋值 - this.addEntryForm.FOName = this.addEntryForm.FOName || this.addEntryForm.foname - this.addEntryForm.FO = this.addEntryForm.FO || this.addEntryForm.fo - this.addEntryForm.ZRBMName = this.addEntryForm.ZRBMName || this.addEntryForm.zrbmname - this.addEntryForm.ZRBM = this.addEntryForm.ZRBM || this.addEntryForm.zrbm - this.addEntryForm.XGBMName = this.addEntryForm.XGBMName || this.addEntryForm.xgbmname - this.addEntryForm.XGBM = this.addEntryForm.XGBM || this.addEntryForm.xgbm - // this.addEntryForm.GXHBQ = this.addEntryForm.GXHBQ || this.addEntryForm.gxhbq - this.addEntryForm.applyArctic = this.addEntryForm.applyArctic ? this.addEntryForm.applyArctic.split(',') : [] - // this.addEntryForm.GXHBQ = this.addEntryForm.gxhbq ? this.addEntryForm.gxhbq.split(',') : [] - // this.addEntryForm.GXHBQ = '' - // delete this.addEntryForm.gxhbq - // 在产车实施日期项目赋值 - if (!this.addEntryForm.prodPutTextTime || this.addEntryForm.prodPutTextTime === '') { - this.addEntryForm.prodPutTextTime = !['N/A', 'TBD', '已实施', ''].includes(this.addEntryForm.ZCCSSRQ) ? this.getEarliestDate(this.addEntryForm.ZCCSSRQ, 'datePicker') : '' - } else { - this.addEntryForm.prodPutTextTime = this.addEntryForm.prodPutTextTime !== '' && this.addEntryForm.prodPutTextTime !== null ? this.getEarliestDate(this.addEntryForm.prodPutTextTime, 'datePicker') : '' - } - - // 新车型实施日期赋值 - if (!this.addEntryForm.newPutTextTime || this.addEntryForm.newPutTextTime === '') { - this.addEntryForm.newPutTextTime = !['N/A', 'TBD', '已实施', ''].includes(this.addEntryForm.XCXSSRQ) ? this.getEarliestDate(this.addEntryForm.XCXSSRQ, 'datePicker') : '' - } else { - this.addEntryForm.newPutTextTime = this.addEntryForm.newPutTextTime !== '' && this.addEntryForm.newPutTextTime !== null ? this.getEarliestDate(this.addEntryForm.newPutTextTime, 'datePicker') : '' - } - - // EOP实施日期赋值 - if (!this.addEntryForm.eopPutTextTime || this.addEntryForm.eopPutTextTime === '') { - this.addEntryForm.eopPutTextTime = !['N/A', 'TBD', '已实施', ''].includes(this.addEntryForm.EOPSSRQ) ? this.getEarliestDate(this.addEntryForm.EOPSSRQ, 'datePicker') : '' - } else { - this.addEntryForm.eopPutTextTime = this.addEntryForm.eopPutTextTime !== '' && this.addEntryForm.eopPutTextTime !== null ? this.getEarliestDate(this.addEntryForm.eopPutTextTime, 'datePicker') : '' - } - this.sarAccessInfoListArry = [] - this.$refs.tableSKILL.clearSelection() - this.$refs.tableADMIN.clearSelection() - - setTimeout(() => { - this.$refs.addEntryForm.clearValidate() - }, 1) - // clearFiles - }) - } - }, // 请求部门结构树 getOrgTreeSource () { this.$http.get('sys/org/getTree', {}, {_this: this}, @@ -1845,33 +1399,18 @@ export default { nowstandinfo.askNature = nowstandinfo.askNature.join(',') // 判断新增还是编辑 if (this.editAddType === 1) { - if (this.activeName === 'SKILL') { this.sarAccessInfoList.push(nowstandinfo) this.sarAccessInfoList[this.sarAccessInfoList.length - 1].uuid = this.number this.number++ - } else { - this.sarAccessInfoListADMIN.push(nowstandinfo) - this.sarAccessInfoListADMIN[this.sarAccessInfoListADMIN.length - 1].uuid = this.number - this.number++ - } this.isSubmit = false this.$message.success('添加成功') } else { - if (this.activeName === 'SKILL') { this.sarAccessInfoList.map((item, index) => { if (item.uuid === nowstandinfo.uuid) { // this.sarAccessInfoList[index] = nowstandinfo this.$set(this.sarAccessInfoList, index, nowstandinfo) } }) - } else { - this.sarAccessInfoListADMIN.map((item, index) => { - if (item.uuid === nowstandinfo.uuid) { - // this.sarAccessInfoListADMIN[index] = nowstandinfo - this.$set(this.sarAccessInfoListADMIN, index, nowstandinfo) - } - }) - } this.isSubmit = false this.$message.success('编辑成功') } @@ -1911,40 +1450,6 @@ export default { this.isSubmit = false this.$refs['addEntryForm'].resetFields() }, - // 根据准入id查询标准法规详情 - selectInfobyAccid () { - this.$http.get('lawss/sarSarAccessInfo/selectSarAccessInfoByAccessId', { - accessId: this.$route.query.id, - validFlag: 0 - }, { - _this: this - }, res => { - res.data.SKILL.map((item, index) => { - item.uuid = this.number - item.GXHBQ = item.gxhbq - item.eopPutTime = item.eopPutTextTime - item.newPutTime = item.newPutTextTime - item.prodPutTime = item.prodPutTextTime - this.number++ - }) - res.data.ADMIN.map((item, index) => { - item.uuid = this.number - item.GXHBQ = item.gxhbq - item.eopPutTime = item.eopPutTextTime - item.newPutTime = item.newPutTextTime - item.prodPutTime = item.prodPutTextTime - this.number++ - }) - this.sarAccessInfoList = res.data.SKILL - this.sarAccessInfoListADMIN = res.data.ADMIN - this.$nextTick(() => { - this.$refs.tableSKILL.doLayout() - this.$refs.tableADMIN.doLayout() - }) - // this.sarAccessInfoList = res.data.list - }, e => { - }) - }, /** * 赋值内容到入库标准抽屉内 * item 清单行数据 @@ -2099,19 +1604,11 @@ export default { // 新增、编辑标准时验证标准编号是否重复 validCode (rule, value, callback) { let find = 0 - if (this.activeName === 'SKILL') { this.sarAccessInfoList.map(item => { if (item.code === value) { find++ } }) - } else { - this.sarAccessInfoListADMIN.map(item => { - if (item.code === value) { - find++ - } - }) - } if (find > 1 && this.editAddType === 2) { return callback(new Error('标准编号已存在')) } else if (find > 0 && this.editAddType === 1) { @@ -2137,21 +1634,6 @@ export default { }) return askTypeName }, - // 表格回显适用车辆类型 - getApplyArctic (val) { - if (val) { - val = val.split(',') - let applyArcticName = [] - this.energyKindOptions.map(item => { - val.map(items => { - if (item.value === items) { - applyArcticName.push(item.label) - } - }) - }) - return applyArcticName.join(',') - } - }, // 表格回显监管类型 getAskNature (val) { if (!val) { @@ -2163,39 +1645,6 @@ export default { return askTypeName.join(',') }, - // 标签回显适用车辆类型 - getGXHBQ (val) { - if (val) { - val = val.split(',') - let GXHBQName = [] - this.GXHBQOptions.map(item => { - val.map(items => { - if (item.value === items) { - GXHBQName.push(item.label) - } - }) - }) - return GXHBQName.join(',') - } - }, - - /** - * @description: 获取最早日期 - * @date: 2021-02-27 16:56:30 - * @auth: chenxiaoxi - */ - getEarliestDate(date, isDatePickerUse) { - if (!date) { return } - const dateList = date.split(',') - const dateTimeList = [] - dateList.map(date => { - dateTimeList.push(new Date(date).getTime()) - }) - const dateTimeSortList = dateTimeList.sort(function(a, b) { - return a - b - }) - return isDatePickerUse !== undefined ? new Date(dateTimeSortList[0]) : this.$moment(dateTimeSortList[0]).format('YYYY-MM-DD') - }, onChecked () { this.sarStandardsInfoEO.FO = '' this.sarStandardsInfoEO.XMPGJS = '' @@ -2203,6 +1652,15 @@ export default { formatText(str) { return formatText(str) }, + getData() { + this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, { + _this: this + }, res => { + this.sarAccessInfoList = res.data + }, e => { + + }) + } }, watch: { // 监听 清单类型 @@ -2218,6 +1676,8 @@ export default { ...mapGetters(['getAccessStandardRegRow']), }, mounted () { + this.zqaId =this.$route.query.id; + // this.getData() this.getDept() // 从数据库中查询各下拉框数据 this.$http.get('sys/dictype/getDicTypeListCode', '', { @@ -2228,7 +1688,7 @@ export default { this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list - this.applyOptions = res.data.COUNTRY + this.applyOptions = res.data.COUNTRY //适用区域list this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质 this.accessSarTypeOptions = res.data.REQUESTTYPE // 数据搜索 要求类型 this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 @@ -2243,7 +1703,6 @@ export default { // 判断是否是编辑 if (this.$route.query.id) { const accessRow = this.getAccessStandardRegRow - console.log('是否是编辑', accessRow); this.$nextTick(() => { this.sarAccessEO.type = accessRow.type this.sarAccessEO.countryArea = accessRow.countryArea.split(',') @@ -2254,7 +1713,7 @@ export default { this.sarAccessEO.relateFile = accessRow.relateFile this.sarAccessInfoSearch.validFlag = 0 this.getFileInfo() - this.selectInfobyAccid() + this.getData() this.selectLawsStands() }) } else { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index fd8d643cb..b7a1cda74 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -111,70 +111,41 @@ align="center"> - - - - + label="发布日期"> + label="新车型实施日期"> + label="在产车实施日期"> - - - - diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index a0d23f9bd..e0b693f37 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -211,37 +211,27 @@ + prop="isSubTime" + sortable + label="发布日期"> - - - - + prop="isSubTime" + sortable + label="发布日期"> - - + label="新车型实施日期"> + label="在产车实施日期"> - - @@ -731,7 +693,7 @@ export default { accessType: '', id: '', standType: 'INLAND', // 标准分类 - // country: 'CN', // 适用区域 + country: 'CN', // 适用区域 standSort: '', // 标准类别 standNumber: '', // 标准编号 standYear: '', // 标准年份 @@ -2204,7 +2166,7 @@ export default { this.regionOptions = res.data.REGION // 基础信息 区域list this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list - this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list + this.applicationScope = res.data.COUNTRY // 国家、地区list this.applyOptions = res.data.COUNTRY //适用领域 list this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质 this.accessSarTypeOptions = res.data.REQUESTTYPE // 数据搜索 要求类型 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 100426e1e..fa81df038 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -211,37 +211,27 @@ + prop="isSubTime" + sortable + label="发布日期"> - - - - + prop="isSubTime" + sortable + label="发布日期"> - - + label="新车型实施日期"> + label="在产车实施日期"> - - @@ -636,56 +598,6 @@ export default { {required: true, type: 'string', message: '英文名称不能为空', trigger: 'blur'}, {type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change'} ], - // synopsis: [ - // {required: true, type: 'string', message: '法规说明不能为空', trigger: 'blur'}, - // {type: 'string', max: 1000, message: '法规说明不能超过1000个字符', trigger: 'change'} - // ], - // newPutTime: [ - // {required: true, message: '新车型实施日期不能为空', trigger: 'change'} - // ], - // prodPutTime: [ - // {required: true, message: '在产车实施日期不能为空', trigger: 'change'} - // ], - // eopPutTime: [ - // {required: true, message: 'eop实施日期不能为空', trigger: 'change'} - // ], - // newPutTextTime: [ - // {required: true, message: '新车型实施日期（项目）不能为空', trigger: 'change'} - // ], - // prodPutTextTime: [ - // {required: true, message: '在产车实施日期（项目）不能为空', trigger: 'change'} - // ], - // eopPutTextTime: [ - // {required: true, message: 'eop实施日期（项目）不能为空', trigger: 'change'} - // ], - performInfo: [ - // {required: true, type: 'string', message: '实施说明不能为空', trigger: 'blur'}, - {type: 'string', max: 1000, message: '实施说明不能超过1000个字符', trigger: 'change'} - ], - // ZRBM: [ - // {required: true, type: 'string', message: '责任部门不能为空', trigger: 'change'} - // ], - // XGBM: [ - // {required: true, message: '相关部门不能为空', trigger: 'change'} - // ], - // FO: [ - // {required: true, type: 'string', message: 'FO不能为空', trigger: 'change'} - // ], - // proEssessUserId: [ - // {required: true, type: 'string', message: '项目评估角色不能为空', trigger: 'change'} - // ], - askNature: [ - {required: true, message: '监管类型不能为空', trigger: 'change'} - ], - // applyArctic: [ - // {required: true, message: '适用车辆类型不能为空', trigger: 'change'} - // ], - accessType: [ - {required: true, type: 'string', message: '入库模块不能为空', trigger: 'change'} - ], - authObjId: [ - {required: true, type: 'string', message: '认证对象不能为空', trigger: 'change'} - ] }, // 认证对象下拉数据 authObjOptions: [ diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 87ab93d05..5dca0201d 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -133,7 +133,7 @@