From cd084b1031d68946e67b4d3b9a39ab863759288e Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 7 Jan 2022 17:13:35 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=8C=E5=85=A5=E4=BC=9A=E5=8F=82=E4=BC=9A=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=EF=BC=8C=E5=8F=82=E4=BC=9A=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHd-rh/step1.vue | 5 +- .../pages/creatProcess/bzhHy-ch/step1.vue | 11 +- .../pages/creatProcess/bzhHy-ch/step2.vue | 6 - .../pages/creatProcess/bzhHy-ch/step3.vue | 5 - .../pages/creatProcess/bzhHy-ch/step4.vue | 5 - .../pages/creatProcess/bzhHy-ch/step5.vue | 10 - .../pages/creatProcess/bzhHy-ch/step6-1.vue | 5 - .../pages/creatProcess/bzhHy-ch/step6.vue | 5 - .../pages/addEdit.vue | 1644 ++++++++--------- .../pages/otherAddEit.vue | 911 +++++---- .../pages/projectAddEit.vue | 1419 +++++++------- 11 files changed, 2168 insertions(+), 1858 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 6950b24f7..27fa808db 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -601,7 +601,10 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' + || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF' + || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.PPT' + || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.bmp') { return true } else { this.spinShow = false diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 34eecdb81..4d371e4af 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -537,7 +537,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' + || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF' + || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.PPT' + || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.bmp' + ) { return true } else { this.spinShow = false @@ -872,11 +876,6 @@ export default { text-align: right; } - .meeting_table { - /deep/ .el-input__inner { - text-align: center; - } - } /deep/ .el-table th { padding: 0px; diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index de701e95d..85e7bc4e3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -480,12 +480,6 @@ export default { height: auto !important; } - .meeting_table { - /deep/ .el-input__inner { - text-align: center; - } - } - /deep/ .el-textarea__inner { font-family: inherit; } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue index 3fe8cfa32..660d45fa0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue @@ -533,11 +533,6 @@ export default { margin-top: 0px; } - .meeting_table { - /deep/ .el-input__inner { - text-align: center; - } - } /deep/ .el-table__body-wrapper { height: auto !important; diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue index 0b5e95d1f..f7eb8758d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue @@ -454,11 +454,6 @@ export default { margin-top: 0px; } - .meeting_table { - /deep/ .el-input__inner { - text-align: center; - } - } /deep/ .el-table__body-wrapper { height: auto !important; diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue index 583a25fe0..c683d401b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue @@ -631,11 +631,6 @@ export default { margin-top: 0px; } - .meeting_table { - /deep/ .el-input__inner { - text-align: center; - } - } /deep/ .el-table__body-wrapper { height: auto !important; @@ -645,11 +640,6 @@ export default { font-family: inherit; } - .meeting_table { - /deep/ .el-input__inner { - text-align: center; - } - } /deep/ .el-table th { padding: 0px; diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue index 0aaf6bc93..48ab08c8b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue @@ -358,11 +358,6 @@ export default { /deep/.el-textarea__inner { font-family: inherit; } - .meeting_table { - /deep/ .el-input__inner { - text-align: center; - } - } /deep/.el-upload { display: unset; } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue index 0b145656b..9a355c0cb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue @@ -527,11 +527,6 @@ export default { font-family: inherit; } - .meeting_table { - /deep/ .el-input__inner { - text-align: center; - } - } /deep/ .el-upload { display: unset; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index af8403ca5..8e22d49a5 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -13,18 +13,18 @@ @@ -32,28 +32,28 @@



点击上传 @@ -69,48 +69,50 @@ 数据搜索
- + - + - + + v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'" + v-model="sarAccessInfo.standNumber" + placeholder="请输入标准号"/> + + + type="primary" + class="common-button-primary" + size="small" + @click="searchLawsStands"> 查询 清空 + class="common-button-default" + size="small" + @click="clearSearchLaws">清空 - - - 高级查询 - - 高级查询 @@ -119,117 +121,103 @@
-
- - - - - - - - - 查询 - - -
添加 + class="common-button-default" + size="mini" @click="addSarAccess">添加 {{ $t('m.showAddDataList') }} {{ $t('m.hideAddDataList') }}
+ show-overflow-tooltip + fixed="left" + align="center" + width="150px" + :label="standLabelNum"> - - - + prop="standName" + align="center" + show-overflow-tooltip + :label="standLabelName" + > + + + + prop="xcxssrq" + align="center" + width="150" + label="新车型实施日期"> + show-overflow-tooltip + prop="zccssrq" + align="center" + width="150" + label="在产车实施日期"> + show-overflow-tooltip + prop="textStatus" + width="100px" + align="center" + label="文本状态"> @@ -243,139 +231,138 @@ 清单条目
导出 删除
+ type="selection" + width="55" + align="center"> + show-overflow-tooltip + width="180px" + fixed="left" + align="center" + :label="standLabelNum"> + prop="standEnName" + align="center" + width="180px" + label="英文名称"> + prop="typeApplicable" + align="center" + width="180px" + label="适用车型"> + prop="nylx" + align="center" + width="180px" + label="能源类型"> + prop="ssrq" + align="center" + width="210px" + label="标准实施日期"> + show-overflow-tooltip + prop="zccssrqgj" + width="210px" + align="center" + label="在产车实施日期"> + prop="xcxssrqgj" + align="center" + width="210px" + label="新车型实施日期"> + show-overflow-tooltip + prop="zrbm" + width="210px" + align="center" + label="责任部门"> + show-overflow-tooltip + prop="sycpx" + width="180px" + align="center" + label="适用产品线"> @@ -405,13 +392,13 @@
@@ -421,11 +408,11 @@ @@ -445,11 +432,11 @@ + clearable + v-model.trim="editRowData.ssrq" + type="dates" + value-format="yyyy-MM-dd" + placeholder="选择日期"> @@ -479,24 +466,237 @@
提交 取消
+ + + +
+ + + + + + + + + + + + + + + + {{ opt.label }} + + + + + + {{ opt.label }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ 取消 + 确认 +
+
+ + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index c35fd6eac..e3386c8e9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -952,6 +952,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change' } ], + putTime: [ + { required: true, message: '请选择企标实施日期', trigger: 'change' } + ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index 2fd189adf..7b5ce1fd6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -1019,7 +1019,7 @@ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], putTime: [ - { required: false, message: '请选择企标实施日期', trigger: 'change' } + { required: true, message: '请选择企标实施日期', trigger: 'change' } ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } @@ -1975,11 +1975,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined); - if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){ - this.$message.error('文件限制只可上传一个') - return false - } + // this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined); + // if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){ + // this.$message.error('文件限制只可上传一个') + // return false + // } if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { @@ -2533,7 +2533,6 @@ this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName); this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName); this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName); - console.log(this.LSBBBUSSFileList) this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName); this.formKey++ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue index bab22e13a..570cb2108 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue @@ -957,6 +957,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], + putTime: [ + { required: true, message: '请选择企标实施日期', trigger: 'change' } + ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index 4bbee0e44..bfc3831b0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -7,8 +7,8 @@
会签评分
基础信息
- -
审批历史
+
会签意见
+
审批历史
- +
--> - - -
-
-
- {{ item.name }} - - - -
-
-
- - - -
-
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -185,7 +185,128 @@ :disabledState = "disabledState" :verifySarStandard = "verifySarStandard">
- +
+ + + + +
+ @@ -264,7 +385,7 @@ -
+
item.response === undefined && item.raw === undefined); - if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){ - this.$message.error('文件限制只可上传一个') - return false - } + // this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined); + // if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){ + // this.$message.error('文件限制只可上传一个') + // return false + // } if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index b6f30ab4c..8a1ee1e07 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -1089,6 +1089,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], + putTime: [ + { required: true, message: '请选择企标实施日期', trigger: 'change' } + ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue index 8fdd3e678..11f460fc1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue @@ -883,6 +883,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], + putTime: [ + { required: true, message: '请选择企标实施日期', trigger: 'change' } + ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index 10c0623b9..46b4062d4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -1091,6 +1091,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], + putTime: [ + { required: true, message: '请选择企标实施日期', trigger: 'change' } + ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index 1fdafaf7c..3a1756c5a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -921,6 +921,8 @@ xdUserName: this.$store.getters.userInfo.userName, pxUserId: this.$store.getters.userInfo.userId, pxUserName: this.$store.getters.userInfo.userName, + fbUserId: '', + fbUserName: '', qcUserId: '', // 多实例 qcUserName:'', // 多实例 bzhUserId:'', @@ -1017,7 +1019,7 @@ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], putTime: [ - { required: false, message: '请选择企标实施日期', trigger: 'change' } + { required: true, message: '请选择企标实施日期', trigger: 'change' } ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } @@ -1973,11 +1975,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined); - if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){ - this.$message.error('文件限制只可上传一个') - return false - } + // this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined); + // if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){ + // this.$message.error('文件限制只可上传一个') + // return false + // } if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { @@ -2531,7 +2533,6 @@ this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName); this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName); this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName); - console.log(this.LSBBBUSSFileList) this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName); this.formKey++ diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 882d3509e..c11ae9fa3 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -352,7 +352,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '重新企标汇总修订'){ + }else if (row.taskInfo === '重新企标编写汇总修订'){ this.$router.push({ name: 'bussLibraryC3', query: { diff --git a/src/router/index.js b/src/router/index.js index 0f5a22d51..b12ff7caa 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1067,7 +1067,15 @@ const routes = [ requireAuth: true, title: '企标制修订流程及企业标准库流程' } - }, + },{ + path: '/bussLibrary13', + name: 'bussLibrary13', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step13.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + }, { path: '/bussLibraryDetail', name: 'bussLibraryDetail', From 561edcc9ea74925e33b7a3af2c1ffc83edcd39ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 7 Jan 2022 18:06:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=90=AF=E7=94=A8?= =?UTF-8?q?=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/roleManage/index.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index 914b5f030..9d5cde35c 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -393,6 +393,11 @@ export default { AddRoleOk() { // 新增角色确定 this.$refs['addForm'].validate((valid) => { if (valid) { + if(this.addForm.useFlag === '启用'){ + this.addForm.useFlag = '1' + }else { + this.addForm.useFlag = '0' + } if (this.type === 1) { // 新增 this.$http.postData('sarRole/role', this.addForm, {}, res => { if (res.ok) { From f36cae2b5d731c5c8fd5ad2299df6a1d12fedd50 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 7 Jan 2022 18:13:12 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzrk/step1.vue | 9 ++++++++- .../processCenter/pages/creatProcess/bzrk/step4.vue | 10 +++++++--- .../domesticStandardsAndRegulations/index.vue | 3 --- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 28587330f..b0b5fd664 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -126,7 +126,7 @@ 是 否 - + @@ -1840,10 +1840,14 @@ export default { this.rules.standName[0].required = false this.rules.standEnName[0].required = true; this.rules.standNature[0].required = false + this.rules.standYear[0].required = false; + this.rules.standName[0].required = false } else { this.rules.standName[0].required = true this.rules.standNature[0].required = true this.rules.standEnName[0].required = false; + this.rules.standYear[0].required = true; + this.rules.standName[0].required = true } this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN' //切换清空表单 @@ -2996,6 +3000,7 @@ export default { }, handleSubmit() { + // this.form.country=this.countryArr; this.$refs['form'].validate((valid) => { if (valid) { @@ -3045,6 +3050,8 @@ export default { } // 流程提交之后，应该流转至待办任务页面 this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) + } else { + this.isSubmit = false } }) } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index cd698d361..025968104 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -55,14 +55,14 @@ > - + - +