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
2022-08-17 11:16:08 +08:00
parent 7c84913aaa
commit 90ad8fbf44
4 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/CollectionType/index.vue
+13 -12
View File
@@ -278,6 +278,18 @@
<!-- 文本+下拉多选--> <!-- 文本+下拉多选-->
<div v-else-if='detailDate.controlType === "6"' class='add_flex'> <div v-else-if='detailDate.controlType === "6"' class='add_flex'>
<div v-for='(item,index) in detailDate.list' :key='index' class='add-width'> <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
<div v-if='item.type==="pull_more"'>
<a-select v-model="item.dataValue"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
mode="multiple" class='selectWid'
:disabled="item.isLock == '1' ? true: false" allowClear>
<a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
<span style="display: inline-block;width: 100%" :title=" item.label ">
{{ item.label }}
</span>
</a-select-option>
</a-select>
</div>
<div v-if='item.type==="text"'> <div v-if='item.type==="text"'>
<!-- 文本校验 分情况--> <!-- 文本校验 分情况-->
<!-- 1 无--> <!-- 1 无-->
@@ -369,18 +381,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
</div> </div>
<div v-if='item.type==="pull_more"'>
<a-select v-model="item.dataValue"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
mode="multiple" class='selectWid'
:disabled="item.isLock == '1' ? true: false" allowClear>
<a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
<span style="display: inline-block;width: 100%" :title=" item.label ">
{{ item.label }}
</span>
</a-select-option>
</a-select>
</div>
</div> </div>
</div> </div>
<!-- 文本+附件--> <!-- 文本+附件-->
jero-web/src/components/tableCollection/index.vue
+9 -1
View File
@@ -25,6 +25,9 @@
<span style='padding-right: 10px;margin-left: -16px'>{{ item.db_field_txt }} </span> <span style='padding-right: 10px;margin-left: -16px'>{{ item.db_field_txt }} </span>
<a-button @click='onClickSee(item)'>{{$t('See')}}</a-button> <a-button @click='onClickSee(item)'>{{$t('See')}}</a-button>
</div> </div>
<span slot="ParameterDescription" slot-scope="text,record" :title="text">
{{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }}
</span>
<span slot="operationbtn" slot-scope="record"> <span slot="operationbtn" slot-scope="record">
<span v-if='currentPersonRole === "homo"'> <span v-if='currentPersonRole === "homo"'>
@@ -627,7 +630,7 @@
title: res.db_field_txt, title: res.db_field_txt,
dataIndex: res.db_field_name, dataIndex: res.db_field_name,
align: 'center', align: 'center',
ellipsis: true, // ellipsis: true,
sorter: res.sort, sorter: res.sort,
width: 160 width: 160
}) })
@@ -640,6 +643,11 @@
customRender: 'operationzr' customRender: 'operationzr'
} }
} }
if(res.click2){
this.columns[index].scopedSlots = {
customRender: 'ParameterDescription'
}
}
if (res.click) { if (res.click) {
// 工程接口人列表修改 // 工程接口人列表修改
this.columns[index].scopedSlots = { this.columns[index].scopedSlots = {
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+1 -1
View File
@@ -49,7 +49,7 @@
<div class="title-text" :title="$t('NareaOfResponsibility')"> <div class="title-text" :title="$t('NareaOfResponsibility')">
<span>{{$t('NareaOfResponsibility')}}</span> <span>{{$t('NareaOfResponsibility')}}</span>
</div> </div>
<j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory" <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
:placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')" :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
:type="'select'" :type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/> :triggerChange="false" :dictCode="'duty_territory'"/>
jero-web/src/views/regulationsKanban/components/addModel.vue
+18 -18
View File
@@ -58,28 +58,28 @@
@change='handleTableChange'> @change='handleTableChange'>
<span slot="status" slot-scope="text,record" :title="text" > <span slot="status" slot-scope="text,record" :title="text" >
<a v-if="record.designFlowTaskStatus_dicText == '符合'" style='color: #26BD4B'>{{ text }}</a> <a v-if="record.designFlowTaskStatus == 'Compliance'" style='color: #26BD4B'>{{ text }}</a>
<a v-if="record.designFlowTaskStatus_dicText == '不符合'" style='color: #E83030'>{{ text }}</a> <a v-if="record.designFlowTaskStatus == 'Non-Compliance'" style='color: #E83030'>{{ text }}</a>
<a v-if="record.designFlowTaskStatus_dicText == '待追踪'" style='color: #FDA71C'>{{ text }}</a> <a v-if="record.designFlowTaskStatus == 'To be tracked'" style='color: #FDA71C'>{{ text }}</a>
<a v-if="record.designFlowTaskStatus_dicText == '不涉及'" style='color: #707486'>{{ text }}</a> <a v-if="record.designFlowTaskStatus == 'NA'" style='color: #707486'>{{ text }}</a>
<a v-if="record.designFlowTaskStatus_dicText == '待确认'" style='color: #00B3BE'>{{ text }}</a> <a v-if="record.designFlowTaskStatus == 'No rating'" style='color: #00B3BE'>{{ text }}</a>
<a v-if="record.designFlowTaskStatus_dicText == '任务终止'" style='color: #E83030'>{{ text }}</a> <a v-if="record.designFlowTaskStatus == 'Termination of task'" style='color: #E83030'>{{ text }}</a>
</span> </span>
<span slot="statusprehomo" slot-scope="text,record" :title="text" > <span slot="statusprehomo" slot-scope="text,record" :title="text" >
<a v-if="record.prehomoFlowTaskStatus_dicText == '符合'" style='color: #26BD4B'>{{ text }}</a> <a v-if="record.prehomoFlowTaskStatus == 'Compliance'" style='color: #26BD4B'>{{ text }}</a>
<a v-if="record.prehomoFlowTaskStatus_dicText == '不符合'" style='color: #E83030'>{{ text }}</a> <a v-if="record.prehomoFlowTaskStatus == 'Non-Compliance'" style='color: #E83030'>{{ text }}</a>
<a v-if="record.prehomoFlowTaskStatus_dicText == '待追踪'" style='color: #FDA71C'>{{ text }}</a> <a v-if="record.prehomoFlowTaskStatus == 'To be tracked'" style='color: #FDA71C'>{{ text }}</a>
<a v-if="record.prehomoFlowTaskStatus_dicText == '不涉及'" style='color: #707486'>{{ text }}</a> <a v-if="record.prehomoFlowTaskStatus == 'NA'" style='color: #707486'>{{ text }}</a>
<a v-if="record.prehomoFlowTaskStatus_dicText == '待确认'" style='color: #00B3BE'>{{ text }}</a> <a v-if="record.prehomoFlowTaskStatus == 'No rating'" style='color: #00B3BE'>{{ text }}</a>
<a v-if="record.prehomoFlowTaskStatus_dicText == '任务终止'" style='color: #E83030'>{{ text }}</a> <a v-if="record.prehomoFlowTaskStatus == 'Termination of task'" style='color: #E83030'>{{ text }}</a>
</span> </span>
<span slot="filstatuse" slot-scope="text,record" :title="text" > <span slot="filstatuse" slot-scope="text,record" :title="text" >
<a v-if="record.verifyFlowTaskStatus_dicText == '符合'" style='color: #26BD4B'>{{ text }}</a> <a v-if="record.verifyFlowTaskStatus == 'Compliance'" style='color: #26BD4B'>{{ text }}</a>
<a v-if="record.verifyFlowTaskStatus_dicText == '不符合'" style='color: #E83030'>{{ text }}</a> <a v-if="record.verifyFlowTaskStatus == 'Non-Compliance'" style='color: #E83030'>{{ text }}</a>
<a v-if="record.verifyFlowTaskStatus_dicText == '待追踪'" style='color: #FDA71C'>{{ text }}</a> <a v-if="record.verifyFlowTaskStatus == 'To be tracked'" style='color: #FDA71C'>{{ text }}</a>
<a v-if="record.verifyFlowTaskStatus_dicText == '不涉及'" style='color: #707486'>{{ text }}</a> <a v-if="record.verifyFlowTaskStatus == 'NA'" style='color: #707486'>{{ text }}</a>
<a v-if="record.verifyFlowTaskStatus_dicText == '待确认'" style='color: #00B3BE'>{{ text }}</a> <a v-if="record.verifyFlowTaskStatus == 'No rating'" style='color: #00B3BE'>{{ text }}</a>
<a v-if="record.verifyFlowTaskStatus_dicText == '任务终止'" style='color: #E83030'>{{ text }}</a> <a v-if="record.verifyFlowTaskStatus == 'Termination of task'" style='color: #E83030'>{{ text }}</a>
</span> </span>
<!-- <template slot="file" slot-scope="text, record">--> <!-- <template slot="file" slot-scope="text, record">-->