Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
This commit is contained in:
@@ -1787,4 +1787,5 @@ module.exports = {
|
|||||||
pleaseSelectRegulatoryCurrentLogin:'Please select Regulatory Engineer as the data for the current login',
|
pleaseSelectRegulatoryCurrentLogin:'Please select Regulatory Engineer as the data for the current login',
|
||||||
cannotSetResponsibilityAreas:'Cannot set an interface person due to different responsibility areas',
|
cannotSetResponsibilityAreas:'Cannot set an interface person due to different responsibility areas',
|
||||||
lidar:'lidar',
|
lidar:'lidar',
|
||||||
|
history:'History',
|
||||||
}
|
}
|
||||||
@@ -1889,4 +1889,5 @@ module.exports = {
|
|||||||
pleaseSelectRegulatoryCurrentLogin:'请选择法规工程师为当前登录人的数据',
|
pleaseSelectRegulatoryCurrentLogin:'请选择法规工程师为当前登录人的数据',
|
||||||
cannotSetResponsibilityAreas:'所属不同责任领域,不能设置接口人',
|
cannotSetResponsibilityAreas:'所属不同责任领域,不能设置接口人',
|
||||||
lidar:'激光雷达',
|
lidar:'激光雷达',
|
||||||
|
history:'历史',
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
<a-drawer
|
<a-drawer
|
||||||
:title="$t('Transfer')"
|
:title="$t('Transfer')"
|
||||||
:maskClosable="false"
|
:maskClosable="false"
|
||||||
:width="1000"
|
:width="1100"
|
||||||
placement="right"
|
placement="right"
|
||||||
:closable="true"
|
:closable="true"
|
||||||
@close="handleCancel"
|
@close="handleCancel"
|
||||||
@@ -45,7 +45,7 @@
|
|||||||
<a-table
|
<a-table
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
rowKey="id"
|
rowKey="id"
|
||||||
:scroll="{x: 800,y:600}"
|
:scroll="{x: 800,y:'calc(100vh - 330px)'}"
|
||||||
:data-source="dataList"
|
:data-source="dataList"
|
||||||
:pagination="false"
|
:pagination="false"
|
||||||
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
|
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
|
||||||
@@ -95,7 +95,7 @@ export default {
|
|||||||
title: this.$t('standard'),
|
title: this.$t('standard'),
|
||||||
align: 'left',
|
align: 'left',
|
||||||
dataIndex: 'serialNumber',
|
dataIndex: 'serialNumber',
|
||||||
width: 100,
|
width: 180,
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
scopedSlots: { customRender: 'standard' }
|
scopedSlots: { customRender: 'standard' }
|
||||||
},
|
},
|
||||||
@@ -103,7 +103,7 @@ export default {
|
|||||||
title: this.$t('title'),
|
title: this.$t('title'),
|
||||||
align: 'left',
|
align: 'left',
|
||||||
dataIndex: 'title',
|
dataIndex: 'title',
|
||||||
width: 100,
|
width: 180,
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
scopedSlots: { customRender: 'titleName' }
|
scopedSlots: { customRender: 'titleName' }
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -534,30 +534,30 @@
|
|||||||
dataIndex: 'dutyTerritory_dictText',
|
dataIndex: 'dutyTerritory_dictText',
|
||||||
width: 180
|
width: 180
|
||||||
},
|
},
|
||||||
{
|
// {
|
||||||
title: this.$t('regulatoryEngineer'),
|
// title: this.$t('regulatoryEngineer'),
|
||||||
align: 'left',
|
// align: 'left',
|
||||||
ellipsis: true,
|
// ellipsis: true,
|
||||||
sorter: true,
|
// sorter: true,
|
||||||
dataIndex: 'regulationOwnerName',
|
// dataIndex: 'regulationOwnerName',
|
||||||
width: 180
|
// width: 180
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
title: this.$t('certifiedEngineer'),
|
// title: this.$t('certifiedEngineer'),
|
||||||
align: 'left',
|
// align: 'left',
|
||||||
ellipsis: true,
|
// ellipsis: true,
|
||||||
sorter: true,
|
// sorter: true,
|
||||||
dataIndex: 'homologationEngineerName',
|
// dataIndex: 'homologationEngineerName',
|
||||||
width: 180
|
// width: 180
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
title: this.$t('engineeringInterfacePerson'),
|
// title: this.$t('engineeringInterfacePerson'),
|
||||||
align: 'left',
|
// align: 'left',
|
||||||
ellipsis: true,
|
// ellipsis: true,
|
||||||
sorter: true,
|
// sorter: true,
|
||||||
dataIndex: 'engineeringInterfacePersonName',
|
// dataIndex: 'engineeringInterfacePersonName',
|
||||||
width: 180
|
// width: 180
|
||||||
},
|
// },
|
||||||
{
|
{
|
||||||
title: this.$t('remarks'),
|
title: this.$t('remarks'),
|
||||||
align: 'left',
|
align: 'left',
|
||||||
@@ -801,33 +801,33 @@
|
|||||||
key: 15,
|
key: 15,
|
||||||
moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
|
moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
|
||||||
},
|
},
|
||||||
{
|
// {
|
||||||
sort: '',
|
// sort: '',
|
||||||
name: this.$t('regulatoryEngineer'),
|
// name: this.$t('regulatoryEngineer'),
|
||||||
headFieldCn: '法规工程师',
|
// headFieldCn: '法规工程师',
|
||||||
headFieldEn: 'Regulation Engineer',
|
// headFieldEn: 'Regulation Engineer',
|
||||||
field: 'regulationOwnerName',
|
// field: 'regulationOwnerName',
|
||||||
key: 16,
|
// key: 16,
|
||||||
moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
|
// moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
sort: '',
|
// sort: '',
|
||||||
name: this.$t('certifiedEngineer'),
|
// name: this.$t('certifiedEngineer'),
|
||||||
headFieldCn: '认证工程师',
|
// headFieldCn: '认证工程师',
|
||||||
headFieldEn: 'Homo Engineer',
|
// headFieldEn: 'Homo Engineer',
|
||||||
field: 'homologationEngineerName',
|
// field: 'homologationEngineerName',
|
||||||
key: 17,
|
// key: 17,
|
||||||
moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
|
// moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
sort: '',
|
// sort: '',
|
||||||
name: this.$t('engineeringInterfacePerson'),
|
// name: this.$t('engineeringInterfacePerson'),
|
||||||
headFieldCn: '工程接口人',
|
// headFieldCn: '工程接口人',
|
||||||
headFieldEn: 'Eng. Interface',
|
// headFieldEn: 'Eng. Interface',
|
||||||
field: 'engineeringInterfacePersonName',
|
// field: 'engineeringInterfacePersonName',
|
||||||
key: 18,
|
// key: 18,
|
||||||
moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
|
// moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
|
||||||
},
|
// },
|
||||||
{
|
{
|
||||||
sort: '',
|
sort: '',
|
||||||
name: this.$t('remarks'),
|
name: this.$t('remarks'),
|
||||||
|
|||||||
@@ -5,10 +5,10 @@
|
|||||||
<a-row :gutter="24">
|
<a-row :gutter="24">
|
||||||
<a-col :md="6" :sm="8">
|
<a-col :md="6" :sm="8">
|
||||||
<div class="box-title-text">
|
<div class="box-title-text">
|
||||||
<div class="title-text" :title="$t('VirtualListName')">
|
<div class="title-text" :title="$t('marketRegulationList')">
|
||||||
<span>{{$t('VirtualListName')}}</span>
|
<span>{{$t('marketRegulationList')}}</span>
|
||||||
</div>
|
</div>
|
||||||
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('VirtualListName')"
|
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('marketRegulationList')"
|
||||||
v-model="queryParam.name"></j-input>
|
v-model="queryParam.name"></j-input>
|
||||||
</div>
|
</div>
|
||||||
</a-col>
|
</a-col>
|
||||||
@@ -54,7 +54,7 @@
|
|||||||
size="middle"
|
size="middle"
|
||||||
:loading="loading"
|
:loading="loading"
|
||||||
:pagination="false"
|
:pagination="false"
|
||||||
:scroll="{x: '100%'}"
|
:scroll="{x: '100%',y:'calc(100vh - 300px)'}"
|
||||||
:rowKey="(record)=>JSON.stringify(record)"
|
:rowKey="(record)=>JSON.stringify(record)"
|
||||||
:data-source="dataSource"
|
:data-source="dataSource"
|
||||||
@change="tableOnChange"
|
@change="tableOnChange"
|
||||||
@@ -119,12 +119,12 @@
|
|||||||
<div class="box-title-text-add">
|
<div class="box-title-text-add">
|
||||||
<div class="title-text-add">
|
<div class="title-text-add">
|
||||||
<span class="Required">*</span>
|
<span class="Required">*</span>
|
||||||
<span class="title-text-text" :title="$t('VirtualListName')">{{$t('VirtualListName')}}</span>
|
<span class="title-text-text" :title="$t('marketRegulationList')">{{$t('marketRegulationList')}}</span>
|
||||||
</div>
|
</div>
|
||||||
<a-form-model-item class="itemModel" prop="name">
|
<a-form-model-item class="itemModel" prop="name">
|
||||||
<a-input class="box-input-add"
|
<a-input class="box-input-add"
|
||||||
v-model.trim="formInline.name"
|
v-model.trim="formInline.name"
|
||||||
:placeholder="$t('PleaseEnter')+$t('VirtualListName')"/>
|
:placeholder="$t('PleaseEnter')+$t('marketRegulationList')"/>
|
||||||
</a-form-model-item>
|
</a-form-model-item>
|
||||||
</div>
|
</div>
|
||||||
</a-col>
|
</a-col>
|
||||||
@@ -180,12 +180,12 @@
|
|||||||
name: [
|
name: [
|
||||||
{
|
{
|
||||||
required: true,
|
required: true,
|
||||||
message: this.$t('VirtualListName') + this.$t('cannotEmpty'),
|
message: this.$t('marketRegulationList') + this.$t('cannotEmpty'),
|
||||||
trigger: 'blur'
|
trigger: 'blur'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
max: 100,
|
max: 100,
|
||||||
message: this.$t('VirtualListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
|
message: this.$t('marketRegulationList') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
|
||||||
trigger: 'blur'
|
trigger: 'blur'
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
@@ -218,7 +218,7 @@
|
|||||||
title: this.$t('newlyAdded'),
|
title: this.$t('newlyAdded'),
|
||||||
columns: [
|
columns: [
|
||||||
{
|
{
|
||||||
title: this.$t('VirtualListName'),
|
title: this.$t('marketRegulationList'),
|
||||||
align: 'left',
|
align: 'left',
|
||||||
dataIndex: 'name',
|
dataIndex: 'name',
|
||||||
width: '40',
|
width: '40',
|
||||||
|
|||||||
+9
-2
@@ -33,10 +33,10 @@
|
|||||||
<a-table
|
<a-table
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
rowKey="id"
|
rowKey="id"
|
||||||
:scroll="{x: '100%',y:600}"
|
:scroll="{x: '100%',y:'calc(100vh - 330px)'}"
|
||||||
:data-source="dataList"
|
:data-source="dataList"
|
||||||
:pagination="false"
|
:pagination="false"
|
||||||
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' , type:'radio'}"
|
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' '}"
|
||||||
:loading="loading">
|
:loading="loading">
|
||||||
|
|
||||||
</a-table>
|
</a-table>
|
||||||
@@ -87,6 +87,13 @@
|
|||||||
dataIndex: 'studioEngineerName',
|
dataIndex: 'studioEngineerName',
|
||||||
align: 'left',
|
align: 'left',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
|
width: 140
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: this.$t('explain'),
|
||||||
|
dataIndex: 'explanation',
|
||||||
|
align: 'left',
|
||||||
|
ellipsis: true,
|
||||||
width: 223
|
width: 223
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|||||||
+1
-1
@@ -45,7 +45,7 @@
|
|||||||
<a-table
|
<a-table
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
rowKey="id"
|
rowKey="id"
|
||||||
:scroll="{x: 800,y:600}"
|
:scroll="{x: 800,y:'calc(100vh - 330px)'}"
|
||||||
:data-source="dataList"
|
:data-source="dataList"
|
||||||
:pagination="false"
|
:pagination="false"
|
||||||
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:'' }"
|
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:'' }"
|
||||||
|
|||||||
@@ -292,7 +292,7 @@
|
|||||||
</a>
|
</a>
|
||||||
<a class="text-operation"
|
<a class="text-operation"
|
||||||
@click="modifyHistoryClick(record)">
|
@click="modifyHistoryClick(record)">
|
||||||
{{ $t('modifyHistory') }}
|
{{ $t('history') }}
|
||||||
</a>
|
</a>
|
||||||
<a class="text-operation"
|
<a class="text-operation"
|
||||||
v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
|
v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
|
||||||
@@ -662,7 +662,7 @@
|
|||||||
title: this.$t('configurationItem'),
|
title: this.$t('configurationItem'),
|
||||||
align: 'left',
|
align: 'left',
|
||||||
dataIndex: 'configItem',
|
dataIndex: 'configItem',
|
||||||
width: 180,
|
width: 100,
|
||||||
ellipsis: true
|
ellipsis: true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -778,7 +778,7 @@
|
|||||||
title: this.$t('operation'),
|
title: this.$t('operation'),
|
||||||
align: 'left',
|
align: 'left',
|
||||||
fixed: 'right',
|
fixed: 'right',
|
||||||
width: 230,
|
width: localStorage.getItem('language') == 'zh-cn' ? 160 : 180,
|
||||||
scopedSlots: { customRender: 'operation' }
|
scopedSlots: { customRender: 'operation' }
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1118,7 +1118,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
sort: '',
|
sort: '',
|
||||||
name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('typeOfDeliverables'),
|
name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('typeOfDeliverables'),
|
||||||
headFieldCn: '交付物类型',
|
headFieldCn: '交付物类型',
|
||||||
headFieldEn: 'Deliverable Type',
|
headFieldEn: 'Deliverable Type',
|
||||||
field: 'verifyDeliverableTypeName',
|
field: 'verifyDeliverableTypeName',
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<a-drawer
|
<a-drawer
|
||||||
:title="$t('Transfer')"
|
:title="$t('Transfer')"
|
||||||
:maskClosable="false"
|
:maskClosable="false"
|
||||||
:width="1000"
|
:width="1100"
|
||||||
placement="right"
|
placement="right"
|
||||||
:closable="true"
|
:closable="true"
|
||||||
@close="handleCancel"
|
@close="handleCancel"
|
||||||
@@ -45,7 +45,7 @@
|
|||||||
<a-table
|
<a-table
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
rowKey="id"
|
rowKey="id"
|
||||||
:scroll="{x: 800,y:600}"
|
:scroll="{x: 800,y:'calc(100vh - 330px)'}"
|
||||||
:data-source="dataList"
|
:data-source="dataList"
|
||||||
:pagination="false"
|
:pagination="false"
|
||||||
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
|
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
|
||||||
@@ -94,7 +94,7 @@ export default {
|
|||||||
title: this.$t('standard'),
|
title: this.$t('standard'),
|
||||||
align: 'left',
|
align: 'left',
|
||||||
dataIndex: 'serialNumber',
|
dataIndex: 'serialNumber',
|
||||||
width: 100,
|
width: 180,
|
||||||
fixed: 'left',
|
fixed: 'left',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
scopedSlots: { customRender: 'standard' }
|
scopedSlots: { customRender: 'standard' }
|
||||||
@@ -103,7 +103,7 @@ export default {
|
|||||||
title: this.$t('title'),
|
title: this.$t('title'),
|
||||||
align: 'left',
|
align: 'left',
|
||||||
dataIndex: 'title',
|
dataIndex: 'title',
|
||||||
width: 100,
|
width: 180,
|
||||||
fixed: 'left',
|
fixed: 'left',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
scopedSlots: { customRender: 'titleName' }
|
scopedSlots: { customRender: 'titleName' }
|
||||||
|
|||||||
@@ -69,7 +69,7 @@
|
|||||||
dataIndex: 'projectName',
|
dataIndex: 'projectName',
|
||||||
scopedSlots: { customRender: 'RelatedItems' },
|
scopedSlots: { customRender: 'RelatedItems' },
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
width: 300
|
width: 200
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('standardInformation'),
|
title: this.$t('standardInformation'),
|
||||||
@@ -77,7 +77,7 @@
|
|||||||
dataIndex: 'standardInfo',
|
dataIndex: 'standardInfo',
|
||||||
scopedSlots: { customRender: 'standardInformation' },
|
scopedSlots: { customRender: 'standardInformation' },
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
width: 300
|
width: 200
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('ProcessType'),
|
title: this.$t('ProcessType'),
|
||||||
@@ -122,7 +122,7 @@
|
|||||||
dataIndex: 'endTime',
|
dataIndex: 'endTime',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
sorter: true,
|
sorter: true,
|
||||||
width: 108
|
width: 100
|
||||||
},
|
},
|
||||||
// {
|
// {
|
||||||
// title: this.$t('taskStatus'),
|
// title: this.$t('taskStatus'),
|
||||||
|
|||||||
@@ -81,7 +81,7 @@
|
|||||||
dataIndex: 'projectName',
|
dataIndex: 'projectName',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
scopedSlots: { customRender: 'RelatedItems' },
|
scopedSlots: { customRender: 'RelatedItems' },
|
||||||
width: 300
|
width: 200
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('standardInformation'),
|
title: this.$t('standardInformation'),
|
||||||
@@ -89,7 +89,7 @@
|
|||||||
dataIndex: 'standardInfo',
|
dataIndex: 'standardInfo',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
scopedSlots: { customRender: 'standardInformation' },
|
scopedSlots: { customRender: 'standardInformation' },
|
||||||
width: 300
|
width: 200
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('ProcessType'),
|
title: this.$t('ProcessType'),
|
||||||
@@ -126,7 +126,7 @@
|
|||||||
align: 'left',
|
align: 'left',
|
||||||
dataIndex: 'endTime',
|
dataIndex: 'endTime',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
width: 172,
|
width: 100,
|
||||||
sorter: true,
|
sorter: true,
|
||||||
scopedSlots: { customRender: 'endTime' }
|
scopedSlots: { customRender: 'endTime' }
|
||||||
},
|
},
|
||||||
|
|||||||
+4
-4
@@ -11,10 +11,6 @@
|
|||||||
style="height: 100%;overflow: auto;margin-bottom: 436px;">
|
style="height: 100%;overflow: auto;margin-bottom: 436px;">
|
||||||
|
|
||||||
<JLoading :loading="loading">{{textLoading}}</JLoading>
|
<JLoading :loading="loading">{{textLoading}}</JLoading>
|
||||||
<a-button style="float: right;" @click="referenceDeliverablesClick"
|
|
||||||
v-if="this.queryData.isDisplay && (queryData.TaskKey == 'zrrtjjfw' || queryData.TaskKey == 'dezrrtjjfw')"
|
|
||||||
type="primary">{{$t('referenceDeliverables')}}
|
|
||||||
</a-button>
|
|
||||||
<a-icon v-if="this.queryData.isDisplay"
|
<a-icon v-if="this.queryData.isDisplay"
|
||||||
class="questionClass"
|
class="questionClass"
|
||||||
:title="queryData.flowType == '2' ? this.$t('checkRegulatoryCompletedBefore') : this.$t('checkVerificationResultsBeforeMP')"
|
:title="queryData.flowType == '2' ? this.$t('checkRegulatoryCompletedBefore') : this.$t('checkVerificationResultsBeforeMP')"
|
||||||
@@ -46,6 +42,10 @@
|
|||||||
<!--:class="{'drawer-review':isDrawerClass,
|
<!--:class="{'drawer-review':isDrawerClass,
|
||||||
'drawer-review-One':!isDrawerClass}"-->
|
'drawer-review-One':!isDrawerClass}"-->
|
||||||
<div v-if="this.queryData.isDisplay" class="drawer-review">
|
<div v-if="this.queryData.isDisplay" class="drawer-review">
|
||||||
|
<a-button style="float: right;" @click="referenceDeliverablesClick"
|
||||||
|
v-if="this.queryData.isDisplay && (queryData.TaskKey == 'zrrtjjfw' || queryData.TaskKey == 'dezrrtjjfw')"
|
||||||
|
type="primary">{{$t('referenceDeliverables')}}
|
||||||
|
</a-button>
|
||||||
<reviewedByThePersonInCharge
|
<reviewedByThePersonInCharge
|
||||||
v-if="isDisplay"
|
v-if="isDisplay"
|
||||||
ref="reviewedByThePersonInChargeRef"
|
ref="reviewedByThePersonInChargeRef"
|
||||||
|
|||||||
@@ -74,7 +74,7 @@
|
|||||||
dataIndex: 'projectName',
|
dataIndex: 'projectName',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
scopedSlots: { customRender: 'RelatedItems' },
|
scopedSlots: { customRender: 'RelatedItems' },
|
||||||
width: 300
|
width: 200
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('standardInformation'),
|
title: this.$t('standardInformation'),
|
||||||
@@ -82,7 +82,7 @@
|
|||||||
dataIndex: 'standardInfo',
|
dataIndex: 'standardInfo',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
scopedSlots: { customRender: 'standardInformation' },
|
scopedSlots: { customRender: 'standardInformation' },
|
||||||
width: 300
|
width: 200
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('ProcessType'),
|
title: this.$t('ProcessType'),
|
||||||
@@ -120,7 +120,7 @@
|
|||||||
dataIndex: 'endTime',
|
dataIndex: 'endTime',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
sorter: true,
|
sorter: true,
|
||||||
width: 108
|
width: 100
|
||||||
},
|
},
|
||||||
// {
|
// {
|
||||||
// title: this.$t('taskStatus'),
|
// title: this.$t('taskStatus'),
|
||||||
|
|||||||
+12
-2
@@ -33,10 +33,10 @@
|
|||||||
<a-table
|
<a-table
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
rowKey="id"
|
rowKey="id"
|
||||||
:scroll="{x: '100%',y:600}"
|
:scroll="{x: '100%',y:'calc(100vh - 330px)'}"
|
||||||
:data-source="dataList"
|
:data-source="dataList"
|
||||||
:pagination="false"
|
:pagination="false"
|
||||||
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' , type:'radio'}"
|
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' '}"
|
||||||
:loading="loading">
|
:loading="loading">
|
||||||
|
|
||||||
</a-table>
|
</a-table>
|
||||||
@@ -87,6 +87,13 @@
|
|||||||
dataIndex: 'studioEngineerName',
|
dataIndex: 'studioEngineerName',
|
||||||
align: 'left',
|
align: 'left',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
|
width: 140
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: this.$t('explain'),
|
||||||
|
dataIndex: 'explanation',
|
||||||
|
align: 'left',
|
||||||
|
ellipsis: true,
|
||||||
width: 223
|
width: 223
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
@@ -151,6 +158,9 @@
|
|||||||
},
|
},
|
||||||
onSelectChange(value) {
|
onSelectChange(value) {
|
||||||
this.selectedRowKeys = value
|
this.selectedRowKeys = value
|
||||||
|
if (this.selectedRowKeys.length > 1) {
|
||||||
|
this.selectedRowKeys.shift()
|
||||||
|
}
|
||||||
},
|
},
|
||||||
handleCancel() {
|
handleCancel() {
|
||||||
this.visible = false
|
this.visible = false
|
||||||
|
|||||||
+1
-2
@@ -2,8 +2,7 @@
|
|||||||
<div class="box">
|
<div class="box">
|
||||||
<div class="box-text">
|
<div class="box-text">
|
||||||
<div class="header-text">
|
<div class="header-text">
|
||||||
{{query.TaskKey == 'zrrqr' || query.TaskKey == 'dezrrqr' || query.TaskKey == 'zrrtjjfw' || $route.query.TaskKey
|
{{query.TaskKey == 'zrrqr' || query.TaskKey == 'dezrrqr' || query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'dezrrtjjfw'
|
||||||
== 'dezrrtjjfw'
|
|
||||||
? $t('personLiableConfirm'):$t('sponsorReview')}}
|
? $t('personLiableConfirm'):$t('sponsorReview')}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -23,10 +23,10 @@
|
|||||||
</a-col>
|
</a-col>
|
||||||
<a-col :md="6" :sm="8">
|
<a-col :md="6" :sm="8">
|
||||||
<div class="box-title-text tree-select">
|
<div class="box-title-text tree-select">
|
||||||
<div class="title-text" :title="$t('taskType')">
|
<div class="title-text" :title="$t('ProcessType')">
|
||||||
<span>{{$t('taskType')}}</span>
|
<span>{{$t('ProcessType')}}</span>
|
||||||
</div>
|
</div>
|
||||||
<a-select :placeholder="$t('PleaseSelect')+$t('taskType')"
|
<a-select :placeholder="$t('PleaseSelect')+$t('ProcessType')"
|
||||||
class="box-input"
|
class="box-input"
|
||||||
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
||||||
allowClear
|
allowClear
|
||||||
@@ -44,10 +44,10 @@
|
|||||||
<template v-if="toggleSearchStatus">
|
<template v-if="toggleSearchStatus">
|
||||||
<a-col :md="6" :sm="8">
|
<a-col :md="6" :sm="8">
|
||||||
<div class="box-title-text">
|
<div class="box-title-text">
|
||||||
<div class="title-text" :title="$t('taskStatus')">
|
<div class="title-text" :title="$t('ProcessStatus')">
|
||||||
<span>{{$t('taskStatus')}}</span>
|
<span>{{$t('ProcessStatus')}}</span>
|
||||||
</div>
|
</div>
|
||||||
<a-select :placeholder="$t('PleaseSelect')+$t('taskStatus')"
|
<a-select :placeholder="$t('PleaseSelect')+$t('ProcessStatus')"
|
||||||
class="box-input"
|
class="box-input"
|
||||||
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
||||||
allowClear
|
allowClear
|
||||||
|
|||||||
@@ -5,10 +5,10 @@
|
|||||||
<a-row :gutter="24">
|
<a-row :gutter="24">
|
||||||
<a-col :md="6" :sm="8">
|
<a-col :md="6" :sm="8">
|
||||||
<div class="box-title-text">
|
<div class="box-title-text">
|
||||||
<div class="title-text" :title="$t('CertificationListName')">
|
<div class="title-text" :title="$t('marketCertificationList')">
|
||||||
<span>{{$t('CertificationListName')}}</span>
|
<span>{{$t('marketCertificationList')}}</span>
|
||||||
</div>
|
</div>
|
||||||
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('CertificationListName')"
|
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('marketCertificationList')"
|
||||||
v-model="queryParam.name"></j-input>
|
v-model="queryParam.name"></j-input>
|
||||||
</div>
|
</div>
|
||||||
</a-col>
|
</a-col>
|
||||||
@@ -114,12 +114,12 @@
|
|||||||
<div class="title-text-add">
|
<div class="title-text-add">
|
||||||
<span class="Required">*</span>
|
<span class="Required">*</span>
|
||||||
<span class="title-text-text"
|
<span class="title-text-text"
|
||||||
:title="$t('CertificationListName')">{{$t('CertificationListName')}}</span>
|
:title="$t('marketCertificationList')">{{$t('marketCertificationList')}}</span>
|
||||||
</div>
|
</div>
|
||||||
<a-form-model-item class="itemModel" prop="name">
|
<a-form-model-item class="itemModel" prop="name">
|
||||||
<a-input class="box-input-add"
|
<a-input class="box-input-add"
|
||||||
v-model.trim="formInline.name"
|
v-model.trim="formInline.name"
|
||||||
:placeholder="$t('PleaseEnter')+$t('CertificationListName')"/>
|
:placeholder="$t('PleaseEnter')+$t('marketCertificationList')"/>
|
||||||
</a-form-model-item>
|
</a-form-model-item>
|
||||||
</div>
|
</div>
|
||||||
</a-col>
|
</a-col>
|
||||||
@@ -167,12 +167,12 @@
|
|||||||
name: [
|
name: [
|
||||||
{
|
{
|
||||||
required: true,
|
required: true,
|
||||||
message: this.$t('CertificationListName') + this.$t('cannotEmpty'),
|
message: this.$t('marketCertificationList') + this.$t('cannotEmpty'),
|
||||||
trigger: 'blur'
|
trigger: 'blur'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
max: 100,
|
max: 100,
|
||||||
message: this.$t('CertificationListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
|
message: this.$t('marketCertificationList') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
|
||||||
trigger: 'blur'
|
trigger: 'blur'
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
@@ -212,10 +212,10 @@
|
|||||||
dataSource: [],
|
dataSource: [],
|
||||||
columns: [
|
columns: [
|
||||||
{
|
{
|
||||||
title: this.$t('CertificationListName'),
|
title: this.$t('marketCertificationList'),
|
||||||
align: 'left',
|
align: 'left',
|
||||||
dataIndex: 'name',
|
dataIndex: 'name',
|
||||||
width: '40%',
|
width: '40',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
scopedSlots: { customRender: 'CertificationListName' }
|
scopedSlots: { customRender: 'CertificationListName' }
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user