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:
zhaokaiyao@91isoft.com
2021-12-30 17:46:29 +08:00
parent 8849004b05 aa9bf64879
commit 021af1806d
93 changed files with 940 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+19 -2
View File
@@ -4289,7 +4289,7 @@ export default {
},
// 分页查询国内标准
getDomesticStandardTable(item) {
console.log(item)
console.log('4292',item)
if (item !== '' && item !== null && item !== undefined) {
item.pageSize = this.$store.getters.userInfo.configContent
}
@@ -4330,9 +4330,26 @@ export default {
// // 自定义属性字段高级搜索处理
//advanceSearchVOStr
const advanceSearchVOList = [];
console.log('4333',this.advanceSearchMapping)
for (let key in this.advanceSearchMapping) {
console.log('key',key)
const value = this.advanceSearchMapping[key];
if (value !== null && value !== '') {
console.log('value',value)
if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX&&item.CLLX.length>0)) ){
advanceSearchVOList.push({
connect: "and",
field: key || '',
type: 'regexp',
value: value.join(',')
});
}else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ' )){
advanceSearchVOList.push({
connect: "and",
field: key || '',
type: 'between',
value: value.join(',')
});
}else if (value !== null && value !== ''){
advanceSearchVOList.push({
connect: "and",
field: key || '',
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+1 -1
View File
@@ -1919,7 +1919,7 @@ export default {
standName: [
{required: true, message: '中文名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'},
{validator: this.verify.valiateName, trigger: 'change'}
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{required: true, message: '英文名称不能为空', trigger: 'change'},
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+27 -14
View File
@@ -5,6 +5,7 @@
<el-form :modal="form" inline class="label-input-form">
<el-form-item label="计划状态" class="search-item">
<el-select v-model="form.planStatus" placeholder="请选择计划状态">
<el-option label="请选择" value=""></el-option>
<el-option label="未开始" value="0"></el-option>
<el-option label="制定中" value="1"></el-option>
<el-option label="修订中" value="2"></el-option>
@@ -14,6 +15,7 @@
</el-form-item>
<el-form-item label="制修订状态" class="search-item">
<el-select v-model="form.reviseStatus" placeholder="请选择制修订状态">
<el-option label="请选择" value=""></el-option>
<el-option label="制定" value="1"></el-option>
<el-option label="修订" value="2"></el-option>
</el-select>
@@ -118,7 +120,7 @@
align="center"
label="制修订状态">
<template slot-scope="scope">
<div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
<div>{{ scope.row.reviseStatus === ''? '' : (scope.row.reviseStatus === '1'? '制定' : '修订') }}</div>
</template>
</el-table-column>
<el-table-column
@@ -204,10 +206,10 @@
<el-col :span="24">
<el-form :model="addForm" inline class="label-input-form" label-width="180px" :rules="addFormRules" ref="addForm">
<el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-select v-model="addForm.bussSort" filterable clearable placeholder="" style="appearance: none" placeholder="请选择企标类别">
<el-select :disabled="DrawerType === 'see'" v-model="addForm.bussSort" filterable clearable placeholder="" style="appearance: none" placeholder="请选择企标类别">
<el-option
v-for="item in standSortOptions"
:key="item.value"
v-for="(item, index) in standSortOptions"
:key="index"
:value="item.value"
:label="item.label"
></el-option>
@@ -321,7 +323,7 @@
</el-form-item>
<el-form-item label="标准范围" style="width: 100%; margin-right:10px" class="add-form-item" prop="area" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-select v-model="addForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
<el-select :disabled="DrawerType === 'see'" v-model="addForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
@@ -333,7 +335,7 @@
</el-form-item>
<el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="isRelate" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
<el-radio-group v-model="addForm.isRelate">
<el-radio-group :disabled="DrawerType === 'see'" v-model="addForm.isRelate">
<el-radio label="是" value="是"></el-radio>
<el-radio label="否" value="否"></el-radio>
</el-radio-group>
@@ -343,13 +345,14 @@
<custom-input-for-all-standards
class="classDisplay"
:config="{attrName: '采用标准'}"
:disabled="DrawerType === 'see'"
:labelWidth="'180px'"
v-model="addForm.esStandRelations"
></custom-input-for-all-standards>
</template>
<el-form-item v-if="addForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" class="add-form-item" prop="useLevel" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
<el-radio-group v-model="addForm.useLevel">
<el-radio-group :disabled="DrawerType === 'see'" v-model="addForm.useLevel">
<el-radio label="等同" value="等同"></el-radio>
<el-radio label="修改" value="修改"></el-radio>
<el-radio label="非等效" value="非等效"></el-radio>
@@ -359,6 +362,7 @@
<el-form-item v-if="addForm.isRelate === '否'" label="简述技术指标依据" style="width: 100%; margin-right:10px" class="add-form-item" prop="technologic" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.technologic"
placeholder="请简述技术指标依据">
</el-input>
@@ -367,6 +371,7 @@
<template>
<custom-input-for-all-standards2
class="classDisplay"
:disabled="DrawerType === 'see'"
:config="{attrName: '配套标准'}"
:labelWidth="'180px'"
v-model="addForm.esMatingRelations"
@@ -716,12 +721,16 @@
this.TXJGmodal = false
},
choiceTXJG (id) {
if (id) {
this.TXJGList = id.split(',')
if ( this.DrawerType === 'see') {
return
} else {
this.TXJGList = []
if (id) {
this.TXJGList = id.split(',')
} else {
this.TXJGList = []
}
this.TXJGmodal = true
}
this.TXJGmodal = true
},
QYBZcloseDrawer () {
this.clearQYBZ()
@@ -766,9 +775,13 @@
}
},
choiceQYBZ (id) {
this.QYBZformSelect = []
this.QYBZget()
this.QYBZmodal = true
if (this.DrawerType === 'see') {
return
} else {
this.QYBZformSelect = []
this.QYBZget()
this.QYBZmodal = true
}
},
drawerCheckZRBM (data) {
let list = ''
src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+2 -2
View File
@@ -1817,7 +1817,7 @@
lawsName: [
{required: true, message: '中文名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'},
{validator: this.verify.valiateName, trigger: 'change'}
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
lawsEnName: [
{required: false, message: '英文名称不能为空', trigger: 'change'},
@@ -1859,7 +1859,7 @@
lawsName: [
{required: true, message: '中文名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'},
{validator: this.verify.valiateName, trigger: 'change'}
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
lawsEnName: [
{required: false, message: '英文名称不能为空', trigger: 'change'},
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+36 -19
View File
@@ -945,22 +945,22 @@
placeholder="请输入标准英文名称"
clearable></el-input>
</el-form-item>
<el-form-item prop="standNature" label-width="150px" class="add-form-item">
<template slot="label">标准性质</template>
<el-select v-model="sarStandardsInfoEO.standNature"
placeholder="请选择标准性质"
clearable>
<el-option
v-for="item in standNatureOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
>
{{ item.label }}
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item prop="standNature" label-width="150px" class="add-form-item">-->
<!-- <template slot="label">标准性质</template>-->
<!-- <el-select v-model="sarStandardsInfoEO.standNature"-->
<!-- placeholder="请选择标准性质"-->
<!-- clearable>-->
<!-- <el-option-->
<!-- v-for="item in standNatureOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- >-->
<!-- {{ item.label }}-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
prop="standState" label-width="150px" class="add-form-item">
<template slot="label">文本状态</template>
@@ -2285,11 +2285,11 @@ export default {
{type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
],
standName: [
{required: true, message: '中文名称不能为空', trigger: 'change'},
{required: false, message: '中文名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
],
standEnName: [
{required: true, message: '英文名称不能为空', trigger: 'change'},
{required: false, message: '英文名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}
// {validator: this.verify.valiateEnName, trigger: 'blur'}
],
@@ -3810,9 +3810,26 @@ export default {
// // 自定义属性字段高级搜索处理
//advanceSearchVOStr
const advanceSearchVOList = [];
console.log('4333',this.advanceSearchMapping)
for (let key in this.advanceSearchMapping) {
console.log('key',key)
const value = this.advanceSearchMapping[key];
if (value !== null && value !== '') {
console.log('value',value)
if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX&&item.CLLX.length>0)) ){
advanceSearchVOList.push({
connect: "and",
field: key || '',
type: 'regexp',
value: value.join(',')
});
}else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ' )){
advanceSearchVOList.push({
connect: "and",
field: key || '',
type: 'between',
value: value.join(',')
});
}else if (value !== null && value !== ''){
advanceSearchVOList.push({
connect: "and",
field: key || '',