Merge branch 'master' into wangfy-dev

wfy

2021-09-18 0417d31de9980cbc1735daffffb308d050ce35b4

 java110-generator/src/main/resources/web/template_1.json

old mode 100644
new mode 100755
@@ -1,103 +1,68 @@
{
  "templateName": "房屋装修",
  "templateName":"收据模板",
  "directories": "property",
  "templateCode": "roomRenovation",
  "templateKey": "rId",
  "templateKeyName": "装修ID",
  "searchCode": "rId",
  "searchName": "装修ID",
  "templateCode":"feePrintPage",
  "templateKey":"pageId",
  "templateKeyName":"收据ID",
  "searchCode": "pageId",
  "searchName": "收据ID",
  "conditions": [
    {
      "name": "房屋名称",
      "inputType": "input",
      "code": "roomName",
      "whereCondition": "equal"
      "whereCondition": "equal",
      "code": "pageId",
      "name": "页面ID",
      "inputType": "input"
    },
    {
      "name": "联系人",
      "inputType": "input",
      "code": "personName",
      "whereCondition": "equal"
      "whereCondition": "equal",
      "code": "pageName",
      "name": "名称",
      "inputType": "input"
    },
    {
      "name": "联系电话",
      "inputType": "input",
      "code": "personTel",
      "whereCondition": "equal"
      "whereCondition": "equal",
      "code": "state",
      "name": "状态",
      "inputType": "input"
    }
  ],
  "columns": [
    {
      "code": "roomName",
      "cnCode": "房屋",
      "desc": "必填，请填写房屋",
      "required": true,
      "hasDefaultValue": false,
      "inputType": "input",
      "limitParam": "128",
      "code": "pageName",
      "limitErrInfo": "名称不能超过128",
      "cnCode": "名称",
      "limit": "maxLength",
      "limitParam": "64",
      "limitErrInfo": "房屋格式错误",
      "show": true
      "show": true,
      "inputType": "input",
      "required": true,
      "desc": "必填，名称"
    },
    {
      "code": "personName",
      "cnCode": "联系人",
      "desc": "必填，请填写联系人",
      "required": true,
      "hasDefaultValue": false,
      "inputType": "input",
      "limitParam": "30",
      "code": "communityId",
      "limitErrInfo": "小区ID不能超过30",
      "cnCode": "小区ID",
      "limit": "maxLength",
      "limitParam": "64",
      "limitErrInfo": "联系人格式错误",
      "show": true
    },
    {
      "code": "personTel",
      "cnCode": "联系电话",
      "desc": "选填，请填写联系电话",
      "show": true,
      "inputType": "input",
      "required": true,
      "hasDefaultValue": false,
      "inputType": "input",
      "limit": "num",
      "limitParam": "",
      "limitErrInfo": "联系电话错误",
      "show": true
      "desc": "必填，小区ID"
    },
    {
      "code": "startTime",
      "cnCode": "装修时间",
      "desc": "选填，请选择装修时间",
      "required": true,
      "hasDefaultValue": false,
      "inputType": "input",
      "limit": "date",
      "limitParam": "",
      "limitErrInfo": "装修时间错误",
      "show": true
    },
    {
      "code": "endTime",
      "cnCode": "结束时间",
      "desc": "必填，请选择结束时间",
      "required": true,
      "hasDefaultValue": false,
      "inputType": "input",
      "limit": "date",
      "limitParam": "",
      "limitErrInfo": "结束时间错误",
      "show": true
    },
    {
      "code": "remark",
      "cnCode": "备注",
      "desc": "必填，请选择备注",
      "required": false,
      "hasDefaultValue": false,
      "inputType": "input",
      "limit": "maxLength",
      "limitParam": "512",
      "limitErrInfo": "备注太长",
      "show": false
      "code": "pageUrl",
      "limitErrInfo": "收据页面不能超过512",
      "cnCode": "收据页面",
      "limit": "maxLength",
      "show": true,
      "inputType": "input",
      "required": true,
      "desc": "必填，收据页面"
    }
  ]
}

}