Merge branch 'develop' of http://103.249.252.28:90/LAWS/laws-system-front-FOTON into develop
This commit is contained in:
+71
-48
@@ -68,6 +68,11 @@
|
||||
label="标准/政策名称"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="interpretationTime"
|
||||
label="评估时间"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
fixed="right"
|
||||
label=""
|
||||
@@ -137,57 +142,57 @@
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="carModel"
|
||||
prop="productLineId"
|
||||
label="产品线">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="carModel"
|
||||
prop="standNumber"
|
||||
label="项目编号">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="carModel"
|
||||
prop="productName"
|
||||
label="项目名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="carModel"
|
||||
prop="standNumber"
|
||||
label="标准编号">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="carModel"
|
||||
prop="standName"
|
||||
label="标准名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="carModel"
|
||||
label="标准章节">
|
||||
prop="standardItem"
|
||||
label="标准章条">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="carModel"
|
||||
prop="standardInfo"
|
||||
label="标准主要内容">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
align="productType"
|
||||
label="在研产品">
|
||||
<el-table-column
|
||||
prop=""
|
||||
prop="researchImplementationTime"
|
||||
label="实施时间">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop=""
|
||||
prop="researchCompliance"
|
||||
label="合规">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
align="researchNonCompliance"
|
||||
label="不合规">
|
||||
<el-table-column
|
||||
prop=""
|
||||
prop="researchNonCompliance"
|
||||
label="不合规项目">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop=""
|
||||
prop="researchCountermeasures"
|
||||
label="应对措施">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop=""
|
||||
prop="researchCompletionTime"
|
||||
label="完成时间">
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
@@ -196,22 +201,22 @@
|
||||
align="center"
|
||||
label="在产产品">
|
||||
<el-table-column
|
||||
prop=""
|
||||
prop="productionImplementationTime"
|
||||
label="实施时间">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop=""
|
||||
prop="productionCompliance"
|
||||
label="合规(具体情况)">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
label="不合规">
|
||||
<el-table-column
|
||||
prop=""
|
||||
prop="productionCountermeasures"
|
||||
label="应对措施">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop=""
|
||||
prop="productionCompletionTime"
|
||||
label="完成时间">
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
@@ -233,29 +238,30 @@ export default {
|
||||
name: 'standInvolveProjectDetail',
|
||||
data () {
|
||||
return {
|
||||
sarProject: {
|
||||
standName: '', // 标准政策名称
|
||||
standNumber: '', // 标准/政策号
|
||||
standApplicationType: 1
|
||||
sarProject: {
|
||||
standName: '', // 标准政策名称
|
||||
standNumber: '', // 标准/政策号
|
||||
standApplicationType: 1
|
||||
}, // 条件查询
|
||||
showSarProStateModal: false, // 查看drawer开关
|
||||
// table数据
|
||||
sarProjectListDatas: [],
|
||||
// table高度
|
||||
tableHeight: null,
|
||||
// 列表页loading
|
||||
loading: false,
|
||||
total: 0,
|
||||
page: 1,
|
||||
pageSize: this.$store.getters.userInfo.configContent,
|
||||
sarProStateEO: {
|
||||
productName: ''
|
||||
},
|
||||
sarProStateTotal: 0,
|
||||
sarProStateTotalPage: 1,
|
||||
sarProStatePageSize: this.$store.getters.userInfo.configContent,
|
||||
sarProStateListDatas: [], // 符合性项目列表数据
|
||||
sarProStateTableHeight: null, // 符合性项目列表高度
|
||||
showSarProStateModal: false, // 查看drawer开关
|
||||
// table数据
|
||||
sarProjectListDatas: [],
|
||||
// table高度
|
||||
tableHeight: null,
|
||||
// 列表页loading
|
||||
loading: false,
|
||||
total: 0,
|
||||
page: 1,
|
||||
pageSize: this.$store.getters.userInfo.configContent,
|
||||
sarProStateEO: {
|
||||
productName: ''
|
||||
},
|
||||
sarProStateTotal: 0,
|
||||
sarProStateTotalPage: 1,
|
||||
sarProStatePageSize: this.$store.getters.userInfo.configContent,
|
||||
sarProStateListDatas: [], // 符合性项目列表数据
|
||||
sarProStateTableHeight: null, // 符合性项目列表高度
|
||||
standId: '' // 符合性项目Id
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
@@ -290,17 +296,34 @@ export default {
|
||||
this.queryStandAndLaws()
|
||||
}, // 外层清空条件查询
|
||||
handleProjectCompliance (row) {
|
||||
this.showSarProStateModal = true
|
||||
this.querySarProStateZero()
|
||||
this.standId = row.standId
|
||||
this.querySarProStateZero()
|
||||
}, // 查看项目符合性
|
||||
querySarProStateZero () {}, // 查询项目数据
|
||||
querySarProStateZero () {
|
||||
var form = this.sarProStateEO
|
||||
form.standId = this.standId
|
||||
form.current = this.sarProStateTotalPage
|
||||
form.size = this.sarProStatePageSize
|
||||
this.$http.get('sarStandardComplianceAssessResult/product', form, {
|
||||
_this: this,
|
||||
loading: 'loading'
|
||||
}, res => {
|
||||
if (res.ok) {
|
||||
this.sarProStateListDatas = res.data.records
|
||||
this.sarProStateTotal = res.data.total
|
||||
}
|
||||
})
|
||||
this.showSarProStateModal = true
|
||||
}, // 查询项目数据
|
||||
clearSearchProState () {
|
||||
this.sarProStateEO.productName = ''
|
||||
this.querySarProStateZero()
|
||||
this.sarProStateEO.productName = ''
|
||||
this.sarProStateTotalPage = 1
|
||||
this.querySarProStateZero()
|
||||
}, // 清空条件查询
|
||||
clearSearchPro () {
|
||||
this.sarProStateEO.productName = ''
|
||||
this.showSarProStateModal = false
|
||||
this.sarProStateEO.productName = ''
|
||||
this.showSarProStateModal = false
|
||||
this.standId = ''
|
||||
}, // 关闭查看事件
|
||||
pageProStateChange (page) {
|
||||
this.sarProStateTotalPage = page
|
||||
|
||||
+45
-17
@@ -14,6 +14,12 @@
|
||||
placeholder="标准/政策名称查找"
|
||||
clearable></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="类型" class="search-item search-item-last">
|
||||
<el-select v-model="sarProject.position" placeholder="请选择标准性质">
|
||||
<el-option value="1" label="国内"></el-option>
|
||||
<el-option value="2" label="海外"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="" class="search-item btn-box">
|
||||
<el-button class="common-button-primary" type="primary" icon="el-icon-search" size="mini" @click="searchStandAndLaws"></el-button>
|
||||
</el-form-item>
|
||||
@@ -68,6 +74,11 @@
|
||||
label="标准/政策名称"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="interpretationTime"
|
||||
label="评估时间"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
fixed="right"
|
||||
label=""
|
||||
@@ -137,26 +148,25 @@
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="productName"
|
||||
prop="standNumber"
|
||||
label="标准编号">
|
||||
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="carModel"
|
||||
prop="standName"
|
||||
label="标准名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="SarProStateType === 'INLAND'"
|
||||
prop="productName"
|
||||
v-if="sarProject.position === '1'"
|
||||
prop="lastVersionNumber"
|
||||
label="上一版本标准编号">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="SarProStateType !== 'INLAND'"
|
||||
prop="productName"
|
||||
v-if="sarProject.position === '2'"
|
||||
prop="correspondDomesticStandard"
|
||||
label="对应国行标">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="productName"
|
||||
prop="specificItem"
|
||||
label="具体章条">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -164,17 +174,17 @@
|
||||
align="center"
|
||||
label="解读内容">
|
||||
<el-table-column
|
||||
prop="carModel"
|
||||
prop="coreTechnicalRequirement"
|
||||
label="核心技术要求(简述、请勿抄写标准)">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="SarProStateType === 'INLAND'"
|
||||
prop="carModel"
|
||||
v-if="sarProject.position === '1'"
|
||||
prop="comparedWithPrevious"
|
||||
label="相对于上一版本变化点">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="SarProStateType !== 'INLAND'"
|
||||
prop="carModel"
|
||||
v-if="sarProject.position === '2'"
|
||||
prop="comparedDomesticStandard"
|
||||
label="相对于国行标差异点">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -203,7 +213,8 @@ name: "technologyInvolveProject",
|
||||
sarProject: {
|
||||
standName: '', // 标准政策名称
|
||||
standNumber: '', // 标准/政策号
|
||||
standApplicationType: 2
|
||||
standApplicationType: 2,
|
||||
position: '1'
|
||||
}, // 条件查询
|
||||
sarProjectListDatas: [], // table数据
|
||||
countryOptions: [], //国家选择下拉框数据
|
||||
@@ -221,6 +232,7 @@ name: "technologyInvolveProject",
|
||||
sarProStatePageSize: this.$store.getters.userInfo.configContent,
|
||||
sarProStateListDatas: [], // 符合性项目列表数据
|
||||
sarProStateTableHeight: null,
|
||||
standId: '', // 符合性项目id
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
@@ -255,10 +267,26 @@ name: "technologyInvolveProject",
|
||||
this.queryStandAndLaws()
|
||||
}, // 外层清空条件查询
|
||||
handleProjectCompliance (row) {
|
||||
this.showSarProStateModal = true
|
||||
this.querySarProStateZero()
|
||||
this.standId = row.standId
|
||||
this.querySarProStateZero()
|
||||
}, // 查看项目符合性
|
||||
querySarProStateZero () {}, // 查询项目数据
|
||||
querySarProStateZero () {
|
||||
var form = this.sarProStateEO
|
||||
form.position = this.sarProject.position
|
||||
form.standId = this.standId
|
||||
form.current = this.sarProStateTotalPage
|
||||
form.size = this.sarProStatePageSize
|
||||
this.$http.get('sarStandardComplianceAssessResult/interpretation', form, {
|
||||
_this: this,
|
||||
loading: 'loading'
|
||||
}, res => {
|
||||
if (res.ok) {
|
||||
this.sarProStateListDatas = res.data.records
|
||||
this.sarProStateTotal = res.data.total
|
||||
}
|
||||
})
|
||||
this.showSarProStateModal = true
|
||||
}, // 查询项目数据
|
||||
clearSearchProState () {
|
||||
this.sarProStateEO.productName = ''
|
||||
this.querySarProStateZero()
|
||||
|
||||
Reference in New Issue
Block a user