chuangte/bick_back
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into tx

Browse Source
This commit is contained in:
邱贞招 2024-11-08 17:42:02 +08:00
commit 6ae2be2f19
8 changed files with 327 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/system/dept.js
View File

@ -43,6 +43,15 @@ export function addDept(data) {
})
}
// 快速生成
export function fastAddDept(data) {
return request({
url: '/system/dept/fastCreate',
method: 'post',
data: data
})
}
// 修改部门
export function updateDept(data) {
return request({

14
src/components/Map/location/LocationMaps.vue
View File

@ -117,9 +117,10 @@ export default {
// this.doPlaceSearch(city + '人民政府');
// }
// },
async getAreas(areaId) {
getArea(this.areaId).then(response => {
if(areaId !=null){
getArea(this.areaId).then(response => {
console.log(response,'responseresponse');
this.area = response.data;
@ -140,7 +141,8 @@ export default {
this.initAMap();
});
});
});
}
},
initAMap() {
AMapLoader.load({
@ -183,7 +185,7 @@ export default {
// setTimeout(() => {
// this.trajectory()
// }, 500);
}).catch((e) => {
console.log("地图加载失败！！！");
@ -207,7 +209,7 @@ export default {
let longitude = parseFloat(abb[0][0]);
let latitude1 = parseFloat(abb[abb.length - 1][1]);
let longitude1 = parseFloat( abb[abb.length - 1][0]);
this.marker = new AMap.Marker({
map: this.map,
position: [longitude, latitude],
@ -600,7 +602,7 @@ export default {
// 每一段的时长
duration: 200,//可根据实际采集时间间隔设置
});
},
pauseAnimation() {
this.marker.pauseMove();

232
src/views/system/dept/index.vue
View File

@ -61,6 +61,16 @@
@click="toggleExpandAll"
>展开/折叠</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="fastAdd"
v-hasPermi="['system:dept:add']"
>快速生成</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -216,7 +226,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="!isFastAdd">
<el-col :span="24">
<el-form-item label="绑定运营区" label-width="90">
<el-select style="width: 91%" v-model="form.areaIds" multiple placeholder="请绑定运营区">
@ -312,6 +322,69 @@
</el-form-item>
</el-col>
</el-row>
<el-row v-if="isFastAdd">
<el-col :span="12">
<el-form-item
label="运营区"
prop="areaName"
data-tip="这是运营区输入框">
<el-input v-model="form.areaName" placeholder="请输入运营区" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="运营区域" data-tip="这是运营区域选择框">
<el-select
v-model="form.province"
clearable
size="small"
placeholder="请选择省"
class="filter-item"
style="width: 90px"
@change="provinceChange($event)"
>
<el-option
v-for="item in form.provinceList"
:key="item.name"
:label="item.name"
:value="item.name"
/>
</el-select>
<el-select
v-model="form.city"
clearable
size="small"
placeholder="请选择城市"
class="filter-item"
style="width: 100px"
@change="cityChange($event)"
>
<el-option
v-for="item in form.cityList"
:key="item.name"
:label="item.name"
:value="item.name"
/>
</el-select>
<el-select
v-model="form.county"
clearable
size="small"
placeholder="请选择区县"
class="filter-item"
style="width: 100px"
>
<el-option
v-for="item in form.countyList"
:key="item.name"
:label="item.name"
:value="item.name"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12" v-show="form.isUsePlatformApp != true">
<el-form-item label="appSecret" prop="appSecret">
@ -336,7 +409,6 @@
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
<div slot="footer" class="dialog-footer">
@ -353,6 +425,7 @@
<el-radio
v-for="dict in dict.type.et_withdraw_method"
:key="dict.value"
v-if="dict.value === '1'"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
@ -376,15 +449,15 @@
</template>
<script>
import {
listDept,
getDept,
delDept,
addDept,
updateDept,
listDeptExcludeChild,
listDept2
} from '@/api/system/dept'
import {
listDept,
getDept,
delDept,
addDept,
updateDept,
listDeptExcludeChild,
listDept2, fastAddDept
} from '@/api/system/dept'
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { listArea } from '../../../api/system/area'
@ -392,6 +465,7 @@ import { fastSearch } from '@/api/user/user'
import { getUser } from '@/api/system/user'
import { withdraw } from '@/api/system/flow'
import { listChannel } from '@/api/system/channel'
import { getDistrictList } from '@/api/common/common'
export default {
name: "Dept",
@ -448,6 +522,15 @@ export default {
// 表格树数据
deptList: [],
// appUserId: null,
isFastAdd: false,
province: null,
city: null,
county: null,
provinceList: [],
cityList: [],
countyList: [],
CITY: [],
XIAN: [],
// 总条数
total: 0,
// 代理商树选项
@ -483,7 +566,13 @@ export default {
},
// 表单参数
form: {
// isProfitSharing: 'N'
payChannel: 2,
province: "",
city: "",
county: "",
provinceList: [],
cityList: [],
countyList: [],
},
form2: {
method: '1'
@ -657,6 +746,7 @@ export default {
email: undefined,
status: "0",
// isProfitSharing: false,
payChannel: 2,
separateAccount: 'N',
platformServiceFee: '4',
handlingCharge: '5.4',
@ -668,7 +758,13 @@ export default {
notifyUrl: null,
privateKeyPath: null,
merchantSerialNumber: null,
refundNotifyUrl: null
refundNotifyUrl: null,
province: "",
city: "",
county: "",
provinceList: [],
cityList: [],
countyList: []
};
this.balance = 0,
this.form2 = {
@ -691,9 +787,22 @@ export default {
},
/** 新增按钮操作 */
handleAdd(row) {
this.addHandle(row,1);
},
fastAdd(row){
this.addHandle(row,2);
},
addHandle(row,type){
this.reset();
this.open = true;
this.title = "添加代理商";
if(type === 1){
this.title = "添加代理商";
this.isFastAdd = false
}else{
this.title = "快速生成";
this.isFastAdd = true;
}
this.getCityList();
listDept2({status: '0',pageNum:1,pageSize:999 }).then(response => {
// console.log("response=============",response)
this.deptOptions = response.data;
@ -705,6 +814,83 @@ export default {
this.channelOptions = response.rows;
});
});
console.log("provinceList======"+JSON.stringify(this.form))
},
getCityList() {
getDistrictList().then((res) => {
this.form.provinceList = JSON.parse(res.data);
// this.form.provinceList = res.data.districts[0].districts /* 省*/
/* 进行遍历赋值*/
/* 市区和县区*/
let newProvince = this.form.provinceList;
for (let i = 0; i < newProvince.length; i++) {
/* 省级*/
for (let j = 0; j < newProvince[i].districts.length; j++) {
/* 市级*/
let city = newProvince[i].districts[j].name;
this.CITY.push({ id: j + 1, name: city, code: i + 1 });
for (
let k = 0;
k < newProvince[i].districts[j].districts.length;
k++
) {
/* 县级*/
let xian = newProvince[i].districts[j].districts[k].name;
this.XIAN.push({
id: k + 1,
name: xian,
code: j + 1,
cityCountyName: city,
});
}
}
}
for (let m = 0; m < newProvince.length; m++) {
newProvince[m] = { ...newProvince[m], ...{ code: m + 1 } };
}
// console.log("newProvince======"+JSON.stringify(newProvince))
this.form.provinceList = newProvince;
// this.loading = true
// console.log("this.form.provinceList222222222222",this.form.provinceList)
});
},
cityChange(that) {
let countyCode = 0;
let cityname = "";
let newCountyArry = [];
this.form.cityList.forEach((item, index) => {
if (item.name == that) {
countyCode = item.id;
cityname = item.name;
}
});
if (countyCode) {
this.form.countyList = [];
this.XIAN.forEach((item, index) => {
if (item.code == countyCode && item.cityCountyName == cityname) {
this.form.countyList.push(item);
}
});
}
},
provinceChange(that) {
// 根据选中省，匹配市
let cityCode = 0;
let newCityArry = [];
this.form.provinceList.forEach((item, index) => {
if (item.name == that) {
cityCode = item.code;
}
});
// console.log(cityCode)
if (cityCode) {
this.form.cityList = [];
this.CITY.forEach((item, index) => {
if (item.code == cityCode) {
this.form.cityList.push(item);
}
}); /* 市匹配成功*/
}
},
/** 展开/折叠操作 */
toggleExpandAll() {
@ -768,11 +954,19 @@ export default {
this.getList();
});
} else {
addDept(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
if(this.isFastAdd){
fastAddDept(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}else{
addDept(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
}
});

74
src/views/system/device/index.vue
View File

@ -128,6 +128,21 @@
/>
</el-select>
</el-form-item>
<el-form-item label="车型" prop="modelId" v-if="userName == 'admin'">
<el-select
v-model="queryParams.modelId"
filterable
placeholder="选择车型"
style="width: 120px"
clearable>
<el-option
v-for="item in modelOptions"
:key="item.modelId"
:label="item.model"
:value="item.modelId"
></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="primary"
@ -794,7 +809,7 @@
</el-row>
<el-row>
<h2 style="font-weight: bold; font-size: 18px; padding: 0; margin: 0">
定位更新1
定位更新
</h2>
<el-col :span="6">
<el-form-item label="经度：">{{ form.longitude }}</el-form-item>
@ -1015,6 +1030,7 @@ export default {
mac: null,
sn: null,
areaId: null,
modelId: null,
onlineStatus: null,
status: null,
version: null,
@ -1093,6 +1109,7 @@ export default {
this.userName = this.$store.state.user.name;
this.getList();
if (this.userName === "admin") {
console.log("admin==========================="+this.userName)
listHardwareVersionExcludeParent(this.queryParams).then((response) => {
this.hardwareVersionOptions = response.data;
this.loading2 = false;
@ -1122,10 +1139,15 @@ export default {
}
},
"form.hardwareVersionId": function (hardwareVersionId) {
if (hardwareVersionId && this.username == 'admin') {
if (hardwareVersionId && this.userName == 'admin') {
this.selectHardwareVersion(hardwareVersionId);
}
},
"queryParams.deptId": function (newVal) {
if (!this.isUpdating) {
this.fetchData4(newVal);
}
},
open2(val) {
if (!val) {
console.log("========关闭地图=============");
@ -1232,6 +1254,7 @@ export default {
: (this.form.areaId = null);
this.modelOptions = response.data.modelList;
let modelOptions = response.data.modelList;
// console.log("=======1111111111=======",this.modelOptions.length)
modelOptions.length > 0
? (this.form.modelId = modelOptions[0].modelId)
: (this.form.modelId = null);
@ -1244,6 +1267,25 @@ export default {
// this.form.modelId = null;
}
},
/** 当选择代理商时 根据代理商id，获取运营区和型号 */
fetchData4(deptId) {
if (deptId) {
// this.isUpdating = true; // 设置标志位
selectAreaListByDeptId(deptId).then((response) => {
this.modelOptions = response.data.modelList;
let modelOptions = response.data.modelList;
modelOptions.length > 0
? (this.form.modelId = modelOptions[0].modelId)
: (this.form.modelId = null);
}).finally(() => {
// this.isUpdating = false; // 清除标志位
});
} else {
this.reset2();
// this.form.areaId = null;
// this.form.modelId = null;
}
},
/** 当选择运营区时 根据运营区id，获取代理商和型号 */
fetchData3(areaId) {
if (areaId) {
@ -1406,6 +1448,9 @@ export default {
this.total = response.total;
this.loading = false;
});
listModel(this.queryParams).then((response) => {
this.modelOptions = response.rows;
});
},
// 取消按钮
cancel() {
@ -1449,6 +1494,10 @@ export default {
}
);
}
// console.log(33333333333)
listModel(this.queryParams).then((response) => {
this.modelOptions = response.rows;
});
// listModel(this.queryParams).then((response) => {
// this.modelOptions = response.rows;
// });
@ -1457,7 +1506,6 @@ export default {
});
},
reset2() {
console.log(11111);
this.form.areaId = null;
this.form.deptId = null;
this.form.modelId = null;
@ -1468,9 +1516,6 @@ export default {
}
);
}
// listModel(this.queryParams).then((response) => {
// this.modelOptions = response.rows;
// });
listArea(this.queryParams).then((response) => {
this.areaOptions = response.rows;
});
@ -1496,11 +1541,9 @@ export default {
this.reset();
this.open = true;
this.title = "添加设备";
this.$nextTick(() => {
if(this.deptId){
this.form.deptId=this.deptId
}
})
},
@ -1509,6 +1552,7 @@ export default {
this.open2 = true;
console.log("row======" + JSON.stringify(row));
this.form.areaId = row.areaId;
console.log("this.form.areaId======" + this.form.areaId);
this.form = row;
console.log(this.form, "this.formthis.formthis.form");
@ -1567,6 +1611,20 @@ export default {
const deviceId = row.deviceId || this.ids;
getDevice(deviceId).then((response) => {
this.form = response.data;
console.log("111111111111111111",this.form)
selectAreaListByDeptId(response.data.deptId).then((response) => {
this.areaOptions = response.data.areaList;
let areaOptions = response.data.areaList;
areaOptions.length > 0
? (this.form.areaId = areaOptions[0].areaId)
: (this.form.areaId = null);
this.modelOptions = response.data.modelList;
let modelOptions = response.data.modelList;
console.log("==============",this.modelOptions.length)
modelOptions.length > 0
? (this.form.modelId = modelOptions[0].modelId)
: (this.form.modelId = null);
});
this.open = true;
this.title = "修改设备";
});

1
src/views/system/partner/index.vue
View File

@ -308,6 +308,7 @@ export default {
title: "",
// 部门树选项
deptOptions: undefined,
deptOptions2: [],
// 是否显示弹出层
open: false,
// 部门名称

12
src/views/system/recharge/index.vue
View File

@ -30,6 +30,13 @@
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="是否退款" prop="isRefund">
<el-checkbox-group v-model="queryParams.isRefund" @change="handleQuery" size="mini">
<el-checkbox-button v-for="dict in dict.type.et_is_refund" :label="dict.value" :key="dict.value">
{{dict.label}}
</el-checkbox-button>
</el-checkbox-group>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -105,11 +112,11 @@
</template>
<script>
import { rechargeList, getOrder, delOrder, addOrder, updateOrder, handleRefund, deduction } from '@/api/system/order'
import { rechargeList, getOrder, delOrder, addOrder, updateOrder, handleRefund, deduction } from '@/api/system/order'
import { listDept2 } from '@/api/system/dept'
export default {
name: "Order",
dicts: ['et_order_type', 'et_pay_type', 'et_recharge_status','et_recharge_status'],
dicts: ['et_order_type', 'et_pay_type', 'et_recharge_status','et_is_refund'],
props: {
// 用户id
deptId: {
@ -146,6 +153,7 @@ export default {
orderNo: null,
type: "2",
userId: null,
isRefund: ["0","1"],
deviceMac: null,
deptId: this.deptId,
},

5
src/views/system/user/index.vue
View File

@ -669,7 +669,6 @@ export default {
/** 提交按钮 */
submitForm: function () {
this.form.userName = this.form.phonenumber;
this.form.userType = '00';
// 判空检查
if (!this.form.roleIds || this.form.roleIds.length === 0) {
this.$modal.msgError("请选择角色"); // 弹窗提示
@ -677,6 +676,7 @@ export default {
}
this.form.roleIds = [this.form.roleIds];
console.log("roleIds" + this.form.roleIds)
console.log("roleIds===="+this.form.roleIds)
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.userId != undefined) {
@ -686,6 +686,9 @@ export default {
this.getList();
});
} else {
if(this.form.roleIds == 4){
this.form.userType = '03';
}
addUser(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;

23
src/views/system/withdrawAudit/index.vue
View File

@ -165,6 +165,7 @@
<el-radio
v-for="dict in dict.type.et_withdraw_method"
:key="dict.value"
v-if="dict.value === '1'"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
@ -246,14 +247,17 @@ export default {
computed: {
formattedFee() {
let fee;
// console.log("this.handlingChargeType", this.handlingChargeType)
if(this.handlingChargeType === '1'){
let handlingCharge = parseFloat(this.handlingCharge)/1000;
// console.log("1111111111111")
let withdrawHandlingCharge = parseFloat(this.withdrawHandlingCharge)/1000;
// 计算手续费
let fee1 = this.form.amount * handlingCharge;
let fee1 = this.form.amount * withdrawHandlingCharge;
// 保留两位小数，并确保四舍五入
fee = fee1.toFixed(2);
}else{
fee = parseFloat(this.handlingCharge);
// console.log("22222222222")
fee = parseFloat(this.withdrawHandlingCharge);
}
// 判断手续费是否为0
if (fee === 0) {
@ -265,14 +269,16 @@ export default {
actualAmount() {
let amount = this.form.amount;
let fee;
console.log("this.handlingChargeType", this.handlingChargeType)
console.log("this.withdrawHandlingCharge", this.withdrawHandlingCharge)
if(this.handlingChargeType === '1'){
let handlingCharge = parseFloat(this.handlingCharge)/1000;
let handlingCharge = parseFloat(this.withdrawHandlingCharge)/1000;
let fee1 = this.form.amount * handlingCharge;
// 四舍五入到两位小数
fee = Math.round(fee1 * 100) / 100;
// 计算实际到账金额并四舍五入到两位小数
}else{
fee = parseFloat(this.handlingCharge);
fee = parseFloat(this.withdrawHandlingCharge);
}
let actual = amount - fee;
actual = actual.toFixed(2);
@ -329,7 +335,9 @@ export default {
ownerId:this.deptId
},
// 表单参数
form: {},
form: {
method: '1',
},
form3: {},
collectionCode:null,
// 表单校验
@ -380,7 +388,8 @@ export default {
getDept(deptId){
getDeptByToken(deptId).then(response => {
this.balance = response.data.balance;
this.handlingCharge = response.data.handlingCharge;
// this.handlingCharge = response.data.handlingCharge;
this.withdrawHandlingCharge = response.data.withdrawHandlingCharge;
this.handlingChargeType = response.data.handlingChargeType;
this.form.amount = 0;
// console.log("11111handlingCharge===========",this.handlingCharge)