WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改禅道已知bug

Browse Source
This commit is contained in:
qq787203167
2022-05-19 21:39:20 +08:00
parent 7c64025f9f
commit 9a0007442d
9 changed files with 185 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/documentTools/virtualList/components/addModel.vue
+3 -5
View File
@@ -40,7 +40,7 @@
:triggerChange="false" :dictCode="'state'"/> :triggerChange="false" :dictCode="'state'"/>
</div> </div>
</a-col> </a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons"> <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24"> <a-col :md="12" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button> <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button> <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
@@ -265,8 +265,7 @@
} }
.title-text { .title-text {
width: 20%; width: 33px;
min-width: 110px;
color: #000F16; color: #000F16;
display: inline-block; display: inline-block;
font-weight: 500; font-weight: 500;
@@ -281,9 +280,8 @@
.box-input { .box-input {
display: inline-block; display: inline-block;
width: 70%; width: 100%;
height: 38px; height: 38px;
margin-top: 2px;
} }
.box-button { .box-button {
jero-web/src/views/documentTools/virtualList/components/editModel.vue
+76 -76
View File
@@ -55,13 +55,17 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="title-text-text" :title="'WVTA ID'">WVTA ID</span> <span class="title-text-text"
:title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="wvtaId"> <a-form-model-item class="itemModel-multi" prop="region">
<a-input class="box-input" <!-- <a-input class="box-input"-->
:disabled="false" <!-- :disabled="true"-->
v-model="formInline.wvtaId" <!-- v-model="formInline.region_dictText"/>-->
:placeholder="$t('PleaseEnter')+'WVTA ID'"/> <j-multi-select-tag class="box-input" v-model="formInline.region"
:placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
:type="'select'"
:triggerChange="false" :dictCode="'region'"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -117,6 +121,24 @@
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('implementationCategory')">{{$t('implementationCategory')}}</span>
</div>
<a-form-model-item class="itemModel" prop="implementType">
<j-dict-select-tag class="box-input" v-model="formInline.implementType"
:disabled="disabled"
@input="handleInput('implementType')"
:placeholder="$t('PleaseSelect')+$t('implementationCategory')"
:type="'select'"
:triggerChange="false" :dictCode="'implement_type'"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
@@ -134,8 +156,6 @@
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
@@ -154,6 +174,21 @@
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="'WVTA ID'">WVTA ID</span>
</div>
<a-form-model-item class="itemModel" prop="wvtaId">
<a-input class="box-input"
:disabled="false"
v-model="formInline.wvtaId"
:placeholder="$t('PleaseEnter')+'WVTA ID'"/>
</a-form-model-item>
</div>
</a-col>
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
@@ -171,6 +206,39 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
</div>
<a-form-model-item class="itemModel" prop="attestationRank">
<j-dict-select-tag class="box-input" v-model="formInline.attestationRank"
:disabled="disabled"
@input="handleInput('attestationRank')"
:placeholder="$t('PleaseSelect')+$t('certificationLevel')"
:type="'select'"
:triggerChange="false" :dictCode="'attestation_rank'"/>
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('applicableSupplement')">{{$t('applicableSupplement')}}</span>
</div>
<a-form-model-item class="itemModel" prop="applicableSupplement">
<a-input class="box-input"
:disabled="false"
v-model="formInline.applicableSupplement"
:placeholder="$t('PleaseEnter')+$t('applicableSupplement')"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
@@ -209,74 +277,6 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
</div>
<a-form-model-item class="itemModel" prop="attestationRank">
<j-dict-select-tag class="box-input" v-model="formInline.attestationRank"
:disabled="disabled"
@input="handleInput('attestationRank')"
:placeholder="$t('PleaseSelect')+$t('certificationLevel')"
:type="'select'"
:triggerChange="false" :dictCode="'attestation_rank'"/>
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('implementationCategory')">{{$t('implementationCategory')}}</span>
</div>
<a-form-model-item class="itemModel" prop="implementType">
<j-dict-select-tag class="box-input" v-model="formInline.implementType"
:disabled="disabled"
@input="handleInput('implementType')"
:placeholder="$t('PleaseSelect')+$t('implementationCategory')"
:type="'select'"
:triggerChange="false" :dictCode="'implement_type'"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
</div>
<a-form-model-item class="itemModel-multi" prop="region">
<!-- <a-input class="box-input"-->
<!-- :disabled="true"-->
<!-- v-model="formInline.region_dictText"/>-->
<j-multi-select-tag class="box-input" v-model="formInline.region"
:placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
:type="'select'"
:triggerChange="false" :dictCode="'region'"/>
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('applicableSupplement')">{{$t('applicableSupplement')}}</span>
</div>
<a-form-model-item class="itemModel" prop="applicableSupplement">
<a-input class="box-input"
:disabled="false"
v-model="formInline.applicableSupplement"
:placeholder="$t('PleaseEnter')+$t('applicableSupplement')"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="24"> <a-col :span="24">
<div class="box-title-text"> <div class="box-title-text">
jero-web/src/views/documentTools/virtualList/index.vue
+4 -4
View File
@@ -178,7 +178,7 @@
total: 0, total: 0,
pageSize: 10, pageSize: 10,
pageNo: 1, pageNo: 1,
title: '新增', title: this.$t('newlyAdded'),
columns: [ columns: [
{ {
title: this.$t('VirtualListName'), title: this.$t('VirtualListName'),
@@ -217,7 +217,7 @@
}, },
//添加 //添加
handleAdd() { handleAdd() {
this.title = '新增' this.title = this.$t('newlyAdded')
this.formInline = {} this.formInline = {}
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
@@ -249,7 +249,7 @@
}, },
//编辑 //编辑
edit(item) { edit(item) {
this.title = '编辑' this.title = this.$t('edit')
this.formInline = JSON.parse(JSON.stringify(item)) this.formInline = JSON.parse(JSON.stringify(item))
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
@@ -514,7 +514,7 @@
.drawer-bootom-button { .drawer-bootom-button {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
z-index:100; z-index: 100;
width: 100%; width: 100%;
border-top: 1px solid #e8e8e8; border-top: 1px solid #e8e8e8;
padding: 10px 16px; padding: 10px 16px;
jero-web/src/views/projectManagement/components/TaskList.vue
+4 -2
View File
@@ -231,12 +231,14 @@
CurrentColor: { CurrentColor: {
'1': '#f3dddd', '1': '#f3dddd',
'2': '#f6ebdb', '2': '#f6ebdb',
'3': '#dbf6e2' '3': '#dbf6e2',
'4': '#ddf3f4'
}, },
CurrentColorBox: { CurrentColorBox: {
'1': '#E83030', '1': '#E83030',
'2': '#FDA71C', '2': '#FDA71C',
'3': '#26BD4B' '3': '#26BD4B',
'4': '#00B3BE'
}, },
url: { url: {
list: '/project/projectTaskInventoryEO/list', list: '/project/projectTaskInventoryEO/list',
jero-web/src/views/projectManagement/components/TaskListModel.vue
+7 -5
View File
@@ -73,11 +73,12 @@
{{ $t('green') }} {{ $t('green') }}
</span> </span>
</a-select-option> </a-select-option>
<!-- <a-select-option :key="3" :value="3">-->
<!-- <span style="display: inline-block;width: 100%">--> <a-select-option :value="'4'">
<!-- {{ $t('blue') }}--> <span style="display: inline-block;width: 100%">
<!-- </span>--> {{ $t('blue') }}
<!-- </a-select-option>--> </span>
</a-select-option>
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -143,6 +144,7 @@
this.disabled = true this.disabled = true
} }
} }
console.log(val.conditionAssessment)
this.formInline = val this.formInline = val
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ruleForm.clearValidate() this.$refs.ruleForm.clearValidate()
jero-web/src/views/projectManagement/components/batSetting.vue
+60 -6
View File
@@ -1,7 +1,7 @@
<template> <template>
<a-modal <a-modal
:title="$t('batSetting')" :title="$t('batSetting')"
:width="900" :width="1200"
:visible="visible" :visible="visible"
:confirm-loading="confirmLoading" :confirm-loading="confirmLoading"
:maskClosable="false" :maskClosable="false"
@@ -39,6 +39,22 @@
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
</div>
<a-form-model-item class="itemModel-multi" prop="region">
<j-multi-select-tag class="box-input" v-model="formInline.region"
:placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
:type="'select'"
:triggerChange="false" :dictCode="'region'"/>
</a-form-model-item>
</div>
</a-col>
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
@@ -53,17 +69,53 @@
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span> <span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
</div> </div>
<a-form-model-item class="itemModel"> <a-form-model-item class="itemModel-multi">
<j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory" <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
@input="handleInput('dutyTerritory')"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')" :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
:type="'select'" :type="'select'"
:triggerChange="false" dictCode="duty_territory"/> :triggerChange="false" :dictCode="'duty_territory'"/>
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('vehicleInProductionDate')">{{$t('vehicleInProductionDate')}}</span>
</div>
<a-form-model-item class="itemModel" :prop="'implementTime'">
<a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+$t('vehicleInProductionDate')"
:getCalendarContainer="(trigger) => trigger.parentNode"
@change="dateChange({db_field_name:'implementTime'})"
format="YYYY-MM-DD"
v-model="formInline.implementTime"
style="width: 100%"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('ImplementationDate')">{{$t('ImplementationDate')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-date-picker class="box-input"
:getCalendarContainer="(trigger) => trigger.parentNode"
:placeholder="$t('PleaseSelect')+$t('ImplementationDate')"
@change="dateChange({db_field_name:'xin1Che1Xing2Shi2Shi1Ri4Qi1'})"
format="YYYY-MM-DD"
v-model="formInline.xin1Che1Xing2Shi2Shi1Ri4Qi1"
style="width: 100%"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -85,6 +137,8 @@
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
@@ -244,7 +298,7 @@
} }
.title-text { .title-text {
width: 84px; width: 174px;
text-align: right; text-align: right;
display: inline-block; display: inline-block;
font-weight: 500; font-weight: 500;
jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue
+1 -1
View File
@@ -121,7 +121,7 @@
let color = [] let color = []
if (dataSource && dataSource.length > 0) { if (dataSource && dataSource.length > 0) {
dataSource.forEach(res => { dataSource.forEach(res => {
if (res.color == '0') { if (res.color == '4') {
data.push({ data.push({
value: res.conditionAssessmentCount, value: res.conditionAssessmentCount,
name: this.$t('blue') name: this.$t('blue')
jero-web/src/views/projectManagement/components/listAddModel.vue
+3 -5
View File
@@ -40,7 +40,7 @@
:triggerChange="false" :dictCode="'state'"/> :triggerChange="false" :dictCode="'state'"/>
</div> </div>
</a-col> </a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons"> <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24"> <a-col :md="12" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button> <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button> <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
@@ -249,8 +249,7 @@
} }
.title-text { .title-text {
width: 20%; width: 33px;
min-width: 110px;
color: #000F16; color: #000F16;
display: inline-block; display: inline-block;
font-weight: 500; font-weight: 500;
@@ -265,9 +264,8 @@
.box-input { .box-input {
display: inline-block; display: inline-block;
width: 70%; width: 100%;
height: 38px; height: 38px;
margin-top: 2px;
} }
.box-button { .box-button {
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+26 -5
View File
@@ -356,14 +356,14 @@
title: this.$t('listConfirmationStatus'), title: this.$t('listConfirmationStatus'),
align: 'center', align: 'center',
dataIndex: 'inventoryAffirmStatusName', dataIndex: 'inventoryAffirmStatusName',
width: 180, width: 240,
scopedSlots: { customRender: 'titleName' } scopedSlots: { customRender: 'titleName' }
}, },
{ {
title: this.$t('taskAffirmStatus'), title: this.$t('taskAffirmStatus'),
align: 'center', align: 'center',
dataIndex: 'taskAffirmStatusName', dataIndex: 'taskAffirmStatusName',
width: 180, width: 240,
scopedSlots: { customRender: 'titleName' } scopedSlots: { customRender: 'titleName' }
}, },
// { // {
@@ -395,13 +395,13 @@
{ {
title: this.$t('ImplementationDate'), title: this.$t('ImplementationDate'),
align: 'center', align: 'center',
width: 140, width: 200,
dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1' dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1'
}, },
{ {
title: this.$t('vehicleInProductionDate'), title: this.$t('vehicleInProductionDate'),
align: 'center', align: 'center',
width: 140, width: 220,
dataIndex: 'implementTime' dataIndex: 'implementTime'
}, },
{ {
@@ -421,7 +421,7 @@
{ {
title: this.$t('applicableSupplement'), title: this.$t('applicableSupplement'),
align: 'center', align: 'center',
width: 180, width: 220,
dataIndex: 'applicableSupplement', dataIndex: 'applicableSupplement',
scopedSlots: { customRender: 'titleName' } scopedSlots: { customRender: 'titleName' }
}, },
@@ -500,6 +500,13 @@
dataIndex: 'designDueDate', dataIndex: 'designDueDate',
align: 'center', align: 'center',
width: 140 width: 140
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'designRemark',
align: 'center',
width: 220,
scopedSlots: { customRender: 'titleName' }
} }
] ]
}, },
@@ -532,6 +539,13 @@
dataIndex: 'prehomoDueDate', dataIndex: 'prehomoDueDate',
align: 'center', align: 'center',
width: 140 width: 140
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'prehomoRemark',
align: 'center',
width: 220,
scopedSlots: { customRender: 'titleName' }
} }
] ]
}, },
@@ -564,6 +578,13 @@
dataIndex: 'verifyDueDate', dataIndex: 'verifyDueDate',
align: 'center', align: 'center',
width: 140 width: 140
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'verifyRemark',
align: 'center',
width: 220,
scopedSlots: { customRender: 'titleName' }
} }
] ]
}, },