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:
yanyizhou
2021-10-22 14:17:21 +08:00
parent 9cdc77656c ec3b397e65
commit 22f2bfbf35
6 changed files with 209 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+1 -1
View File
@@ -337,7 +337,7 @@
label="项目分类"
/>
<el-table-column
prop="projectManager"
prop="uname"
align="center"
label="项目经理"
/>
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+195 -156
View File
@@ -13,7 +13,7 @@
</div>
<transition name="el-zoom-in-top">
<div v-show="heightShow" class="transition-box">
<p class="transition-box-p" v-if="sarAccessEO.sortKey === '1'">
<p class="transition-box-p" v-if="sarAccessEO.sortKey === '1'">
<label class="transition-box-label">国家/地区：</label>
<span class="transition-box-span">
{{ sarAccessEO.countryAreaShow }}
@@ -71,11 +71,14 @@
</el-select>
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary" type="primary" size="small" @click="selectProductBtn">查询
<el-button v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary"
type="primary" size="small" @click="selectProductBtn">查询
</el-button>
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button v-btn-permission="'d55e2eb884449f04ecdb30f0523d965d'" class="common-button-default" @click="resetSelect" size="small">清空</el-button>
<el-button v-btn-permission="'d55e2eb884449f04ecdb30f0523d965d'" class="common-button-default"
@click="resetSelect" size="small">清空
</el-button>
</el-form-item>
<el-button class="common-button-default export-button"
@@ -110,11 +113,11 @@
align="center">
</el-table-column>
<el-table-column
label="序号"
align="center"
width="55"
fixed="left"
type="index"
label="序号"
align="center"
width="55"
fixed="left"
type="index"
>
</el-table-column>
<el-table-column
@@ -286,80 +289,80 @@
:wrapperClosable="false"
:visible.sync="isAdvancedSearch">
<div class="demo-drawer-content">
<el-form :model="standardFormList" class="labelForm" label-position="right" label-width="100px">
<el-form-item label="中文名称" >
<el-input
class="showBox"
v-model="standardFormList.standName"
placeholder="请输入"
:maxlength="100"
size="small"
/>
</el-form-item>
<el-form-item label="适用车型" >
<el-select
class="showBox"
v-model="standardFormList.typeApplicable"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in applyArcticOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="能源类型" >
<el-select
class="showBox"
v-model="standardFormList.nylx"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in categoryOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="责任部门" >
<el-select
class="showBox"
v-model="standardFormList.zrbm"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in zrbmOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="适用产品线" >
<el-select
class="showBox"
v-model="standardFormList.sycpx"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in sycpxOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form :model="standardFormList" class="labelForm" label-position="right" label-width="100px">
<el-form-item label="中文名称">
<el-input
class="showBox"
v-model="standardFormList.standName"
placeholder="请输入"
:maxlength="100"
size="small"
/>
</el-form-item>
<el-form-item label="适用车型">
<el-select
class="showBox"
v-model="standardFormList.typeApplicable"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in applyArcticOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="能源类型">
<el-select
class="showBox"
v-model="standardFormList.nylx"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in categoryOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="责任部门">
<el-select
class="showBox"
v-model="standardFormList.zrbm"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in zrbmOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="适用产品线">
<el-select
class="showBox"
v-model="standardFormList.sycpx"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in sycpxOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
</el-form>
</div>
<div class="demo-drawer-footer">
@@ -367,11 +370,13 @@
size="small"
icon="el-icon-check"
type="primary"
@click="queryInfo">搜索</el-button>
@click="queryInfo">搜索
</el-button>
<el-button
size="small"
icon="el-icon-close"
@click="backInfo">取消</el-button>
@click="backInfo">取消
</el-button>
</div>
</el-drawer>
@@ -381,6 +386,7 @@
<script>
import { interfaceUrl } from "@/sysConfig";
export default {
name: "AccessStandardDetails",
data() {
@@ -410,7 +416,7 @@ export default {
heightShow: true,
dataLoading: false,
standardForm: {
zrbm: '',
zrbm: "",
standNumber: "",
standName: "",
responseUnit: "",
@@ -418,13 +424,13 @@ export default {
Size: this.$store.getters.userInfo.configContent
},
standardFormList: {
zrbm: '',
typeApplicable: '',
nylx: '',
sycpx: '',
standNumber: '',
standName: '',
responseUnit: '',
zrbm: "",
typeApplicable: "",
nylx: "",
sycpx: "",
standNumber: "",
standName: "",
responseUnit: "",
page: 1,
Size: this.$store.getters.userInfo.configContent
},
@@ -441,18 +447,18 @@ export default {
loading: false,
accessSarType: "",
selectedList: [],
pageId: '',
pageId: "",
// 导出文件模态框控制，和文件名称
saveExportType: "",
depNode: [], // 部门树
sarAccessEO: {},
sarAccessEOInfo: '',
sarAccessEOInfo: "",
fileInfoList: [],
// 改变颜色
dialogColor: false,
dialogType: "",
color: "",
isShow: false,
isShow: false
};
},
methods: {
@@ -495,44 +501,73 @@ export default {
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
...this.standardFormList,
...this.standardForm,
id: this.pageId,
id: this.pageId
}, {
_this: this
}, res => {
console.log(res.data.records);
res.data.records.forEach(item => {
if (item.nylx === "[]") {
item.nylx = null;
}
if (item.typeApplicable === "[]") {
item.typeApplicable = null;
}
if (item.sycpx === "[]") {
item.sycpx = null;
}
if(item.zrbm === "[]"){
item.zrbm = null
}
});
this.standinfoList = res.data.records;
this.standardFormTotal = res.data.total
this.standardFormTotal = res.data.total;
this.standinfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
item.standNumber = item.standSortShow + " " + item.standNumber;
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
}
})
});
}, e => {
});
},
selectInfoMore() {
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
...this.standardFormList,
id: this.pageId,
id: this.pageId
}, {
_this: this
}, res => {
res.data.records.forEach(item => {
if (item.nylx === "[]") {
item.nylx = null;
}
if (item.typeApplicable === "[]") {
item.typeApplicable = null;
}
if (item.sycpx === "[]") {
item.sycpx = null;
}
if(item.zrbm === "[]"){
item.zrbm = null
}
});
this.standinfoList = res.data.records;
this.standardFormTotal = res.data.total
this.standardFormTotal = res.data.total;
this.standinfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
item.standNumber = item.standSortShow + " " + item.standNumber;
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
}
})
});
}, e => {
});
},
back() {
this.$router.push({name: 'AccessStandardsAndRegulations'})
this.$router.push({ name: "AccessStandardsAndRegulations" });
// this.$router.push(this.$store.state.detailMap)
// this.$store.commit('setDetailMap', '')
},
@@ -544,11 +579,11 @@ export default {
},
// 重置搜索
resetSelect() {
this.standardForm.zrbm = ''
this.standardForm.standName = ''
this.standardForm.responseUnit = ''
this.selectInfobyAccid()
this.selectInfoMore()
this.standardForm.zrbm = "";
this.standardForm.standName = "";
this.standardForm.responseUnit = "";
this.selectInfobyAccid();
this.selectInfoMore();
},
exportStandard() {
if (this.selectedList.length > 0) {
@@ -565,22 +600,22 @@ export default {
},
// 导出确定功能
//确认导出
exportTestItem () {
if(this.saveExportType === 'apart') {
if (this.selectedList != null && this.selectedList != ''){
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?' +
'exportType' + this.saveExportType + '&ids=' + this.selectedList.join(',') + '&exportName=' + this.exportName
window.open(exportURL)
this.$message.success('导出信息成功')
exportTestItem() {
if (this.saveExportType === "apart") {
if (this.selectedList != null && this.selectedList != "") {
const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" +
"exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
window.open(exportURL);
this.$message.success("导出信息成功");
}
} else if (this.saveExportType === 'all') {
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?' +
'exportType' + this.saveExportType + '&id=' + this.pageId + '&exportName=' + this.exportName
window.open(exportURL)
this.$message.success('导出信息成功')
} else if (this.saveExportType === "all") {
const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" +
"exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
window.open(exportURL);
this.$message.success("导出信息成功");
}
this.exportModelFlag = false
this.selectedList = []
this.exportModelFlag = false;
this.selectedList = [];
},
// tab页切换
handleClick(tab, event) {
@@ -591,10 +626,10 @@ export default {
this.selectInfobyAccid();
},
// 修改成表格样式后，选择项勾选改变
standSelectChange (data) {
this.selectedList = []
standSelectChange(data) {
this.selectedList = [];
for (let i = 0; i < data.length; i++) {
this.selectedList.push(data[i].id)
this.selectedList.push(data[i].id);
}
},
pageChange(page) {
@@ -655,7 +690,7 @@ export default {
},
// 附件下载事件
fileDownLoad(attId) {
window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId
window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId;
},
// 点击查看
handlePreview(data) {
@@ -707,30 +742,30 @@ export default {
* 高级检索
*/
selectMoreBtn() {
this.isAdvancedSearch = true
this.standardFormList.standName = ''
this.standardFormList.typeApplicable = ''
this.standardFormList.nylx = ''
this.standardFormList.zrbm = ''
this.standardFormList.sycpx = ''
this.showTableFlag = false
this.page = 1
this.standardForm.page = 1
this.selectInfoMore()
this.isAdvancedSearch = true;
this.standardFormList.standName = "";
this.standardFormList.typeApplicable = "";
this.standardFormList.nylx = "";
this.standardFormList.zrbm = "";
this.standardFormList.sycpx = "";
this.showTableFlag = false;
this.page = 1;
this.standardForm.page = 1;
this.selectInfoMore();
},
queryInfo() {
this.page = 1;
this.standardForm.page = 1;
this.selectInfoMore();
this.isAdvancedSearch = false
this.isAdvancedSearch = false;
},
backInfo() {
this.standardFormList.standName = ''
this.standardFormList.typeApplicable = ''
this.standardFormList.nylx = ''
this.standardFormList.zrbm = ''
this.standardFormList.sycpx = ''
this.isAdvancedSearch = false
this.standardFormList.standName = "";
this.standardFormList.typeApplicable = "";
this.standardFormList.nylx = "";
this.standardFormList.zrbm = "";
this.standardFormList.sycpx = "";
this.isAdvancedSearch = false;
},
// 获取工作组信息下拉框信息
getGzzOption() {
@@ -767,16 +802,16 @@ export default {
this.$refs.skillTable && this.$refs.skillTable.doLayout();
},
// 将文本状态的id与name对应
setMap(data){
setMap(data) {
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
})
this.$set(this.textStatusMap, item.value, item.label);
});
}
},
mounted() {
this.$nextTick(() => {
let accessRow = JSON.parse(sessionStorage.getItem("accessRow"));
this.pageId = accessRow.id
this.pageId = accessRow.id;
this.sarAccessEO = accessRow;
this.selectInfobyAccid();
this.getOrgTreeSource();
@@ -800,11 +835,11 @@ export default {
this.ROLELIST = res.data.ROLELIST;
this.GXHBQOptions = res.data.GXHBQXX;
this.askNatureOptions = res.data.ACCESSTYPE;
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.textStatusOptions = res.data.WBZTCLASS
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.setMap(this.textStatusOptions)
this.zrbmOptions = res.data.ZRBMCLASS; // 责任部门
this.categoryOptions = res.data.NYLXCLASS; // 能源类型
this.textStatusOptions = res.data.WBZTCLASS;
this.sycpxOptions = res.data.SYCPXCLASS; // 适用产品线
this.setMap(this.textStatusOptions);
this.getGzzOption();
}, e => {
});
@@ -935,9 +970,11 @@ export default {
}
}
}
.labelForm {
margin-top: 20px;
}
/deep/ .relateClass {
& > button {
height: 30px;
@@ -969,9 +1006,10 @@ export default {
}
}
/deep/.showBox{
/deep/ .showBox {
width: 300px;
}
.iconClass {
width: 18px;
height: 18px;
@@ -995,6 +1033,7 @@ export default {
cursor: pointer
}
}
.relateClass {
.el-dialog__body {
max-height: 460px;
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+4 -1
View File
@@ -5202,7 +5202,10 @@ export default {
}
.el-card {
min-width: min-content;
width: 500px;
min-width: 2000px;
max-width: 100%;
//min-width: min-content;
}
height: 95%;
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+4 -1
View File
@@ -4159,7 +4159,10 @@ export default {
padding: 0 !important;
}
.el-card{
min-width: min-content;
width: 500px;
min-width: 2000px;
max-width: 100%;
//min-width: min-content;
}
height: 95%;
width: 95%;
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+4 -1
View File
@@ -4903,7 +4903,10 @@ export default {
}
.el-card {
min-width: min-content;
width: 500px;
min-width: 2000px;
max-width: 100%;
//min-width: min-content;
}
height: 95%;
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+1 -1
View File
@@ -185,7 +185,7 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="projectManager"
prop="uname"
align="center"
label="项目经理">
</el-table-column>