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
2022-01-13 16:04:29 +08:00
parent 54f03674d0 02b6b629ed
commit 767caa6ef6
8 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/navMenu/index.vue
+1 -1
View File
@@ -721,7 +721,7 @@
}
}
.el-menu-item {
padding-left: 29px !important;
padding-left: 0 !important;
font-size: 16px;
font-weight: normal;
height: 40px;
src/pages/home2/components/empennage/index.vue
+2 -2
View File
@@ -2,7 +2,7 @@
<template>
<div class="link" id="link">
<!-- 此部分暂时这样写，到后面做修改 -->
<div style="display: inline-block;width: 15%;">
<div style="display: inline-block;width: 10%;">
<span class="title borderRight">友情链接</span>
</div>
<div style="display: inline-block;width: 80%;text-align: center">
@@ -225,7 +225,7 @@ export default {
word-break: break-all;
line-height: normal;
margin-top: 10px;
font-size: 5px;
//font-size: 5px;
}
}
</style>
src/pages/home2/components/navMenu/index.vue
+1 -1
View File
@@ -81,7 +81,7 @@
border-radius: 10px;
}
.menu-wrap {
height: 200px;
height: 175px;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+16 -3
View File
@@ -160,6 +160,19 @@
clearable
></el-input>
</el-form-item>
<!--<el-form-item label="归档位置">
<el-input
style="display: none"
v-model="form.treeListId"
placeholder="请"
readonly
></el-input>
<el-input
v-model="form.treeListName"
placeholder="请输入标准英文名称"
readonly
></el-input>
</el-form-item>-->
</el-col>
</el-row>
</div>
@@ -1622,10 +1635,10 @@ export default {
{required: true, message: '请输入标准中文名称', trigger: 'blur'},
{min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur'}
],
standEnName: [
/*standEnName: [
{required: false, message: '请输入标准英文名称', trigger: 'blur'},
{min: 1, max: 500, message: '长度在 1 到 500 个字符', trigger: 'blur'}
],
],*/
standNature: [
{required: true, message: '请选择标准性质', trigger: 'change'}
],
@@ -2575,7 +2588,7 @@ export default {
this.quoteIdList1 = []
this.replaceLawsNumForm.quoteIdList = ''
}
this.replaceLawsNumForm.standType = this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
this.replaceLawsNumForm.standType = 'FOREIGN' // this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
_this: this,
loading: 'replaceLoading'
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+3 -3
View File
@@ -1520,10 +1520,10 @@ export default {
{ required: true, message: '请输入标准名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
],
standEnName: [
/* standEnName: [
{ required: false, message: '请输入标准英文名称', trigger: 'blur' },
{ min: 1, max: 500, message: '长度在 1 到 500 个字符', trigger: 'blur' }
],
],*/
/*standNature: [
{ required: true, message: '请选择标准性质', trigger: 'change' }
],*/
@@ -1998,7 +1998,7 @@ export default {
this.quoteIdList1 = []
this.replaceLawsNumForm.quoteIdList = ''
}
this.replaceLawsNumForm.standType = this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
this.replaceLawsNumForm.standType = 'FOREIGN' // this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
_this: this,
loading: 'replaceLoading'
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
-9
View File
@@ -107,15 +107,6 @@
<span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="overTime"
label="完成日期"
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('m.operation')" align="center" width="80">
<template slot-scope="scope">
<el-button size="mini" type="primary" @click="dealWith(scope.row)">办理</el-button>
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+5 -7
View File
@@ -285,10 +285,13 @@
<span v-else>{{ scope.row.ZCCSSRQ }}</span>
</template>
</el-table-column>
<el-table-column
prop="dtbzh"
width="200"
label="代替标准号">
</el-table-column>
<el-table-column
prop="textStatus"
sortable="custom"
width="110"
label="文本状态">
<!-- <template slot="header" slot-scope="scope">-->
<!-- <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
@@ -304,11 +307,6 @@
<span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
<el-table-column
prop="replaceStandNum"
width="150"
label="代替标准号">
</el-table-column>
<el-table-column fixed="right"
v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0"
label="收藏" align="center" width="50px"
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+2 -2
View File
@@ -2287,11 +2287,11 @@ export default {
synopsis: [
{type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'}
],
standEnName: [
/* standEnName: [
{required: true, message: '英文名称不能为空', trigger: 'change'},
// {validator: this.verify.valiateEnName, trigger: 'blur'},
{type: 'string', max: 500, message: '英文名称不能超过500个字符不', trigger: 'change'}
],
],*/
standName: [
{required: false, message: '中文名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}