the commit.
master
jevononlie 5 months ago
commit 2038340177

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.mapper.RecycleOrderProductMapper">
</mapper>

@ -0,0 +1,16 @@
package jnpf.mapper;
import jnpf.entity.RecycleOrderProductEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* RecycleOrder
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-05-20
*/
public interface RecycleOrderProductMapper extends BaseMapper<RecycleOrderProductEntity> {
}

@ -0,0 +1,18 @@
package jnpf.service;
import jnpf.model.recycleorder.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* RecycleOrder
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-05-20
*/
public interface RecycleOrderProductService extends IService<RecycleOrderProductEntity> {
QueryWrapper<RecycleOrderProductEntity> getChild(RecycleOrderPagination pagination,QueryWrapper<RecycleOrderProductEntity> recycleOrderProductQueryWrapper);
}

@ -27,6 +27,9 @@ public interface RecycleOrderService extends IService<RecycleOrderEntity> {
boolean update(String id, RecycleOrderEntity entity);
//子表方法
List<RecycleOrderProductEntity> getRecycleOrderProductList(String id,RecycleOrderPagination recycleOrderPagination);
List<RecycleOrderProductEntity> getRecycleOrderProductList(String id);
//副表数据方法
String checkForm(RecycleOrderForm form,int i);

@ -0,0 +1,59 @@
package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.RecycleOrderProductMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.recycleorder.*;
import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.util.GeneraterSwapUtil;
import jnpf.database.model.superQuery.SuperQueryJsonModel;
import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel;
import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import java.util.*;
import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity;
/**
*
* RecycleOrder
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-05-20
*/
@Service
public class RecycleOrderProductServiceImpl extends ServiceImpl<RecycleOrderProductMapper, RecycleOrderProductEntity> implements RecycleOrderProductService{
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
//子表过滤方法
@Override
public QueryWrapper<RecycleOrderProductEntity> getChild(RecycleOrderPagination pagination, QueryWrapper<RecycleOrderProductEntity> recycleOrderProductQueryWrapper){
boolean pcPermission = false;
boolean appPermission = false;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String ruleQueryJson = isPc?RecycleOrderConstant.getColumnData():RecycleOrderConstant.getAppColumnData();
ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson,ColumnDataModel.class);
String ruleJson = isPc?JsonUtil.getObjectToString(dataModel.getRuleList()):JsonUtil.getObjectToString(dataModel.getRuleListApp());
if(isPc){
}
return recycleOrderProductQueryWrapper;
}
}

@ -51,6 +51,8 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
private UserProvider userProvider;
@Autowired
private OrganizeService organizeService;
@Autowired
private RecycleOrderProductService recycleOrderProductService;
@Override
public List<RecycleOrderEntity> getList(RecycleOrderPagination recycleOrderPagination){
@ -426,6 +428,26 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
this.removeById(entity.getId());
}
}
/** RecycleOrderProduct子表方法 */
@Override
public List<RecycleOrderProductEntity> getRecycleOrderProductList(String id,RecycleOrderPagination recycleOrderPagination){
Map<String, Object> newtabMap=RecycleOrderConstant.TABLEFIELDKEY.entrySet()
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
String tableName="recycleOrderProduct";
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
QueryWrapper<RecycleOrderProductEntity> queryWrapper = new QueryWrapper<>();
queryWrapper = recycleOrderProductService.getChild(recycleOrderPagination,queryWrapper);
queryWrapper.lambda().eq(RecycleOrderProductEntity::getRecycleOrderId, id);
generaterSwapUtil.wrapperHandle(RecycleOrderConstant.getColumnData(), RecycleOrderConstant.getAppColumnData(), queryWrapper,RecycleOrderProductEntity.class,"sub",tableName);
return recycleOrderProductService.list(queryWrapper);
}
/** RecycleOrderProduct子表方法 */
@Override
public List<RecycleOrderProductEntity> getRecycleOrderProductList(String id){
QueryWrapper<RecycleOrderProductEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(RecycleOrderProductEntity::getRecycleOrderId, id);
return recycleOrderProductService.list(queryWrapper);
}
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
@Override
public String checkForm(RecycleOrderForm form,int i) {

@ -163,6 +163,8 @@ public class RecycleOrderController {
recycleOrderMap.put("id", recycleOrderMap.get("id"));
//副表数据
//子表数据
List<RecycleOrderProductEntity> recycleOrderProductList = recycleOrderService.getRecycleOrderProductList(entity.getId());
recycleOrderMap.put("tableField172",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recycleOrderProductList)));
recycleOrderMap = generaterSwapUtil.swapDataDetail(recycleOrderMap,RecycleOrderConstant.getFormData(),"520255187403674181",false);
return ActionResult.success(recycleOrderMap);
}

@ -0,0 +1,51 @@
package jnpf.entity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.util.Date;
import java.math.BigDecimal;
import java.math.BigDecimal;
/**
* -
*
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-05-20
*/
@Data
@TableName("nx_recycle_order_product")
public class RecycleOrderProductEntity {
@TableId(value ="ID" )
private String id;
@TableField(value = "RECYCLE_ORDER_ID" , updateStrategy = FieldStrategy.IGNORED)
private String recycleOrderId;
@TableField(value = "PRODUCT_ID" , updateStrategy = FieldStrategy.IGNORED)
private String productId;
@TableField("PRODUCT_NAME")
private String productName;
@TableField("PRODUCT_WEIGHT")
private String productWeight;
@TableField(value = "PRODUCT_ACTUAL_WEIGHT" , updateStrategy = FieldStrategy.IGNORED)
private Double productActualWeight;
@TableField(value = "RECOVERY_PRICE" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal recoveryPrice;
@TableField(value = "ACTUAL_RECOVERY_PRICE" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal actualRecoveryPrice;
@TableField("F_CREATOR_TIME")
private Date creatorTime;
@TableField("F_CREATOR_USER_ID")
private String creatorUserId;
@TableField("F_LAST_MODIFY_TIME")
private Date lastModifyTime;
@TableField("F_LAST_MODIFY_USER_ID")
private String lastModifyUserId;
@TableField("F_DELETE_TIME")
private Date deleteTime;
@TableField("F_DELETE_USER_ID")
private String deleteUserId;
@TableField("F_DELETE_MARK")
private Integer deleteMark;
@TableField("F_TENANT_ID")
private String tenantId;
}

@ -0,0 +1,37 @@
package jnpf.model.recycleorder;
import lombok.Data;
import java.util.List;
import java.util.Date;
import java.math.BigDecimal;
import com.alibaba.fastjson.annotation.JSONField;
import cn.afterturn.easypoi.excel.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
*
* RecycleOrder
* V3.5
* : https://www.jnpfsoft.com
* JNPF
* 2024-05-20
*/
@Data
public class RecycleOrderProductModel {
/** 订单id **/
@JSONField(name = "recycleOrderId")
private String recycleOrderId;
/** 商品id **/
@JSONField(name = "productId")
private Object productId;
/** 废品实际重量 **/
@JSONField(name = "productActualWeight")
private String productActualWeight;
/** 下单时回收单价 **/
@JSONField(name = "recoveryPrice")
private String recoveryPrice;
/** 实际回收单价 **/
@JSONField(name = "actualRecoveryPrice")
private String actualRecoveryPrice;
}

@ -1,352 +1,349 @@
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack"
content="详情"/>
<div class="options">
<el-button @click="goBack"> </el-button>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack" content="详情" />
<div class="options">
<el-button @click="goBack"> </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">
<template v-if="!loading">
<el-col :span="24">
<jnpf-form-tip-item label-width="0">
<JnpfGroupTitle contentPosition="left" :closable="false" content="订单信息">
</JnpfGroupTitle>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<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">
<p>{{ dataForm.orderTypeId }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<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">
<p>{{ dataForm.orderClientStatusId }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<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">
<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="订单商品">
</JnpfGroupTitle>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.tableField172" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="productId" label="商品id">
<template slot-scope="scope">
<p>{{ scope.row.productId }}</p>
</template>
</el-table-column>
<el-table-column prop="productActualWeight" label="废品实际重量">
<template slot-scope="scope">
<p>{{ scope.row.productActualWeight }}</p>
</template>
</el-table-column>
<el-table-column prop="recoveryPrice" label="下单时回收单价">
<template slot-scope="scope">
<p>{{ scope.row.recoveryPrice }}</p>
</template>
</el-table-column>
<el-table-column prop="actualRecoveryPrice" label="实际回收单价">
<template slot-scope="scope">
<p>{{ scope.row.actualRecoveryPrice }}</p>
</template>
</el-table-column>
</el-table>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label-width="0">
<JnpfGroupTitle contentPosition="left" :closable="false" content="散户信息">
</JnpfGroupTitle>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<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">
<p>{{ dataForm.clientMobile }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="预估重量" prop="predictWeight">
<p>{{ dataForm.predictWeight }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<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">
<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="收货员信息">
</JnpfGroupTitle>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<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">
<p>{{ dataForm.staffsId }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<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>
</el-col>
<el-col :span="8">
<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">
<p>{{ dataForm.consultTimeEnd }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<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">
<p>{{ dataForm.settleTime }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<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">
</JnpfRate>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<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" disabled 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">
</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">
</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">
</JnpfRate>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</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" >
<template v-if="!loading">
<el-col :span="24" >
<jnpf-form-tip-item label-width="0">
<JnpfGroupTitle
contentPosition="left" :closable= "false" content ="订单信息" >
</JnpfGroupTitle>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<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" >
<p>{{dataForm.orderTypeId}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<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" >
<p>{{dataForm.orderClientStatusId}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<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" >
<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 ="散户信息" >
</JnpfGroupTitle>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<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" >
<p>{{dataForm.clientMobile}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="预估重量"
prop="predictWeight" >
<p>{{dataForm.predictWeight}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<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" >
<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 ="收货员信息" >
</JnpfGroupTitle>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<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" >
<p>{{dataForm.staffsId}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<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>
</el-col>
<el-col :span="8" >
<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" >
<p>{{dataForm.consultTimeEnd}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<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" >
<p>{{dataForm.settleTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<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" >
</JnpfRate>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<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"
disabled
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" >
</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" >
</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" >
</JnpfRate>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div>
</transition>
</transition>
</template>
<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"
export default {
components: { Detail},
props: [],
data() {
return {
visible: false,
detailVisible: false,
loading: false,
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: [],
data() {
return {
visible: false,
detailVisible: false,
loading: false,
dataForm: {
id :'',
orderNumber : '',
orderTypeId : "521999177572425477",
orderAmount : '',
orderClientStatusId : "",
orderStaffsStatusId : "",
receivePeriod : '',
longitude : "10",
latitude : "10",
distance : "10",
orderStatusId : "520192817293693253",
clientId : "",
clientName : '',
clientMobile : '',
predictWeight : '',
appointmentTimeStart : '',
appointmentTimeEnd : '',
clientAddressId : "",
recycleStationId : "",
staffsId : "",
staffsName : '',
consultTimeStart : '',
consultTimeEnd : '',
receiveTime : '',
settleTime : '',
creatorTime : "",
creatorUserId : "",
starScore : 0,
comment : '',
commentPics : [],
responseStar : 0,
attitudeStar : 0,
priceStar : 0,
id: '',
orderNumber: '',
orderTypeId: "521999177572425477",
orderAmount: '',
orderClientStatusId: "",
orderStaffsStatusId: "",
receivePeriod: '',
longitude: "10",
latitude: "10",
distance: "10",
orderStatusId: "520192817293693253",
clientId: "",
clientName: '',
clientMobile: '',
predictWeight: '',
appointmentTimeStart: '',
appointmentTimeEnd: '',
clientAddressId: "",
recycleStationId: "",
staffsId: "",
staffsName: '',
consultTimeStart: '',
consultTimeEnd: '',
receiveTime: '',
settleTime: '',
creatorTime: "",
creatorUserId: "",
starScore: 0,
comment: '',
commentPics: [],
responseStar: 0,
attitudeStar: 0,
priceStar: 0,
recycleorderproductList: [],
},
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" },
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() {
},
mounted() { },
methods: {
toDetail(defaultValue, modelId) {
console.log(defaultValue)
console.log(modelId)
if (!defaultValue) return
getConfigData(modelId).then(res => {
console.log(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)
})
})
},
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
},
computed: {},
watch: {},
created() {
goBack() {
this.$emit('refresh')
},
mounted() {},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue)
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/scm/RecycleOrder/detail/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
})
},
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
},
goBack() {
this.$emit('refresh')
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/scm/RecycleOrder/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
}
})
},
})
},
}
},
}
</script>

Loading…
Cancel
Save