Commit 94a36ef4 by 任晓松

update

parent 7582ba73
...@@ -12,9 +12,10 @@ module.exports = (db, DataTypes) => { ...@@ -12,9 +12,10 @@ module.exports = (db, DataTypes) => {
form_describe: DataTypes.STRING, form_describe: DataTypes.STRING,
notes: DataTypes.STRING, notes: DataTypes.STRING,
user_id: DataTypes.STRING(100), user_id: DataTypes.STRING(100),
user_name: DataTypes.STRING(100), //user_name 用户名称 user_name: DataTypes.STRING(100),
company_id: DataTypes.INTEGER(11), company_id: DataTypes.INTEGER(11),
record_num:DataTypes.INTEGER(11) record_num:DataTypes.INTEGER(11),
form_table:DataTypes.JSON
}, { }, {
paranoid: true,//假的删除 paranoid: true,//假的删除
underscored: true, underscored: true,
......
...@@ -49,8 +49,8 @@ class ForminfoService extends ServiceBase { ...@@ -49,8 +49,8 @@ class ForminfoService extends ServiceBase {
} }
upData.form_items = form_items; upData.form_items = form_items;
//组装form表单 //组装form表单
// let form = await this.packageForm(itemData); let form = await this.packageForm(itemData);
upData.form_table = form;
let result = await this.updateByWhere(upData,{id:pobj.id}) let result = await this.updateByWhere(upData,{id:pobj.id})
return system.getResult(result); return system.getResult(result);
} }
...@@ -62,35 +62,62 @@ class ForminfoService extends ServiceBase { ...@@ -62,35 +62,62 @@ class ForminfoService extends ServiceBase {
"singleBtn": "radiogroup", "singleBtn": "radiogroup",
"multipleBtn": "checkgroup", "multipleBtn": "checkgroup",
"downOptions": "dic-select", "downOptions": "dic-select",
"singleText": "textarea", "singleText": "input",
"multipleText": "textarea", "multipleText": "textarea",
"dateTime": "datetime", "dateTime": "datetime",
"area": "省市" "area": "tree-sel"//忽略 4
} }
let form = {}; let form = {};
let ctls = []; let ctls = [];
if(items.length>0){ if(items.length>0){
items.forEach(item=>{ items.forEach(item=>{
console.log(item.config_params) let ctl = {}
let ctl = { "type": `${data[item.item_type_name]}`, "label": "名称",options:'ddd,,dd,,dd' ,"prop": "name",rules: [{ "required": true, "message": ' ', "trigger": 'blur' },] } ctl['type'] = data[item.item_type];
ctl['type'] = data[item.item_type_name];
ctl['label'] = item.name; ctl['label'] = item.name;
ctl['prop'] = item.item_type; ctl['prop'] = item.item_type;
ctl['rules'] = //单选框 多选框 下拉选项 添加options属性 结构为 a,b,c
ctls.push(); if(['singleBtn','multipleBtn','downOptions'].includes(item.item_type) && item.config_params){
ctl['options'] = item.config_params.options
}
//校验
let rules = [{ "required": true, "message": ' ', "trigger": 'blur' }];
//单行文本 多行文本 增加校验项 有最小和最大值
if(['singleText','multipleText'].includes(item.item_type)){
let rule = { "validator": "validatex", "trigger": "blur","minchars":item.config_params.input_length[0],"maxchars":item.config_params.input_length[1]}
rules.push(rule)
}
//手机号选项 增加校验项 有最大最小值
if('phone'== item.item_type){
let param = item.config_params;
let minchars,maxchars = 11;
if(param.mobile_input_length == 2){
minchars = 7;
maxchars = 11;
}
let rule = { "validator": "validatex", "trigger": "blur","minchars":minchars,"maxchars":maxchars}
rules.push(rule);
}
//省市选项 增加 ignorelevel属性 忽略区县为4,不忽略为5
if('area' == item.item_type){
let param = item.config_params;
if(param.is_show_county == 0){
ctl['ignorelevel'] = 4;
}else{
ctl['ignorelevel'] = 5;
}
}
ctl['rules'] = rules;
ctls.push(ctl);
}) })
//组装form 格式表单
form = { form = {
name: "xxx", name: "xxx",
main: [ main: [
{ {
"title": "表单信息", "title": "表单信息",
cols:1, cols:1,
ctls: [ ctls: ctls
{ "type": "input", "label": "名称",options:'ddd,,dd,,dd' ,"prop": "name","style": "padding-left:6px",rules: [{ "required": true, "message": ' ', "trigger": 'blur' },] },
{ "type": "dic-select", "label": "类型", options:"","prop": "item_type", "placeHolder": "选择类型",dicName:"control_type","style": "width:100%",isMulti:false,rules: [{ "required": true, "message": ' ', "trigger": 'blur' },] },
{ "type": "input", "label": "排序", "prop": "sequence","style": "padding-left:6px",rules: [{ "required": true, "message": ' ', "trigger": 'blur' },] },
]
} }
] ]
} }
......
...@@ -43,13 +43,13 @@ class FormitemService extends ServiceBase { ...@@ -43,13 +43,13 @@ class FormitemService extends ServiceBase {
let config_params = {}; let config_params = {};
switch (pobj.item_type) { switch (pobj.item_type) {
case "phone": case "phone":
config_params["mobile_input_length"]=pobj.mobile_input_length; config_params["mobile_input_length"]=pobj.mobile_input_length =="specific" ?1:2;
config_params["verify_sms"]=pobj.verify_sms; config_params["verify_sms"]=pobj.verify_sms==true?1:0;
break; break;
case "singleBtn": case "singleBtn":
case "multipleBtn": case "multipleBtn":
case "downOptions": case "downOptions":
config_params["options"] = pobj.options.split(','); config_params["options"] = pobj.options;
break; break;
case "singleText": case "singleText":
case "multipleText": case "multipleText":
...@@ -59,10 +59,10 @@ class FormitemService extends ServiceBase { ...@@ -59,10 +59,10 @@ class FormitemService extends ServiceBase {
config_params["input_length"] = length; config_params["input_length"] = length;
break; break;
case "dateTime": case "dateTime":
config_params["date_type"] = pobj.date_type; config_params["date_type"] = pobj.date_type == "specific" ? 1 : 2;
config_params["date_accuracy"] = pobj.date_type; config_params["date_accuracy"] = pobj.date_type == "day" ? 1 : 2;
config_params["date_shield_type"] = pobj.date_type; config_params["date_shield_type"] = pobj.date_shield_type == "default" ? 1 : 2;
config_params["shield_date"] = pobj.dshield_date.split(','); config_params["shield_date"] = pobj.shield_date;
break; break;
case "area": case "area":
config_params["is_show_county"] = pobj.is_show_county; config_params["is_show_county"] = pobj.is_show_county;
......
...@@ -23,7 +23,7 @@ class FormsubmitrecordService extends ServiceBase { ...@@ -23,7 +23,7 @@ class FormsubmitrecordService extends ServiceBase {
} }
var pageIndex = Number(pobj.pageInfo.pageNo || 1); var pageIndex = Number(pobj.pageInfo.pageNo || 1);
var from = pageIndex == 1 ? 0 : Number((pageIndex - 1) * pageSize); var from = pageIndex == 1 ? 0 : Number((pageIndex - 1) * pageSize);
let sql = `select record.created_at,info.user_name name,info.notes,record.record_status_name from c_form_submit_record record left join c_form_info info on info.id = record.form_id where info.deleted_at is NULL`; let sql = `select record.id,record.created_at,info.user_name name,info.notes,record.record_status_name from c_form_submit_record record left join c_form_info info on info.id = record.form_id where info.deleted_at is NULL`;
let countSql = `select count(*) count from c_form_submit_record record left join c_form_info info on info.id = record.form_id where info.deleted_at is NULL`; let countSql = `select count(*) count from c_form_submit_record record left join c_form_info info on info.id = record.form_id where info.deleted_at is NULL`;
if(pobj.record_status_name){ if(pobj.record_status_name){
sql += ` AND record.record_status_name = '${pobj.record_status_name}'` sql += ` AND record.record_status_name = '${pobj.record_status_name}'`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment