回收订单和其他修改u

master
CJYXTX\27961 7 months ago
parent d9314eb538
commit eb881db187

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

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

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

@ -10,7 +10,7 @@ import java.math.BigDecimal;
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-02-01
* @ 2024-03-15
*/
@Data
@TableName("nx_recycle_order")
@ -29,6 +29,8 @@ public class RecycleOrderEntity {
private String orderClientStatusId;
@TableField(value = "ORDER_STAFFS_STATUS_ID" , updateStrategy = FieldStrategy.IGNORED)
private String orderStaffsStatusId;
@TableField(value = "ORDER_STATUS_ID" , updateStrategy = FieldStrategy.IGNORED)
private String orderStatusId;
@TableField(value = "RECEIVE_PERIOD" , updateStrategy = FieldStrategy.IGNORED)
private Integer receivePeriod;
@TableField(value = "CLIENT_ID" , updateStrategy = FieldStrategy.IGNORED)
@ -37,16 +39,16 @@ public class RecycleOrderEntity {
private String clientName;
@TableField(value = "CLIENT_MOBILE" , updateStrategy = FieldStrategy.IGNORED)
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)
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)
private Date appointmentTimeStart;
@TableField(value = "APPOINTMENT_TIME_END" , updateStrategy = FieldStrategy.IGNORED)
@ -61,6 +63,10 @@ public class RecycleOrderEntity {
private Date consultTimeEnd;
@TableField(value = "RECEIVE_TIME" , updateStrategy = FieldStrategy.IGNORED)
private Date receiveTime;
@TableField("ARRIVAL_TIME")
private Date arrivalTime;
@TableField("COMPLETE_TIME")
private Date completeTime;
@TableField(value = "SETTLE_TIME" , updateStrategy = FieldStrategy.IGNORED)
private Date settleTime;
@TableField("REMARK")
@ -91,7 +97,6 @@ public class RecycleOrderEntity {
private String undefined4;
@TableField("F_FLOW_ID")
private String flowId;
@TableField(value = "f_creator_time" , fill = FieldFill.INSERT)
private Date creatorTime;
@TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT)
@ -108,9 +113,4 @@ public class RecycleOrderEntity {
private Integer deleteMark;
@TableField("F_TENANT_ID")
private String tenantId;
@TableField(value = "LONGITUDE" , updateStrategy = FieldStrategy.IGNORED)
private String longitude;
@TableField(value = "LATITUDE" , updateStrategy = FieldStrategy.IGNORED)
private String latitude;
}

@ -1,18 +1,16 @@
package jnpf.model.recycleorder;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.util.List;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* RecycleOrder
* recycleOrder
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-02-01
* @ 2024-03-15
*/
@Data
public class RecycleOrderForm {
@ -37,7 +35,19 @@ public class RecycleOrderForm {
/** 接单周期(分) **/
@JsonProperty("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")
private String clientId;
/** 散户姓名 **/
@ -46,15 +56,18 @@ public class RecycleOrderForm {
/** 散户手机号 **/
@JsonProperty("clientMobile")
private String clientMobile;
/** 回收地址 **/
@JsonProperty("clientAddressId")
private String clientAddressId;
/** 预估重量 **/
@JsonProperty("predictWeight")
private String predictWeight;
/** 预约时间起 **/
@JsonProperty("appointmentTimeStart")
private String appointmentTimeStart;
/** 预约时间止 **/
@JsonProperty("appointmentTimeEnd")
private String appointmentTimeEnd;
/** 散户下单关联地址 **/
@JsonProperty("clientAddressId")
private String clientAddressId;
/** 回收站 **/
@JsonProperty("recycleStationId")
private Object recycleStationId;
@ -64,12 +77,6 @@ public class RecycleOrderForm {
/** 回收员姓名 **/
@JsonProperty("staffsName")
private String staffsName;
/** 创建用户 **/
@JsonProperty("creatorUserId")
private String creatorUserId;
/** 创建时间 **/
@JsonProperty("creatorTime")
private String creatorTime;
/** 协商时间起 **/
@JsonProperty("consultTimeStart")
private String consultTimeStart;
@ -82,6 +89,12 @@ public class RecycleOrderForm {
/** 结算时间 **/
@JsonProperty("settleTime")
private String settleTime;
/** 创建时间 **/
@JsonProperty("creatorTime")
private String creatorTime;
/** 创建用户 **/
@JsonProperty("creatorUserId")
private String creatorUserId;
/** 综合评分 **/
@JsonProperty("starScore")
private String starScore;
@ -100,10 +113,6 @@ public class RecycleOrderForm {
/** 平台价格 **/
@JsonProperty("priceStar")
private String priceStar;
/** 经纬度 **/
@JsonProperty("longitude")
private String longitude;
/** 经纬度 **/
@JsonProperty("latitude")
private String latitude;
}

@ -7,11 +7,11 @@ import java.util.List;
/**
*
* RecycleOrder
* recycleOrder
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-02-01
* @ 2024-03-15
*/
@Data
public class RecycleOrderPagination extends Pagination {
@ -57,11 +57,4 @@ public class RecycleOrderPagination extends Pagination {
/** 回收员 */
@JsonProperty("staffsId")
private Object staffsId;
/** 经纬度 **/
@JsonProperty("longitude")
private String longitude;
/** 经纬度 **/
@JsonProperty("latitude")
private String latitude;
}

@ -1,237 +1,238 @@
<template>
<div>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<Detail
v-if="detailVisible"
ref="Detail"
@close="detailVisible = false"
/>
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header
@back="goBack"
:content="dataForm.isJiedan ? '派单' : '详情'"
/>
<el-page-header @back="goBack"
content="详情"/>
<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="paidanConfirm"></el-button>
</div>
</div>
<el-row
:gutter="15"
class="main"
:style="{ margin: '0 auto', width: '100%' }"
>
<el-form
ref="formRef"
:model="dataForm"
size="small"
label-width="100px"
label-position="right"
>
<el-row :gutter="15" 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">
<el-col :span="24" >
<jnpf-form-tip-item label-width="0">
<JnpfGroupTitle
contentPosition="left"
:closable="false"
content="订单信息"
>
contentPosition="left" :closable= "false" content ="订单信息" >
</JnpfGroupTitle>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="订单编号" prop="orderNumber">
<jnpf-form-tip-item label="订单编号"
prop="orderNumber" >
<p>{{dataForm.orderNumber}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="订单类型" prop="orderTypeId">
<jnpf-form-tip-item label="订单类型"
prop="orderTypeId" >
<p>{{dataForm.orderTypeId}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="订单金额(元)" prop="orderAmount">
<jnpf-form-tip-item label="订单金额(元)"
prop="orderAmount" >
<p>{{dataForm.orderAmount}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="散户端状态"
prop="orderClientStatusId"
>
<jnpf-form-tip-item label="散户状态"
prop="orderClientStatusId" >
<p>{{dataForm.orderClientStatusId}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="回收员端状态"
prop="orderStaffsStatusId"
>
<jnpf-form-tip-item label="回收员状态"
prop="orderStaffsStatusId" >
<p>{{dataForm.orderStaffsStatusId}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="接单周期(分)" prop="receivePeriod">
<jnpf-form-tip-item label="接单周期(分)"
prop="receivePeriod" >
<p>{{dataForm.receivePeriod}}</p>
</jnpf-form-tip-item>
</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" >
<jnpf-form-tip-item label-width="0">
<JnpfGroupTitle
contentPosition="left"
:closable="false"
content="散户信息"
>
contentPosition="left" :closable= "false" content ="散户信息" >
</JnpfGroupTitle>
</jnpf-form-tip-item>
</el-col>
<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>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="散户手机号" prop="clientMobile">
<jnpf-form-tip-item label="散户手机号"
prop="clientMobile" >
<p>{{dataForm.clientMobile}}</p>
</jnpf-form-tip-item>
</el-col>
<!-- <el-col :span="8">
<jnpf-form-tip-item label="回收地址" prop="recycleAddress">
<p>{{dataForm.recycleAddress}}</p>
<el-col :span="8" >
<jnpf-form-tip-item label="预估重量"
prop="predictWeight" >
<p>{{dataForm.predictWeight}}</p>
</jnpf-form-tip-item>
</el-col> -->
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="预约时间起"
prop="appointmentTimeStart"
>
<jnpf-form-tip-item label="预约时间起"
prop="appointmentTimeStart" >
<p>{{dataForm.appointmentTimeStart}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="预约时间止"
prop="appointmentTimeEnd"
>
<jnpf-form-tip-item label="预约时间止"
prop="appointmentTimeEnd" >
<p>{{dataForm.appointmentTimeEnd}}</p>
</jnpf-form-tip-item>
</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" >
<jnpf-form-tip-item label-width="0">
<JnpfGroupTitle
contentPosition="left"
:closable="false"
content="收货员信息"
>
contentPosition="left" :closable= "false" content ="收货员信息" >
</JnpfGroupTitle>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="回收站" prop="recycleStationId">
<jnpf-form-tip-item label="回收站"
prop="recycleStationId" >
<p>{{dataForm.recycleStationId}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="回收员" prop="staffsId">
<jnpf-form-tip-item label="回收员"
prop="staffsId" >
<p>{{dataForm.staffsId}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="回收员姓名" prop="staffsName">
<jnpf-form-tip-item label="回收员姓名"
prop="staffsName" >
<p>{{dataForm.staffsName}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<JnpfDivider contentPosition="center"> 其他信息 </JnpfDivider>
<JnpfDivider contentPosition="center" >
其他信息 </JnpfDivider>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="创建用户" prop="creatorUserId">
<p>{{ dataForm.creatorUserId }}</p>
</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">
<jnpf-form-tip-item label="协商时间起"
prop="consultTimeStart" >
<p>{{dataForm.consultTimeStart}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="协商时间止" prop="consultTimeEnd">
<jnpf-form-tip-item label="协商时间止"
prop="consultTimeEnd" >
<p>{{dataForm.consultTimeEnd}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="收货时间" prop="receiveTime">
<jnpf-form-tip-item label="收货时间"
prop="receiveTime" >
<p>{{dataForm.receiveTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="结算时间" prop="settleTime">
<jnpf-form-tip-item label="结算时间"
prop="settleTime" >
<p>{{dataForm.settleTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<JnpfDivider contentPosition="center"> 用户评论 </JnpfDivider>
<JnpfDivider contentPosition="center" >
用户评论 </JnpfDivider>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="综合评分" prop="starScore">
<JnpfRate v-model="dataForm.starScore" disabled :max="5">
<jnpf-form-tip-item label="综合评分"
prop="starScore" >
<JnpfRate v-model="dataForm.starScore"
disabled
:max="5" >
</JnpfRate>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="评价详情" prop="comment">
<jnpf-form-tip-item label="评价详情"
prop="comment" >
<p>{{dataForm.comment}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="评价图片" prop="commentPics">
<JnpfUploadImg
v-model="dataForm.commentPics"
<jnpf-form-tip-item label="评价图片"
prop="commentPics" >
<JnpfUploadImg v-model="dataForm.commentPics"
disabled
detailed
:fileSize="10"
sizeUnit="MB"
:limit="9"
pathType="defaultPath"
:isAccount="0"
>
detailed :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0" >
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="响应速度" prop="responseStar">
<JnpfRate v-model="dataForm.responseStar" disabled :max="5">
<jnpf-form-tip-item label="响应速度"
prop="responseStar" >
<JnpfRate v-model="dataForm.responseStar"
disabled
:max="5" >
</JnpfRate>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="服务态度" prop="attitudeStar">
<JnpfRate v-model="dataForm.attitudeStar" disabled :max="5">
<jnpf-form-tip-item label="服务态度"
prop="attitudeStar" >
<JnpfRate v-model="dataForm.attitudeStar"
disabled
:max="5" >
</JnpfRate>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="平台价格" prop="priceStar">
<JnpfRate v-model="dataForm.priceStar" disabled :max="5">
<jnpf-form-tip-item label="平台价格"
prop="priceStar" >
<JnpfRate v-model="dataForm.priceStar"
disabled
:max="5" >
</JnpfRate>
</jnpf-form-tip-item>
</el-col>
@ -240,79 +241,14 @@
</el-row>
</div>
</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>
<script>
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 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"
export default {
components: { Detail},
props: [],
@ -321,215 +257,96 @@ export default {
visible: false,
detailVisible: false,
loading: false,
paidanDrawer: false,
paidanDirection: "rtl",
staffList: [],
zhipanData: {
id: "",
staffsId: "",
staffsName: "",
orderClientStatusId: "",
orderStaffsStatusId: "",
receiveTime: "",
},
dataForm: {
id: "",
orderNumber: "",
id :'',
orderNumber : '',
orderTypeId : "521999177572425477",
orderAmount: "",
orderAmount : '',
orderClientStatusId : "",
orderStaffsStatusId : "",
receivePeriod: "",
receivePeriod : '',
longitude : "10",
latitude : "10",
distance : "10",
orderStatusId : "520192817293693253",
clientId : "",
clientName: "",
clientMobile: "",
// recycleAddress: '',
appointmentTimeStart: "",
appointmentTimeEnd: "",
clientName : '',
clientMobile : '',
predictWeight : '',
appointmentTimeStart : '',
appointmentTimeEnd : '',
clientAddressId : "",
recycleStationId : "",
staffsId : "",
staffsName: "",
creatorUserId: "",
staffsName : '',
consultTimeStart : '',
consultTimeEnd : '',
receiveTime : '',
settleTime : '',
creatorTime : "",
consultTimeStart: "",
consultTimeEnd: "",
receiveTime: "",
settleTime: "",
creatorUserId : "",
starScore : 0,
comment: "",
comment : '',
commentPics : [],
responseStar : 0,
attitudeStar : 0,
priceStar : 0,
isJiedan: false,
},
orderTypeIdProps: { label: "fullName", value: "id" },
orderClientStatusIdProps: { label: "fullName", value: "id" },
orderStaffsStatusIdProps: { label: "fullName", value: "id" },
recycleStationIdProps: { label: "station_name", value: "id" },
staffsIdProps: { label: "staffs_name", value: "id" },
orderClientStatusIdOptions: [],
orderStaffsStatusIdOptions: [],
};
orderTypeIdProps:{"label":"fullName","value":"id" },
orderClientStatusIdProps:{"label":"fullName","value":"id" },
orderStaffsStatusIdProps:{"label":"fullName","value":"id" },
orderStatusIdProps:{"label":"fullName","value":"id" },
recycleStationIdProps:{"label":"station_name","value":"id" },
staffsIdProps:{"label":"staffs_name","value":"id" },
}
},
computed: {},
watch: {},
created() {},
created() {
},
mounted() {},
methods: {
paidanHandleClose(done) {
this.$confirm("确认关闭?")
.then((_) => {
done();
})
.catch((_) => {});
},
toDetail(defaultValue, modelId) {
if (!defaultValue) return;
getConfigData(modelId).then((res) => {
if (!res.data || !res.data.formData) return;
let formData = JSON.parse(res.data.formData);
formData.popupType = "general";
this.detailVisible = true;
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue);
});
});
this.$refs.Detail.init(formData, modelId, defaultValue)
})
})
},
dataInfo(dataAll){
let _dataAll = dataAll;
this.dataForm = _dataAll;
let _dataAll =dataAll
this.dataForm = _dataAll
},
goBack() {
this.$emit("refresh");
this.$emit('refresh')
},
init(id, flag) {
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true;
this.loading = true
request({
url: "/api/scm/RecycleOrder/detail/" + this.dataForm.id,
method: "get",
}).then((res) => {
this.dataInfo(res.data);
this.loading = false;
this.dataForm.isJiedan = flag;
});
url: '/api/scm/RecycleOrder/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
});
},
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 {
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>
</script>

@ -105,8 +105,8 @@
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="散户状态" prop="orderClientStatusId">
<!-- <el-col :span="8">
<jnpf-form-tip-item label="散户状态" prop="orderClientStatusId">
<JnpfSelect
v-model="dataForm.orderClientStatusId"
@change="changeData('orderClientStatusId', -1)"
@ -118,12 +118,9 @@
>
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
</el-col> -->
<el-col :span="8">
<jnpf-form-tip-item
label="回收员端状态"
prop="orderStaffsStatusId"
>
<jnpf-form-tip-item label="回收员状态" prop="orderStaffsStatusId">
<JnpfSelect
v-model="dataForm.orderStaffsStatusId"
@change="changeData('orderStaffsStatusId', -1)"
@ -148,6 +145,58 @@
</JnpfInput>
</jnpf-form-tip-item>
</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">
<jnpf-form-tip-item>
<JnpfGroupTitle content="散户信息" contentPosition="left">
@ -155,6 +204,31 @@
</jnpf-form-tip-item>
</el-col>
<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">
<JnpfInput
v-model="dataForm.clientName"
@ -165,7 +239,7 @@
>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
</el-col> -->
<el-col :span="8">
<jnpf-form-tip-item label="散户手机号" prop="clientMobile">
<JnpfInput
@ -178,14 +252,18 @@
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<!-- <el-col :span="8">
<jnpf-form-tip-item label="回收地址" prop="recycleAddress">
<JnpfInput v-model="dataForm.recycleAddress"
@change="changeData('recycleAddress',-1)" placeholder="请输入" clearable
:style='{"width":"100%"}'>
<el-col :span="8">
<jnpf-form-tip-item label="预估重量" prop="predictWeight">
<JnpfInput
v-model="dataForm.predictWeight"
@change="changeData('predictWeight', -1)"
placeholder="请输入"
clearable
:style="{ width: '100%' }"
>
</JnpfInput>
</jnpf-form-tip-item>
</el-col> -->
</el-col>
<el-col :span="8">
<jnpf-form-tip-item
@ -223,6 +301,33 @@
</JnpfDatePicker>
</jnpf-form-tip-item>
</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">
<jnpf-form-tip-item>
<JnpfGroupTitle content="收货员信息" contentPosition="left">
@ -249,7 +354,6 @@
v-model="dataForm.staffsId"
@change="changeData('staffsId', -1)"
placeholder="请选择"
disabled
clearable
:style="{ width: '100%' }"
:options="staffsIdOptions"
@ -264,7 +368,6 @@
v-model="dataForm.staffsName"
@change="changeData('staffsName', -1)"
placeholder="请输入"
disabled
clearable
:style="{ width: '100%' }"
>
@ -277,36 +380,6 @@
</JnpfDivider>
</jnpf-form-tip-item>
</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">
<jnpf-form-tip-item label="协商时间起" prop="consultTimeStart">
@ -375,6 +448,36 @@
</JnpfDatePicker>
</jnpf-form-tip-item>
</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">
<jnpf-form-tip-item>
<JnpfDivider content="用户评论" contentPosition="center">
@ -516,21 +619,26 @@ export default {
orderClientStatusId: undefined,
orderStaffsStatusId: undefined,
receivePeriod: undefined,
longitude: undefined,
latitude: undefined,
distance: "10",
orderStatusId: "520192817293693253",
clientId: undefined,
clientName: undefined,
clientMobile: undefined,
// recycleAddress: undefined,
predictWeight: undefined,
appointmentTimeStart: undefined,
appointmentTimeEnd: undefined,
clientAddressId: undefined,
recycleStationId: undefined,
staffsId: undefined,
staffsName: undefined,
creatorUserId: undefined,
creatorTime: undefined,
consultTimeStart: undefined,
consultTimeEnd: undefined,
receiveTime: undefined,
settleTime: undefined,
creatorTime: undefined,
creatorUserId: undefined,
starScore: 0,
comment: undefined,
commentPics: [],
@ -554,6 +662,41 @@ export default {
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: [
{
required: true,
@ -568,6 +711,18 @@ export default {
orderClientStatusIdProps: { label: "fullName", value: "id" },
orderStaffsStatusIdOptions: [],
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: [],
recycleStationIdProps: { label: "station_name", value: "id" },
staffsIdOptions: [],
@ -581,21 +736,37 @@ export default {
orderClientStatusId: [],
orderStaffsStatusId: [],
receivePeriod: [],
longitude: [],
latitude: [],
distance: [],
orderStatusId: [],
clientId: [],
clientName: [],
clientMobile: [],
// recycleAddress: [],
predictWeight: [],
appointmentTimeStart: [],
appointmentTimeEnd: [],
clientAddressId: [
{
dataType: "varchar",
defaultValue: "",
field: "clientId",
fieldName: "",
id: "434Ri02",
jnpfKey: "popupSelect",
relationField: "clientId",
required: "0",
},
],
recycleStationId: [],
staffsId: [],
staffsName: [],
creatorUserId: [],
creatorTime: [],
consultTimeStart: [],
consultTimeEnd: [],
receiveTime: [],
settleTime: [],
creatorTime: [],
creatorUserId: [],
starScore: [],
comment: [],
commentPics: [],
@ -616,6 +787,14 @@ export default {
},
mounted() {},
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() {
this.index--;
if (this.index === 0) {
@ -696,6 +875,7 @@ export default {
this.getorderTypeIdOptions();
this.getorderClientStatusIdOptions();
this.getorderStaffsStatusIdOptions();
this.getorderStatusIdOptions();
this.getrecycleStationIdOptions();
this.getstaffsIdOptions();
},
@ -714,6 +894,11 @@ export default {
this.orderStaffsStatusIdOptions = res.data.list;
});
},
getorderStatusIdOptions() {
getDictionaryDataSelector("520192751392788805").then((res) => {
this.orderStatusIdOptions = res.data.list;
});
},
getrecycleStationIdOptions() {
const index = this.childIndex;
let templateJsonList = JSON.parse(

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