diff --git a/fuintAdmin/src/api/fleet/fleetinfo.js b/fuintAdmin/src/api/fleet/fleetinfo.js
new file mode 100644
index 000000000..6ea27cf2a
--- /dev/null
+++ b/fuintAdmin/src/api/fleet/fleetinfo.js
@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+// 分页查询所有的订单信息
+export function getFleetInfoList(query) {
+ return request({
+ url: 'fleetInfo',
+ method: 'get',
+ params: query
+
+ })
+}
+
+// 分页查询所有的订单信息
+export function getFleetInfo(id) {
+ return request({
+ url: 'fleetInfo/'+id,
+ method: 'get',
+ })
+}
+
+// 分页查询所有的订单信息
+export function addFleetInfo(data) {
+ return request({
+ url: 'fleetInfo',
+ method: 'post',
+ data: data
+ })
+}
+
+// 分页查询所有的订单信息
+export function editFleetInfo(data) {
+ return request({
+ url: 'fleetInfo',
+ method: 'put',
+ data: data
+ })
+}
+
+// 分页查询所有的订单信息
+export function deleteFleetInfo(id) {
+ return request({
+ url: 'fleetInfo/'+id,
+ method: 'delete',
+ })
+}
diff --git a/fuintAdmin/src/api/fleet/fleetmember.js b/fuintAdmin/src/api/fleet/fleetmember.js
new file mode 100644
index 000000000..15e6a0539
--- /dev/null
+++ b/fuintAdmin/src/api/fleet/fleetmember.js
@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+// 分页查询所有的订单信息
+export function getFleetMemberList(query) {
+ return request({
+ url: 'fleetMember',
+ method: 'get',
+ params: query
+
+ })
+}
+
+// 分页查询所有的订单信息
+export function getFleetMember(id) {
+ return request({
+ url: 'fleetMember/'+id,
+ method: 'get',
+ })
+}
+
+// 分页查询所有的订单信息
+export function addFleetMember(data) {
+ return request({
+ url: 'fleetMember',
+ method: 'post',
+ data: data
+ })
+}
+
+// 分页查询所有的订单信息
+export function editFleetMember(data) {
+ return request({
+ url: 'fleetMember',
+ method: 'put',
+ data: data
+ })
+}
+
+// 分页查询所有的订单信息
+export function deleteFleetMember(id) {
+ return request({
+ url: 'fleetMember/'+id,
+ method: 'delete',
+ })
+}
diff --git a/fuintAdmin/src/api/staff/user/userlabel.js b/fuintAdmin/src/api/staff/user/userlabel.js
new file mode 100644
index 000000000..fb8b510fc
--- /dev/null
+++ b/fuintAdmin/src/api/staff/user/userlabel.js
@@ -0,0 +1,40 @@
+import request from '@/utils/request'
+
+// 查询会员标签列表
+export function listUserLabel(query) {
+ return request({
+ url: '/userLabel',
+ method: 'get',
+ params: query
+ })
+}
+// 根据id查询会员标签
+export function getUserLabel(id) {
+ return request({
+ url: '/userLabel/'+id,
+ method: 'get',
+ })
+}
+// 添加会员标签
+export function addUserLabel(data) {
+ return request({
+ url: '/userLabel',
+ method: 'post',
+ data: data
+ })
+}
+// 修改会员标签
+export function editUserLabel(data) {
+ return request({
+ url: '/userLabel',
+ method: 'put',
+ data: data
+ })
+}
+// 删除会员标签
+export function deleteUserLabel(id) {
+ return request({
+ url: '/userLabel/'+id,
+ method: 'delete',
+ })
+}
diff --git a/fuintAdmin/src/layout/components/Navbar.vue b/fuintAdmin/src/layout/components/Navbar.vue
index 9b8925fab..95afce182 100644
--- a/fuintAdmin/src/layout/components/Navbar.vue
+++ b/fuintAdmin/src/layout/components/Navbar.vue
@@ -282,7 +282,7 @@ export default {
background-size: cover;
background-repeat: no-repeat;
background: #FFFFFF;
- box-shadow: 0px 3px 6px 1px rgba(0,0,0,0.1);
+ //box-shadow: 0px 3px 6px 1px rgba(0,0,0,0.1);
box-sizing: border-box;
padding: 20px;
display: flex;
diff --git a/fuintAdmin/src/views/fleet/index.vue b/fuintAdmin/src/views/fleet/index.vue
new file mode 100644
index 000000000..3daf9184c
--- /dev/null
+++ b/fuintAdmin/src/views/fleet/index.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/fuintAdmin/src/views/fleet/tab/fleetInfo.vue b/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
new file mode 100644
index 000000000..1d518fa99
--- /dev/null
+++ b/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
@@ -0,0 +1,490 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 至
+
+
+
+
+ 搜索
+ 重置
+ 新增车队
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 车队充值
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 元
+
+
+
+
+
+ 元
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 至
+
+
+
+
+ 搜索
+ 重置
+ 新增成员
+ 批量增加
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 额度管理
+ 注销副卡
+ 消费记录
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 元
+
+
+
+
+
+ 元
+
+
+
+
+
+ 元
+
+
+
+
+
+
+
+
+
+
+
+
+ 元
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 元
+
+
+
+
+
+ 元
+
+
+
+
+
+ 元
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
点击导入 文件
+
+
+
+ 只能上传xls/xlsx文件，批量导入会员手机号，单次最大支持5000个会员手机号认证，请确保用户手机号已注册为油站会员(在会员列表已显示)，否则无法添加成员信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+ 油品订单提成
+ 商品订单提成
+ 储值卡充值提成
+ 囤油卡充值提成
+
+
+
+
+ {{ scope.row.amount || 0 }}
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 至
+
+
+
+
+ 搜索
+ 重置
+ 新增标签
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+ 新增设备
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+ 新增设备
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
门头照：
@@ -164,6 +170,11 @@ export default {
this.store.logo = "/static" + list[list.length - 1]
},
// 获取图片url地址
+ getLicenseUrl(val) {
+ let list = val.split("/static")
+ this.store.license = "/static" + list[list.length - 1]
+ },
+ // 获取图片url地址
getDoorImgUrl(val) {
let list = val.split(",")
let doorUrl = []
diff --git a/fuintAdmin_zt/src/views/Site/add.vue b/fuintAdmin_zt/src/views/Site/add.vue
index 10896e467..5357a411c 100644
--- a/fuintAdmin_zt/src/views/Site/add.vue
+++ b/fuintAdmin_zt/src/views/Site/add.vue
@@ -71,6 +71,10 @@ export default {
});
},
submitForm(formName) {
+ if (this.ruleForm.checkedKeys.length==0 && this.ruleForm.roleCode != '2' && this.ruleForm.roleCode != '3') {
+ this.$message.error("请先选择菜单")
+ return;
+ }
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.ruleForm.dutyId) {
@@ -111,7 +115,7 @@ export default {
this.ruleForm.roleType = response.data.roleInfo.type;
this.ruleForm.storeId = response.data.roleInfo.storeId;
this.ruleForm.description = response.data.roleInfo.description;
- let checkedKeys = response.data.checkedKeys
+ let checkedKeys = response.data.checkedKeys || []
this.ruleForm.checkedKeys = checkedKeys
this.ruleForm.menuIds = checkedKeys
this.merchantId = response.data.roleInfo.type
@@ -120,7 +124,7 @@ export default {
}else {
this.isCashier = false
}
- if (this.checkedKeys.length==this.ruleForm.checkedKeys.length && this.isCashier){
+ if (this.ruleForm.checkedKeys.length >0 && this.checkedKeys.length==this.ruleForm.checkedKeys.length && this.isCashier){
this.checked = true
}else {
this.checked = false
@@ -356,7 +360,7 @@ export default {
-
+
全选
展开
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue
index 1d77ae56f..0635732ac 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue
@@ -96,7 +96,6 @@ export default {