diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleOrderMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleOrderMapper.java index 53caefe..2dba39d 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleOrderMapper.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleOrderMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.5 * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 作者： JNPF开发平台组 - * 日期： 2024-01-30 + * 日期： 2024-02-01 */ public interface RecycleOrderMapper extends BaseMapper { diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleOrderService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleOrderService.java index f5d4bb3..9010c69 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleOrderService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleOrderService.java @@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; * 版本： V3.5 * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 作者： JNPF开发平台组 - * 日期： 2024-01-30 + * 日期： 2024-02-01 */ public interface RecycleOrderService extends IService { List getList(RecycleOrderPagination recycleOrderPagination); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleOrderServiceImpl.java index 71f77f9..b04b5c5 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleOrderServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleOrderServiceImpl.java @@ -36,7 +36,7 @@ import jnpf.permission.entity.UserEntity; * 版本： V3.5 * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 作者： JNPF开发平台组 - * 日期： 2024-01-30 + * 日期： 2024-02-01 */ @Service public class RecycleOrderServiceImpl extends ServiceImpl implements RecycleOrderService{ diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleOrderController.java index 2ef5780..5d42851 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleOrderController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleOrderController.java @@ -34,7 +34,7 @@ import org.springframework.transaction.annotation.Transactional; * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 - * @日期： 2024-01-30 + * @日期： 2024-02-01 */ @Slf4j @RestController diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleOrderEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleOrderEntity.java index d06ab59..61a137b 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleOrderEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleOrderEntity.java @@ -10,7 +10,7 @@ import java.math.BigDecimal; * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 - * @日期： 2024-01-30 + * @日期： 2024-02-01 */ @Data @TableName("nx_recycle_order") @@ -49,7 +49,7 @@ public class RecycleOrderEntity { private Date appointmentTimeEnd; @TableField(value = "STAFFS_ID" , updateStrategy = FieldStrategy.IGNORED) private String staffsId; - @TableField("STAFFS_NAME") + @TableField(value = "STAFFS_NAME" , updateStrategy = FieldStrategy.IGNORED) private String staffsName; @TableField(value = "CONSULT_TIME_START" , updateStrategy = FieldStrategy.IGNORED) private Date consultTimeStart; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderConstant.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderConstant.java index 59f0366..0481598 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderConstant.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderConstant.java @@ -9,7 +9,7 @@ import java.util.Map; * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 - * @日期： 2024-01-30 + * @日期： 2024-02-01 */ public class RecycleOrderConstant{ /** 数据库链接 */ @@ -21,7 +21,7 @@ public class RecycleOrderConstant{ /** 整个表单配置json */ public static final String getFormData(){ StringBuilder sb = new StringBuilder(); -sb.append("{\"popupType\":\"fullScreen\",\"idGlobal\":154,\"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\":false,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":false,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"__config__\":{\"formId\":111,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"groupTitle\",\"dragDisabled\":false,\"className\":[],\"label\":\"分组标题\",\"showLabel\":false,\"required\":false,\"renderKey\":1706175299512,\"tableName\":\"nx_recycle_order\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-group\",\"tag\":\"JnpfGroupTitle\",\"span\":24},\"contentPosition\":\"left\",\"content\":\"订单信息\",\"helpMessage\":\"\"},{\"__config__\":{\"formId\":138,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"billRule\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"rule\":\"order\",\"className\":[],\"label\":\"订单编号\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706590652682,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-documents\",\"ruleName\":\"回收订单\",\"tag\":\"JnpfInput\",\"span\":8},\"readonly\":true,\"__vModel__\":\"orderNumber\",\"style\":{\"width\":\"100%\"},\"placeholder\":\"系统自动生成\"},{\"filterable\":false,\"clearable\":false,\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"521999177572425477\",\"noShow\":false,\"dataType\":\"dictionary\",\"dictionaryType\":\"520193298627825989\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"订单类型\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706174782022,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"multiple\":false,\"__vModel__\":\"orderTypeId\",\"style\":{\"width\":\"100%\"},\"disabled\":true,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}},{\"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\":\"nx_recycle_order\",\"renderKey\":1706174844643,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[{\"pattern\":\"/^([1-9][\\\\d]*|0)(\\\\.[\\\\d]+)?$/\",\"message\":\"请输入正确的金额\"}],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"orderAmount\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"\",\"noShow\":false,\"dataType\":\"dictionary\",\"dictionaryType\":\"520192751392788805\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"散户端状态\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706175132534,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"multiple\":false,\"__vModel__\":\"orderClientStatusId\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":106,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"\",\"noShow\":false,\"dataType\":\"dictionary\",\"dictionaryType\":\"520192751392788805\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"回收员端状态\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706175158983,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"multiple\":false,\"__vModel__\":\"orderStafstatusId\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":107,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"接单周期(分)\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706175190830,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"receivePeriod\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"__config__\":{\"formId\":112,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"groupTitle\",\"dragDisabled\":false,\"className\":[],\"label\":\"分组标题\",\"showLabel\":false,\"required\":false,\"renderKey\":1706175310389,\"tableName\":\"nx_recycle_order\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-group\",\"tag\":\"JnpfGroupTitle\",\"span\":24},\"contentPosition\":\"left\",\"content\":\"散户信息\",\"helpMessage\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":108,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":true,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"散户id\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706175232907,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"clientId\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":154,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"散户姓名\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706593973010,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"clientName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":109,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"散户手机号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706175257685,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"clientMobile\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":110,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"回收地址\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706175269791,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"recycleAddress\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706591955219,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":141,\"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 HH:mm\",\"__vModel__\":\"appointmentTimeStart\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\",\"type\":\"datetime\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706591986153,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":142,\"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 HH:mm\",\"__vModel__\":\"appointmentTimeEnd\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\",\"type\":\"datetime\"},{\"__config__\":{\"formId\":116,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"groupTitle\",\"dragDisabled\":false,\"className\":[],\"label\":\"分组标题\",\"showLabel\":false,\"required\":false,\"renderKey\":1706175391082,\"tableName\":\"nx_recycle_order\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-group\",\"tag\":\"JnpfGroupTitle\",\"span\":24},\"contentPosition\":\"left\",\"content\":\"收货员信息\",\"helpMessage\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":117,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"\",\"noShow\":false,\"dataType\":\"dynamic\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"回收站\",\"trigger\":\"change\",\"propsUrl\":\"520259300875047493\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706176463828,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"查询全部回收站\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"multiple\":false,\"__vModel__\":\"recycleStationId\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"station_name\",\"value\":\"id\"}},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":118,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"回收员\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706176520966,\"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__\":\"staffsId\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}},{\"__config__\":{\"formId\":120,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"divider\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"分割线\",\"showLabel\":false,\"required\":false,\"renderKey\":1706176691574,\"tableName\":\"nx_recycle_order\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-divider\",\"tag\":\"JnpfDivider\",\"span\":24},\"contentPosition\":\"center\",\"content\":\"其他信息\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":123,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"创建用户\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706176720717,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"creatorUserId\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":true,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706176705880,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":121,\"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:ss\",\"__vModel__\":\"creatorTime\",\"style\":{\"width\":\"100%\"},\"disabled\":true,\"placeholder\":\"请选择\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706592081417,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":144,\"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 HH:mm\",\"__vModel__\":\"consultTimeStart\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\",\"type\":\"datetime\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706592104864,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":145,\"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 HH:mm\",\"__vModel__\":\"consultTimeEnd\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\",\"type\":\"datetime\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706592141007,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":146,\"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 HH:mm:ss\",\"__vModel__\":\"receiveTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\",\"type\":\"datetime\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706592235492,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":147,\"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 HH:mm:ss\",\"__vModel__\":\"settleTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\",\"type\":\"datetime\"},{\"__config__\":{\"formId\":132,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"divider\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"分割线\",\"showLabel\":false,\"required\":false,\"renderKey\":1706177013276,\"tableName\":\"nx_recycle_order\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-divider\",\"tag\":\"JnpfDivider\",\"span\":24},\"contentPosition\":\"center\",\"content\":\"用户评论\"},{\"__config__\":{\"formId\":148,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"rate\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"综合评分\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706592381868,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-rate\",\"tag\":\"JnpfRate\",\"regList\":[],\"span\":8},\"showText\":false,\"count\":5,\"__vModel__\":\"starScore\",\"showScore\":false,\"style\":{},\"disabled\":false,\"allowHalf\":false},{\"autoSize\":{\"minRows\":4,\"maxRows\":8},\"__config__\":{\"formId\":133,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"textarea\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"评价详情\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706177034253,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-textarea\",\"tag\":\"JnpfTextarea\",\"regList\":[],\"span\":8},\"readonly\":false,\"maxlength\":\"200\",\"showWordLimit\":true,\"__vModel__\":\"comment\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"type\":\"textarea\"},{\"showTip\":false,\"isAccount\":0,\"pathType\":\"defaultPath\",\"accept\":\"\",\"__config__\":{\"formId\":135,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"uploadImg\",\"defaultValue\":[],\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"评价图片\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706177064145,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-upload\",\"tag\":\"JnpfUploadImg\",\"regList\":[],\"span\":8},\"folder\":\"\",\"fileSize\":10,\"limit\":9,\"__vModel__\":\"commentPics\",\"sizeUnit\":\"MB\",\"tipText\":\"\",\"disabled\":false},{\"__config__\":{\"formId\":151,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"rate\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"响应速度\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706592417763,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-rate\",\"tag\":\"JnpfRate\",\"regList\":[],\"span\":8},\"showText\":false,\"count\":5,\"__vModel__\":\"responseStar\",\"showScore\":false,\"style\":{},\"disabled\":false,\"allowHalf\":false},{\"__config__\":{\"formId\":149,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"rate\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"服务态度\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706592412244,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-rate\",\"tag\":\"JnpfRate\",\"regList\":[],\"span\":8},\"showText\":false,\"count\":5,\"__vModel__\":\"attitudeStar\",\"showScore\":false,\"style\":{},\"disabled\":false,\"allowHalf\":false},{\"__config__\":{\"formId\":150,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"rate\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"平台价格\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706592417018,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-rate\",\"tag\":\"JnpfRate\",\"regList\":[],\"span\":8},\"showText\":false,\"count\":5,\"__vModel__\":\"priceStar\",\"showScore\":false,\"style\":{},\"disabled\":false,\"allowHalf\":false}],\"span\":24}"); return sb.toString(); +sb.append("{\"popupType\":\"fullScreen\",\"idGlobal\":156,\"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\":false,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":false,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"__config__\":{\"formId\":111,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"groupTitle\",\"dragDisabled\":false,\"className\":[],\"label\":\"分组标题\",\"showLabel\":false,\"required\":false,\"renderKey\":1706175299512,\"tableName\":\"nx_recycle_order\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-group\",\"tag\":\"JnpfGroupTitle\",\"span\":24},\"contentPosition\":\"left\",\"content\":\"订单信息\",\"helpMessage\":\"\"},{\"__config__\":{\"formId\":138,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"billRule\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"rule\":\"order\",\"className\":[],\"label\":\"订单编号\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706590652682,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-documents\",\"ruleName\":\"回收订单\",\"tag\":\"JnpfInput\",\"span\":8},\"readonly\":true,\"__vModel__\":\"orderNumber\",\"style\":{\"width\":\"100%\"},\"placeholder\":\"系统自动生成\"},{\"filterable\":false,\"clearable\":false,\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"521999177572425477\",\"noShow\":false,\"dataType\":\"dictionary\",\"dictionaryType\":\"520193298627825989\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"订单类型\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706174782022,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"multiple\":false,\"__vModel__\":\"orderTypeId\",\"style\":{\"width\":\"100%\"},\"disabled\":true,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}},{\"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\":\"nx_recycle_order\",\"renderKey\":1706174844643,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[{\"pattern\":\"/^([1-9][\\\\d]*|0)(\\\\.[\\\\d]+)?$/\",\"message\":\"请输入正确的金额\"}],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"orderAmount\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"\",\"noShow\":false,\"dataType\":\"dictionary\",\"dictionaryType\":\"520192751392788805\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"散户端状态\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706175132534,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"multiple\":false,\"__vModel__\":\"orderClientStatusId\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":106,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"\",\"noShow\":false,\"dataType\":\"dictionary\",\"dictionaryType\":\"520192751392788805\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"回收员端状态\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706175158983,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"multiple\":false,\"__vModel__\":\"orderStafstatusId\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":107,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"接单周期(分)\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706175190830,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"receivePeriod\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"__config__\":{\"formId\":112,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"groupTitle\",\"dragDisabled\":false,\"className\":[],\"label\":\"分组标题\",\"showLabel\":false,\"required\":false,\"renderKey\":1706175310389,\"tableName\":\"nx_recycle_order\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-group\",\"tag\":\"JnpfGroupTitle\",\"span\":24},\"contentPosition\":\"left\",\"content\":\"散户信息\",\"helpMessage\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":108,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":true,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"散户id\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706175232907,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"clientId\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":154,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"散户姓名\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706593973010,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"clientName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":109,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"散户手机号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706175257685,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"clientMobile\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":110,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"回收地址\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706175269791,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"recycleAddress\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706591955219,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":141,\"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 HH:mm\",\"__vModel__\":\"appointmentTimeStart\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\",\"type\":\"datetime\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706591986153,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":142,\"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 HH:mm\",\"__vModel__\":\"appointmentTimeEnd\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\",\"type\":\"datetime\"},{\"__config__\":{\"formId\":116,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"groupTitle\",\"dragDisabled\":false,\"className\":[],\"label\":\"分组标题\",\"showLabel\":false,\"required\":false,\"renderKey\":1706175391082,\"tableName\":\"nx_recycle_order\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-group\",\"tag\":\"JnpfGroupTitle\",\"span\":24},\"contentPosition\":\"left\",\"content\":\"收货员信息\",\"helpMessage\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":117,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"\",\"noShow\":false,\"dataType\":\"dynamic\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"回收站\",\"trigger\":\"change\",\"propsUrl\":\"520259300875047493\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706176463828,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"查询全部回收站\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"multiple\":false,\"__vModel__\":\"recycleStationId\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"station_name\",\"value\":\"id\"}},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":118,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"\",\"noShow\":false,\"dataType\":\"dynamic\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"回收员\",\"trigger\":\"change\",\"propsUrl\":\"522739595385777413\",\"templateJson\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706176520966,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"获取所有启用员工\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"multiple\":false,\"__vModel__\":\"staffsId\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"staffs_name\",\"value\":\"id\"}},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":156,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"回收员姓名\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706767669277,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"staffsName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"__config__\":{\"formId\":120,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"divider\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"分割线\",\"showLabel\":false,\"required\":false,\"renderKey\":1706176691574,\"tableName\":\"nx_recycle_order\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-divider\",\"tag\":\"JnpfDivider\",\"span\":24},\"contentPosition\":\"center\",\"content\":\"其他信息\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":123,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"创建用户\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706176720717,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"creatorUserId\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":true,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706176705880,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":121,\"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:ss\",\"__vModel__\":\"creatorTime\",\"style\":{\"width\":\"100%\"},\"disabled\":true,\"placeholder\":\"请选择\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706592081417,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":144,\"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 HH:mm\",\"__vModel__\":\"consultTimeStart\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\",\"type\":\"datetime\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706592104864,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":145,\"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 HH:mm\",\"__vModel__\":\"consultTimeEnd\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\",\"type\":\"datetime\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706592141007,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":146,\"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 HH:mm:ss\",\"__vModel__\":\"receiveTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\",\"type\":\"datetime\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706592235492,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":147,\"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 HH:mm:ss\",\"__vModel__\":\"settleTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\",\"type\":\"datetime\"},{\"__config__\":{\"formId\":132,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"divider\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"分割线\",\"showLabel\":false,\"required\":false,\"renderKey\":1706177013276,\"tableName\":\"nx_recycle_order\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-divider\",\"tag\":\"JnpfDivider\",\"span\":24},\"contentPosition\":\"center\",\"content\":\"用户评论\"},{\"__config__\":{\"formId\":148,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"rate\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"综合评分\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706592381868,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-rate\",\"tag\":\"JnpfRate\",\"regList\":[],\"span\":8},\"showText\":false,\"count\":5,\"__vModel__\":\"starScore\",\"showScore\":false,\"style\":{},\"disabled\":false,\"allowHalf\":false},{\"autoSize\":{\"minRows\":4,\"maxRows\":8},\"__config__\":{\"formId\":133,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"textarea\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"评价详情\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706177034253,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-textarea\",\"tag\":\"JnpfTextarea\",\"regList\":[],\"span\":8},\"readonly\":false,\"maxlength\":\"200\",\"showWordLimit\":true,\"__vModel__\":\"comment\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"type\":\"textarea\"},{\"showTip\":false,\"isAccount\":0,\"pathType\":\"defaultPath\",\"accept\":\"\",\"__config__\":{\"formId\":135,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"uploadImg\",\"defaultValue\":[],\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"评价图片\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706177064145,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-upload\",\"tag\":\"JnpfUploadImg\",\"regList\":[],\"span\":8},\"folder\":\"\",\"fileSize\":10,\"limit\":9,\"__vModel__\":\"commentPics\",\"sizeUnit\":\"MB\",\"tipText\":\"\",\"disabled\":false},{\"__config__\":{\"formId\":151,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"rate\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"响应速度\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706592417763,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-rate\",\"tag\":\"JnpfRate\",\"regList\":[],\"span\":8},\"showText\":false,\"count\":5,\"__vModel__\":\"responseStar\",\"showScore\":false,\"style\":{},\"disabled\":false,\"allowHalf\":false},{\"__config__\":{\"formId\":149,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"rate\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"服务态度\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706592412244,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-rate\",\"tag\":\"JnpfRate\",\"regList\":[],\"span\":8},\"showText\":false,\"count\":5,\"__vModel__\":\"attitudeStar\",\"showScore\":false,\"style\":{},\"disabled\":false,\"allowHalf\":false},{\"__config__\":{\"formId\":150,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"rate\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"平台价格\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_recycle_order\",\"renderKey\":1706592417018,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-rate\",\"tag\":\"JnpfRate\",\"regList\":[],\"span\":8},\"showText\":false,\"count\":5,\"__vModel__\":\"priceStar\",\"showScore\":false,\"style\":{},\"disabled\":false,\"allowHalf\":false}],\"span\":24}"); return sb.toString(); } /** 列表字段配置json */ public static final String getColumnData(){ diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderForm.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderForm.java index 9ea1c58..b67ef72 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderForm.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderForm.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 - * @日期： 2024-01-30 + * @日期： 2024-02-01 */ @Data public class RecycleOrderForm { @@ -59,6 +59,9 @@ public class RecycleOrderForm { /** 回收员 **/ @JsonProperty("staffsId") private Object staffsId; + /** 回收员姓名 **/ + @JsonProperty("staffsName") + private String staffsName; /** 创建用户 **/ @JsonProperty("creatorUserId") private String creatorUserId; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderPagination.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderPagination.java index 6506712..294525e 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderPagination.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderPagination.java @@ -11,7 +11,7 @@ import java.util.List; * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 - * @日期： 2024-01-30 + * @日期： 2024-02-01 */ @Data public class RecycleOrderPagination extends Pagination { diff --git a/jnpf-java-boot/jnpf-web/src/views/recycleorder/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/recycleorder/Detail.vue index c56b763..8dfe23e 100644 --- a/jnpf-java-boot/jnpf-web/src/views/recycleorder/Detail.vue +++ b/jnpf-java-boot/jnpf-web/src/views/recycleorder/Detail.vue @@ -7,11 +7,12 @@
- {{staff}} + {{dataForm.staffsName}} 选择收货员 取 消 + 确定
@@ -98,7 +99,12 @@ -

{{ dataForm.staffsId }}

+

{{dataForm.staffsId}}

+ + + + +

{{dataForm.staffsName}}

 @@ -177,11 +183,8 @@ - - -
- {{`休息中`}} + 开启接单
- {{`回收中`}} + 关闭接单
+ @click="chooseStaff(item.id,item.staffsName)"> 派 单 @@ -243,8 +246,8 @@ export default { loading: false, paidanDrawer: false, paidanDirection: 'rtl', - staff: '', staffList: [], + dataForm: { id: '', orderNumber: '', @@ -261,6 +264,7 @@ export default { appointmentTimeEnd: '', recycleStationId: "", staffsId: "", + staffsName: '', creatorUserId: '', creatorTime: '', consultTimeStart: '', @@ -274,13 +278,13 @@ export default { attitudeStar: 0, priceStar: 0, isJiedan: false, + }, orderTypeIdProps: { "label": "fullName", "value": "id" }, orderClientStatusIdProps: { "label": "fullName", "value": "id" }, orderStafstatusIdProps: { "label": "fullName", "value": "id" }, recycleStationIdProps: { "label": "station_name", "value": "id" }, - staffsIdOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }], - staffsIdProps: { "label": "fullName", "value": "id" }, + staffsIdProps: { "label": "staffs_name", "value": "id" }, } }, @@ -336,11 +340,12 @@ export default { }) }, - chooseStaff(name) { - console.log(name); + chooseStaff(id, name) { this.paidanDrawer = false - this.staff = name - console.log(this.staff); + this.dataForm.staffsId = id + this.dataForm.staffsName = name + // console.log(id); + // console.log(name); }, getStaffList() { this.paidanDrawer = true @@ -360,11 +365,33 @@ export default { ...o, ...this.expandObj, })) - // console.log(this.staffList); - console.log(this.staffList[0].headIcon[0]); + console.log(this.staffList); }) - } + }, + paidanConfirm() { + console.log('paidan confirm cliked'); + // let _data = this.dataForm + // request({ + // url: '/api/scm/RecycleOrder/' + this.dataForm.id, + // method: 'PUT', + // data: _data + // }).then((res) => { + // this.$message({ + // message: res.msg, + // type: 'success', + // duration: 1000, + // onClose: () => { + // this.detailVisible = true + // this.$emit('refresh', true) + // } + // }) + // }).catch(() => { + // // this.btnLoading = false + // // this.continueBtnLoading = false + // }) + }, }, + } @@ -400,4 +427,4 @@ export default { border-radius: 50%; background-color: red; } - + \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue b/jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue index 0762552..07424f5 100644 --- a/jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue @@ -161,6 +161,13 @@ + + + + + + @@ -339,6 +346,7 @@ export default { appointmentTimeEnd: undefined, recycleStationId: undefined, staffsId: undefined, + staffsName: undefined, creatorUserId: undefined, creatorTime: undefined, consultTimeStart: undefined, @@ -385,8 +393,8 @@ export default { orderStafstatusIdProps: { "label": "fullName", "value": "id" }, recycleStationIdOptions: [], recycleStationIdProps: { "label": "station_name", "value": "id" }, - staffsIdOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }], - staffsIdProps: { "label": "fullName", "value": "id" }, + staffsIdOptions: [], + staffsIdProps: { "label": "staffs_name", "value": "id" }, childIndex: -1, isEdit: false, interfaceRes: { @@ -404,6 +412,7 @@ export default { appointmentTimeEnd: [], recycleStationId: [], staffsId: [], + staffsName: [], creatorUserId: [], creatorTime: [], consultTimeStart: [], @@ -511,6 +520,7 @@ export default { this.getorderClientStatusIdOptions(); this.getorderStafstatusIdOptions(); this.getrecycleStationIdOptions(); + this.getstaffsIdOptions(); }, getorderTypeIdOptions() { getDictionaryDataSelector('520193298627825989').then(res => { @@ -552,6 +562,31 @@ export default { this.changeDataFormData(1, 'recycleStationId', 'recycleStationId', index, '') }) }, + getstaffsIdOptions() { + const index = this.childIndex + let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.staffsId)) + for (let i = 0; i < templateJsonList.length; i++) { + let json = templateJsonList[i]; + if (json.relationField) { + let relationFieldAll = json.relationField.split("-"); + let val = json.defaultValue; + if (relationFieldAll.length > 1 && index > -1) { + val = this.dataForm[relationFieldAll[0] + 'List'] && this.dataForm[relationFieldAll[0] + 'List'].length ? this.dataForm[relationFieldAll[0] + 'List'][index][relationFieldAll[1]] : '' + } else { + val = this.dataForm[relationFieldAll] + } + json.defaultValue = val + } + } + let template = { + paramList: templateJsonList + } + getDataInterfaceRes('522739595385777413', template).then(res => { + let data = res.data + this.staffsIdOptions = data + this.changeDataFormData(1, 'staffsId', 'staffsId', index, '') + }) + }, goBack() { this.$emit('refresh') }, diff --git a/jnpf-java-boot/jnpf-web/src/views/recycleorder/index.vue b/jnpf-java-boot/jnpf-web/src/views/recycleorder/index.vue index 5c1c221..aefdf29 100644 --- a/jnpf-java-boot/jnpf-web/src/views/recycleorder/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/recycleorder/index.vue @@ -182,7 +182,6 @@ @close="toFormDetailVisible = false" /> - @@ -270,8 +269,8 @@ export default { orderStafstatusIdProps: { "label": "fullName", "value": "id" }, recycleStationIdOptions: [], recycleStationIdProps: { "label": "station_name", "value": "id" }, - staffsIdOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }], - staffsIdProps: { "label": "fullName", "value": "id" }, + staffsIdOptions: [], + staffsIdProps: { "label": "staffs_name", "value": "id" }, interfaceRes: { }, } @@ -292,6 +291,12 @@ export default { this.queryData = JSON.parse(JSON.stringify(this.query)) }, methods: { + goJiedanDetail(id) { + this.detailVisible = true + this.$nextTick(() => { + this.$refs.Detail.init(id, true) + }) + }, toDetail(defaultValue, modelId) { if (!defaultValue) return getConfigData(modelId).then(res => { @@ -466,12 +471,6 @@ export default { this.$refs.Detail.init(id) }) }, - goJiedanDetail(id) { - this.detailVisible = true - this.$nextTick(() => { - this.$refs.Detail.init(id, true) - }) - }, sortChange({ column, prop, order }) { this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc' this.listQuery.sidx = !order ? '' : prop