pref_mail@163.com 8 months ago
parent
commit
90a3434ad6
  1. 6
      src/option/storagecost/Categorypricingunit.js
  2. 584
      src/views/cost/Deliverycostmanagement/Categorypricingunit.vue
  3. 63
      src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
  4. 2
      src/views/cost/Deliverycostmanagement/WarehouseTemplate.vue
  5. 12
      src/views/distribution/turndelivery/deliveryDiscuss.vue

6
src/option/storagecost/Categorypricingunit.js

@ -3,7 +3,7 @@ export const columnList = [
prop: 'checkbox',
label: '复选框',
type: 0,
width: 55,
width: 35,
fixed: true,
},
{
@ -11,7 +11,7 @@ export const columnList = [
label: '序号',
type: 12,
values: '',
width: 55,
width: 35,
fixed: true,
},
{
@ -61,7 +61,7 @@ export const columnList = [
label: '操作',
type: 6,
values: '',
width: '200',
width: '80',
checkarr: [],
fixed: 'right',
sortable: false,

584
src/views/cost/Deliverycostmanagement/Categorypricingunit.vue

@ -1,306 +1,296 @@
<template>
<basic-container>
<!-- 首页表格 -->
<div class="avue-crud">
<!-- 搜索模块 -->
<el-row v-if="search">
<!-- 查询模块 -->
<el-form :inline="true" :model="query" class="el-fr-d">
<!-- 查询按钮 -->
<el-form-item class="el-btn">
<el-button type="primary" icon="el-icon-search" @click="searchChange"> </el-button>
<el-button icon="el-icon-delete" @click="searchReset()"> </el-button>
</el-form-item>
</el-form>
</el-row>
<!-- 控件模块 -->
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button type="primary" @click="AddInfo"
><el-icon><Download /></el-icon></el-button
>
<el-button type="primary" @click="AddInfo"
><el-icon><Upload /></el-icon></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>
<basic-container>
<!-- 首页表格 -->
<div class="avue-crud">
<!-- 搜索模块 -->
<el-row v-if="search">
<!-- 查询模块 -->
<el-form :inline="true" :model="query" class="el-fr-d">
<!-- 查询按钮 -->
<el-form-item class="el-btn">
<el-button type="primary" icon="el-icon-search" @click="searchChange"> </el-button>
<el-button icon="el-icon-delete" @click="searchReset()"> </el-button>
</el-form-item>
</el-form>
</el-row>
<!-- 控件模块 -->
<!-- <el-row>
<div class="avue-crud__header">
<div class="avue-crud__left"></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-row>
<!-- 首页表格 -->
<el-row>
<!-- 列表模块 -->
<tablecmt
class="tableNode"
:columnList="details.columnList"
:tableData="data"
:loading="loadingObj.list"
@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 size="small" @click="handleEdit(slotProps.scope)"> </el-text>
</div>
</template>
</div>
</el-row> -->
<!-- 首页表格 -->
<el-row>
<!-- 列表模块 -->
<tablecmt
class="tableNode"
:columnList="details.columnList"
:tableData="data"
:loading="loadingObj.list"
@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 size="small" @click="handleEdit(slotProps.scope)"> </el-text>
</div>
</template>
</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>
</basic-container>
<!-- 列表配置显示 -->
<edittablehead
@setcolum="setnewcolum"
@closce="showdrawer"
:drawerShow="drawerShow"
:columnList="details.columnList"
v-model="details.columnList"
></edittablehead>
</template>
<script setup>
import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
import { columnList } from '@/option/storagecost/Categorypricingunit.js';
import { getDictionaryBiz } from '@/api/system/dict'; //
import { processRowProperty, setNodeHeight } from '@/utils/util';
import functions from '@/utils/functions.js';
import { ElMessageBox, ElMessage } from 'element-plus';
import { downloadXls } from '@/utils/util';
import { useStore } from 'vuex';
import dayjs from 'dayjs';
const $router = useRouter(); //
const $useStore = useStore(); //
const $route = useRoute(); //
const details = reactive({
/** 是否开启搜索 */
search: false,
/** 表格搜索条件 */
query: {},
/** 时间快捷选择设置 */
shortcuts: [
{
text: '最近一周',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
return [start, end];
},
},
{
text: '最近一个月',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
return [start, end];
},
},
{
text: '最近三个月',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
return [start, end];
},
</template>
</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>
</basic-container>
<!-- 列表配置显示 -->
<edittablehead
@setcolum="setnewcolum"
@closce="showdrawer"
:drawerShow="drawerShow"
:columnList="details.columnList"
v-model="details.columnList"
></edittablehead>
</template>
<script setup>
import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
import { columnList } from '@/option/storagecost/Categorypricingunit.js';
import { getDictionaryBiz } from '@/api/system/dict'; //
import { processRowProperty, setNodeHeight } from '@/utils/util';
import functions from '@/utils/functions.js';
import { ElMessageBox, ElMessage } from 'element-plus';
import { downloadXls } from '@/utils/util';
import { useStore } from 'vuex';
import dayjs from 'dayjs';
const $router = useRouter(); //
const $useStore = useStore(); //
const $route = useRoute(); //
const details = reactive({
/** 是否开启搜索 */
search: false,
/** 表格搜索条件 */
query: {},
/** 时间快捷选择设置 */
shortcuts: [
{
text: '最近一周',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
return [start, end];
},
],
/** 时间选择器数据 */
stockupDate: [],
/** 列表 */
columnList,
/** 列表数据 */
data: [{}],
/** 页面loading */
loadingObj: {
/** 列表加载loading */
list: false,
packageListLoading: false,
},
/** 列表复选框选中的数据 */
selectionList: [],
/** 是否显示设置表格 */
drawerShow: false,
/** 分页参数 */
page: {
currentPage: 1,
pageSize: 50,
total: 0,
},
/** 弹出层显示 */
popUpShow: {
/** 包件明细 */
packageOrderListlVisited: false,
/** 二维码 */
QRCodeVisible: false,
/** 修改客户信息 */
editClientInfoVisible: false,
{
text: '最近一个月',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
return [start, end];
},
},
/** 列表Dom节点 */
listNode: '',
form: {},
/** 全屏 */
fullscreenObj: {
/** 包明细 */
packageOrderListlVisited: false,
{
text: '最近三个月',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
return [start, end];
},
},
});
const {
search,
query,
shortcuts,
stockupDate,
data,
loadingObj,
selectionList,
drawerShow,
page,
trickleLoadingPage,
zeroAdditionalRecordingInfo,
popUpShow,
recorddata,
} = toRefs(details);
/** 展开列表控件 */
const showdrawer = _flag => {
details.drawerShow = _flag;
};
/** 表格表头输入框搜索 */
const inputsc = (index, row) => {
details.query[row.prop] = index;
processRowProperty(index, row, details);
test(details.query);
};
//
const test = val => {};
/** 表格表头时间选择 */
const timesc = (index, row) => {
console.log(index, row);
if (!!index) {
index = dayjs(index).format('YYYY-MM-DD');
}
details.query[row.prop] = index;
if (!index) {
delete details.query[row.prop];
}
};
/** 表格表头输入框搜索 */
const btnsc = val => {
console.log(val);
};
/** 表格表头下拉框选择 */
const selectsc = (index, row) => {
processRowProperty(index, row, details);
};
/** 表格表头复选框选择 */
const selectionChange = list => {
console.log(list);
details.selectionList = list;
};
//
const searchChange = () => {
details.search = false; //
};
//
const sizeChange = val => {
page.value.pageSize = val;
};
/** 页码改变执行的回调 */
const currentChange = val => {
page.value.currentPage = val;
};
//
const searchChangeS = () => {
details.search = false; //
};
//
const searchHide = () => {
console.log(details);
details.search = !details.search;
const _node = document.querySelector('.tableNode');
setNodeHeight(_node, '', true);
};
//
function updateDictionary(targetArray, dictionaryType) {
getDictionaryBiz(dictionaryType).then(res => {
console.log(res, '字典');
res.data.data.forEach(item => {
targetArray.push({
value: item.dictKey,
label: item.dictValue,
});
});
});
}
//
const onLoad = () => {};
//
const handleEdit = row => {
console.log(row);
};
</script>
<style scoped lang="scss">
.ElBtnClass button {
border: none;
padding: 0;
background-color: transparent;
}
:deep(.el-card) {
height: 100%;
],
/** 时间选择器数据 */
stockupDate: [],
/** 列表 */
columnList,
/** 列表数据 */
data: [{}],
/** 页面loading */
loadingObj: {
/** 列表加载loading */
list: false,
packageListLoading: false,
},
/** 列表复选框选中的数据 */
selectionList: [],
/** 是否显示设置表格 */
drawerShow: false,
/** 分页参数 */
page: {
currentPage: 1,
pageSize: 50,
total: 0,
},
/** 弹出层显示 */
popUpShow: {
/** 包件明细 */
packageOrderListlVisited: false,
/** 二维码 */
QRCodeVisible: false,
/** 修改客户信息 */
editClientInfoVisible: false,
},
/** 列表Dom节点 */
listNode: '',
form: {},
/** 全屏 */
fullscreenObj: {
/** 包明细 */
packageOrderListlVisited: false,
},
});
const {
search,
query,
shortcuts,
stockupDate,
data,
loadingObj,
selectionList,
drawerShow,
page,
trickleLoadingPage,
zeroAdditionalRecordingInfo,
popUpShow,
recorddata,
} = toRefs(details);
/** 展开列表控件 */
const showdrawer = _flag => {
details.drawerShow = _flag;
};
/** 表格表头输入框搜索 */
const inputsc = (index, row) => {
details.query[row.prop] = index;
processRowProperty(index, row, details);
test(details.query);
};
//
const test = val => {};
/** 表格表头时间选择 */
const timesc = (index, row) => {
console.log(index, row);
if (!!index) {
index = dayjs(index).format('YYYY-MM-DD');
}
:deep(.el-card__body) {
height: 100%;
display: flex;
flex-direction: column;
details.query[row.prop] = index;
if (!index) {
delete details.query[row.prop];
}
.el-fy {
flex: 1;
display: flex;
align-items: flex-end;
margin-bottom: 10px;
}
.avue-crud {
height: 100%;
display: flex;
flex-direction: column;
}
</style>
};
/** 表格表头输入框搜索 */
const btnsc = val => {
console.log(val);
};
/** 表格表头下拉框选择 */
const selectsc = (index, row) => {
processRowProperty(index, row, details);
};
/** 表格表头复选框选择 */
const selectionChange = list => {
console.log(list);
details.selectionList = list;
};
//
const searchChange = () => {
details.search = false; //
};
//
const sizeChange = val => {
page.value.pageSize = val;
};
/** 页码改变执行的回调 */
const currentChange = val => {
page.value.currentPage = val;
};
//
const searchChangeS = () => {
details.search = false; //
};
//
const searchHide = () => {
console.log(details);
details.search = !details.search;
const _node = document.querySelectorAll('.tableNode');
setNodeHeight(_node, '', true);
};
//
function updateDictionary(targetArray, dictionaryType) {
getDictionaryBiz(dictionaryType).then(res => {
console.log(res, '字典');
res.data.data.forEach(item => {
targetArray.push({
value: item.dictKey,
label: item.dictValue,
});
});
});
}
//
const onLoad = () => {};
//
const handleEdit = row => {
console.log(row);
};
</script>
<style scoped lang="scss">
.ElBtnClass button {
border: none;
padding: 0;
background-color: transparent;
}
:deep(.el-card) {
height: 100%;
}
:deep(.el-card__body) {
height: 100%;
display: flex;
flex-direction: column;
}
.el-fy {
flex: 1;
display: flex;
align-items: flex-end;
margin-bottom: 10px;
}
.avue-crud {
height: 100%;
display: flex;
flex-direction: column;
}
</style>

63
src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue

@ -5,27 +5,31 @@
<el-tab-pane label="市配" name="Municipaldistribution"></el-tab-pane>
</el-tabs>
<div class="form">
<el-form-item label="车型配置">
<SurchargeTable
:SurchargeData="form.dispatchSubjoinCategoryData"
:Surcharge="dispatchSubjoinCategory"
@focus="handleRowFocus"
@search="search"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<div class="eml_btn">
<span class="el_btn_a">
<el-icon style="color: #409eff; margin-right: 3px"><CirclePlus /></el-icon>
</span>
<span @click="categoriesduceSurcharge(slotProps.scope.row.index)" class="el_btn_b">
<el-icon style="color: #f00; margin-right: 3px"><Delete /></el-icon>
</span>
</div>
</template>
<div class="top">
<span class="title">车型配置</span>
<div class="el_add">
<el-icon><Plus /></el-icon><span></span>
</div>
</div>
<SurchargeTable
:SurchargeData="form.dispatchSubjoinCategoryData"
:Surcharge="dispatchSubjoinCategory"
@focus="handleRowFocus"
@search="search"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<div class="eml_btn">
<span class="el_btn_a">
<el-icon style="color: #409eff; margin-right: 3px"><CirclePlus /></el-icon>
</span>
<span @click="categoriesduceSurcharge(slotProps.scope.row.index)" class="el_btn_b">
<el-icon style="color: #f00; margin-right: 3px"><Delete /></el-icon>
</span>
</div>
</template>
</SurchargeTable>
</el-form-item>
</template>
</SurchargeTable>
</div>
</div>
</template>
@ -35,7 +39,7 @@ import SurchargeTable from '@/components/pric/tablePric.vue';
const activeName = ref('Commercialdistribution');
const form = ref({
dispatchSubjoinCategoryData: [
{
{
index: 1,
Warehousecategory: '',
options: [],
@ -46,7 +50,7 @@ const form = ref({
const dispatchSubjoinCategory = ref([
{ label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
{
label: '产品品类',
label: '车型',
prop: 'Warehousecategory',
type: 'select',
width: 'auto',
@ -67,5 +71,20 @@ const categoriesduceSurcharge = () => {};
<style scoped lang="scss">
.form {
width: 30%;
.top {
margin-bottom: 10px;
display: flex;
align-items: center;
}
.el_add {
display: flex;
align-items: center;
color: #656565;
cursor: pointer;
}
.title {
color: #6f6f6f;
margin-right: 20px;
}
}
</style>

2
src/views/cost/Deliverycostmanagement/WarehouseTemplate.vue

@ -253,7 +253,7 @@ const searchChangeS = () => {
const searchHide = () => {
console.log(details);
details.search = !details.search;
const _node = document.querySelector('.tableNode');
const _node = document.querySelectorAll('.tableNode');
setNodeHeight(_node, '', true);
};
//

12
src/views/distribution/turndelivery/deliveryDiscuss.vue

@ -2148,7 +2148,8 @@ const submit = () => {
if (!dataInfo.value[dataId.value].packageListInfo) {
dataInfo.value[dataId.value].packageListInfo = [];
}
dataInfo.value[dataId.value].packageListInfo = [...dataInfo.value[dataId.value].packageListInfo, ...dataTmp.value];
// dataInfo.value[dataId.value].packageListInfo = [...dataInfo.value[dataId.value].packageListInfo, ...dataTmp.value];
dataInfo.value[dataId.value].packageListInfo = dataTmp.value
wrapTemp.value[dataId.value] = dataTmp.value;
console.log('wrapTemp.value[dataId.value] :>> ', wrapTemp.value[dataId.value]);
console.log(wrapTemp.value, '包件订单被缓存');
@ -2188,7 +2189,8 @@ const submit = () => {
if (!dataInfo.value[dataId.value].packageListInfo) {
dataInfo.value[dataId.value].packageListInfo = [];
}
dataInfo.value[dataId.value].packageListInfo = [...dataInfo.value[dataId.value].packageListInfo, ...dataTmp.value];
// dataInfo.value[dataId.value].packageListInfo = [...dataInfo.value[dataId.value].packageListInfo, ...dataTmp.value];
dataInfo.value[dataId.value].packageListInfo = dataTmp.value
console.log(wrapTemp.value, '包件订单被缓存222');
console.log(dataInfo.value, '处理好的订单');
console.log(Packageow.value, 'Packageow.value');
@ -2202,8 +2204,11 @@ const submit = () => {
console.log('提交后的临时存储', dataTmp.value);
}
//
dataInfo.value = removeDuplicates(dataInfo.value);
dataInfo.value = removeDuplicates(dataInfo.value);
console.log( dataInfo.value,' dataInfo.value');
//
tooSUM();
//
@ -3260,7 +3265,6 @@ const SubmitCommercial = async () => {
handleBack();
} else {
//
console.log(DataSubmit.value, '准备提交的信息');
const res = await deliveryBusinessTask(DataSubmit.value);
code = res.data.code;

Loading…
Cancel
Save