diff --git a/src/assets/styles/navMenu.less b/src/assets/styles/navMenu.less index f5eeff979..30ebe9e02 100644 --- a/src/assets/styles/navMenu.less +++ b/src/assets/styles/navMenu.less @@ -14,7 +14,7 @@ font-weight: 600; } .el-submenu__title, .el-menu-item{ - font-size: 15px; + font-size: 14px; background-color: transparent !important; &::before{ content: ''; diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 066759cb2..8d9373769 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -3,7 +3,9 @@
- {{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 企标详情 + {{sarStandardsInfoEO.standCode}} 《{{sarStandardsInfoEO.standName}}》 企标详情 + +
@@ -57,6 +59,7 @@ />
-
快捷入口
+
快捷入口
  • - {{ item.prcName }} + {{ item.prcName }}
    • @@ -1284,8 +1284,7 @@ export default { display: inline-block; margin: 15px; color: #333333; - font-size: 16px; - font-weight: bold; + font-size: 14px; } .more { float: right; diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue index 88d0b73a1..a8dbebf6c 100644 --- a/src/pages/home2/index.vue +++ b/src/pages/home2/index.vue @@ -187,7 +187,7 @@ export default { } .footer { height: 90px; - line-height: 44px; + line-height: 33px; //margin-top: 0.3vh; //line-height: 5.2vh; background: #FFFFFF; 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/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue index 669fd8666..a21d2d52f 100644 --- a/src/pages/localTool/standardRecognition/index.vue +++ b/src/pages/localTool/standardRecognition/index.vue @@ -1359,7 +1359,7 @@ export default { ) { this.isSubmit = true; this.uploadFilesdfEo.fileType = this.uploadFilesdfEo.fileType.toString(); - this.$http.post( + this.$http.post( "ocr/OCRRestful/addOcrRecord", this.uploadFilesdfEo, { @@ -1413,7 +1413,10 @@ export default { }, // 获取doc文件 downloadFile(data) { - window.open(data.docRealFile); + let URL = 'http://10.100.5.116:4201/' + data.docRealName + window.open(URL) + // console.log(URL); + // window.open(data.docRealFile); }, // 删除 delSingalData(row) { 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/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index acd410c04..02735c0ca 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -26,7 +26,7 @@
    - 带入 + 导入
    @@ -84,7 +84,7 @@
    - 带入 + 导入
    @@ -329,7 +329,7 @@ 数据加载中……
    取消 - 带入 + 导入
    @@ -649,7 +649,7 @@ this.standCommonlySearch2.pageSize = pageSize this.sarStandCompareHis2() }, - /** 选择带入数据的方法操作 + /** 选择导入数据的方法操作 * */ handleSelection(data) { this.selectedList = []; @@ -710,9 +710,9 @@ this.loading = false }) } else if (this.selectedList.length > 1) { - this.$message.warning("只能选择一条数据进行带入"); + this.$message.warning("只能选择一条数据进行导入"); } else { - this.$message.warning("请选择一条数据进行带入"); + this.$message.warning("请选择一条数据进行导入"); } }, closeDrawer2() { @@ -744,9 +744,9 @@ this.form.oldNumber = bringData[0].id this.listModel2 = false } else if (this.selectedList2.length > 1) { - this.$message.warning("只能选择一条数据进行带入"); + this.$message.warning("只能选择一条数据进行导入"); } else { - this.$message.warning("请选择一条数据进行带入"); + this.$message.warning("请选择一条数据进行导入"); } }, /*** **********************************************/ diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 132805150..99ee89033 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -27,7 +27,7 @@
    - 带入 + 导入
    @@ -94,7 +94,7 @@
    - 带入 + 导入
    @@ -345,7 +345,7 @@ 数据加载中……
    取消 - 带入 + 导入
    @@ -680,7 +680,7 @@ export default { this.standCommonlySearch2.pageSize = pageSize this.sarStandCompareHis2() }, - /** 选择带入数据的方法操作 + /** 选择导入数据的方法操作 * */ handleSelection(data) { this.selectedList = []; @@ -747,9 +747,9 @@ export default { this.loading = false }) } else if (this.selectedList.length > 1) { - this.$message.warning("只能选择一条数据进行带入"); + this.$message.warning("只能选择一条数据进行导入"); } else { - this.$message.warning("请选择一条数据进行带入"); + this.$message.warning("请选择一条数据进行导入"); } }, closeDrawer2() { @@ -781,9 +781,9 @@ export default { this.form.oldNumber = bringData[0].id this.listModel2 = false } else if (this.selectedList2.length > 1) { - this.$message.warning("只能选择一条数据进行带入"); + this.$message.warning("只能选择一条数据进行导入"); } else { - this.$message.warning("请选择一条数据进行带入"); + this.$message.warning("请选择一条数据进行导入"); } }, /*** **********************************************/ diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index ea6b7430c..13e2b8eda 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1478,9 +1478,9 @@ ], }, rules:{ - standSort: [ + /*standSort: [ { required: true, message: '请选择标准类别', trigger: 'change' } - ], + ],*/ standNumber: [ { required: true, message: '请输入标准编号', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' } @@ -1497,9 +1497,9 @@ { required: false, message: '请输入标准英文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' } ], - standNature: [ + /*standNature: [ { required: true, message: '请选择标准性质', trigger: 'change' } - ], + ],*/ textStatus: [ { required: true, message: '请选择文本状态', trigger: 'change' } ] diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 4bf84c077..0102ee586 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -44,7 +44,7 @@ - + - + - + - + - + - + - + - + - + - + - + - + 海外标准入库 - + - + - + - + -

    责任部门对接人

    +

    责任领导

    @@ -253,7 +253,7 @@
    -

    责任部门对接人

    +

    责任领导

    @@ -254,7 +254,7 @@ { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index e11860ba6..1c447a791 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -485,7 +485,8 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - let commitStatus = res.commitStatus + console.log(data); + let commitStatus = res.commitStatus if(commitStatus && commitStatus > 0){ this.acceptShow = true this.submitShow = false @@ -493,12 +494,16 @@ export default { this.acceptShow = false this.submitShow = true } - this.form.fjList = data.fjList || data.form.fjList - this.form.fjListId = data.fjListId || data.form.fjListId - this.form.cid = data.cid || data.form.cid - this.form.endTime = data.endTime || data.form.endTime + this.form.fjList = data.fjList || data.form.fjList || [] + if (data.fjListId === '') { + this.form.fjListId = '' + } else { + this.form.fjListId = data.form.fjListId || data.fjListId + } + this.form.cid = data.cid || data.form.cid + this.form.endTime = data.endTime || data.form.endTime this.todoId = res.id - this.json = data + this.json = data this.data = data.info || data.data || data.form.data || [] }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 035b50399..d5933345e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -373,7 +373,11 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.form.fjList = data.fjList || data.form.fjList - this.form.fjListId = data.fjListId || data.form.fjListId + if (data.fjListId === '') { + this.form.fjListId = '' + } else { + this.form.fjListId = data.form.fjListId || data.fjListId + } this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime this.form.cname = data.cname || data.form.cname diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 21e11d8c9..6beb38976 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -420,7 +420,11 @@ export default { }).then(res => { let data = JSON.parse(res.mesg); this.form.fjList = data.fjList || data.form.fjList - this.form.fjListId = data.fjListId || data.form.fjListId + if (data.fjListId === '') { + this.form.fjListId = '' + } else { + this.form.fjListId = data.form.fjListId || data.fjListId + } this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; this.form.cname = data.cname || data.form.cname; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 33a0caa49..d68e7e09b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -437,7 +437,11 @@ export default { }).then(res => { let data = JSON.parse(res.mesg); this.form.fjList = data.fjList || data.form.fjList - this.form.fjListId = data.fjListId || data.form.fjListId + if (data.fjListId === '') { + this.form.fjListId = '' + } else { + this.form.fjListId = data.form.fjListId || data.fjListId + } this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; this.form.cname = data.cname || data.form.cname; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 708a4ea2c..66919dec5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -434,7 +434,11 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.form.fjList = data.fjList || data.form.fjList - this.form.fjListId = data.fjListId || data.form.fjListId + if (data.fjListId === '') { + this.form.fjListId = '' + } else { + this.form.fjListId = data.form.fjListId || data.fjListId + } this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; this.form.cname = data.cname || data.form.cname; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 8cfe376a3..8bd0319ec 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -434,7 +434,11 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.form.fjList = data.fjList || data.form.fjList - this.form.fjListId = data.fjListId || data.form.fjListId + if (data.fjListId === '') { + this.form.fjListId = '' + } else { + this.form.fjListId = data.form.fjListId || data.fjListId + } this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; this.form.cname = data.cname || data.form.cname; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 9887dfac6..2a9039e77 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -434,7 +434,11 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.form.fjList = data.fjList || data.form.fjList - this.form.fjListId = data.fjListId || data.form.fjListId + if (data.fjListId === '') { + this.form.fjListId = '' + } else { + this.form.fjListId = data.form.fjListId || data.fjListId + } this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; this.form.cname = data.cname || data.form.cname; diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 73022ed85..d119d117b 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -247,7 +247,7 @@ export default { this.queryProcess() }, queryProcess () { // 查询待办流程 - this.$http.postData('lawss/activiti/todoTaskList', { + this.$http.postData('lawss/activiti/todoTaskListNew', { current: this.pageNo, size: parseInt(this.$store.getters.userInfo.configContent), userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId, diff --git a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue index 53dfbe6a3..afc3541ea 100644 --- a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue +++ b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue @@ -7,10 +7,10 @@     - + - + @@ -61,25 +61,23 @@ @@ -119,15 +117,13 @@ - + - + - - 点击上传 @@ -153,18 +150,6 @@ - - - - + + +
    + 保存 + + 提交 + + 取消 +
    + + + + + + + + + + 清空查询 + + + + + + + + + + + + + + + + + + + +
    + 取消 + 确定 +
    +     + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + 取消 + + 提交 + +
    +     + + + + +
    点击或拖拽上传文件
    +     +     + + +
    +
    +
    + + + + {{ opt.label }} + + + + + + + + + 查询 + + + + + 清空 + + + +
    +
    +
    + - - - - - - - - - - - - - - - - - -
    - 加载中... - -
    -
    - 提交 - - 取消 - -
    -     - - - - - - - - - - - - - -
    - 提交 - - 取消 - -
    -     - - -
    - - -
    -
    - 提交 - - 取消 -
    -     - - -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - 提交 - - 取消 - -
    -     - - - - - - - -

    - 导入失败 -

    -
    -

    -
    -
    - 确认 - -
    -     - + + + + + + + + + + + + +
    + 提交 + + 取消 + +
    +     + + +
    + + +
    +
    + 提交 + + 取消 +
    +     + + +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + 提交 + + 取消 + +
    +     + + + + + + + +

    + 导入失败 +

    +
    +

    +
    +
    + 确认 + +
    +     + - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - - {{ opt.label }} - - - - - - - {{ opt.label }} - - - - - - - - - - - - - - - - - - - - - - {{ opt.label }} - - - - - - - - - - - - -
    - - - -
    - - - - - - - - - - - - - - - - - - - - - - -
    - - - -
    - - - - - - {{ opt.label }} - - - - - - - {{ opt.label }} - - - - - - - {{ opt.label }} - - - - - - - {{ opt.label }} - - - - - - - {{ opt.label }} - - - - - - - - - - - - - - - + + +
    + + + + +
    + + + + + + + + + + + + + + + + + + + {{ opt.label }} + + + + + + + {{ opt.label }} + + + + + + + + + + + + + + + + + + + + + + {{ opt.label }} + + + + + + + + + + + + +
    + + + +
    + + + + + + + + + + + + + + + + + + + + + + +
    + + + +
    + + + + + + {{ opt.label }} + + + + + + + {{ opt.label }} + + + + + + + {{ opt.label }} + + + + + + + {{ opt.label }} + + + + + + + {{ opt.label }} + + + + + + + + + + + + + + + - - - - - - {{ opt.label }} - - - - - - - {{ opt.label }} - - - - - - - {{ opt.label }} - - - - - - - {{ opt.label }} - - - - - - - - - -
    - - - -
    - - - - - - - - - - - - - - + + + + + + {{ opt.label }} + + + + + + + {{ opt.label }} + + + + + + + {{ opt.label }} + + + + + + + {{ opt.label }} + + + + + + + + + +
    + + + +
    + + + + + + + + + + + + + + - - - - - - - - - - - - -
    - - - - - - - -     + + + + + + + + + + + + +
    + + + + + + + + +
    +
    + 搜索 + + 取消 + +
    +
    -
    - 搜索 - - 取消 - -
    -     - - - - 导入中... - - - -
    -
    -
    -
    - - - - - - + @confirm="isTreeOk" + > + 导入中... + + + +
    +
    +
    +
    + + + + + + +
    +
    +
    + 数据加载中…… +
    + 取消 + 转换 +
    -
    -
    - 数据加载中…… -
    - 取消 - 转换 -
    -
    - -
    +     + diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProject.vue index 3d92486ad..924ab2531 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProject.vue @@ -3,12 +3,12 @@
    - +
    - +
    @@ -30,7 +30,7 @@ export default { return { skill: false, project: false, - tabValue: '', + tabValue: 'standInvolveProjectDetail', menuName: [ "项目评估结果", "技术评估结果"] } }, @@ -53,12 +53,12 @@ export default { } } }); - if(this.skill === true){ - this.tabValue = "technologyInvolveProject" - return; - }else if(this.project === true){ + if (this.project === true) { this.tabValue = "standInvolveProjectDetail" return; + } else if (this.skill === true) { + this.tabValue = "technologyInvolveProject" + return; } } } diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index a51c91f57..10dc6566b 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -159,24 +159,24 @@ width="55" align="center"> - - - - - - + + + + + + + + + + + + + + + + + +     - - - - - - + + + + + + 查询 @@ -33,24 +33,24 @@
    + type="selection" + width="55" + align="center">