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

回收柜配置修改完善

Browse Source
master
mhsnet 4 months ago
parent 7b95899a7f
commit fb2231377d
4 changed files with 1132 additions and 1062 deletions
Show Stats Download Patch File Download Diff File

11
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceConfigOneServiceImpl.java
Unescape View File

@ -349,16 +349,13 @@ public class RecycleDeviceConfigOneServiceImpl extends ServiceImpl<RecycleDevice
if(isSave){
String mainId = RandomUtil.uuId() ;
entity.setLastModifyUserId(null);
entity.setLastModifyTime(null);
entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(),"all"));
entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
entity.setCompanyId(userInfo.getOrganizeId());
entity.setDepartmentId(userInfo.getDepartmentId());
entity.setId(mainId);
}else{
entity.setLastModifyUserId(null);
entity.setLastModifyTime(null);
entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(),"all"));
entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
}
this.saveOrUpdate(entity);
}
}

21
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceConfigOneController.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;
@ -81,6 +82,26 @@ public class RecycleDeviceConfigOneController {
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
* 列表
*
* @param recycleDeviceConfigOnePagination
* @return
*/
@Operation(summary = "获取用户配置")
@PostMapping("/getOne")
public ActionResult getOne(){
UserInfo userInfo = userProvider.get();
Boolean isAdministrator = userInfo.getIsAdministrator();
String organizeId = userInfo.getOrganizeId();
QueryWrapper<RecycleDeviceConfigOneEntity> wrapper = new QueryWrapper<>();
LambdaQueryWrapper<RecycleDeviceConfigOneEntity> lambda = wrapper.lambda();
if(!isAdministrator){
lambda.eq(RecycleDeviceConfigOneEntity::getCompanyId,organizeId);
}
List<RecycleDeviceConfigOneEntity> list = recycleDeviceConfigOneService.list(lambda);
return ActionResult.success(list);
}
/**
* 创建
*

1923
jnpf-java-boot/jnpf-web/src/views/recycledeviceconfigone/form.vue
View File

File diff suppressed because it is too large Load Diff

239
jnpf-java-boot/jnpf-web/src/views/recycledeviceconfigone/index.vue
Unescape View File

@ -1,181 +1,5 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="当前商户">
<JnpfOrganizeSelect
v-model="query.organizeJsonId"
placeholder="请选择"
:lastLevel="false"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"
>查询</el-button
>
<el-button icon="el-icon-refresh-right" @click="reset()"
>重置</el-button
>
</el-form-item>
</el-col>
</el-form>
</el-row>
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button
type="primary"
icon="icon-ym icon-ym-btn-add"
v-has="'btn_add'"
@click="addOrUpdateHandle()"
>新增
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link
icon="icon-ym icon-ym-filter JNPF-common-head-icon"
:underline="false"
@click="openSuperQuery()"
/>
</el-tooltip>
<el-tooltip
effect="dark"
:content="$t('common.refresh')"
placement="top"
>
<el-link
icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
:underline="false"
@click="initData()"
/>
</el-tooltip>
</div>
</div>
<JNPF-table
v-loading="listLoading"
:data="list"
@sort-change="sortChange"
:span-method="arraySpanMethod"
>
<el-table-column prop="organizeJsonId" label="组织架构" align="left">
</el-table-column>
<el-table-column
prop="deliveryPrice"
label="统一投递价格"
align="left"
>
</el-table-column>
<el-table-column prop="bucket1Price" label="1号桶价格" align="left">
</el-table-column>
<el-table-column prop="bucket2Price" label="2号桶价格" align="left">
</el-table-column>
<el-table-column prop="bucket3Price" label="3号桶价格" align="left">
</el-table-column>
<el-table-column prop="bucket4Price" label="4号桶价格" align="left">
</el-table-column>
<el-table-column prop="bucket5Price" label="5号桶价格" align="left">
</el-table-column>
<el-table-column prop="bucket6Price" label="6号桶价格" align="left">
</el-table-column>
<el-table-column prop="bucket7Price" label="7号桶价格" align="left">
</el-table-column>
<el-table-column prop="bucket8Price" label="8号桶价格" align="left">
</el-table-column>
<el-table-column prop="bucket9Price" label="9号桶价格" align="left">
</el-table-column>
<el-table-column prop="bucket10Price" label="10号桶价格" align="left">
</el-table-column>
<el-table-column prop="bucket11Price" label="11号桶价格" align="left">
</el-table-column>
<el-table-column prop="bucket12Price" label="12号桶价格" align="left">
</el-table-column>
<el-table-column
prop="allowPhoneLogin"
label="手机号登录"
align="left"
>
</el-table-column>
<el-table-column prop="closeDelay" label="投递关门" align="left">
</el-table-column>
<el-table-column prop="warningWeight" label="报警重量" align="left">
</el-table-column>
<el-table-column
label="投递审核配置 "
prop="deliveryAdjustSet"
algin="left"
>
<template slot-scope="scope">
{{ scope.row.deliveryAdjustSet }}
</template>
</el-table-column>
<el-table-column
label="清运审核配置"
prop="cleanAdjustSet"
algin="left"
>
<template slot-scope="scope">
{{ scope.row.cleanAdjustSet }}
</template>
</el-table-column>
<el-table-column prop="cleanLock" label="清运锁" align="left">
</el-table-column>
<el-table-column prop="fullSet" label="满溢报警" align="left">
</el-table-column>
<el-table-column prop="smogSet" label="烟雾报警" align="left">
</el-table-column>
<el-table-column prop="promotionSet" label="宣传配置" align="left">
</el-table-column>
<el-table-column
prop="promotionalSlogans"
label="宣传标语"
align="left"
>
</el-table-column>
<el-table-column
prop="lastModifyUserId"
label="修改用户"
align="left"
>
</el-table-column>
<el-table-column prop="lastModifyTime" label="修改时间" align="left">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button
type="text"
@click="addOrUpdateHandle(scope.row)"
v-has="'btn_edit'"
>编辑
</el-button>
<el-button
type="text"
class="JNPF-table-delBtn"
v-has="'btn_remove'"
@click="handleDel(scope.row.id)"
>删除
</el-button>
<el-button
type="text"
v-has="'btn_detail'"
@click="goDetail(scope.row.id)"
>详情
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination
:total="total"
:page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize"
@pagination="initData"
/>
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
@ -298,6 +122,7 @@ export default {
created() {
this.getColumnList(), this.initSearchDataAndListData();
this.queryData = JSON.parse(JSON.stringify(this.query));
console.log(this.queryData);
},
methods: {
toDetail(defaultValue, modelId) {
@ -390,6 +215,7 @@ export default {
}
this.getMergeList(list);
this.getExportList(list);
console.log(list);
return list;
},
arraySpanMethod({ column }) {
@ -467,29 +293,54 @@ export default {
async initSearchData() {},
initData() {
this.listLoading = true;
let _query = {
...this.listQuery,
...this.query,
keyword: this.keyword,
dataType: 0,
menuId: this.menuId,
moduleId: "578190840367677829",
type: 1
};
request({
url: `/api/scm/RecycleDeviceConfigOne/getList`,
method: "post",
data: _query
url: `/api/scm/RecycleDeviceConfigOne/getOne`,
method: "post"
}).then(res => {
var _list = res.data.list;
this.list = _list.map(o => ({
...o,
...this.expandObj
}));
this.total = res.data.pagination.total;
this.list = res.data;
switch(this.list.length){
case 1:
this.addOrUpdateHandle(this.list[0])
break;
case 0:
this.addOrUpdateHandle()
break;
default:
break;
}
// this.list = _list.map(o => ({
// ...o,
// ...this.expandObj
// }));
//this.total = res.data.pagination.total;
this.listLoading = false;
});
},
// initData() {
// this.listLoading = true;
// let _query = {
// ...this.listQuery,
// ...this.query,
// keyword: this.keyword,
// dataType: 0,
// menuId: this.menuId,
// moduleId: "578190840367677829",
// type: 1
// };
// request({
// url: `/api/scm/RecycleDeviceConfigOne/getList`,
// method: "post",
// data: _query
// }).then(res => {
// var _list = res.data.list;
// this.list = _list.map(o => ({
// ...o,
// ...this.expandObj
// }));
// this.total = res.data.pagination.total;
// this.listLoading = false;
// });
// },
handleDel(id) {
this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
type: "warning"

Write Preview
Loading…
Cancel
Save