bug 78523

This commit is contained in:
赵霄
2023-11-20 13:42:33 +08:00
parent 559c0d9dee
commit 813fd009a6
6 changed files with 121 additions and 49 deletions
@@ -125,19 +125,15 @@
:triggerChange="false"
:dictCode="item.dictField" />
<!-- 12, 树选择 -->
<a-tree-select
<s-tree-select
v-else-if="item.fieldShowType === FieldType.TREE.value"
v-model="formInline[item.dbFieldName]"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
style="width: 100%"
:disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
:tree-data="optionsData[item.dbFieldName]"
tree-checkable
treeCheckStrictly
:label-in-value="false"
@change="updateDom"
show-search
:filterTreeNode="filterTreeOption"
:placeholder="$t('pleaseSelect')+item.dbFieldTxt" />
<!-- 14, 年份选择 -->
<j-date v-else-if="item.fieldShowType === FieldType.YEAR_PICKER.value"
@@ -148,16 +144,12 @@
date-format="YYYY"
:placeholder="$t('pleaseSelect')+item.dbFieldTxt" />
<!-- 15, 树选择(单选) -->
<a-tree-select v-else-if="item.fieldShowType === FieldType.TREE_SINGLE.value"
<s-tree-select v-else-if="item.fieldShowType === FieldType.TREE_SINGLE.value"
v-model="formInline[item.dbFieldName]"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
style="width: 100%"
:disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
:tree-data="optionsData[item.dbFieldName]"
:label-in-value="false"
@change="updateDom"
show-search
:filterTreeNode="filterTreeOption"
:placeholder="$t('pleaseSelect')+item.dbFieldTxt" />
</a-form-model-item>
</div>
@@ -232,6 +224,7 @@ import JMultipleDatePicker from '../../../../components/JMultipleDatePicker.vue'
import { FieldType, TypeOfClauseItem, YesOrNoEnum } from '../../../../enums/commonEnums'
import { getAction } from '../../../../api/manage'
import { getFormDictTreeList } from '../../../../api/api'
import STreeSelect from '../../../../components/STreeSelect'
export default {
name: 'SplitAddForm',
@@ -240,7 +233,8 @@ export default {
SplitDetailAddTable,
UploadFile,
StandardSelection,
SplitDetailAddTypeCheck
SplitDetailAddTypeCheck,
STreeSelect
},
data () {
return {
@@ -120,18 +120,14 @@
:triggerChange="false"
:dictCode="item.dictField"/>
<!-- 12, 树选择 -->
<a-tree-select
<s-tree-select
v-else-if="item.fieldShowType === FieldType.TREE.value"
v-model="formInline[item.dbFieldName]"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
style="width: 100%"
:disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
:tree-data="optionsData[item.dbFieldName]"
tree-checkable
treeCheckStrictly
:label-in-value="false"
show-search
:filterTreeNode="filterTreeOption"
:placeholder="$t('pleaseSelect')+item.dbFieldTxt"/>
<!-- 14, 年份选择 -->
<j-date v-else-if="item.fieldShowType === FieldType.YEAR_PICKER.value"
@@ -142,15 +138,13 @@
date-format="YYYY"
:placeholder="$t('pleaseSelect')+item.dbFieldTxt"/>
<!-- 15, 树选择(单选) -->
<a-tree-select v-else-if="item.fieldShowType === FieldType.TREE_SINGLE.value"
<s-tree-select v-else-if="item.fieldShowType === FieldType.TREE_SINGLE.value"
v-model="formInline[item.dbFieldName]"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
style="width: 100%"
:disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
:tree-data="optionsData[item.dbFieldName]"
:label-in-value="false"
show-search
:filterTreeNode="filterTreeOption"
:placeholder="$t('pleaseSelect')+item.dbFieldTxt"/>
</a-form-model-item>
</div>
@@ -179,10 +173,11 @@ import { getDocSplitEditForm, editBatchEditClause } from '../../../../api/docume
import { FieldType, YesOrNoEnum } from '../../../../enums/commonEnums'
import { getFormDictTreeList } from '../../../../api/api'
import { getAction } from '../../../../api/manage'
import STreeSelect from '../../../../components/STreeSelect'
export default {
name: 'SplitDetailBatchEditDrawer',
components: { UserSelection, StandardSelection, UploadFile, JMultipleDatePicker },
components: { UserSelection, StandardSelection, UploadFile, JMultipleDatePicker, STreeSelect },
data () {
return {
FieldType,
@@ -453,10 +448,6 @@ export default {
width: 100%;
}
/deep/ .ant-select-tree-dropdown {
max-height: 50vh !important;
}
.unscramble-item {
display: flex;
justify-content: space-between;
@@ -34,15 +34,12 @@
<a-form-model-item :label="$t('projectLibrary.vehicleItemLibrary.responsibleDepartment')"
:labelCol="labelCol"
:wrapperCol="wrapperCol">
<a-tree-select
<s-tree-select
tree-node-filter-prop="title"
v-model="queryParam.responsibleDepartment"
:maxTagCount="1"
:show-search="true"
:filterTreeNode="filterTreeOption"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
can-search
class="box-input"
style="width: 100%"
:tree-data="departList"
:placeholder="$t('pleaseSelect') + $t('projectLibrary.vehicleItemLibrary.responsibleDepartment')"
@change="handleDepartsChange"
@@ -125,10 +122,11 @@ import JTable from '../../../components/jero/JTable'
import { mapGetters } from 'vuex'
import { StandardSource } from '../../../enums/commonEnums'
import { filterObj } from '../../../utils/util'
import STreeSelect from '../../../components/STreeSelect'
export default {
name: 'StandardWarningList',
components: { JTable },
components: { JTable, STreeSelect },
mixins: [JeroListMixin],
data () {
return {
@@ -223,11 +223,9 @@
:triggerChange="false"
:dictCode="item.dictField" />
<!-- 12, 树选择 -->
<a-tree-select
<s-tree-select
v-else-if="item.fieldShowType === FieldType.TREE.value"
v-model="formInline[item.dbFieldName]"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
style="width: 100%"
:disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
:tree-data="optionsData[item.dbFieldName]"
tree-checkable
@@ -243,10 +241,8 @@
date-format="YYYY"
:placeholder="$t('pleaseSelect')+item.dbFieldTxt" />
<!-- 15, 树选择(单选) -->
<a-tree-select v-else-if="item.fieldShowType === FieldType.TREE_SINGLE.value"
<s-tree-select v-else-if="item.fieldShowType === FieldType.TREE_SINGLE.value"
v-model="formInline[item.dbFieldName]"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
style="width: 100%"
:disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
:tree-data="optionsData[item.dbFieldName]"
:label-in-value="false"
@@ -358,6 +354,7 @@ import {
agreeStandardECProcess, rejectStandardECProcess
} from '../../../api/workCenter'
import { WorkCenterMixin } from '../../../mixins/WorkCenterMixin'
import STreeSelect from '../../../components/STreeSelect'
export default {
name: 'StandardEntryOrChangeProcess',
@@ -370,7 +367,8 @@ export default {
InternalDetailPage,
ProcessDetailList,
UserSelectModal,
TreeSelection
TreeSelection,
STreeSelect
},
mixins: [WorkCenterMixin],
data () {