diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/ConfigurerAdapter.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/ConfigurerAdapter.java new file mode 100644 index 00000000..392f9ef0 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/ConfigurerAdapter.java @@ -0,0 +1,47 @@ +/* + * Copyright 2019-2020 Zheng Jie + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.nl.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import org.springframework.web.filter.CorsFilter; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +/** + * WebMvcConfigurer + * + * @author Zheng Jie + * @date 2018-11-30 + */ +@Configuration +@EnableWebMvc +public class ConfigurerAdapter implements WebMvcConfigurer { + @Bean + public CorsFilter corsFilter() { + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + CorsConfiguration config = new CorsConfiguration(); + config.setAllowCredentials(true); + config.addAllowedOrigin("*"); + config.addAllowedHeader("*"); + config.addAllowedMethod("*"); + source.registerCorsConfiguration("/**", config); + return new CorsFilter(source); + } +} diff --git a/wms_pro/qd/src/layout/components/Sidebar/Logo.vue b/wms_pro/qd/src/layout/components/Sidebar/Logo.vue index ba96c841..8c127dfe 100644 --- a/wms_pro/qd/src/layout/components/Sidebar/Logo.vue +++ b/wms_pro/qd/src/layout/components/Sidebar/Logo.vue @@ -2,11 +2,11 @@
- +

{{ title }}

- +

{{ title }}

@@ -24,6 +24,13 @@ export default { required: true } }, + data() { + return { + title: '恒森WMS系统', + logo: Logo, + title_param: 'platform' + } + }, computed: { variables() { return variables @@ -32,13 +39,6 @@ export default { return this.$store.state.settings.sideTheme } }, - data() { - return { - title: '海亮lms系统', - logo: Logo, - title_param: 'platform' - } - }, created() { this.getValueByCode(this.title_param).then(res => { this.title = res.value diff --git a/wms_pro/qd/src/views/login.vue b/wms_pro/qd/src/views/login.vue index 26ce01d4..90a02af9 100644 --- a/wms_pro/qd/src/views/login.vue +++ b/wms_pro/qd/src/views/login.vue @@ -2,7 +2,7 @@
@@ -54,14 +55,14 @@ - + 选择库存 @@ -85,19 +86,20 @@ - + - + - + @@ -116,8 +118,8 @@ @@ -129,6 +131,7 @@ import CRUD, { crud, form } from '@crud/crud' import StructAttrDialog from '@/views/wms/stor_manage/storIvtInfo/StructAttrDialog' import formstruc from '@/views/wms/config_manage/formStruc/formstruc' import crudCheck from '@/views/wms/stor_manage/warehouse/checkStorage/check' +import crudFormData from '../move/formData' const defaultForm = { id: '', @@ -145,15 +148,15 @@ const defaultForm = { update_time: '', remark: '', form_data: {}, - proc_inst_id:'' + proc_inst_id: '' } export default { name: 'AddDialog', components: { formstruc, StructAttrDialog }, mixins: [crud(), form(defaultForm)], - statusEnums: [ 'FORM_STATUS', 'IOBILL_TYPE_IN' ], - tableEnums: [ 'st_ivt_bsrealstorattr#stor_name#stor_code','bm_measure_unit#unit_name#unit_id' ], + statusEnums: ['FORM_STATUS', 'IOBILL_TYPE_IN'], + tableEnums: ['st_ivt_bsrealstorattr#stor_name#stor_code', 'bm_measure_unit#unit_name#unit_id'], props: { dialogShow: { type: Boolean, @@ -165,12 +168,12 @@ export default { }, data() { return { - cols:[], - dtlCols:[], - tableData:[], - structs:[], - endStructs:[], - currentIndex:null, + cols: [], + dtlCols: [], + tableData: [], + structs: [], + endStructs: [], + currentIndex: null, dialogVisible: false, structShow: false, structShow2: false, @@ -180,7 +183,7 @@ export default { rules: { bill_type: [ { required: true, message: '单据类型不能为空', trigger: 'blur' } - ], + ] } } }, @@ -200,24 +203,24 @@ export default { this.cols = res this.form.form_type = 'st_ivt_check' res.forEach(a => { - this.form.form_data[a.value,''] + this.form.form_data[a.value, ''] }) }) formstruc.getHeader('st_ivt_checkdtl').then(res => { this.dtlCols = res res.forEach(a => { - this.dtlCols.form_data[a.value,''] + this.dtlCols.form_data[a.value, ''] }) }) }, close() { - this.tableData = [], - this.structs = [], - this.endStructs = [], - this.crud.cancelCU() + this.tableData = [], + this.structs = [], + this.endStructs = [], + this.crud.cancelCU() this.$emit('AddChanged') }, - changeStor(stor){ + changeStor(stor) { this.stor_code = stor }, @@ -239,27 +242,20 @@ export default { this.dis_flag = true } }, - [CRUD.HOOK.beforeCrudToCU]() { - this.$refs['form'].validate((valid) => { - if (valid) { - return true - }else { - return false - } + [CRUD.HOOK.beforeToEdit]() { + // 获取入库单明细 + crudFormData.getSonFormData(this.form.id).then(res => { + this.tableData = res }) - if (this.tableData.length === 0) { - this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO) - return false - } }, submitCU() { // 提交前校验 this.$refs['form'].validate((valid) => { - if (valid) { - return true - }else { - return false - } + if (valid) { + return true + } else { + return false + } }) if (this.tableData.length === 0) { this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO) @@ -279,10 +275,10 @@ export default { tableDtlMaterial(rows) { rows.forEach((row) => { - if (this.structs.includes(row.struct_code)){ + if (this.structs.includes(row.struct_code)) { return } - const data = {} + const data = {} this.structs.push(row.struct_code) data.sect_name = row.sect_name data.sect_code = row.sect_code @@ -300,15 +296,14 @@ export default { data.form_type = 'st_ivt_checkdtl' data.form_data = {} data.end_struct_code = row.struct_code - this.dtlCols.forEach(a=>{ + this.dtlCols.forEach(a => { let item = '' if (a.value in data) { - item = data[a.value]; + item = data[a.value] } - this.$set(data.form_data,a.value,item) + this.$set(data.form_data, a.value, item) }) this.tableData.splice(-1, 0, data) - }) } }