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
马远东 1 year ago
parent
1208381c4b 71e7575e2c
commit
9bb831a9d0
5 changed files with 85 additions and 36 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. 9
      src/router/views/index.js
  2. 6
      src/views/distribution/artery/AddVehicleStowage.vue
  3. 32
      src/views/financialsector/Financialse/FinancialBill.vue
  4. 4
      src/views/warehouse/warehouseWaybill.vue
  5. 66
      src/views/wel/index.vue

9
src/router/views/index.js
Unescape View File

@ -1504,6 +1504,15 @@ export default [
name: '仓储模板',
component: () => import('@/views/financialsector/Financialse/FinancialWarehousing.vue'),
},
{
meta: {
i18n: 'dict',
keepAlive: false,
},
path: '/financialsector/Financialse/FinancialBill',
name: '新增模板',
component: () => import('@/views/financialsector/Financialse/FinancialBill.vue'),
},
],
},

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

@ -575,6 +575,12 @@
</el-dialog>
</template>
<script lang="ts">
export default {
name: 'AddVehicleStowage',
};
</script>
<script setup lang="ts">
import { ref, reactive, toRefs, computed, onMounted, nextTick, onActivated, watch } from 'vue';
import functions from '@/utils/functions';

32
src/views/financialsector/Financialse/FinancialBill.vue
Unescape View File

@ -0,0 +1,32 @@
<template>
<div>
<el-form>
<el-form-item label="计费类型">
<el-input />
</el-form-item>
</el-form>
<el-divider content-position="left">整车计费</el-divider>
<el-form inline>
<el-form-item label="车型"></el-form-item>
<el-form-item label="整车计费（ 元/车 ）">
<el-input-number :min="0" :controls="false" :precision="2" :value-on-clear="0" />
</el-form-item>
</el-form>
</div>
</template>
<script setup lang="ts"></script>
<style lang="scss" scoped>
// 标题
:deep(.el-divider__text.is-left) {
font-size: 20px;
font-weight: bold;
color: var(--el-color-primary);
}
:deep(.el-input-number .el-input__inner) {
text-align: left;
}
</style>

4
src/views/warehouse/warehouseWaybill.vue
Unescape View File

@ -609,7 +609,7 @@ export default {
{
prop: 'stockCount',
label: '在库数',
type: 4,
type: 2,
values: '',
width: '130',
checkarr: [],
@ -620,7 +620,7 @@ export default {
{
prop: 'handleNum',
label: '可用数量',
type: 4,
type: 2,
values: '',
width: '130',
checkarr: [],

66
src/views/wel/index.vue
Unescape View File

@ -546,29 +546,40 @@
<!-- 当前配送数据 -->
<div class="mr10 box1 view_box">
<!-- 标题 -->
<div class="align_center mb20">
<div class="flex-c-sb mb20">
<div class="align_center">
<img class="mr10 img_13pt" src="@/static/icon_data.png" alt="" />
<div class="title">当前配送数据</div>
</div>
<div class="align_center">
<div :class="{ button: true, active: isActive }" @click="isActive = !isActive">
市配
</div>
<div :class="{ button: true, active: !isActive }" @click="isActive = !isActive">
商配
</div>
</div>
</div>
<!-- 数据 -->
<div class="border data_container pd10 flex">
<div class="item">
<div class="align_center">
<img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
<span>总数</span>
<span>配送计划总数</span>
</div>
<div class="mt10">
<span class="data mr5px">16899</span>
<span class="">件</span>
<span class="">单</span>
</div>
</div>
<div class="item border-left">
<div class="align_center">
<img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
<span>零担</span>
<span>总件数</span>
</div>
<div class="mt10">
<span class="data mr5px">16899</span>
@ -579,29 +590,29 @@
<div class="item border-left">
<div class="align_center">
<img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
<span>三方中转</span>
<span>总重量</span>
</div>
<div class="mt10">
<span class="data mr5px">16899</span>
<span class="">件</span>
<span class="">kg</span>
</div>
</div>
<div class="item border-left">
<div class="align_center">
<img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
<span>商配</span>
<span>总方数</span>
</div>
<div class="mt10">
<span class="data mr5px">16899</span>
<span class="">件</span>
<span class="">m³</span>
</div>
</div>
<div class="item border-left">
<div class="align_center">
<img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
<span>市配</span>
<span>在途件数</span>
</div>
<div class="mt10">
<span class="data mr5px">16899</span>
@ -620,22 +631,11 @@
<div class="title">签收数据</div>
</div>
<div class="border data_container pd10 flex">
<div class="border data_container pd10 flex-c-sb">
<div class="item">
<div class="align_center">
<img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
<span>总数</span>
</div>
<div class="mt10">
<span class="data mr5px">16899</span>
<span class="">件</span>
</div>
</div>
<div class="item border-left">
<div class="align_center">
<img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
<span>已上架</span>
<span>已签收</span>
</div>
<div class="mt10">
<span class="data mr5px">16899</span>
@ -646,7 +646,7 @@
<div class="item border-left">
<div class="align_center">
<img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
<span>空置</span>
<span>未签收</span>
</div>
<div class="mt10">
<span class="data mr5px">16899</span>
@ -657,18 +657,17 @@
<div class="item border-left">
<div class="align_center">
<img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
<span>已上架</span>
<span>签收率</span>
</div>
<div class="mt10">
<span class="data mr5px">16899</span>
<span class="">件</span>
<span class="data">16899</span>
</div>
</div>
<div class="item border-left">
<div class="align_center">
<img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
<span>未上架</span>
<span>文员签收数</span>
</div>
<div class="mt10">
<span class="data mr5px">16899</span>
@ -679,18 +678,17 @@
<div class="item border-left">
<div class="align_center">
<img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
<span>未上架</span>
<span>文员签收率</span>
</div>
<div class="mt10">
<span class="data mr5px">16899</span>
<span class="">件</span>
<span class="data">16899</span>
</div>
</div>
<div class="item border-left">
<div class="align_center">
<img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
<span>未上架</span>
<span>超时签收</span>
</div>
<div class="mt10">
<span class="data mr5px">16899</span>
@ -908,7 +906,11 @@ const isActive = ref(false);
// 第四排
.row_fourthly {
@extend .row_second;
@extend .row_third;
.item {
width: 150px;
}
}
.mr5px {

Write Preview
Loading…
Cancel
Save