From 281193bcaa4ab204d4fb913bc3353c692562433d Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Wed, 4 Aug 2021 16:24:57 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step2.vue | 8 ++-- .../pages/creatProcess/wfhxzg/step3.vue | 40 ++++++++++++++-- .../pages/creatProcess/wfhxzg/step4.vue | 46 +++++++++++++++++-- 3 files changed, 82 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 8b3878ffb..34d9c9a60 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -234,7 +234,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import { roleTreeData } from "@/api/unqualProcess.js" -import {completeTask, inboundLiaisonDetail, saveinboundTask} from "@/api/process.js" +import {completeTask, inboundLiaisonDetail, saveinboundTask, saveTaskForPub} from "@/api/process.js" export default { name: "wfhxzgStep2", @@ -373,10 +373,10 @@ export default { _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ // roleForm: this.roleForm, - itemsList: this.dataList, + standardInfoList: this.dataList, commentText: this.commentText })) - saveinboundTask(_formData).then(res => { + saveTaskForPub(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result @@ -388,7 +388,7 @@ export default { handleSubmit() { this.isSubmit = true let zqa = new Map(); - for (let lastDataListElement of this.lastDataList) { + for (let lastDataListElement of this.dataList) { let a = zqa.get(lastDataListElement.dutyPeopleInfoId) if( a == null){ a = { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index afdc672db..e8a67fc9b 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -241,7 +241,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {completeTask, inboundLiaisonDetail} from "@/api/process.js"; +import {completeTask, inboundLiaisonDetail, saveTaskForPub} from "@/api/process.js"; export default { name: "wfhxzgStep3", @@ -405,7 +405,41 @@ export default { window.open(routeUrl.href, '_blank') }, // 保存按钮 - handleSave() {}, + handleSave() { + this.isSubmit = true + let zqa = new Map(); + for (let lastDataListElement of this.dataList) { + let a = zqa.get(lastDataListElement.dutyPeopleInfoId) + if( a == null){ + a = { + id: lastDataListElement.dutyPeopleInfoId, + name: lastDataListElement.dutyPeopleInfo, + standardInfoList: [] + } + } + a.standardInfoList.push(lastDataListElement); + zqa.set(a.id, a); + } + let list = []; + for(let item of zqa) { + list.push(item[1]) + } + this.saveLoading = true + let _formData = new FormData() + _formData.append('taskIds', this.taskIds) + _formData.append('json', JSON.stringify({ + // roleForm: this.roleForm, + dockUserList: list, + commentText: this.commentText + })) + saveTaskForPub(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, // 提交按钮 handleSubmit() { this.isSubmit = true @@ -418,7 +452,7 @@ export default { }) if(flag)return this.$message.warning('请选择负责人填入') let zqa = new Map(); - for (let lastDataListElement of this.lastDataList) { + for (let lastDataListElement of this.dataList) { let a = zqa.get(lastDataListElement.dutyPeopleId) if( a == null){ a = { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index df0c6c866..627b58150 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -230,7 +230,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import {uploadFile} from '@/api/unqualProcess.js'; -import {inboundLiaisonDetail, completeTask} from "@/api/process" +import {inboundLiaisonDetail, completeTask, saveTaskForPub} from "@/api/process" export default { name: "wfhxzgStep4", @@ -306,10 +306,13 @@ export default { }, getFormFieldList (item) { this.$nextTick(() => { - - this.dataList = [JSON.parse(JSON.stringify(item.responUserInfo.info))] + let listJSON = JSON.parse(JSON.stringify(item.responUserInfo.info)) + if (listJSON.length !== undefined) { + this.dataList = listJSON + } else { + this.dataList = [listJSON] + } this.newDataList = [] - console.log(this.dataList) this.dataList.forEach(item => { if (item.fileText.length !== 0) { item.fileText.forEach(item1 => { @@ -402,7 +405,40 @@ export default { window.open(routeUrl.href, '_blank') }, // 保存按钮 - handleSave() {}, + handleSave() { + let zqa = new Map(); + for (let lastDataListElement of this.dataList) { + let a = zqa.get(lastDataListElement.dutyPeopleId) + if( a == null){ + a = { + standardInfoList: [] + } + } + a.standardInfoList.push(lastDataListElement); + zqa.set(a.id, a); + } + let list = [] + for(let item of zqa) { + list.push(item[1].standardInfoList) + } + this.saveLoading = true + let _formData = new FormData() + _formData.append('taskIds', this.taskIds) + _formData.append('json', JSON.stringify({ + // roleForm: this.roleForm, + responUserInfo: { + info: this.dataList.splice(-1, 1) + }, + commentText: this.commentText + })) + saveTaskForPub(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, // 提交按钮 handleSubmit() { this.isSubmit = true From e5fc796cd3b1d7cdec690f11e3dc493171cf1411 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 4 Aug 2021 17:16:48 +0800 Subject: [PATCH 2/6] commit --- src/pages/processCenter/pages/creatProcess/bzjd/step5.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 8030287a6..ee025d337 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -363,7 +363,7 @@ this.sarType = data.standInData this.json = data this.itemList = data.itemList - this.loading = true + this.loading = false }).catch(e => { }) }) From 2c6cd94f20f4a4e7abea04fac2a0cba5cb4458ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 4 Aug 2021 17:25:58 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1.vue | 7 +- .../pages/creatProcess/xmpg/step3.vue | 92 ++- .../pages/creatProcess/xmpg/test.vue | 595 ++++++++++++++++++ .../pages/processDetail/index.vue | 3 +- .../tabComponents/taskDraft/index.vue | 32 +- 5 files changed, 663 insertions(+), 66 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/test.vue diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index ad7e4df9d..c75e17d9b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -451,6 +451,8 @@ export default { listForm: { standNumber: "", //标准编号 standName: "",//标准名称 + XCXSSRQ: "", //新车型实施日期 + ZCCSSRQ: "", //在产车实施日期 certifiedEngineer: "", //认证工程师 qualityEngineer: "", //质量工程师 breakdownList: [{ @@ -655,6 +657,7 @@ export default { if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) { this.$message.warning("请选择分发责任人"); } else { + this.isSubmit = true var json = Object.assign(this.listForm, this.roleForm); this.$refs["listForm"].validate((valid) => { if (valid) { @@ -708,9 +711,11 @@ export default { //选择拆分标准确定事件 OkDrawer() { - if (this.selectedList.length == 1) { + if (this.selectedList.length === 1) { this.listForm.standNumber = this.selectedList[0].standSortShow + '-' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ; this.listForm.standName = this.selectedList[0].standName; + this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj + this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj this.listForm.id = this.selectedList[0].id; this.$http.get("SarStandItems/sar-stand-items/findAllItems", { ids: this.listForm.id, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 283e74541..e3362d266 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -57,7 +57,7 @@
- 批量分发落实人 + 批量分发落实人
{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }} - + @@ -260,6 +259,8 @@ export default { tabValue: "listOfCountries", selectedList: [], //选择清单的选择框 selectList: [], //选择标准的选择框 + lsIndex: '', + lsType: '', bringData: [], commentText: "", //填写会签意见 page: 1, @@ -346,7 +347,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res); + console.log(res.mesg) if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); @@ -355,11 +356,6 @@ export default { }); }); }, - - createItemId() { - return Number(Math.random().toString().substr(3,18) + Date.now()).toString(36); - }, - /** * @description: 动态表单读取 */ @@ -373,7 +369,6 @@ export default { for (let i = 0; i < item.pepdtos.length; i++) { for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) { this.listForm.breakdownList.push({ - itemId: this.createItemId(), itemsName: item.pepdtos[i].breakdownList[j].itemsName, itemNum: item.pepdtos[i].breakdownList[j].itemsNum, responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer, @@ -395,46 +390,47 @@ export default { }); } } + console.log(this.listForm.breakdownList); }, - //批量操作按钮 - batchOperation(id) { - if (this.selectList.length === 0) { - this.$message.warning("请至少选择一条数据进行批量分发"); - } else { - this.nodeList = []; - this.nodeList.push(id); - this.modalshowflag = true; + checkedRole (data) { + if (this.type === 1) { + this.listForm.breakdownList[this.lsIndex].implementerId = data[0].id + this.listForm.breakdownList[this.lsIndex].implementer = data[0].name + } else if(this.type === 2) { + this.listForm.breakdownList.forEach( item => { + this.selectList.forEach( items => { + if (item === items) { + item.implementerId = data[0].id + item.implementer = data[0].name + } + }) + }) } - }, - checkedRole(data) { - // 选取负责人时的操作 - let mis = []; - let miss = []; - this.selectList.forEach(item => { - item.implementer = data[0].name; - item.implementerId = data[0].id; - mis.push(item.projectNumber); - miss.push(item.itemNum) - }); - this.listForm.breakdownList.forEach(item => { - if (!mis.includes(item.projectNumber) && !miss.includes(item.itemsNum)) { - this.selectList.push(item); - } - }); - this.listForm.breakdownList = this.selectList; - this.$refs.selection.clearSelection(); - this.modalshowflag = false; + this.modalshowflag = false }, cancleUserInfo() { this.modalshowflag = false; }, - choiceZRRS(scope) { - if (scope != null) this.dsadadadsada = scope.$index; - this.nodeList = []; - if (this.roleForm.implementer.length > 0) { - this.nodeList = this.roleForm.implementer.split(","); + choiceZRRS (row, type, index) { + this.type = type + if (type === 1) { + this.drawerTitle = '选择责任人' + this.nodeList = [] + this.lsIndex = index + this.lsType = type + this.nodeList.push(row) + this.modalshowflag = true + } else if (type === 2) { + // 批量 + if (this.selectList.length > 0) { + this.lsType = type + this.nodeList = [] + this.modalshowflag = true + this.drawerTitle = '批量选择责任人' + } else { + this.$message.warning('请选择要分发的数据') + } } - this.modalshowflag2 = true; }, getTree() { this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/test.vue b/src/pages/processCenter/pages/creatProcess/xmpg/test.vue new file mode 100644 index 000000000..daa015930 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg/test.vue @@ -0,0 +1,595 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index ff4dd93eb..120de5f7b 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -178,6 +178,7 @@ export default { let row = {...this.detailData[index]} row.taskIds = row.id row.taskInfo = row.name + console.log(row.name) row.tabsName = this.$route.query.tabsName let prcType = this.detailData[index].prcType // 流程类型 // 判断当前流程是否已全部办理完成 @@ -205,7 +206,7 @@ export default { this.toProcessDetail('bzqdfbStep4',row) }else if (prcType === '5'){ //标准项目合规评估 标准维度 - if(row.taskInfo === '标准法规部部长审批'){ + if(row.taskInfo === '标准法规部领导审核'){ this.toProcessDetail('xmpgStep7',row) }else{ this.toProcessDetail('xmpgStep2',row) diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 3e3f73c32..1a8c3c2a8 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -4,22 +4,22 @@
- - - - - - + + + + + + + + + + + + + + + + Date: Wed, 4 Aug 2021 17:56:37 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step4.vue | 10 +---- .../pages/creatProcess/wfhxzg/step5.vue | 39 ++++++++++++++----- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index 627b58150..a684c38a4 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -312,8 +312,7 @@ export default { } else { this.dataList = [listJSON] } - this.newDataList = [] - this.dataList.forEach(item => { + this.dataList.forEach(item => { if (item.fileText.length !== 0) { item.fileText.forEach(item1 => { this.fileTextList.push({ @@ -340,12 +339,7 @@ export default { id: res.data.attId, name: res.data.standName }) - this.newDataList.forEach(item =>{ - this.fileListData.fileText.push({ - id: item.id, - name: item.name - }) - }) + this.fileListData.fileText = this.newDataList this.$message({ showClose: true, message: res.message, diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 073001399..ab8c6df90 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -107,15 +107,9 @@ - + @@ -212,6 +206,15 @@ submitBTNText="同意" > + + + +
@@ -226,6 +229,7 @@ export default { name: "wfhxzgStep5", data() { return { + fileMadel: false, detailData: [], loading: false, commentText: '', @@ -271,6 +275,10 @@ export default { } }, methods: { + queryFile(row) { + this.fileTextList = row.fileText + this.fileMadel = true + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -297,14 +305,14 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList - this.dataList.forEach(item => { + /*this.dataList.forEach(item => { item.fileText.forEach(item1 => { this.fileTextList.push({ id: item1.id, name: item1.name }) }) - }) + })*/ }) }, @@ -351,6 +359,9 @@ export default { handleSubmitNo() { if (this.commentText) { var json = { + responUserInfo: { + info: this.dataList + }, actionFlag: 1, commentText: this.commentText } @@ -361,6 +372,7 @@ export default { }, {}, res => { if (res.success) { this.$message.success('驳回成功') + this.fileTextList = [] this.$router.push('/processCenter') } }) @@ -452,6 +464,13 @@ export default { /deep/.el-upload{ display: block; } + // 上传信息回显多余隐藏 + /deep/.el-upload-list__item .el-icon-close { + font-size: 0; + } + /deep/.el-upload-list__item .el-icon-close-tip { + font-size: 0; + } .content-center { padding: 10px 0px 10px 10px; } From 45345d44a25b5385923533b601d2271d9a424f2f Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 4 Aug 2021 18:00:23 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feat:=20=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E5=8A=A8=E6=80=81=E5=8C=B9=E9=85=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../searchCenter/pages/advancedSearch.vue | 544 ++++++++++++++---- 1 file changed, 422 insertions(+), 122 deletions(-) diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index 8de49527b..4611f40a4 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -54,13 +54,15 @@ - - - {{ opt.label }} + + + @@ -83,41 +85,60 @@ - - + + - - + + - + + + - - + + + + - + + v-model="standForm.issueTime" + type="date" + placeholder="请选择标准发布日期" + value-format="yyyy-MM-dd"> @@ -125,115 +146,181 @@ - - - - + + + - + + v-model="standForm.ssrq" + type="date" + placeholder="请选择标准实施日期(标准文本)" + value-format="yyyy-MM-dd"> - + + v-model="standForm.xcxssrq" + type="date" + placeholder="请选择新车型实施日期(标准文本" + value-format="yyyy-MM-dd"> - + + v-model="standForm.zccssrq" + type="date" + placeholder="请选择在产车实施日期(标准文本)" + value-format="yyyy-MM-dd"> - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + @@ -245,40 +332,68 @@ - - + + + - + - - + + + - - + + + + - - + + @@ -939,9 +1054,13 @@ import "../../../assets/zTree/js/jquery.ztree.core.js"; import "../../../assets/zTree/js/jquery.ztree.excheck.js"; import "../../../assets/zTree/js/jquery.ztree.exedit.js"; -// import deptTree from '../../processCenter/pages/components/deptTree' +import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; + export default { name: "advancedSearch", + components: { + TreeSelectNew + }, data() { return { tableLoading: false, @@ -949,6 +1068,42 @@ export default { saveRoleBuss: [], bussRoleFlag: false, drawerModal: false, + modalShowFlag1: false, // drawer开关 + modalShowFlag2: false, // drawer开关 + modalShowFlag3: false, // drawer开关 + modalShowFlag4: false, // drawer开关 + url:'', + urlChild:'', + drawerTitle: '', //drawer标题 + showCheckBox: true, // 树形控件是否展示多选框 + defaultProps: { + children: 'children', + label: 'menuName' + }, + defaultCodeProps: { + children: 'children', + label: 'code' + }, + defaultModelProps: { + children: 'children', + label: 'model' + }, + type: '', + defaultUserProps: { + children: 'children', + label: 'name' + }, + key:1, + key1:2, + key2:3, + key3:4, + nodeKey: 'id', + defaultCheckedKeys: [], + nodeKeyCode: 'code', + nodeKeyModel: 'model', + defaultCheckedKeys1: [], + defaultCheckedKeys2: [], + defaultCheckedKeys3: [], drawerModalstyles: { height: "calc(100% - 55px)", overflow: "auto", @@ -975,11 +1130,7 @@ export default { selectIndex: "stand", nature: "", // 标准性质 country: "", // 国家 - standSort: "", // 标准类别 applyArctic: "", // 适用车型 - standNumber: "", // 标准编号 - standYear: "", // 标准年份 - standEnName: "", // 标准英文名称 standState: "", // 标准状态 replaceStandNum: "", // 代替标准号 replacedStandNum: "", // 被代替标准号 @@ -987,7 +1138,6 @@ export default { adoptExtent: "", // 采标程度 energyKind: "", // 能源种类 applyAuth: "", // 适用认证 - issueTime: "", // 发布日期 issueTimeSt: "", // 发布日期(开始) issueTimeEd: "", // 发布日期(结束) putTime: "", // 实施日期 @@ -1023,12 +1173,100 @@ export default { registerPutTime: "", // 注册登记车实施日期 itemsNum: "", // 条款号 itemsName: "", // 条款名称 - parts: "" // 关联零部件 + parts: "", // 关联零部件 + // 基础信息 + textStatus: '', // 文本状态 + standYear: '', // 标准年份 + standInData: '0', // 标准类型 + standSort: '', // 标准类别 + standNumber: '', // 标准编号 + standNature: '', // 标准性质 + standEnName: '', // 英文名称 + standName: '', // 中文名称 + signFlag: '1', // 是否需要会签 + issueTime: '', // 发布时间 + isRelateAccess: '', // 是否纳入认证清单 + standSystem: '',// 标准体系 + standSystemName: '',// 标准体系 + gxhbq: '', // 标签 + // 实施日期 + ssrq: '', // 实施日期(标准文本) + xcxssrq: '', // 新车型实施日期(标准文本) + zccssrq: '', // 在产车实施日期(标准文本) + ssrqgj: '', // 实施日期(国际) + xcxssrqgj: '', // 新车型实施日期(国际) + zccssrqgj: '', // 在产车实施日期(国际) + // 文本信息 + ca: '', // 草案 + fbgbjbd: '', // 发布稿 + xgd: '', // 修改单 + bpg: '', // 报批稿 + ssg: '', // 送审稿 + zqyjg: '', // 征求意见稿 + jdwj: '', // 解读文件 + zbjbd: '', // 增补件 + bfbdtbzh: '', // 增补件 + kwj: '', // 勘误件 + caName: '', // 草案 + fbgbjbdName: '', // 发布稿 + xgdName: '', // 修改单 + bpgName: '', // 报批稿 + ssgName: '', // 送审稿 + zqyjgName: '', // 征求意见稿 + jdwjName: '', // 解读文件 + zbjbdName: '', // 增补件 + kwjName: '', // 勘误件 + glwjName: '', // 关联文件 + // 适用范围 + txlb: '', // 体系类别 + gkdw: '', // 归口管理部门 + qcdw: '', // 起草单位 + wssmr: '', // 我司署名人 + cysd: '', // 我司参与深度 + cllx: '', // 适用车型 + nylx: '',// 能源类型 + sycpx: '',// 适用产品线 + syrz: '', // 适用认证 + zrbm: '', // 责任部门 + zrgcs: '', // 责任工程师 + cycvppsbm: '', // 关联模块--乘用车VPPS编码 + cycvppscn: '', // 关联模块--乘用车vpps中文名称 + kccvppsbm: '', // 关联模块--卡车VPPS编码 + kccvppscn: '', // 关联模块--卡车vpps中文名称 + dybxh: '', // 模块结构单元变型号 + dymc: '', // 模块结构单元名称 + // 关联信息 + dtbjh: '', // 代替标准号 + cbbh: '', // 采标编号 + cbcd: '', // 采标程度 + yybj: '', // 引用标准 + byybj: '', // 被引用标准 + glwj: '', // 关联文件 + xglc: '', // 相关流程 + chjl: '', // 参会记录 }, // 国家/地区 countryOptions: [], + standSystemOptions: [], // 标准体系 + busVppsOptions: [], // 车系体系架构 + busVppsChildOptions: [], // 车系体系架构子集合 + modelOptions: [], // 模块体系架构 + modelChildOptions: [], // 模块体系架构子集合 + cysdOptions: [], // 我司参与深度 + sycpxOptions: [], // 适用产品线 + zrbmOptions: [], // 责任部门 + zrgcsOptions: [], // 责任工程师 + txlbOptions: [], // 体系类别 // 标准类别 standSortOptions: [], + // 我司署名人 + wssmrOptions: [], + // 体系类别 + qcdwOption: [], + // 归口管理部门 + gkglbmOptions: [], + // 采标程度 + cbcdOptions: [], // 标准性质 standNatureOptions: [], // 标准、文件状态 @@ -1081,6 +1319,74 @@ export default { }; }, methods: { + choiceZRR1 (type, title, id) { + this.drawerTitle = title + this.modalShowFlag1 = true + this.key++ + }, + choiceZRR2 (type, title, id) { + this.drawerTitle = title + this.modalShowFlag2 = true + this.url = '' + this.urlChild = '' + this.url="sarVppsTree/list" + this.urlChild="sarVppsTree/childByList" + this.key1++ + }, + choiceZRR3 (type, title, id) { + this.drawerTitle = title + this.modalShowFlag3 = true + this.url = '' + this.urlChild = '' + this.url="sarVppsTree/list" + this.urlChild="sarVppsTree/childByList" + this.key2++ + }, + choiceZRR4 (type, title, id) { + this.drawerTitle = title + this.modalShowFlag4 = true + this.url = '' + this.urlChild = '' + this.url="sarModelTree/list" + this.urlChild="sarModelTree/childByList" + this.key3++ + }, + popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) { + if(checkedData) { + if(checkedData.length > 0){ + this.standForm.dybxh = checkedData.map(item => item.model).join(",") + this.standForm.dymc = checkedData.map(item => item.name).join(",") + }else { + this.standForm.dybxh = checkedData.model + this.standForm.dymc = checkedData.name + } + } + this.modalShowFlag4 = false + }, + popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) { + if(checkedData) { + if(checkedData.length > 0){ + this.standForm.kccvppsbm = checkedData.map(item => item.code).join(",") + this.standForm.kccvppscn = checkedData.map(item => item.chineseName).join(",") + }else { + this.standForm.kccvppsbm = checkedData.code + this.standForm.kccvppscn = checkedData.chineseName + } + } + this.modalShowFlag3 = false + }, + popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { + if(checkedData) { + if(checkedData.length > 0){ + this.standForm.cycvppsbm = checkedData.map(item => item.code).join(",") + this.standForm.cycvppscn = checkedData.map(item => item.chineseName).join(",") + }else { + this.standForm.cycvppsbm = checkedData.code + this.standForm.cycvppscn = checkedData.chineseName + } + } + this.modalShowFlag2 = false + }, // 关联零部件 getRelationParts() { this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this }, res => { @@ -1473,6 +1779,7 @@ export default { nowStandForm.putYear = this.$dateFormat(this.standForm.putYear, "yyyy"); } this.exportSearchInfo = nowStandForm; + nowStandForm['sarStandAttrEOStr'] = JSON.stringify(nowStandForm).replace(/"/g, "'") this.$http.post("search/searchCenter/searchSarBykey", nowStandForm, { _this: this, loading: "resultLoading" @@ -2038,9 +2345,6 @@ export default { window.open("/api/search/searchCenter/exportSearchCenterDatas?exportDatas=" + searchInfoEO + "&searchType=" + this.selectIndex); } }, - components: { - // deptTree - }, props: {}, computed: { // 条件按钮提示 @@ -2069,7 +2373,6 @@ export default { } }, mounted() { - this.getRelationParts(); // 查询检索历史 this.getSearchHistoty(); // 切换标签 @@ -2077,29 +2380,26 @@ export default { _this: this }, res => { // 设置高级搜索下拉框 - this.standNatureOptions = res.data.SARPROPERTY; // 标准性质 - // this.standNatureOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) + this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 + this.standNatureOptions = res.data.SARPROPERTY // 标准性质 + this.standStateOptions = res.data.WBZTCLASS // 文本状态 + this.standSystemOptions = res.data.BZTXCLASS // 标准体系 + this.applyArcticOptions = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车型” + this.categoryOptions = res.data.NYLXCLASS // 能源类型 + this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 + this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.wssmrOptions = res.data.WSSMR // 我司署名人 + this.qcdwOption = res.data.QCDW // 体系类别 + this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 + this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 + this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 + this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 + this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.countryOptions = res.data.COUNTRY; - // this.countryOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) - // this.standSortOptions = res.data.STANDCLASSIFY - // this.standSortOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) - this.applyArcticOptions = res.data.PRODUCTTYPE; // 根据需求文档，产品类别对应标准属性中的“适用车型” - // this.applyArcticOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) - this.applyAuthOptions = res.data.PROVETYPE; // 适用认证下拉框 - // this.applyAuthOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) - this.categoryOptions = res.data.CATEGORY; - // this.categoryOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) - this.standStateOptions = res.data.STANDSTATE; - // this.standStateOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) this.adoptExtentOptions = res.data.DEGREESTANDARD; - // this.adoptExtentOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) this.energyKindOptions = res.data.ENERGYTYPES; - // this.energyKindOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) this.bussBigClassOptions = res.data.BUSSBIGCLASS; - // this.bussBigClassOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) this.bussStandClassOptions = res.data.BUSSSTANDCLASS; - // this.bussStandClassOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) - // 区域前台新加----没测试噢噢噢噢哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦 this.regionOptions = res.data.REGION; // 区域 }, e => { }); @@ -2110,7 +2410,7 @@ export default { this.showBuyRole(); // 组织结构 this.getOrgTreeSource(); - this.selectBussRoleMsg(); + // this.selectBussRoleMsg(); // 滚动事件绑定 window.addEventListener("scroll", this.handleScrollHeader); // 检索中心特殊处理 From d56974c416b6edc7e94a4f5e74babf4c7d330f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 4 Aug 2021 18:00:55 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E4=BA=A4loding?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 2 + .../pages/creatProcess/bzqdfb/step1.vue | 5 +- .../pages/creatProcess/bzqdfb/step2.vue | 2 + .../pages/creatProcess/bzqdfb/step3.vue | 2 + .../pages/creatProcess/bzqdfb/step4.vue | 2 + .../pages/creatProcess/xmpg/step1-1.vue | 3 +- .../pages/creatProcess/xmpg/step1.vue | 1 + .../pages/creatProcess/xmpg/step2.vue | 2 + .../pages/creatProcess/xmpg/step3.vue | 2 + .../pages/creatProcess/xmpg/step4.vue | 2 + .../pages/creatProcess/xmpg/step5.vue | 2 + .../pages/creatProcess/xmpg/step6.vue | 2 + .../pages/creatProcess/xmpg/step7.vue | 2 + .../pages/creatProcess/xmpg/test.vue | 595 ------------------ 14 files changed, 26 insertions(+), 598 deletions(-) delete mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/test.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index da6e5b796..0aaef349e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1057,6 +1057,7 @@ export default { if (valid) { this.$refs["Form"].validate((valid) => { if (valid) { + this.isSubmit = true this.$http.get("lawss/activiti/startProcess", { type: "4" }, { _this: this }, res => { @@ -1072,6 +1073,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }); } }); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 1fad32ba3..574677866 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -208,7 +208,7 @@ + :color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'">

标准/政策法规工程师

@@ -1024,11 +1024,11 @@ export default { this.$message.warning("标准不能为空"); } else { var json = Object.assign(this.listForm, this.roleForm); - console.log(json) this.$refs["qdfbForm"].validate((valid) => { if (valid) { this.$refs["Form"].validate((valid) => { if (valid) { + this.isSubmit = true this.$http.get("lawss/activiti/startProcess", { type: "4" }, { _this: this }, res => { @@ -1044,6 +1044,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }); } }); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 1b18f1766..f651fe48e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -390,6 +390,7 @@ export default { if (this.commentText === null || this.commentText === undefined || this.commentText === "") { this.$message.warning("请填写会签意见"); }else{ + this.isSubmit = true this.listForm.commentText = this.commentText; this.listForm.approvalOpinion = ""; this.listForm.signFlag = ""; @@ -405,6 +406,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 79adf88df..8c29d742e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -712,6 +712,7 @@ export default { //提交事件 handleSubmit() { const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -723,6 +724,7 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + this.isSubmit = false }); }, //标准表格选择框改变 diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index cfb326ed6..0d8cf9310 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -404,6 +404,7 @@ export default { if (this.commentText === null || this.commentText === undefined || this.commentText === "") { this.$message.warning("请填写审批意见"); } else { + this.isSubmit = true this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -417,6 +418,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }); } }, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 48849b845..2e84bd32f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -681,7 +681,7 @@ export default { this.$message.warning("请选择分发责任人"); } else { var json = Object.assign(this.listForm, this.roleForm); - console.log(json); + this.isSubmit = true this.$refs["listForm"].validate((valid) => { if (valid) { this.$refs["roleForm"].validate((valid) => { @@ -701,6 +701,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }); } }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index c75e17d9b..58f52cd16 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -678,6 +678,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }); } }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 688712f47..696a2f8e8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -341,6 +341,7 @@ export default { }else{ this.listForm.commentText = this.commentText const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -352,6 +353,7 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index e3362d266..29c37d98e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -459,6 +459,7 @@ export default { this.listForm.approvalOpinion = ""; this.listForm.signFlag = ""; const json = JSON.stringify(this.listForm.breakdownList); + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -470,6 +471,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } else { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 1a4d60404..548f3e639 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -493,6 +493,7 @@ export default { this.listForm.signFlag = ""; this.listForm.dataList = this.dataList; const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -504,6 +505,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 4e92accc3..b350287cb 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -480,6 +480,7 @@ export default { this.listForm.dataList = this.dataList this.listForm.fenFlag = '2' const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -491,6 +492,7 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index eeec0a723..e74199aa4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -455,6 +455,7 @@ export default { if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ this.$message.warning('请填写审批意见') } else { + this.isSubmit = true this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; @@ -475,6 +476,7 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + this.isSubmit = false }, e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index a1ef9dd2f..40b79891e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -463,6 +463,7 @@ export default { this.listForm.fenFlag = "1"; this.listForm.dataList = this.dataList const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -474,6 +475,7 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + this.isSubmit = false }, e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/test.vue b/src/pages/processCenter/pages/creatProcess/xmpg/test.vue deleted file mode 100644 index daa015930..000000000 --- a/src/pages/processCenter/pages/creatProcess/xmpg/test.vue +++ /dev/null @@ -1,595 +0,0 @@ - - - - - - -