diff --git a/src/api/standardRegulationLibraryApi.js b/src/api/standardRegulationLibraryApi.js
index 0d973742..669b83e9 100644
--- a/src/api/standardRegulationLibraryApi.js
+++ b/src/api/standardRegulationLibraryApi.js
@@ -30,6 +30,8 @@ const getDomesticStandardTree = (params) => getAction('/laws/standard/lawsTreeNo
const addDomesticStandard = (params) => postAction('/laws/standard/domestic/commonAdd', params)
// 国内标准-编辑标准
const editDomesticStandard = (params) => postAction('/laws/standard/domestic/commonEdit', params)
+// 国内标准-配置标准-过滤没有选中体系的数据
+const getDomesticStandardNoSystem = (params) => getAction('/laws/standard/common/getStandardRightBox', params)
// 海外标准-获取查询条件
const getOverseasStandardSearchForm = (params) => getAction('/laws/standard/overseas/getQueryCondition', params)
@@ -57,6 +59,7 @@ export {
getDomesticStandardTree,
addDomesticStandard,
editDomesticStandard,
+ getDomesticStandardNoSystem,
// 海外标准
getOverseasStandardSearchForm,
diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js
index ffc6de4f..78a9ab45 100644
--- a/src/common/lang/en-us.js
+++ b/src/common/lang/en-us.js
@@ -481,7 +481,11 @@ module.exports = {
standardSelect: {
standardSelection: 'Standard Selection',
source: 'Source',
- standardNumOrName: 'Standard number/Standard name'
+ standardNumOrName: 'Standard number/Standard name',
+ standardNumber: 'Standard number',
+ standardName: 'Standard name',
+ releaseDate: 'Release date',
+ textState: 'Text state'
},
// 用户/组织结构选择器
userOrOrganSelect: {
diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js
index 94a86134..8d6ff6e6 100644
--- a/src/common/lang/zh-cn.js
+++ b/src/common/lang/zh-cn.js
@@ -481,7 +481,11 @@ module.exports = {
standardSelect: {
standardSelection: '标准选择',
source: '来源',
- standardNumOrName: '标准号/标准名称'
+ standardNumOrName: '标准号/标准名称',
+ standardNumber: '标准号',
+ standardName: '标准名称',
+ releaseDate: '发布日期',
+ textState: '文本状态'
},
// 用户/组织结构选择器
userOrOrganSelect: {
diff --git a/src/components/selection/VehicleProjectSelectionDrawer.vue b/src/components/selection/VehicleProjectSelectionDrawer.vue
new file mode 100644
index 00000000..becbde38
--- /dev/null
+++ b/src/components/selection/VehicleProjectSelectionDrawer.vue
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/projectLibrary/vehicleItemLibrary/EvaluationResultHistoryPage.vue b/src/views/projectLibrary/vehicleItemLibrary/EvaluationResultHistoryPage.vue
new file mode 100644
index 00000000..8806f97d
--- /dev/null
+++ b/src/views/projectLibrary/vehicleItemLibrary/EvaluationResultHistoryPage.vue
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
diff --git a/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibrary.vue b/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibrary.vue
index 7d5b4886..94a75d49 100644
--- a/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibrary.vue
+++ b/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibrary.vue
@@ -159,7 +159,7 @@ export default {
{
title: this.$t('operation'),
fixed: 'right',
- width: 200,
+ width: 150,
scopedSlots: { customRender: 'operation' }
}
],
diff --git a/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibraryDetail.vue b/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibraryDetail.vue
index 6496dc6c..b7d1438b 100644
--- a/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibraryDetail.vue
+++ b/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibraryDetail.vue
@@ -40,11 +40,18 @@
-
+
-
-
+
+
+
+
+
+
+
+
@@ -114,6 +121,9 @@
+
+
+
@@ -124,10 +134,11 @@ import { queryByIdVehicleItemLibrary } from '../../../api/projectLibraryApi.js'
import { JeroListMixin } from '../../../mixins/JeroListMixin.js'
import JTable from '../../../components/jero/JTable.vue'
import { TagsTypeEnums } from '../../../enums/commonEnums.js'
+import StandardSelectionModal from '../../../components/selection/StandardSelectionModal.vue'
export default {
name: 'VehicleItemLibraryDetail',
- components: { JTable, InternalDetailPage },
+ components: { JTable, InternalDetailPage, StandardSelectionModal },
mixins: [JeroListMixin],
data () {
return {
@@ -174,63 +185,63 @@ export default {
columns: [
// 标准号
{
- dataIndex: 'projectSource_dictText',
+ dataIndex: 'standardNumber',
title: this.$t('projectLibrary.vehicleItemLibrary.standardNumber'),
width: 150,
scopedSlots: { customRender: 'standardNumber' }
},
// 标准名称
{
- dataIndex: 'projectName',
+ dataIndex: 'standardName',
title: this.$t('projectLibrary.vehicleItemLibrary.standardName'),
width: 150,
scopedSlots: { customRender: 'standardName' }
},
// 英文名称
{
- dataIndex: 'workNumber',
+ dataIndex: 'standardEnglishName',
title: this.$t('projectLibrary.vehicleItemLibrary.englishName'),
width: 150
},
// 标准状态
{
- dataIndex: 'nameWorkNo',
+ dataIndex: 'standardState_dictText',
title: this.$t('projectLibrary.vehicleItemLibrary.standardState'),
width: 100
},
// 适用车型
{
- dataIndex: 'projectHealth_dictText',
+ dataIndex: 'applicableVehicle',
title: this.$t('projectLibrary.vehicleItemLibrary.applicableVehicleType'),
width: 150
},
// 在产车实施日期
{
- dataIndex: 'projectSource_dictText',
+ dataIndex: 'onTheProductionDate',
title: this.$t('projectLibrary.vehicleItemLibrary.productionDate'),
width: 150
},
// 新车型实施日期
{
- dataIndex: 'projectName',
+ dataIndex: 'newModelImplementationDate',
title: this.$t('projectLibrary.vehicleItemLibrary.newModelImplementationDate'),
width: 150
},
// 流程状态
{
- dataIndex: 'workNumber',
+ dataIndex: 'processStatus_dictText',
title: this.$t('projectLibrary.vehicleItemLibrary.processState'),
width: 120
},
// 评估结果
{
- dataIndex: 'nameWorkNo',
+ dataIndex: 'evaluationResults_dictText',
title: this.$t('projectLibrary.vehicleItemLibrary.evaluationResult'),
width: 120
},
// 责任部门
{
- dataIndex: 'projectHealth_dictText',
+ dataIndex: 'responsibleDepartment',
title: this.$t('projectLibrary.vehicleItemLibrary.responsibleDepartment'),
width: 120
},
@@ -243,10 +254,12 @@ export default {
}
],
url: {
- list: '',
- delete: ''
+ list: '/projectLibrary/lawsAssess/page',
+ delete: '/projectLibrary/lawsAssess/delete'
},
- dataSource: [{ id: 1 }]
+ filters: {
+ projectId: this.$route.query.id
+ }
}
},
computed: {
@@ -270,8 +283,11 @@ export default {
this.loading = false
})
},
+ /**
+ * 调取
+ */
handleTransfer () {
-
+ this.$refs.standardSelectionModal.open()
},
handleCopy () {
diff --git a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue
index 1a6f0801..26855a96 100644
--- a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue
+++ b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue
@@ -175,7 +175,7 @@
-
+
@@ -199,11 +199,11 @@ import {
import { StandardSystemTreeNodeType, TagsTypeEnums, YesOrNoEnum } from '../../../enums/commonEnums'
import UserSelectModal from '../../../components/selection/UserSelectModal.vue'
import DomesticSystemTreeModal from './modules/DomesticSystemTreeModal.vue'
-import StandardSelectionModal from '../../../components/selection/StandardSelectionModal.vue'
+import SelectionDomesticStandardDrawer from './modules/SelectionDomesticStandardDrawer.vue'
export default {
name: 'DomesticStandardList',
- components: { Search, JTable, DomesticStandardModal, UserSelectModal, DomesticSystemTreeModal, StandardSelectionModal },
+ components: { Search, JTable, DomesticStandardModal, UserSelectModal, DomesticSystemTreeModal, SelectionDomesticStandardDrawer },
mixins: [ConfigurableTableMixin],
data () {
return {
diff --git a/src/views/standardRegulationLibrary/domesticStandard/modules/SelectionDomesticStandardDrawer.vue b/src/views/standardRegulationLibrary/domesticStandard/modules/SelectionDomesticStandardDrawer.vue
new file mode 100644
index 00000000..fd25a818
--- /dev/null
+++ b/src/views/standardRegulationLibrary/domesticStandard/modules/SelectionDomesticStandardDrawer.vue
@@ -0,0 +1,226 @@
+
+
+
+
+
+
{{ $t('cancel') }}
+
{{ $t('submit') }}
+
+
+
+
+
+
+