diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue index b6a81a16..3e184acb 100644 --- a/src/components/customField/AddForm.vue +++ b/src/components/customField/AddForm.vue @@ -389,6 +389,8 @@ export default { if (val === IsTrial.YES.value) { // 试行,标准状态改为试运行, this.formInline.standard_state = EnterpriseStandardStatus.TRIAL_OPERATION.value + // 试行周期给默认值24 + this.formInline.trial_period = '24' this.formInline = JSON.parse(JSON.stringify(this.formInline)) // 试行,标准状态不可修改 if (!this.innerDisabledField.includes('standard_state')) { @@ -397,6 +399,8 @@ export default { // 试行,试行周期必填 this.rules.trial_period[0].required = true } else { + // 试行周期置空 + this.formInline.trial_period = undefined // 不试行,标准状态可修改 if (this.innerDisabledField.includes('standard_state')) { this.innerDisabledField = this.innerDisabledField.filter(item => item !== 'standard_state') diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js index 8f68a5bd..65cb1998 100644 --- a/src/mixins/JeroListMixin.js +++ b/src/mixins/JeroListMixin.js @@ -526,6 +526,11 @@ export const JeroListMixin = { this.$nextTick(() => { document.getElementsByClassName('ant-modal-confirm-btns')[0].style = 'display: inline-block' }) + }, + // tree-select搜索 + filterTreeOption (input, option) { + const text = option.componentOptions.propsData.title || option.componentOptions.propsData.label + return text.toLowerCase().indexOf(input.toLowerCase()) >= 0 } } } diff --git a/src/views/enterpriseStandardLibrary/check/CheckList.vue b/src/views/enterpriseStandardLibrary/check/CheckList.vue index 054b1456..520061d3 100644 --- a/src/views/enterpriseStandardLibrary/check/CheckList.vue +++ b/src/views/enterpriseStandardLibrary/check/CheckList.vue @@ -61,6 +61,7 @@ class="box-input" style="width: 100%" :tree-data="categoryTreeList" + :filterTreeNode="filterTreeOption" :placeholder="$t('pleaseSelect') + $t('enterpriseStandardLibrary.check.department')" /> diff --git a/src/views/enterpriseStandardLibrary/plan/PlanList.vue b/src/views/enterpriseStandardLibrary/plan/PlanList.vue index dcf9feb7..66791e15 100644 --- a/src/views/enterpriseStandardLibrary/plan/PlanList.vue +++ b/src/views/enterpriseStandardLibrary/plan/PlanList.vue @@ -43,6 +43,7 @@ v-model="queryParam.mainDraftingUnit" :maxTagCount="1" :show-search="true" + :filterTreeNode="filterTreeOption" :getPopupContainer="triggerNode=> triggerNode.parentNode" class="box-input" style="width: 100%" diff --git a/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue b/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue index e1d36727..dcf93d19 100644 --- a/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue +++ b/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue @@ -14,7 +14,7 @@ @@ -80,6 +81,7 @@ export default { this.model.pid = parentNodeKey }, edit (nodeKey, record) { + console.log(record) this.visible = true this.form.resetFields() this.model = Object.assign({}, record)