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

Merge branch 'dev' into pre-production

fix_bug_pro20231227
pref_mail@163.com 2 years ago
parent
b6f2ffd8c5 608d973214
commit
08d0ba03f0
4 changed files with 174 additions and 173 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 338
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  2. 4
      src/views/distribution/disStockListDetail/disStockListDetail.vue
  3. 4
      src/views/distribution/disStockOrdercodeReco/disStockOrdercodeReco.vue
  4. 1
      src/views/distribution/signdetail/distributionSigndetaledt.vue

338
src/views/distribution/deliverylist/distributionDeliveryListedt.vue
Unescape View File

@ -608,159 +608,159 @@ export default {
fixed: false, fixed: false,
sortable: true, sortable: true,
}, },
{ // {
prop: 'stockCount', // prop: 'stockCount',
label: '在库数', // label: '在库数',
type: 4, // type: 4,
values: '', // values: '',
width: '180', // width: '180',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
}, // },
{ // {
prop: 'totalWeight', // prop: 'totalWeight',
label: '总重量', // label: '总重量',
type: 2, // type: 2,
values: '', // values: '',
width: '150', // width: '150',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
head: false, // head: false,
}, // },
{ // {
prop: 'totalVolume', // prop: 'totalVolume',
label: '总体积', // label: '总体积',
type: 2, // type: 2,
values: '', // values: '',
width: '150', // width: '150',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
head: false, // head: false,
}, // },
{ // {
prop: 'deliveryMethodStr', // prop: 'deliveryMethodStr',
label: '送货方式', // label: '送货方式',
type: 2, // type: 2,
values: '', // values: '',
width: '150', // width: '150',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
head: false, // head: false,
}, // },
{ // {
prop: 'urgencyStr', // prop: 'urgencyStr',
label: '紧急度', // label: '紧急度',
type: 2, // type: 2,
values: '', // values: '',
width: '150', // width: '150',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
head: false, // head: false,
}, // },
{ // {
prop: 'receiptCount', // prop: 'receiptCount',
label: '回单数', // label: '回单数',
type: 2, // type: 2,
values: '', // values: '',
width: '150', // width: '150',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
head: false, // head: false,
}, // },
{ // {
prop: 'receiptRequirement', // prop: 'receiptRequirement',
label: '回单要求', // label: '回单要求',
type: 2, // type: 2,
values: '', // values: '',
width: '150', // width: '150',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
head: false, // head: false,
}, // },
{ // {
prop: 'agent', // prop: 'agent',
label: '经办人', // label: '经办人',
type: 2, // type: 2,
values: '', // values: '',
width: '150', // width: '150',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
head: false, // head: false,
}, // },
{ // {
prop: 'documentMakingTime', // prop: 'documentMakingTime',
label: '制单时间', // label: '制单时间',
type: 5, // type: 5,
values: '', // values: '',
width: '150', // width: '150',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
head: false, // head: false,
}, // },
{ // {
prop: 'remark', // prop: 'remark',
label: '备注', // label: '备注',
type: 2, // type: 2,
values: '', // values: '',
width: '150', // width: '150',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
head: false, // head: false,
}, // },
{ // {
prop: 'batchNo', // prop: 'batchNo',
label: '批次号', // label: '批次号',
type: 2, // type: 2,
values: '', // values: '',
width: '150', // width: '150',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
head: false, // head: false,
}, // },
{ // {
prop: 'serviceTypeStr', // prop: 'serviceTypeStr',
label: '服务类型', // label: '服务类型',
type: 2, // type: 2,
values: '', // values: '',
width: '150', // width: '150',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
head: false, // head: false,
}, // },
{ // {
prop: 'serviceNo', // prop: 'serviceNo',
label: '服务号', // label: '服务号',
type: 2, // type: 2,
values: '', // values: '',
width: '150', // width: '150',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
head: false, // head: false,
}, // },
{ // {
prop: 'freezeStatusStr', // prop: 'freezeStatusStr',
label: '冻结状态', // label: '冻结状态',
type: 2, // type: 2,
values: '', // values: '',
width: '150', // width: '150',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
head: false, // head: false,
}, // },
{ {
prop: '', prop: '',
label: '操作', label: '操作',
@ -1417,24 +1417,24 @@ export default {
// search: true, // search: true,
// width: '100px' // width: '100px'
// }, // },
// {
// label: '配送件数',
// prop: 'packageNub',
// search: true,
// width: '100px',
// },
{ {
label: '配送件数', label: '计划包件数',
prop: 'packageNub', prop: 'reservationNum',
search: true, search: true,
width: '100px', width: '100px',
}, },
{ {
label: '配送库存品数', label: '计划库存品数',
prop: 'reservationStockListNum', prop: 'reservationStockListNum',
search: true, search: true,
width: '110px', width: '110px',
}, },
{
label: '计划件数',
prop: 'reservationNum',
search: true,
width: '100px',
},
{ {
label: '扫描件数', label: '扫描件数',
prop: 'loadedNub', prop: 'loadedNub',
@ -1447,13 +1447,6 @@ export default {
search: true, search: true,
width: '100px', width: '100px',
}, },
{
label: '备注',
prop: 'remarks',
search: false,
width: '100px',
hide: true,
},
{ {
label: '是否加急', label: '是否加急',
prop: 'isUrgentName', prop: 'isUrgentName',
@ -1472,6 +1465,13 @@ export default {
search: true, search: true,
width: '100px', width: '100px',
}, },
{
label: '备注',
prop: 'remarks',
search: false,
width: '100px',
hide: true,
},
{ {
label: '司机签收时间', label: '司机签收时间',
prop: 'signingStatus', prop: 'signingStatus',

4
src/views/distribution/disStockListDetail/disStockListDetail.vue
Unescape View File

@ -138,8 +138,8 @@
</template> </template>
<script> <script>
import { getList, getDetail, add, update, remove } from "@/api/disStockListDetail/disStockListDetail"; import { getList, getDetail, add, update, remove } from "@/api/distribution/disStockListDetail";
import option from "@/option/disStockListDetail/disStockListDetail"; import option from "@/option/distribution/disStockListDetail";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
export default { export default {

4
src/views/distribution/disStockOrdercodeReco/disStockOrdercodeReco.vue
Unescape View File

@ -117,8 +117,8 @@
</template> </template>
<script> <script>
import { getList, getDetail, add, update, remove } from "@/api/disStockOrdercodeReco/disStockOrdercodeReco"; import { getList, getDetail, add, update, remove } from "@/api/distribution/disStockOrdercodeReco";
import option from "@/option/disStockOrdercodeReco/disStockOrdercodeReco"; import option from "@/option/distribution/disStockOrdercodeReco";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
export default { export default {

1
src/views/distribution/signdetail/distributionSigndetaledt.vue
Unescape View File

@ -1,3 +1,4 @@
<template> <template>
<basic-container> <basic-container>
<div class="avue-crud"> <div class="avue-crud">

Write Preview
Loading…
Cancel
Save