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

feat(order):投递、清运订单统计查询前后端代码提交;

Browse Source
master
jiyufei 4 months ago
parent 70be5b2306
commit e30ec30677
7 changed files with 267 additions and 160 deletions
Show Stats Download Patch File Download Diff File

3
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java
Unescape View File

@ -690,6 +690,9 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
} else {
finalDeviceCodes.addAll(request.getDeviceCodes());
}
if (CollectionUtils.isEmpty(finalDeviceCodes)) {
return Collections.emptyList();
}
//处理时间查询条件
Date[] date = this.getMonthStartAndEndDate(request.getYear(), request.getMonth());
LambdaQueryWrapper<RecycleDeliveryOrderEntity> wrapper = new LambdaQueryWrapper<>(RecycleDeliveryOrderEntity.class)

190
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/EnterpriserecyclestationController.java
Unescape View File

@ -1,6 +1,7 @@
package jnpf.controller;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -13,24 +14,30 @@ import jnpf.entity.*;
import jnpf.util.*;
import jnpf.model.enterpriserecyclestation.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.*;
import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity;
import java.io.IOException;
import java.util.stream.Collectors;
import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException;
import org.springframework.transaction.annotation.Transactional;
/**
* Enterpriserecyclestation
*
* @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组
@ -38,16 +45,13 @@ import org.springframework.transaction.annotation.Transactional;
*/
@Slf4j
@RestController
@Tag(name = "Enterpriserecyclestation" , description = "scm")
@Tag(name = "Enterpriserecyclestation", description = "scm")
@RequestMapping("/api/scm/Enterpriserecyclestation")
public class EnterpriserecyclestationController {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Autowired
private EnterpriserecyclestationService enterpriserecyclestationService;
@ -58,29 +62,29 @@ public class EnterpriserecyclestationController {
/**
* 列表
*
* @param enterpriserecyclestationPagination
* @return
*/
* 列表
*
* @param enterpriserecyclestationPagination
* @return
*/
@Operation(summary = "获取列表")
@PostMapping("/getList")
public ActionResult list(@RequestBody EnterpriserecyclestationPagination enterpriserecyclestationPagination)throws IOException{
List<EnterpriserecyclestationEntity> list= enterpriserecyclestationService.getList(enterpriserecyclestationPagination);
List<Map<String, Object>> realList=new ArrayList<>();
public ActionResult list(@RequestBody EnterpriserecyclestationPagination enterpriserecyclestationPagination) throws IOException {
List<EnterpriserecyclestationEntity> list = enterpriserecyclestationService.getList(enterpriserecyclestationPagination);
List<Map<String, Object>> realList = new ArrayList<>();
for (EnterpriserecyclestationEntity entity : list) {
Map<String, Object> enterpriserecyclestationMap=JsonUtil.entityToMap(entity);
enterpriserecyclestationMap.put("id", enterpriserecyclestationMap.get("id"));
//副表数据
//子表数据
List<RecyclestationpriceEntity> recyclestationpriceList = enterpriserecyclestationService.getRecyclestationpriceList(entity.getId(),enterpriserecyclestationPagination);
enterpriserecyclestationMap.put("tableField135",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recyclestationpriceList)));
List<RecyclestationhousingestateEntity> recyclestationhousingestateList = enterpriserecyclestationService.getRecyclestationhousingestateList(entity.getId(),enterpriserecyclestationPagination);
enterpriserecyclestationMap.put("tableField119",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recyclestationhousingestateList)));
Map<String, Object> enterpriserecyclestationMap = JsonUtil.entityToMap(entity);
enterpriserecyclestationMap.put("id", enterpriserecyclestationMap.get("id"));
//副表数据
//子表数据
List<RecyclestationpriceEntity> recyclestationpriceList = enterpriserecyclestationService.getRecyclestationpriceList(entity.getId(), enterpriserecyclestationPagination);
enterpriserecyclestationMap.put("tableField135", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recyclestationpriceList)));
List<RecyclestationhousingestateEntity> recyclestationhousingestateList = enterpriserecyclestationService.getRecyclestationhousingestateList(entity.getId(), enterpriserecyclestationPagination);
enterpriserecyclestationMap.put("tableField119", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recyclestationhousingestateList)));
realList.add(enterpriserecyclestationMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, EnterpriserecyclestationConstant.getFormData(), EnterpriserecyclestationConstant.getColumnData(), enterpriserecyclestationPagination.getModuleId(),false);
realList = generaterSwapUtil.swapDataList(realList, EnterpriserecyclestationConstant.getFormData(), EnterpriserecyclestationConstant.getColumnData(), enterpriserecyclestationPagination.getModuleId(), false);
//返回对象
PageListVO vo = new PageListVO();
@ -89,126 +93,146 @@ public class EnterpriserecyclestationController {
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
* 创建
*
* @param enterpriserecyclestationForm
* @return
*/
* 创建
*
* @param enterpriserecyclestationForm
* @return
*/
@PostMapping()
@Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid EnterpriserecyclestationForm enterpriserecyclestationForm) {
String b = enterpriserecyclestationService.checkForm(enterpriserecyclestationForm,0);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
String b = enterpriserecyclestationService.checkForm(enterpriserecyclestationForm, 0);
if (StringUtil.isNotEmpty(b)) {
return ActionResult.fail(b);
}
try{
enterpriserecyclestationService.saveOrUpdate(enterpriserecyclestationForm, null ,true);
}catch(Exception e){
try {
enterpriserecyclestationService.saveOrUpdate(enterpriserecyclestationForm, null, true);
} catch (Exception e) {
return ActionResult.fail("新增数据失败");
}
return ActionResult.success("创建成功");
}
/**
* 编辑
* @param id
* @param enterpriserecyclestationForm
* @return
*/
* 编辑
*
* @param id
* @param enterpriserecyclestationForm
* @return
*/
@PutMapping("/{id}")
@Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid EnterpriserecyclestationForm enterpriserecyclestationForm,
@RequestParam(value = "isImport", required = false) boolean isImport){
public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid EnterpriserecyclestationForm enterpriserecyclestationForm,
@RequestParam(value = "isImport", required = false) boolean isImport) {
enterpriserecyclestationForm.setId(id);
if (!isImport) {
String b = enterpriserecyclestationService.checkForm(enterpriserecyclestationForm,1);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
String b = enterpriserecyclestationService.checkForm(enterpriserecyclestationForm, 1);
if (StringUtil.isNotEmpty(b)) {
return ActionResult.fail(b);
}
}
EnterpriserecyclestationEntity entity= enterpriserecyclestationService.getInfo(id);
if(entity!=null){
try{
enterpriserecyclestationService.saveOrUpdate(enterpriserecyclestationForm,id,false);
}catch(Exception e){
EnterpriserecyclestationEntity entity = enterpriserecyclestationService.getInfo(id);
if (entity != null) {
try {
enterpriserecyclestationService.saveOrUpdate(enterpriserecyclestationForm, id, false);
} catch (Exception e) {
return ActionResult.fail("修改数据失败");
}
return ActionResult.success("更新成功");
}else{
} else {
return ActionResult.fail("更新失败，数据不存在");
}
}
/**
* 删除
* @param id
* @return
*/
* 删除
*
* @param id
* @return
*/
@Operation(summary = "删除")
@DeleteMapping("/{id}")
@Transactional
public ActionResult delete(@PathVariable("id") String id){
EnterpriserecyclestationEntity entity= enterpriserecyclestationService.getInfo(id);
if(entity!=null){
public ActionResult delete(@PathVariable("id") String id) {
EnterpriserecyclestationEntity entity = enterpriserecyclestationService.getInfo(id);
if (entity != null) {
//主表数据删除
enterpriserecyclestationService.delete(entity);
QueryWrapper<RecyclestationpriceEntity> queryWrapperRecyclestationprice=new QueryWrapper<>();
queryWrapperRecyclestationprice.lambda().eq(RecyclestationpriceEntity::getStationId,entity.getId());
QueryWrapper<RecyclestationpriceEntity> queryWrapperRecyclestationprice = new QueryWrapper<>();
queryWrapperRecyclestationprice.lambda().eq(RecyclestationpriceEntity::getStationId, entity.getId());
//子表数据删除
recyclestationpriceService.remove(queryWrapperRecyclestationprice);
QueryWrapper<RecyclestationhousingestateEntity> queryWrapperRecyclestationhousingestate=new QueryWrapper<>();
queryWrapperRecyclestationhousingestate.lambda().eq(RecyclestationhousingestateEntity::getStationId,entity.getId());
QueryWrapper<RecyclestationhousingestateEntity> queryWrapperRecyclestationhousingestate = new QueryWrapper<>();
queryWrapperRecyclestationhousingestate.lambda().eq(RecyclestationhousingestateEntity::getStationId, entity.getId());
//子表数据删除
recyclestationhousingestateService.remove(queryWrapperRecyclestationhousingestate);
}
return ActionResult.success("删除成功");
}
/**
* 表单信息(详情页)
* 详情页面使用-转换数据
* @param id
* @return
*/
* 表单信息(详情页)
* 详情页面使用-转换数据
*
* @param id
* @return
*/
@Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id){
EnterpriserecyclestationEntity entity= enterpriserecyclestationService.getInfo(id);
if(entity==null){
public ActionResult detailInfo(@PathVariable("id") String id) {
EnterpriserecyclestationEntity entity = enterpriserecyclestationService.getInfo(id);
if (entity == null) {
return ActionResult.fail("表单数据不存在！");
}
Map<String, Object> enterpriserecyclestationMap=JsonUtil.entityToMap(entity);
Map<String, Object> enterpriserecyclestationMap = JsonUtil.entityToMap(entity);
enterpriserecyclestationMap.put("id", enterpriserecyclestationMap.get("id"));
//副表数据
//子表数据
List<RecyclestationpriceEntity> recyclestationpriceList = enterpriserecyclestationService.getRecyclestationpriceList(entity.getId());
enterpriserecyclestationMap.put("tableField135",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recyclestationpriceList)));
enterpriserecyclestationMap.put("tableField135", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recyclestationpriceList)));
List<RecyclestationhousingestateEntity> recyclestationhousingestateList = enterpriserecyclestationService.getRecyclestationhousingestateList(entity.getId());
enterpriserecyclestationMap.put("tableField119",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recyclestationhousingestateList)));
enterpriserecyclestationMap = generaterSwapUtil.swapDataDetail(enterpriserecyclestationMap,EnterpriserecyclestationConstant.getFormData(),"518043449954403781",false);
enterpriserecyclestationMap.put("tableField119", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recyclestationhousingestateList)));
enterpriserecyclestationMap = generaterSwapUtil.swapDataDetail(enterpriserecyclestationMap, EnterpriserecyclestationConstant.getFormData(), "518043449954403781", false);
return ActionResult.success(enterpriserecyclestationMap);
}
/**
* 获取详情(编辑页)
* 编辑页面使用-不转换数据
* @param id
* @return
*/
* 获取详情(编辑页)
* 编辑页面使用-不转换数据
*
* @param id
* @return
*/
@Operation(summary = "信息")
@GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id){
EnterpriserecyclestationEntity entity= enterpriserecyclestationService.getInfo(id);
if(entity==null){
public ActionResult info(@PathVariable("id") String id) {
EnterpriserecyclestationEntity entity = enterpriserecyclestationService.getInfo(id);
if (entity == null) {
return ActionResult.fail("表单数据不存在！");
}
Map<String, Object> enterpriserecyclestationMap=JsonUtil.entityToMap(entity);
Map<String, Object> enterpriserecyclestationMap = JsonUtil.entityToMap(entity);
enterpriserecyclestationMap.put("id", enterpriserecyclestationMap.get("id"));
//副表数据
//子表数据
List<RecyclestationpriceEntity> recyclestationpriceList = enterpriserecyclestationService.getRecyclestationpriceList(entity.getId());
enterpriserecyclestationMap.put("recyclestationpriceList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recyclestationpriceList)));
enterpriserecyclestationMap.put("recyclestationpriceList", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recyclestationpriceList)));
List<RecyclestationhousingestateEntity> recyclestationhousingestateList = enterpriserecyclestationService.getRecyclestationhousingestateList(entity.getId());
enterpriserecyclestationMap.put("recyclestationhousingestateList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recyclestationhousingestateList)));
enterpriserecyclestationMap = generaterSwapUtil.swapDataForm(enterpriserecyclestationMap,EnterpriserecyclestationConstant.getFormData(),EnterpriserecyclestationConstant.TABLEFIELDKEY,EnterpriserecyclestationConstant.TABLERENAMES);
enterpriserecyclestationMap.put("recyclestationhousingestateList", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recyclestationhousingestateList)));
enterpriserecyclestationMap = generaterSwapUtil.swapDataForm(enterpriserecyclestationMap, EnterpriserecyclestationConstant.getFormData(), EnterpriserecyclestationConstant.TABLEFIELDKEY, EnterpriserecyclestationConstant.TABLERENAMES);
return ActionResult.success(enterpriserecyclestationMap);
}
@Operation(summary = "根据商户查询回收站")
@GetMapping("/queryByCompanyId/{companyId}")
public ActionResult queryByCompanyId(@PathVariable("companyId") String companyId) {
LambdaQueryWrapper<EnterpriserecyclestationEntity> wrapper = new LambdaQueryWrapper<>(EnterpriserecyclestationEntity.class)
.eq(EnterpriserecyclestationEntity::getCompanyId, companyId);
List<EnterpriserecyclestationEntity> list = enterpriserecyclestationService.list(wrapper);
if (CollectionUtils.isEmpty(list)) {
return ActionResult.success();
}
return ActionResult.success(list);
}
}

13
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceController.java
Unescape View File

@ -17,6 +17,7 @@ import jnpf.service.*;
import jnpf.util.*;
import jnpf.utils.CustomerMqttClient;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@ -372,5 +373,15 @@ public class RecycleDeviceController {
}
}
@PostMapping("/getDeviceCodes")
@Operation(summary = "根据回收站查询设备")
public ActionResult getDeviceCodes(@RequestBody RecycleDevicePagination recycleDevicePagination) {
LambdaQueryWrapper<RecycleDeviceEntity> wrapper = new LambdaQueryWrapper<>(RecycleDeviceEntity.class)
.in(RecycleDeviceEntity::getBeLongStationId, recycleDevicePagination.getStationIds());
List<RecycleDeviceEntity> list = recycleDeviceService.list(wrapper);
if (CollectionUtils.isEmpty(list)) {
return ActionResult.success();
}
return ActionResult.success(list);
}
}

1
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeliveryorder/OrderStatisticsRequest.java
Unescape View File

@ -13,7 +13,6 @@ public class OrderStatisticsRequest {
/**
* 商户id
*/
@NotBlank(message = "商户id 不能为空")
private String companyId;
/**

3
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledevice/RecycleDevicePagination.java
Unescape View File

@ -52,4 +52,7 @@ public class RecycleDevicePagination extends Pagination {
/** id */
@JsonProperty("stationId")
private String stationId;
@JsonProperty("stationIds")
private List<String> stationIds;
}

109
jnpf-java-boot/jnpf-web/src/views/recyclecleanorderstatistics/index.vue
Unescape View File

@ -5,17 +5,28 @@
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="*商户">
<JnpfOrganizeSelect v-model="query.companyId" placeholder="请选择商户" :lastLevel="false" />
<el-select v-model="query.companyId" placeholder="请选择要查询的商户" @change="handleSelectChange">
<el-option v-for="item in companyOptions" :key="item.id" :label="item.enterpriseName" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="回收站">
<JnpfSelect v-model="query.stationIds" placeholder="请选择回收站" :lastLevel="false" />
<el-select v-model="query.stationIds" placeholder="请选择要查询的回收站" multiple @change="handleStationChange">
<el-option v-for="station in stationOptions" :key="station.id" :label="station.stationName"
:value="station.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="设备">
<JnpfSelect v-model="query.deviceCodes" placeholder="请选择设备" :lastLevel="false" />
<el-select v-model="query.deviceCodes" placeholder="请选择要查询的设备" multiple>
<el-option v-for="device in deviceOptions" :key="device.deviceCode" :label="device.deviceName"
:value="device.deviceCode">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
@ -65,7 +76,6 @@
</JNPF-table>
</div>
</div>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
</div>
</template>
@ -93,10 +103,11 @@ export default {
mergeList: [],
exportList: [],
showAll: false,
superQueryVisible: false,
uploadBoxVisible: false,
companyOptions: [],
stationOptions: [],
deviceOptions: [],
query: {
companyId: "543048783756268357",
companyId: undefined,
stationIds: [],
deviceCodes: [],
auditStatus: "1",
@ -139,6 +150,7 @@ export default {
}
},
created() {
this.fetchCompanies();
if (this.$route.query.deviceCode) {
this.query.deviceCode = [this.$route.query.deviceCode];
}
@ -147,16 +159,44 @@ export default {
this.queryData = JSON.parse(JSON.stringify(this.query));
},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return;
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return;
let formData = JSON.parse(res.data.formData);
formData.popupType = "general";
this.toFormDetailVisible = true;
this.$nextTick(() => {
this.$refs.toFormDetail.init(formData, modelId, defaultValue);
});
fetchCompanies() {
request({
url: `/api/scm/RecycleDevice/getCompanyList`,
method: "post"
}).then(res => {
this.companyOptions = res.data;
});
},
handleSelectChange(value) {
this.query.stationIds = [];
this.fetchStations(value);
},
fetchStations(companyId) {
request({
url: "/api/scm/Enterpriserecyclestation/queryByCompanyId/" + companyId,
method: "get"
}).then(res => {
this.stationOptions = res.data;
}).catch(error => {
console.error('Failed to fetch stations:', error);
});
},
handleStationChange(value) {
this.query.deviceCodes = [];
this.fetchDevices(value);
},
fetchDevices(stationIds) {
let _query = {
stationIds: stationIds,
};
request({
url: `/api/scm/RecycleDevice/getDeviceCodes`,
method: "post",
data: _query
}).then(res => {
this.deviceOptions = res.data;
}).catch(error => {
console.error('Failed to fetch devices:', error);
});
},
toggleTreeExpand(expands) {
@ -282,31 +322,24 @@ export default {
this.listLoading = false;
});
},
handelUpload() {
this.uploadBoxVisible = true;
this.$nextTick(() => {
this.$refs.UploadBox.init("", "scm/RecycleDeliveryOrder");
});
},
openSuperQuery() {
this.superQueryVisible = true;
this.$nextTick(() => {
this.$refs.SuperQuery.init();
});
},
superQuery(queryJson) {
this.listQuery.currentPage = 1;
this.initData();
},
exportData() {
ExportCleanOrderData({ data: this.list }).then(res => {
this.jnpf.downloadFile(res.data.url)
})
this.$confirm('您确定要导出数据吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
ExportCleanOrderData({ data: this.list }).then(res => {
this.jnpf.downloadFile(res.data.url);
}).catch(error => {
console.error('导出数据过程中发生错误:', error);
this.$message.error('导出数据失败');
});
}).catch(() => {
});
},
search() {
if (this.query.companyId == null) {
this.$message.error('请选择商户');
this.$message.error('请选择需要查询的商户');
return;
}
if (this.query.auditStatus == null) {

108
jnpf-java-boot/jnpf-web/src/views/recycledeliveryorderstatistics/index.vue
Unescape View File

@ -5,17 +5,28 @@
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="*商户">
<JnpfOrganizeSelect v-model="query.companyId" placeholder="请选择商户" :lastLevel="false" />
<el-select v-model="query.companyId" placeholder="请选择要查询的商户" @change="handleSelectChange">
<el-option v-for="item in companyOptions" :key="item.id" :label="item.enterpriseName" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="回收站">
<JnpfSelect v-model="query.stationIds" placeholder="请选择回收站" :lastLevel="false" />
<el-select v-model="query.stationIds" placeholder="请选择要查询的回收站" multiple @change="handleStationChange">
<el-option v-for="station in stationOptions" :key="station.id" :label="station.stationName"
:value="station.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="设备">
<JnpfSelect v-model="query.deviceCodes" placeholder="请选择设备" :lastLevel="false" />
<el-select v-model="query.deviceCodes" placeholder="请选择要查询的设备" multiple>
<el-option v-for="device in deviceOptions" :key="device.deviceCode" :label="device.deviceName"
:value="device.deviceCode">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
@ -65,7 +76,6 @@
</JNPF-table>
</div>
</div>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
</div>
</template>
@ -93,10 +103,11 @@ export default {
mergeList: [],
exportList: [],
showAll: false,
superQueryVisible: false,
uploadBoxVisible: false,
companyOptions: [],
stationOptions: [],
deviceOptions: [],
query: {
companyId: "543048783756268357",
companyId: undefined,
stationIds: [],
deviceCodes: [],
auditStatus: "1",
@ -138,6 +149,7 @@ export default {
}
},
created() {
this.fetchCompanies();
if (this.$route.query.deviceCode) {
this.query.deviceCode = [this.$route.query.deviceCode];
}
@ -146,16 +158,44 @@ export default {
this.queryData = JSON.parse(JSON.stringify(this.query));
},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return;
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return;
let formData = JSON.parse(res.data.formData);
formData.popupType = "general";
this.toFormDetailVisible = true;
this.$nextTick(() => {
this.$refs.toFormDetail.init(formData, modelId, defaultValue);
});
fetchCompanies() {
request({
url: `/api/scm/RecycleDevice/getCompanyList`,
method: "post"
}).then(res => {
this.companyOptions = res.data;
});
},
handleSelectChange(value) {
this.query.stationIds = [];
this.fetchStations(value);
},
fetchStations(companyId) {
request({
url: "/api/scm/Enterpriserecyclestation/queryByCompanyId/" + companyId,
method: "get"
}).then(res => {
this.stationOptions = res.data;
}).catch(error => {
console.error('Failed to fetch stations:', error);
});
},
handleStationChange(value) {
this.query.deviceCodes = [];
this.fetchDevices(value);
},
fetchDevices(stationIds) {
let _query = {
stationIds: stationIds,
};
request({
url: `/api/scm/RecycleDevice/getDeviceCodes`,
method: "post",
data: _query
}).then(res => {
this.deviceOptions = res.data;
}).catch(error => {
console.error('Failed to fetch devices:', error);
});
},
toggleTreeExpand(expands) {
@ -281,30 +321,24 @@ export default {
this.listLoading = false;
});
},
handelUpload() {
this.uploadBoxVisible = true;
this.$nextTick(() => {
this.$refs.UploadBox.init("", "scm/RecycleDeliveryOrder");
});
},
openSuperQuery() {
this.superQueryVisible = true;
this.$nextTick(() => {
this.$refs.SuperQuery.init();
});
},
superQuery(queryJson) {
this.listQuery.currentPage = 1;
this.initData();
},
exportData() {
ExportDeliveryOrderData({ data: this.list }).then(res => {
this.jnpf.downloadFile(res.data.url)
})
this.$confirm('您确定要导出数据吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
ExportDeliveryOrderData({ data: this.list }).then(res => {
this.jnpf.downloadFile(res.data.url);
}).catch(error => {
console.error('导出数据过程中发生错误:', error);
this.$message.error('导出数据失败');
});
}).catch(() => {
});
},
search() {
if (this.query.companyId == null) {
this.$message.error('请选择商户');
this.$message.error('请选择需要查询的商户');
return;
}
if (this.query.auditStatus == null) {

Write Preview
Loading…
Cancel
Save