[update] 修改客户提出的部分问题
This commit is contained in:
@@ -389,6 +389,8 @@ export default {
|
|||||||
if (val === IsTrial.YES.value) {
|
if (val === IsTrial.YES.value) {
|
||||||
// 试行,标准状态改为试运行,
|
// 试行,标准状态改为试运行,
|
||||||
this.formInline.standard_state = EnterpriseStandardStatus.TRIAL_OPERATION.value
|
this.formInline.standard_state = EnterpriseStandardStatus.TRIAL_OPERATION.value
|
||||||
|
// 试行周期给默认值24
|
||||||
|
this.formInline.trial_period = '24'
|
||||||
this.formInline = JSON.parse(JSON.stringify(this.formInline))
|
this.formInline = JSON.parse(JSON.stringify(this.formInline))
|
||||||
// 试行,标准状态不可修改
|
// 试行,标准状态不可修改
|
||||||
if (!this.innerDisabledField.includes('standard_state')) {
|
if (!this.innerDisabledField.includes('standard_state')) {
|
||||||
@@ -397,6 +399,8 @@ export default {
|
|||||||
// 试行,试行周期必填
|
// 试行,试行周期必填
|
||||||
this.rules.trial_period[0].required = true
|
this.rules.trial_period[0].required = true
|
||||||
} else {
|
} else {
|
||||||
|
// 试行周期置空
|
||||||
|
this.formInline.trial_period = undefined
|
||||||
// 不试行,标准状态可修改
|
// 不试行,标准状态可修改
|
||||||
if (this.innerDisabledField.includes('standard_state')) {
|
if (this.innerDisabledField.includes('standard_state')) {
|
||||||
this.innerDisabledField = this.innerDisabledField.filter(item => item !== 'standard_state')
|
this.innerDisabledField = this.innerDisabledField.filter(item => item !== 'standard_state')
|
||||||
|
|||||||
@@ -526,6 +526,11 @@ export const JeroListMixin = {
|
|||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
document.getElementsByClassName('ant-modal-confirm-btns')[0].style = 'display: inline-block'
|
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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,6 +61,7 @@
|
|||||||
class="box-input"
|
class="box-input"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
:tree-data="categoryTreeList"
|
:tree-data="categoryTreeList"
|
||||||
|
:filterTreeNode="filterTreeOption"
|
||||||
:placeholder="$t('pleaseSelect') + $t('enterpriseStandardLibrary.check.department')"
|
:placeholder="$t('pleaseSelect') + $t('enterpriseStandardLibrary.check.department')"
|
||||||
/>
|
/>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
|
|||||||
@@ -43,6 +43,7 @@
|
|||||||
v-model="queryParam.mainDraftingUnit"
|
v-model="queryParam.mainDraftingUnit"
|
||||||
:maxTagCount="1"
|
:maxTagCount="1"
|
||||||
:show-search="true"
|
:show-search="true"
|
||||||
|
:filterTreeNode="filterTreeOption"
|
||||||
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
||||||
class="box-input"
|
class="box-input"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
<a-spin :spinning="confirmLoading" style="width: 100%;height:100%">
|
<a-spin :spinning="confirmLoading" style="width: 100%;height:100%">
|
||||||
<add-form ref="addForm"
|
<add-form ref="addForm"
|
||||||
flag="3"
|
flag="3"
|
||||||
:defaultValue="{year_number: new Date().getFullYear() + '', trial_period: '24'}"
|
:defaultValue="{year_number: new Date().getFullYear() + '', try_flag: '0'}"
|
||||||
:disabledFieldList="['standard_number', 'replaced_by_standard_number', 'referenced_standard']"
|
:disabledFieldList="['standard_number', 'replaced_by_standard_number', 'referenced_standard']"
|
||||||
:hiddenFieldList="hiddenFieldList"
|
:hiddenFieldList="hiddenFieldList"
|
||||||
:get-form-func="getFormFunc"
|
:get-form-func="getFormFunc"
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('system.internalWorkGroup.adminAuthority')">
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('system.internalWorkGroup.adminAuthority')">
|
||||||
<user-selection :placeholder="$t('pleaseSelect') + $t('system.internalWorkGroup.adminAuthority')"
|
<user-selection :placeholder="$t('pleaseSelect') + $t('system.internalWorkGroup.adminAuthority')"
|
||||||
type="radio"
|
type="radio"
|
||||||
|
:nameStr="model.userId_dictText"
|
||||||
v-decorator="['userId', validatorRules.userId]" />
|
v-decorator="['userId', validatorRules.userId]" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-form>
|
</a-form>
|
||||||
@@ -80,6 +81,7 @@ export default {
|
|||||||
this.model.pid = parentNodeKey
|
this.model.pid = parentNodeKey
|
||||||
},
|
},
|
||||||
edit (nodeKey, record) {
|
edit (nodeKey, record) {
|
||||||
|
console.log(record)
|
||||||
this.visible = true
|
this.visible = true
|
||||||
this.form.resetFields()
|
this.form.resetFields()
|
||||||
this.model = Object.assign({}, record)
|
this.model = Object.assign({}, record)
|
||||||
|
|||||||
Reference in New Issue
Block a user