bug 78135

This commit is contained in:
赵霄
2023-11-03 09:48:14 +08:00
parent 571c46ca07
commit 8fbe2fbe4e
2 changed files with 31 additions and 4 deletions
@@ -17,7 +17,8 @@
<j-dict-select-tag style="width: 100%" v-model="queryParam.source" <j-dict-select-tag style="width: 100%" v-model="queryParam.source"
:disabled="disabledSourceSearch" :disabled="disabledSourceSearch"
:placeholder="$t('pleaseSelect')+$t('standardSelect.source')" :placeholder="$t('pleaseSelect')+$t('standardSelect.source')"
:triggerChange="false" dictCode="standard_source" :triggerChange="false"
:options="sourceOptions"
@change="handleTypeChange" /> @change="handleTypeChange" />
</a-form-item> </a-form-item>
</a-col> </a-col>
@@ -65,8 +66,9 @@
</template> </template>
<script> <script>
import { getStandardList } from '@/api/api' import { ajaxGetDictItems, getStandardList } from '@/api/api'
import JDictSelectTag from '../dict/JDictSelectTag' import JDictSelectTag from '../dict/JDictSelectTag'
import { StandardSource } from '../../enums/commonEnums'
export default { export default {
name: 'StandardSelectionModal', name: 'StandardSelectionModal',
@@ -76,6 +78,14 @@ export default {
type: [String, Number], type: [String, Number],
default: '1' default: '1'
}, },
// 查询条件可以选择的类型
canSelectedSource: {
type: [String, Array],
required: false,
default: () => {
return [StandardSource.DOMESTIC.value, StandardSource.OVERSEAS.value, StandardSource.ENTERPRISE.value]
}
},
value: { value: {
type: String, type: String,
default: '' default: ''
@@ -147,18 +157,28 @@ export default {
width: 150 width: 150
} }
], ],
dataList: [] dataList: [],
sourceOptions: []
} }
}, },
methods: { methods: {
open () { open () {
this.visible = true this.visible = true
this.queryParam = {} this.queryParam = {}
this.initDict()
this.$nextTick(() => { this.$nextTick(() => {
this.source ? this.queryParam.source = this.source : this.queryParam = {} this.source ? this.queryParam.source = this.source : this.queryParam = {}
this.replacePage() this.replacePage()
}) })
}, },
initDict () {
ajaxGetDictItems('standard_source').then(res => {
if (res.success) {
const canSelectedArr = typeof this.canSelectedSource === 'string' ? this.canSelectedSource.split(',') : this.canSelectedSource
this.sourceOptions = res.result.filter(tt => canSelectedArr.includes(tt.value))
}
})
},
// 获取表格数据 // 获取表格数据
replacePage () { replacePage () {
const query = { const query = {
@@ -18,6 +18,7 @@
<standard-selection :placeholder="$t('pleaseSelect') + $t('standardSelect.standardNumber')" <standard-selection :placeholder="$t('pleaseSelect') + $t('standardSelect.standardNumber')"
type="radio" type="radio"
@nameChange="handleStandardNumberChange" @nameChange="handleStandardNumberChange"
:can-selected-source="[StandardSource.DOMESTIC.value, StandardSource.ENTERPRISE.value]"
v-decorator="['serialNumber', validatorRules.serialNumber]" /> v-decorator="['serialNumber', validatorRules.serialNumber]" />
</a-form-item> </a-form-item>
<!--标准名称--> <!--标准名称-->
@@ -41,7 +42,11 @@
<!--拆分结果文件--> <!--拆分结果文件-->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('docTool.split.splitResultFile')"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('docTool.split.splitResultFile')">
<div class="result-file-box"> <div class="result-file-box">
<j-upload v-decorator="['splitFileId', validatorRules.splitFileId]" return-id :number="1" class="line-btn" file-type="zip,rar" /> <j-upload v-decorator="['splitFileId', validatorRules.splitFileId]"
return-id
:number="1"
class="line-btn"
file-type="zip,rar" />
<a-button class="line-btn" @click="downTemplate($t('docTool.split.documentSplitTemplate'), '.zip')"> <a-button class="line-btn" @click="downTemplate($t('docTool.split.documentSplitTemplate'), '.zip')">
{{ $t('templateDownload') }} {{ $t('templateDownload') }}
</a-button> </a-button>
@@ -63,12 +68,14 @@ import StandardSelection from '../../../../components/selection/StandardSelectio
import { importSplitResult } from '@api/documentToolApi' import { importSplitResult } from '@api/documentToolApi'
import { getFileInfo } from '@api/api' import { getFileInfo } from '@api/api'
import { downloadFile } from '@api/manage' import { downloadFile } from '@api/manage'
import { StandardSource } from '../../../../enums/commonEnums'
export default { export default {
name: 'ImportSplitResultModal', name: 'ImportSplitResultModal',
components: { StandardSelection }, components: { StandardSelection },
data () { data () {
return { return {
StandardSource,
width: 600, width: 600,
visible: false, visible: false,
confirmLoading: false, confirmLoading: false,