form

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

@@ -156,7 +156,7 @@ class ForminfoService extends ServiceBase {
         let ctls = [];
         let ctls = [];
         if(items.length>0){
         if(items.length>0){
             items.forEach(item=>{
             items.forEach(item=>{
-                if(item.is_enabled === 1){
+                if(item.is_enabled == 1){
                     let ctl = {}
                     let ctl = {}
                     ctl['type'] = data[item.item_type];
                     ctl['type'] = data[item.item_type];
                     ctl['label'] = item.name;
                     ctl['label'] = item.name;
@@ -194,7 +194,7 @@ class ForminfoService extends ServiceBase {
                         ctl['archName']= 'regionJSON';
                         ctl['archName']= 'regionJSON';
                         ctl['rootName'] = '全国区域';
                         ctl['rootName'] = '全国区域';
                     }
                     }
-                    if(item.is_required ===1){
+                    if(item.is_required ==1){
                         ctl['rules'] = rules;
                         ctl['rules'] = rules;
                     }
                     }
                     ctls.push(ctl);
                     ctls.push(ctl);

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

@@ -14,7 +14,7 @@ class FormitemService extends ServiceBase {
         }
         }
         var list = await this.dao.model.findAll({
         var list = await this.dao.model.findAll({
             attributes:[["code","key"],["name","title"]],
             attributes:[["code","key"],["name","title"]],
-            where:{form_id:pobj.form_id},
+            where:{form_id:pobj.form_id,is_enabled:1},
             raw:true,
             raw:true,
             order:[["sequence","asc"]]
             order:[["sequence","asc"]]
         });
         });

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

@@ -53,7 +53,7 @@ class FormsubmitrecordService extends ServiceBase {
         }
         }
         //获取表单项
         //获取表单项
         var formitems = await this.formitemDao.model.findAll({
         var formitems = await this.formitemDao.model.findAll({
-            where:{form_id:ab.form_id},raw:true
+            where:{form_id:ab.form_id},raw:true,order:[["sequence","asc"]]
         });
         });
         //校验封装参数
         //校验封装参数
         var res = await this.checkAndPackageFormItems(formitems,ab);
         var res = await this.checkAndPackageFormItems(formitems,ab);
@@ -83,7 +83,7 @@ class FormsubmitrecordService extends ServiceBase {
             if(item && item.code && item.is_enabled){//显示状态的表单项
             if(item && item.code && item.is_enabled){//显示状态的表单项
                 var value = ab[item.code];
                 var value = ab[item.code];
                 if(item.is_required===1){//必填
                 if(item.is_required===1){//必填
-                    if(!ab[item.code]){
+                    if(!ab[item.code] || ab[item.code].length<1){
                         return system.getResultFail(-100,item.name+"参数不能为空");
                         return system.getResultFail(-100,item.name+"参数不能为空");
                     }
                     }
                 }
                 }