Browse Source

Merge branch 'dev' into pre-production

pre-production
pref_mail@163.com 5 hours ago
parent
commit
552653f25c
  1. 8
      src/api/distribution/SeparateTheList.js
  2. 14
      src/api/distribution/VehicleArrivalManagement.js
  3. 10
      src/option/basic/basicMaterial.js
  4. 6
      src/option/distribution/SeparateTheList.js
  5. 1
      src/option/distribution/directMerchantSign.js
  6. 20
      src/option/storagecost/Traincostbreakdown.js
  7. 16
      src/page/login/aiqa.vue
  8. 87
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
  9. 164
      src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
  10. 4
      src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue
  11. 86
      src/views/distribution/artery/VehicleArrivalManagement.vue
  12. 102
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  13. 2
      src/views/distribution/inventory/delivery/SeparateTheList.vue
  14. 15
      src/views/distribution/reservation/reservationAddFrom.vue
  15. 17
      src/views/distribution/signfor/distributionSignfortreat.vue
  16. 2
      src/views/waybill/WaybillOrderList.vue

8
src/api/distribution/SeparateTheList.js

@ -9,11 +9,11 @@ export const $_alltasklist = params => {
};
// 完成总任务
export const $_finishalltask = params => {
export const $_finishalltask = data => {
return request({
url: '/api/logpm-distribution/split-order-task/finish-all-task',
method: 'post',
params,
data,
});
};
// 子任务列表
@ -43,10 +43,10 @@ export const $_gettaskdetail = params => {
});
};
// 撤销总任务
export const $_cancelalltask = params => {
export const $_cancelalltask = data => {
return request({
url: '/api/logpm-distribution/split-order-task/cancel-all-task',
method: 'post',
params,
data,
});
};

14
src/api/distribution/VehicleArrivalManagement.js

@ -56,4 +56,18 @@ export const postUnloadByLoadId = (page, params) => {
});
};
/**
* 检测是否存在直发商家未卸车数据
*/
export const postUnloadByLoadIdBefore = (page, params) => {
return request({
url: '/api/logpm-trunkline/carsLoad/unloadByLoadIdBefore',
method: 'post',
data: {
...page,
...params,
},
});
};
// /logpm-trunkline/carsLoad/unloadByLoadId

10
src/option/basic/basicMaterial.js

@ -160,6 +160,11 @@ export default {
message: '请输入产品编码',
trigger: 'blur',
},
{
pattern: /^[a-zA-Z0-9]{1,50}$/,
message: '产品编码只能包含字母和数字,长度不能超过50位',
trigger: 'blur',
}
],
overHidden: true,
},
@ -174,6 +179,11 @@ export default {
message: '请输入物品sku',
trigger: 'blur',
},
{
pattern: /^[a-zA-Z0-9]{1,50}$/,
message: '物品sku只能包含字母和数字,长度不能超过50位',
trigger: 'blur',
}
],
overHidden: true,
},

6
src/option/distribution/SeparateTheList.js

@ -69,15 +69,15 @@ export const columnList = [
checkarr: [
{
label: '未完成',
value: 0,
value: 1,
},
{
label: '已完成',
value: 1,
value: 2,
},
{
label: '已撤销',
value: 2,
value: 3,
},
],
},

1
src/option/distribution/directMerchantSign.js

@ -137,6 +137,7 @@ export const columnList = [
{ label: '未签收', value: '0' },
{ label: '部分签收', value: '10' },
{ label: '已签收', value: '20' },
{ label: '已上传图片', value: '30' },
],
fixed: false,
sortable: true,

20
src/option/storagecost/Traincostbreakdown.js

@ -365,15 +365,15 @@ 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,
},
];

16
src/page/login/aiqa.vue

@ -138,9 +138,9 @@ const Data = ref({
{
content: '东集pad-q7恢复出厂设置',
},
{
content: '货无忧的汇通物流公司编码是多少',
},
// {
// content: '',
// },
{
content: '蓝牙打印机芝柯tx453设备连接密码是多少',
},
@ -319,11 +319,11 @@ const AiData = (value = '') => {
) {
aiResponse = '东集pad-q7恢复出厂设置教程地址:1、关机状态下,按下【电源键】、【两侧扫描键】; 2、出现开机画面,松开【电源键】,出现工厂模式界面,按键全部松开;3、进入工厂模式后通过方向键选择【wipe data/factory reset】, 按电源键确认进入子菜单,选择【yes】,按【电源键】确认,恢复出厂完成后选择第一个【reboot system now】 ,按【电源键】确认重启设备。视频教程如下:https://mp.weixin.qq.com/s/0CG-jYooh9LJ-9aLauVGfA';
}
else if (
lowercaseValue.includes('货无忧的汇通物流公司编码是多少')
) {
aiResponse = '货无忧的汇通物流公司编码是:627683';
}
// else if (
// lowercaseValue.includes('')
// ) {
// aiResponse = '627683';
// }
else if (
lowercaseValue.includes('蓝牙打印机芝柯tx453设备连接密码是多少') || lowercaseValue.includes('tx453')
) {

87
src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue

@ -1,6 +1,6 @@
<template>
<basic-container>
<div class="avue-crud">
<div class="avue-crud" v-loading="loadingObj.pageLoading">
<div v-h5uShow="!search">
<!-- 查询模块 -->
<el-form :inline="true" :model="query" class="header_search" style="width: 100%">
@ -172,13 +172,13 @@
style="width: 88%"
/> -->
<el-input
v-model.trim="form.goodsShelfName"
style="width: 100%"
placeholder="请输入货架名称"
@input="headlineinput"
v-model.trim="form.goodsShelfName"
style="width: 100%"
placeholder="请输入货架名称"
@input="headlineinput"
>
<template #append></template>
</el-input>
<template #append></template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-if="allocation">
@ -346,8 +346,7 @@
width="600px"
v-model="dialogVisible"
>
<div class="el_ewm" v-loading="ewmloading"
element-loading-text="二维码加载中...">
<div class="el_ewm" v-loading="ewmloading" element-loading-text="二维码加载中...">
<!-- <div v-for="(item,index) in qrCodeObj" class="pdf-dom">-->
<!-- <el-divider></el-divider>-->
@ -374,7 +373,7 @@
:option="alloption"
v-model:page="allpage"
v-model="allform"
:table-loading="loading"
:table-loading="loadingObj.allocation"
:data="alldata"
ref="crud"
@selection-change="allselectionChange"
@ -388,11 +387,7 @@
</el-button>
</template>
<template #menu="{ size, row, index }">
<el-button
type="primary"
text
icon="el-icon-view"
@click="viewhandleqr(row)"
<el-button type="primary" text icon="el-icon-view" @click="viewhandleqr(row)"
>查看二维码</el-button
>
<el-button
@ -471,7 +466,7 @@ export default {
goodsAreaId: null,
},
form2: {},
ewmloading:true,
ewmloading: true,
box2: false,
form3: {},
box3: false,
@ -885,9 +880,7 @@ export default {
templateData: [],
validatorRules: {
goodsAreaId: [{ required: true, message: '请选择货区!', trigger: 'change' }],
goodsShelfName: [
{ required: true, message: '请填写货架名称!', trigger: 'blur' }
],
goodsShelfName: [{ required: true, message: '请填写货架名称!', trigger: 'blur' }],
// goodsShelfStatus: [
// { required: true, message: '!', trigger: 'change' }
// ],
@ -897,6 +890,12 @@ export default {
},
//
idShowStatus: false,
loadingObj: {
/** 页面loading */
pageLoading: false,
/** 库位loading */
allocation: false,
},
};
},
created() {
@ -1009,7 +1008,7 @@ export default {
return;
}
this.ewmloading=true;
this.ewmloading = true;
let checkcode = [];
this.allselectionList.map(item => {
checkcode.push(item.id);
@ -1025,22 +1024,22 @@ export default {
this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
this.dialogVisible = true;
this.ewmloading=false;
this.ewmloading = false;
},
viewhandleqr(row){
viewhandleqr(row) {
console.log(row);
let ids = row.id;
this.html = '';
this.ewmloading=true;
this.ewmloading = true;
getPrintTemplate({ ids }).then(res => {
// this.orderPackageCode = res.data
console.log(res.data);
this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
this.dialogVisible = true;
this.ewmloading=false;
this.ewmloading = false;
},
// childrenundefined
formatCascaderData(data) {
@ -1183,7 +1182,7 @@ export default {
// this.form.goodsAreaName = item.headline
// }
// })
this.form.goodsShelfName=this.form.goodsShelfName+'排'
this.form.goodsShelfName = this.form.goodsShelfName + '排';
add(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
@ -1193,7 +1192,7 @@ export default {
});
});
} else {
this.form.goodsShelfName=this.form.goodsShelfName+'排'
this.form.goodsShelfName = this.form.goodsShelfName + '排';
update(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
@ -1230,7 +1229,7 @@ export default {
this.idShowStatus = true;
getDetail(row.id).then(res => {
this.form = res.data.data;
this.headlineinput(this.form.goodsShelfName)
this.headlineinput(this.form.goodsShelfName);
console.log('>>>>>>>>>>', this.form);
//TODO
});
@ -1261,7 +1260,7 @@ export default {
});
});
},
headlineinput(data){
headlineinput(data) {
if (data.includes('排')) {
this.form.goodsShelfName = data.replace('排', '');
}
@ -1461,19 +1460,29 @@ export default {
},
allsizeChange(pageSize) {
this.allpage.pageSize = pageSize;
this.onLoad(this.page);
this.allonLoad(this.allpage);
},
allonLoad(page) {
let values = {
goodsShelfId: this.goodsShelfId,
};
allgetList(page.currentPage, page.pageSize, values).then(res => {
async allonLoad(page) {
try {
this.loadingObj.allocation = true;
let values = {
goodsShelfId: this.goodsShelfId,
};
const res = await allgetList({
currentPage: page.currentPage,
size: page.pageSize,
...values,
});
const data = res.data.data;
console.log('data>>>>>>>>>>>>>>>', data);
this.allpage.total = data.total;
this.alldata = data.records;
this.loading = false;
});
} catch (error) {
console.log('error :>> ', error);
} finally {
this.loadingObj.allocation = false;
}
},
onLoad(page, params = {}) {
this.loading = true;
@ -1536,7 +1545,7 @@ export default {
display: flex;
justify-content: space-between;
}
.el_ewm{
.el_ewm {
min-height: 300px;
}
</style>

164
src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue

@ -1,69 +1,83 @@
<template>
<basic-container>
<basic-container v-loading="loadingObj.list" element-loading-text="正在加载中...">
<el-row v-if="details.search">
<el-form :inline="true" :model="Topquery" class="el-fr-d"> </el-form>
</el-row>
<!-- 头部右侧按钮模块 -->
<div class="el_top_btn">
<div>
<el-button type="primary" @click="newlyadd" icon="el-icon-plus"> </el-button>
<el-button type="primary" icon="el-icon-delete" @click="DeleteInformationAll"
>批量删除</el-button
>
</div>
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
<el-button icon="Search" @click="searchHide" circle></el-button>
<div>
<el-tabs type="border-card" class="top-el-tabs" v-model="tabName" @tab-change="tabchange">
<el-tab-pane label="全部" :name="1">全部</el-tab-pane>
<el-tab-pane label="临期" :name="2">临期</el-tab-pane>
<el-tab-pane label="到期" :name="3">到期</el-tab-pane>
</el-tabs>
<div>
<div class="el_top_btn">
<div>
<el-button type="primary" @click="newlyadd" icon="el-icon-plus"> </el-button>
<el-button type="primary" icon="el-icon-delete" @click="DeleteInformationAll"
>批量删除</el-button
>
</div>
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
<el-button icon="Search" @click="searchHide" circle></el-button>
</div>
</div>
</div>
<el-row>
<!-- 列表模块 -->
<tablecmt
:columnList="details.columnList"
:tableData="data"
:loading="loadingObj.list"
:checkselect="selectList"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<div class="ElBtnClass">
<el-text v-if="userInfo == 'admin'" @click="Expandconfiguration(slotProps.scope.row)"
>扩展配置</el-text
>
<el-text @click="view(slotProps.scope)">查看</el-text>
<el-text @click="edit(slotProps.scope)">编辑</el-text>
<el-text @click="DeleteInformation(slotProps.scope)">删除</el-text>
</div>
<el-row>
<!-- 列表模块 -->
<tablecmt
class="tableNode"
:columnList="details.columnList"
:tableData="data"
:checkselect="selectList"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<div class="ElBtnClass">
<el-text
v-if="userInfo == 'admin'"
@click="Expandconfiguration(slotProps.scope.row)"
>扩展配置</el-text
>
<el-text @click="view(slotProps.scope)">查看</el-text>
<el-text @click="edit(slotProps.scope)">编辑</el-text>
<el-text @click="DeleteInformation(slotProps.scope)">删除</el-text>
</div>
</template>
</template>
</template>
</tablecmt>
</el-row>
</tablecmt>
</el-row>
<!-- 分页模块 -->
<el-row class="el-fy">
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<div></div>
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
</el-pagination>
</div>
</el-row>
</div>
</div>
<!-- 分页模块 -->
<el-row class="el-fy">
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<div></div>
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
</el-pagination>
</div>
</el-row>
<!-- 新增弹窗 -->
<el-dialog destroy-on-close v-model="newlyaddload" :title="dialogTitle" width="50%">
<el-form
@ -507,7 +521,7 @@ import {
$_warehouseConfigupdate,
} from '@/api/basicdata/basicdataWarehouse';
import { processRowProperty, deepClone } from '@/utils/util';
import { processRowProperty, deepClone, setNodeHeight } from '@/utils/util';
import { getDictionaryBiz } from '@/api/system/dict'; //
import { getToken } from '@/utils/auth';
import dayjs from 'dayjs';
@ -533,6 +547,7 @@ const Expandconfigurationform = ref({});
const selectAll = ref([]);
const formdisabled = ref(false);
const search = ref(false); //
const tabName = ref(1);
const warehouseID = ref('');
const Manageregionalconfiguration = {
multiple: true,
@ -821,23 +836,33 @@ const MyWareh = () => {
});
};
MyWareh(); //
const Setheight = () => {
const _node = document.querySelector('.tableNode');
setNodeHeight(_node, '', true);
};
const tabchange = () => {
onLoad();
};
const onLoad = val => {
let data = {
current: details.page.currentPage,
size: details.page.pageSize,
pageType: tabName.value,
...val,
...details.query,
};
details.loadingObj.list = true; //
$_basicdataWarehouse(data)
.then(res => {
.then(async res => {
console.log(gradeList.value, '仓库等级');
if (res.data.code == 200) {
if (res.data.data.records.length) {
details.data = res.data.data.records; //
details.page.total = res.data.data.total; //
console.log(res, '仓库列表');
const { code, data } = res.data;
console.log(data, '仓库列表1');
if (code == 200) {
if (data.records.length) {
details.data = data.records; //
details.page.total = data.total; //
details.data.forEach(item => {
if (item.functionType) {
//
@ -896,8 +921,10 @@ const onLoad = val => {
).dictValue;
}
});
await nextTick();
Setheight();
} else {
details.data = res.data.data.records; //
details.data = res.data.data.records || []; //
}
}
})
@ -1311,4 +1338,9 @@ const newlyaddSubmit = () => {
width: 20%;
}
}
:deep(.top-el-tabs) {
.el-tabs__content {
display: none;
}
}
</style>

4
src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue

@ -49,7 +49,7 @@
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<div class="ElBtnClass">
<el-button type="primary">编辑</el-button>
<el-text type="primary">编辑</el-text>
</div>
</template>
</template>
@ -137,7 +137,7 @@ const details = reactive({
columnList,
/** 列表数据 */
data: [{}],
data: [],
/** 页面loading */
loadingObj: {
/** 列表加载loading */

86
src/views/distribution/artery/VehicleArrivalManagement.vue

@ -602,6 +602,7 @@ import {
postloadArriveCarByLoadId,
postloadCancelArriveCarByLoadId,
postUnloadByLoadId,
postUnloadByLoadIdBefore,
} from '@/api/distribution/VehicleArrivalManagement';
import {
postStartCarByLoadId,
@ -1348,47 +1349,62 @@ const packageInputsc = (value, row) => {
};
/** 卸车确认 */
const handleUnloadByLoadId = (type: 1 | 2) => {
if (!ChecksWhetherTheWarehouseIsSelected())
return ElMessage.warning('多仓权限无法操作,请选择仓库');
const handleUnloadByLoadId = async (type: 1 | 2) => {
try {
if (!ChecksWhetherTheWarehouseIsSelected())
return ElMessage.warning('多仓权限无法操作,请选择仓库');
if (details.selectionList.length === 0) return ElMessage.warning('请选择需要卸车的数据');
if (details.selectionList.length > 1) return ElMessage.warning('只支持单条数据操作');
if (details.selectionList.length === 0) return ElMessage.warning('请选择需要卸车的数据');
if (details.selectionList.length > 1) return ElMessage.warning('只支持单条数据操作');
details.loadingObj.pageLoading = true;
ElMessageBox.confirm(
'请确认卸车数据是否完成,未卸车数据将进入异常列表。',
type === 1 ? '中途卸车确认' : '终点卸车确认',
{
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
}
).then(async () => {
try {
details.loadingObj.pageLoading = true;
const item = details.selectionList[0];
const res = await postUnloadByLoadIdBefore({ loadId: item.id });
const { code, data } = res.data;
const submitData = {
loadId: details.selectionList.map(val => val.id).join(','),
unloadType: type,
};
if (code !== 200) return;
const res = await postUnloadByLoadId(submitData);
const { code } = res.data;
if (code !== 200) {
return;
ElMessageBox.confirm(
'请确认卸车数据是否完成,未卸车数据将进入异常列表。',
type === 1 ? '中途卸车确认' : '终点卸车确认',
{
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
}
ElMessage({
type: 'success',
message: '卸车成功',
});
)
.then(async () => {
try {
details.loadingObj.pageLoading = true;
onLoad();
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.pageLoading = false;
}
});
const submitData = {
loadId: item.id,
unloadType: type,
};
const res = await postUnloadByLoadId(submitData);
const { code } = res.data;
if (code !== 200) {
return;
}
ElMessage({
type: 'success',
message: '卸车成功',
});
onLoad();
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.pageLoading = false;
}
})
.catch(() => {});
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.pageLoading = false;
}
};
/** 显示装载清单 */

102
src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@ -636,9 +636,13 @@
</el-radio-group>
</el-form-item>
<el-form-item label="备注">
<el-form-item label="文员备注">
<el-input v-model="TcForm.clerkSignRemarks" placeholder="暂无备注" />
</el-form-item>
<el-form-item label="司机备注">
<el-input v-model="TcForm.driverRemarks" placeholder="暂无备注" disabled/>
</el-form-item>
</el-form>
<div class="imgName">
<span>上门照</span>
@ -660,6 +664,7 @@
:src="file.url"
alt="photo"
style="width: 100%; height: 100%; cursor: pointer"
@click="EnlargeTheTmageA(file)"
/>
</el-tooltip>
</template>
@ -690,6 +695,7 @@
:src="file.url"
alt="photo"
style="width: 100%; height: 100%; cursor: pointer"
@click="EnlargeTheTmageB(file)"
/>
</el-tooltip>
</template>
@ -720,6 +726,7 @@
:src="file.url"
alt="photo"
style="width: 100%; height: 100%; cursor: pointer"
@click="EnlargeTheTmageC(file)"
/>
</el-tooltip>
</template>
@ -750,6 +757,7 @@
:src="file.url"
alt="photo"
style="width: 100%; height: 100%; cursor: pointer"
@click="EnlargeTheTmageD(file)"
/>
</el-tooltip>
</template>
@ -780,6 +788,7 @@
:src="file.url"
alt="photo"
style="width: 100%; height: 100%; cursor: pointer"
@click="EnlargeTheTmageE(file)"
/>
</el-tooltip>
</template>
@ -809,17 +818,18 @@
@close="Abnormalshutdown"
class="el_abnormalBox"
>
<div class="abnormalBox_flex">
<div>
<el-button type="primary" @click="BatchcancellationAll">批量取消</el-button>
<el-button type="primary" @click="abnormalViewQRcode(1)">批量查看二维码</el-button>
</div>
<div>
<el-button icon="el-icon-refresh" @click="abnormalBoxsearchChange" circle></el-button>
<div class="abnormalBox_flex">
<div>
<el-button type="primary" @click="BatchcancellationAll">批量取消</el-button>
<el-button type="primary" @click="Batchreview">批量审核</el-button>
<el-button type="primary" @click="abnormalViewQRcode(1)">批量查看二维码</el-button>
</div>
<div>
<el-button icon="el-icon-refresh" @click="abnormalBoxsearchChange" circle></el-button>
</div>
</div>
</div>
<tablecmt
:columnList="AbnormalReview"
:tableData="AbnormalReviewData"
@ -881,7 +891,10 @@
<el-dialog v-model="dialogViReject" title="驳回" width="500">
<div>
<span>请联系司机将货物带回仓库并由<strong style="color: red">文员或库管</strong>进行回库扫描</span>
<span
>请联系司机将货物带回仓库并由<strong style="color: red">文员或库管</strong
>进行回库扫描</span
>
<!-- <el-select
v-model="yesOrNo"
placeholder="请选择货物是否在库"
@ -4182,7 +4195,7 @@ export default {
})
.catch(() => {});
},
abnormalBoxsearchChange(){
abnormalBoxsearchChange() {
this.viewAbnormalLoading(this.toexamineID); //
},
signingReservationPackage(row) {
@ -4214,6 +4227,57 @@ export default {
});
});
},
//
Batchreview() {
if (!this.selectionList.length) {
ElMessage({
message: '请勾选要审核的数据',
type: 'warning',
});
return;
}
let result = this.selectionList.every(item => {
return item.auditingStatusName === '待审核' && item.abnormalTypeName !== '装车异常';
});
if (!result) {
ElMessage({
message: '勾选数据必须满足条件为待审核并且不是装车异常',
type: 'warning',
});
return;
}
ElMessageBox.confirm('是否确认批量审核?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
let ids = this.selectionList.map(item => item.id).join(',');
this.AbnormalReviewloading = true; //
loadingAbnormalPackageListAuditing(ids)
.then(res => {
console.log('res-------->', res);
if (res.data.code == 200) {
this.$message({
type: 'success',
message: '操作成功!',
});
this.AbnormalReviewloading = false; //
console.log();
this.viewAbnormalLoading(this.toexamineID); //
}
})
.catch(error => {
console.log(error, 'error');
})
.finally(() => {
this.AbnormalReviewloading = false; //
});
})
.catch(() => {});
},
//
retention(row) {
ElMessageBox.confirm('是否确认滞留操作?', '提示', {
@ -5393,12 +5457,12 @@ export default {
this.loading = true; //
this.deliveryId = this.$route.query.id;
if(!this.deliveryId){
if (!this.deliveryId) {
ElMessage({
message: '遇到异常,请刷新页面重试',
type: 'warning',
})
return
message: '遇到异常,请刷新页面重试',
type: 'warning',
});
return;
}
const res = await getDetail(this.deliveryId);
@ -5492,7 +5556,7 @@ export default {
align-items: center;
justify-content: center;
}
.abnormalBox_flex{
.abnormalBox_flex {
display: flex;
justify-content: space-between;
}

2
src/views/distribution/inventory/delivery/SeparateTheList.vue

@ -378,7 +378,7 @@ const handleDelete = row => {
})
.then(() => {
let data = {
taskId: row.id,
allTaskId: row.id,
};
details.loadingObj.list = true;
$_cancelalltask(data)

15
src/views/distribution/reservation/reservationAddFrom.vue

@ -64,7 +64,7 @@
</el-row>
<el-row>
<el-col :span="10">
<el-col :span="10" v-if="Collectionfreightcharges">
<el-form-item label="代收运费:" prop="replaceFee" label-width="100px">
<el-input v-model="form.replaceFee" :disabled="true" />
</el-form-item>
@ -486,13 +486,15 @@ import dayjs from 'dayjs';
import { entryNum, updateEntryNum } from '@/api/distribution/distributionParcelNumber';
import { setNodeHeight, removeZeroWidth } from '@/utils/util.js';
import { ElMessage, ElMessageBox } from 'element-plus';
import error from '@/error';
import { useStore } from 'vuex';
export default {
name: '/distribution/reservation/reservationAddFrom',
data() {
return {
activeName: 'orderTab',
Inventoryloading: true, //
Collectionfreightcharges:false,//
packageQuery: {},
reservationloading: false,
orderRow: {},
@ -1887,7 +1889,7 @@ export default {
},
//
form: {
isInstall: '1', //
isInstall: '2', //
},
//
selectionList: [],
@ -1984,6 +1986,13 @@ export default {
console.log('123 :>> ', 123);
this.fetchData();
this.onLoad(this.page);
const $useStore = useStore();
console.log($useStore,'$useStore.getters');
if ($useStore.getters && $useStore.getters.permission) {
this.Collectionfreightcharges = $useStore.getters.permission.Collectionfreightcharges; //
console.log(this.Collectionfreightcharges, 'Collectionfreightchargesl按钮权限');
}
// this.$watch(
// () => this.$route.params,
// () => {

17
src/views/distribution/signfor/distributionSignfortreat.vue

@ -280,9 +280,14 @@
</el-radio-group>
</el-form-item>
<el-form-item label="备注">
<el-form-item label="文员备注">
<el-input v-model="TcForm.clerkSignRemarks" placeholder="暂无备注" />
</el-form-item>
<el-form-item label="司机备注:">
<el-input v-model="TcForm.driverRemarks" placeholder="暂无备注" disabled />
</el-form-item>
</el-form>
<div class="imgName">
<span>上门照</span>
@ -305,6 +310,7 @@
:src="file.url"
alt="photo"
style="width: 100%; height: 100%; cursor: pointer"
@click="EnlargeTheTmageA(file)"
/>
</el-tooltip>
</template>
@ -337,6 +343,7 @@
:src="file.url"
alt="photo"
style="width: 100%; height: 100%; cursor: pointer"
@click="EnlargeTheTmageB(file)"
/>
</el-tooltip>
</template>
@ -368,6 +375,7 @@
:src="file.url"
alt="photo"
style="width: 100%; height: 100%; cursor: pointer"
@click="EnlargeTheTmageC(file)"
/>
</el-tooltip>
</template>
@ -399,6 +407,7 @@
:src="file.url"
alt="photo"
style="width: 100%; height: 100%; cursor: pointer"
@click="EnlargeTheTmageD(file)"
/>
</el-tooltip>
</template>
@ -430,6 +439,7 @@
:src="file.url"
alt="photo"
style="width: 100%; height: 100%; cursor: pointer"
@click="EnlargeTheTmageE(file)"
/>
</el-tooltip>
</template>
@ -440,10 +450,7 @@
</el-dialog>
</div>
<div>
<div class="title fwb">司机备注</div>
<div class="title fwb">{{ form.driverRemarks }}</div>
</div>
<div class="tj-ttn">
<el-button type="primary" @click="submitForm">确定</el-button>

2
src/views/waybill/WaybillOrderList.vue

@ -468,7 +468,7 @@ const onLoad = async (page?: any, params = {}) => {
delete submitData.createTime;
delete submitData.documentMakingTime;
//
//
const res = await postWarehouseWaybillPageWaybillList(submitData);
console.log('res :>> ', res);
const { code, data } = res.data;

Loading…
Cancel
Save