diff --git a/src/api/projectLibraryApi.js b/src/api/projectLibraryApi.js
index 61c1a30d..f17e7d27 100644
--- a/src/api/projectLibraryApi.js
+++ b/src/api/projectLibraryApi.js
@@ -25,7 +25,7 @@ const editInconformityItem = (params) => postAction('/projectLibrary/lawsEvaluat
const batchCloseInconformityItem = (params) => postAction('/projectLibrary/lawsEvaluationNotMet/batchClose', params)
// 专项项目库-编辑
-const editSpecialProjectLibrary = (params) => postAction('', params)
+const editSpecialProjectLibrary = (params) => postAction('/projectLibrary/lawsSpecialProjectLibrary/edit', params)
export {
addVehicleItemLibrary,
diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js
index 89368be2..5fb5d2f4 100644
--- a/src/mixins/JeroListMixin.js
+++ b/src/mixins/JeroListMixin.js
@@ -114,6 +114,7 @@ export const JeroListMixin = {
this.ipagination.current = 1
}
const params = this.getQueryParams()// 查询条件
+ console.log(params)
this.loading = true
getAction(this.url.list, params).then((res) => {
if (res.success) {
diff --git a/src/views/projectLibrary/specialProjectLibrary/SpecialProjectLibrary.vue b/src/views/projectLibrary/specialProjectLibrary/SpecialProjectLibrary.vue
index 661da2a6..c6f93322 100644
--- a/src/views/projectLibrary/specialProjectLibrary/SpecialProjectLibrary.vue
+++ b/src/views/projectLibrary/specialProjectLibrary/SpecialProjectLibrary.vue
@@ -24,8 +24,9 @@
-
+
@@ -48,7 +49,7 @@
:placeholder="$t('pleaseSelect')+$t('projectLibrary.specialProjectLibrary.complianceAssessmentResults')"
type="select"
:triggerChange="false"
- dict-code="" />
+ dict-code="standards_assess_results" />
@@ -93,6 +94,7 @@
-
- {{ text || text === 0 ? text : global.emptyLine }}
- {{ text }}
- {{ global.emptyLine }}
-
+ {{ $t('view') }}
@@ -155,6 +153,7 @@ import JTable from '../../../components/jero/JTable'
import { JeroListMixin } from '../../../mixins/JeroListMixin'
import BasisDescriptionModal from './modules/BasisDescriptionModal'
import SpecialProjectLibraryModal from './modules/SpecialProjectLibraryModal'
+import { StandardSource } from '../../../enums/commonEnums'
export default {
name: 'SpecialProjectLibrary',
@@ -167,7 +166,7 @@ export default {
{
dataIndex: 'source_dictText',
title: this.$t('standardSelect.source'),
- width: 150
+ width: 100
},
// 标准编号
{
@@ -188,7 +187,7 @@ export default {
{
dataIndex: 'termNumber',
title: this.$t('workCenter.enStandardRevision.clauseNumber'),
- width: 150
+ width: 120
},
// 条款名称
{
@@ -210,15 +209,15 @@ export default {
},
// 合规评估结果
{
- dataIndex: 'result',
+ dataIndex: 'result_dictText',
title: this.$t('projectLibrary.specialProjectLibrary.complianceAssessmentResults'),
width: 120
},
// 依据描述
{
- dataIndex: 'basisDescription',
+ dataIndex: 'description',
title: this.$t('projectLibrary.specialProjectLibrary.basisDescription'),
- width: 180,
+ width: 120,
scopedSlots: { customRender: 'basisDescription' }
},
// 评估日期
@@ -226,7 +225,7 @@ export default {
dataIndex: 'valuationTime',
title: this.$t('projectLibrary.vehicleItemLibrary.dateOfEvaluation'),
sorter: true,
- width: 180
+ width: 150
},
// 是否立项
{
@@ -238,21 +237,19 @@ export default {
{
dataIndex: 'workNumber',
title: this.$t('projectLibrary.workOrderNumber'),
- width: 120,
- scopedSlots: { customRender: 'project' }
+ width: 120
},
// 项目名称
{
dataIndex: 'projectName',
title: this.$t('projectLibrary.projectName'),
- width: 150,
- scopedSlots: { customRender: 'project' }
+ width: 150
},
// 流程编号
{
dataIndex: 'processNum',
title: this.$t('workCenter.processCenter.processNumber'),
- width: 120,
+ width: 180,
scopedSlots: { customRender: 'process' }
},
// 操作
@@ -274,9 +271,7 @@ export default {
clickEvent: 'handleEdit',
has: 'specialProjectLibrary:edit'
}
- ],
- disableMixinCreated: true,
- dataSource: [{ id: 1, basisDescription: '1111' }]
+ ]
}
},
methods: {
@@ -284,10 +279,10 @@ export default {
* 跳转标准详情
* @param record
*/
- toDetailPage ({ standardId, splitStandardSource }) {
+ toDetailPage ({ standardId, source }) {
let path
// 根据来源跳转不同的详情页
- switch (splitStandardSource) {
+ switch (source) {
// 国内
case StandardSource.DOMESTIC.value:
path = '/standardRegulationLibrary/DomesticStandardDetail'
@@ -316,13 +311,15 @@ export default {
/**
* 查看依据详情
*/
- viewBasisDescription () {
- this.$refs.basisDescriptionModal.open()
+ viewBasisDescription ({ processTermId }) {
+ this.$refs.basisDescriptionModal.open(processTermId)
}
}
}
\ No newline at end of file
+.table-page-search-wrapper .ant-form-inline .ant-form-item > .ant-form-item-label {
+ min-width: 90px;
+}
+
diff --git a/src/views/projectLibrary/specialProjectLibrary/modules/BasisDescriptionModal.vue b/src/views/projectLibrary/specialProjectLibrary/modules/BasisDescriptionModal.vue
index 884d8034..46da5144 100644
--- a/src/views/projectLibrary/specialProjectLibrary/modules/BasisDescriptionModal.vue
+++ b/src/views/projectLibrary/specialProjectLibrary/modules/BasisDescriptionModal.vue
@@ -11,33 +11,16 @@
-
-
-
-
-
-
-
+
-
+
@@ -65,7 +48,8 @@
@change="handleTableChange">
- {{ text }}
+ {{ text }}
+ {{ global.emptyLine }}
@@ -121,50 +105,44 @@ export default {
},
// 姓名
{
- dataIndex: '1',
+ dataIndex: 'designEngineer_dictText',
title: this.$t('userSelect.name'),
width: 100
},
- // 工号
- {
- dataIndex: '2',
- title: this.$t('user.workNo'),
- width: 100
- },
- // 部门
- {
- dataIndex: '3',
- title: this.$t('department'),
- width: 100
- },
// 车型
{
- dataIndex: '4',
+ dataIndex: 'modelSeries_dictText',
title: this.$t('projectLibrary.specialProjectLibrary.vehicleModel'),
width: 100
},
// 依据描述
{
- dataIndex: 'nameWorkNo',
+ dataIndex: 'description',
title: this.$t('projectLibrary.specialProjectLibrary.basisDescription'),
width: 250,
scopedSlots: { customRender: 'basisDescription' }
},
// 佐证材料
{
- dataIndex: '5',
+ dataIndex: 'fileId',
title: this.$t('projectLibrary.specialProjectLibrary.supportingMaterial'),
width: 120
}
],
image: false,
- imageUrl: null
+ imageUrl: null,
+ url: {
+ list: '/process/projectStandard/getTermUserList'
+ }
}
},
methods: {
- open () {
+ open (processTermId) {
this.visible = true
this.getDepartTreeList()
+ this.filters = {
+ termId: processTermId
+ }
this.loadData(1)
},
handleOk () {