form

gsb-marketplat/app/base/db/models/configmag/formsubmitrecord.js

@@ -22,6 +22,7 @@ module.exports = (db, DataTypes) => {
         templatelink_snapshot:DataTypes.JSON,//模板链接快照
         templatelink_snapshot:DataTypes.JSON,//模板链接快照
         record_content:DataTypes.JSON,//记录内容
         record_content:DataTypes.JSON,//记录内容
         push_status:DataTypes.INTEGER,//推送状态 0：未推送，1：已推送  2：异常
         push_status:DataTypes.INTEGER,//推送状态 0：未推送，1：已推送  2：异常
+        op_notes:DataTypes.STRING,//操作备注
     }, {
     }, {
         paranoid: true,//假的删除
         paranoid: true,//假的删除
         underscored: true,
         underscored: true,

gsb-marketplat/app/base/service/impl/configmag/forminfoSve.js

@@ -21,7 +21,12 @@ class ForminfoService extends ServiceBase {
         if(!pobj.form_describe){
         if(!pobj.form_describe){
             return system.getResultFail(-1,'表单描述不能为空');
             return system.getResultFail(-1,'表单描述不能为空');
         }
         }
-
+        var checkFormInfo = await this.dao.model.findOne({
+            where:{name:pobj.name},raw:true
+        });
+        if(checkFormInfo && checkFormInfo.id){
+            return system.getResultFail(-300,'表单名称重复，操作失败');
+        }
         let code = await this.getBusUid("fm")
         let code = await this.getBusUid("fm")
         pobj.code = code;
         pobj.code = code;
         pobj.user_id = pobj.userid;
         pobj.user_id = pobj.userid;
@@ -95,6 +100,12 @@ class ForminfoService extends ServiceBase {
             name:pobj.name,
             name:pobj.name,
             form_describe: pobj.form_describe
             form_describe: pobj.form_describe
         }
         }
+        var checkFormInfo = await this.dao.model.findOne({
+            where:{name:pobj.name},raw:true
+        });
+        if(checkFormInfo && checkFormInfo.id){
+            return system.getResultFail(-300,'表单名称重复，操作失败');
+        }
         let template = await this.templateDao.findOne({form_id:pobj.id},[]);
         let template = await this.templateDao.findOne({form_id:pobj.id},[]);
         if(template && template.is_enabled == 1){
         if(template && template.is_enabled == 1){
             return system.getResultFail(-1,'表单已投入使用，不能修改')
             return system.getResultFail(-1,'表单已投入使用，不能修改')
@@ -182,7 +193,8 @@ class ForminfoService extends ServiceBase {
                             minchars = 7;
                             minchars = 7;
                             maxchars = 11;
                             maxchars = 11;
                         }
                         }
-                        let rule = { "validator": "validatex", "trigger": "blur","minchars":minchars,"maxchars":maxchars}
+                        let rule = { "validator": "validatex", "trigger": "blur","minchars":minchars,"maxchars":maxchars};
+                        rule["verifysms"] = param.verify_sms || 0;
                         rules.push(rule);
                         rules.push(rule);
                     }
                     }
                     //省市选项 增加 ignorelevel属性 忽略区县为4，不忽略为5
                     //省市选项 增加 ignorelevel属性 忽略区县为4，不忽略为5

gsb-marketplat/app/base/service/impl/configmag/formsubmitrecordSve.js

@@ -65,7 +65,11 @@ class FormsubmitrecordService extends ServiceBase {
             template_id:linkInfo.template_id,templatelink_id:linkInfo.id,
             template_id:linkInfo.template_id,templatelink_id:linkInfo.id,
             form_id:forminfo.id,record_status:1,templatelink_snapshot:linkInfo,
             form_id:forminfo.id,record_status:1,templatelink_snapshot:linkInfo,
             form_snapshot:{forminfo:forminfo,formitems:formitems},
             form_snapshot:{forminfo:forminfo,formitems:formitems},
-            record_content:params,business_code:templateinfo.business_code
+            record_content:params,business_code:templateinfo.business_code,
+            push_status:0
+        }
+        if(ab.push_status==1){
+            addObj.push_status=1;
         }
         }
         await this.dao.create(addObj);//创建记录
         await this.dao.create(addObj);//创建记录
         return system.getResultSuccess();
         return system.getResultSuccess();