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,133 +1,68 @@
{
  "templateName":"房源",
  "directories": "admin",
  "templateCode":"rentingPool",
  "templateKey":"rentingId",
  "templateKeyName":"租房ID",
  "searchCode": "rentingId",
  "searchName": "租房ID",
  "templateName":"收据模板",
  "directories": "property",
  "templateCode":"feePrintPage",
  "templateKey":"pageId",
  "templateKeyName":"收据ID",
  "searchCode": "pageId",
  "searchName": "收据ID",
  "conditions": [
    {
      "name": "租房名称",
      "inputType": "input",
      "code": "rentingTitle",
      "whereCondition": "equal"
      "whereCondition": "equal",
      "code": "pageId",
      "name": "页面ID",
      "inputType": "input"
    },
    {
      "name": "预付类型",
      "inputType": "select",
      "selectValue":"1001,2002,3003",
      "selectValueName":"押一付一,押一付三,押一付六",
      "code": "paymentType",
      "whereCondition": "equal"
      "whereCondition": "equal",
      "code": "pageName",
      "name": "名称",
      "inputType": "input"
    },
    {
      "name": "业主名称",
      "inputType": "input",
      "code": "ownerName",
      "whereCondition": "equal"
      "whereCondition": "equal",
      "code": "state",
      "name": "状态",
      "inputType": "input"
    }
  ],
  "columns":[
  "columns": [
    {
      "code": "rentingTitle",
      "cnCode":"出租标题",
      "desc":"必填，请填写出租标题",
      "required":true,
      "hasDefaultValue":false,
      "hasDefaultValue": false,
      "limitParam": "128",
      "code": "pageName",
      "limitErrInfo": "名称不能超过128",
      "cnCode": "名称",
      "limit": "maxLength",
      "show": true,
      "inputType": "input",
      "limit":"maxLength",
      "limitParam":"100",
      "limitErrInfo":"标题太长 超过100位",
      "show": true
      "required": true,
      "desc": "必填，名称"
    },
    {
      "code": "price",
      "cnCode":"租金",
      "desc":"必填，请填写出租金",
      "required":true,
      "hasDefaultValue":false,
      "hasDefaultValue": false,
      "limitParam": "30",
      "code": "communityId",
      "limitErrInfo": "小区ID不能超过30",
      "cnCode": "小区ID",
      "limit": "maxLength",
      "show": true,
      "inputType": "input",
      "limit":"money",
      "limitParam":"",
      "limitErrInfo":"格式错误",
      "show": true
      "required": true,
      "desc": "必填，小区ID"
    },
    {
      "inputType": "select",
      "selectValue":"1001,2002,3003",
      "selectValueName":"押一付一,押一付三,押一付六",
      "code": "paymentType",
      "cnCode":"预付类型",
      "desc":"必填，请填写值",
      "required":true,
      "hasDefaultValue":false,
      "limit":"num",
      "limitParam":"",
      "limitErrInfo":"格式错误",
      "show": true
    },
    {
      "code": "checkInDate",
      "cnCode":"入住时间",
      "desc":"必填，请填写入住时间",
      "required":true,
      "hasDefaultValue":false,
      "hasDefaultValue": false,
      "limitParam": "512",
      "code": "pageUrl",
      "limitErrInfo": "收据页面不能超过512",
      "cnCode": "收据页面",
      "limit": "maxLength",
      "show": true,
      "inputType": "input",
      "limit":"date",
      "limitParam":"",
      "limitErrInfo":"格式错误",
      "show": true
    },
    {
      "code":"rentingConfigId",
      "cnCode":"出租配置",
      "desc":"必填，请选择出租配置",
      "required":true,
      "hasDefaultValue":false,
      "inputType": "select",
      "selectValue":"1001,2002",
      "selectValueName":"出租配置,每月租金比例",
      "limit":"num",
      "limitParam":"",
      "limitErrInfo":"显示格式错误",
      "show": true
    },
    {
      "code": "rentingDesc",
      "cnCode":"备注",
      "desc":"选填，请填写租客收费比率",
      "required":false,
      "hasDefaultValue":false,
      "inputType": "input",
      "limit":"maxLength",
      "limitParam":"500",
      "limitErrInfo":"备注格式错误",
      "show": false
    },
    {
      "code": "ownerName",
      "cnCode":"业主名称",
      "desc":"必填，请填写业主名称",
      "required":true,
      "hasDefaultValue":false,
      "inputType": "input",
      "limit":"maxLength",
      "limitParam":"100",
      "limitErrInfo":"业主名称太长",
      "show": true
    },
    {
      "code": "ownerTel",
      "cnCode":"业主电话",
      "desc":"必填，请填写业主电话",
      "required":true,
      "hasDefaultValue":false,
      "inputType": "input",
      "limit":"phone",
      "limitParam":"",
      "limitErrInfo":"业主电话格式错误",
      "show": true
      "required": true,
      "desc": "必填，收据页面"
    }
  ]
}

}