FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zhutianqi
2021-12-17 17:31:25 +08:00
parent b3ecd95964 cdda1c385d
commit 72a16863c0
23 changed files with 851 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+6 -3
View File
@@ -452,7 +452,7 @@
<el-form-item label="标准实施日期" prop="ssrq">
<el-date-picker
v-model.trim="editRowData.ssrq"
type="date"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
@@ -460,7 +460,7 @@
<el-form-item label="在产车实施日期" prop="zccssrqgj">
<el-date-picker
v-model.trim="editRowData.zccssrqgj"
type="date"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
@@ -468,7 +468,7 @@
<el-form-item label="新车型实施日期" prop="xcxssrqgj">
<el-date-picker
v-model.trim="editRowData.xcxssrqgj"
type="date"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
@@ -2350,6 +2350,9 @@ export default {
background: #ffffff;
text-align: right;
}
/deep/.el-date-editor.el-input {
width: 100%;
}
}
.labelBox {
/deep/ .el-form-item__label {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+6 -3
View File
@@ -517,7 +517,7 @@
<el-form-item label="标准实施日期" prop="ssrq">
<el-date-picker
v-model.trim="editRowData.ssrq"
type="date"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
@@ -525,7 +525,7 @@
<el-form-item label="在产车实施日期" prop="zccssrqgj">
<el-date-picker
v-model.trim="editRowData.zccssrqgj"
type="date"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
@@ -533,7 +533,7 @@
<el-form-item label="新车型实施日期" prop="xcxssrqgj">
<el-date-picker
v-model.trim="editRowData.xcxssrqgj"
type="date"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
@@ -2318,6 +2318,9 @@ export default {
background: #ffffff;
text-align: right;
}
/deep/.el-date-editor.el-input {
width: 100%;
}
}
.labelBox {
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+21 -13
View File
@@ -597,7 +597,7 @@
</el-form-item>
</template>
<template v-else-if="field.attrField === 'CYCVPPSCN'">
<el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" label-width="150px"
<el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" label-width="150px"
prop="cycvppscn" class="add-form-item">
<el-input
v-model="sarStandardsInfoEO.CYCVPPSCN" disabled
@@ -606,7 +606,7 @@
</el-form-item>
</template>
<template v-else-if="field.attrField === 'KCCVPPSCN'">
<el-form-item title="关联模块--卡车vpps中文名称" label="关联模块--卡车vpps中文名称" label-width="150px" prop="kccvppscn"
<el-form-item title="关联模块--卡车VPPS中文名称" label="关联模块--卡车VPPS中文名称" label-width="150px" prop="kccvppscn"
class="add-form-item">
<el-input
v-model="sarStandardsInfoEO.KCCVPPSCN" disabled
@@ -1714,17 +1714,10 @@
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- 关联模块--乘用车vpps中文名称-->
<el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" prop="standNumber"
<el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" prop="standNumber"
class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.CYCVPPSCN" clearable
placeholder="关联模块--乘用车vpps中文名称"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!--关联模块--卡车VPPS编码-->
<el-form-item title="关联模块--卡车VPPS编码" label="关联模块--卡车VPPS编码" prop="standNumber"
class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.KCCVPPSBM" clearable
placeholder="关联模块--卡车VPPS编码"
placeholder="关联模块--乘用车VPPS中文名称"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
@@ -1771,11 +1764,18 @@
</el-option>
</el-select>
</el-form-item>
<!--关联模块--卡车VPPS编码-->
<el-form-item title="关联模块--卡车VPPS编码" label="关联模块--卡车VPPS编码" prop="standNumber"
class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.KCCVPPSBM" clearable
placeholder="关联模块--卡车VPPS编码"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!--关联模块--卡车vpps中文名称-->
<el-form-item title="关联模块--卡车vpps中文名称" label="关联模块--卡车vpps中文名称" prop="standNumber"
<el-form-item title="关联模块--卡车VPPS中文名称" label="关联模块--卡车VPPS中文名称" prop="standNumber"
class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.KCCVPPSCN" clearable
placeholder="关联模块--卡车vpps中文名称"
placeholder="关联模块--卡车VPPS中文名称"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
</el-col>
@@ -4238,6 +4238,10 @@ export default {
}
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
this.SarExportSearchEo = formData
formData.startIssueTime = formData.issueTime[0]
formData.endIssueTime = formData.issueTime[1]
formData.issueTime = null
this.loading = true
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
_this: this, loading: 'loading'
@@ -5622,6 +5626,10 @@ export default {
overflow-x: scroll;
}
/deep/ .label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner{
width: 280px;
}
.OCRstandardForComments {
height: 100%;
}
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+4 -1
View File
@@ -1026,7 +1026,7 @@
:model="sarBussionessSearch"
:inline="true"
class="label-input-form table-lattice"
label-width="76px"
label-width="300px"
style="display: flex;flex-wrap: wrap">
<ProcessTitle>
<template slot="title">基础信息</template>
@@ -4552,6 +4552,9 @@ export default {
width:70%;
height:100%;
}
/deep/ .label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner{
width: 280px;
}
/deep/.contentTitle{
width: 100%;
}
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+33 -17
View File
@@ -465,7 +465,7 @@
<el-form
:model="sarStandardsSearch"
:inline="true"
label-width="68px"
label-width="300px"
class="label-input-form table-lattice"
style="display: flex;flex-wrap: wrap">
<ProcessTitle>
@@ -497,7 +497,10 @@
<el-form-item label="标准发布日期" title="标准发布日期" class="add-form-item form-item-disabled">
<el-date-picker
v-model="sarStandardsSearch.issueTime"
type="date"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
placeholder="根据标准发布日期查找">
</el-date-picker>
@@ -566,7 +569,10 @@
<el-form-item label="实施日期" class="add-form-item form-item-disabled">
<el-date-picker
v-model="advanceSearchMapping.SSRQ"
type="date"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
placeholder="根据实施日期查找">
</el-date-picker>
@@ -575,7 +581,10 @@
<el-form-item title="在产车实施日期" label="在产车实施日期" class="add-form-item form-item-disabled">
<el-date-picker
v-model="advanceSearchMapping.ZCCSSRQ"
type="date"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
placeholder="根据在产车实施日期查找">
</el-date-picker>
@@ -587,7 +596,10 @@
<el-date-picker
value-format="yyyy-MM-dd"
v-model="advanceSearchMapping.XCXSSRQ"
type="date"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
placeholder="根据新车型实施日期查找">
</el-date-picker>
</el-form-item>
@@ -641,15 +653,15 @@
</el-select>
</el-form-item>
<!-- 关联模块--乘用车vpps中文名称-->
<el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" prop="standNumber" class="add-form-item form-item-disabled">
<el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" prop="standNumber" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.CYCVPPSCN" clearable
placeholder="关联模块--乘用车vpps中文名称"
placeholder="关联模块--乘用车VPPS中文名称"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!--关联模块--卡车vpps中文名称-->
<el-form-item title="关联模块--卡车vpps中文名称" label="关联模块--卡车vpps中文名称" prop="standNumber" class="add-form-item form-item-disabled">
<el-form-item title="关联模块--卡车VPPS中文名称" label="关联模块--卡车VPPS中文名称" prop="standNumber" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.KCCVPPSCN" clearable
placeholder="关联模块--卡车vpps中文名称"
placeholder="关联模块--卡车VPPS中文名称"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
@@ -718,10 +730,10 @@
</el-col>
<el-col :span="12">
<!-- 被代替标准号-->
<el-form-item label="被代替标准号" class="add-form-item form-item-disabled">
<el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- <el-form-item label="被代替标准号" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
<!-- </el-form-item>-->
<!-- 被引用标准-->
<el-form-item label="被引用标准" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.BYYBJ" clearable
@@ -5132,6 +5144,10 @@ export default {
@import '~@/assets/styles/style';
#foreignStandardsAndRegulations {
/deep/ .label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner{
width: 280px;
}
//background: #fff;
display: flex;
height: 100%;
@@ -5366,15 +5382,15 @@ export default {
.label-input-form {
&.table-lattice {
/deep/ .el-input__inner {
height: 30px;
//height: 30px;
line-height: 30px;
border-radius: 0 !important;
}
}
.el-date-editor.el-input, .el-date-editor.el-input__inner {
width: 190px
}
//.el-date-editor.el-input, .el-date-editor.el-input__inner {
// width: 190px
//}
.classDisplay {
display: none;
src/pages/regulatoryRepository/workingGroup/index.vue
+15 -1
View File
@@ -14,6 +14,7 @@
<workingGroup2 v-if="activeName === 'workingGroup2'"></workingGroup2>
</el-tab-pane>
</el-tabs>
<el-button size="mini" type="primary" @click="statisticsBtn" class="statistics">工作组统计</el-button>
</div>
</template>
<script>
@@ -30,14 +31,27 @@
activeName: 'workingGroup1',
}
},
methods: {},
methods: {
statisticsBtn(){
this.$router.push({
name: 'dataStatisComments'
})
}
},
mounted() {},
beforeDestroy() {}
}
</script>
<style lang="less" scoped>
.workingGroup{
position: relative;
height: 100%;
.statistics{
position: absolute;
top: 0;
right: 0;
margin: 5px;
}
.home-tabs {
height: 100%;
/deep/.el-tabs__content {