update

gsb-marketplat/app/base/controller/impl/configmag/formitemCtl.js

@@ -19,6 +19,7 @@ class FormItemCtl extends CtlBase {
         return result;
         return result;
     }
     }
 
 
+
     /**
     /**
      * 重写删除
      * 重写删除
      * @param pobj
      * @param pobj
@@ -28,6 +29,7 @@ class FormItemCtl extends CtlBase {
         let result = this.formitemSve.deleteItem(pobj);
         let result = this.formitemSve.deleteItem(pobj);
         return result;
         return result;
     }
     }
+
 }
 }
 
 
 module.exports = FormItemCtl;
 module.exports = FormItemCtl;

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

@@ -25,10 +25,10 @@ module.exports = (db, DataTypes) => {
             type: DataTypes.JSON
             type: DataTypes.JSON
         },
         },
         is_enabled: {//显示状态
         is_enabled: {//显示状态
-            type: DataTypes.INTEGER
+            type: DataTypes.BOOLEAN
         },
         },
         is_required: {//是否必填
         is_required: {//是否必填
-            type: DataTypes.INTEGER
+            type: DataTypes.BOOLEAN
         },
         },
         sequence: {//次序
         sequence: {//次序
             type: DataTypes.INTEGER
             type: DataTypes.INTEGER

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

@@ -26,6 +26,7 @@ class ForminfoService extends ServiceBase {
      * @returns {Promise<void>}
      * @returns {Promise<void>}
      */
      */
     async createForm(pobj){
     async createForm(pobj){
+        console.log(pobj)
         if(!pobj.name){
         if(!pobj.name){
             return system.getResult(null,'name can not be empty');
             return system.getResult(null,'name can not be empty');
         }
         }
@@ -33,15 +34,10 @@ class ForminfoService extends ServiceBase {
             return system.getResult(null,'form_describe can not be empty');
             return system.getResult(null,'form_describe can not be empty');
         }
         }
         let code = await this.getBusUid("fm")
         let code = await this.getBusUid("fm")
-        let formData = {
-            name:pobj.name,
-            code:code,
-            form_describe:pobj.form_describe,
-            form_item:formItem.data,
-            user_id:pobj.user_id,
-            user_name:pobj.username
-        }
-        let result = await this.create(formData);
+        pobj.code = code;
+        pobj.user_id = pobj.userid;
+        pobj.user_name = pobj.username;
+        let result = await this.create(pobj)
         return system.getResult(result);
         return system.getResult(result);
     }
     }
     /**
     /**
@@ -50,7 +46,12 @@ class ForminfoService extends ServiceBase {
      * @returns {Promise<void>}
      * @returns {Promise<void>}
      */
      */
     async updateForm(pobj) {
     async updateForm(pobj) {
-        return null;
+        let upData = {
+            name:pobj.name,
+            form_describe: pobj.form_describe
+        }
+        let result = await this.updateByWhere(upData,{id:pobj.id})
+        return system.getResult(result);
     }
     }
 
 
     async getFormList (pobj) {
     async getFormList (pobj) {

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

@@ -15,20 +15,15 @@ class FormitemService extends ServiceBase {
      * @returns {Promise<void>}
      * @returns {Promise<void>}
      */
      */
     async createItem(pobj) {
     async createItem(pobj) {
-        let type_name = await this.getTypeName(pobj.item_type);
         let code = await this.getBusUid('it');
         let code = await this.getBusUid('it');
-        pobj.item_type_name = type_name;
-        pobj.is_enabled = pobj.is_enabled ? 1:0;
-        pobj.is_required = pobj.is_required ? 1:0;
+        pobj.item_type_name = pobj.item_type_name;
         pobj.code = code;
         pobj.code = code;
-        console.log(pobj)
         //获取表单的表单项
         //获取表单的表单项
         let form = await this.forminfoSve.findOne({id:pobj.form_id},['form_items']);
         let form = await this.forminfoSve.findOne({id:pobj.form_id},['form_items']);
-        console.log(form)
         if(!form){
         if(!form){
             return system.getResult(null,'获取订单信息失败');
             return system.getResult(null,'获取订单信息失败');
         }
         }
-        let form_items = form.form_items ? form.form_items + "、" + type_name : type_name;
+        let form_items = form.form_items ? form.form_items + "、" + pobj.item_type_name : pobj.item_type_name;
         //修改表单项字段
         //修改表单项字段
         this.forminfoSve.updateByWhere({form_items:form_items},{id:pobj.form_id});
         this.forminfoSve.updateByWhere({form_items:form_items},{id:pobj.form_id});
         //保存表单项
         //保存表单项
@@ -50,20 +45,23 @@ class FormitemService extends ServiceBase {
         if(!form){
         if(!form){
             return system.getResult(null,'获取表单失败');
             return system.getResult(null,'获取表单失败');
         }
         }
-        let form_items = form.form_items.replace('、'+item.item_type_name,'');
+        let form_items = '';
+        if(form.form_items){
+            form_items = form.form_items.replace('、'+item.item_type_name,'');
+        }
         this.forminfoSve.updateByWhere({form_items:form_items},{id:item.form_id});
         this.forminfoSve.updateByWhere({form_items:form_items},{id:item.form_id});
         let result = await this.delete(pobj);
         let result = await this.delete(pobj);
         return system.getResult(result);
         return system.getResult(result);
     }
     }
 
 
     /**
     /**
-     *
+     * 修改表表单项
      * @param pobj
      * @param pobj
      * @returns {Promise<void>}
      * @returns {Promise<void>}
      */
      */
-    async updateForm(pobj) {
-
-        return null;
+    async updateItem(pobj) {
+        let upResult = await this.update(pobj);
+        return system.getResult(upResult);
     }
     }
 
 
     //根据类型获取类型名称
     //根据类型获取类型名称