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

钱包管理页面调整

Browse Source
master
jingling 9 months ago
parent 3efe20f456
commit 8e6447d6f7
15 changed files with 81 additions and 19 deletions
Show Stats Download Patch File Download Diff File

2
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/EnterpriseAccountBillMapper.java
Unescape View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组
* 日期： 2024-01-29
* 日期： 2024-02-04
*/
public interface EnterpriseAccountBillMapper extends BaseMapper<EnterpriseAccountBillEntity> {

2
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/EnterpriseAccountBillService.java
Unescape View File

@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
* 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组
* 日期： 2024-01-29
* 日期： 2024-02-04
*/
public interface EnterpriseAccountBillService extends IService<EnterpriseAccountBillEntity> {
List<EnterpriseAccountBillEntity> getList(EnterpriseAccountBillPagination enterpriseAccountBillPagination);

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

@ -36,7 +36,7 @@ import jnpf.permission.entity.UserEntity;
* 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组
* 日期： 2024-01-29
* 日期： 2024-02-04
*/
@Service
public class EnterpriseAccountBillServiceImpl extends ServiceImpl<EnterpriseAccountBillMapper, EnterpriseAccountBillEntity> implements EnterpriseAccountBillService{
@ -232,6 +232,16 @@ public class EnterpriseAccountBillServiceImpl extends ServiceImpl<EnterpriseAcco
}
if(ObjectUtil.isNotEmpty(enterpriseAccountBillPagination.getCreatorUserId())){
enterpriseAccountBillNum++;
String value = enterpriseAccountBillPagination.getCreatorUserId() instanceof List ?
JsonUtil.getObjectToString(enterpriseAccountBillPagination.getCreatorUserId()) :
String.valueOf(enterpriseAccountBillPagination.getCreatorUserId());
enterpriseAccountBillQueryWrapper.lambda().like(EnterpriseAccountBillEntity::getCreatorUserId,value);
}
}
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){

2
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/EnterpriseAccountBillController.java
Unescape View File

@ -34,7 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
* @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组
* @日期： 2024-01-29
* @日期： 2024-02-04
*/
@Slf4j
@RestController

6
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/EnterpriseAccountBillEntity.java
Unescape View File

@ -12,7 +12,7 @@ import java.math.BigDecimal;
* @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组
* @日期： 2024-01-29
* @日期： 2024-02-04
*/
@Data
@TableName("nx_enterprise_account_bill")
@ -35,9 +35,9 @@ public class EnterpriseAccountBillEntity {
private BigDecimal payoutAmount;
@TableField(value = "ACCOUNT_BALANCE" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal accountBalance;
@TableField("CREATOR_USER_ID")
@TableField(value = "CREATOR_USER_ID" , updateStrategy = FieldStrategy.IGNORED)
private String creatorUserId;
@TableField("CREATOR_TIME")
@TableField(value = "CREATOR_TIME" , updateStrategy = FieldStrategy.IGNORED)
private Date creatorTime;
@TableField(value = "REMARK" , updateStrategy = FieldStrategy.IGNORED)
private String remark;

8
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/enterpriseaccountbill/EnterpriseAccountBillConstant.java
View File

File diff suppressed because one or more lines are too long

8
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/enterpriseaccountbill/EnterpriseAccountBillForm.java
Unescape View File

@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组
* @日期： 2024-01-29
* @日期： 2024-02-04
*/
@Data
public class EnterpriseAccountBillForm {
@ -38,6 +38,12 @@ public class EnterpriseAccountBillForm {
/** 余额（元） **/
@JsonProperty("accountBalance")
private String accountBalance;
/** 创建用户 **/
@JsonProperty("creatorUserId")
private String creatorUserId;
/** 创建时间 **/
@JsonProperty("creatorTime")
private String creatorTime;
/** 备注 **/
@JsonProperty("remark")
private String remark;

5
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/enterpriseaccountbill/EnterpriseAccountBillPagination.java
Unescape View File

@ -11,7 +11,7 @@ import java.util.List;
* @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组
* @日期： 2024-01-29
* @日期： 2024-02-04
*/
@Data
public class EnterpriseAccountBillPagination extends Pagination {
@ -42,4 +42,7 @@ public class EnterpriseAccountBillPagination extends Pagination {
/** 备注 */
@JsonProperty("remark")
private Object remark;
/** 创建用户 */
@JsonProperty("creatorUserId")
private Object creatorUserId;
}

2
jnpf-java-boot/jnpf-web/src/views/enterprise/form.vue
Unescape View File

@ -123,7 +123,7 @@
<el-col :span="8">
<jnpf-form-tip-item label="商户logo" prop="enterpriseLogo">
<JnpfUploadImg v-model="dataForm.enterpriseLogo"
@change="changeData('enterpriseLogo',-1)" :fileSize="10" sizeUnit="MB" :limit="9"
@change="changeData('enterpriseLogo',-1)" :fileSize="10" sizeUnit="MB" :limit="1"
pathType="defaultPath" :isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>

6
jnpf-java-boot/jnpf-web/src/views/enterprise/index.vue
Unescape View File

@ -108,11 +108,11 @@
</el-table-column>
<el-table-column prop="firstContactPersonPosition" label="职位" align="left">
</el-table-column>
<el-table-column prop="firstContactPersonTel" label="手机号码" align="left">
<el-table-column prop="firstContactPersonTel" label="手机号码" align="left" width="100px">
</el-table-column>
<el-table-column prop="address" label="详细地址" align="left">
</el-table-column>
<el-table-column prop="landline" label="固话" align="left">
<el-table-column prop="landline" label="固话" align="left" width="100px">
</el-table-column>
<el-table-column prop="fax" label="传真" align="left">
</el-table-column>
@ -128,7 +128,7 @@
</el-table-column>
<el-table-column prop="depositBankAccount" label="开户银行账号" align="left">
</el-table-column>
<el-table-column prop="financeTel" label="电话号码" align="left">
<el-table-column prop="financeTel" label="电话号码" align="left" width="100px">
</el-table-column>
<el-table-column prop="registerAddress" label="注册地址" align="left">
</el-table-column>

12
jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/Detail.vue
Unescape View File

@ -47,6 +47,16 @@
<p>{{dataForm.accountBalance}}</p>
</jnpf-form-tip-item>
</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>{{dataForm.creatorTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="备注" prop="remark">
<p>{{dataForm.remark}}</p>
@ -83,6 +93,8 @@ export default {
incomeAmount: '',
payoutAmount: '',
accountBalance: '',
creatorUserId: '',
creatorTime: '',
remark: '',
},
orderTypeIdProps: { "label": "fullName", "value": "id" },

2
jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/columnList.js
View File

File diff suppressed because one or more lines are too long

21
jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/form.vue
Unescape View File

@ -87,6 +87,23 @@
</JnpfInput>
</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="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="创建时间" prop="creatorTime">
<JnpfDatePicker v-model="dataForm.creatorTime"
@change="changeData('creatorTime',-1)" :startTime="dateTime(false,1,1,'','')"
:endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable
:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col> -->
<el-col :span="24">
<jnpf-form-tip-item label="备注" prop="remark">
<JnpfTextarea v-model="dataForm.remark" @change="changeData('remark',-1)"
@ -153,6 +170,8 @@ export default {
incomeAmount: undefined,
payoutAmount: undefined,
accountBalance: undefined,
creatorUserId: undefined,
creatorTime: undefined,
remark: undefined,
},
tableRequiredData: {},
@ -173,6 +192,8 @@ export default {
incomeAmount: [],
payoutAmount: [],
accountBalance: [],
creatorUserId: [],
creatorTime: [],
remark: [],
},
}

10
jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/index.vue
Unescape View File

@ -40,6 +40,11 @@
<el-input v-model="query.remark" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="创建用户">
<el-input v-model="query.creatorUserId" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<el-form-item>
@ -103,6 +108,10 @@
</el-table-column>
<el-table-column prop="remark" label="备注" align="left">
</el-table-column>
<el-table-column prop="creatorUserId" label="创建用户" align="left">
</el-table-column>
<el-table-column prop="creatorTime" 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)">编辑
@ -178,6 +187,7 @@ export default {
orderTypeId: undefined,
billStatusId: undefined,
remark: undefined,
creatorUserId: undefined,
},
treeProps: {
children: 'children',

2
jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/superQueryJson.js
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save