diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 0e0b6cc72..919158cb7 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -706,7 +706,7 @@ export default { } .el-menu-item { padding-left: 29px !important; - font-size: 15px; + font-size: 14px; font-weight: normal; height: 40px; line-height: 40px; diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue index a8dbebf6c..ee56d41a2 100644 --- a/src/pages/home2/index.vue +++ b/src/pages/home2/index.vue @@ -186,7 +186,7 @@ export default { padding: 0; } .footer { - height: 90px; + height: 70px; line-height: 33px; //margin-top: 0.3vh; //line-height: 5.2vh; diff --git a/src/pages/localTool/standWarning.vue b/src/pages/localTool/standWarning.vue new file mode 100644 index 000000000..2b6d6b055 --- /dev/null +++ b/src/pages/localTool/standWarning.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 6175e2a9c..5baf5253a 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -8,13 +8,13 @@
-
-
实施预警
-
+
+
实施预警
+
- - - + + + - - - - - - - - - - -
- + + + + + + + + + + + + + + + + + + + + - 查询 - - + - 清空 - - - - - - - - - - - - - - - - -
- - - + 清空 + + + +
-
- 新车型实施日期预警 +
+ 实施日期预警 - + - + @@ -114,293 +133,219 @@ {{ scope.row.standName }} - - - - - - - - - - - 在产车实施日期预警 - - - - - + - + - + + + + + + + + + + - + - 新车型条款预警 - - - - - - - - - - - - - - - - - - - - - - - - 在产车条款预警 - - - - - - - - - - - - - - - - - - - - - - - + style="position: static;" + :page="pageConfig.newItemsPage" + :pageSize="pageConfig.newItemsPageSize" + :total="pageConfig.count1" + autoSize + @pageChange="page => handlePageChange('newItems', page)" + @pageSizeChange="pageSize => handlePageSizeChange('newItems', pageSize)"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -515,7 +460,7 @@ export default { } } }) - let arr = result.newItems.records + let arr = result.newItems.records arr.forEach(item => { // 适用车型转换 if (item.applyType !== null) { @@ -672,16 +617,16 @@ export default { roundButton: false }).then(() => { this.$http.get('sys/EarlyWarning/ChangePermissions', { - id: row.id, - }, {}, res => { - this.pageConfig.newItemsPage = 1 - this.pageConfig.oldItemsPage = 1 - this.pageConfig.newStandPage = 1 - this.pageConfig.oldStandPage = 1 - this.pageConfig.newPolicyPage = 1 - this.pageConfig.oldPolicyPage = 1 - this.getEarlyDate() - } + id: row.id, + }, {}, res => { + this.pageConfig.newItemsPage = 1 + this.pageConfig.oldItemsPage = 1 + this.pageConfig.newStandPage = 1 + this.pageConfig.oldStandPage = 1 + this.pageConfig.newPolicyPage = 1 + this.pageConfig.oldPolicyPage = 1 + this.getEarlyDate() + } ) }).catch(() => { this.$message.warning('取消事件') @@ -758,27 +703,27 @@ export default { }, handlePageChange(field, page) { switch (field) { - // 新车型实施日期预警 + // 新车型实施日期预警 case 'newItems': this.pageConfig.newItemsPage = page break - // 新车型条款预警 + // 新车型条款预警 case 'newStand': this.pageConfig.newStandPage = page break - // 在产车实施日期预警 + // 在产车实施日期预警 case 'oldItems': this.pageConfig.oldItemsPage = page break - // 在产车条款预警 + // 在产车条款预警 case 'oldStand': this.pageConfig.oldStandPage = page break - // 政策新车型实施日期预警 + // 政策新车型实施日期预警 case 'newPolicy': this.pageConfig.newPolicyPage = page break - //政策 在产车实施日期预警 + //政策 在产车实施日期预警 case 'oldPolicy': this.pageConfig.oldPolicyPage = page break @@ -809,10 +754,10 @@ export default { }, watch: {}, mounted() { - this.height = $(".content").height() * 0.4; - window.onresize = () => { - this.height = $(".content").height() * 0.4; - }; + // this.height = $(".content").height() * 0.4; + // window.onresize = () => { + // this.height = $(".content").height() * 0.4; + // }; //从数据库中查询下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this @@ -855,7 +800,7 @@ export default { } } }) - let arr = result.newItems.records + let arr = result.newItems.records arr.forEach(item => { console.log(item.applyType) // 适用车型转换 @@ -1043,7 +988,6 @@ export default { .dynamic-content { height: 100%; - overflow-y: hidden; width: 100%; position: relative; @@ -1071,14 +1015,15 @@ export default { } .more { - margin-top: 30px; + margin-top: 30px; + /deep/ .el-input__inner { - width: 155px; + width: 185px; } .choose-time-area { /deep/ .el-input__inner { - width: 220px; + width: 210px; } } @@ -1178,10 +1123,11 @@ export default { .content { padding-bottom: 10px; height: calc(~'100% - 40px'); - /deep/.el-button--mini{ - padding: 5px 7px; - font-size: 8px; - } + + /deep/ .el-button--mini { + padding: 5px 7px; + font-size: 8px; + } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 6b47933c8..4ab48c3bf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1629,19 +1629,6 @@ export default { } }) }, - getTaskId () { - queryTaskFirst({ - bpnId: this.$route.query.bpnId - }).then(res => { - let mes = JSON.parse(res.mes) - mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) - this.roleForm = mes.roleForm - this.commentText = mes.commentText - this.taskIds=mes.taskIds - //表单文件处理 - this.getFormFieldList(mes.form) - }) - }, choiceZRR1 (type, title, id) { this.drawerTitle = title this.modalShowFlag1 = true @@ -2215,7 +2202,12 @@ export default { if (res) { const processForm = JSON.parse(res.mesg) this.commentText = processForm.commentText - this.getFormFieldList(processForm) + if (processForm.form === undefined) { + this.getFormFieldList(processForm) + } else { + //表单文件处理 + this.getFormFieldList(processForm.form) + } } }).catch(e => { console.log("错误") @@ -2238,7 +2230,6 @@ export default { this.form.prcName = this.prcName this.form['id'] = item.id - console.log("this.form",this.form); // 遍历对象 for(const p in this.form) { @@ -2328,22 +2319,22 @@ export default { this.form.country=this.countryArr; 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.uName) + _formData.append('id', this.bpnId) + // _formData.append('createUser', this.$store.getters.userInfo.userId) + // _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', '1') _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ form: this.form, roleForm: this.roleForm, commentText: this.commentText, - taskInfo: '申请人修订', - taskIds:this.taskIds + // taskInfo: '申请人修订', + // taskIds:this.taskIds })) - saveTaskFirst(_formData).then(res => { + saveTaskForPub(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) @@ -2442,7 +2433,6 @@ export default { this.getData() }, mounted () { - this.getTaskId() this.processTable() this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this