From e9dcc4f56c1dda84193081f170825d36b12e2f60 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 27 Dec 2021 17:05:26 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20-=20?= =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=20-=20=E6=8E=92=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step2.vue | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 0602efbc4..382880a85 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -548,6 +548,17 @@ > + + + + + @@ -896,6 +907,7 @@ qcdw: '', // 起草单位 wssmr: '', // 我司署名人 cysd: '', // 我司参与深度 + cyzbpm:[],// 我司参与制标排名 cllx: '', // 适用车型 nylx: '',// 能源类型 sycpx: '',// 适用产品线 @@ -953,6 +965,7 @@ categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 + cyzbpmOptions:[], // 我司参与制标排名 wssmrOptions: [], // 我司署名人 qcdwOptions: [], // 起草单位 sycpxOptions: [], // 适用产品线 @@ -1305,6 +1318,7 @@ this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名 this.wssmrOptions = res.data.WSSMR // 我司署名人 this.qcdwOptions = res.data.QCDW // 起草单位 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 From aef5e1733629fb64f205c71302dc8073e28f1bde Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 27 Dec 2021 17:25:24 +0800 Subject: [PATCH 2/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=E8=8D=89=E7=A8=BF=E5=8F=91=E8=B5=B7=E5=BE=85?= =?UTF-8?q?=E5=8A=9E=E6=B6=88=E5=A4=B1=E9=97=AE=E9=A2=98=EF=BC=8C=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=AE=A1=E6=89=B9=E5=9B=9E=E6=98=BE=EF=BC=8C=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step1.vue | 2 +- .../pages/creatProcess/wfhxzg/step2.vue | 2 +- .../pages/creatProcess/wfhxzg/step3.vue | 14 ++++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 183eebc5a..3d3945aff 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -578,7 +578,7 @@ export default { if (valid) { this.isSubmit = true let paramsInfo = new FormData() - paramsInfo.append('id', this.bpnId || '') + // paramsInfo.append('id', this.bpnId || '') paramsInfo.append('createUser', this.$store.getters.userInfo.userId) paramsInfo.append('createUserName', this.$store.getters.userInfo.userName) paramsInfo.append('type', '8') diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index d06c3cdc8..2e3b80444 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -290,13 +290,13 @@ export default { this.$message.warning("请选择至少一条数据进行分发责任人"); } else { this.nodeList = [] + this.drawerTitle = '选择分发责任人' this.nodeList.push(id) this.modalshowflag = true } }, // 每行选择负责人点击操作 clickOpen(val, id) { - console.log(val) this.$refs.multipleTable.clearSelection() this.rowDutyPeople = val this.nodeList = [] diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 20206b405..a96f17315 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -77,7 +77,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="textarea"> @@ -186,7 +186,7 @@ export default { passInfo: 0, detailData: [], loading: false, - commentText: '', // 意见 + textarea: '', // 意见 title: '', // 新增编辑抽屉标题 ListModel: false, // 新增编辑抽屉开关 nonSearch: { @@ -266,6 +266,7 @@ export default { if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) { this.dataList = fileData[0].standardInfoList this.standardInfoList = this.dataList + this.textarea = JSON.parse(JSON.stringify(item)).textarea } } } else { @@ -274,6 +275,7 @@ export default { if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) { this.dataList = fileData[i].standardInfoList this.standardInfoList = this.dataList + this.textarea = JSON.parse(JSON.stringify(item)).commentText } } } @@ -311,12 +313,12 @@ export default { }, // 退回按钮 handleSubmitNo() { - if (this.commentText) { + if (this.textarea) { var json = { passInfo: 1, actionFlag: 1, - commentText: this.commentText, + commentText: this.textarea, standardInfoList: this.standardInfoList, } const params = new FormData(); @@ -370,7 +372,7 @@ export default { _formData.append('json', JSON.stringify({ // roleForm: this.roleForm, dockUserList: list, - commentText: this.commentText + textarea: this.textarea })) saveTaskForPub(_formData).then(res => { this.saveLoading = false @@ -411,7 +413,7 @@ export default { let json = { passInfo: this.passInfo, responUserList: list, - commentText: this.commentText, + commentText: this.textarea, actionFlag: 0 } if(flag)return; From 972c220d740a7f86d787099abb7120ad0f8f3712 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 27 Dec 2021 17:29:55 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20-=20?= =?UTF-8?q?=E6=B5=B7=E5=A4=96=E7=AC=AC=E4=BA=8C=E6=AD=A5=20-=20=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzrk/step2.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 382880a85..cea06b1d8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -365,6 +365,14 @@ - - + +
+ {{value.name}} +
+
+ - - +
+ @@ -808,6 +816,7 @@ zqyjgFileMap: [], jdwjFileMap: [], kwjFileMap: [], + xdbFileMap: [], glwjFileMap: [], caFileMap: [], zbjbdFileMap: [], @@ -1150,6 +1159,8 @@ // jdwjFileMap: {}, this.kwjFileMap=this.assemble(processForm.kwj,processForm.kwjName); // kwjFileMap: {}, + this.xdbFileMap=this.assemble(processForm.xdb,processForm.xdbName); + // xdbFileMap: {}, this.glwjFileMap=this.assemble(processForm.glwj,processForm.glwjName); // glwjFileMap: {}, this.caFileMap=this.assemble(processForm.ca,processForm.caName); From 787e4053cf5d0608c33b34278a149ac3697b67ad Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 27 Dec 2021 17:45:54 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 1265919c1..a5b345fb9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -2125,14 +2125,15 @@ export default { const json = Object.assign(bringData, bringData.attrInfoCaseMap); this.form = JSON.parse(JSON.stringify(json)) - this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : '' - this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : '' - this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : '' - this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm && JSON.parse(JSON.stringify(json)).zrbm !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm.split(',') : '' - this.form.syrz = JSON.parse(JSON.stringify(json)).syrz && JSON.parse(JSON.stringify(json)).syrz !== '[]' ? JSON.parse(JSON.stringify(json)).syrz.split(',') : '' - this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx && JSON.parse(JSON.stringify(json)).sycpx !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx.split(',') : '' - this.form.nylx = JSON.parse(JSON.stringify(json)).nylx && JSON.parse(JSON.stringify(json)).nylx !== '[]' ? JSON.parse(JSON.stringify(json)).nylx.split(',') : '' - this.form.cllx = JSON.parse(JSON.stringify(json)).cllx && JSON.parse(JSON.stringify(json)).cllx !== '[]' ? JSON.parse(JSON.stringify(json)).cllx.split(',') : '' + console.log(this.form) + this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw : '' + this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr : '' + this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs : '' + this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm && JSON.parse(JSON.stringify(json)).zrbm !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm : '' + this.form.syrz = JSON.parse(JSON.stringify(json)).syrz && JSON.parse(JSON.stringify(json)).syrz !== '[]' ? JSON.parse(JSON.stringify(json)).syrz : '' + this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx && JSON.parse(JSON.stringify(json)).sycpx !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx : '' + this.form.nylx = JSON.parse(JSON.stringify(json)).nylx && JSON.parse(JSON.stringify(json)).nylx !== '[]' ? JSON.parse(JSON.stringify(json)).nylx : '' + this.form.cllx = JSON.parse(JSON.stringify(json)).cllx && JSON.parse(JSON.stringify(json)).cllx !== '[]' ? JSON.parse(JSON.stringify(json)).cllx : '' this.defaultCheckedKeys = [this.form.standSystem]; this.defaultCheckedKeys1 = [this.form.cycvppsbm]; this.defaultCheckedKeys2 = [this.form.kccvppsbm]; @@ -2143,10 +2144,9 @@ export default { this.key3++ this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : '' - console.log(this.form) - this.form.ssrq = this.form.ssrq ? this.$moment(this.form.ssrq).format("YYYY-MM-DD") : null - this.form.zccssrq = this.form.zccssrq ? this.$moment(this.form.zccssrq).format("YYYY-MM-DD") : null - this.form.xcxssrq = this.form.xcxssrq ? this.$moment(this.form.xcxssrq).format("YYYY-MM-DD") : null + // this.form.ssrq = this.form.ssrq ? this.$moment(this.form.ssrq).format("YYYY-MM-DD") : null + // this.form.zccssrq = this.form.zccssrq ? this.$moment(this.form.zccssrq).format("YYYY-MM-DD") : null + // this.form.xcxssrq = this.form.xcxssrq ? this.$moment(this.form.xcxssrq).format("YYYY-MM-DD") : null this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = bringData.id From 3975851225387a28652516d99129fb1942438989 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 27 Dec 2021 17:47:56 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20-=20?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=20-=20=E9=A9=B3=E5=9B=9E=E4=B9=8B=E5=90=8E?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E8=A6=81=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 53882e2c9..6eccc8ad3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -2374,7 +2374,7 @@ export default { }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) - this.commentText = processForm.commentText + // this.commentText = processForm.commentText if (processForm.form === undefined) { this.getFormFieldList(processForm) } else { From c302d80e4823151f640ae2d5ba675acdcf68a73e Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 27 Dec 2021 18:08:08 +0800 Subject: [PATCH 6/6] commit --- .../components/EnterpriseStandardDatabase.vue | 1 - .../enterpriseStandardPlan/index.vue | 313 ++++++++++++++++-- 2 files changed, 284 insertions(+), 30 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 4de7326ed..c8d3c6477 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -4566,7 +4566,6 @@ export default { this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 this.standSystemOptions = res.data.TXLBBUSS // 标准体系 - console.log(this.standSystemOptions); this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型 this.categoryOptions.options = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证 diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 2d6ec22f6..702f7c6aa 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -263,40 +263,42 @@ v-model="addForm.unit"> - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +
+ + + + +
+ + +
+ + + +
@@ -361,6 +363,128 @@ :nodeList="nodeListZRBM" @checkedRole="drawerCheckZRBM" /> + +
+
+ +
+ + + + + + + + + 查询 + + 清空 + + + +
+
+
+ + + + + + + + + + + + + + + + +
+ + 数据加载中…… +
+
+
+ 取消 + 导入 +
+
+ + +
+
+ + +
+
+ 取消 + 确定 +
+
+ @@ -371,9 +495,28 @@ components: {}, data() { return { + TXJGList: [], + TXJGmodal: false, + standSystemOptions: [], + defaultProps: { + children: 'children', + label: 'menuName' + }, + QYBZShow: false, + QYBZList: [], modalshowflagZRBM: false, nodeListZRBM: [], - + QYBZformSelect: [], + QYBZmodal: false, + QYBZform: { + page: 1, + pageSzie: this.$store.getters.userInfo.configContent, + validFlag: '0', + userId: this.$store.getters.userInfo.userId, + standCode: '', + standName: '', + total: 0, + }, QCDWmodal: false, QCDWValue: [], QCDWList: [], @@ -390,6 +533,10 @@ DrawerType: '', ids: [], addForm: { + tsJson: '', + tsJsonName: '', + rqbJson: '', + rqbName: '', unit: '', // 单位 unitName: '', esName: '', // 企标名称 @@ -450,6 +597,83 @@ props: {}, watch: {}, methods: { + TXJGcloseDrawer () { + this.TXJGmodal = false + }, + TXJGenterDrawer () { + let list = this.$refs.TXJGTree.getCheckedNodes() + let id = '' + let name = '' + list.map(item => { + if (id.length > 0) { + id += ',' + id += item.id + name += ',' + name += item.menuName + } else { + id = item.id + name = item.menuName + } + }) + this.addForm.tsJson = id + this.addForm.tsJsonName = name + this.TXJGmodal = false + }, + choiceTXJG (id) { + if (id) { + this.TXJGList = id.split(',') + } else { + this.TXJGList = [] + } + this.TXJGmodal = true + }, + QYBZcloseDrawer () { + this.clearQYBZ() + }, + QYBZenterDrawer () { + if (this.QYBZformSelect.length > 1) { + this.$message.warning('请选择一条标准') + } else if (this.QYBZformSelect.length < 1){ + this.$message.warning('请选择要带入的标准') + } else { + this.addForm.rqbJson = this.QYBZformSelect[0].id + this.addForm.rqbName = this.QYBZformSelect[0].standName + this.clearQYBZ() + this.QYBZmodal = false + } + }, + handleSelectionQYBZ (val) { + this.QYBZformSelect = val + }, + QYBZpageChange (page) { + this.QYBZform.page = page + this.QYBZget() + }, + QYBZpageSizeChange (pageSize) { + this.QYBZform.pageSize = pageSize + this.QYBZget() + }, + QYBZget () { + this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, { + _this: this, loading: 'QYBZShow' + }, res => { + this.QYBZList = res.data.list + this.QYBZform.total = res.data.count + }, e => { + }) + }, + clearQYBZ () { + this.QYBZform = { + page: 1, + standCode: '', + standName: '', + } + }, + choiceQYBZ (id) { + this.QYBZformSelect = [] + this.QYBZget() + this.QYBZmodal = true + }, drawerCheckZRBM (data) { let list = '' let listName = '' @@ -718,6 +942,7 @@ _this: this }, res => { this.QCDWList = res.data.QCDW // 起草单位 + this.standSystemOptions = res.data.TXLBBUSS // 体系结构 }, e => { }) }, @@ -730,6 +955,36 @@ #enterpriseStandardPlan { height: 100%; background: #fff; + .standardForComments { + height: calc(~'100% - 56px'); + background: #fff; + flex-direction: column; + .action-bar { + margin-bottom: 5px; + padding: 0; + } + + .content { + flex: auto; + overflow: hidden; + display: flex; + flex-direction: column; + + .table-wrap { + flex: auto; + overflow: hidden; + position: relative; + } + } + + & > .pagination { + position: static; + + /deep/ .pagination-slot { + padding: 0; + } + } + } /deep/.table-wrap { .el-table__fixed { height: calc(~'100% - 20px') !important;