java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

修复已知bug

dev-xx
马远东 6 months ago
parent
27386f2879
commit
6852eb4216
4 changed files with 158 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 80
      src/option/mt/Mengtiandatapushback.js
  2. 44
      src/option/signfor/asurcharge.js
  3. 1
      src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue
  4. 117
      src/views/distribution/signfor/asurcharge.vue

80
src/option/mt/Mengtiandatapushback.js
Unescape View File

@ -14,7 +14,17 @@ export const columnList = [
width: 55,
fixed: true,
},
{
prop: 'warehouse',
label: '作业仓库',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'senderCode',
label: '发货单编号',
@ -48,6 +58,7 @@ export const columnList = [
sortable: true,
head: false,
},
{
prop: 'type',
label: '类型',
@ -87,6 +98,53 @@ export const columnList = [
sortable: true,
head: false,
},
{
prop: 'content',
label: '内容',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'resultContent',
label: '返回值',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'createTime',
label: '创建时间',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'updateTime',
label: '更新时间',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'sendStatusNameS',
label: '状态',
@ -112,14 +170,14 @@ export const columnList = [
head: false,
},
// {
// prop: 'createUserName',
// label: '操作',
// type: 6,
// values: '',
// width: '200',
// checkarr: [],
// fixed: 'right',
// sortable: false,
// },
// {
// prop: 'createUserName',
// label: '操作',
// type: 6,
// values: '',
// width: '200',
// checkarr: [],
// fixed: 'right',
// sortable: false,
// },
];

44
src/option/signfor/asurcharge.js
Unescape View File

@ -138,7 +138,7 @@ export const columnList = [
},
{
prop: 'a',
prop: 'floolNum',
label: '上楼层数',
type: 1,
values: '',
@ -149,7 +149,7 @@ export const columnList = [
head: false,
},
{
prop: 'aa',
prop: 'unitPrice',
label: '费用',
type: 1,
values: '',
@ -159,16 +159,16 @@ export const columnList = [
sortable: true,
head: false,
},
{
prop: '',
label: '操作',
type: 6,
values: '',
width: '200',
checkarr: [],
fixed: 'right',
sortable: false,
},
// {
// prop: '',
// label: '操作',
// type: 6,
// values: '',
// width: '200',
// checkarr: [],
// fixed: 'right',
// sortable: false,
// },
];
export const columnListTC = [
@ -332,15 +332,15 @@ export const columnListTC = [
sortable: true,
head: false,
},
{
prop: '',
label: '操作',
type: 6,
values: '',
width: '200',
checkarr: [],
fixed: 'right',
sortable: false,
},
// {
// prop: '',
// label: '操作',
// type: 6,
// values: '',
// width: '200',
// checkarr: [],
// fixed: 'right',
// sortable: false,
// },
];

1
src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue
Unescape View File

@ -171,6 +171,7 @@ export default {
type: 'select',
dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_driverjob_type',
options: [],
multiple: true,
},
{
label: '准驾车型',

117
src/views/distribution/signfor/asurcharge.vue
Unescape View File

@ -31,7 +31,7 @@
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<h4 class="el_fee">合计费用:999999</h4>
<h4 class="el_fee">合计费用:0</h4>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
@ -135,9 +135,7 @@
/>
</div>
<el-button type="primary" class="el_butn" @click="preservation"
>保存</el-button
>
<el-button type="primary" class="el_butn" @click="preservation">保存</el-button>
</div>
</div>
</div>
@ -209,30 +207,29 @@
:controls="false"
:value-on-clear="0"
placeholder="请输入楼层"
:disabled="addvalueDetailId"
/>
</el-form-item>
<el-form-item label="平移费:" width="240px" v-if="Tipstitle == '平移费'">
<!-- <el-form-item label="平移费:" width="240px" v-if="Tipstitle == '平移费'">
<el-input-number
v-model="TcZcInput.distance"
v-model="TcZcInput.fee"
:min="0"
:controls="false"
:value-on-clear="0"
placeholder="请输入距离&emsp;单位:米"
placeholder="请输入平移费用&emsp;单位:元"
/>
</el-form-item>
</el-form-item> -->
<el-form-item label="平移距离:" width="240px" v-if="Tipstitle == '平移费'">
<el-input-number
v-model="TcZcInput.fee"
v-model="TcZcInput.distance"
:min="0"
:controls="false"
:value-on-clear="0"
:disabled="addvalueDetailId"
placeholder="请输入距离&emsp;单位:米"
/>
</el-form-item>
<!-- <el-form-item label="费用:" width="200px">
<el-input v-model="TcZcInput.fee" placeholder="请输入费用" />
</el-form-item> -->
</el-form>
<template #footer>
<span class="dialog-footer">
@ -276,7 +273,7 @@ import error from '@/error';
const $router = useRouter(); //跳转
const $useStore = useStore(); //权限
const tabName = ref(1);
const addvalueDetailId = ref('');
const addvalueDetailId = ref(null);
const ConfirmationInformation = ref(false);
const $route = useRoute(); //获取地址栏参数
const TcloadingObj = ref(false);
@ -287,6 +284,8 @@ const form = ref({
numcost: 0,
Specialcar: 0,
SuperZone: 0,
distance: 0,
fee: 0,
});
const details = reactive({
/** 是否开启搜索 */
@ -477,9 +476,9 @@ const exportExcel = () => {
return;
};
// 页面初始化
const onLoad = (value = 1) => {
const onLoad = () => {
let data = {
addvalueId: value,
addvalueId: tabName.value,
signforId: $route.query.id,
reservationId: $route.query.reservationId,
};
@ -488,9 +487,9 @@ const onLoad = (value = 1) => {
.then(res => {
console.log(res, 'res');
if (res.data.code == 200) {
if (res.data.data == null) {
if (res.data.data == null || !res.data.data?.addvalueDetailId) {
details.data = [];
addvalueDetailId.value = '';
addvalueDetailId.value = null;
return;
}
if (res.data.data.addvalueDetailId) {
@ -498,10 +497,13 @@ const onLoad = (value = 1) => {
if (tabName.value == 6) {
//专车费
form.value.Specialcar = 1;
form.value.numcost =res.data.data.fee
form.value.numcost = res.data.data.fee; //上楼
}
}
details.data = res.data.data.packageEntityList;
TcZcInput.value.floolNum = res.data.data.floolNum; //上楼费
TcZcInput.value.distance = res.data.data.distance; //平移距离
console.log(TcZcInput.value.floolNum, 'TcZcInput.value.floolNum');
if (res.data.data.addvalueId == 6) {
res.data.data.packageEntityList[0];
}
@ -517,7 +519,7 @@ const onLoad = (value = 1) => {
onLoad();
// 页面初始化方法
const tabchange = row => {
console.log(row, 'row ');
console.log(row, '当前菜单 ');
tabName.value = row.props.name;
Tipstitle.value = row.props.label; //标题
onLoad(row.props.name);
@ -624,17 +626,56 @@ const preservation = () => {
reservationId: $route.query.reservationId,
packageEntityList: [],
};
console.log(data, '准备提交的数据');
details.loadingObj.list = true;
if (tabName.value == 2) {
data.distance=form.value.distance;//超区公里数
data.fee=form.value.fee;//超区费用
if (!form.value.SuperZone && !addvalueDetailId.value) {
ElMessage({
message: '操作成功',
type: 'success',
});
return;
}
if (!form.value.SuperZone) {
// 删除
data.addvalueDetailId = addvalueDetailId.value;
details.loadingObj.list = true;
$_cancelSignAddValuePackage(data)
.then(res => {
console.log(res, '删除成功');
if (res.data.code == 200) {
ElMessage({
message: res.data.msg,
type: 'success',
});
}
})
.catch(err => {
console.log(err, '删除失败');
})
.finally(() => {
details.loadingObj.list = false;
onLoad(tabName.value);
});
return
}
data.distance = form.value.distance; //超区公里数
data.fee = form.value.fee; //超区费用
//超区
} else if (tabName.value == 6) {
//专车
if (!form.value.Specialcar && !addvalueDetailId.value) {
ElMessage({
message: '操作成功',
type: 'success',
});
return;
}
// 选择否
if (!form.value.Specialcar) {
// 删除
data.addvalueDetailId = addvalueDetailId.value;
details.loadingObj.list = true;
$_cancelSignAddValuePackage(data)
.then(res => {
console.log(res, '删除成功');
@ -657,34 +698,8 @@ const preservation = () => {
data.fee = form.value.numcost; //费用
}
if (addvalueDetailId.value) {
ElMessage({
message: '请选择否，然后点击是重新填写金额',
type: 'warning',
});
return
// 走更新接口
data.addvalueDetailId = addvalueDetailId.value;
$_updateSignAddValuePackage(data)
.then(res => {
console.log(res, '修改成功');
if (res.data.code == 200) {
ElMessage({
message: res.data.msg,
type: 'success',
});
}
})
.catch(error => {
console.log(error, '修改失败');
})
.finally(() => {
details.loadingObj.list = false;
onLoad();
});
return;
}
// 表格下面有数据走新增接口
console.log(data, '准备提交的数据');
// 表格下面没有数据走新增接口
$_saveSignAddValuePackage(data)
.then(res => {
console.log(res, '新增成功');

Write Preview
Loading…
Cancel
Save