yunxi
/
ningxiaWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

回收订单和其他修改u

Browse Source
master
CJYXTX\27961 7 months ago
parent d9314eb538
commit eb881db187
10 changed files with 1312 additions and 1372 deletions
Show Stats Download Patch File Download Diff File

81
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/RecycleOrderMapper.xml
Unescape View File

@ -13,8 +13,7 @@
<result column="client_id" jdbcType="VARCHAR" property="clientId" /> <result column="client_id" jdbcType="VARCHAR" property="clientId" />
<result column="client_name" jdbcType="VARCHAR" property="clientName" /> <result column="client_name" jdbcType="VARCHAR" property="clientName" />
<result column="client_mobile" jdbcType="VARCHAR" property="clientMobile" /> <result column="client_mobile" jdbcType="VARCHAR" property="clientMobile" />
<result column="creator_user_id" jdbcType="VARCHAR" property="creatorUserId" /> <result column="f_creator_user_id" jdbcType="VARCHAR" property="creatorUserId" />
<result column="creator_time" jdbcType="TIMESTAMP" property="creatorTime" />
<result column="client_address_id" jdbcType="VARCHAR" property="clientAddressId" /> <result column="client_address_id" jdbcType="VARCHAR" property="clientAddressId" />
<result column="appointment_time_start" jdbcType="TIMESTAMP" property="appointmentTimeStart" /> <result column="appointment_time_start" jdbcType="TIMESTAMP" property="appointmentTimeStart" />
<result column="appointment_time_end" jdbcType="TIMESTAMP" property="appointmentTimeEnd" /> <result column="appointment_time_end" jdbcType="TIMESTAMP" property="appointmentTimeEnd" />
@ -38,6 +37,11 @@
<result column="undefined3" jdbcType="VARCHAR" property="undefined3" /> <result column="undefined3" jdbcType="VARCHAR" property="undefined3" />
<result column="undefined4" jdbcType="VARCHAR" property="undefined4" /> <result column="undefined4" jdbcType="VARCHAR" property="undefined4" />
<result column="f_flow_id" jdbcType="VARCHAR" property="flowId" /> <result column="f_flow_id" jdbcType="VARCHAR" property="flowId" />
<result column="predict_weight" jdbcType="VARCHAR" property="predictWeight" />
<result column="longitude" jdbcType="VARCHAR" property="longitude" />
<result column="latitude" jdbcType="VARCHAR" property="latitude" />
<result column="distance" jdbcType="VARCHAR" property="distance" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, recycle_station_id, order_number, order_type_id, order_amount, order_client_status_id, id, recycle_station_id, order_number, order_type_id, order_amount, order_client_status_id,
@ -45,7 +49,7 @@
creator_time, client_address_id, appointment_time_start, appointment_time_end, staffs_id, creator_time, client_address_id, appointment_time_start, appointment_time_end, staffs_id,
staffs_name, consult_time_start, consult_time_end, receive_time, settle_time, remark, staffs_name, consult_time_start, consult_time_end, receive_time, settle_time, remark,
star_score, comment, comment_pics, response_star, attitude_star, price_star, is_user_deleted, star_score, comment, comment_pics, response_star, attitude_star, price_star, is_user_deleted,
is_deleted, undefined1, undefined2, undefined3, undefined4, f_flow_id is_deleted, undefined1, undefined2, undefined3, undefined4, f_flow_id,predict_weight,longitude,latitude,distance,f_creator_user_id
</sql> </sql>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
select select
@ -61,21 +65,21 @@
insert into nx_recycle_order (id, recycle_station_id, order_number, insert into nx_recycle_order (id, recycle_station_id, order_number,
order_type_id, order_amount, order_client_status_id, order_type_id, order_amount, order_client_status_id,
order_staffs_status_id, receive_period, client_id, order_staffs_status_id, receive_period, client_id,
client_name, client_mobile, creator_user_id, client_name, client_mobile,
creator_time, client_address_id, appointment_time_start, client_address_id, appointment_time_start,
appointment_time_end, staffs_id, staffs_name, appointment_time_end, staffs_id, staffs_name,
consult_time_start, consult_time_end, receive_time, consult_time_start, consult_time_end, receive_time,
settle_time, remark, star_score, settle_time, remark, star_score,
comment, comment_pics, response_star, comment, comment_pics, response_star,
attitude_star, price_star, is_user_deleted, attitude_star, price_star, is_user_deleted,
is_deleted, undefined1, undefined2, is_deleted, undefined1, undefined2,
undefined3, undefined4, f_flow_id undefined3, undefined4, f_flow_id ,predict_weight,longitude,latitude,distance,f_creator_user_id
) )
values (#{id,jdbcType=VARCHAR}, #{recycleStationId,jdbcType=VARCHAR}, #{orderNumber,jdbcType=VARCHAR}, values (#{id,jdbcType=VARCHAR}, #{recycleStationId,jdbcType=VARCHAR}, #{orderNumber,jdbcType=VARCHAR},
#{orderTypeId,jdbcType=VARCHAR}, #{orderAmount,jdbcType=DECIMAL}, #{orderClientStatusId,jdbcType=VARCHAR}, #{orderTypeId,jdbcType=VARCHAR}, #{orderAmount,jdbcType=DECIMAL}, #{orderClientStatusId,jdbcType=VARCHAR},
#{orderStaffsStatusId,jdbcType=VARCHAR}, #{receivePeriod,jdbcType=INTEGER}, #{clientId,jdbcType=VARCHAR}, #{orderStaffsStatusId,jdbcType=VARCHAR}, #{receivePeriod,jdbcType=INTEGER}, #{clientId,jdbcType=VARCHAR},
#{clientName,jdbcType=VARCHAR}, #{clientMobile,jdbcType=VARCHAR}, #{creatorUserId,jdbcType=VARCHAR}, #{clientName,jdbcType=VARCHAR}, #{clientMobile,jdbcType=VARCHAR},
#{creatorTime,jdbcType=TIMESTAMP}, #{clientAddressId,jdbcType=VARCHAR}, #{appointmentTimeStart,jdbcType=TIMESTAMP}, #{clientAddressId,jdbcType=VARCHAR}, #{appointmentTimeStart,jdbcType=TIMESTAMP},
#{appointmentTimeEnd,jdbcType=TIMESTAMP}, #{staffsId,jdbcType=VARCHAR}, #{staffsName,jdbcType=VARCHAR}, #{appointmentTimeEnd,jdbcType=TIMESTAMP}, #{staffsId,jdbcType=VARCHAR}, #{staffsName,jdbcType=VARCHAR},
#{consultTimeStart,jdbcType=TIMESTAMP}, #{consultTimeEnd,jdbcType=TIMESTAMP}, #{receiveTime,jdbcType=TIMESTAMP}, #{consultTimeStart,jdbcType=TIMESTAMP}, #{consultTimeEnd,jdbcType=TIMESTAMP}, #{receiveTime,jdbcType=TIMESTAMP},
#{settleTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{starScore,jdbcType=INTEGER}, #{settleTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{starScore,jdbcType=INTEGER},
@ -83,6 +87,11 @@
#{attitudeStar,jdbcType=INTEGER}, #{priceStar,jdbcType=INTEGER}, #{isUserDeleted,jdbcType=INTEGER}, #{attitudeStar,jdbcType=INTEGER}, #{priceStar,jdbcType=INTEGER}, #{isUserDeleted,jdbcType=INTEGER},
#{isDeleted,jdbcType=INTEGER}, #{undefined1,jdbcType=VARCHAR}, #{undefined2,jdbcType=VARCHAR}, #{isDeleted,jdbcType=INTEGER}, #{undefined1,jdbcType=VARCHAR}, #{undefined2,jdbcType=VARCHAR},
#{undefined3,jdbcType=VARCHAR}, #{undefined4,jdbcType=VARCHAR}, #{flowId,jdbcType=VARCHAR} #{undefined3,jdbcType=VARCHAR}, #{undefined4,jdbcType=VARCHAR}, #{flowId,jdbcType=VARCHAR}
, #{predictWeight,jdbcType=VARCHAR}
, #{longitude,jdbcType=VARCHAR}
, #{latitude,jdbcType=VARCHAR}
, #{distance,jdbcType=VARCHAR}
, #{creatorUserId,jdbcType=VARCHAR}
) )
</insert> </insert>
<insert id="insertSelective" parameterType="jnpf.entity.RecycleOrderEntity"> <insert id="insertSelective" parameterType="jnpf.entity.RecycleOrderEntity">
@ -121,12 +130,6 @@
<if test="clientMobile != null"> <if test="clientMobile != null">
client_mobile, client_mobile,
</if> </if>
<if test="creatorUserId != null">
creator_user_id,
</if>
<if test="creatorTime != null">
creator_time,
</if>
<if test="clientAddressId != null"> <if test="clientAddressId != null">
client_address_id, client_address_id,
</if> </if>
@ -196,6 +199,21 @@
<if test="flowId != null"> <if test="flowId != null">
f_flow_id, f_flow_id,
</if> </if>
<if test="predictWeight != null">
predict_weight,
</if>
<if test="longitude != null">
longitude,
</if>
<if test="latitude != null">
latitude,
</if>
<if test="distance != null">
distance,
</if>
<if test="creatorUserId != null">
f_creator_user_id,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
@ -231,12 +249,7 @@
<if test="clientMobile != null"> <if test="clientMobile != null">
#{clientMobile,jdbcType=VARCHAR}, #{clientMobile,jdbcType=VARCHAR},
</if> </if>
<if test="creatorUserId != null">
#{creatorUserId,jdbcType=VARCHAR},
</if>
<if test="creatorTime != null">
#{creatorTime,jdbcType=TIMESTAMP},
</if>
<if test="clientAddressId != null"> <if test="clientAddressId != null">
#{clientAddressId,jdbcType=VARCHAR}, #{clientAddressId,jdbcType=VARCHAR},
</if> </if>
@ -306,6 +319,21 @@
<if test="flowId != null"> <if test="flowId != null">
#{flowId,jdbcType=VARCHAR}, #{flowId,jdbcType=VARCHAR},
</if> </if>
<if test="predictWeight != null">
#{predictWeight,jdbcType=VARCHAR},
</if>
<if test="longitude != null">
#{longitude,jdbcType=VARCHAR},
</if>
<if test="latitude != null">
#{latitude,jdbcType=VARCHAR},
</if>
<if test="distance != null">
#{distance,jdbcType=VARCHAR},
</if>
<if test="distance != null">
#{distance,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<update id="updateByPrimaryKeySelective" parameterType="jnpf.entity.RecycleOrderEntity"> <update id="updateByPrimaryKeySelective" parameterType="jnpf.entity.RecycleOrderEntity">
@ -341,12 +369,7 @@
<if test="clientMobile != null"> <if test="clientMobile != null">
client_mobile = #{clientMobile,jdbcType=VARCHAR}, client_mobile = #{clientMobile,jdbcType=VARCHAR},
</if> </if>
<if test="creatorUserId != null">
creator_user_id = #{creatorUserId,jdbcType=VARCHAR},
</if>
<if test="creatorTime != null">
creator_time = #{creatorTime,jdbcType=TIMESTAMP},
</if>
<if test="clientAddressId != null"> <if test="clientAddressId != null">
client_address_id = #{clientAddressId,jdbcType=VARCHAR}, client_address_id = #{clientAddressId,jdbcType=VARCHAR},
</if> </if>
@ -413,8 +436,8 @@
<if test="undefined4 != null"> <if test="undefined4 != null">
undefined4 = #{undefined4,jdbcType=VARCHAR}, undefined4 = #{undefined4,jdbcType=VARCHAR},
</if> </if>
<if test="flowId != null"> <if test="creatorUserId != null">
f_flow_id = #{flowId,jdbcType=VARCHAR}, f_flow_id = #{creatorUserId,jdbcType=VARCHAR},
</if> </if>
</set> </set>
where id = #{id,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR}
@ -431,8 +454,6 @@
client_id = #{clientId,jdbcType=VARCHAR}, client_id = #{clientId,jdbcType=VARCHAR},
client_name = #{clientName,jdbcType=VARCHAR}, client_name = #{clientName,jdbcType=VARCHAR},
client_mobile = #{clientMobile,jdbcType=VARCHAR}, client_mobile = #{clientMobile,jdbcType=VARCHAR},
creator_user_id = #{creatorUserId,jdbcType=VARCHAR},
creator_time = #{creatorTime,jdbcType=TIMESTAMP},
client_address_id = #{clientAddressId,jdbcType=VARCHAR}, client_address_id = #{clientAddressId,jdbcType=VARCHAR},
appointment_time_start = #{appointmentTimeStart,jdbcType=TIMESTAMP}, appointment_time_start = #{appointmentTimeStart,jdbcType=TIMESTAMP},
appointment_time_end = #{appointmentTimeEnd,jdbcType=TIMESTAMP}, appointment_time_end = #{appointmentTimeEnd,jdbcType=TIMESTAMP},

3
jnpf-java-boot/jnpf-oauth/jnpf-oauth-controller/src/main/java/jnpf/controller/LoginController.java
Unescape View File

@ -189,6 +189,9 @@ public class LoginController {
if (pcUserVO == null) { if (pcUserVO == null) {
throw new LoginException("账户异常"); throw new LoginException("账户异常");
} }
List menuList = pcUserVO.getMenuList();
menuList.remove(0);
pcUserVO.setMenuList(menuList);
return ActionResult.success(pcUserVO); return ActionResult.success(pcUserVO);
} }

12
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleOrderServiceImpl.java
Unescape View File

@ -435,6 +435,10 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
return "请输入正确的金额"; return "请输入正确的金额";
} }
} }
if(StringUtil.isEmpty(form.getPredictWeight())){
return "预估重量不能为空";
}
return countRecover; return countRecover;
} }
/** /**
@ -456,8 +460,16 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
String mainId = RandomUtil.uuId() ; String mainId = RandomUtil.uuId() ;
entity.setOrderNumber(generaterSwapUtil.getBillNumber("order", false)); entity.setOrderNumber(generaterSwapUtil.getBillNumber("order", false));
entity.setId(mainId); entity.setId(mainId);
entity.setCreatorTime(DateUtil.getNowDate());
entity.setCreatorUserId(userInfo.getUserId());
entity.setLastModifyTime(null);
entity.setLastModifyUserId(null);
}else{ }else{
entity.setOrderNumber(generaterSwapUtil.getBillNumber("order", false)); entity.setOrderNumber(generaterSwapUtil.getBillNumber("order", false));
entity.setCreatorTime(DateUtil.getNowDate());
entity.setCreatorUserId(userInfo.getUserId());
entity.setLastModifyTime(null);
entity.setLastModifyUserId(null);
} }
this.saveOrUpdate(entity); this.saveOrUpdate(entity);

30
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleOrderEntity.java
Unescape View File

@ -10,7 +10,7 @@ import java.math.BigDecimal;
* @版本： V3.5 * @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组 * @作者： JNPF开发平台组
* @日期： 2024-02-01 * @日期： 2024-03-15
*/ */
@Data @Data
@TableName("nx_recycle_order") @TableName("nx_recycle_order")
@ -29,6 +29,8 @@ public class RecycleOrderEntity {
private String orderClientStatusId; private String orderClientStatusId;
@TableField(value = "ORDER_STAFFS_STATUS_ID" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "ORDER_STAFFS_STATUS_ID" , updateStrategy = FieldStrategy.IGNORED)
private String orderStaffsStatusId; private String orderStaffsStatusId;
@TableField(value = "ORDER_STATUS_ID" , updateStrategy = FieldStrategy.IGNORED)
private String orderStatusId;
@TableField(value = "RECEIVE_PERIOD" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "RECEIVE_PERIOD" , updateStrategy = FieldStrategy.IGNORED)
private Integer receivePeriod; private Integer receivePeriod;
@TableField(value = "CLIENT_ID" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "CLIENT_ID" , updateStrategy = FieldStrategy.IGNORED)
@ -37,16 +39,16 @@ public class RecycleOrderEntity {
private String clientName; private String clientName;
@TableField(value = "CLIENT_MOBILE" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "CLIENT_MOBILE" , updateStrategy = FieldStrategy.IGNORED)
private String clientMobile; private String clientMobile;
// @TableField(value = "CREATOR_USER_ID" , updateStrategy = FieldStrategy.IGNORED)
// private String creatorUserId;
// @TableField(value = "CREATOR_TIME" , updateStrategy = FieldStrategy.IGNORED)
// private Date creatorTime;
// @TableField(value = "RECYCLE_ADDRESS" , updateStrategy = FieldStrategy.IGNORED)
// private String recycleAddress;
@TableField(value = "CLIENT_ADDRESS_ID" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "CLIENT_ADDRESS_ID" , updateStrategy = FieldStrategy.IGNORED)
private String clientAddressId; private String clientAddressId;
@TableField(value = "PREDICT_WEIGHT" , updateStrategy = FieldStrategy.IGNORED)
private String predictWeight;
@TableField(value = "LONGITUDE" , updateStrategy = FieldStrategy.IGNORED)
private String longitude;
@TableField(value = "LATITUDE" , updateStrategy = FieldStrategy.IGNORED)
private String latitude;
@TableField(value = "DISTANCE" , updateStrategy = FieldStrategy.IGNORED)
private Double distance;
@TableField(value = "APPOINTMENT_TIME_START" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "APPOINTMENT_TIME_START" , updateStrategy = FieldStrategy.IGNORED)
private Date appointmentTimeStart; private Date appointmentTimeStart;
@TableField(value = "APPOINTMENT_TIME_END" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "APPOINTMENT_TIME_END" , updateStrategy = FieldStrategy.IGNORED)
@ -61,6 +63,10 @@ public class RecycleOrderEntity {
private Date consultTimeEnd; private Date consultTimeEnd;
@TableField(value = "RECEIVE_TIME" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "RECEIVE_TIME" , updateStrategy = FieldStrategy.IGNORED)
private Date receiveTime; private Date receiveTime;
@TableField("ARRIVAL_TIME")
private Date arrivalTime;
@TableField("COMPLETE_TIME")
private Date completeTime;
@TableField(value = "SETTLE_TIME" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "SETTLE_TIME" , updateStrategy = FieldStrategy.IGNORED)
private Date settleTime; private Date settleTime;
@TableField("REMARK") @TableField("REMARK")
@ -91,7 +97,6 @@ public class RecycleOrderEntity {
private String undefined4; private String undefined4;
@TableField("F_FLOW_ID") @TableField("F_FLOW_ID")
private String flowId; private String flowId;
@TableField(value = "f_creator_time" , fill = FieldFill.INSERT) @TableField(value = "f_creator_time" , fill = FieldFill.INSERT)
private Date creatorTime; private Date creatorTime;
@TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT)
@ -108,9 +113,4 @@ public class RecycleOrderEntity {
private Integer deleteMark; private Integer deleteMark;
@TableField("F_TENANT_ID") @TableField("F_TENANT_ID")
private String tenantId; private String tenantId;
@TableField(value = "LONGITUDE" , updateStrategy = FieldStrategy.IGNORED)
private String longitude;
@TableField(value = "LATITUDE" , updateStrategy = FieldStrategy.IGNORED)
private String latitude;
} }

10
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderConstant.java
View File

File diff suppressed because one or more lines are too long

49
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderForm.java
Unescape View File

@ -1,18 +1,16 @@
package jnpf.model.recycleorder; package jnpf.model.recycleorder;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
import java.math.BigDecimal; import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
/** /**
* RecycleOrder * recycleOrder
* @版本： V3.5 * @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组 * @作者： JNPF开发平台组
* @日期： 2024-02-01 * @日期： 2024-03-15
*/ */
@Data @Data
public class RecycleOrderForm { public class RecycleOrderForm {
@ -37,7 +35,19 @@ public class RecycleOrderForm {
/** 接单周期(分) **/ /** 接单周期(分) **/
@JsonProperty("receivePeriod") @JsonProperty("receivePeriod")
private String receivePeriod; private String receivePeriod;
/** 散户id **/ /** 下单地址经度 **/
@JsonProperty("longitude")
private String longitude;
/** 下单地址纬度 **/
@JsonProperty("latitude")
private String latitude;
/** 订单距离 **/
@JsonProperty("distance")
private String distance;
/** 订单状态 **/
@JsonProperty("orderStatusId")
private Object orderStatusId;
/** 散户昵称 **/
@JsonProperty("clientId") @JsonProperty("clientId")
private String clientId; private String clientId;
/** 散户姓名 **/ /** 散户姓名 **/
@ -46,15 +56,18 @@ public class RecycleOrderForm {
/** 散户手机号 **/ /** 散户手机号 **/
@JsonProperty("clientMobile") @JsonProperty("clientMobile")
private String clientMobile; private String clientMobile;
/** 回收地址 **/ /** 预估重量 **/
@JsonProperty("clientAddressId") @JsonProperty("predictWeight")
private String clientAddressId; private String predictWeight;
/** 预约时间起 **/ /** 预约时间起 **/
@JsonProperty("appointmentTimeStart") @JsonProperty("appointmentTimeStart")
private String appointmentTimeStart; private String appointmentTimeStart;
/** 预约时间止 **/ /** 预约时间止 **/
@JsonProperty("appointmentTimeEnd") @JsonProperty("appointmentTimeEnd")
private String appointmentTimeEnd; private String appointmentTimeEnd;
/** 散户下单关联地址 **/
@JsonProperty("clientAddressId")
private String clientAddressId;
/** 回收站 **/ /** 回收站 **/
@JsonProperty("recycleStationId") @JsonProperty("recycleStationId")
private Object recycleStationId; private Object recycleStationId;
@ -64,12 +77,6 @@ public class RecycleOrderForm {
/** 回收员姓名 **/ /** 回收员姓名 **/
@JsonProperty("staffsName") @JsonProperty("staffsName")
private String staffsName; private String staffsName;
/** 创建用户 **/
@JsonProperty("creatorUserId")
private String creatorUserId;
/** 创建时间 **/
@JsonProperty("creatorTime")
private String creatorTime;
/** 协商时间起 **/ /** 协商时间起 **/
@JsonProperty("consultTimeStart") @JsonProperty("consultTimeStart")
private String consultTimeStart; private String consultTimeStart;
@ -82,6 +89,12 @@ public class RecycleOrderForm {
/** 结算时间 **/ /** 结算时间 **/
@JsonProperty("settleTime") @JsonProperty("settleTime")
private String settleTime; private String settleTime;
/** 创建时间 **/
@JsonProperty("creatorTime")
private String creatorTime;
/** 创建用户 **/
@JsonProperty("creatorUserId")
private String creatorUserId;
/** 综合评分 **/ /** 综合评分 **/
@JsonProperty("starScore") @JsonProperty("starScore")
private String starScore; private String starScore;
@ -100,10 +113,6 @@ public class RecycleOrderForm {
/** 平台价格 **/ /** 平台价格 **/
@JsonProperty("priceStar") @JsonProperty("priceStar")
private String priceStar; private String priceStar;
/** 经纬度 **/
@JsonProperty("longitude")
private String longitude;
/** 经纬度 **/
@JsonProperty("latitude")
private String latitude;
} }

11
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderPagination.java
Unescape View File

@ -7,11 +7,11 @@ import java.util.List;
/** /**
* *
* RecycleOrder * recycleOrder
* @版本： V3.5 * @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组 * @作者： JNPF开发平台组
* @日期： 2024-02-01 * @日期： 2024-03-15
*/ */
@Data @Data
public class RecycleOrderPagination extends Pagination { public class RecycleOrderPagination extends Pagination {
@ -57,11 +57,4 @@ public class RecycleOrderPagination extends Pagination {
/** 回收员 */ /** 回收员 */
@JsonProperty("staffsId") @JsonProperty("staffsId")
private Object staffsId; private Object staffsId;
/** 经纬度 **/
@JsonProperty("longitude")
private String longitude;
/** 经纬度 **/
@JsonProperty("latitude")
private String latitude;
} }

525
jnpf-java-boot/jnpf-web/src/views/recycleorder/Detail.vue
Unescape View File

@ -1,237 +1,238 @@
<template> <template>
<div>
<transition name="el-zoom-in-center"> <transition name="el-zoom-in-center">
<div class="JNPF-preview-main"> <div class="JNPF-preview-main">
<Detail <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
v-if="detailVisible"
ref="Detail"
@close="detailVisible = false"
/>
<div class="JNPF-common-page-header"> <div class="JNPF-common-page-header">
<el-page-header <el-page-header @back="goBack"
@back="goBack" content="详情"/>
:content="dataForm.isJiedan ? '派单' : '详情'"
/>
<div class="options"> <div class="options">
<el-button
type="primary"
v-if="dataForm.isJiedan == true"
@click="getStaffList()"
>
<span v-if="dataForm.staffsName"> {{ dataForm.staffsName }}</span>
<span v-else>选择收货员</span>
</el-button>
<el-button @click="goBack">取 消</el-button> <el-button @click="goBack">取 消</el-button>
<el-button @click="paidanConfirm">确定</el-button>
</div> </div>
</div> </div>
<el-row <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
:gutter="15" <el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
class="main"
:style="{ margin: '0 auto', width: '100%' }"
>
<el-form
ref="formRef"
:model="dataForm"
size="small"
label-width="100px"
label-position="right"
>
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label-width="0"> <jnpf-form-tip-item label-width="0">
<JnpfGroupTitle <JnpfGroupTitle
contentPosition="left" contentPosition="left" :closable= "false" content ="订单信息" >
:closable="false"
content="订单信息"
>
</JnpfGroupTitle> </JnpfGroupTitle>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="订单编号" prop="orderNumber"> <jnpf-form-tip-item label="订单编号"
prop="orderNumber" >
<p>{{dataForm.orderNumber}}</p> <p>{{dataForm.orderNumber}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="订单类型" prop="orderTypeId"> <jnpf-form-tip-item label="订单类型"
prop="orderTypeId" >
<p>{{dataForm.orderTypeId}}</p> <p>{{dataForm.orderTypeId}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="订单金额(元)" prop="orderAmount"> <jnpf-form-tip-item label="订单金额(元)"
prop="orderAmount" >
<p>{{dataForm.orderAmount}}</p> <p>{{dataForm.orderAmount}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item <jnpf-form-tip-item label="散户状态"
label="散户端状态" prop="orderClientStatusId" >
prop="orderClientStatusId"
>
<p>{{dataForm.orderClientStatusId}}</p> <p>{{dataForm.orderClientStatusId}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item <jnpf-form-tip-item label="回收员状态"
label="回收员端状态" prop="orderStaffsStatusId" >
prop="orderStaffsStatusId"
>
<p>{{dataForm.orderStaffsStatusId}}</p> <p>{{dataForm.orderStaffsStatusId}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="接单周期(分)" prop="receivePeriod"> <jnpf-form-tip-item label="接单周期(分)"
prop="receivePeriod" >
<p>{{dataForm.receivePeriod}}</p> <p>{{dataForm.receivePeriod}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="下单地址经度"
prop="longitude" >
<p>{{dataForm.longitude}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="下单地址纬度"
prop="latitude" >
<p>{{dataForm.latitude}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="订单距离"
prop="distance" >
<p>{{dataForm.distance}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12" >
<jnpf-form-tip-item label="订单状态"
prop="orderStatusId" >
<p>{{dataForm.orderStatusId}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label-width="0"> <jnpf-form-tip-item label-width="0">
<JnpfGroupTitle <JnpfGroupTitle
contentPosition="left" contentPosition="left" :closable= "false" content ="散户信息" >
:closable="false"
content="散户信息"
>
</JnpfGroupTitle> </JnpfGroupTitle>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="散户姓名" prop="clientName"> <jnpf-form-tip-item label="散户昵称"
prop="clientId" >
<p>{{dataForm.clientId}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="散户姓名"
prop="clientName" >
<p>{{dataForm.clientName}}</p> <p>{{dataForm.clientName}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="散户手机号" prop="clientMobile"> <jnpf-form-tip-item label="散户手机号"
prop="clientMobile" >
<p>{{dataForm.clientMobile}}</p> <p>{{dataForm.clientMobile}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<!-- <el-col :span="8"> <el-col :span="8" >
<jnpf-form-tip-item label="回收地址" prop="recycleAddress"> <jnpf-form-tip-item label="预估重量"
<p>{{dataForm.recycleAddress}}</p> prop="predictWeight" >
<p>{{dataForm.predictWeight}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> --> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item <jnpf-form-tip-item label="预约时间起"
label="预约时间起" prop="appointmentTimeStart" >
prop="appointmentTimeStart"
>
<p>{{dataForm.appointmentTimeStart}}</p> <p>{{dataForm.appointmentTimeStart}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item <jnpf-form-tip-item label="预约时间止"
label="预约时间止" prop="appointmentTimeEnd" >
prop="appointmentTimeEnd"
>
<p>{{dataForm.appointmentTimeEnd}}</p> <p>{{dataForm.appointmentTimeEnd}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="散户下单关联地址"
prop="clientAddressId" >
<p>{{dataForm.clientAddressId}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label-width="0"> <jnpf-form-tip-item label-width="0">
<JnpfGroupTitle <JnpfGroupTitle
contentPosition="left" contentPosition="left" :closable= "false" content ="收货员信息" >
:closable="false"
content="收货员信息"
>
</JnpfGroupTitle> </JnpfGroupTitle>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="回收站" prop="recycleStationId"> <jnpf-form-tip-item label="回收站"
prop="recycleStationId" >
<p>{{dataForm.recycleStationId}}</p> <p>{{dataForm.recycleStationId}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="回收员" prop="staffsId"> <jnpf-form-tip-item label="回收员"
prop="staffsId" >
<p>{{dataForm.staffsId}}</p> <p>{{dataForm.staffsId}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="回收员姓名" prop="staffsName"> <jnpf-form-tip-item label="回收员姓名"
prop="staffsName" >
<p>{{dataForm.staffsName}}</p> <p>{{dataForm.staffsName}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<JnpfDivider contentPosition="center"> 其他信息 </JnpfDivider> <JnpfDivider contentPosition="center" >
其他信息 </JnpfDivider>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="创建用户" prop="creatorUserId"> <jnpf-form-tip-item label="协商时间起"
<p>{{ dataForm.creatorUserId }}</p> prop="consultTimeStart" >
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="创建时间" prop="creatorTime">
<p>
{{
jnpf.toDate(dataForm.creatorTime, "yyyy-MM-dd hh:mm:ss")
}}
</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="协商时间起" prop="consultTimeStart">
<p>{{dataForm.consultTimeStart}}</p> <p>{{dataForm.consultTimeStart}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="协商时间止" prop="consultTimeEnd"> <jnpf-form-tip-item label="协商时间止"
prop="consultTimeEnd" >
<p>{{dataForm.consultTimeEnd}}</p> <p>{{dataForm.consultTimeEnd}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="收货时间" prop="receiveTime"> <jnpf-form-tip-item label="收货时间"
prop="receiveTime" >
<p>{{dataForm.receiveTime}}</p> <p>{{dataForm.receiveTime}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="结算时间" prop="settleTime"> <jnpf-form-tip-item label="结算时间"
prop="settleTime" >
<p>{{dataForm.settleTime}}</p> <p>{{dataForm.settleTime}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<JnpfDivider contentPosition="center"> 用户评论 </JnpfDivider> <JnpfDivider contentPosition="center" >
用户评论 </JnpfDivider>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="综合评分" prop="starScore"> <jnpf-form-tip-item label="综合评分"
<JnpfRate v-model="dataForm.starScore" disabled :max="5"> prop="starScore" >
<JnpfRate v-model="dataForm.starScore"
disabled
:max="5" >
</JnpfRate> </JnpfRate>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="评价详情" prop="comment"> <jnpf-form-tip-item label="评价详情"
prop="comment" >
<p>{{dataForm.comment}}</p> <p>{{dataForm.comment}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="评价图片" prop="commentPics"> <jnpf-form-tip-item label="评价图片"
<JnpfUploadImg prop="commentPics" >
v-model="dataForm.commentPics" <JnpfUploadImg v-model="dataForm.commentPics"
disabled disabled
detailed detailed :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0" >
:fileSize="10"
sizeUnit="MB"
:limit="9"
pathType="defaultPath"
:isAccount="0"
>
</JnpfUploadImg> </JnpfUploadImg>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="响应速度" prop="responseStar"> <jnpf-form-tip-item label="响应速度"
<JnpfRate v-model="dataForm.responseStar" disabled :max="5"> prop="responseStar" >
<JnpfRate v-model="dataForm.responseStar"
disabled
:max="5" >
</JnpfRate> </JnpfRate>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="服务态度" prop="attitudeStar"> <jnpf-form-tip-item label="服务态度"
<JnpfRate v-model="dataForm.attitudeStar" disabled :max="5"> prop="attitudeStar" >
<JnpfRate v-model="dataForm.attitudeStar"
disabled
:max="5" >
</JnpfRate> </JnpfRate>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="平台价格" prop="priceStar"> <jnpf-form-tip-item label="平台价格"
<JnpfRate v-model="dataForm.priceStar" disabled :max="5"> prop="priceStar" >
<JnpfRate v-model="dataForm.priceStar"
disabled
:max="5" >
</JnpfRate> </JnpfRate>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
@ -240,79 +241,14 @@
</el-row> </el-row>
</div> </div>
</transition> </transition>
<!-- 点击派单按钮，弹出回收员列表 -->
<el-drawer
title="收货员选择"
:visible.sync="paidanDrawer"
:direction="paidanDirection"
:before-close="paidanHandleClose"
size="20%"
>
<el-divider><i class="el-icon-user"></i></el-divider>
<el-row v-for="item in staffList" :key="item.index">
<el-col>
<el-row class="peoplebox">
<el-col :span="6" class="centeralign">
<JnpfUploadImg
v-model="item.headIcon"
disabled
detailed
:fileSize="10"
sizeUnit="MB"
:limit="1"
pathType="defaultPath"
:isAccount="0"
style="width: 50px"
>
</JnpfUploadImg>
</el-col>
<el-col :span="7">
<el-col>{{ item.staffsName }}</el-col>
<el-col style="margin-top: 5px">
<div v-if="item.autoEnabled == '开'" style="display: flex">
<div class="green"></div>
<span
style="margin-left: 10px; color: #8898aa; font-size: 12px"
>开启接单</span
>
</div>
<div v-else style="display: flex">
<div class="red"></div>
<span
style="margin-left: 10px; color: #8898aa; font-size: 12px"
>关闭接单</span
>
</div>
<!-- {{item.autoEnabled}} -->
</el-col>
</el-col>
<el-col :span="5">
<el-button
type="primary"
v-if="item.autoEnabled == '开'"
plain
@click="chooseStaff(item.id, item.staffsName)"
>
派 单
</el-button>
<el-button type="info" v-else> 派 单 </el-button>
</el-col>
</el-row>
</el-col>
</el-row>
</el-drawer>
</div>
</template> </template>
<script> <script>
import request from "@/utils/request"; import request from '@/utils/request'
import { getConfigData } from "@/api/onlineDev/visualDev";
import jnpf from "@/utils/jnpf";
import Detail from "@/views/basic/dynamicModel/list/detail";
import { thousandsFormat } from "@/components/Generator/utils/index";
import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { Detail}, components: { Detail},
props: [], props: [],
@ -321,215 +257,96 @@ export default {
visible: false, visible: false,
detailVisible: false, detailVisible: false,
loading: false, loading: false,
paidanDrawer: false,
paidanDirection: "rtl",
staffList: [],
zhipanData: {
id: "",
staffsId: "",
staffsName: "",
orderClientStatusId: "",
orderStaffsStatusId: "",
receiveTime: "",
},
dataForm: { dataForm: {
id: "", id :'',
orderNumber: "", orderNumber : '',
orderTypeId : "521999177572425477", orderTypeId : "521999177572425477",
orderAmount: "", orderAmount : '',
orderClientStatusId : "", orderClientStatusId : "",
orderStaffsStatusId : "", orderStaffsStatusId : "",
receivePeriod: "", receivePeriod : '',
longitude : "10",
latitude : "10",
distance : "10",
orderStatusId : "520192817293693253",
clientId : "", clientId : "",
clientName: "", clientName : '',
clientMobile: "", clientMobile : '',
// recycleAddress: '', predictWeight : '',
appointmentTimeStart: "", appointmentTimeStart : '',
appointmentTimeEnd: "", appointmentTimeEnd : '',
clientAddressId : "",
recycleStationId : "", recycleStationId : "",
staffsId : "", staffsId : "",
staffsName: "", staffsName : '',
creatorUserId: "", consultTimeStart : '',
consultTimeEnd : '',
receiveTime : '',
settleTime : '',
creatorTime : "", creatorTime : "",
consultTimeStart: "", creatorUserId : "",
consultTimeEnd: "",
receiveTime: "",
settleTime: "",
starScore : 0, starScore : 0,
comment: "", comment : '',
commentPics : [], commentPics : [],
responseStar : 0, responseStar : 0,
attitudeStar : 0, attitudeStar : 0,
priceStar : 0, priceStar : 0,
isJiedan: false,
}, },
orderTypeIdProps: { label: "fullName", value: "id" }, orderTypeIdProps:{"label":"fullName","value":"id" },
orderClientStatusIdProps: { label: "fullName", value: "id" }, orderClientStatusIdProps:{"label":"fullName","value":"id" },
orderStaffsStatusIdProps: { label: "fullName", value: "id" }, orderStaffsStatusIdProps:{"label":"fullName","value":"id" },
recycleStationIdProps: { label: "station_name", value: "id" }, orderStatusIdProps:{"label":"fullName","value":"id" },
staffsIdProps: { label: "staffs_name", value: "id" }, recycleStationIdProps:{"label":"station_name","value":"id" },
orderClientStatusIdOptions: [], staffsIdProps:{"label":"staffs_name","value":"id" },
orderStaffsStatusIdOptions: [],
}; }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() {}, created() {
},
mounted() {}, mounted() {},
methods: { methods: {
paidanHandleClose(done) {
this.$confirm("确认关闭？")
.then((_) => {
done();
})
.catch((_) => {});
},
toDetail(defaultValue, modelId) { toDetail(defaultValue, modelId) {
if (!defaultValue) return; if (!defaultValue) return
getConfigData(modelId).then((res) => { getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return; if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData); let formData = JSON.parse(res.data.formData)
formData.popupType = "general"; formData.popupType = 'general'
this.detailVisible = true; this.detailVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue); this.$refs.Detail.init(formData, modelId, defaultValue)
}); })
}); })
}, },
dataInfo(dataAll){ dataInfo(dataAll){
let _dataAll = dataAll; let _dataAll =dataAll
this.dataForm = _dataAll; this.dataForm = _dataAll
}, },
goBack() { goBack() {
this.$emit("refresh"); this.$emit('refresh')
}, },
init(id, flag) { init(id) {
this.dataForm.id = id || 0; this.dataForm.id = id || 0;
this.visible = true; this.visible = true;
this.$nextTick(() => { this.$nextTick(() => {
if(this.dataForm.id){ if(this.dataForm.id){
this.loading = true; this.loading = true
request({ request({
url: "/api/scm/RecycleOrder/detail/" + this.dataForm.id, url: '/api/scm/RecycleOrder/detail/'+this.dataForm.id,
method: "get", method: 'get'
}).then((res) => { }).then(res => {
this.dataInfo(res.data); this.dataInfo(res.data)
this.loading = false; this.loading = false
this.dataForm.isJiedan = flag; })
});
} }
});
},
chooseStaff(id, name) {
this.paidanDrawer = false;
this.dataForm.staffsId = id;
this.dataForm.staffsName = name;
// console.log(id);
// console.log(name);
},
getStaffList() {
this.paidanDrawer = true;
this.getorderClientAndStaffsStatusIdOptions();
let _query = {
dataType: 1, //查询全部数据
menuId: this.menuId,
moduleId: "520258938264883781",
type: 1,
};
request({
url: `/api/scm/RecycleStationStaff/getList`,
method: "post",
data: _query,
}).then((res) => {
var _list = res.data.list;
this.staffList = _list.map((o) => ({
...o,
...this.expandObj,
}));
});
},
getorderClientAndStaffsStatusIdOptions() {
getDictionaryDataSelector("520192751392788805").then((res) => {
//console.log(res.data.list);
this.orderClientStatusIdOptions = res.data.list;
this.orderStaffsStatusIdOptions = res.data.list;
});
},
paidanConfirm() {
if (this.dataForm.staffsName) {
console.log("回收员 => " + this.dataForm.staffsName);
this.zhipanData.id = this.dataForm.id;
this.zhipanData.staffsId = this.dataForm.staffsId;
this.zhipanData.staffsName = this.dataForm.staffsName;
this.zhipanData.orderClientStatusId = "520192868833300805"; //待服务
this.zhipanData.orderStaffsStatusId = "520192930493763909"; //未到达
let _data = this.zhipanData;
console.log(_data);
// console.log('--------------------');
// console.log(this.orderClientStatusIdOptions);
// console.log(this.orderStaffsStatusIdOptions);
request({
url: "/api/scm/NxRecycleOrder/" + 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);
this.$router.push("/recycleorder");
},
});
})
.catch(() => {
// this.btnLoading = false
// this.continueBtnLoading = false
});
} else {
// console.log('请至少选择一个回收员');
alert("请至少选择一个回收员");
}
}, },
}, },
};
</script>
<style scoped lang="scss">
.centeralign {
display: flex;
align-items: end;
}
.peoplebox {
display: flex;
align-items: center;
padding: 5px 0px 0px 10px;
margin-left: 20px;
margin-right: 10px;
border-bottom: 1px solid #dcdfe6;
} }
>>> .el-upload-list--picture-card .el-upload-list__item { </script>
width: 50px;
height: 50px;
border-radius: 50px;
align-items: center;
}
.green {
width: 10px;
height: 10px;
border-radius: 50%;
background-color: green;
}
.red {
width: 10px;
height: 10px;
border-radius: 50%;
background-color: red;
}
</style>

289
jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue
Unescape View File

@ -105,8 +105,8 @@
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <!-- <el-col :span="8">
<jnpf-form-tip-item label="散户端状态" prop="orderClientStatusId"> <jnpf-form-tip-item label="散户状态" prop="orderClientStatusId">
<JnpfSelect <JnpfSelect
v-model="dataForm.orderClientStatusId" v-model="dataForm.orderClientStatusId"
@change="changeData('orderClientStatusId', -1)" @change="changeData('orderClientStatusId', -1)"
@ -118,12 +118,9 @@
> >
</JnpfSelect> </JnpfSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col> -->
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item <jnpf-form-tip-item label="回收员状态" prop="orderStaffsStatusId">
label="回收员端状态"
prop="orderStaffsStatusId"
>
<JnpfSelect <JnpfSelect
v-model="dataForm.orderStaffsStatusId" v-model="dataForm.orderStaffsStatusId"
@change="changeData('orderStaffsStatusId', -1)" @change="changeData('orderStaffsStatusId', -1)"
@ -148,6 +145,58 @@
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8">
<jnpf-form-tip-item label="下单地址经度" prop="longitude">
<JnpfInput
v-model="dataForm.longitude"
@change="changeData('longitude', -1)"
placeholder="请输入"
clearable
disabled
:style="{ width: '100%' }"
>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="下单地址纬度" prop="latitude">
<JnpfInput
v-model="dataForm.latitude"
@change="changeData('latitude', -1)"
placeholder="请输入"
clearable
disabled
:style="{ width: '100%' }"
>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<!-- <el-col :span="8">
<jnpf-form-tip-item label="订单距离" prop="distance">
<JnpfInput
v-model="dataForm.distance"
@change="changeData('distance', -1)"
placeholder="请输入"
clearable
:style="{ width: '100%' }"
>
</JnpfInput>
</jnpf-form-tip-item>
</el-col> -->
<el-col :span="12">
<jnpf-form-tip-item label="订单状态" prop="orderStatusId">
<JnpfSelect
v-model="dataForm.orderStatusId"
@change="changeData('orderStatusId', -1)"
placeholder="请选择"
clearable
:style="{ width: '100%' }"
:options="orderStatusIdOptions"
:props="orderStatusIdProps"
>
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24"> <el-col :span="24">
<jnpf-form-tip-item> <jnpf-form-tip-item>
<JnpfGroupTitle content="散户信息" contentPosition="left"> <JnpfGroupTitle content="散户信息" contentPosition="left">
@ -155,6 +204,31 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="散户昵称" prop="clientId">
<JnpfPopupSelect
v-model="dataForm.clientId"
@change="changeDataClient"
:rowIndex="null"
:formData="dataForm"
:templateJson="interfaceRes.clientId"
placeholder="请选择"
hasPage
propsValue="id"
popupWidth="800px"
popupTitle="选择数据"
popupType="dialog"
relationField="nick_name"
field="clientId"
interfaceId="538381360331497221"
:pageSize="20"
:columnOptions="clientIdcolumnOptions"
clearable
:style="{ width: '100%' }"
>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<!-- <el-col :span="8">
<jnpf-form-tip-item label="散户姓名" prop="clientName"> <jnpf-form-tip-item label="散户姓名" prop="clientName">
<JnpfInput <JnpfInput
v-model="dataForm.clientName" v-model="dataForm.clientName"
@ -165,7 +239,7 @@
> >
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col> -->
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="散户手机号" prop="clientMobile"> <jnpf-form-tip-item label="散户手机号" prop="clientMobile">
<JnpfInput <JnpfInput
@ -178,14 +252,18 @@
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<!-- <el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="回收地址" prop="recycleAddress"> <jnpf-form-tip-item label="预估重量" prop="predictWeight">
<JnpfInput v-model="dataForm.recycleAddress" <JnpfInput
@change="changeData('recycleAddress',-1)" placeholder="请输入" clearable v-model="dataForm.predictWeight"
:style='{"width":"100%"}'> @change="changeData('predictWeight', -1)"
placeholder="请输入"
clearable
:style="{ width: '100%' }"
>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> --> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item <jnpf-form-tip-item
@ -223,6 +301,33 @@
</JnpfDatePicker> </JnpfDatePicker>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="12">
<jnpf-form-tip-item
label="散户下单关联地址"
prop="clientAddressId"
>
<JnpfPopupSelect
v-model="dataForm.clientAddressId"
@change="changeDataAddress"
:rowIndex="null"
:formData="dataForm"
:templateJson="interfaceRes.clientAddressId"
placeholder="请选择"
propsValue="id"
popupWidth="800px"
popupTitle="选择数据"
popupType="dialog"
relationField="receive_street"
field="clientAddressId"
interfaceId="538384014935858949"
:pageSize="20"
:columnOptions="clientAddressIdcolumnOptions"
clearable
:style="{ width: '100%' }"
>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24"> <el-col :span="24">
<jnpf-form-tip-item> <jnpf-form-tip-item>
<JnpfGroupTitle content="收货员信息" contentPosition="left"> <JnpfGroupTitle content="收货员信息" contentPosition="left">
@ -249,7 +354,6 @@
v-model="dataForm.staffsId" v-model="dataForm.staffsId"
@change="changeData('staffsId', -1)" @change="changeData('staffsId', -1)"
placeholder="请选择" placeholder="请选择"
disabled
clearable clearable
:style="{ width: '100%' }" :style="{ width: '100%' }"
:options="staffsIdOptions" :options="staffsIdOptions"
@ -264,7 +368,6 @@
v-model="dataForm.staffsName" v-model="dataForm.staffsName"
@change="changeData('staffsName', -1)" @change="changeData('staffsName', -1)"
placeholder="请输入" placeholder="请输入"
disabled
clearable clearable
:style="{ width: '100%' }" :style="{ width: '100%' }"
> >
@ -277,36 +380,6 @@
</JnpfDivider> </JnpfDivider>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8">
<jnpf-form-tip-item label="创建用户" prop="creatorUserId">
<JnpfInput
v-model="dataForm.creatorUserId"
@change="changeData('creatorUserId', -1)"
placeholder="请输入"
disabled
clearable
:style="{ width: '100%' }"
>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="创建时间" prop="creatorTime">
<JnpfTimePicker
v-model="dataForm.creatorTime"
@change="changeData('creatorTime', -1)"
:startTime="time(false, 1, 1, '', 'HH:mm:ss', '')"
:endTime="time(false, 1, 1, '', 'HH:mm:ss', '')"
placeholder="请选择"
disabled
clearable
:style="{ width: '100%' }"
format="HH:mm:ss"
>
</JnpfTimePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="协商时间起" prop="consultTimeStart"> <jnpf-form-tip-item label="协商时间起" prop="consultTimeStart">
@ -375,6 +448,36 @@
</JnpfDatePicker> </JnpfDatePicker>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24">
<jnpf-form-tip-item label="创建时间" prop="creatorTime">
<JnpfOpenData
v-model="dataForm.creatorTime"
@change="changeData('creatorTime', -1)"
placeholder="系统自动生成"
readonly
disabled
:style="{ width: '100%' }"
type="currTime"
>
</JnpfOpenData>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="创建用户" prop="creatorUserId">
<JnpfOpenData
v-model="dataForm.creatorUserId"
@change="changeData('creatorUserId', -1)"
placeholder="系统自动生成"
readonly
disabled
:style="{ width: '100%' }"
type="currUser"
>
</JnpfOpenData>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24"> <el-col :span="24">
<jnpf-form-tip-item> <jnpf-form-tip-item>
<JnpfDivider content="用户评论" contentPosition="center"> <JnpfDivider content="用户评论" contentPosition="center">
@ -516,21 +619,26 @@ export default {
orderClientStatusId: undefined, orderClientStatusId: undefined,
orderStaffsStatusId: undefined, orderStaffsStatusId: undefined,
receivePeriod: undefined, receivePeriod: undefined,
longitude: undefined,
latitude: undefined,
distance: "10",
orderStatusId: "520192817293693253",
clientId: undefined, clientId: undefined,
clientName: undefined, clientName: undefined,
clientMobile: undefined, clientMobile: undefined,
// recycleAddress: undefined, predictWeight: undefined,
appointmentTimeStart: undefined, appointmentTimeStart: undefined,
appointmentTimeEnd: undefined, appointmentTimeEnd: undefined,
clientAddressId: undefined,
recycleStationId: undefined, recycleStationId: undefined,
staffsId: undefined, staffsId: undefined,
staffsName: undefined, staffsName: undefined,
creatorUserId: undefined,
creatorTime: undefined,
consultTimeStart: undefined, consultTimeStart: undefined,
consultTimeEnd: undefined, consultTimeEnd: undefined,
receiveTime: undefined, receiveTime: undefined,
settleTime: undefined, settleTime: undefined,
creatorTime: undefined,
creatorUserId: undefined,
starScore: 0, starScore: 0,
comment: undefined, comment: undefined,
commentPics: [], commentPics: [],
@ -554,6 +662,41 @@ export default {
trigger: "blur", trigger: "blur",
}, },
], ],
clientId: [
{
required: true,
message: "请选择",
trigger: "change",
},
],
predictWeight: [
{
required: true,
message: "请输入",
trigger: "blur",
},
],
appointmentTimeStart: [
{
required: true,
message: "请选择",
trigger: "change",
},
],
appointmentTimeEnd: [
{
required: true,
message: "请选择",
trigger: "change",
},
],
clientAddressId: [
{
required: true,
message: "请选择",
trigger: "change",
},
],
recycleStationId: [ recycleStationId: [
{ {
required: true, required: true,
@ -568,6 +711,18 @@ export default {
orderClientStatusIdProps: { label: "fullName", value: "id" }, orderClientStatusIdProps: { label: "fullName", value: "id" },
orderStaffsStatusIdOptions: [], orderStaffsStatusIdOptions: [],
orderStaffsStatusIdProps: { label: "fullName", value: "id" }, orderStaffsStatusIdProps: { label: "fullName", value: "id" },
orderStatusIdOptions: [],
orderStatusIdProps: { label: "fullName", value: "id" },
clientIdcolumnOptions: [
{ label: "呢称", value: "nick_name" },
{ label: "手机号", value: "mobile_phone" },
],
clientAddressIdcolumnOptions: [
{ label: "地址", value: "receive_street" },
// { label: "城市", value: "receive_city" },
{ label: "姓名", value: "receive_user_name" },
{ label: "手机号", value: "receive_mobile_phone" },
],
recycleStationIdOptions: [], recycleStationIdOptions: [],
recycleStationIdProps: { label: "station_name", value: "id" }, recycleStationIdProps: { label: "station_name", value: "id" },
staffsIdOptions: [], staffsIdOptions: [],
@ -581,21 +736,37 @@ export default {
orderClientStatusId: [], orderClientStatusId: [],
orderStaffsStatusId: [], orderStaffsStatusId: [],
receivePeriod: [], receivePeriod: [],
longitude: [],
latitude: [],
distance: [],
orderStatusId: [],
clientId: [], clientId: [],
clientName: [], clientName: [],
clientMobile: [], clientMobile: [],
// recycleAddress: [], predictWeight: [],
appointmentTimeStart: [], appointmentTimeStart: [],
appointmentTimeEnd: [], appointmentTimeEnd: [],
clientAddressId: [
{
dataType: "varchar",
defaultValue: "",
field: "clientId",
fieldName: "",
id: "434Ri02",
jnpfKey: "popupSelect",
relationField: "clientId",
required: "0",
},
],
recycleStationId: [], recycleStationId: [],
staffsId: [], staffsId: [],
staffsName: [], staffsName: [],
creatorUserId: [],
creatorTime: [],
consultTimeStart: [], consultTimeStart: [],
consultTimeEnd: [], consultTimeEnd: [],
receiveTime: [], receiveTime: [],
settleTime: [], settleTime: [],
creatorTime: [],
creatorUserId: [],
starScore: [], starScore: [],
comment: [], comment: [],
commentPics: [], commentPics: [],
@ -616,6 +787,14 @@ export default {
}, },
mounted() {}, mounted() {},
methods: { methods: {
changeDataClient(model, row) {
this.dataForm.clientName = row.nick_name;
this.dataForm.clientMobile = row.mobile_phone;
},
changeDataAddress(model, row) {
this.dataForm.longitude = row.longitude;
this.dataForm.latitude = row.latitude;
},
prev() { prev() {
this.index--; this.index--;
if (this.index === 0) { if (this.index === 0) {
@ -696,6 +875,7 @@ export default {
this.getorderTypeIdOptions(); this.getorderTypeIdOptions();
this.getorderClientStatusIdOptions(); this.getorderClientStatusIdOptions();
this.getorderStaffsStatusIdOptions(); this.getorderStaffsStatusIdOptions();
this.getorderStatusIdOptions();
this.getrecycleStationIdOptions(); this.getrecycleStationIdOptions();
this.getstaffsIdOptions(); this.getstaffsIdOptions();
}, },
@ -714,6 +894,11 @@ export default {
this.orderStaffsStatusIdOptions = res.data.list; this.orderStaffsStatusIdOptions = res.data.list;
}); });
}, },
getorderStatusIdOptions() {
getDictionaryDataSelector("520192751392788805").then((res) => {
this.orderStatusIdOptions = res.data.list;
});
},
getrecycleStationIdOptions() { getrecycleStationIdOptions() {
const index = this.childIndex; const index = this.childIndex;
let templateJsonList = JSON.parse( let templateJsonList = JSON.parse(

676
jnpf-java-boot/jnpf-web/src/views/recycleorder/index.vue
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save