From 265fb2a83d232ee6497fcb5dafd4dad79e40d9be Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 24 Dec 2021 10:28:13 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8F=82=E4=BC=9A=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=A1=86=E5=8A=A0=E5=8F=AF=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standCalendar/index.vue | 1 - src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue | 3 +++ src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue index 2aebcb0ad..8006a15cc 100644 --- a/src/pages/localTool/standCalendar/index.vue +++ b/src/pages/localTool/standCalendar/index.vue @@ -520,7 +520,6 @@ export default { localStorage.setItem('objs', JSON.stringify(item)) this.fileListData = item this.reData = item.files - console.log(item) this.editMeetForm = item this.editMeetForm.contents = [] if (this.editMeetForm.content !== '') { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index c5481e7e7..15ededbd0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -63,6 +63,7 @@ @@ -48,6 +49,7 @@ @@ -62,6 +64,7 @@ Date: Fri, 24 Dec 2021 10:32:37 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=A1=86=E5=8A=A0=E5=8F=AF=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 15ededbd0..af4ab5d56 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -20,6 +20,7 @@ @@ -34,6 +35,7 @@ @@ -48,6 +50,7 @@ Date: Fri, 24 Dec 2021 10:43:48 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20-=20?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=80=A7=E8=B4=A8=20-=20=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 5a30d3110..27e97489d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1574,9 +1574,9 @@ { required: false, message: '请输入标准英文名称', trigger: 'blur' }, { min: 1, max: 500, message: '长度在 1 到 500 个字符', trigger: 'blur' } ], - /*standNature: [ + standNature: [ { required: true, message: '请选择标准性质', trigger: 'change' } - ],*/ + ], textStatus: [ { required: true, message: '请选择文本状态', trigger: 'change' } ] From 2bb8f30f8d001dff7b073abacd337b75ca996ad9 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 24 Dec 2021 11:02:05 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=81=E6=A0=B7=E5=BC=8F=E3=80=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=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 | 151 ++++++++++-------- .../pages/creatProcess/wfhxzg/step2.vue | 4 +- .../pages/creatProcess/wfhxzg/step3.vue | 2 +- .../pages/creatProcess/wfhxzg/step4.vue | 2 +- .../pages/creatProcess/wfhxzg/step5-1.vue | 2 +- .../pages/creatProcess/wfhxzg/step5.vue | 2 +- 6 files changed, 86 insertions(+), 77 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 006476cef..183eebc5a 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -10,46 +10,46 @@
- - - -
-
- 添加 - 批量删除 -
+ + + +
+
+ 添加 + 批量删除
- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
@@ -173,7 +173,7 @@ class="common-button-primary" size="mini" v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'" - @click="getTableByPage('')"> + @click="getTableByPage"> 查询 @@ -326,8 +326,9 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel,processBack } from '@/api/process.js' -import { standUnqualified, dicTypeData } from '@/api/unqualProcess.js' +import {startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel, processBack} from '@/api/process.js' +import {standUnqualified, dicTypeData} from '@/api/unqualProcess.js' + export default { name: "wfhxzgStep1", data() { @@ -365,7 +366,7 @@ export default { }, deleteDataList: [], roleFormRules: { - dockUserName: [{ required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}] + dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}] }, nodeList: [], drawerTitle: '', //drawer标题 @@ -419,23 +420,23 @@ export default { if (item.responsibleUnit !== null || item.responsibleUnit !== "") { let k = (item.responsibleUnit || "").split(',') for (let i in this.zrbmOptions) { - for (let m = 0; m< k.length; m++) { + for (let m = 0; m < k.length; m++) { if (this.zrbmOptions[i].value === k[m]) { - k[m] = this.zrbmOptions[i].label + k[m] = this.zrbmOptions[i].label } item.responsibleUnit = k.join(',') } } } - this.$set(item,'engineer','') - this.$set(item,'engineerId','') - this.$set(item,'dutyPeopleInfo','') - 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, 'engineer', '') + this.$set(item, 'engineerId', '') + this.$set(item, 'dutyPeopleInfo', '') + 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.total = res.data.total this.loading = false @@ -478,7 +479,7 @@ export default { } }, // 点击查看 - handlePreview (item) { + handlePreview(item) { let routeUrl = this.$router.resolve({ name: 'OtherStandardDetails', params: { @@ -506,12 +507,12 @@ export default { addList = this.dataList.findIndex(items => { return items.id === item.id }) - if(addList > -1){ + if (addList > -1) { // this.$refs.accessTypeSelect.clearSelection() this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() this.$message.warning('请勿添加重复数据') - } else{ + } else { this.dataList.push(item) // this.$refs.accessTypeSelect.clearSelection() this.$refs.entryTable.clearSelection() @@ -557,7 +558,7 @@ export default { }, // 提交按钮 handleSubmit() { - this.dataList.forEach(item =>{ + this.dataList.forEach(item => { item.standId = item.standSerialNumber }) let json = { @@ -593,13 +594,13 @@ export default { params.set('userId', this.$store.getters.userInfo.userId) params.set('taskIds', this.taskID) completeTask(params).then(res => { - if(res.success === true) { + if (res.success === true) { this.$message.success('提交成功') if (this.bpnId !== '') { let taskId = { id: this.bpnId } - taskDel(taskId).then(res=>{ + taskDel(taskId).then(res => { return res }) } @@ -614,14 +615,14 @@ export default { } }, // 流程阶段负责人选择 - choiceZRR (type, title, id) { + choiceZRR(type, title, id) { this.nodeList = [] this.nodeList.push(id) this.type = type this.drawerTitle = title this.modalshowflag = true }, - drawerCheck (data) { + drawerCheck(data) { this.unqualidiedData.forEach(item => { item.engineer = data[0].name item.engineerId = data[0].id @@ -635,20 +636,18 @@ export default { this.addList() }, // 清空 查询条件 - clearAllSearch (search = true) { - this.queryUnqualidiedData = { - standSerialNumber: '', - productName: '', - responsibleUnit: '' - } + clearAllSearch() { + this.queryUnqualidiedData.standSerialNumber = '' + this.queryUnqualidiedData.productName = '' + this.queryUnqualidiedData.responsibleUnit = '' this.getTableByPage() }, // 分页事件 - pageChange (page) { + pageChange(page) { this.pageNo = page this.getTableByPage() }, - pageSizeChange (pageSize) { + pageSizeChange(pageSize) { this.size = pageSize this.getTableByPage(pageSize) }, @@ -659,18 +658,22 @@ export default {