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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-03-29 20:48:28 +08:00
parent 5d2ce8d44b 95ae216460
commit fa1fe15630
143 changed files with 2444 additions and 1894 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+36 -20
View File
@@ -503,16 +503,16 @@
<el-form-item :label="standLabelNum" class="add-form-item">
<el-input
v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'"
v-model="sarAccessInfo.standNumber"
placeholder="请输入标准号"/>
v-model="sarAccessInfo.seniorStandNumber"
:placeholder="'请输入' + standLabelNum"/>
<el-input
v-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'"
v-model="sarAccessInfo.lawsNumber"
placeholder="请输入政策编号"/>
v-model="sarAccessInfo.seniorLawsNumber"
:placeholder="'请输入' + standLabelNum"/>
<el-input
v-else-if="sarAccessInfo.dataSource === 'BUSINESS'"
v-model="sarAccessInfo.standCode"
placeholder="请输入标准号"/>
v-model="sarAccessInfo.seniorStandCode"
:placeholder="'请输入' + standLabelNum"/>
</el-form-item>
<el-form-item v-if="sarAccessInfo.dataSource === 'BUSINESS'" label="文本状态" class="add-form-item">
@@ -569,7 +569,7 @@
</el-col>
<el-col :span="12">
<el-form-item :label="standLabelName" class="add-form-item">
<el-input v-model="sarAccessInfo.standName" placeholder="请输入标准名称"></el-input>
<el-input v-model="sarAccessInfo.standName" :placeholder="'请输入' + standLabelName"></el-input>
</el-form-item>
<el-form-item label="是否纳入认证清单" class="add-form-item">
<el-select v-model="sarAccessInfo.isRelateAccess" clearable placeholder="根据是否纳入标准清单查找">
@@ -845,9 +845,14 @@ export default {
id: '',
standName: '',
standNumber: '',
lawsNumber: '',
standCode: '', // 政策编号
textStatus: '',
seniorStandNumber: '',
seniorLawsNumber: '',
seniorStandCode: '',
textStatusBuss: '',
CLLX: '',
SYRZ: '',
@@ -1032,7 +1037,7 @@ export default {
}*/
this.sarAccessInfo = formData
this.showQueryMore = false
this.selectLawsStands()
this.selectLawsStands(1)
},
// 删除上传的文件
@@ -1212,8 +1217,8 @@ export default {
this.$refs.searchTable.clearSelection()
this.$message.warning('请勿添加重复数据')
} else {
this.sarAccessInfoLists.push(item)
this.sarAccessInfoLists.forEach(item => {
this.sarAccessInfoList.push(item)
this.sarAccessInfoList.forEach(item => {
if (item.lawsNumber) {
item.standNumber = item.lawsNumber
}
@@ -1254,7 +1259,7 @@ export default {
// this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
this.sarAccessInfoLists.forEach(item => {
this.sarAccessInfoList.forEach(item => {
if (item.nylx === '[]') {
item.nylx = ''
}
@@ -1268,7 +1273,7 @@ export default {
item.sycpx = ''
}
})
this.sarAccessInfoList = this.sarAccessInfoLists
// this.sarAccessInfoList = this.sarAccessInfoLists
}
})
} else {
@@ -1508,9 +1513,20 @@ export default {
}
})
},
pageInfo() {
pageInfo(type) {
if (this.sarAccessInfo.dataSource === 'INLAND_STAND' || this.sarAccessInfo.dataSource === 'FOREIGN_STAND') {
StandardsInfoPage((this.sarAccessInfo)).then(res => {
if (type === 1) {
delete this.sarAccessInfo.standNumber
delete this.sarAccessInfo.lawsNumber
delete this.sarAccessInfo.standCode
}
console.log('this.sarAccessInfo===' , this.sarAccessInfo)
StandardsInfoPage(type === 1 ? ({...this.sarAccessInfo, standNumber: this.sarAccessInfo.seniorStandNumber, lawsNumber: this.sarAccessInfo.seniorLawsNumber, standCode: this.sarAccessInfo.seniorStandCode}) : (this.sarAccessInfo)).then(res => {
// if (type === 1) {
// this.sarAccessInfo.standNumber = ''
// this.sarAccessInfo.lawsNumber = ''
// this.sarAccessInfo.standCode = ''
// }
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
@@ -1544,20 +1560,20 @@ export default {
})
}
},
// 查询数据搜索 table 数据
selectLawsStands() {
// 查询数据搜索 table 数据 type === 1为高级搜索
selectLawsStands(type) {
if (this.sarAccessInfo.dataSource === 'INLAND_STAND') {
this.sarAccessInfo.standType = 'INLAND'
this.pageInfo()
this.pageInfo(type)
} else if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND') {
this.sarAccessInfo.standType = 'FOREIGN'
this.pageInfo()
this.pageInfo(type)
} else if (this.sarAccessInfo.dataSource === 'FOREIGN_LAWS') {
this.sarAccessInfo.standType = 'LAWS'
this.pageInfo()
this.pageInfo(type)
} else if (this.sarAccessInfo.dataSource === 'BUSINESS') {
this.sarAccessInfo.standType = 'BUSINESS'
this.pageInfo()
this.pageInfo(type)
}
},
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+2 -2
View File
@@ -621,14 +621,14 @@ export default {
const advanceSearchVOList = [];
for (let key in formData) {
const value = formData[key];
if (value !== null && value !== '' && value.length > 0 && (key === 'SYRZ' || key === 'CLLX')) {
if (value !== null && value !== '' && value !== undefined && value !== [] && (key === 'SYRZ' || key === 'CLLX')) {
advanceSearchVOList.push({
connect: "and",
field: key || '',
type: 'regexp',
value: value.join(',')
});
} else if (value !== null && value !== '' && value.length > 0 && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) {
} else if (value !== null && value !== '' && value !== undefined && value !== [] && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) {
advanceSearchVOList.push({
connect: "and",
field: key || '',
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+46 -1
View File
@@ -3719,6 +3719,43 @@ export default {
},
// 搜索
getDomesticStandardTableBtn(item) {
// // 自定义属性字段高级搜索处理
//advanceSearchVOStr
const advanceSearchVOList = [];
for (let key in this.advanceSearchMapping) {
const value = this.advanceSearchMapping[key];
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 !== '' && (key === 'BARQ')) {
advanceSearchVOList.push({
connect: "and",
field: key || '',
type: 'equals',
value: value
});
} else if (value !== null && value !== '' && (key === 'TXLBName')) {
} else if (value !== null && value !== '') {
advanceSearchVOList.push({
connect: "and",
field: key || '',
type: 'like',
value: value
});
}
}
item.advanceSearchVOStr = advanceSearchVOList
sessionStorage.setItem('tableFlag', JSON.stringify(item))
this.tableFlag = item
item.page = 1
@@ -4576,7 +4613,15 @@ export default {
});
}
}
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
if(item.advanceSearchVOStr){
advanceSearchVOList.push({
connect: item.advanceSearchVOStr[0].connect,
field: item.advanceSearchVOStr[0].field,
type: item.advanceSearchVOStr[0].type,
value: item.advanceSearchVOStr[0].value,
})
}
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList)
this.SarExportSearchEo = formData
formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null
formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+7 -7
View File
@@ -500,13 +500,13 @@
</el-date-picker>
</el-form-item>
<!-- 标准性质-->
<el-form-item :label="$t('m.standNatureShow')" class="add-form-item form-item-disabled">
<el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable>
<el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value"
:key="opt.value" :label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item :label="$t('m.standNatureShow')" class="add-form-item form-item-disabled">-->
<!-- <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable>-->
<!-- <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value"-->
<!-- :key="opt.value" :label="opt.label">{{ opt.label }}-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- 备案日期 -->
<el-form-item label="备案日期" class="add-form-item form-item-disabled">
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+5 -5
View File
@@ -226,10 +226,10 @@
<el-form :model="localProTableSearch" :inline="true" class="label-input-form table-lattice"
style="display: flex;flex-wrap: wrap">
<!-- 产品平台-->
<el-form-item label="产品平台" class="serch-form-item">
<el-input v-model="localProTableSearch.projectPlatfor" placeholder="根据产品平台" clearable :maxlength="100"
@keyup.enter.native="getLocalProductTableBtn"></el-input>
</el-form-item>
<!-- <el-form-item label="产品平台" class="serch-form-item">-->
<!-- <el-input v-model="localProTableSearch.projectPlatfor" placeholder="根据产品平台" clearable :maxlength="100"-->
<!-- @keyup.enter.native="getLocalProductTableBtn"></el-input>-->
<!-- </el-form-item>-->
<!-- 项目编号-->
<el-form-item label="项目编号" class="serch-form-item">
<el-input v-model="localProTableSearch.projectNumber" placeholder="根据项目编号" clearable :maxlength="500"
@@ -1341,7 +1341,7 @@ export default {
handleProcess(row) {
// 项目清单确认流程
this.$router.push({
name: 'xmqdqrStep1-4',
name: 'xmqdqrStep1',
query: {
row
}
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+32 -24
View File
@@ -79,7 +79,7 @@
</div>
</transition>
<div class="effect">
<el-button v-if="ideaKey" type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')" v-btn-permission="'bb5501f4461476b330cbbc3c6f22780a'">
<el-button v-if="ideaKey" type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')" v-btn-permission="''">
添加
</el-button>
<el-button type="primary" class="common-button-primary" size="mini" @click="exportAll" v-btn-permission="'5af38c3aaad325741045c4db44e6850e'">导出</el-button>
@@ -145,23 +145,30 @@
</el-table-column>
</el-table-column>
<el-table-column
prop="deptName"
align="center"
label="提出部门"
width="170"
prop="deptName"
align="center"
label="提出部门"
width="170"
>
</el-table-column>
<el-table-column
prop="userName"
align="center"
width="100"
label="提出人"
prop="userName"
align="center"
width="100"
label="提出人"
>
</el-table-column>
<el-table-column
prop="state"
align="center"
label="处理意见">
prop="sourceType"
align="center"
width="100"
label="来源"
>
</el-table-column>
<el-table-column
prop="state"
align="center"
label="处理意见">
<template slot-scope="scope">
<div>{{ stateText(scope.row.state) }}</div>
</template>
@@ -257,18 +264,19 @@
</template>
<script>
import { mapGetters } from 'vuex';
export default {
name: 'consultationDetails',
data() {
return {
freshClueNum: '',
itermsConditionsFlag: false,
itermsConditionsTitle: '',
options: [],
fileInfoList: [],
fileInfoLists: [],
itemData: this.lawsStand,
import { mapGetters } from "vuex";
export default {
name: "consultationDetails",
data() {
return {
freshClueNum: "",
itermsConditionsFlag: false,
itermsConditionsTitle: "",
options: [],
fileInfoList: [],
fileInfoLists: [],
itemData: this.lawsStand,
id: '', // 选中id
type: '', // 选中状态
spinShow: false,