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
2021-12-23 16:54:00 +08:00
parent 7a183c3f1d 73315186e2
commit e9939642ea
3 changed files with 75 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+5 -1
View File
@@ -520,6 +520,7 @@
<!--适用车型--> <!--适用车型-->
<template> <template>
<custom-select-array <custom-select-array
style="margin-left: -12px"
:key="applyArcticOptions.options" :key="applyArcticOptions.options"
:config="applyArcticOptions" :config="applyArcticOptions"
v-model="form['cllx']" v-model="form['cllx']"
@@ -528,6 +529,7 @@
<!--能源类型--> <!--能源类型-->
<template> <template>
<custom-select-array <custom-select-array
style="margin-left: -12px"
:key="categoryOptions.options" :key="categoryOptions.options"
:config="categoryOptions" :config="categoryOptions"
v-model="form['nylx']" v-model="form['nylx']"
@@ -643,6 +645,7 @@
<template> <template>
<custom-select-array <custom-select-array
:key="sycpxOptions.options" :key="sycpxOptions.options"
style="margin-left: -12px"
:config="sycpxOptions" :config="sycpxOptions"
v-model="form['sycpx']" v-model="form['sycpx']"
></custom-select-array> ></custom-select-array>
@@ -662,6 +665,7 @@
<template> <template>
<custom-select-array <custom-select-array
:key="applyAuthOptions.options" :key="applyAuthOptions.options"
style="margin-left: -12px;"
:config="applyAuthOptions" :config="applyAuthOptions"
v-model="form['syrz']" v-model="form['syrz']"
></custom-select-array> ></custom-select-array>
@@ -1203,7 +1207,7 @@
:data="tableData.standardData" :data="tableData.standardData"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%;" style="width: 100%;"
:height="tableHeight.standardTableHeight" height="100%"
border border
class="drag-table" class="drag-table"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+4
View File
@@ -726,6 +726,7 @@
<!--适用车型--> <!--适用车型-->
<template> <template>
<custom-select-array <custom-select-array
style="margin-left: -12px"
:key="applyArcticOptions.options" :key="applyArcticOptions.options"
:config="applyArcticOptions" :config="applyArcticOptions"
v-model="form['cllx']" v-model="form['cllx']"
@@ -734,6 +735,7 @@
<!--能源类型--> <!--能源类型-->
<template> <template>
<custom-select-array <custom-select-array
style="margin-left: -12px"
:key="categoryOptions.options" :key="categoryOptions.options"
:config="categoryOptions" :config="categoryOptions"
v-model="form['nylx']" v-model="form['nylx']"
@@ -844,6 +846,7 @@
<template> <template>
<custom-select-array <custom-select-array
:key="sycpxOptions.options" :key="sycpxOptions.options"
style="margin-left: -12px"
:config="sycpxOptions" :config="sycpxOptions"
v-model="form['sycpx']" v-model="form['sycpx']"
></custom-select-array> ></custom-select-array>
@@ -863,6 +866,7 @@
<template> <template>
<custom-select-array <custom-select-array
:key="applyAuthOptions.options" :key="applyAuthOptions.options"
style="margin-left: -12px"
:config="applyAuthOptions" :config="applyAuthOptions"
v-model="form['syrz']" v-model="form['syrz']"
></custom-select-array> ></custom-select-array>
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+66 -31
View File
@@ -459,39 +459,74 @@ export default {
}, },
// 根据准入id查询标准法规详情 // 根据准入id查询标准法规详情
selectInfobyAccid() { selectInfobyAccid() {
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { if(this.sarAccessEO.sortKey === '1'){
...this.standardFormList, this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
...this.standardForm, ...this.standardFormList,
id: this.pageId ...this.standardForm,
}, { id: this.pageId,
_this: this types: '1',
}, res => { }, {
console.log(res.data.records); _this: this
res.data.records.forEach(item => { }, res => {
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.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + " " + item.standNumber;
} else {
item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
}
});
}, e => {
}); });
this.standinfoList = res.data.records; }else{
this.standardFormTotal = res.data.total; this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
this.standinfoList.forEach(item => { ...this.standardFormList,
if (item.standYear === null) { ...this.standardForm,
item.standNumber = item.standSortShow + " " + item.standNumber; id: this.pageId
} else { }, {
item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear; _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.standinfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + " " + item.standNumber;
} else {
item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
}
});
}, e => {
}); });
}, e => { }
});
}, },
selectInfoMore() { selectInfoMore() {
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {