From 1219f3b49f105454f429b994b90bb6689a2d6fed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 3 Aug 2021 11:15:55 +0800 Subject: [PATCH 01/12] commit --- .../processCenter/pages/creatProcess/xmpg2/step1.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 5dabd8629..7864191ff 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -85,22 +85,22 @@ { this.ProjectDatas = res.data.Maintenance.records; + this.total = res.data.Maintenance.total; }); }, From 7f69ee42ecb75867666815f0c6f1f3b9884b8d72 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Tue, 3 Aug 2021 11:24:52 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step1.vue | 126 ++++++++++++++---- .../pages/creatProcess/wfhxzg/step2.vue | 35 ++++- .../pages/creatProcess/wfhxzg/step3.vue | 53 ++++++-- 3 files changed, 176 insertions(+), 38 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index ebb110b56..49068ff27 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -29,7 +29,16 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - + + + + + + @@ -87,6 +96,42 @@ + + + +

确认+选择责任人

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

负责人

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

分发负责人

+
+ + + +
+ + + @@ -103,7 +148,7 @@ @@ -154,25 +199,44 @@ + @selection-change="selectedChange" + > - - - - - - - + + + + + + + + + + + + + + +
取消 带入 @@ -217,13 +281,17 @@ export default { // 责任部门 zrbmOptions: [], standModel: false, + // 总数 + total: 0, + // 当前页数 + pageNo: 1, // 查询未符合项整改数据库数据 queryUnqualidiedData: { pageNo: 1, pageSize: 10, total: 0, closeState: '1', - standId: '', // 标准号/名称 + standSerialNumber: '', // 标准号/名称 productName: '', // 项目名称 responsibleUnit: '' // 责任部门 }, @@ -269,9 +337,9 @@ export default { this.$set(item,'dutyPeople','') this.$set(item,'dutyPeopleInfoId','') this.$set(item,'dutyPeopleId','') - this.$set(item,'fileText','') - this.$set(item,'fileTextId','') - this.$set(item,'fileTextPath','') + this.$set(item,'fileText',[]) + this.$set(item,'fileTextId',[]) + this.$set(item,'fileTextPath',[]) }) this.total = res.data.total }) @@ -308,6 +376,18 @@ export default { }); } }, + // 点击查看 + handlePreview (item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'FOREIGN_STAND' + // pageType: item.standType + '_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, //选择标准取消事件 closeDrawer() { this.standModel = false @@ -432,7 +512,7 @@ export default { // 清空 查询条件 clearAllSearch (search = true) { this.queryUnqualidiedData = { - standId: '', + standSerialNumber: '', productName: '', responsibleUnit: '' } diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index d0c774c8a..4a203c4e7 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -13,7 +13,7 @@ - +
- + + + + + + @@ -119,7 +128,6 @@ -
@@ -316,9 +324,9 @@ export default { const params = { taskIds: this.taskIds, pId: this.pId, - standId: '', // 标准号/名称 - productName: '', // 项目名称 - responsibleUnit: '' // 责任部门 + // standId: '', // 标准号/名称 + // productName: '', // 项目名称 + // responsibleUnit: '' // 责任部门 } inboundLiaisonDetail(params).then(res => { const processForm = JSON.parse(res.mesg) @@ -328,6 +336,7 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList + this.textarea = JSON.parse(JSON.stringify(item)).commentText }) }, // 批量选择分发责任人 @@ -455,6 +464,18 @@ export default { }) this.dataList = this.realList }, + // 点击查看 + handlePreview (item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'FOREIGN_STAND' + // pageType: item.standType + '_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, // 清空 查询条件 clearAllSearch () { this.nonSearch = { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index e7b4bc4e9..ba1775e1f 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -13,7 +13,7 @@ - +
- + + + + + + @@ -125,7 +134,6 @@ -
@@ -316,6 +324,7 @@ export default { for (let i = 0; i { + if (res.success) { + this.$message.success('驳回成功') + this.$router.push('/processCenter') + } + this.isSubmit = false + }) + } else { + this.$message.warning('请输入反馈意见') + } +/* this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, userId: this.$store.getters.userInfo.userId @@ -365,7 +390,19 @@ export default { }) } else { this.$message.warning('请输入反馈意见') - } + }*/ + }, + // 点击查看 + handlePreview (item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'FOREIGN_STAND' + // pageType: item.standType + '_STAND' + } + }) + window.open(routeUrl.href, '_blank') }, // 保存按钮 handleSave() {}, From 1ab9e81ded617772565053887d91b9b2fb736d08 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 3 Aug 2021 13:37:05 +0800 Subject: [PATCH 03/12] commit --- .../pages/creatProcess/bzjd/step1.vue | 14 +- .../pages/creatProcess/bzjd/step2.vue | 149 ++++++------------ .../pages/creatProcess/bzjd/step3.vue | 61 ++++--- .../pages/creatProcess/bzjd/step4.vue | 38 +++-- .../pages/creatProcess/bzjd/step5.vue | 38 +++-- .../pages/creatProcess/bzjd/step6.vue | 40 ++--- 6 files changed, 166 insertions(+), 174 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 4ab746639..f274448db 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -600,12 +600,6 @@ } this.modalshowflag = false }, - handleSelectionChange (val) { - this.zrIdList = [] - val.forEach( item => { - this.zrIdList.push(item.id) - }) - }, choiceZRRS (row, type, index) { this.type = type if (type === 1) { @@ -632,6 +626,12 @@ this.modalshowflag = true } }, + handleSelectionChange (val) { + this.zrIdList = [] + val.forEach( item => { + this.zrIdList.push(item.id) + }) + }, handleTabs(name) { this.active = name }, @@ -650,6 +650,7 @@ if (b > 0) { this.$message.warning('请选择责任人') } else { + this.isSubmit = true this.$http.get('lawss/activiti/startProcess', { type: '9' }, {}, res => { @@ -672,6 +673,7 @@ this.$message.warning('流程启动失败') } }) + this.isSubmit = false } } else { return this.$message.warning('请完善人员信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index ebf12321b..77c7bec18 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -26,7 +26,7 @@ @@ -34,7 +34,7 @@ @@ -42,28 +42,28 @@ @@ -198,7 +198,6 @@
- - - - - + + 加载中... @@ -245,33 +226,30 @@ name: "bzjdStep2", data() { return { + type: '', + drawerTitle: '', histortData: [], sarType: '', zxIndex: '', zxType: '', zxIdList: [], modalshowflag2: false, - treeData: [], nodeList2: [], - defaultProps: { - children: 'children', - label: 'name' - }, - loading: false, + loading: true, commentText: '', taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, roleRow: {}, - type: '', - drawerTitle: '', //drawer标题 textarea: '', // 意见 ListModel: false, // 新增编辑抽屉开关 active: '1', // 默认显示 isSubmit: false, saveLoading: false, form: { - number: '', - name: '', + itemsNum: '', + itemsName: '', + itemsNum1: '', + itemsName1: '', }, json: {}, itemList: [] @@ -290,26 +268,18 @@ this.histortData = res }, e => {}) }, - drawerCheck2 (data) { - var getlist = this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()); - if(getlist.length == 1) { - this.roleRow = getlist[0] - }else { - this.$refs.tree2.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree2.getCheckedNodes()[0] - } - }, choiceZRRS (row, type, index) { + this.type = type if (type === 1) { + this.drawerTitle = '选择责任部门对接人' this.nodeList2 = [] this.zxIndex= index - this.zxType = type this.nodeList2.push(row) this.modalshowflag2 = true } else { // 批量 + this.drawerTitle = '批量选择责任部门对接人' if (this.zxIdList.length > 0) { - this.zxType = type this.nodeList2 = [] this.modalshowflag2 = true } else { @@ -317,39 +287,21 @@ } } }, - saveUserInfo2 () { - var idList = '' - var nameList = '' - this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => { - if (nameList.length > 0) { - nameList += ',' - idList += ',' - } - idList += item.id - nameList += item.name - }) - if (this.zxType == 1) { - this.itemList[this.zxIndex].zxUserId = idList - this.itemList[this.zxIndex].zxUserIdName = nameList + saveUserInfo (data) { + if (this.type === 1) { + this.itemList[this.zxIndex].zxUserId = data[0].id + this.itemList[this.zxIndex].zxUserIdName = data[0].name } else { this.itemList.forEach( item => { this.zxIdList.forEach( items => { if (item.id === items) { - item.zxUserId = idList - item.zxUserIdName = nameList + item.zxUserId = data[0].id + item.zxUserIdName = data[0].name } }) }) } - this.modalshowflag2 = false - }, - cancleUserInfo2 () { - this.modalshowflag2 = false - }, - getTree () { - this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { - this.treeData = res.data - }) + this.modalshowflag = false }, handleTabs(name) { this.active = name @@ -366,20 +318,23 @@ } if (b > 0) { this.$message.warning('请选择执行人') + } else { + this.isSubmit = true + var json = this.json + json.itemList = this.itemList + json.commentText = this.commentText + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: this.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('提交成功') + this.$router.push('/processCenter') + } + }) + this.isSubmit = false } - var json = this.json - json.itemList = this.itemList - json.commentText = this.commentText - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: this.taskIds, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('提交成功') - this.$router.push('/processCenter') - } - }) } else { return this.$message.warning('请完善基础信息') } @@ -398,10 +353,10 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.number = data.number - this.form.name = data.name - this.form.number1 = data.number1 - this.form.name1 = data.name1 + this.form.itemsNum = data.itemsNum + this.form.itemsName = data.itemsName + this.form.itemsNum1 = data.itemsNum1 + this.form.itemsName1 = data.itemsName1 this.sarType = data.standInData this.json = data var arr = [] @@ -411,6 +366,7 @@ item.zxUserIdName = '' }) this.itemList = arr + this.loading = false }).catch(e => { }) }) @@ -418,7 +374,6 @@ }, mounted () { this.getHistoryData() - this.getTree() this.getData() } } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index ec3179f4c..5a7bfc5ef 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -26,7 +26,7 @@ @@ -34,7 +34,7 @@ @@ -42,28 +42,28 @@ @@ -189,6 +189,11 @@ width="150" label="适用车型" align="center"> + - 数据获取中
@@ -278,7 +282,6 @@
+ + + + + + 加载中... @@ -359,6 +368,7 @@ name: "bzjdStep3", data() { return { + cxList: [], histortData: [], plForm: { technicalRequir: '', // 核心技术要求 @@ -367,11 +377,12 @@ complianceState: '', // 合规性分析 newData: '', // 新车型实施日期 onlineData: '', // 在产车实施日期 + applyArctic: '', // 适用车型 }, modalshowflag: false, sarType: '', itemList: [], - loading: false, + loading: true, commentText: '', taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, @@ -380,10 +391,10 @@ isSubmit: false, saveLoading: false, form: { - number: '', - name: '', - number1: '', - name1: '' + itemsNum: '', + itemsName: '', + itemsNum1: '', + itemsName1: '', }, json: {}, idList: [] @@ -412,6 +423,7 @@ this.itemList[a].complianceState = this.plForm.complianceState this.itemList[a].newData = this.plForm.newData this.itemList[a].onlineData = this.plForm.onlineData + this.itemList[a].applyArctic = this.plForm.applyArctic } } } @@ -446,7 +458,7 @@ handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { - let num1 = 0, num2 = 0, num3 = 0, num4 = 0, num5 = 0 + let num1 = 0, num2 = 0, num3 = 0, num4 = 0, num5 = 0, num6 = 0 for (let a = 0; a < this.itemList.length; a++) { if (!this.itemList[a].technicalRequir) { num1++ @@ -463,6 +475,9 @@ if (!this.itemList[a].onlineData) { num5++ } + if (!this.itemList[a].applyArctic) { + num6++ + } } if (num1 > 0) { this.$message.warning('请输入核心技术要求') @@ -478,7 +493,10 @@ this.$message.warning('请输入新车型实施日期') } else if (num5 > 0) { this.$message.warning('请输入在产车实施日期') + } else if (num6 > 0) { + this.$message.warning('请选择适用车型') } else { + this.isSubmit = true var json = this.json json.commentText = this.commentText json.itemList = this.itemList @@ -492,6 +510,7 @@ this.$router.push('/processCenter') } }) + this.isSubmit = false } } else { return this.$message.warning('请完善基础信息') @@ -505,10 +524,10 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.number = data.number - this.form.name = data.name - this.form.number1 = data.number1 - this.form.name1 = data.name1 + this.form.itemsNum = data.itemsNum + this.form.itemsName = data.itemsName + this.form.itemsNum1 = data.itemsNum1 + this.form.itemsName1 = data.itemsName1 this.sarType = data.standInData this.json = data const itemList = JSON.parse(data.itemList) @@ -524,6 +543,7 @@ item.itemsTitle = item.itermsConditions }) this.itemList = itemList + this.loading = false }).catch(e => { }) }) @@ -532,6 +552,11 @@ mounted () { this.getHistoryData() this.getData() + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + this.cxList = res.data.ENERGYTYPES // 适用车型 + }) } } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 4d68f687d..ff4b8c6aa 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -26,7 +26,7 @@ @@ -34,7 +34,7 @@ @@ -42,28 +42,28 @@ @@ -176,7 +176,6 @@ align="center"> - 数据获取中
@@ -250,8 +249,8 @@
+ 加载中... { let data = JSON.parse(res.mesg) - this.form.number = data.number - this.form.name = data.name - this.form.number1 = data.number1 - this.form.name1 = data.name1 + this.form.itemsNum = data.itemsNum + this.form.itemsName = data.itemsName + this.form.itemsNum1 = data.itemsNum1 + this.form.itemsName1 = data.itemsName1 this.sarType = data.standInData this.json = data this.itemList = data.itemList + this.loading = false }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index d8fbe2523..8030287a6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -26,7 +26,7 @@ @@ -34,7 +34,7 @@ @@ -42,28 +42,28 @@ @@ -176,7 +176,6 @@ align="center"> - 数据获取中
@@ -251,7 +250,6 @@
+ 加载中... @@ -278,7 +277,7 @@ histortData: [], sarType: '', itemList: [], - loading: false, + loading: true, commentText: '', taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, @@ -287,10 +286,10 @@ isSubmit: false, saveLoading: false, form: { - number: '', - name: '', - number1: '', - name1: '' + itemsNum: '', + itemsName: '', + itemsNum1: '', + itemsName1: '', }, json: {}, } @@ -313,6 +312,7 @@ }, handleSave() {}, handleSubmit() { + this.isSubmit = true var json = this.json json.zrApplyFlag = 1 json.commentText = this.commentText @@ -325,10 +325,12 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) }, handleSubmitNo () { if (this.commentText) { + this.isSubmit = true var json = this.json json.zrApplyFlag = 2 json.commentText = this.commentText @@ -341,6 +343,7 @@ this.$message.success('驳回成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') @@ -353,13 +356,14 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.number = data.number - this.form.name = data.name - this.form.number1 = data.number1 - this.form.name1 = data.name1 + this.form.itemsNum = data.itemsNum + this.form.itemsName = data.itemsName + this.form.itemsNum1 = data.itemsNum1 + this.form.itemsName1 = data.itemsName1 this.sarType = data.standInData this.json = data this.itemList = data.itemList + this.loading = true }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index c29c8e39e..9c0039f5d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -26,7 +26,7 @@ @@ -34,7 +34,7 @@ @@ -42,28 +42,28 @@ @@ -177,7 +177,6 @@ align="center"> - 数据获取中
@@ -252,17 +251,15 @@
+ 加载中... @@ -279,7 +276,7 @@ histortData: [], sarType: '', itemList: [], - loading: false, + loading: true, commentText: '', taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, @@ -288,10 +285,10 @@ isSubmit: false, saveLoading: false, form: { - number: '', - name: '', - number1: '', - name1: '' + itemsNum: '', + itemsName: '', + itemsNum1: '', + itemsName1: '', }, json: {}, } @@ -314,6 +311,7 @@ }, handleSave() {}, handleSubmit() { + this.isSubmit = true var json = this.json json.gcApplyFlag = 1 json.commentText = this.commentText @@ -326,10 +324,12 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) }, handleSubmitNo () { if (this.commentText) { + this.isSubmit = true var json = this.json json.gcApplyFlag = 2 json.commentText = this.commentText @@ -342,6 +342,7 @@ this.$message.success('驳回成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') @@ -354,13 +355,14 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.number = data.number - this.form.name = data.name - this.form.number1 = data.number1 - this.form.name1 = data.name1 + this.form.itemsNum = data.itemsNum + this.form.itemsName = data.itemsName + this.form.itemsNum1 = data.itemsNum1 + this.form.itemsName1 = data.itemsName1 this.sarType = data.standInData this.json = data this.itemList = data.itemList + this.loading = false }).catch(e => { }) }) From fdcc5a86923d55c1096b2abddd483c4fdfdcff2f Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 3 Aug 2021 13:40:38 +0800 Subject: [PATCH 04/12] commit --- .../processCenter/pages/creatProcess/bzjd/step1.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index f274448db..55c6529cd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -248,6 +248,17 @@ + + + + From af7a7493699aba09e0b357469d44a795c8d8c72f Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 3 Aug 2021 13:57:13 +0800 Subject: [PATCH 05/12] commit --- .../pags/consultationDetails.vue | 738 +++++++++--------- 1 file changed, 375 insertions(+), 363 deletions(-) diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 684ffedb8..578bec260 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -1,92 +1,92 @@ + + + + Date: Tue, 3 Aug 2021 14:49:11 +0800 Subject: [PATCH 08/12] commit --- .../pages/creatProcess/bzjd/step1-1.vue | 874 ++++++++++++++++++ .../pages/creatProcess/bzjd/step1.vue | 123 ++- .../pages/creatProcess/bzjd/step2.vue | 2 +- .../pages/creatProcess/bzjd/step3.vue | 2 +- .../tabComponents/taskDraft/index.vue | 10 + .../domesticStandardsAndRegulations/index.vue | 1 - src/router/index.js | 9 + 7 files changed, 995 insertions(+), 26 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue new file mode 100644 index 000000000..56f6aa09e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -0,0 +1,874 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 55c6529cd..0e1e083c2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -272,7 +272,7 @@ - - - - + label="标准号" + > + - - - - + label="标准名称"> + + + + + + + + + + + + @@ -339,11 +363,12 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - + import { saveTaskFirst } from 'api/process' export default { name: "bzjdStep1", data() { return { + textStatusMap: {}, listModel2: false, standInfoList2: [], sarType: '', @@ -384,7 +409,7 @@ standCommonlySearch2: { page: 1, pageSize: this.$store.getters.userInfo.configContent, - result: '1', + userId : this.$store.getters.userInfo.userId, standType: 'INLAND' }, spinShow: false, @@ -433,6 +458,19 @@ ProcessTitle }, methods: { + setMap(data){ + data.forEach(item => { + this.$set(this.textStatusMap, item.value, item.label) + }) + }, + formatIssueDate(str) { + const momentDate = this.$moment(str) + if (momentDate.isValid()) { + return this.$moment(str).format('YYYY-MM-DD') + } else { + return str + } + }, addZqyjList() { this.title = '标准拆分数据库' this.listModel = true @@ -468,11 +506,25 @@ }, sarStandCompareHis2 () { var form = this.standCommonlySearch2 - this.$http.get('lawss/sarFileSplitInfo/getSarFileSplitInfoEOPage', form, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', form, { _this: this }, res => { this.standInfoList2 = res.data.list - this.total2 = res.data.total + this.standInfoList2.forEach(item => { + if (item.attrInfoMap && item.attrInfoMap.XCXSSRQ) { + item.XCXSSRQ = item.attrInfoMap.XCXSSRQ + } + if (item.attrInfoMap && item.attrInfoMap.ZCCSSRQ) { + item.ZCCSSRQ = item.attrInfoMap.ZCCSSRQ + } + }) + + this.total2 = res.data.count + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + this.setMap(res.data.WBZTCLASS) + }) }, e => { }) }, @@ -580,7 +632,11 @@ // this.form.itemsNum1 = bringData[0].showNumber // this.form.itemsName1 = bringData[0].standName // } - this.form.itemsNum1 = bringData[0].showNumber + if (bringData[0].standYear) { + this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + } else { + this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber + } this.form.itemsName1 = bringData[0].standName this.form.oldNumber = bringData[0].id this.listModel2 = false @@ -646,7 +702,28 @@ handleTabs(name) { this.active = name }, - handleSave() {}, + handleSave() { + this.saveLoading = true + let _formData = new FormData() + _formData.append('id', this.bpnId || '') + _formData.append('createUser', this.$store.getters.userInfo.userId) + _formData.append('createUserName', this.$store.getters.userInfo.userName) + _formData.append('prcType', '9') + _formData.append('json', JSON.stringify({ + form: this.form, + roleForm: this.roleForm, + commentText: this.commentText, + itemList: this.itemList, + sarType: this.sarType + })) + saveTaskFirst(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { @@ -682,9 +759,9 @@ }) } else { this.$message.warning('流程启动失败') + this.isSubmit = false } }) - this.isSubmit = false } } else { return this.$message.warning('请完善人员信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 77c7bec18..1ebcac3fe 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -332,8 +332,8 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) - this.isSubmit = false } } else { return this.$message.warning('请完善基础信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 5a7bfc5ef..b1513d569 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -509,8 +509,8 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) - this.isSubmit = false } } else { return this.$message.warning('请完善基础信息') diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index bd68b0c25..9c30e58d3 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -335,6 +335,16 @@ export default { } }) break + case '9': + this.$router.push({ + name: 'bzjdStep1-1', + query: { + type: '9', + processName: '标准解读流程', + bpnId: id + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index f14971026..dcdd4e90e 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3501,7 +3501,6 @@ export default { } } this.stahndinfoList = res.data.list - console.log(this.stahndinfoList) this.total = res.data.count if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) { this.pageChange(1) diff --git a/src/router/index.js b/src/router/index.js index 9b3ba16fc..abb7f7bf3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -781,6 +781,15 @@ const routes = [ title: '标准解读流程' } }, + { + path: '/bzjdStep1-1', + name: 'bzjdStep1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue'), + meta: { + requireAuth: true, + title: '标准解读流程' + } + }, { path: '/bzjdStep2', name: 'bzjdStep2', From 1746c1d5b7fe77ed8a2074b4a7b912f538191776 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 3 Aug 2021 15:07:08 +0800 Subject: [PATCH 09/12] commit --- src/common/axiosV2/index.js | 3 ++- src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/axiosV2/index.js b/src/common/axiosV2/index.js index e86814c70..f4aaa8125 100644 --- a/src/common/axiosV2/index.js +++ b/src/common/axiosV2/index.js @@ -2,6 +2,7 @@ import axios from 'axios' import router from '@/router' import store from '@/store' import {Message} from 'element-ui' +import { baseUrl } from '@/sysConfig' // import 'element-ui/lib/theme-chalk/index.css' /** @@ -18,7 +19,7 @@ let formData = (data) => { } const service = axios.create({ - baseURL: '/' + baseURL: process.env.NODE_ENV === 'production' ? baseUrl : '/' }) service.defaults.timeout = 99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 56f6aa09e..337123722 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -176,7 +176,6 @@ Date: Tue, 3 Aug 2021 15:58:04 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84--=E5=88=97=E8=A1=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AE=9E=E6=96=BD=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=EF=BC=88=E6=A0=87=E5=87=86=E6=96=87=E6=9C=AC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 76ff36995..082aff793 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -195,7 +195,7 @@ width="150px" label="实施日期"> From 28451a6343bfdb1aff4508b2adc23e38c167a4cb Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Tue, 3 Aug 2021 16:28:11 +0800 Subject: [PATCH 11/12] =?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/step1.vue | 18 ++- .../pages/creatProcess/wfhxzg/step4.vue | 126 ++++++++++-------- .../pages/creatProcess/wfhxzg/step5.vue | 59 +++++++- 3 files changed, 142 insertions(+), 61 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 49068ff27..7d0b0fe66 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -265,7 +265,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import { startProcess, completeTask, saveTaskFirst } from '@/api/process.js' +import { startProcess, completeTask, saveTaskFirst, queryTaskFirst } from '@/api/process.js' import { standUnqualified, dicTypeData } from '@/api/unqualProcess.js' export default { name: "wfhxzgStep1", @@ -322,7 +322,23 @@ export default { ProcessFooter, ProcessTitle }, + mounted() { + this.bpnId = this.$route.query.bpnId + if (this.bpnId !== undefined) { + this.getData() + } + }, methods: { + getData() { + queryTaskFirst({ + bpnId: this.$route.query.bpnId + }).then(res => { + let mes = JSON.parse(res.mes); + this.dataList = mes.dataList; + this.roleForm = mes.roleForm; + this.commentText = mes.commentText; + }); + }, //点击新增事件 addList() { dicTypeData().then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index b5827c953..df0c6c866 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -13,7 +13,7 @@ - + + + + + + + @@ -97,32 +107,30 @@ - + - @@ -214,23 +222,6 @@ @submit="handleSubmit" > - - -
- -

点击或拖拽上传文件

-
- - @@ -238,7 +229,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {interfaceUrl} from "@/sysConfig"; +import {uploadFile} from '@/api/unqualProcess.js'; import {inboundLiaisonDetail, completeTask} from "@/api/process" export default { @@ -268,6 +259,8 @@ export default { // 上传路径 uploadPath: 'api/att/attFile/upload', fileMadel: false, + // 上传所储存文件数组 + fileTextList: [], newDataList: [], // 责任部门 zNodesSItem: [], @@ -315,12 +308,18 @@ export default { this.$nextTick(() => { this.dataList = [JSON.parse(JSON.stringify(item.responUserInfo.info))] - /*for (let i = 0; i { + if (item.fileText.length !== 0) { + item.fileText.forEach(item1 => { + this.fileTextList.push({ + id: item1.id, + name: item1.name + }) + }) } - }*/ + }) }) }, @@ -328,16 +327,22 @@ export default { this.active = name }, /************ 上传佐证材料 *****************/ - fileUpload (val) { - this.newDataList = val - this.fileMadel = true + uploadFile (val) { + this.fileListData = val }, // 文件上传成功 handleOnsuccess(res, file, fileList) { if (res.ok) { - this.newDataList.fileText = res.data.name - this.newDataList.fileTextId = res.data.id - this.newDataList.fileTextPath = res.data.filePath + this.newDataList.push({ + id: res.data.attId, + name: res.data.standName + }) + this.newDataList.forEach(item =>{ + this.fileListData.fileText.push({ + id: item.id, + name: item.name + }) + }) this.$message({ showClose: true, message: res.message, @@ -374,13 +379,28 @@ export default { return true }, // 移除上传的文件 - handleBeforeRemove() {}, - handleOnRemove() {}, - // 文件超过限制数量提示 - handleExceed() { - this.$message.error(``) + handleBeforeRemove(file, fileList) { + this.fileTextList = fileList + this.newDataList.forEach((item, index) => { + if (file.name === item.name || file.id === item.id) { + this.newDataList.splice(index, 1) + } + }) }, + /************ ********* *****************/ + // 点击查看 + handlePreview (item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'FOREIGN_STAND' + // pageType: item.standType + '_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, // 保存按钮 handleSave() {}, // 提交按钮 @@ -388,7 +408,7 @@ export default { this.isSubmit = true let flag=false this.dataList.forEach(item => { - if (item.fileText === '') { + if (item.fileText.length === 0) { flag=true this.isSubmit = false } diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 389c2dc99..073001399 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -13,7 +13,7 @@ - + + + + + + + @@ -96,14 +106,19 @@ - - + + - @@ -222,6 +237,7 @@ export default { productName: '', // 项目名称 responsibleUnit: '' // 责任部门 }, + fileTextList: [], active: '1', // 默认显示 isSubmit: false, backLoading: false, @@ -281,13 +297,39 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList + this.dataList.forEach(item => { + item.fileText.forEach(item1 => { + this.fileTextList.push({ + id: item1.id, + name: item1.name + }) + }) + }) }) }, handleTabs(name) { this.active = name }, - + // 点击查看 + handlePreview (item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'FOREIGN_STAND' + // pageType: item.standType + '_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, + // 点击上传的文件进行下载 + handleOnPreview(file) { + let attId = file.id + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } + }, // 提交按钮 handleSubmit() { this.isSubmit = true @@ -407,6 +449,9 @@ export default { background: #E6A23C; } } + /deep/.el-upload{ + display: block; + } .content-center { padding: 10px 0px 10px 10px; } From fe9f8f14b146d678e1b26c5a982d36159aaaaaf0 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Tue, 3 Aug 2021 16:30:27 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BA=BA=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 7d0b0fe66..6d8ca7b07 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -78,8 +78,8 @@

流程发起人

- - + +