diff --git a/config/index.js b/config/index.js index fc1ff45..2d439f8 100644 --- a/config/index.js +++ b/config/index.js @@ -10,7 +10,7 @@ module.exports = { assetsSubDirectory: '', assetsPublicPath: '/', proxyTable: { - /** + '/api/m1/form': { target: 'http://localhost:7013', changeOrigin: true, @@ -18,7 +18,7 @@ module.exports = { '^/api/m1/form': '/form' } }, - + /** '/api/m1/xm': { target: 'http://localhost:7067', changeOrigin: true, diff --git a/src/api/mdp/form/formField.js b/src/api/mdp/form/formField.js index e57ffef..1abb615 100644 --- a/src/api/mdp/form/formField.js +++ b/src/api/mdp/form/formField.js @@ -14,6 +14,9 @@ let base = config.getFormContext(); //普通查询 条件之间and关系 export const listFormField = params => { return axios.get(`${base}/mdp/form/formField/list`, { params: params }); }; +//查询数据库表的字段列表 +export const listTableColumn = params => { return axios.get(`${base}/mdp/dev/db/table/column/list`, { params: params }); }; + //模糊查询表单字段定义 条件之间or关系 //export const listFormFieldKey = params => { return axios.get(`${base}/mdp/form/formField/listKey`, { params: params }); }; diff --git a/src/views/mdp/form/formDef/Index.vue b/src/views/mdp/form/formDef/Index.vue index 4259b06..5ceab66 100644 --- a/src/views/mdp/form/formDef/Index.vue +++ b/src/views/mdp/form/formDef/Index.vue @@ -312,7 +312,7 @@ export default { toDesignAdd(){ if(!this.$route.params.expandId){ - this.$router.push({path:'/mdp/form/design/'}) + this.$router.push({path:'/mdp/form/create'}) }else{ this.$router.push({path:'/mdp/form/design/'+this.$route.params.expandId}) } diff --git a/src/views/mdp/form/formField/Index.vue b/src/views/mdp/form/formField/Index.vue index 8a5444a..a592040 100644 --- a/src/views/mdp/form/formField/Index.vue +++ b/src/views/mdp/form/formField/Index.vue @@ -90,17 +90,29 @@ - + 使用本系统登陆的token - + + + + + + + + if(res.data.tips.isOk){
+   return res.data.data;
+ }else{
+   return null;
+ }
+
关闭 - 确定 + 确定 @@ -115,265 +127,373 @@