From 53a3420d9eb9bf13adb2b6610a3104c888367b5a Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Wed, 7 Aug 2024 14:33:08 +0800
Subject: [PATCH] month

---
 .../YysRequisitionReportConstant.java         |   2 +-
 .../views/yys/yysrequisitionreport/form.vue   |  11 +-
 .../views/yys/yysrequisitionreport/index.vue  | 873 +++++++++---------
 3 files changed, 425 insertions(+), 461 deletions(-)

diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysrequisitionreport/YysRequisitionReportConstant.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysrequisitionreport/YysRequisitionReportConstant.java
index 71c6690..2f3f9f5 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysrequisitionreport/YysRequisitionReportConstant.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysrequisitionreport/YysRequisitionReportConstant.java
@@ -21,7 +21,7 @@ public class YysRequisitionReportConstant{
     /** 整个表单配置json */
     public static final String  getFormData(){
         StringBuilder sb = new StringBuilder();
-sb.append("{\"popupType\":\"fullScreen\",\"idGlobal\":117,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":true,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":true,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":true,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722921768594,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"生产日期\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"yyyy-MM-dd\",\"__vModel__\":\"manufactureTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择生产日期\",\"type\":\"date\"},{\"popupType\":\"dialog\",\"hasPage\":false,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"设备编码\",\"value\":\"device_code\"},{\"label\":\"设备名称\",\"value\":\"device_name\"},{\"label\":\"设备类型\",\"value\":\"device_desc\"}],\"templateJson\":[],\"relationField\":\"device_name\",\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"设备编码\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722921879802,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":8},\"popupTitle\":\"选择数据\",\"__vModel__\":\"deviceCode\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择设备编码\",\"interfaceId\":\"590497496266971845\",\"interfaceName\":\"查询所有已启用设备\",\"popupWidth\":\"800px\",\"propsValue\":\"device_code\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"设备名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722922365913,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"deviceName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":true,\"placeholder\":\"选择设备后自动带入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":106,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":1,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"顺序号\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722922427003,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":1,\"__vModel__\":\"sort\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"顺序号\",\"controlsPosition\":\"right\",\"addonBefore\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":107,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班次\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722922468367,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"options\":[{\"fullName\":\"旺季白班\",\"id\":\"1\"},{\"fullName\":\"旺季晚班\",\"id\":\"2\"}],\"multiple\":false,\"__vModel__\":\"post\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择班次\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722922515552,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":109,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"开始时间\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"HH:mm\",\"__vModel__\":\"startTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择开始时间\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722922546956,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":110,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"结束时间\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"HH:mm\",\"__vModel__\":\"endTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择结束时间\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":111,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"产品编码\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722922594238,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"productCode\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入产品编码\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":112,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"产品名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722922606105,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":true,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"productName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入产品名称\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":113,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"规格型号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722922619554,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"model\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入规格型号\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":114,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"当班领用\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722922638116,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"duty\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入当班领用\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":117,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"本班结存\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_requisition_report\",\"renderKey\":1723009615308,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"classBalance\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入本班结存\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"span\":24}");        return sb.toString();
+sb.append("{\"popupType\":\"fullScreen\",\"idGlobal\":117,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":true,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":true,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":true,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722921768594,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"生产日期\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"yyyy-MM-dd\",\"__vModel__\":\"manufactureTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择生产日期\",\"type\":\"date\"},{\"popupType\":\"dialog\",\"hasPage\":false,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"设备编码\",\"value\":\"device_code\"},{\"label\":\"设备名称\",\"value\":\"device_name\"},{\"label\":\"设备类型\",\"value\":\"device_desc\"}],\"templateJson\":[],\"relationField\":\"device_code\",\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"设备编码\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722921879802,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":8},\"popupTitle\":\"选择数据\",\"__vModel__\":\"deviceCode\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择设备编码\",\"interfaceId\":\"590497496266971845\",\"interfaceName\":\"查询所有已启用设备\",\"popupWidth\":\"800px\",\"propsValue\":\"device_code\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"设备名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722922365913,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"deviceName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":true,\"placeholder\":\"选择设备后自动带入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":106,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":1,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"顺序号\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722922427003,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":1,\"__vModel__\":\"sort\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"顺序号\",\"controlsPosition\":\"right\",\"addonBefore\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":107,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班次\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722922468367,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"options\":[{\"fullName\":\"旺季白班\",\"id\":\"1\"},{\"fullName\":\"旺季晚班\",\"id\":\"2\"}],\"multiple\":false,\"__vModel__\":\"post\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择班次\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722922515552,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":109,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"开始时间\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"HH:mm\",\"__vModel__\":\"startTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择开始时间\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722922546956,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":110,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"结束时间\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"HH:mm\",\"__vModel__\":\"endTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择结束时间\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":111,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"产品编码\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722922594238,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"productCode\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入产品编码\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":112,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"产品名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722922606105,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":true,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"productName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入产品名称\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":113,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"规格型号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722922619554,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"model\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入规格型号\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":114,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"当班领用\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_requisition_report\",\"renderKey\":1722922638116,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"duty\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入当班领用\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":117,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"本班结存\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_requisition_report\",\"renderKey\":1723009615308,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"classBalance\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入本班结存\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"span\":24}");        return sb.toString();
     }
     /** 列表字段配置json */
     public static final String  getColumnData(){
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysrequisitionreport/form.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysrequisitionreport/form.vue
index 2b7a2ec..d87718d 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysrequisitionreport/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysrequisitionreport/form.vue
@@ -48,10 +48,11 @@
                                 <JnpfPopupSelect v-model="dataForm.deviceCode" @change="changeData('deviceCode', -1)"
                                     :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.deviceCode"
                                     placeholder="请选择设备编码" propsValue="device_code" popupWidth="800px" popupTitle="选择数据"
-                                    popupType="dialog" relationField='device_name' field='deviceCode'
+                                    popupType="dialog" relationField='device_code' field='deviceCode'
                                     interfaceId="590497496266971845" :pageSize="20"
                                     :columnOptions="deviceCodecolumnOptions" clearable :style='{ "width": "100%" }'>
                                 </JnpfPopupSelect>
+
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
@@ -319,6 +320,14 @@ export default {
             this.$emit('refreshDataList', true)
         },
         changeData(model, index) {
+            if (model == 'deviceCode' && this.dataForm.deviceCode != undefined) {
+                request({
+                    url: '/api/example/YysDevice/queryNameByCode/' + this.dataForm.deviceCode,
+                    method: 'get'
+                }).then(res => {
+                    this.dataForm.deviceName = res.msg;
+                });
+            }
             this.isEdit = false
             this.childIndex = index
             let modelAll = model.split("-");
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysrequisitionreport/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysrequisitionreport/index.vue
index c5781ad..2b5704f 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysrequisitionreport/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysrequisitionreport/index.vue
@@ -1,50 +1,42 @@
-
-
-
-
-
-
-
 <template>
     <div class="JNPF-common-layout">
         <div class="JNPF-common-layout-center">
             <el-row class="JNPF-common-search-box" :gutter="16">
                 <el-form @submit.native.prevent>
-                            <el-col :span="6">
-                                <el-form-item label="生产日期">
-                                        <JnpfDateRangePicker v-model="query.manufactureTime"
-                                                             format="yyyy-MM-dd" startPlaceholder="开始日期"
-                                                             endPlaceholder="结束日期" >
-                                        </JnpfDateRangePicker>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="产品编码">
-                                        <el-input v-model="query.productCode" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="产品名称">
-                                        <el-input v-model="query.productName" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                        <template v-if="showAll">
-                                    <el-col :span="6">
-                                        <el-form-item label="设备名称">
-                                                <el-input v-model="query.deviceName" placeholder="请输入" clearable>  </el-input>
-                                        </el-form-item>
-                                    </el-col>
-                        </template>
+                    <el-col :span="6">
+                        <el-form-item label="生产日期">
+                            <JnpfDateRangePicker v-model="query.manufactureTime" format="yyyy-MM-dd"
+                                startPlaceholder="开始日期" endPlaceholder="结束日期">
+                            </JnpfDateRangePicker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="产品编码">
+                            <el-input v-model="query.productCode" placeholder="请输入" clearable> </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="产品名称">
+                            <el-input v-model="query.productName" placeholder="请输入" clearable> </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <template v-if="showAll">
+                        <el-col :span="6">
+                            <el-form-item label="设备名称">
+                                <el-input v-model="query.deviceName" placeholder="请输入" clearable> </el-input>
+                            </el-form-item>
+                        </el-col>
+                    </template>
                     <el-col :span="6">
                         <el-form-item>
                             <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
                             <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                                <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
-                                    展开
-                                </el-button>
-                                <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
-                                    收起
-                                </el-button>
+                            <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
+                                展开
+                            </el-button>
+                            <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
+                                收起
+                            </el-button>
                         </el-form-item>
                     </el-col>
                 </el-form>
@@ -52,483 +44,446 @@
             <div class="JNPF-common-layout-main JNPF-flex-main">
                 <div class="JNPF-common-head">
                     <div>
-                                    <!-- <el-button type="primary" icon="icon-ym icon-ym-btn-add"  @click="addOrUpdateHandle()">新增
+                        <!-- <el-button type="primary" icon="icon-ym icon-ym-btn-add"  @click="addOrUpdateHandle()">新增
                                     </el-button> -->
-                                    <el-button type="success" icon="icon-ym icon-ym-btn-download" @click="exportData()" >导出
-                                    </el-button>
-                                    <el-button type="success" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()" >导入
-                                    </el-button>
+                        <el-button type="success" icon="icon-ym icon-ym-btn-download" @click="exportData()">导出
+                        </el-button>
+                        <el-button type="success" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()">导入
+                        </el-button>
                     </div>
                     <div class="JNPF-common-head-right">
-                            <el-tooltip content="高级查询" placement="top" v-if="true">
-                                <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
-                                         @click="openSuperQuery()" />
-                            </el-tooltip>
-                            <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-                                <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                         @click="initData()" />
-                            </el-tooltip>
+                        <el-tooltip content="高级查询" placement="top" v-if="true">
+                            <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                                @click="openSuperQuery()" />
+                        </el-tooltip>
+                        <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
+                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                                @click="initData()" />
+                        </el-tooltip>
                     </div>
                 </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  
- :span-method="arraySpanMethod"  
-
->
-                                                <el-table-column
-                                                            prop="manufactureTime"
- label="生产日期"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="deviceCode"
- label="设备编码"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="deviceName"
- label="设备名称"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="sort"
- label="顺序号"  align="left"
- >
-                                                        <template slot-scope="scope"   v-if="scope.row.sort" >
-                                                            <JnpfNumber v-model="scope.row.sort" :thousands="false"/>
-                                                        </template>
-                                                </el-table-column>
-                                        <el-table-column label="班次"  prop="post" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.post}}
-                                            </template>
-                                        </el-table-column>
-                                                <el-table-column
-                                                            prop="startTime"
- label="开始时间"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="endTime"
- label="结束时间"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="productCode"
- label="产品编码"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="productName"
- label="产品名称"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="model"
- label="规格型号"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="duty"
- label="当班领用"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="classBalance"
- label="本班结存"  align="left"
- >
-                                                </el-table-column>
-                        <el-table-column label="操作"
- fixed="right" width="150" >
-                            <template slot-scope="scope"  >
-                                            <el-button type="text"
-                                                       @click="addOrUpdateHandle(scope.row)" >编辑
-                                            </el-button>
-                                        <!-- <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
+                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
+                    :span-method="arraySpanMethod"border>
+                    <el-table-column prop="manufactureTime" label="生产日期" align="center">
+                    </el-table-column>
+                    <el-table-column prop="deviceCode" label="设备编码" align="center">
+                    </el-table-column>
+                    <el-table-column prop="deviceName" label="设备名称" align="center">
+                    </el-table-column>
+                    <el-table-column prop="sort" label="顺序号" align="center">
+                        <template slot-scope="scope" v-if="scope.row.sort">
+                            <JnpfNumber v-model="scope.row.sort" :thousands="false" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="班次" prop="post" algin="center">
+                        <template slot-scope="scope">
+                            {{ scope.row.post }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="startTime" label="开始时间" align="center">
+                    </el-table-column>
+                    <el-table-column prop="endTime" label="结束时间" align="center">
+                    </el-table-column>
+                    <el-table-column prop="productCode" label="产品编码" align="center">
+                    </el-table-column>
+                    <el-table-column prop="productName" label="产品名称" align="center">
+                    </el-table-column>
+                    <el-table-column prop="model" label="规格型号" align="center">
+                    </el-table-column>
+                    <el-table-column prop="duty" label="当班领用" align="center">
+                    </el-table-column>
+                    <el-table-column prop="classBalance" label="本班结存" align="center">
+                    </el-table-column>
+                    <el-table-column label="操作" fixed="right" width="150">
+                        <template slot-scope="scope">
+                            <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
+                            </el-button>
+                            <!-- <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
                                         </el-button>
                                         <el-button type="text"  
                                                    @click="goDetail(scope.row.id)">详情
                                         </el-button> -->
-                            </template>
-                        </el-table-column>
+                        </template>
+                    </el-table-column>
                 </JNPF-table>
-                        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-             </div>
+                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+                    @pagination="initData" />
+            </div>
         </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
+        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
 
 
 
         <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
         <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
-            <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
-                        @superQuery="superQuery" />
+        <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
+            @superQuery="superQuery" />
     </div>
 </template>
 
 <script>
 
-    import request from '@/utils/request'
-    import {mapGetters} from "vuex";
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './form'
-    import Detail from './Detail'
-    import ExportBox from '@/components/ExportBox'
-    import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
-    import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
-            import columnList from './columnList'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-        import SuperQuery from '@/components/SuperQuery'
-        import superQueryJson from './superQueryJson'
+import request from '@/utils/request'
+import { mapGetters } from "vuex";
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import JNPFForm from './form'
+import Detail from './Detail'
+import ExportBox from '@/components/ExportBox'
+import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+import { getConfigData } from '@/api/onlineDev/visualDev'
+import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
+import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
+import columnList from './columnList'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+import SuperQuery from '@/components/SuperQuery'
+import superQueryJson from './superQueryJson'
 
-    export default {
-        components: {
-                JNPFForm,
-                Detail,
- ExportBox,ToFormDetail , SuperQuery
-        },
-        data() {
-            return {
+export default {
+    components: {
+        JNPFForm,
+        Detail,
+        ExportBox, ToFormDetail, SuperQuery
+    },
+    data() {
+        return {
 
-                keyword:'',
-                expandsTree: true,
-                refreshTree: true,
-                toFormDetailVisible:false,
-                                expandObj:{},
-                columnOptions: [],
-                mergeList: [],
-                exportList:[],
-                    columnList,
+            keyword: '',
+            expandsTree: true,
+            refreshTree: true,
+            toFormDetailVisible: false,
+            expandObj: {},
+            columnOptions: [],
+            mergeList: [],
+            exportList: [],
+            columnList,
 
-                    showAll: false,
-                    superQueryVisible: false,
-                    superQueryJson,
-                uploadBoxVisible: false,
-                detailVisible: false,
-                query: {
-                        manufactureTime:undefined,
-                        productCode:undefined,
-                        productName:undefined,
-                        deviceName:undefined,
+            showAll: false,
+            superQueryVisible: false,
+            superQueryJson,
+            uploadBoxVisible: false,
+            detailVisible: false,
+            query: {
+                manufactureTime: undefined,
+                productCode: undefined,
+                productName: undefined,
+                deviceName: undefined,
             },
             treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id',
-                    isLeaf: 'isLeaf'
+                children: 'children',
+                label: 'fullName',
+                value: 'id',
+                isLeaf: 'isLeaf'
             },
             list: [],
             listLoading: true,
-                    total: 0,
+            total: 0,
             queryData: {},
             listQuery: {
-                    superQueryJson: '',
-                        currentPage: 1,
-                        pageSize: 20,
+                superQueryJson: '',
+                currentPage: 1,
+                pageSize: 20,
                 sort: "desc",
-                        sidx: "post",
+                sidx: "post",
             },
             formVisible: false,
             flowVisible: false,
             flowListVisible: false,
             flowList: [],
             exportBoxVisible: false,
-                                                                                                                                                                postOptions:[{"fullName":"旺季白班","id":"1"},{"fullName":"旺季晚班","id":"2"}],
-                        postProps:{"label":"fullName","value":"id"  },
+            postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季晚班", "id": "2" }],
+            postProps: { "label": "fullName", "value": "id" },
             interfaceRes: {
-                        deviceCode:[] ,
-                },
-            }
-        },
-        computed: {
-            ...mapGetters(['userInfo']),
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
-        },
-        created() {
-                        this.getColumnList(),
-                this.initSearchDataAndListData()
-            this.queryData = JSON.parse(JSON.stringify(this.query))
-        },
-        methods: {
-            toDetail(defaultValue, modelId) {
-                if (!defaultValue) return
-                getConfigData(modelId).then(res => {
-                    if (!res.data || !res.data.formData) return
-                    let formData = JSON.parse(res.data.formData)
-                    formData.popupType = 'general'
-                    this.toFormDetailVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.toFormDetail.init(formData, modelId, defaultValue)
-                    })
-                })
+                deviceCode: [],
             },
-            toggleTreeExpand(expands) {
-                this.refreshTree = false
-                this.expandsTree = expands
+        }
+    },
+    computed: {
+        ...mapGetters(['userInfo']),
+        menuId() {
+            return this.$route.meta.modelId || ''
+        }
+    },
+    created() {
+        this.getColumnList(),
+            this.initSearchDataAndListData()
+        this.queryData = JSON.parse(JSON.stringify(this.query))
+    },
+    methods: {
+        toDetail(defaultValue, modelId) {
+            if (!defaultValue) return
+            getConfigData(modelId).then(res => {
+                if (!res.data || !res.data.formData) return
+                let formData = JSON.parse(res.data.formData)
+                formData.popupType = 'general'
+                this.toFormDetailVisible = true
                 this.$nextTick(() => {
-                    this.refreshTree = true
-                    this.$nextTick(() => {
-                        this.$refs.treeBox.setCurrentKey(null)
-                    })
+                    this.$refs.toFormDetail.init(formData, modelId, defaultValue)
                 })
-            },
-            filterNode(value, data) {
-                if (!value) return true;
-                return data[this.treeProps.label].indexOf(value) !== -1;
-            },
-            loadNode(node, resolve) {
-                const nodeData = node.data
-                const config ={
-                    treeInterfaceId:"",
-                    treeTemplateJson:[]
-                }
-                if (config.treeInterfaceId) {
-                    //这里是为了拿到参数中关联的字段的值，后端自行拿
-                    if (config.treeTemplateJson && config.treeTemplateJson.length) {
-                        for (let i = 0; i < config.treeTemplateJson.length; i++) {
-                            const element = config.treeTemplateJson[i];
-                            element.defaultValue = nodeData[element.relationField] || ''
-                        }
-                    }
-                    //参数
-                    let query = {
-                        paramList: config.treeTemplateJson || [],
-                    }
-                    //接口
-                    getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-                        let data = res.data
-                        if (Array.isArray(data)) {
-                            resolve(data);
-                        } else {
-                            resolve([]);
-                        }
-                    })
-                }
-            },
-                        getColumnList() {
-                    // 没有开启权限
-                    this.columnOptions = this.transformColumnList(this.columnList)
-            },
-            transformColumnList(columnList) {
-                let list = []
-                for (let i = 0; i < columnList.length; i++) {
-                    const e = columnList[i];
-                    if (!e.prop.includes('-')) {
-                        list.push(e)
-                    } else {
-                        let prop = e.prop.split('-')[0]
-                        let label = e.label.split('-')[0]
-                        let vModel = e.prop.split('-')[1]
-                        let newItem = {
-                            align: "center",
-                            jnpfKey: "table",
-                            prop,
-                            label,
-                            children: []
-                        }
-                        e.vModel = vModel
-                        if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
-                        if (!list.some(o => o.prop === prop)) list.push(newItem)
-                        for (let i = 0; i < list.length; i++) {
-                            if (list[i].prop === prop) {
-                                list[i].children.push(e)
-                                break
-                            }
-                        }
+            })
+        },
+        toggleTreeExpand(expands) {
+            this.refreshTree = false
+            this.expandsTree = expands
+            this.$nextTick(() => {
+                this.refreshTree = true
+                this.$nextTick(() => {
+                    this.$refs.treeBox.setCurrentKey(null)
+                })
+            })
+        },
+        filterNode(value, data) {
+            if (!value) return true;
+            return data[this.treeProps.label].indexOf(value) !== -1;
+        },
+        loadNode(node, resolve) {
+            const nodeData = node.data
+            const config = {
+                treeInterfaceId: "",
+                treeTemplateJson: []
+            }
+            if (config.treeInterfaceId) {
+                //这里是为了拿到参数中关联的字段的值，后端自行拿
+                if (config.treeTemplateJson && config.treeTemplateJson.length) {
+                    for (let i = 0; i < config.treeTemplateJson.length; i++) {
+                        const element = config.treeTemplateJson[i];
+                        element.defaultValue = nodeData[element.relationField] || ''
                     }
                 }
-                this.getMergeList(list)
-                this.getExportList(list)
-                return list
-            },
-            arraySpanMethod({ column }) {
-                for (let i = 0; i < this.mergeList.length; i++) {
-                    if (column.property == this.mergeList[i].prop) {
-                        return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
-                    }
+                //参数
+                let query = {
+                    paramList: config.treeTemplateJson || [],
                 }
-            },
-            getMergeList(list) {
-                let newList = JSON.parse(JSON.stringify(list))
-                newList.forEach(item => {
-                    if (item.children && item.children.length) {
-                        let child = {
-                            prop: item.prop + '-child-first'
-                        }
-                        item.children.unshift(child)
-                    }
-                })
-                newList.forEach(item => {
-                    if (item.children && item.children.length ) {
-                        item.children.forEach((child, index) => {
-                            if (index == 0) {
-                                this.mergeList.push({
-                                    prop: child.prop,
-                                    rowspan: 1,
-                                    colspan: item.children.length
-                                })
-                            } else {
-                                this.mergeList.push({
-                                    prop: child.prop,
-                                    rowspan: 0,
-                                    colspan: 0
-                                })
-                            }
-                        })
+                //接口
+                getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+                    let data = res.data
+                    if (Array.isArray(data)) {
+                        resolve(data);
                     } else {
-                        this.mergeList.push({
-                            prop: item.prop,
-                            rowspan: 1,
-                            colspan: 1
-                        })
+                        resolve([]);
                     }
                 })
-            },
-            getExportList(list) {
-                let exportList = []
-                for (let i = 0; i < list.length; i++) {
-                    if (list[i].jnpfKey === 'table') {
-                        for (let j = 0; j < list[i].children.length; j++) {
-                            exportList.push(list[i].children[j])
+            }
+        },
+        getColumnList() {
+            // 没有开启权限
+            this.columnOptions = this.transformColumnList(this.columnList)
+        },
+        transformColumnList(columnList) {
+            let list = []
+            for (let i = 0; i < columnList.length; i++) {
+                const e = columnList[i];
+                if (!e.prop.includes('-')) {
+                    list.push(e)
+                } else {
+                    let prop = e.prop.split('-')[0]
+                    let label = e.label.split('-')[0]
+                    let vModel = e.prop.split('-')[1]
+                    let newItem = {
+                        align: "center",
+                        jnpfKey: "table",
+                        prop,
+                        label,
+                        children: []
+                    }
+                    e.vModel = vModel
+                    if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
+                    if (!list.some(o => o.prop === prop)) list.push(newItem)
+                    for (let i = 0; i < list.length; i++) {
+                        if (list[i].prop === prop) {
+                            list[i].children.push(e)
+                            break
                         }
-                    } else {
-                        exportList.push(list[i])
                     }
                 }
-                this.exportList = exportList
-            },
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            async initSearchDataAndListData() {
-                await this.initSearchData()
-                this.initData()
-            },
-            //初始化查询的默认数据
-            async initSearchData() {
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                        keyword: this.keyword,
-                        dataType: 0,
-                    menuId:this.menuId,
-                    moduleId:'590864498890378181',
-                    type:1,
-                };
-                request({
-                    url: `/api/example/YysRequisitionReport/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =res.data.list;
-                                            this.list = _list.map(o => ({
-                            ...o,
-                            ...this.expandObj,
-                        }))
-                            this.total = res.data.pagination.total
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/example/YysRequisitionReport/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
+            }
+            this.getMergeList(list)
+            this.getExportList(list)
+            return list
+        },
+        arraySpanMethod({ column }) {
+            for (let i = 0; i < this.mergeList.length; i++) {
+                if (column.property == this.mergeList[i].prop) {
+                    return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
+                }
+            }
+        },
+        getMergeList(list) {
+            let newList = JSON.parse(JSON.stringify(list))
+            newList.forEach(item => {
+                if (item.children && item.children.length) {
+                    let child = {
+                        prop: item.prop + '-child-first'
+                    }
+                    item.children.unshift(child)
+                }
+            })
+            newList.forEach(item => {
+                if (item.children && item.children.length) {
+                    item.children.forEach((child, index) => {
+                        if (index == 0) {
+                            this.mergeList.push({
+                                prop: child.prop,
+                                rowspan: 1,
+                                colspan: item.children.length
+                            })
+                        } else {
+                            this.mergeList.push({
+                                prop: child.prop,
+                                rowspan: 0,
+                                colspan: 0
+                            })
+                        }
                     })
-                }).catch(() => {
-                });
-            },
-            handelUpload(){
-                this.uploadBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.UploadBox.init("","example/YysRequisitionReport")
-                })
-            },
-                openSuperQuery() {
-                    this.superQueryVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.SuperQuery.init()
+                } else {
+                    this.mergeList.push({
+                        prop: item.prop,
+                        rowspan: 1,
+                        colspan: 1
                     })
-                },
-                superQuery(queryJson) {
-                    this.listQuery.superQueryJson = queryJson
-                    this.listQuery.currentPage = 1
-                    this.initData()
-                },
-            addOrUpdateHandle(row, isDetail) {
-                let id = row?row.id:""
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail,this.list)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.exportList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
+                }
+            })
+        },
+        getExportList(list) {
+            let exportList = []
+            for (let i = 0; i < list.length; i++) {
+                if (list[i].jnpfKey === 'table') {
+                    for (let j = 0; j < list[i].children.length; j++) {
+                        exportList.push(list[i].children[j])
+                    }
+                } else {
+                    exportList.push(list[i])
+                }
+            }
+            this.exportList = exportList
+        },
+        goDetail(id) {
+            this.detailVisible = true
+            this.$nextTick(() => {
+                this.$refs.Detail.init(id)
+            })
+        },
+        sortChange({ column, prop, order }) {
+            this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+            this.listQuery.sidx = !order ? '' : prop
+            this.initData()
+        },
+        async initSearchDataAndListData() {
+            await this.initSearchData()
+            this.initData()
+        },
+        //初始化查询的默认数据
+        async initSearchData() {
+        },
+        initData() {
+            this.listLoading = true;
+            let _query = {
+                ...this.listQuery,
+                ...this.query,
+                keyword: this.keyword,
+                dataType: 0,
+                menuId: this.menuId,
+                moduleId: '590864498890378181',
+                type: 1,
+            };
+            request({
+                url: `/api/example/YysRequisitionReport/getList`,
+                method: 'post',
+                data: _query
+            }).then(res => {
+                var _list = res.data.list;
+                this.list = _list.map(o => ({
+                    ...o,
+                    ...this.expandObj,
+                }))
+                this.total = res.data.pagination.total
+                this.listLoading = false
+            })
+        },
+        handleDel(id) {
+            this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                type: 'warning'
+            }).then(() => {
                 request({
-                    url: `/api/example/YysRequisitionReport/Actions/Export`,
-                    method: 'post',
-                    data: query
+                    url: `/api/example/YysRequisitionReport/${id}`,
+                    method: 'DELETE'
                 }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
+                    this.$message({
+                        type: 'success',
+                        message: res.msg,
+                        onClose: () => {
+                            this.initData()
+                        }
+                    });
                 })
-            },
-            search() {
-                    this.listQuery.currentPage=1
-                        this.listQuery.pageSize=20
-                    this.listQuery.sort="desc"
-                this.listQuery.sidx="post"
-                this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                this.query = JSON.parse(JSON.stringify(this.queryData))
-                this.search()
-            },
-            colseFlow(isrRefresh) {
-                this.flowVisible = false
-                if (isrRefresh) this.reset()
-            },
-        }
+            }).catch(() => {
+            });
+        },
+        handelUpload() {
+            this.uploadBoxVisible = true
+            this.$nextTick(() => {
+                this.$refs.UploadBox.init("", "example/YysRequisitionReport")
+            })
+        },
+        openSuperQuery() {
+            this.superQueryVisible = true
+            this.$nextTick(() => {
+                this.$refs.SuperQuery.init()
+            })
+        },
+        superQuery(queryJson) {
+            this.listQuery.superQueryJson = queryJson
+            this.listQuery.currentPage = 1
+            this.initData()
+        },
+        addOrUpdateHandle(row, isDetail) {
+            let id = row ? row.id : ""
+            this.formVisible = true
+            this.$nextTick(() => {
+                this.$refs.JNPFForm.init(id, isDetail, this.list)
+            })
+        },
+        exportData() {
+            this.exportBoxVisible = true
+            this.$nextTick(() => {
+                this.$refs.ExportBox.init(this.exportList)
+            })
+        },
+        download(data) {
+            let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
+            request({
+                url: `/api/example/YysRequisitionReport/Actions/Export`,
+                method: 'post',
+                data: query
+            }).then(res => {
+                if (!res.data.url) return
+                this.jnpf.downloadFile(res.data.url)
+                this.$refs.ExportBox.visible = false
+                this.exportBoxVisible = false
+            })
+        },
+        search() {
+            this.listQuery.currentPage = 1
+            this.listQuery.pageSize = 20
+            this.listQuery.sort = "desc"
+            this.listQuery.sidx = "post"
+            this.initData()
+        },
+        refresh(isrRefresh) {
+            this.formVisible = false
+            if (isrRefresh) this.reset()
+        },
+        reset() {
+            this.query = JSON.parse(JSON.stringify(this.queryData))
+            this.search()
+        },
+        colseFlow(isrRefresh) {
+            this.flowVisible = false
+            if (isrRefresh) this.reset()
+        },
     }
+}
 </script>