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:
zyx.net
2023-09-26 15:59:39 +08:00
parent b40409ed18
commit c1e9483aba
5 changed files with 36 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+1 -1
View File
@@ -876,7 +876,7 @@
this.queryPersonByProject(value.dutyTerritory.join(',')) this.queryPersonByProject(value.dutyTerritory.join(','))
} }
console.log(value) console.log(value)
if(value.projectCertificationInventoryEOS && value.projectCertificationInventoryEOS.length > 0){ if(value.projectCertificationInventoryEOS && (value.projectCertificationInventoryEOS.length > 0 || value.projectCertificationInventoryEOS == null)){
this.flowdisabled = true this.flowdisabled = true
this.$refs.uploadFile.disabled = true this.$refs.uploadFile.disabled = true
} }
jero-web/src/views/projectManagement/components/flowstatusdetial.vue
+5
View File
@@ -246,6 +246,11 @@ export default {
left: 33%; left: 33%;
font-size: 14px; font-size: 14px;
color: #040B29; color: #040B29;
width: 60%;
overflow: hidden; /*超出部分隐藏*/
text-overflow: ellipsis; /*超出部分省略号表示*/
white-space: nowrap; /*强制单行显示*/
display: inline-block; /*转换为行内块元素*/
} }
.title-text-description{ .title-text-description{
display: inline-block; display: inline-block;
jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue
+10 -38
View File
@@ -84,25 +84,24 @@
<div class="title-text"> <div class="title-text">
<!-- <span class="Required">*</span>--> <!-- <span class="Required">*</span>-->
<span class="title-text-text" <span class="title-text-text"
:title="$t('RelatedItems')">{{$t('RelatedItems')}}</span> :title="$t('Problemstate')">{{$t('Problemstate')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="contentTemplate"> <a-form-model-item class="itemModel" prop="contentTemplate">
<a-select allowClear <a-select allowClear
class="box-input" class="box-input"
v-model="formInline.projectId" v-model="formInline.problemState"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
showSearch showSearch
mode="multiple"
optionFilterProp="label" optionFilterProp="label"
:autoClearSearchValue="false" :autoClearSearchValue="false"
:placeholder="$t('PleaseSelect')+$t('RelatedItems')"> :placeholder="$t('PleaseSelect')+$t('Problemstate')">
<a-select-option v-for="(item, key) in projectNameList" <a-select-option v-for="(item, key) in ProblemstateList"
:label='item'
:key="key" :key="key"
:label="item.projectName" :value="item">
:value="item.id"> <span style="display: inline-block;width: 100%" :title=" item">
<span style="display: inline-block;width: 100%" :title=" item.projectName "> {{ item }}
{{ item.projectName}} </span>
</span>
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
@@ -138,34 +137,7 @@
</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="Required">*</span>-->
<span class="title-text-text"
:title="$t('Problemstate')">{{$t('Problemstate')}}</span>
</div>
<a-form-model-item class="itemModel" prop="contentTemplate">
<a-select allowClear
class="box-input"
v-model="formInline.problemState"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
showSearch
optionFilterProp="label"
:autoClearSearchValue="false"
:placeholder="$t('PleaseSelect')+$t('Problemstate')">
<a-select-option v-for="(item, key) in ProblemstateList"
:label='item'
:key="key"
:value="item">
<span style="display: inline-block;width: 100%" :title=" item">
{{ item }}
</span>
</a-select-option>
</a-select>
</a-form-model-item>
</div>
</a-col>
</a-row> </a-row>
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="24"> <a-col :span="24">
jero-web/src/views/projectManagement/platformItemLibraryDetails/components/detilModel.vue
+9 -37
View File
@@ -78,25 +78,24 @@
<div class="title-text"> <div class="title-text">
<!-- <span class="Required">*</span>--> <!-- <span class="Required">*</span>-->
<span class="title-text-text" <span class="title-text-text"
:title="$t('RelatedItems')">{{$t('RelatedItems')}}</span> :title="$t('Problemstate')">{{$t('Problemstate')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="contentTemplate"> <a-form-model-item class="itemModel" prop="contentTemplate">
<a-select allowClear <a-select allowClear
class="box-input" class="box-input"
v-model="formInline.projectId" v-model="formInline.problemState"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
showSearch showSearch
mode="multiple"
:disabled="disabled" :disabled="disabled"
optionFilterProp="label" optionFilterProp="label"
:autoClearSearchValue="false"> :autoClearSearchValue="false">
<a-select-option v-for="(item, key) in projectNameList" <a-select-option v-for="(item, key) in ProblemstateList"
:label='item'
:key="key" :key="key"
:label="item.projectName" :value="item">
:value="item.id"> <span style="display: inline-block;width: 100%" :title=" item">
<span style="display: inline-block;width: 100%" :title=" item.projectName "> {{ item }}
{{ item.projectName}} </span>
</span>
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
@@ -133,34 +132,7 @@
</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="Required">*</span>-->
<span class="title-text-text"
:title="$t('Problemstate')">{{$t('Problemstate')}}</span>
</div>
<a-form-model-item class="itemModel" prop="contentTemplate">
<a-select allowClear
class="box-input"
v-model="formInline.problemState"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
showSearch
:disabled="disabled"
optionFilterProp="label"
:autoClearSearchValue="false">
<a-select-option v-for="(item, key) in ProblemstateList"
:label='item'
:key="key"
:value="item">
<span style="display: inline-block;width: 100%" :title=" item">
{{ item }}
</span>
</a-select-option>
</a-select>
</a-form-model-item>
</div>
</a-col>
</a-row> </a-row>
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="24"> <a-col :span="24">
jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
+11 -11
View File
@@ -230,14 +230,14 @@ export default {
sorter:true, sorter:true,
ellipsis: true ellipsis: true
}, },
{ // {
title: this.$t('RelatedItems'), // title: this.$t('RelatedItems'),
align: 'left', // align: 'left',
dataIndex: 'projectName', // dataIndex: 'projectName',
width: 170, // width: 170,
sorter:true, // sorter:true,
ellipsis: true // ellipsis: true
}, // },
{ {
title: this.$t('problemType'), title: this.$t('problemType'),
align: 'left', align: 'left',
@@ -404,9 +404,9 @@ export default {
this.queryParam.problemType_dictText = value this.queryParam.problemType_dictText = value
}, },
getList() { getList() {
if(this.queryParam.problemType_dictText){ // if(this.queryParam.problemType_dictText){
delete this.queryParam.problemType // delete this.queryParam.problemType
} // }
let query = { let query = {
pageNo: this.pageNo, pageNo: this.pageNo,
pageSize: this.pageSize, pageSize: this.pageSize,