diff --git a/src/views/documentTool/documentComparison/DocumentDataComparison.vue b/src/views/documentTool/documentComparison/DocumentDataComparison.vue
index aae1f38..fbe67ce 100644
--- a/src/views/documentTool/documentComparison/DocumentDataComparison.vue
+++ b/src/views/documentTool/documentComparison/DocumentDataComparison.vue
@@ -200,7 +200,7 @@ export default {
methods: {
// 文档对比的一致按钮点击
consistentAssessmentClick () {
- if (!this.dataLeft.id && !this.dataRight.id) {
+ if (!this.dataLeft.id || !this.dataRight.id) {
this.$message.warning(this.$t('docTool.comparison.pleaseSelectTheDataCompared'))
return
}
@@ -244,7 +244,7 @@ export default {
},
// 文档对比的保存按钮点击
submit () {
- if (!this.dataLeft.id && !this.dataRight.id) {
+ if (!this.dataLeft.id || !this.dataRight.id) {
this.$message.warning(this.$t('docTool.comparison.pleaseSelectTheDataCompared'))
return
}
diff --git a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
index bd7ec42..b277647 100644
--- a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
@@ -5,6 +5,7 @@
:visible="visible"
@close="handleCancel"
width="1100"
+ destroyOnClose
class="custom-drawer-style">
diff --git a/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue b/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue
index 18b79ed..ae1bb3c 100644
--- a/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue
@@ -5,6 +5,7 @@
:visible="visible"
@close="handleCancel"
width="900"
+ destroyOnClose
class="custom-drawer-style">
@@ -146,18 +147,26 @@
:label-in-value="false"
:placeholder="$t('pleaseSelect')+item.dbFieldTxt + getPlaceholderSuffix(item)" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -187,13 +196,15 @@ import { getFormDictTreeList } from '../../../../api/api'
import { getAction } from '../../../../api/manage'
import STreeSelect from '../../../../components/STreeSelect'
import TreeSelection from '../../../../components/selection/TreeSelection'
+import TreeDataSelection from '@comp/selection/TreeDataSelection'
export default {
name: 'SplitDetailBatchEditDrawer',
- components: { TreeSelection, UserSelection, StandardSelection, UploadFile, JMultipleDatePicker, STreeSelect },
+ components: { TreeDataSelection, TreeSelection, UserSelection, StandardSelection, UploadFile, JMultipleDatePicker, STreeSelect },
data () {
return {
FieldType,
+ defaultValue: {},
title: this.$t('docTool.split.batchEdit'),
visible: false,
confirmLoading: false,
@@ -206,39 +217,13 @@ export default {
uploadName: '',
type: 'add',
hiddenFieldList: ['item_num', 'item_title', 'item_content', 'interpretation_articles', 'translation'], // 隐藏的字段
- radioDictSelect: ['is_long_effect'], // 使用radio样式的数据字典单选
+ radioDictSelect: [], // 使用radio样式的数据字典单选
disabledFieldList: [], // 禁用的字段
specialPlaceholder: {}, // 特殊的placeholder
optionsData: {} // 通过接口获取的下拉数据
// interpretationArticlesList: [] // 条文解读数据
}
},
- watch: {
- // 是否长期有效,是的话新认证实施日期、已认证实施日期、新注册实施日期为多选,否则为单选
- 'formInline.is_long_effect': {
- handler (value) {
- console.log('是否长期有效', value)
- const indexArr = []
- // 新认证实施日期
- indexArr[0] = this.dataList.findIndex(tt => tt.dbFieldName === 'new_cer_implement_date')
- // 已认证实施日期
- indexArr[1] = this.dataList.findIndex(tt => tt.dbFieldName === 'cer_implement_date')
- // 新注册实施日期
- indexArr[2] = this.dataList.findIndex(tt => tt.dbFieldName === 'new_register_implement_date')
- if (value === YesOrNoEnum.YES.value) {
- indexArr.forEach(index => {
- this.$set(this.dataList[index], 'fieldShowType', FieldType.DATE_MORE.value)
- })
- } else if (value === YesOrNoEnum.NO.value) {
- indexArr.forEach(index => {
- this.$set(this.dataList[index], 'fieldShowType', FieldType.DATE_SINGLE.value)
- })
- }
- this.$forceUpdate()
- },
- immediate: true
- }
- },
methods: {
open (ids) {
this.visible = true
@@ -269,8 +254,6 @@ export default {
// this.interpretationArticlesList = [
// { id: '', itemContent: null }
// ]
- // 是否长期有效默认选否
- this.$set(this.formInline, 'is_long_effect', YesOrNoEnum.NO.value)
this.dataList = res.result
this.ruleList = res.result
this.integrateData()
@@ -458,6 +441,9 @@ export default {
}
return null
},
+ treeDataSelectNameChange (value, fieldName) {
+ this.formInline[fieldName + '_dictText'] = value
+ },
/**
* 如果字段中的usableRange只有一个值,那么就需要在placeholder中标识
* @param field