From ef0cf628b28c8f96765e36fdb487b0cc3c8910a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Thu, 28 Mar 2024 15:18:55 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
fuintAdmin_zt/src/views/Site/index.vue | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index e85d268be..5544bfe49 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -294,7 +294,7 @@
- 元
+ 万元
@@ -315,7 +315,7 @@
- 元
+ 万元
@@ -323,7 +323,7 @@
- 元
+ 万元
@@ -369,7 +369,7 @@
- 元
+ 万元
@@ -1221,14 +1221,14 @@ export default {
// 费率
const feeRate = new BigNumber(this.ruleForm.rates?this.ruleForm.rates:0);
if (feeRate == 0) return
- const fee = turnoverLimit.dividedBy(feeRate.dividedBy(100));
+ const fee = turnoverLimit.dividedBy(feeRate.dividedBy(0.01));
this.ruleForm.turnoverLimit = fee.toFixed(2)
}else if (this.ruleForm.turnoverType === '4'){
// 实际交易量
const turnoverLimit = new BigNumber(this.ruleForm.turnoverLimit?this.ruleForm.turnoverLimit:0);
const feeRate = new BigNumber(this.ruleForm.rates?this.ruleForm.rates:0);
if (feeRate == 0) return
- const fee = turnoverLimit.times(feeRate.dividedBy(100));
+ const fee = turnoverLimit.times(feeRate.dividedBy(0.01));
this.ruleForm.prepaidAmount = fee.toFixed(2)
}
},
From 19ca4609daa489f390b79e09df75b5ade62b32a2 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Thu, 28 Mar 2024 15:35:13 +0800
Subject: [PATCH 2/8] bug
---
fuintAdmin_zt/src/views/Site/index.vue | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index 5544bfe49..26c6cecfd 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -197,6 +197,16 @@
>{{dict.label}}
+
+
+ {{dict.label}}
+
+
Date: Thu, 28 Mar 2024 18:13:58 +0800
Subject: [PATCH 3/8] bug
---
fuintAdmin_zt/src/views/Site/index.vue | 88 +++++++++++++++-----------
1 file changed, 51 insertions(+), 37 deletions(-)
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index 26c6cecfd..d8ec1ce29 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -187,34 +187,45 @@
>{{dict.label}}
-
-
- {{dict.label}}
-
-
-
-
- {{dict.label}}
-
-
-
- {{dict.label}}
-
+
+
+ {{dict.label}}
+
+
+
+
+ {{dict.label}}
+
+
+
+
+ {{dict.label}}
+
+
+
+
+ {{dict.label}}
+
+
@@ -223,7 +234,7 @@
-
+
无限制
@@ -943,6 +954,12 @@ export default {
mobile: [
{ required: true, message: '手机号不能为空', trigger: 'blur' },
],
+ deptType: [
+ { required: true, message: '机构类型不能为空', trigger: 'blur' },
+ ],
+ turnoverType: [
+ { required: true, message: '计费方式不能为空', trigger: 'blur' },
+ ],
deptName: [
{ required: true, message: '请输入机构名称', trigger: 'blur' },
@@ -1401,13 +1418,10 @@ export default {
// },
handleClick(tab, event) {
console.log(this.activeName)
- if (this.activeName=="list"){
+ if (this.activeName==="list"){
this.onlyGetUser()
}
- if (this.activeName=="duty"){
- this.getDutyList()
- }
- if (this.activeName=="info"){
+ if (this.activeName==="duty"){
this.getDutyList()
}
},
@@ -1423,7 +1437,7 @@ export default {
this.beginTime = ""
this.endTime = ""
- this.addNode(data.id,data.label)
+ this.addNode(data.id,data.label,data.deptType)
// console.log(this.pdinfo)
event.stopPropagation();
@@ -1444,13 +1458,13 @@ export default {
}
},
// 新增数据
- addNode(id,label) {
+ addNode(id,label,deptType) {
let _this = this
// 默认类型
this.isClick = false
- this.ruleForm.deptType = "3"
+ this.ruleForm.deptType = deptType
this.$nextTick(() => {
- console.log("新增树的返回222", this.ruleForm);
+ console.log("新增树的返回222", this.ruleForm,id,label);
});
// _this.ruleForm.deptType = '1'
From 435bca9441f9a1102faf540d62df5c5d761de369 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Fri, 29 Mar 2024 10:18:43 +0800
Subject: [PATCH 4/8] bug
---
fuintAdmin_zt/src/views/Site/index.vue | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index d8ec1ce29..2bb514f5d 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -188,7 +188,7 @@
-
+
{{dict.label}}
-
+
{{dict.label}}
-
+
{{dict.label}}
-
+
+
+ {{dict.label}}
+
+
+
Date: Fri, 29 Mar 2024 10:28:00 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
fuintAdmin_zt/src/views/Site/index.vue | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index 5544bfe49..8142aa0e1 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -764,6 +764,14 @@ export default {
},
dicts: ['node_type'],
data() {
+ const equalToPassword = (rule, value, callback) => {
+ console.log("151515151:",this.form.password1,value)
+ if (this.form.password !== value) {
+ callback(new Error("两次输入的密码不一致"));
+ } else {
+ callback();
+ }
+ };
return {
storeNum: false,
isEditDept:true,
@@ -971,6 +979,11 @@ export default {
{required: true, message: "用户密码不能为空", trigger: "blur"},
{min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur'}
],
+ password1: [
+ {required: true, message: "用户密码不能为空", trigger: "blur"},
+ { required: true, validator: equalToPassword, trigger: "blur" },
+ {min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur'}
+ ],
email: [
{
type: "email",
@@ -1815,6 +1828,7 @@ export default {
app.form.roleIds = Number(app.form.roleIds);
app.form.password1 = row.password
+
//获取角色
let permissionType
From dd6c70f1ab3f6f3e04aa764c79ac69af30b202e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Fri, 29 Mar 2024 10:58:01 +0800
Subject: [PATCH 6/8] mapai
---
fuintAdmin_zt/src/views/tag/oilTag/index.vue | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/fuintAdmin_zt/src/views/tag/oilTag/index.vue b/fuintAdmin_zt/src/views/tag/oilTag/index.vue
index 8ecf40720..3fc77af71 100644
--- a/fuintAdmin_zt/src/views/tag/oilTag/index.vue
+++ b/fuintAdmin_zt/src/views/tag/oilTag/index.vue
@@ -75,6 +75,7 @@
+
已绑
@@ -227,6 +228,15 @@ export default {
form: {},
// 表单校验
rules: {
+ companyName: [
+ { required: true, message: "公司名称不能为空", trigger: "blur" },
+ ],
+ tagCodeSn: [
+ { required: true, message: "二维码SN不能为空", trigger: "blur" },
+ ],
+ snCode: [
+ { required: true, message: "码牌SN不能为空", trigger: "blur" },
+ ]
}
};
},
From 60b52b53b3e737716f78d5d9834f7b4eaa2f3be7 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Fri, 29 Mar 2024 13:18:58 +0800
Subject: [PATCH 7/8] bug
---
fuintAdmin_zt/src/views/Site/index.vue | 108 ++++++++++--------
.../controller/BackendDutyController.java | 2 +-
2 files changed, 63 insertions(+), 47 deletions(-)
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index b99ba7486..98acbdbe3 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -188,53 +188,65 @@
-
-
- {{dict.label}}
-
+
+
+
+ {{dict.label}}
+
+
+
+
+ {{dict.label}}
+
+
+
+
+ {{dict.label}}
+
+
+
+
+ {{dict.label}}
+
+
+
+
+ {{dict.label}}
+
+
-
+
- {{dict.label}}
-
-
-
-
- {{dict.label}}
-
-
-
-
- {{dict.label}}
-
-
-
-
- {{dict.label}}
-
+ {{dict.label}}
+
@@ -808,6 +820,7 @@ export default {
isEditDept:true,
isTopDept:true,
parentDeptType:"",
+ isAdd:false,
timeFrame:[],
@@ -1107,6 +1120,8 @@ export default {
submitForm1: function() {
this.$refs["form1"].validate(valid => {
if (valid) {
+ console.log(this.deptType)
+ this.form1.deptType = this.deptType
if (this.form1.dutyId) {
this.form1.menuIds = this.getMenuAllCheckedKeys();
updateRole(this.form1).then(response => {
@@ -1318,6 +1333,7 @@ export default {
console.log('点树',data)
+ this.isAdd = false
this.cleanUp()
let flag = true
@@ -1465,7 +1481,7 @@ export default {
this.addNode(data.id,data.label,data.deptType)
// console.log(this.pdinfo)
event.stopPropagation();
-
+ this.isAdd = true
// 新增树
},
cleanRuleForm() {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/controller/BackendDutyController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/controller/BackendDutyController.java
index 25312d548..a32b45a18 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/controller/BackendDutyController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/controller/BackendDutyController.java
@@ -140,7 +140,7 @@ public class BackendDutyController extends BaseController {
String token = request.getHeader("Access-Token");
List menuIds = (List) param.get("menuIds");
String name = param.get("roleName").toString();
- String type = param.get("roleType").toString();
+ String type = param.get("deptType").toString();
String status = param.get("status").toString();
String description = param.get("description").toString();
if (ObjectUtil.isEmpty(param.get("storeId"))){
From 7bf9f0274f40cb66f47bd96f07571f84a13c1d3f Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Fri, 29 Mar 2024 13:40:45 +0800
Subject: [PATCH 8/8] bug
---
fuintAdmin_zt/src/views/Site/index.vue | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index 98acbdbe3..a6ea8e1c3 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -546,14 +546,14 @@
:data="dutyList">
-
-
- 超级管理员
- 普通管理员
- 油站角色
- 公司角色
-
-
+
+
+
+
+
+
+
+
@@ -720,6 +720,7 @@
ref="menu"
node-key="id"
:check-strictly="!form1.menuCheckStrictly"
+ :default-checked-keys="form1.checkedKeys"
empty-text="加载中，请稍候"
:props="defaultProps1"
>
@@ -1203,6 +1204,7 @@ export default {
// if (data.dutyType == '4') val = 2;
// const roleMenu = this.getMenuTreeselect(val);
const roleId = data.dutyId
+ this.form1.menuCheckStrictly = false
getRole(roleId).then(response => {
this.form1.roleName = response.data.roleInfo.name;
this.form1.roleType = response.data.roleInfo.type;
@@ -1212,7 +1214,8 @@ export default {
this.openDuty = true;
this.title = "修改角色";
let checkedKeys = response.data.checkedKeys
-
+ this.form1.checkedKeys = checkedKeys
+ this.getMenuTreeselect(response.data.roleInfo.type)
// this.$nextTick(() => {
// roleMenu.then(res => {
// checkedKeys.forEach((v) => {