diff --git a/ant-design-vue-jeecg/src/views/system/QuartzJobList.vue b/ant-design-vue-jeecg/src/views/system/QuartzJobList.vue index db8b6af..540caf1 100644 --- a/ant-design-vue-jeecg/src/views/system/QuartzJobList.vue +++ b/ant-design-vue-jeecg/src/views/system/QuartzJobList.vue @@ -176,6 +176,7 @@ export default { title: '操作', dataIndex: 'action', align: "center", + fixed: "right", width: 180, scopedSlots: {customRender: 'action'}, } diff --git a/ant-design-vue-jeecg/src/views/system/config/modules/ZoneForm.vue b/ant-design-vue-jeecg/src/views/system/config/modules/ZoneForm.vue index 0d8c3d8..bb8da2b 100644 --- a/ant-design-vue-jeecg/src/views/system/config/modules/ZoneForm.vue +++ b/ant-design-vue-jeecg/src/views/system/config/modules/ZoneForm.vue @@ -14,8 +14,12 @@ </a-form-model-item> </a-col> <a-col :span="24"> - <a-form-model-item label="包含库位类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationTypeCode"> - <a-input v-model="model.locationTypeCode" placeholder="请输入包含库位类型编码,用英文逗号分割"></a-input> + <a-form-model-item label="绑定的库位类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationTypeCode"> + <j-select-multiple + v-model="model.locationTypeCode" + :options="locationTypeList" + placeholder="请选择库位类型"> + </j-select-multiple> </a-form-model-item> </a-col> </a-row> @@ -28,6 +32,7 @@ import {httpAction, getAction} from '@/api/manage' import {validateDuplicateValue} from '@/utils/util' +import {getLocationTypeList} from '@/api/api' export default { name: 'ZoneForm', @@ -42,6 +47,7 @@ export default { }, data() { return { + locationTypeList: [], model: {}, labelCol: { xs: {span: 24}, @@ -78,8 +84,18 @@ export default { created() { //备份model原始值 this.modelDefault = JSON.parse(JSON.stringify(this.model)); + this.loadFrom(); }, methods: { + loadFrom() { + getLocationTypeList().then((res) => { + if (res.success) { + this.locationTypeList = res.result.map((item, index, arr) => { + return {label: item.name, value: item.code} + }) + } + }); + }, add() { this.edit(this.modelDefault); },