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

Merge branch 'pre-production'

fix_bug_pro20231227
pref_mail@163.com 1 year ago
parent
b18157ce08 ccc927df31
commit
00fe558bf1
4 changed files with 1216 additions and 1281 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. 4
      src/page/index/index.vue
  2. 1
      src/page/index/layout.vue
  3. 2363
      src/router/views/index.js
  4. 129
      src/views/distribution/deliverylist/distributionDeliveryListmar.vue

4
src/page/index/index.vue
Unescape View File

@ -15,9 +15,9 @@
<!-- 主体视图层 -->
<div id="avue-view" v-show="!isSearch" v-if="isRefresh">
<router-view #="{ Component }">
<!-- <keep-alive> -->
<keep-alive :include="$store.getters.tagsKeep">
<component :is="Component" />
<!-- </keep-alive> -->
</keep-alive>
</router-view>
</div>
</div>

1
src/page/index/layout.vue
Unescape View File

@ -1,6 +1,5 @@
<template>
<router-view #="{ Component }">
<!-- {{ $store.getters.tagsKeep }} -->
<keep-alive :include="$store.getters.tagsKeep">
<component :is="Component" />
</keep-alive>

2363
src/router/views/index.js
View File

File diff suppressed because it is too large Load Diff

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

@ -102,95 +102,18 @@
</div>
</div>
<el-tab-pane label="全部列表" name="first">
<el-row class="el-fy">
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<!-- 列表模块 -->
<tablecmt :columnList="allColumnList" :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.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 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>
</el-tab-pane>
<el-tab-pane label="待配送" name="second">
<el-row class="el-fy">
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<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.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 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>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane label="配送中" name="third">
<el-row class="el-fy">
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<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.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 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>
</el-tab-pane>
<el-tab-pane label="已完成" name="fourth">
<el-row class="el-fy">
</el-tab-pane>
</el-tabs>
<el-row class="el-fy">
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<tablecmt :columnList="columnList" :tableData="data" :loading="loading" @inputTxt="inputsc"
@timeCheck="timesc"
@ -206,18 +129,21 @@
<!-- <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
</template>
</tablecmt>
<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 class="el-fx-btn">
<div class="el_fontsize" 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>
</el-tab-pane>
</el-tabs>
<el-row>
<!-- <el-table ref="table" v-loading="loading"-->
@ -1579,6 +1505,23 @@
.el-fy {
flex: 1;
display: flex;
align-items: flex-end;
align-content: space-between;
}
.flex-c-sb{
flex-direction: column;
justify-content: space-between;
}
.el-fx-btn{
display: flex;
justify-content: flex-end;
margin-right: 20px;
width: 100%;
}
.el_fontsize{
font-size: 14px;
display: flex;
align-items: center;
justify-content: center;
}
</style>

Write Preview
Loading…
Cancel
Save