ZQ/laws-sinotruk-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[update] 联调企标库部分bug，联调企标计划

Browse Source
This commit is contained in:
lideqin
2023-09-14 18:16:21 +08:00
parent b1165ab0da
commit 55439cbe14
5 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/enterpriseStandardLibrary/check/CheckList.vue
+1 -1
View File
@@ -274,7 +274,7 @@ export default {
title: this.$t('enterpriseStandardLibrary.check.status'),
align: 'center',
width: 180,
dataIndex: 'inspectStatus',
dataIndex: 'inspectStatus_dictText',
scopedSlots: { customRender: 'text' }
},
{
src/views/enterpriseStandardLibrary/check/modules/RectificationPlanModal.vue
+1 -1
View File
@@ -96,7 +96,7 @@ export default {
title: this.$t('enterpriseStandardLibrary.check.rectificationStatus'),
align: 'center',
width: 120,
dataIndex: 'rectifyStatus',
dataIndex: 'rectifyStatus_dictText',
scopedSlots: { customRender: 'text' }
}
],
src/views/enterpriseStandardLibrary/plan/PlanList.vue
+36 -37
View File
@@ -6,35 +6,35 @@
<a-row :gutter="24">
<a-col :span="6">
<a-form-item :label="$t('enterpriseStandardLibrary.plan.oldEnterpriseStandardNum')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.plan.oldEnterpriseStandardNum')" v-model="queryParam.oldStandardNo"></a-input>
<a-input :placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.plan.oldEnterpriseStandardNum')" v-model="queryParam.originEnStandardNo"></a-input>
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item :label="$t('enterpriseStandardLibrary.plan.newEnterpriseStandardNum')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.plan.newEnterpriseStandardNum')" v-model="queryParam.newStandardNo"></a-input>
<a-input :placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.plan.newEnterpriseStandardNum')" v-model="queryParam.newEnStandardNo"></a-input>
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item :label="$t('enterpriseStandardLibrary.plan.oldEnterpriseStandardName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.plan.oldEnterpriseStandardName')" v-model="queryParam.oldStandardName"></a-input>
<a-input :placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.plan.oldEnterpriseStandardName')" v-model="queryParam.originEnStandardName"></a-input>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :span="6">
<a-form-item :label="$t('enterpriseStandardLibrary.plan.newEnterpriseStandardName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.plan.newEnterpriseStandardName')" v-model="queryParam.newStandardName"></a-input>
<a-input :placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.plan.newEnterpriseStandardName')" v-model="queryParam.newEnStandardName"></a-input>
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item :label="$t('enterpriseStandardLibrary.plan.principalDrafter')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.plan.principalDrafter')" v-model="queryParam.principalDrafter"></a-input>
<a-input :placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.plan.principalDrafter')" v-model="queryParam.mainDraftingUser"></a-input>
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item :label="$t('enterpriseStandardLibrary.plan.mainDraftingUnit')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-tree-select
tree-node-filter-prop="title"
v-model="queryParam.departId"
v-model="queryParam.mainDraftingUnit"
:maxTagCount="1"
:show-search="true"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -47,14 +47,14 @@
</a-col>
<a-col :span="6">
<a-form-item :label="$t('enterpriseStandardLibrary.plan.headOfMainDraftingUnit')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.plan.headOfMainDraftingUnit')" v-model="queryParam.headOfMainDraftingUnit"></a-input>
<a-input :placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.plan.headOfMainDraftingUnit')" v-model="queryParam.mainDraftingUnitResponsiblePerson"></a-input>
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item :label="$t('enterpriseStandardLibrary.plan.projectStatus')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag
:placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.plan.projectStatus')"
dict-code="inspect_status"
dict-code="esp_project_status"
v-model="queryParam.projectStatus">
</j-dict-select-tag>
</a-form-item>
@@ -63,21 +63,21 @@
<a-form-item :label="$t('enterpriseStandardLibrary.plan.changeState')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag
:placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.plan.changeState')"
dict-code="inspect_status"
v-model="queryParam.changeState">
dict-code="esp_change_status"
v-model="queryParam.changeStatus">
</j-dict-select-tag>
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item :label="$t('enterpriseStandardLibrary.plan.pusherWorkNo')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.plan.pusherWorkNo')" v-model="queryParam.pusherWorkNo"></a-input>
<a-input :placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.plan.pusherWorkNo')" v-model="queryParam.standardPromoterWorkNo"></a-input>
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item :label="$t('enterpriseStandardLibrary.plan.standardType')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag
:placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.plan.standardType')"
dict-code="inspect_status"
dict-code="esp_standard_type"
v-model="queryParam.standardType">
</j-dict-select-tag>
</a-form-item>
@@ -86,8 +86,8 @@
<a-form-item :label="$t('enterpriseStandardLibrary.plan.revisionType')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag
:placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.plan.revisionType')"
dict-code="inspect_status"
v-model="queryParam.revisionType">
dict-code="esp_application_category"
v-model="queryParam.applicationCategory">
</j-dict-select-tag>
</a-form-item>
</a-col>
@@ -178,7 +178,7 @@
<!-- 操作栏 -->
<div slot="action" slot-scope="{text, record}" class="action-span-cell">
<a @click="handleDetail(record)" class="table-ope-btn" v-has="'enterpriseStandardLibrary:plan:detail'">{{ $t('view') }}</a>
<a @click="handleDelete(record.id)" class="table-ope-btn" v-has="'enterpriseStandardLibrary:plan:delete'">{{ $t('delete') }}</a>
<a @click="handleDelete(record.id)" class="table-ope-btn" v-if="record.allowDel" v-has="'enterpriseStandardLibrary:plan:delete'">{{ $t('delete') }}</a>
</div>
</j-table>
@@ -210,63 +210,63 @@ export default {
title: this.$t('enterpriseStandardLibrary.plan.revisionType'),
align: 'center',
width: 180,
dataIndex: 'revisionType',
dataIndex: 'applicationCategory',
scopedSlots: { customRender: 'text' }
},
{
title: this.$t('enterpriseStandardLibrary.plan.oldEnterpriseStandardNum'),
align: 'center',
width: 180,
dataIndex: 'oldEnterpriseStandardNum',
dataIndex: 'originEnStandardNo',
scopedSlots: { customRender: 'toDetailOld' }
},
{
title: this.$t('enterpriseStandardLibrary.plan.newEnterpriseStandardNum'),
align: 'center',
width: 180,
dataIndex: 'newEnterpriseStandardNum',
dataIndex: 'newEnStandardNo',
scopedSlots: { customRender: 'toDetailNew' }
},
{
title: this.$t('enterpriseStandardLibrary.plan.oldEnterpriseStandardName'),
align: 'center',
width: 180,
dataIndex: 'oldEnterpriseStandardName',
dataIndex: 'originEnStandardName',
scopedSlots: { customRender: 'toDetailOld' }
},
{
title: this.$t('enterpriseStandardLibrary.plan.newEnterpriseStandardName'),
align: 'center',
width: 180,
dataIndex: 'newEnterpriseStandardName',
dataIndex: 'newEnStandardName',
scopedSlots: { customRender: 'toDetailNew' }
},
{
title: this.$t('enterpriseStandardLibrary.plan.authDepartment'),
align: 'center',
width: 180,
dataIndex: 'authDepartment',
dataIndex: 'authDeparts',
scopedSlots: { customRender: 'text' }
},
{
title: this.$t('enterpriseStandardLibrary.plan.enterpriseStandardCode'),
align: 'center',
width: 180,
dataIndex: 'enterpriseStandardCode',
dataIndex: 'enStandardCode',
scopedSlots: { customRender: 'text' }
},
{
title: this.$t('enterpriseStandardLibrary.plan.suitUnit'),
align: 'center',
width: 180,
dataIndex: 'suitUnit',
dataIndex: 'cooperateDeparts',
scopedSlots: { customRender: 'text' }
},
{
title: this.$t('enterpriseStandardLibrary.plan.principalDrafter'),
align: 'center',
width: 180,
dataIndex: 'principalDrafter',
dataIndex: 'mainDraftingUser',
scopedSlots: { customRender: 'text' }
},
{
@@ -280,63 +280,63 @@ export default {
title: this.$t('enterpriseStandardLibrary.plan.headOfMainDraftingUnit'),
align: 'center',
width: 180,
dataIndex: 'headOfMainDraftingUnit',
dataIndex: 'mainDraftingUnitResponsiblePerson',
scopedSlots: { customRender: 'text' }
},
{
title: this.$t('enterpriseStandardLibrary.plan.standardPusher'),
align: 'center',
width: 180,
dataIndex: 'standardPusher',
dataIndex: 'standardPromoter',
scopedSlots: { customRender: 'text' }
},
{
title: this.$t('enterpriseStandardLibrary.plan.draftPlanFinishDate'),
align: 'center',
width: 180,
dataIndex: 'draftPlanFinishDate',
dataIndex: 'draftPlannedCompleteDate',
scopedSlots: { customRender: 'text' }
},
{
title: this.$t('enterpriseStandardLibrary.plan.exposureDraftPlanFinishDate'),
align: 'center',
width: 180,
dataIndex: 'exposureDraftPlanFinishDate',
dataIndex: 'solicitationDraftPlanCompleteDate',
scopedSlots: { customRender: 'text' }
},
{
title: this.$t('enterpriseStandardLibrary.plan.planSubmissionDate'),
align: 'center',
width: 180,
dataIndex: 'planSubmissionDate',
dataIndex: 'planApprovalDate',
scopedSlots: { customRender: 'text' }
},
{
title: this.$t('enterpriseStandardLibrary.plan.draftFinishDate'),
align: 'center',
width: 180,
dataIndex: 'draftFinishDate',
dataIndex: 'draftCompletionDate',
scopedSlots: { customRender: 'text' }
},
{
title: this.$t('enterpriseStandardLibrary.plan.submitDraftDate'),
align: 'center',
width: 180,
dataIndex: 'submitDraftDate',
dataIndex: 'draftSubmissionDate',
scopedSlots: { customRender: 'text' }
},
{
title: this.$t('enterpriseStandardLibrary.plan.isAskForAdvice'),
align: 'center',
width: 180,
dataIndex: 'isAskForAdvice',
dataIndex: 'solicitationOpinionEnabled',
scopedSlots: { customRender: 'text' }
},
{
title: this.$t('enterpriseStandardLibrary.plan.exposureDraftFinishDate'),
align: 'center',
width: 180,
dataIndex: 'exposureDraftFinishDate',
dataIndex: 'solicitationDraftCompletionDate',
scopedSlots: { customRender: 'text' }
},
{
@@ -350,7 +350,7 @@ export default {
title: this.$t('enterpriseStandardLibrary.plan.submissionDate'),
align: 'center',
width: 180,
dataIndex: 'submissionDate',
dataIndex: 'approvalDate',
scopedSlots: { customRender: 'text' }
},
{
@@ -371,7 +371,7 @@ export default {
title: this.$t('enterpriseStandardLibrary.plan.changeState'),
align: 'center',
width: 180,
dataIndex: 'changeState',
dataIndex: 'changeStatus',
scopedSlots: { customRender: 'text' }
},
{
@@ -381,9 +381,8 @@ export default {
width: 200
}
],
dataSource: [{ id: 1 }],
url: {
list: ''
list: '/enterprise/plan/page'
}
}
},
src/views/enterpriseStandardLibrary/reviewMeeting/ReviewMeetingList.vue
+1 -1
View File
@@ -162,7 +162,7 @@ export default {
title: this.$t('enterpriseStandardLibrary.reviewMeeting.isQuality'),
align: 'center',
width: 180,
dataIndex: 'qualityFlag',
dataIndex: 'qualityFlag_dictText',
scopedSlots: { customRender: 'text' }
},
{
src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue
+1 -1
View File
@@ -149,7 +149,7 @@ export default {
title: this.$t('enterpriseStandardLibrary.reviewPlan.reviewResult'),
align: 'center',
width: 180,
dataIndex: 'recheckResult',
dataIndex: 'recheckResult_dictText',
scopedSlots: { customRender: 'text' }
},
{