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:
super_liu
2022-05-19 15:38:43 +08:00
parent aeb714bf54 25a92aec07
commit 7a82a6a3ed
33 changed files with 449 additions and 2887 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+1 -1
View File
@@ -1534,7 +1534,7 @@ export default {
this.rowList = row;
this.editRowData = this.rowList;
if(this.editRowData.syrz === '-'){
this.editRowData.ssrq = "";
this.editRowData.syrz = "";
}else if(this.editRowData.syrz){
this.editRowData.syrz = this.editRowData.syrz.split(',')
}
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+10 -7
View File
@@ -1662,11 +1662,14 @@
</el-option>
</el-select>
</el-form-item>
<!-- 备案日期 -->
<el-form-item label="备案日期" class="add-form-item form-item-disabled">
<!-- 备案日期 目前不确定是否需要 暂时隐藏 -->
<el-form-item style="display: none" label="备案日期" class="add-form-item form-item-disabled">
<el-date-picker
v-model="advanceSearchMapping.BARQ"
type="date"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
placeholder="根据备案日期查找">
</el-date-picker>
@@ -3764,8 +3767,8 @@ export default {
advanceSearchVOList.push({
connect: "and",
field: key || '',
type: 'equals',
value: value
type: 'between',
value: value.join(',')
});
} else if (value !== null && value !== '' && (key === 'TXLBName')) {
} else if (value !== null && value !== '') {
@@ -4619,8 +4622,8 @@ export default {
advanceSearchVOList.push({
connect: "and",
field: key || '',
type: 'equals',
value: value
type: 'between',
value: value.join(',')
});
} else if (value !== null && value !== '' && (key === 'TXLBName')) {
} else if (value !== null && value !== '') {
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+10 -6
View File
@@ -1155,13 +1155,15 @@
<!-- 备案日期 -->
<el-form-item label="备案日期" class="add-form-item form-item-disabled">
<el-datePicker
:editable="false"
<el-date-picker
v-model="sarBussionessSearch.BARQ"
type="date"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
placeholder="根据备案日期查找">
</el-datePicker>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -4358,6 +4360,7 @@ export default {
// 清空搜索框
clearAllSearch(flag) {
if (flag === 'sarBussionessSearch') {
console.log('1');
// 标准搜索
this.sarBussionessSearch.applyCountry = ''
this.sarBussionessSearch.standGenera = ''
@@ -4394,6 +4397,7 @@ export default {
this.sarBussionessSearch.QCRBUSS = ''
this.sarBussionessSearch.QCDW = ''
this.sarBussionessSearch.FZRQBUSS = ''
this.sarBussionessSearch.BARQ = ''
this.sarBussionessSearch.FSRQBUSS = ''
this.sarBussionessSearch.DTQBBHBUSS = ''
this.sarBussionessSearch.BDTQBBHBUSS = ''
@@ -4510,8 +4514,8 @@ export default {
advanceSearchVOList.push({
connect: "and",
field: item.attrField || "",
type: 'EQUALS',
value: value
type: "between",
value: (value ? value[0]+','+value[1] : "") || "",
});
}else if (value !== undefined && value !== null && value !== "" && (item.attrField === 'FZRQBUSS' || item.attrField === 'FSRQBUSS')) {
advanceSearchVOList.push({
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+7 -8
View File
@@ -510,8 +510,8 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- 备案日期 -->
<el-form-item label="备案日期" class="add-form-item form-item-disabled">
<!-- 备案日期 目前不确定是否需要 暂时隐藏 -->
<el-form-item style="display: none" label="备案日期" class="add-form-item form-item-disabled">
<el-date-picker
v-model="advanceSearchMapping.BARQ"
type="date"
@@ -519,6 +519,11 @@
placeholder="根据备案日期查找">
</el-date-picker>
</el-form-item>
<!-- 标签-->
<el-form-item label="标签" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.GXHBQ" clearable
placeholder="根据被标签查找"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 标准类别-->
@@ -549,12 +554,6 @@
<el-option value="2" label="否"></el-option>
</el-select>
</el-form-item>
<!-- 标记-->
<!-- 标签-->
<el-form-item label="标签" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.GXHBQ" clearable
placeholder="根据被标签查找"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>