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

Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

pre-production
pref_mail@163.com 1 year ago
parent
65b5e7af87 6087b471c8
commit
ca2565479b
20 changed files with 936 additions and 483 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. 11
      src/api/distribution/CreateOrder.js
  2. 4
      src/api/waybill/orderPackageListDetails.js
  3. 60
      src/components/tablecmt/tablecmt.vue
  4. 34
      src/option/waybill/TemporaryStorageList.js
  5. 12
      src/option/waybill/orderPackageListDetails.js
  6. 11
      src/styles/common.scss
  7. 44
      src/views/aftersales/aftersalesWorkOrder.vue
  8. 434
      src/views/basicdata/brand/basicdataFreight.vue
  9. 33
      src/views/basicdata/brand/basicdataFreightFrom.vue
  10. 10
      src/views/distribution/artery/AddVehicleStowage.vue
  11. 4
      src/views/distribution/artery/VehicleArrivalManagement.vue
  12. 7
      src/views/distribution/artery/VehicleStowage.vue
  13. 232
      src/views/distribution/artery/truckLoadingDetails.vue
  14. 147
      src/views/distribution/deliverylist/distributionDeliveryListdis.vue
  15. 59
      src/views/distribution/deliverylist/distributionDeliveryListmar.vue
  16. 27
      src/views/distribution/inventory/CreateOrder.vue
  17. 20
      src/views/waybill/TemporaryStorageList.vue
  18. 211
      src/views/waybill/WaybillOrderList.vue
  19. 55
      src/views/waybill/orderPackageListDetails.vue
  20. 4
      vite.config.js

11
src/api/distribution/CreateOrder.js
Unescape View File

@ -143,3 +143,14 @@ export const postFindCategoryInfo = data => {
data,
});
};
/**
* 查询物料价格
*/
export const postFindArrPrice = data => {
return request({
url: '/api/logpm-trunkline/openOrder/findArrPrice',
method: 'post',
data,
});
};

4
src/api/waybill/orderPackageListDetails.js
Unescape View File

@ -47,10 +47,10 @@ export const getShowAdvancePackgeCode = params => {
/**
* 批量删除
*/
export const postDeleteAdvanceDetail = params => {
export const postDeleteAdvanceDetail = data => {
return request({
url: '/api/logpm-trunkline/advanceDetail/deleteAdvanceDetail',
method: 'post',
params,
data,
});
};

60
src/components/tablecmt/tablecmt.vue
Unescape View File

@ -8,6 +8,7 @@
:span-method="arraySpanMethod"
v-loading="loading"
@selection-change="handleSelectionChange"
@select-all="handleUserSelcet"
border
height="100%"
:row-class-name="tableRowClassName"
@ -503,29 +504,56 @@ function timechange(value, column: TableColumnType) {
function timechangeKey(value, column: TableColumnType) {
emit('timeCheck', column.values, column);
}
let timer = null;
const handleSelectionChange = (param: TableDataType[]) => {
selectarr.value = param;
try {
// 重置数据
for (const iterator of selectCount.value) {
iterator.value = 0;
}
if (timer) clearTimeout(timer);
timer = setTimeout(() => {
selectarr.value = param;
try {
// 重置数据
for (const iterator of selectCount.value) {
iterator.value = 0;
}
if (selectarr.value.length === 0) return;
if (selectarr.value.length === 0) return;
for (let index = 0; index < selectarr.value.length; index++) {
const val = selectarr.value[index];
for (let index = 0; index < selectarr.value.length; index++) {
const val = selectarr.value[index];
for (let item of selectCount.value) {
if (index === 0) item.value = 0;
item.value = computeNumber(item.value, '+', Number(val[item.prop] || 0)).result;
for (let item of selectCount.value) {
if (index === 0) item.value = 0;
item.value = computeNumber(item.value, '+', Number(val[item.prop] || 0)).result;
}
}
} catch (error) {
console.log('error :>> ', error);
} finally {
console.log('123 :>> ', param);
emit('selection', param);
}
}, 50);
};
// 计算是否清空表格复选框值
const handleUserSelcet = list => {
if (list.length === 0) return;
let _flag = false;
for (const iterator of list) {
if (_flag) return;
for (const item of props.tableData) {
if (item === iterator) _flag = true;
console.log('_flag :>> ', _flag);
if (_flag) break;
}
} catch (error) {
console.log('error :>> ', error);
} finally {
emit('selection', param);
}
if (_flag) return;
handleClearSelect();
};
function inputclear(value, column: TableColumnType) {
emit('inputTxt', '', column);

34
src/option/waybill/TemporaryStorageList.js
Unescape View File

@ -25,16 +25,16 @@ export const columnList = [
sortable: true,
head: false,
},
// {
// prop: 'carNumber',
// label: '汇通商场',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'htMallName',
label: '汇通商场',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'dealerName',
label: '商场名称',
@ -55,6 +55,16 @@ export const columnList = [
fixed: false,
sortable: true,
},
{
prop: 'warehouseName',
label: '导入仓库',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'siteName',
label: '基地',
@ -160,7 +170,7 @@ export const columnList = [
{
prop: 'dealerCode',
label: '商场编码',
type: 1,
type: 2,
values: '',
width: '130',
checkarr: [],
@ -178,7 +188,7 @@ export const columnList = [
sortable: true,
},
{
prop: 'waybillCount',
prop: 'createUserName',
label: '创建人',
type: 1,
values: '',

12
src/option/waybill/orderPackageListDetails.js
Unescape View File

@ -39,7 +39,17 @@ export const packageListColumnList = [
},
{
prop: 'warehouseName',
label: '当前所在仓',
label: '导入仓库',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: true,
sortable: true,
},
{
prop: 'exportWarehouseName',
label: '入库仓库',
type: 1,
values: '',
width: '150',

11
src/styles/common.scss
Unescape View File

@ -181,6 +181,10 @@ a {
margin-bottom: 10px;
}
.flex1 {
flex: 1;
}
// 头部搜索
.search_container {
display: grid;
@ -203,6 +207,13 @@ a {
}
}
// 二维码弹窗
.el-dialog-QRCode-container {
max-height: 80vh;
overflow-y: scroll;
overflow-x: hidden;
}
// ele样式覆盖
@import './element-ui.scss';
// 顶部右侧显示

44
src/views/aftersales/aftersalesWorkOrder.vue
Unescape View File

@ -181,9 +181,9 @@
>批量删除</el-button
> -->
<el-button v-if="ButtonPermissions.appeal" type="primary" @click="appeal"
>申诉</el-button
>
<!-- <el-button v-if="ButtonPermissions.appeal" type="primary" @click="appealAll"
>批量申诉</el-button
> -->
<!-- 财务入账 -->
<el-button
type="primary"
@ -1671,6 +1671,7 @@ const TransportLossNode = ref([
]);
const Statusprocessing = val => {
console.log(val,'状态处理的值');
val.forEach(item => {
// 对为null的数据进行处理
// for (const property in item) {
@ -1694,6 +1695,7 @@ const Statusprocessing = val => {
// 提货环节下拉赋值
if (item.discoveryNode == 1) {
item.discoveryNodeNameS = columnList[3].checkarr[0].label; //提货环节
} else if (item.discoveryNode == 2) {
item.discoveryNodeNameS = columnList[3].checkarr[1].label; //发货环节
} else if (item.discoveryNode == 3) {
@ -1709,6 +1711,8 @@ const Statusprocessing = val => {
} else if (item.discoveryNode == 8) {
item.discoveryNodeNameS = columnList[3].checkarr[7].label; //安装环节
}
if (item.workOrderStatus == 10) {
item.workOrderStatusNameS = columnList[10].checkarr[0].label; //待处理
} else if (item.workOrderStatus == 20) {
@ -1729,11 +1733,12 @@ const Statusprocessing = val => {
item.workOrderStatusNameS = columnList[10].checkarr[8].label; //理赔金未出
} else if (item.workOrderStatus == 21) {
item.workOrderStatusNameS = columnList[10].checkarr[9].label; //处理结果已提交
} else if (item.workOrderStatus == 100) {
item.workOrderStatusNameS = columnList[10].checkarr[10].label; //已结束
} else if (item.workOrderStatus == 110) {
item.workOrderStatusNameS = columnList[10].checkarr[11].label; //已结束
}
// } else if (item.workOrderStatus == 100) {
// item.workOrderStatusNameS = columnList[10].checkarr[10].label; //申诉中
// } else if (item.workOrderStatus == 110) {
// item.workOrderStatusNameS = columnList[10].checkarr[11].label; //已结束
// }
});
};
// 页面初始化数据
@ -1803,21 +1808,18 @@ const IndexTable = (val, Refresh) => {
details.loadingObj.list = false; //关闭动画加载
if (res.data.data) {
console.log(res.data.data, '初始化返回值===>');
console.log(res.data.data.records.length, 'res.data.data.records');
console.log(TabList.value, 'TabList.value===>');
// page.value.total = res.data.data.total; //总页数
if (res.data.data.records.length) {
Statusprocessing(res.data.data.records);
console.log(res.data.data.records, 'res.data.data.records有值');
TabList.value.find(res => res.name == TabPermissions.value).DataList =
res.data.data.records;
TabList.value.find(res => res.name == TabPermissions.value).DataList =res.data.data.records;
TabList.value.find(res => res.name == TabPermissions.value).total = res.data.data.total;
TabList.value.find(res => res.name == TabPermissions.value).request = false;
console.log(TabList.value, '当前存储的值');
// details.data = res.data.data.records;
details.data = TabList.value.find(res => res.name == TabPermissions.value).DataList;
page.value.total = TabList.value.find(res => res.name == TabPermissions.value).total;
console.log(TabList.value, 'TabList.value===>');
Statusprocessing(res.data.data.records);
} else {
TabList.value.find(res => res.name == TabPermissions.value).DataList = [];
TabList.value.find(res => res.name == TabPermissions.value).total = 0;
@ -2257,14 +2259,14 @@ const CancelappealFn = val => {
// 工单申诉按钮
const appeal = (val, state) => {
console.log(state,'state');
AppealAttachment.value = []; //清空图片
Appealselection.value = ''; //清空责任人
Reasonforappeal.value = ''; //清空申诉内容
console.log(state);
console.log(val.row, '申诉当前点击的按钮');
console.log(val, '申诉当前点击的按钮');
if (state == 'edit') {
// 当前是编辑申诉
details.selectionList.push(val.row);
AppealeditorState.value = true; //开启申诉编辑状态
if (val.row) {
@ -2295,13 +2297,19 @@ const appeal = (val, state) => {
}
if (!state) {
console.log('当前是申诉');
// 单条申诉
AppealeditorState.value = false; //开启申诉编辑状态
if (val.row) {
details.selectionList.push(val.row);
}
dialogappeal.value = true; //展开申诉弹窗
} else {
}
};
// 批量申诉
const appealAll=()=>{
// 批量申诉
console.log(details.selectionList, 'details.selectionList');
if (!details.selectionList.length) {
@ -2319,8 +2327,7 @@ const appeal = (val, state) => {
return;
}
dialogappeal.value = true; //展开申诉弹窗
}
};
}
// 确定理赔金额
const DetermineClaims = val => {
console.log(val.row);
@ -2466,6 +2473,7 @@ const Appealbutton = state => {
message: res.data.msg,
type: 'success',
});
DataRendering(TabPermissions.value, details.query, true);
}
})
.finally(res => {

434
src/views/basicdata/brand/basicdataFreight.vue
Unescape View File

@ -51,8 +51,9 @@
<!-- @click="$refs.crud.rowAdd()">新增</el-button>-->
<!-- </template>-->
</avue-crud>
<el-dialog v-model="Detailspop" title="详情" width="60%">
<el-dialog v-model="Detailspop" title="详情" width="60%">
<el-form
v-loading="Formloading"
class="el_formInfo"
:model="formInfo"
label-width="300px"
@ -73,22 +74,65 @@
</el-form-item>
<el-form-item label="品类">
<el-input v-model="formInfo.clientName" />
<el-input v-model="formInfo.categoryName" />
</el-form-item>
</div>
<div class="el_box_2">
<el-form-item label="生效时间">
<el-input v-model="formInfo.clientName" />
<el-input v-model="formInfo.effectiveTime" />
</el-form-item>
<el-form-item label="截止时间">
<el-input v-model="formInfo.clientName" />
<el-input v-model="formInfo.expirationTime" />
</el-form-item>
<el-form-item label="服务类型">
<el-input v-model="formInfo.clientName" />
<el-input v-model="formInfo.details" />
</el-form-item>
</div>
</el-form>
<el-tabs type="border-card">
<el-tab-pane label="干线">
<div class="el_groundline" v-for="item in groundlineZd" :key="item.dictKey">
<div class="checkbox checked" v-if="item.cost !=null"></div>
<el-form-item :label="item.label + '金额'">
<el-input :value="item.cost ? item.cost : '暂无'" disabled/>
</el-form-item>
<el-form-item label="单位">
<el-input :value="item.formulaModeName ? item.formulaModeName : '暂无'" disabled/>
</el-form-item>
</div>
</el-tab-pane>
<el-tab-pane label="仓库">
<div class="el_groundline_box">
<div class="el_groundline" v-for="item in warehouseZd" :key="item.dictKey">
<div class="checkbox checked" v-if="item.cost !=null"></div>
<el-form-item :label="item.label + '金额'">
<el-input :value="item.cost ? item.cost : '暂无'" disabled/>
</el-form-item>
<el-form-item label="单位">
<el-input :value="item.formulaModeName ? item.formulaModeName : '暂无'" disabled/>
</el-form-item>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="配送">
<div class="el_groundline_box">
<div class="el_groundline" v-for="item in DeliveryZd" :key="item.dictKey">
<div class="checkbox checked" v-if="item.cost !=null"></div>
<el-form-item :label="item.label + '金额'">
<el-input :value="item.cost ? item.cost : '暂无'" disabled/>
</el-form-item>
<el-form-item label="单位">
<el-input :value="item.formulaModeName ? item.formulaModeName : '暂无'" disabled/>
</el-form-item>
</div>
</div>
</el-tab-pane>
</el-tabs>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button @click="Detailspop = false">关闭</el-button>
@ -116,6 +160,7 @@ import {
// import option from "@/option/basicdata/basicdataFreight";
import { mapGetters } from 'vuex';
import { exportBlob } from '@/api/common';
import { getDictionaryBiz } from '@/api/system/dict'; //字典
import { getToken } from '@/utils/auth';
import { downloadXls } from '@/utils/util';
import { dateNow } from '@/utils/date';
@ -129,8 +174,15 @@ export default {
query: {},
search: {},
loading: true,
Detailspop: true,
Detailspop: false,
Formloading:false,
formInfo: {}, //详情弹窗表格
groundlineZd: [], //干线
warehouseZd: [], //仓库
DeliveryZd: [], //配送
groundlineInfo: [], //干线
warehouseInfo: [], //仓库
DeliveryInfo: [], //配送
page: {
pageSize: 30,
currentPage: 1,
@ -296,36 +348,36 @@ export default {
hide: true,
width: 'fit-content',
},
// {
// label: '计算方式', //;1件 2方 3公斤
// prop: 'formulaMode',
// type: 'select',
// dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_freight_formulamode',
// width: '100px',
// span: 12,
// props: {
// label: 'dictValue',
// value: 'dictKey',
// },
// search: true,
// rules: [
// {
// required: true,
// message: '请选择计算方式',
// trigger: 'blur',
// },
// ],
// },
{
label: '计算方式', //;1件 2方 3公斤
prop: 'formulaMode',
type: 'select',
dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_freight_formulamode',
width: '100px',
span: 12,
props: {
label: 'dictValue',
value: 'dictKey',
},
search: true,
rules: [
{
required: true,
message: '请选择计算方式',
trigger: 'blur',
},
],
},
{
label: '物品名称',
prop: 'itemName',
label: '客户名称',
prop: 'name',
type: 'input',
width: '150px',
span: 12,
rules: [
{
required: true,
message: '请填写物品名称',
message: '请填写客户名称',
trigger: 'blur',
},
],
@ -380,57 +432,57 @@ export default {
//
// },
{
label: '门店',
prop: 'shop',
type: 'select',
search: false,
dicData: [],
disabled: true,
},
// {
// label: '门店',
// prop: 'shop',
// type: 'select',
// search: false,
// dicData: [],
// disabled: true,
// },
{
label: '品牌',
prop: 'brand',
prop: 'brandName',
type: 'select',
search: false,
dicData: [],
disabled: true,
},
{
label: '服务类型', //;1 干 2干仓 3干仓配 4干配
prop: 'typeService',
type: 'select',
width: '150px',
span: 12,
dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_freight_type',
props: {
label: 'dictValue',
value: 'dictKey',
},
search: true,
rules: [
{
required: true,
message: '请选择服务类型',
trigger: 'blur',
},
],
},
// {
// label: '服务类型', //;1 干 2干仓 3干仓配 4干配
// prop: 'typeService',
// type: 'select',
// width: '150px',
// span: 12,
// dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_freight_type',
// props: {
// label: 'dictValue',
// value: 'dictKey',
// },
// search: true,
// rules: [
// {
// required: true,
// message: '请选择服务类型',
// trigger: 'blur',
// },
// ],
// },
{
label: '一级品类',
prop: 'firstClassCategory',
type: 'input',
width: '150px',
span: 12,
rules: [
{
required: true,
message: '请填写一级品类',
trigger: 'blur',
},
],
},
// {
// label: '一级品类',
// prop: 'firstClassCategory',
// type: 'input',
// width: '150px',
// span: 12,
// rules: [
// {
// required: true,
// message: '请填写一级品类',
// trigger: 'blur',
// },
// ],
// },
{
label: '一口价',
prop: 'fixedPrice',
@ -489,46 +541,91 @@ export default {
// type: "input",
//
// },
{
label: '时间段', //;1 0-30天 2 0-60天 3 60天以上
prop: 'warehousingTimeCharge',
type: 'select',
width: '150px',
span: 12,
dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_freight_timecharge',
props: {
label: 'dictValue',
value: 'dictKey',
},
search: true,
rules: [
{
required: true,
message: '请选择时间段',
trigger: 'blur',
},
],
},
{
label: '时间段费用',
prop: 'warehousingTimeStatus',
type: 'input',
width: '150px',
span: 12,
rules: [
{
required: true,
message: '请填写时间段费用',
trigger: 'blur',
},
],
},
// {
// label: '时间段', //;1 0-30天 2 0-60天 3 60天以上
// prop: 'warehousingTimeCharge',
// type: 'select',
// width: '150px',
// span: 12,
// dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_freight_timecharge',
// props: {
// label: 'dictValue',
// value: 'dictKey',
// },
// search: true,
// rules: [
// {
// required: true,
// message: '请选择时间段',
// trigger: 'blur',
// },
// ],
// },
// {
// label: '时间段费用',
// prop: 'warehousingTimeStatus',
// type: 'input',
// width: '150px',
// span: 12,
// rules: [
// {
// required: true,
// message: '请填写时间段费用',
// trigger: 'blur',
// },
// ],
// },
],
},
data: [],
};
},
created() {},
created() {
// 字典公共函数
// updateDictionary(targetArray, dictionaryType) {
// getDictionaryBiz(dictionaryType).then(res => {
// console.log(res, '字典');
// res.data.data.forEach(item => {
// targetArray.push({
// value: item.dictKey,
// label: item.dictValue,
// });
// });
// });
// };
// groundlineZd:[],//干线
// warehouseZd:[],//仓库
// DeliveryZd:[],//配送
getDictionaryBiz('artery').then(res => {
console.log(res, '干线字典');
res.data.data.forEach(item => {
this.groundlineZd.push({
value: item.dictKey,
label: item.dictValue,
});
});
});
getDictionaryBiz('entrepot').then(res => {
console.log(res, '仓库字典');
res.data.data.forEach(item => {
this.warehouseZd.push({
value: item.dictKey,
label: item.dictValue,
});
});
});
getDictionaryBiz('delivery').then(res => {
console.log(res, '配送字典');
res.data.data.forEach(item => {
this.DeliveryZd.push({
value: item.dictKey,
label: item.dictValue,
});
});
});
},
computed: {
...mapGetters(['permission']),
permissionList() {
@ -670,37 +767,70 @@ export default {
});
});
},
enrichDictionaryWithCosts(dictionary, dataArray, itemNameField) {
dictionary.forEach(dictItem => {
console.log(dictItem,'dictItem');
dataArray.forEach(dataItem => {
if (dictItem.label === dataItem[itemNameField]) {
dictItem.formulaModeName = dataItem.formulaModeName;
dictItem.cost = dataItem.cost;
}
});
});
},
// 查看按钮
beforeOpen(done, type) {
this.Detailspop = true; //开启弹窗
console.log(this.form.id);
console.log(this.form, 'from');
console.log('查看');
this.Formloading=true
this.formInfo={}
getDetail(this.form.id).then(res => {
this.formInfo.fixedPrice = this.form.fixedPrice == 1 ? '否' : this.form.fixedPrice == 2 ? '是' : '暂无';
console.log(res, 'res');
this.form = res.data.data;
$_QueryUserName({
this.formInfo.fixedPrice =
this.form.fixedPrice == 0 ? '否' : this.form.fixedPrice == 1 ? '是' : '暂无';
this.formInfo.categoryName = this.form.categoryName?this.form.categoryName:'暂无'; //品类
this.formInfo.effectiveTime = this.form.effectiveTime?this.form.effectiveTime:'暂无'; //生效时间
this.formInfo.expirationTime = this.form.expirationTime?this.form.expirationTime:'暂无'; //截止时间
this.formInfo.brand=this.form.brandName?this.form.brandName:'暂无'; //品牌
this.formInfo.details = res.data.data.details?res.data.data.details.map(res => res.typeName).join(','):'未选择'; //服务类型
if(res.data.data.details){
res.data.data.details.forEach(res => {
if (res.typeName == '干线') {
this.groundlineInfo.push(res);
} else if (res.typeName == '仓库') {
this.warehouseInfo.push(res);
} else if (res.typeName == '配送') {
this.DeliveryInfo.push(res);
}
});
}
this.enrichDictionaryWithCosts( this.groundlineZd,this.groundlineInfo, 'itemName');
this.enrichDictionaryWithCosts( this.DeliveryZd, this.DeliveryInfo,'itemName');
this.enrichDictionaryWithCosts(this.warehouseZd,this.warehouseInfo, 'itemName');
$_QueryUserName({
id: res.data.data.itemName,
}).then(res => {
this.formInfo.clientName = res.data.data.clientName;
console.log(res, '客户名称');
this.Formloading=false;
});
// 查询品牌
$_brand({
brandId: this.form.brand,
id: this.form.itemName,
// $_brand({
// brandId: this.form.brand,
// id: this.form.itemName,
// }).then(res => {
// console.log(res, '品牌');
// this.formInfo.brand = res.data.data.brandName;
// });
return;
$_category({
id: this.form.category,
}).then(res => {
console.log(res, '品牌');
this.formInfo.brand = res.data.data.brandName;
console.log(res, '品类');
});
return
$_category({
id:this.form.category
}).then(res=>{
console.log(res,'品类');
})
});
return;
if (['edit', 'view'].includes(type)) {
@ -716,6 +846,11 @@ export default {
}
done();
},
searchReset() {
this.query = {};
this.onLoad(this.page);
@ -773,6 +908,14 @@ export default {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.data.forEach(res=>{
res.fixedPrice
if(res.fixedPrice==0){
res.fixedPrice='否'
}else if(res.fixedPrice==1)(
res.fixedPrice='是'
)
})
this.loading = false;
this.selectionClear();
});
@ -811,4 +954,43 @@ export default {
display: flex;
}
}
.el_groundline {
display: flex;
}
.el_groundline_box{
display: flex;
flex-wrap: wrap;
.el_groundline{
width: 50%;
}
}
.checkbox {
position: relative;
display: inline-block;
width: 20px;
height: 15px;
border: 1px solid orange;
margin-top: 8px;
cursor: pointer;
border-radius: 2px;
}
.checkbox::after {
content: '';
position: absolute;
top: 40%;
left: 34%;
width: 5px;
height: 10px;
border-style: solid;
border-color: orange;
border-width: 0 2px 2px 0;
transform: translateY(-50%) rotate(45deg);
opacity: 0; /* 初始时勾隐藏 */
}
.checkbox.checked::after{
opacity: 1; /* 勾显示 */
}
</style>

33
src/views/basicdata/brand/basicdataFreightFrom.vue
Unescape View File

@ -50,8 +50,8 @@
<el-col :span="10" v-if="eachRide">
<el-form-item label="一口价" prop="goalGranary">
<el-select style="width: 100%" clearable v-model="form.fixedPrice" @change="choice">
<el-option label="是" value="2"> 是 </el-option>
<el-option label="否" value="1"> 否 </el-option>
<el-option label="是" value="1"> 是 </el-option>
<el-option label="否" value="0"> 否 </el-option>
</el-select>
</el-form-item>
</el-col>
@ -314,6 +314,8 @@ export default {
DryWarehouseDistributionAID: '', //干线ID
DryWarehouseDistributionBID: '', //仓库ID
DryWarehouseDistributionCID: '', //配送ID
CustomerName:[],//客户名称
brandList:[],//品牌集合
clientOptions: [], //客户集合
categoryData:[],//品类数据
categoryDataID:[],//品类数据的ID
@ -492,7 +494,7 @@ export default {
console.log(this.categoryData,'名字');
let matchedData = this.categoryDataID.map(subArray => {
// subArray 应该包含一个元素，即 id
if (subArray.length === 1) {
if (subArray.length === 1) {
let idToMatch = subArray[0];
// 在 datas 中寻找匹配的 id
let matched = this.categoryData.find(data => data.id === idToMatch);
@ -500,11 +502,16 @@ export default {
if (matched) {
return matched;
}
}
return null;
}).filter(item => item !== null); // 过滤掉任何未匹配的值（null）
console.log(matchedData,'筛选出来的值');
return
}
return null;
}).filter(item => item !== null); // 过滤掉任何未匹配的值（null）
console.log(matchedData,'筛选出来的值');
this.form.categoryName = matchedData.map(res=>res.name).join(',')
this.form.name = this.CustomerName.find(res=>res.id==this.form.clientIds).clientName;//客户名称
this.form.brandName= this.brandList.find(res=>res.brandId==this.form.brand).brandName;//品牌名称
console.log('提交的数据》》》', this.form);
add(this.form).then(() => {
this.$store.commit('DEL_TAG_CURRENT'); //关闭当前页面
this.$router.push('/basicdata/brand/basicdataFreight'); //添加成功跳转到列表
@ -582,7 +589,7 @@ console.log(matchedData,'筛选出来的值');
choice(a) {
//一口价选择
console.log(a);
if (a == '2') {
if (a == '1') {
this.buyNow = false;
} else {
this.buyNow = true;
@ -591,7 +598,7 @@ console.log(matchedData,'筛选出来的值');
choiceRide(a) {
//一口价选择
console.log(a);
if (a == '2') {
if (a == '1') {
this.eachRide = false;
} else {
this.eachRide = true;
@ -612,6 +619,7 @@ console.log(matchedData,'筛选出来的值');
ids: this.form.clientIds,
});
console.log('>>>>>>>>>>', a.data.data);
this.brandList = a.data.data;
this.options = a.data.data.filter(item => {
return item.brandName.toLowerCase().includes(query.toLowerCase());
});
@ -632,7 +640,10 @@ console.log(matchedData,'筛选出来的值');
let a = await selectName(this.page.currentPage, this.page.pageSize, {
clientName: query,
});
console.log('>>>>>>>>>>', a.data.data.records);
console.log('>>>>>>>>>>客户名称', a.data.data.records);
this.CustomerName=a.data.data.records
console.log(this.CustomerName,'当前客户');
console.log(this.form.clientIds,'当前选中客户');
this.clientOptions = a.data.data.records.filter(item => {
return item.clientName.toLowerCase().includes(query.toLowerCase());
});

10
src/views/distribution/artery/AddVehicleStowage.vue
Unescape View File

@ -45,6 +45,7 @@
<template #description>
<el-select
class="mt10"
ref="selectNodeRef"
v-model="item.nodeName"
filterable
remote
@ -255,6 +256,7 @@
Number(details.pageType) === 2 ||
slotProps.scope.row.blackList.includes(slotProps.scope.column.property)
"
:value-on-clear="0"
@change="handleComputedNum"
v-model.lazy="slotProps.scope.row[slotProps.scope.column.property]"
/>
@ -611,6 +613,9 @@ const $store = useStore();
// 表单实例
const ruleFormRef = ref();
// 节点下拉框实例
const selectNodeRef = ref();
console.log('ruleFormRef :>> ', ruleFormRef);
// 获取用户信息
@ -1232,7 +1237,7 @@ const handleComputedNum = () => {
handleComputedNum();
/** 新增目的仓 */
const handleAddNode = (index: number) => {
const handleAddNode = async (index: number) => {
const _flag = details.nodeInfoData.every(val => val.nodeName);
if (!_flag) {
return ElMessage({
@ -1295,6 +1300,9 @@ const handleAddNode = (index: number) => {
if (details.data.length === 0) initOriginWarehouseOrder();
setTabelHeight();
handleComputedNum();
await nextTick();
selectNodeRef.value[selectNodeRef.value.length - 1].focus();
};
/** 删除目的仓 */

4
src/views/distribution/artery/VehicleArrivalManagement.vue
Unescape View File

@ -96,9 +96,9 @@
<el-button type="primary" icon="el-icon-document" @click="searchReset()">
卸车报告
</el-button>
<el-button type="primary" icon="el-icon-document" @click="searchReset()">
<!-- <el-button type="primary" icon="el-icon-document" @click="searchReset()">
欧派TIMS数据关联
</el-button>
</el-button> -->
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">

7
src/views/distribution/artery/VehicleStowage.vue
Unescape View File

@ -91,7 +91,6 @@
</div>
</el-row>
<!-- 表格 -->
<!-- 列表模块 -->
<tablecmt
:checkselect="details.selectionList"
@ -211,12 +210,6 @@
</template>
</tablecmt>
<!-- 统计 -->
<!-- <el-row>
<div>选择数: , 运单数: , 件数: , 重量: , 体积: , 提货费: ,</div>
<div>总计: 总数: , 运单数: , 件数: , 重量: , 体积: , 提货费: ,</div>
</el-row> -->
<!-- 分页模块 -->
<el-row class="el-fy">
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">

232
src/views/distribution/artery/truckLoadingDetails.vue
Unescape View File

@ -175,11 +175,12 @@
:visible.sync="details.popUpShow.QRCodeVisible"
width="780px"
v-model="details.popUpShow.QRCodeVisible"
:align-center="true"
>
<div class="el-dialog-QRCode-container">
<div v-html="details.html"></div>
</div>
<span slot="footer" class="dialog-footer">
<span slot="footer" class="dialog-footer flex-c-c mt10">
<!-- <el-button type="primary" @click="ddd">导 出</el-button>-->
<el-button type="primary" @click="printTemplate">打 印</el-button>
<el-button @click="details.popUpShow.QRCodeVisible = false">取 消</el-button>
@ -659,12 +660,15 @@ const handleBatchUnLoad = async () => {
if (details.selectionList.length === 0) return ElMessage.warning('请选择需要卸车的数据');
if (details.pageInfo.type !== 'TripartiteTransfer') {
if (!details.myWarehouseData) details.myWarehouseData = await getMyCurrentWarehouse();
if (!details.myWarehouseData) {
const res = await getMyCurrentWarehouse();
details.myWarehouseData = res.data.data;
}
if (!details.myWarehouseData) return ElMessage.warning('请先选择一个仓库');
// 当前登录人的仓库Id
const myWarehouseId = details.myWarehouseData.warehouseId;
const myWarehouseId = details.myWarehouseData.id;
// 包件列表
const _orderArr = [];
@ -689,7 +693,7 @@ const handleBatchUnLoad = async () => {
// 不重复判断是否有异常
if (!isHaveAbnormalData) {
isHaveAbnormalData = iterator.warehouseId === myWarehouseId;
isHaveAbnormalData = iterator.finalNodeId !== myWarehouseId;
}
}
}
@ -697,19 +701,36 @@ const handleBatchUnLoad = async () => {
if ([..._zeroArr, ..._orderArr].length === 0) return ElMessage.warning('没有符合要求的数据');
// 判断是否含有异常
if (isHaveAbnormalData) {
const submitData = {
loadId: details.pageInfo.loadId,
unloadPackageList: _orderArr,
unloadZeroList: _zeroArr,
};
const res = await postBatchUnload(submitData);
const { code } = res.data;
if (code !== 200) return;
ElMessage.success('卸车成功');
onLoad();
if (!isHaveAbnormalData) {
ElMessageBox.confirm('是否卸车', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
center: true,
})
// 异常提交
.then(async () => {
try {
details.loadingObj.pageLoading = true;
const submitData = {
loadId: details.pageInfo.loadId,
unloadPackageList: _orderArr,
unloadZeroList: _zeroArr,
};
const res = await postBatchUnload(submitData);
const { code } = res.data;
if (code !== 200) return;
ElMessage.success('卸车成功');
onLoad();
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.pageLoading = false;
}
});
return;
}
@ -752,8 +773,8 @@ const handleBatchUnLoad = async () => {
const submitData = {
loadId: details.pageInfo.loadId,
unloadPackageList: _orderArr.filter(val => val.warehouseId === myWarehouseId),
unloadZeroList: _zeroArr.filter(val => val.warehouseId === myWarehouseId),
unloadPackageList: _orderArr.filter(val => val.finalNodeId === myWarehouseId),
unloadZeroList: _zeroArr.filter(val => val.finalNodeId === myWarehouseId),
};
const res = await postBatchUnload(submitData);
@ -817,90 +838,124 @@ const handleBatchUnLoad = async () => {
/** 卸车 -- 订单 */
const handleOrderUnLoad = async ({ row }) => {
try {
details.loadingObj.pageLoading = true;
if (details.pageInfo.type !== 'TripartiteTransfer') {
if (!details.myWarehouseData) {
const res = await getMyCurrentWarehouse();
details.myWarehouseData = res.data.data;
}
if (details.pageInfo.type !== 'TripartiteTransfer') {
if (!details.myWarehouseData) details.myWarehouseData = await getMyCurrentWarehouse();
if (!details.myWarehouseData) return ElMessage.warning('请先选择一个仓库');
if (!details.myWarehouseData) return ElMessage.warning('请先选择一个仓库');
// 当前登录人的仓库Id
const myWarehouseId = details.myWarehouseData.id;
// 当前登录人的仓库Id
const myWarehouseId = details.myWarehouseData.warehouseId;
if (row.warehouseId !== myWarehouseId)
return (
ElMessageBox.confirm('包含已卸车数据或计划不在本节点卸车的数据', '异常提交', {
confirmButtonText: '提交包含不在本节点数据',
cancelButtonText: '取消',
type: 'warning',
center: true,
console.log('details.myWarehouseData :>> ', details.myWarehouseData);
console.log('row.finalNodeId !== myWarehouseId :>> ', row);
console.log('myWarehouseId :>> ', myWarehouseId);
if (row.finalNodeId !== myWarehouseId)
return (
ElMessageBox.confirm('包含已卸车数据或计划不在本节点卸车的数据', '异常提交', {
confirmButtonText: '提交包含不在本节点数据',
cancelButtonText: '取消',
type: 'warning',
center: true,
})
// 异常提交
.then(async () => {
try {
details.loadingObj.pageLoading = true;
const submitData = {
loadId: details.pageInfo.loadId,
unloadPackageList: [{ orderPackageCode: row.scanCode }],
unloadZeroList: [],
};
const res = await postBatchUnload(submitData);
const { code } = res.data;
if (code !== 200) return;
ElMessage.success('卸车成功');
onLoad();
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.pageLoading = false;
}
})
// 异常提交
.then(async () => {
try {
details.loadingObj.pageLoading = true;
const submitData = {
loadId: details.pageInfo.loadId,
unloadPackageList: [{ orderPackageCode: row.scanCode }],
unloadZeroList: [],
};
const res = await postBatchUnload(submitData);
const { code } = res.data;
if (code !== 200) return;
ElMessage.success('卸车成功');
onLoad();
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.pageLoading = false;
}
})
);
const submitData = {
loadId: details.pageInfo.loadId,
unloadPackageList: [{ orderPackageCode: row.scanCode }],
unloadZeroList: [],
};
.catch(() => {})
);
ElMessageBox.confirm('是否卸车', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
center: true,
}).then(async () => {
try {
details.loadingObj.pageLoading = true;
const res = await postBatchUnload(submitData);
const { code } = res.data;
const submitData = {
loadId: details.pageInfo.loadId,
unloadPackageList: [{ orderPackageCode: row.scanCode }],
unloadZeroList: [],
};
if (code !== 200) return;
ElMessage.success('卸车成功');
onLoad();
} else {
// 三方中转
const submitData = {
loadId: details.pageInfo.loadId,
orderPackageCode: row.scanCode,
};
const res = await postBatchUnload(submitData);
const { code } = res.data;
const res = await postTransferUnloadPackage(submitData);
const { code } = res.data;
if (code !== 200) return;
ElMessage.success('卸车成功');
onLoad();
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.pageLoading = false;
}
});
} else {
// 三方中转
ElMessageBox.confirm('是否卸车', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
center: true,
}).then(async () => {
try {
details.loadingObj.pageLoading = true;
if (code !== 200) return;
ElMessage.success('卸车成功');
onLoad();
}
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.pageLoading = false;
const submitData = {
loadId: details.pageInfo.loadId,
orderPackageCode: row.scanCode,
};
const res = await postTransferUnloadPackage(submitData);
const { code } = res.data;
if (code !== 200) return;
ElMessage.success('卸车成功');
onLoad();
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.pageLoading = false;
}
});
}
};
/** 卸车 -- 零担 */
const handleZeroUnLoad = async ({ row }) => {
if (details.pageInfo.type !== 'TripartiteTransfer') {
if (!details.myWarehouseData) details.myWarehouseData = await getMyCurrentWarehouse();
if (!details.myWarehouseData) {
const res = await getMyCurrentWarehouse();
details.myWarehouseData = res.data.data;
}
if (!details.myWarehouseData) return ElMessage.warning('请先选择一个仓库');
if (details.myWarehouseData.warehouseId !== row.warehouseId)
if (details.myWarehouseData.id !== row.finalNodeId)
return ElMessage.warning('未在目的仓, 无法卸车');
}
@ -1163,9 +1218,4 @@ watch(
}
}
}
.el-dialog-QRCode-container {
max-height: 80vh;
overflow-y: scroll;
}
</style>

147
src/views/distribution/deliverylist/distributionDeliveryListdis.vue
Unescape View File

@ -86,81 +86,84 @@
<!-- 商配总车次 -->
<div style="height: 95%">
<div class="order-info">
<ul>
<li>
<img src="../../../../public/img/bg/Delivery.png" /> 商配总车次{{
statistics.commercialNub
}}
</li>
<li>
<img src="../../../../public/img/bg/package.png" />总包件数{{
statistics.commercialTotal
}}
</li>
</ul>
<div class="flex-c-sb">
<div class="flex1">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="全部列表" name="first"> </el-tab-pane>
<el-tab-pane label="待配送" name="second"> </el-tab-pane>
<el-tab-pane label="配送中" name="third"> </el-tab-pane>
<el-tab-pane label="已完成" name="fourth"> </el-tab-pane>
</el-tabs>
</div>
<div class="order-info ml10">
<ul>
<li>
<img src="../../../../public/img/bg/Delivery.png" /> 商配总车次{{
statistics.commercialNub
}}
</li>
<li>
<img src="../../../../public/img/bg/package.png" />总包件数{{
statistics.commercialTotal
}}
</li>
</ul>
</div>
</div>
<el-row class="el_tabBK">
<el-tabs v-model="activeName" @tab-click="handleClick">
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left" style="margin-top: 20px">
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">添 加 配 送</el-button>-->
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
<!-- <el-button type="primary" icon="el-icon-delete" @click="handleDelete" plain>新 增</el-button>-->
<el-button type="primary" @click="toDeliveryPlan">新增商配</el-button>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left" style="margin-top: 20px">
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">添 加 配 送</el-button>-->
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
<!-- <el-button type="primary" icon="el-icon-delete" @click="handleDelete" plain>新 增</el-button>-->
<el-button type="primary" @click="toDeliveryPlan">新增商配</el-button>
<el-button type="primary" @click="printBatchOrder">批量打印</el-button>
<el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain
>导出
</el-button>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
</div>
<el-tab-pane label="全部列表" name="first"> </el-tab-pane>
<el-tab-pane label="待配送" name="second"> </el-tab-pane>
<el-tab-pane label="配送中" name="third"> </el-tab-pane>
<el-tab-pane label="已完成" name="fourth"> </el-tab-pane>
</el-tabs>
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionsc"
>
<template #default="slotProps">
<el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text>
<el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
<el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>
<el-text
size="small"
v-if="slotProps.scope.row.deliveryStatus != 3"
@click="CancelDelivery(slotProps.scope)"
>取消配送</el-text
>
<el-text
size="small"
v-if="
slotProps.scope.row.deliveryStatusName !== '已完成' ||
slotProps.scope.row.deliveryStatus !== '3'
"
@click="handleEdit(slotProps.scope)"
>编 辑</el-text
>
<!-- <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
</template>
</tablecmt>
</el-row>
<el-button type="primary" @click="printBatchOrder">批量打印</el-button>
<el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain
>导出
</el-button>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
</div>
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionsc"
>
<template #default="slotProps">
<el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text>
<el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
<el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>
<el-text
size="small"
v-if="slotProps.scope.row.deliveryStatus != 3"
@click="CancelDelivery(slotProps.scope)"
>取消配送</el-text
>
<el-text
size="small"
v-if="
slotProps.scope.row.deliveryStatusName !== '已完成' ||
slotProps.scope.row.deliveryStatus !== '3'
"
@click="handleEdit(slotProps.scope)"
>编 辑</el-text
>
<!-- <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
</template>
</tablecmt>
</div>
<el-row class="el-fy">
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">

59
src/views/distribution/deliverylist/distributionDeliveryListmar.vue
Unescape View File

@ -59,11 +59,16 @@
</el-form-item>
</el-form>
</div>
<el-row>
<!-- <el-col :xl="14" :lg="7" :md="8" :sm="24" >-->
<!-- <span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} </span>-->
<!-- </el-col>-->
<div class="order-info">
<div class="flex-c-c">
<el-tabs class="flex1" v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="全部列表" name="first"> </el-tab-pane>
<el-tab-pane label="待配送" name="second"> </el-tab-pane>
<el-tab-pane label="配送中" name="third"> </el-tab-pane>
<el-tab-pane label="已完成" name="fourth"> </el-tab-pane>
</el-tabs>
<div class="order-info ml10">
<ul>
<li>
<img src="../../../../public/img/bg/Delivery.png" /> 市配总车次{{
@ -87,32 +92,26 @@
</li>
</ul>
</div>
</el-row>
<el-row> </el-row>
<el-tabs v-model="activeName" @tab-click="handleClick">
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left" style="margin-top: 20px">
<el-button type="primary" icon="el-icon-plus" @click="printBatchOrder"
>批量打印</el-button
>
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
<el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain
>导出
</el-button>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
</div>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left" style="margin-top: 20px">
<el-button type="primary" icon="el-icon-plus" @click="printBatchOrder"
>批量打印</el-button
>
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
<el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain
>导出
</el-button>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
<el-tab-pane label="全部列表" name="first"> </el-tab-pane>
<el-tab-pane label="待配送" name="second"> </el-tab-pane>
<el-tab-pane label="配送中" name="third"> </el-tab-pane>
<el-tab-pane label="已完成" name="fourth"> </el-tab-pane>
</el-tabs>
</div>
<tablecmt
ref="tableNode"
:columnList="columnList"

27
src/views/distribution/inventory/CreateOrder.vue
Unescape View File

@ -958,6 +958,7 @@ import {
postUpdateWaybillVerify,
postOpenOrderOpenZeroWaybill,
postFindCategoryInfo,
postFindArrPrice,
} from '@/api/distribution/CreateOrder.js';
// 获取vue实例
@ -1450,6 +1451,19 @@ const details = reactive<any>({
submitData: {},
/** tab标签有无数据 */
orderStatus: 'haveData',
priceArr: [
/** 单价 */
{ name: '运费', key: 'price' },
/** 送货费 */
{ name: '配送费', key: 'deliveryExpense' },
// { name: '提货费', key: 'pickupFee' },
/** 仓库管理费 */
{ name: '仓库管理费', key: 'warehouseManagementFee' },
/** 仓储费 */
{ name: '仓库存储费', key: 'storageFee' },
/** 装卸费 */
// { name: '仓库存储费', key: 'storageFee' },
],
});
const info = ref<any>({});
@ -1608,6 +1622,19 @@ const onLoad = async (idsArr = []) => {
val.chargeType = val.chargeType || 1;
console.log('val :>> ', val);
// val.pr
for (let index = 0; index < val.arrPirce.length; index++) {
const element = val.arrPirce[index];
// if (element.typeName !== '干线') continue;
if (element.itemName === '运费')
val.price = isNumber(element.cost) ? Number(element.cost) : 0;
console.log('element :>> ', element);
}
val.goodsListOptions = [];
// 计算运费小计
handleComputed(val);

20
src/views/waybill/TemporaryStorageList.vue
Unescape View File

@ -5,19 +5,6 @@
<div v-h5uShow="!search">
<!-- 查询模块 -->
<el-form :inline="true" :model="query" class="header_search">
<el-form-item label="交期:" class="el-times">
<!-- <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
<el-date-picker
v-model="stockupDate"
type="daterange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
clearable
/>
</el-form-item>
<el-form-item label="创建时间:" class="el-times">
<!-- <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
<el-date-picker
@ -935,6 +922,13 @@ initOnLoad();
/** 搜索 */
const searchChange = () => {
if (details.stockupDate.length === 0) {
delete details.query.startCreateTimeStr;
delete details.query.endCreateTimeStr;
} else {
details.query.startCreateTimeStr = dayjs(details.stockupDate[0]).format('YYYY-MM-DD');
details.query.endCreateTimeStr = dayjs(details.stockupDate[1]).format('YYYY-MM-DD');
}
initOnLoad();
};

211
src/views/waybill/WaybillOrderList.vue
Unescape View File

@ -1,5 +1,5 @@
<template>
<basic-container>
<basic-container v-loading="details.loadingObj.pageLoading">
<div class="avue-crud">
<!-- 搜索模块 -->
<div v-h5uShow="!search">
@ -75,26 +75,24 @@
</div>
<!-- 控件模块 -->
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button type="primary" icon="Printer" @click="batchPrint">打 印</el-button>
<el-button type="primary" icon="Edit" @click="editOrder">改 单</el-button>
<el-button type="primary" icon="Plus" @click="searchChange">加入挑单夹</el-button>
<el-button type="primary" icon="Location" @click="searchChange">运单跟踪</el-button>
<el-button type="primary" icon="Delete" @click="handleBatchDelete">批量作废</el-button>
<el-button type="primary" icon="Rank" @click="handleBatchFreeze">冻 结</el-button>
<el-button type="primary" icon="Refresh" @click="handleBatchRecover">恢 复</el-button>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
<el-button icon="Search" @click="searchHide" circle></el-button>
</div>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button type="primary" icon="Printer" @click="batchPrint">打 印</el-button>
<el-button type="primary" icon="Edit" @click="editOrder">改 单</el-button>
<el-button type="primary" icon="Plus" @click="searchChange">加入挑单夹</el-button>
<el-button type="primary" icon="Location" @click="searchChange">运单跟踪</el-button>
<el-button type="primary" icon="Delete" @click="handleBatchDelete">批量作废</el-button>
<el-button type="primary" icon="Rank" @click="handleBatchFreeze">冻 结</el-button>
<el-button type="primary" icon="Refresh" @click="handleBatchRecover">恢 复</el-button>
</div>
</el-row>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
<el-button icon="Search" @click="searchHide" circle></el-button>
</div>
</div>
<!-- 列表模块 -->
<tablecmt
@ -115,41 +113,36 @@
</template>
<template v-else-if="slotProps.scope.column.label === '操作'">
<el-text @click="handleShowPackageOrderList(slotProps.scope)"> 上传回单 </el-text>
<el-text @click="handleUploadReceipt(slotProps.scope)"> 上传回单 </el-text>
<el-text @click="handleViewOrderDetails(slotProps.scope)"> 查看订单 </el-text>
<!-- <el-text @click="handleShowPackageOrderList(slotProps.scope)">
零担标签
</el-text> -->
</template>
</template>
</tablecmt>
<!-- 分页模块 -->
<el-row class="el-fy">
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<div style="font-size: 14px">勾选数量: {{ selectionList.length }}</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 class="flex-c-sb">
<div style="font-size: 14px">勾选数量: {{ selectionList.length }}</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>
</div>
</basic-container>
<!-- 查看改单 -->
<!-- 上传回单 -->
<el-dialog
class="el-dialog-view"
title="查看改单"
title="上传回单"
:visible.sync="details.popUpShow.view"
width="780px"
:show-close="false"
@ -159,7 +152,7 @@
<!-- 头部 -->
<template #header="{ close, titleId, titleClass }">
<div class="my-header flex-c-sb">
<div :id="titleId" :class="titleClass">查看改单</div>
<div :id="titleId" :class="titleClass">上传回单</div>
<div class="flex-c-c">
<!-- 全屏显示按钮 -->
<el-button type="text" v-if="!details.fullscreenObj.view">
@ -180,15 +173,56 @@
</div>
</div>
</template>
<el-form label-width="100px">
<el-form-item label="运单号：">
<el-input v-model="details.waybillNo"></el-input>
</el-form-item>
<el-form-item label="图片：">
<el-upload
v-model:file-list="details.fileList"
action="/api/blade-resource/oss/endpoint/put-file"
list-type="picture-card"
:on-preview="handlePictureCardPreview"
:headers="details.header"
:on-remove="handleRemove"
>
<el-icon><Plus /></el-icon>
</el-upload>
</el-form-item>
</el-form>
<div class="flex-c-c mt10">
<el-button @click="details.fullscreenObj.view = false">关闭</el-button>
<el-button type="primary" icon="Position" @click="handleUploadReceiptSubmit">提交</el-button>
</div>
</el-dialog>
<!-- 查看改单 -->
<!-- 图片预览 -->
<el-dialog
title="查看改单"
v-model="details.popUpShow.dialogVisible"
width="fit-content"
:show-close="false"
:align-center="true"
class="imgDialogVisible"
>
<!-- <img w-full :src="details.dialogImageUrl" alt="Preview Image" /> -->
<el-image
:src="details.dialogImageUrl"
:preview-src-list="details.viewImgList"
:initial-index="details.viewImgIndex"
fit="cover"
/>
</el-dialog>
<!-- 打印 -->
<el-dialog
title="运单打印"
:visible.sync="details.popUpShow.WaybillPrintTemplate"
width="780px"
:show-close="false"
:fullscreen="details.fullscreenObj.WaybillPrintTemplate"
:align-center="true"
v-model="details.popUpShow.WaybillPrintTemplate"
>
<!-- 头部 -->
@ -216,8 +250,12 @@
</div>
</template>
<div v-for="item in details.selectionList" :key="item.id" style="margin-top: 20px">
<WaybillPrintTemplate :waybillInfo="item" />
<div class="mt10 el-dialog-QRCode-container">
<WaybillPrintTemplate
v-for="item in details.selectionList"
:key="item.id"
:waybillInfo="item"
/>
</div>
</el-dialog>
@ -244,6 +282,8 @@ import { columnList, viewColumnList } from '@/option/waybill/WaybillOrderList';
import { useRouter } from 'vue-router';
import print from '@/utils/print';
import { ElMessage } from 'element-plus';
import { getToken } from '@/utils/auth';
import type { UploadProps, UploadUserFile } from 'element-plus';
// 获取路由实例
const $router = useRouter();
@ -296,6 +336,8 @@ const details = reactive<any>({
/** 列表加载loading */
list: false,
packageListLoading: false,
/** 页面loading */
pageLoading: false,
},
/** 列表复选框选中的数据 */
selectionList: [],
@ -309,12 +351,12 @@ const details = reactive<any>({
},
/** 弹出层显示 */
popUpShow: {
/** 包件明细 */
packageOrderListlVisited: false,
/** 查看 */
/** 上传回单 */
view: false,
/** 运单打印模版 */
WaybillPrintTemplate: false,
/** 图片预览 */
dialogVisible: false,
},
/** 列表Dom节点 */
listNode: '',
@ -325,6 +367,16 @@ const details = reactive<any>({
view: false,
WaybillPrintTemplate: false,
},
/** 预览图片地址 */
dialogImageUrl: '',
/** 上传图片文件list */
fileList: [],
viewImgList: [],
viewImgIndex: 0,
waybillNo: '',
header: computed(() => {
return { 'Blade-Auth': 'Bearer ' + getToken() };
}),
});
const {
@ -353,7 +405,7 @@ onMounted(() => {
});
/** 请求页面数据 */
const onLoad = async (page: any, params = {}) => {
const onLoad = async (page?: any, params = {}) => {
try {
details.loadingObj.list = true;
let _page = details.page;
@ -477,15 +529,16 @@ const beforeClose = done => {
details.view = false;
};
/** 查看包明细 */
const handleShowPackageOrderList = ({ row }) => {
/** 上传回单 */
const handleUploadReceipt = ({ row }) => {
details.popUpShow.view = true;
nextTick(() => {
const _node = document.querySelector(`.el-dialog-view .maboxhi`);
setNodeHeight(_node);
});
details.fileList = [];
details.viewImgIndex = 0;
details.viewImgList = [];
details.waybillNo = row.waybillNo;
};
/** 查看订单详情 */
const handleViewOrderDetails = ({ row }) => {
$router.push({
path: '/waybill/orderDetails',
@ -610,6 +663,36 @@ const handleGoWaybillDetails = ({ row }) => {
},
});
};
/** 图片删除 */
const handleRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => {
console.log(uploadFile, uploadFiles);
};
/** 已上传的文件 */
const handlePictureCardPreview: UploadProps['onPreview'] = uploadFile => {
details.viewImgList = details.fileList.map(val => val.url);
details.viewImgIndex = details.viewImgList.indexOf(uploadFile.url);
details.dialogImageUrl = uploadFile.url!;
details.popUpShow.dialogVisible = true;
};
const handleUploadReceiptSubmit = () => {
let content = '';
if (!details.waybillNo) content = '运单号不能为空';
else if (details.fileList.length === 0) content = '请上传图片';
if (content) return ElMessage.warning({ message: content });
details.loadingObj.pageLoading = true;
details.popUpShow.view = false;
const timer = setTimeout(() => {
details.loadingObj.pageLoading = false;
ElMessage.success({ message: '上传成功' });
clearTimeout(timer);
}, 1000);
};
</script>
<style scoped lang="scss">
@ -643,3 +726,13 @@ const handleGoWaybillDetails = ({ row }) => {
}
}
</style>
<style>
.imgDialogVisible .el-dialog__header {
padding: 0;
}
.imgDialogVisible .el-dialog__body {
padding: 0;
}
</style>

55
src/views/waybill/orderPackageListDetails.vue
Unescape View File

@ -306,11 +306,12 @@
:visible.sync="details.popUpShow.QRCodeVisible"
width="780px"
v-model="details.popUpShow.QRCodeVisible"
:align-center="true"
>
<div class="el-dialog-QRCode-container">
<div v-html="details.html"></div>
</div>
<span slot="footer" class="dialog-footer">
<span slot="footer" class="dialog-footer flex-c-c mt10">
<!-- <el-button type="primary" @click="ddd">导 出</el-button>-->
<el-button type="primary" @click="printTemplate">打 印</el-button>
<el-button @click="details.popUpShow.QRCodeVisible = false">取 消</el-button>
@ -327,7 +328,7 @@
</template>
<script setup lang="ts">
import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
import functions from '@/utils/functions.js';
import dayjs from 'dayjs';
import { mapGetters } from 'vuex';
@ -353,10 +354,6 @@ import { useRoute, useRouter } from 'vue-router';
const $router = useRouter();
const $route = useRoute();
const {
query: { id },
} = $route;
const details = reactive<any>({
/** 是否开启搜索 */
search: true,
@ -482,6 +479,10 @@ onMounted(() => {
/** 请求页面数据 */
const onLoad = async (params = {}) => {
try {
const {
query: { id },
} = $route;
details.loadingObj.packageListLoading = true;
// 获取暂存单列表
@ -505,8 +506,6 @@ const initPage = () => {
onLoad();
};
initPage();
/** 搜索 */
const searchChange = () => {
initPage();
@ -667,19 +666,24 @@ const handleFullScrean = (_type: 'open' | 'close', _name: string) => {
};
/** 单列查看包条码 */
const printOrder = ({ row }) => {
details.popUpShow.QRCodeVisible = true;
let qr = {
orderPackageCodes: row.orderPackageCode,
};
getShowAdvancePackgeCode(qr).then(res => {
// this.orderPackageCode = res.data
if (res.data.code !== 200) return;
console.log(res.data);
const printOrder = async ({ row }) => {
try {
details.loadingObj.pageLaoding = true;
details.html = '';
details.html = getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
let qr = {
orderPackageCodes: row.orderPackageCode,
};
const res = await getShowAdvancePackgeCode(qr);
const { code, data } = res.data;
if (code !== 200) return;
details.popUpShow.QRCodeVisible = true;
details.html = getHtmls(data.dataList, data.templateHtml);
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.pageLaoding = false;
}
};
/** 打印包条码 */
@ -832,6 +836,17 @@ const handleBatchBarcode = async () => {
details.loadingObj.pageLaoding = false;
}
};
watch(
() => $route,
() => {
console.log('$route :>> ', $route);
if ($route.path !== '/waybill/orderPackageListDetails') return;
initPage();
},
{ immediate: true }
);
</script>
<style scoped lang="scss">

4
vite.config.js
Unescape View File

@ -25,7 +25,7 @@ export default ({ mode, command }) => {
// 新zyc
// target: 'http://192.168.6.116:8777',
// target: 'http://192.168.6.122:8777',
target: 'http://192.168.3.14:13000',
// target: 'http://192.168.3.14:13000',
// target: 'http://192.168.10.25:2888',
// target: 'http://192.168.6.161:9777',//CY
// target: 'http://192.168.10.57:13000',
@ -33,7 +33,7 @@ export default ({ mode, command }) => {
// target: 'http://192.168.10.29:13000',
// target: 'http://192.168.3.5:13000',//？
// target: 'http://h5uapi.huitongys.com',
// target: 'http://test.api.huo5you.com',
target: 'http://test.api.huo5you.com',
changeOrigin: true,
rewrite: path => path.replace(/^\/api/, ''),
},

Write Preview
Loading…
Cancel
Save