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,71 +1,68 @@
{
  "templateName": "仓库",
  "templateName":"收据模板",
  "directories": "property",
  "templateCode": "storehouse",
  "templateKey": "shId",
  "templateKeyName": "仓库编号",
  "searchCode": "shId",
  "searchName": "仓库编号",
  "templateCode":"feePrintPage",
  "templateKey":"pageId",
  "templateKeyName":"收据ID",
  "searchCode": "pageId",
  "searchName": "收据ID",
  "conditions": [
    {
      "name": "仓库名称",
      "inputType": "input",
      "code": "shName",
      "whereCondition": "equal"
      "whereCondition": "equal",
      "code": "pageId",
      "name": "页面ID",
      "inputType": "input"
    },
    {
      "name": "仓库类型",
      "inputType": "select",
      "selectValue": "2806,2807",
      "selectValueName": "集团仓库,小区仓库",
      "code": "shType",
      "whereCondition": "equal"
      "whereCondition": "equal",
      "code": "pageName",
      "name": "名称",
      "inputType": "input"
    },
    {
      "name": "仓库编号",
      "inputType": "input",
      "code": "shId",
      "whereCondition": "equal"
      "whereCondition": "equal",
      "code": "state",
      "name": "状态",
      "inputType": "input"
    }
  ],
  "columns": [
    {
      "code": "shName",
      "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": "shType",
      "cnCode": "仓库类型",
      "desc": "必填，请选择仓库类型",
      "required": true,
      "hasDefaultValue": false,
      "inputType": "select",
      "selectValue": "2806,2807",
      "selectValueName": "集团仓库,小区仓库",
      "limit": "num",
      "limitParam": "",
      "limitErrInfo": "仓库类型格式错误",
      "show": true
      "limitParam": "30",
      "code": "communityId",
      "limitErrInfo": "小区ID不能超过30",
      "cnCode": "小区ID",
      "limit": "maxLength",
      "show": true,
      "inputType": "input",
      "required": true,
      "desc": "必填，小区ID"
    },
    {
      "code": "shDesc",
      "cnCode": "描述",
      "desc": "必填，请填写描述",
      "required": true,
      "hasDefaultValue": false,
      "inputType": "input",
      "limit": "maxLength",
      "limitParam": "512",
      "limitErrInfo": "描述太长",
      "show": true
      "code": "pageUrl",
      "limitErrInfo": "收据页面不能超过512",
      "cnCode": "收据页面",
      "limit": "maxLength",
      "show": true,
      "inputType": "input",
      "required": true,
      "desc": "必填，收据页面"
    }
  ]
}

}