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-06 15:00:48 +08:00
parent 520560eaaa 10b39b44f5
commit 8fcc67ad87
3 changed files with 109 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+72 -58
View File
@@ -462,39 +462,44 @@ export default {
}, { }, {
_this: this _this: this
}, res => { }, res => {
res.data.records.forEach(item => { if (res.data !== null) {
if (item.nylx === "[]") { res.data.records.forEach(item => {
item.nylx = null; if (item.nylx === "[]") {
} item.nylx = null;
if (item.typeApplicable === "[]") { }
item.typeApplicable = null; if (item.typeApplicable === "[]") {
} item.typeApplicable = null;
if (item.sycpx === "[]") { }
item.sycpx = null; if (item.sycpx === "[]") {
} item.sycpx = null;
if(item.zrbm === "[]"){ }
item.zrbm = null if(item.zrbm === "[]"){
} item.zrbm = null
if (item.zccssrqgj === "undefined") { }
item.zccssrqgj = '-' if (item.zccssrqgj === "undefined") {
} item.zccssrqgj = '-'
if (item.xcxssrqgj === "undefined") { }
item.xcxssrqgj = '-' if (item.xcxssrqgj === "undefined") {
} item.xcxssrqgj = '-'
if (item.ssrq === "undefined") { }
item.ssrq = '-' if (item.ssrq === "undefined") {
} item.ssrq = '-'
}); }
this.standinfoList = res.data.records; });
this.standardFormTotal = res.data.total; this.standinfoList = res.data.records;
this.standinfoList.forEach(item => { this.standardFormTotal = res.data.total;
if (item.standYear === null) { this.standinfoList.forEach(item => {
item.standNumber = item.standSortShow + " " + item.standNumber; if (item.standYear === null) {
} else { item.standNumber = item.standSortShow + " " + item.standNumber;
item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear; } else {
} item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
}); }
this.standInfoTableLoading = false });
this.standInfoTableLoading = false
} else {
this.standinfoList = []
}
}, e => { }, e => {
this.standInfoTableLoading = false this.standInfoTableLoading = false
}); });
@@ -506,30 +511,35 @@ export default {
}, { }, {
_this: this _this: this
}, res => { }, res => {
res.data.records.forEach(item => { if (res.data !== null) {
if (item.nylx === "[]") { res.data.records.forEach(item => {
item.nylx = null; if (item.nylx === "[]") {
} item.nylx = null;
if (item.typeApplicable === "[]") { }
item.typeApplicable = null; if (item.typeApplicable === "[]") {
} item.typeApplicable = null;
if (item.sycpx === "[]") { }
item.sycpx = null; if (item.sycpx === "[]") {
} item.sycpx = null;
if(item.zrbm === "[]"){ }
item.zrbm = null if(item.zrbm === "[]"){
} item.zrbm = null
}); }
this.standinfoList = res.data.records; });
this.standardFormTotal = res.data.total; this.standinfoList = res.data.records;
this.standinfoList.forEach(item => { this.standardFormTotal = res.data.total;
if (item.standYear === null) { this.standinfoList.forEach(item => {
item.standNumber = item.standSortShow + " " + item.standNumber; if (item.standYear === null) {
} else { item.standNumber = item.standSortShow + " " + item.standNumber;
item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear; } else {
} item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
}); }
this.standInfoTableLoading = false });
this.standInfoTableLoading = false
} else {
this.standinfoList = []
}
}, e => { }, e => {
this.standInfoTableLoading = false this.standInfoTableLoading = false
}); });
@@ -773,13 +783,17 @@ export default {
* 高级检索 * 高级检索
*/ */
selectMoreBtn() { selectMoreBtn() {
this.isAdvancedSearch = true; this.standardForm.zrbm = ''
this.standardForm.responseUnit = ''
this.standardForm.standName = ''
this.standardForm.standNumber = ''
this.standardFormList.standName = ""; this.standardFormList.standName = "";
this.standardFormList.typeApplicable = ""; this.standardFormList.typeApplicable = "";
this.standardFormList.nylx = ""; this.standardFormList.nylx = "";
this.standardFormList.zrbm = ""; this.standardFormList.zrbm = "";
this.standardFormList.sycpx = ""; this.standardFormList.sycpx = "";
this.showTableFlag = false; this.showTableFlag = false;
this.isAdvancedSearch = true;
this.page = 1; this.page = 1;
this.standardForm.page = 1; this.standardForm.page = 1;
this.selectInfoMore(); this.selectInfoMore();
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+34 -23
View File
@@ -4,7 +4,7 @@
<div class="search-area"> <div class="search-area">
<div class="left"> <div class="left">
<el-form inline :model="localProTableSearch" class="label-input-form" <el-form inline :model="localProTableSearch" class="label-input-form"
@keyup.enter.native="getLocalProductTableBtn"> @keyup.enter.native="getLocalProductTableBtns">
<el-form-item label="项目编号" class="search-item"> <el-form-item label="项目编号" class="search-item">
<el-input <el-input
v-model="localProTableSearch.projectNumber" v-model="localProTableSearch.projectNumber"
@@ -51,7 +51,7 @@
class="common-button-primary" class="common-button-primary"
size="small" size="small"
v-btn-permission="'b1ac4fb12eeb08c525b018ef839dbd40'" v-btn-permission="'b1ac4fb12eeb08c525b018ef839dbd40'"
@click="getLocalProductTableBtn">查询 @click="getLocalProductTableBtns">查询
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
@@ -477,7 +477,7 @@ export default {
projectClassification: "", projectClassification: "",
// 项目状态 // 项目状态
projectStatus: "", projectStatus: "",
page: "" page: 1
}, },
//查询3类 //查询3类
projectLibrarySearchDefault: { projectLibrarySearchDefault: {
@@ -1210,6 +1210,37 @@ export default {
this.SarExportSearchEo = this.localProTableSearch; this.SarExportSearchEo = this.localProTableSearch;
this.$http.get("sarStandProjectLibrary/queryProject", { this.$http.get("sarStandProjectLibrary/queryProject", {
...this.localProTableSearch, ...this.localProTableSearch,
page: this.page,
pageSize: this.pageSize,
}, {
_this: this, loading: "loading"
}, res => {
if (this.localProTableSearch.prodectCode === "Maintenance") {
this.localProTableList = res.data.Maintenance.records;
this.productTypeOptions = this.projectData
this.xmztOptions = this.projectStatus
this.total = res.data.Maintenance.total;
} else if (this.localProTableSearch.prodectCode === "notMaintenance") {
this.localProTableList = res.data.notMaintenance.records;
this.productTypeOptions = this.notProjectData
this.xmztOptions = this.notProjectStatus
this.total = res.data.notMaintenance.total;
}
}, e => {
});
// this.$refs.selection.selectAll(false)
},
getLocalProductTableBtns() {
this.projectLibrarySearch.page = 1;
this.isAdvancedSearch = false;
this.getLocalProductTables();
},
getLocalProductTables() {
this.localProTableSearch.prodectCode = this.ifMaintaince;
this.localProTableSearch.dataType = this.insideTabsActiveName;
this.SarExportSearchEo = this.localProTableSearch;
this.$http.get("sarStandProjectLibrary/queryProject", {
...this.projectLibrarySearch, ...this.projectLibrarySearch,
page: this.page, page: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
@@ -1227,26 +1258,6 @@ export default {
this.xmztOptions = this.notProjectStatus this.xmztOptions = this.notProjectStatus
this.total = res.data.notMaintenance.total; this.total = res.data.notMaintenance.total;
} }
// this.localProTableList.map((item) => {
// this.xmztOptions.map((opr) => {
// if (item.productBrand === opr.value) {
// item.productBrand = opr.label
// }
// })
// this.scxxOptions.map((xmItem) => {
// if (item.saleMarket === xmItem.value) {
// item.saleMarket = xmItem.label
// }
// })
// this.scxxOptions.map((xmItem) => {
// if (item.targetMarket === xmItem.value) {
// item.targetMarket = xmItem.label
// }
// })
// })
// if ((this.localProTableList.length === 0 || this.localProTableList === []) && this.localProTableSearch.page !== 1) {
// this.pageChange(1)
// }
}, e => { }, e => {
}); });
// this.$refs.selection.selectAll(false) // this.$refs.selection.selectAll(false)
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+3 -1
View File
@@ -845,7 +845,9 @@ export default {
// 查询详情表格数据 // 查询详情表格数据
this.$http.get('sarStandProjectLibrary/queryStandInfoNew', { this.$http.get('sarStandProjectLibrary/queryStandInfoNew', {
id: this.localProEO.id, id: this.localProEO.id,
cars: "1" cars: "1",
current: 1,
pageSize: this.$store.getters.userInfo.configContent
}, { }, {
_this: this, _this: this,
loading: 'loading' loading: 'loading'