Browse Source

修复已知bug

dev-xx
马远东 4 months ago
parent
commit
18b2151766
  1. 25
      src/components/tablecmt/tablecmt.vue
  2. 4
      src/option/Pricesystem/index.js
  3. 2
      src/option/basicdata/BackStockTask.js
  4. 2
      src/option/distribution/BookingNote.js
  5. 2
      src/option/distribution/DeliveryExceptionReview.js
  6. 2
      src/option/distribution/OrderInTransit.js
  7. 2
      src/option/distribution/SeparateTheList.js
  8. 2
      src/option/distribution/SeparateTheListInfo.js
  9. 6
      src/option/distribution/TripartiteTransfer.js
  10. 2
      src/option/distribution/Unstoreddetails.js
  11. 4
      src/option/distribution/VehicleStowageZeroLoading.js
  12. 2
      src/option/distribution/abnormalList.js
  13. 6
      src/option/distribution/addVehicleStowage.js
  14. 2
      src/option/distribution/arteryDistrilbutionBillLadingList.js
  15. 4
      src/option/distribution/createTask.js
  16. 4
      src/option/distribution/directGoMarketDetails.js
  17. 2
      src/option/distribution/distributionDeliveryListdis.js
  18. 2
      src/option/distribution/distributionDeliveryListmar.js
  19. 4
      src/option/distribution/distributionReservation.js
  20. 4
      src/option/distribution/distributionStockArticleDetails.js
  21. 2
      src/option/distribution/distributionStockArticleSelf.js
  22. 4
      src/option/distribution/distrilbutionBillLading.js
  23. 2
      src/option/finance/CustomerSettlement.js
  24. 4
      src/option/finance/MerchantDepositSlip.js
  25. 238
      src/option/finance/ReconciliationDepositSlip.js
  26. 2
      src/option/finance/WaybillAudit.js
  27. 2
      src/option/mt/Mengtiandatapushback.js
  28. 2
      src/option/reportforms/InventoryReceipt.js
  29. 2
      src/option/reportforms/Selfpickupreport.js
  30. 2
      src/option/reportforms/Selfpickuptask.js
  31. 2
      src/option/reportforms/Stockordertable.js
  32. 4
      src/option/signfor/asurcharge.js
  33. 2
      src/option/storagecost/Financialreview.js
  34. 2
      src/option/storagecost/Monthlyorderwarehousing.js
  35. 2
      src/option/storagecost/OrderTotalCostDetail.js
  36. 2
      src/option/storagecost/OrderTotalWarehouse.js
  37. 2
      src/option/storagecost/Traincostbreakdown.js
  38. 4
      src/option/turndelivery/deliveryDiscuss.js
  39. 2
      src/option/warehouse/PreStoragePackage.js
  40. 2
      src/option/warehouse/PreStorageTrainNumber.js
  41. 4
      src/option/warehouse/Prewarehouseorder.js
  42. 2
      src/option/warehouse/distributionStockArticle.js
  43. 2
      src/option/warehouse/warehouseRetentionRecord.js
  44. 2
      src/option/waybill/FreezeOrder.js
  45. 26
      src/option/waybill/TemporaryStorageList.js
  46. 2
      src/option/waybill/WarehousingByTrainNumber.js
  47. 2
      src/option/waybill/WaybillOrderList.js
  48. 2
      src/option/waybill/orderDetails.js
  49. 2
      src/option/waybill/orderPackageList.js
  50. 2
      src/option/waybill/orderPackageListDetails.js
  51. 6
      src/views/basic/coderule/basicTenantCode.vue
  52. 6
      src/views/basic/coderule/basicTenantCode1.vue
  53. 2
      src/views/basicdata/brand/basicZonePrice.vue
  54. 4
      src/views/basicdata/team/basicdataTeamStaff.vue
  55. 4
      src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue
  56. 18
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
  57. 2
      src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
  58. 2
      src/views/distribution/artery/AddVehicleStowage.vue
  59. 1
      src/views/distribution/artery/truckLoadingDetails.vue
  60. 4
      src/views/distribution/checkInventoryTask/createTask2.vue
  61. 4
      src/views/distribution/checkInventoryTask/createTaskTemp.vue
  62. 2
      src/views/distribution/deliverylist/distributionDeliveryList.vue
  63. 12
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  64. 2
      src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue
  65. 18
      src/views/distribution/inventory/distributionStockListDetails.vue
  66. 16
      src/views/distribution/inventory/distrilbutionBillLading.vue
  67. 23
      src/views/distribution/inventory/distrilbutionBillLadingList.vue
  68. 4
      src/views/distribution/inventory/distrilbutionBillLadingView.vue
  69. 8
      src/views/distribution/reservation/reservationAddFrom copy.vue
  70. 10
      src/views/distribution/reservation/reservationAddFrom.vue
  71. 6
      src/views/distribution/reservation/reservationDetails.vue
  72. 2
      src/views/distribution/signdetail/distributionSigndetailCopy.vue
  73. 6
      src/views/distribution/signfor/distributionSignforedt.vue
  74. 2
      src/views/distribution/signfor/distributionSignforedtTT.vue
  75. 2
      src/views/distribution/signfor/distributionSignfortreat.vue
  76. 6
      src/views/distribution/stockup/distributionStockupDetails.vue
  77. 6
      src/views/distribution/stockup/distributionStockupDetailsSelf.vue
  78. 5269
      src/views/mail/order/add.vue
  79. 2
      src/views/mail/order/list.vue
  80. 2
      src/views/warehouse/parcelList/distributionParcelList.vue
  81. 4
      src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue
  82. 8
      src/views/warehouse/warehouseRetentionRecord/warehouseRetentionDetails.vue
  83. 2
      src/views/warehouse/warehouseStock/warehouseStock.vue
  84. 2
      src/views/warehouse/warehouseWaybill.vue
  85. 4
      src/views/waybill/CreateZeroOrder.vue

25
src/components/tablecmt/tablecmt.vue

@ -123,14 +123,6 @@
v-model="scope.row[column.prop]"
/>
<!-- <el-text
class="mx-2 tabculconte"
v-for="item in column.checkarr"
v-if="Number(column.type) < 6 && Number(column.type) > 0"
>
<span v-if="item.value==scope.row[column.prop]">{{ item.label }}</span>
</el-text
> -->
<el-text
style=""
class="mx-2 tabculconte colors"
@ -161,16 +153,7 @@
:disabled="!scope.row.disabled"
clearable
/>
<!-- <el-image
preview-teleported
v-else-if="column.type == 7"
style="width: 60px; height: 60px; margin-left: 10px"
:initial-index="index"
:z-index="100"
v-for="(item, index) in scope.row[column.prop].split(',')"
:src="item"
:preview-src-list="scope.row[column.prop].split(',')"
/> -->
<el-image
preview-teleported
v-else-if="column.type == 7"
@ -229,15 +212,11 @@
</template>
<script lang="ts" setup>
import { ref, getCurrentInstance, onMounted, defineExpose, inject, watch } from 'vue';
import { ref, getCurrentInstance, onMounted, defineExpose, watch } from 'vue';
import type { PropType } from 'vue';
import { computeNumber } from '@/utils/util.js';
import { useRoute } from 'vue-router';
import { postSaveTableSeting } from '@/api/basic/table';
const $route = useRoute();
const functions = inject('functions') as any;
const { proxy } = getCurrentInstance() as any;
const selecttable = ref(null);

4
src/option/Pricesystem/index.js

@ -118,15 +118,13 @@ export const columnList = [
label: '操作',
type: 6,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: 'right',
sortable: false,
},
];
export const HistoricalList = [
{
prop: '',

2
src/option/basicdata/BackStockTask.js

@ -49,7 +49,7 @@ export default [
prop: 'orderCode',
type: 30,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/distribution/BookingNote.js

@ -143,7 +143,7 @@ export const ChangeOrderColumnList = [
label: '修改内容',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/distribution/DeliveryExceptionReview.js

@ -54,7 +54,7 @@ export const AbnormalReview = [
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: false,

2
src/option/distribution/OrderInTransit.js

@ -44,7 +44,7 @@ export const columnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/distribution/SeparateTheList.js

@ -31,7 +31,7 @@ export const columnList = [
label: '原订单编号',
type: 2,
values: '',
width: '300',
width: '200',
fixed: true,
sortable: true,
head: false,

2
src/option/distribution/SeparateTheListInfo.js

@ -31,7 +31,7 @@ export const columnList = [
label: '原订单编号',
type: 2,
values: '',
width: '300',
width: '200',
fixed: false,
sortable: true,
head: false,

6
src/option/distribution/TripartiteTransfer.js

@ -251,7 +251,7 @@ export const columnList = [
label: '操作',
type: 6,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: 'right',
sortable: false,
@ -302,7 +302,7 @@ export const detailsColumnList = [
label: '订单号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -763,7 +763,7 @@ export const TripartiteTransferColumnList = [
label: '订单号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/distribution/Unstoreddetails.js

@ -25,7 +25,7 @@ export const columnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

4
src/option/distribution/VehicleStowageZeroLoading.js

@ -31,7 +31,7 @@ export const columnList = [
label: '订单号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -86,7 +86,7 @@ export const columnList = [
label: '操作',
type: 6,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: 'right',
sortable: false,

2
src/option/distribution/abnormalList.js

@ -103,7 +103,7 @@ export const columnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

6
src/option/distribution/addVehicleStowage.js

@ -175,7 +175,7 @@ export const columnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -439,7 +439,7 @@ export const newColumnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -684,7 +684,7 @@ export const detailsColumnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,

2
src/option/distribution/arteryDistrilbutionBillLadingList.js

@ -378,7 +378,7 @@ export const columnDetailList = [
label: '合同号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

4
src/option/distribution/createTask.js

@ -205,7 +205,7 @@ export const columnListInventory = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -539,7 +539,7 @@ export const comparativecolumnList = [
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

4
src/option/distribution/directGoMarketDetails.js

@ -182,7 +182,7 @@ export const detailsColumnList = [
label: '订单号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -377,7 +377,7 @@ export const oldColumnList = [
label: '合同号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,

2
src/option/distribution/distributionDeliveryListdis.js

@ -56,7 +56,7 @@ export const columnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/distribution/distributionDeliveryListmar.js

@ -65,7 +65,7 @@ export const columnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

4
src/option/distribution/distributionReservation.js

@ -353,7 +353,7 @@ export default {
{
label: '订单自编号',
prop: 'orderCode',
width: '300',
width: '200',
},
{
label: '商场名称',
@ -498,7 +498,7 @@ export default {
{
label: '订单自编号',
prop: 'orderCode',
width: '300',
width: '200',
},
// {
// prop: 'incomingBatch',

4
src/option/distribution/distributionStockArticleDetails.js

@ -36,7 +36,7 @@ export const columnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -271,7 +271,7 @@ export const zerocolumnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/distribution/distributionStockArticleSelf.js

@ -44,7 +44,7 @@ export const columnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

4
src/option/distribution/distrilbutionBillLading.js

@ -271,7 +271,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -1115,7 +1115,7 @@ export default {
{
prop: 'orderCode',
label: '订单自编号',
width: '300',
width: '200',
},
{
prop: 'mallName',

2
src/option/finance/CustomerSettlement.js

@ -52,7 +52,7 @@ export const columnList = [
label: '订单编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,

4
src/option/finance/MerchantDepositSlip.js

@ -41,7 +41,7 @@ export const columnList = [
label: '订单编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -474,7 +474,7 @@ export const orderColumnList = [
label: '订单编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,

238
src/option/finance/ReconciliationDepositSlip.js

@ -19,7 +19,7 @@ export const columnList = [
label: '品牌',
type: 2,
values: '',
width: '150',
width: '100',
checkarr: [],
fixed: true,
sortable: true,
@ -30,7 +30,7 @@ export const columnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -186,6 +186,39 @@ export const columnList = [
head: false,
isshowSummary: true,
},
{
prop: 'totalNum',
label: '货物品类',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'totalNum',
label: '品类件数',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'totalNum',
label: '干线品类单价',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'totalWeight',
label: '总重量',
@ -449,6 +482,18 @@ export const columnList = [
head: false,
isshowSummary: true,
},
{
prop: 'deliveryCrossingFee',
label: '配送专车费',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'installFee',
label: '安装费',
@ -473,6 +518,42 @@ export const columnList = [
head: false,
isshowSummary: true,
},
{
prop: 'deliveryCrossingFee',
label: '回扣',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'deliveryCrossingFee',
label: '申明价值',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'deliveryCrossingFee',
label: '保价费',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'shipperPerson',
label: '发货人',
@ -609,6 +690,17 @@ export const columnList = [
sortable: true,
head: false,
},
{
prop: 'signNum',
label: '送货时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signTime',
label: '签收时间',
@ -620,6 +712,28 @@ export const columnList = [
sortable: true,
head: false,
},
{
prop: 'signNum',
label: '签收人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signNum',
label: '配送司机',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'syncFeeStatus',
label: '是否计算价格',
@ -677,7 +791,7 @@ export const columnListB = [
label: '品牌',
type: 2,
values: '',
width: '150',
width: '100',
checkarr: [],
fixed: true,
sortable: true,
@ -688,7 +802,7 @@ export const columnListB = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -844,6 +958,39 @@ export const columnListB = [
head: false,
isshowSummary: true,
},
{
prop: 'totalNum',
label: '货物品类',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'totalNum',
label: '品类件数',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'totalNum',
label: '干线品类单价',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'totalWeight',
label: '总重量',
@ -1108,6 +1255,18 @@ export const columnListB = [
head: false,
isshowSummary: true,
},
{
prop: 'deliveryCrossingFee',
label: '配送专车费',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'installFee',
label: '安装费',
@ -1132,6 +1291,42 @@ export const columnListB = [
head: false,
isshowSummary: true,
},
{
prop: 'deliveryCrossingFee',
label: '回扣',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'deliveryCrossingFee',
label: '申明价值',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'deliveryCrossingFee',
label: '保价费',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'shipperPerson',
label: '发货人',
@ -1268,6 +1463,17 @@ export const columnListB = [
sortable: true,
head: false,
},
{
prop: 'signNum',
label: '送货时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signTime',
label: '签收时间',
@ -1279,6 +1485,28 @@ export const columnListB = [
sortable: true,
head: false,
},
{
prop: 'signNum',
label: '签收人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signNum',
label: '配送司机',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'syncFeeStatus',
label: '是否计算价格',
@ -1330,7 +1558,7 @@ export const confirmColumnList = [
label: '订单号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/finance/WaybillAudit.js

@ -41,7 +41,7 @@ export const columnList = [
label: '订单编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,

2
src/option/mt/Mengtiandatapushback.js

@ -41,7 +41,7 @@ export const columnList = [
label: '订单号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/reportforms/InventoryReceipt.js

@ -96,7 +96,7 @@ export const columnList = [
label: '订单自编码',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/reportforms/Selfpickupreport.js

@ -86,7 +86,7 @@ export const columnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/reportforms/Selfpickuptask.js

@ -52,7 +52,7 @@ export const columnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/reportforms/Stockordertable.js

@ -41,7 +41,7 @@ export const columnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

4
src/option/signfor/asurcharge.js

@ -19,7 +19,7 @@ export const columnList = [
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -192,7 +192,7 @@ export const columnListTC = [
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/storagecost/Financialreview.js

@ -74,7 +74,7 @@ export const columnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/storagecost/Monthlyorderwarehousing.js

@ -30,7 +30,7 @@ export const columnList = [
label: '订单编号 ',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/storagecost/OrderTotalCostDetail.js

@ -30,7 +30,7 @@ export const columnList = [
label: '订单编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/storagecost/OrderTotalWarehouse.js

@ -30,7 +30,7 @@ export const columnList = [
label: '订单编号 ',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/storagecost/Traincostbreakdown.js

@ -63,7 +63,7 @@ export const columnList = [
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

4
src/option/turndelivery/deliveryDiscuss.js

@ -48,7 +48,7 @@ export const columnList = [
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -426,7 +426,7 @@ export const newMenuData = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/warehouse/PreStoragePackage.js

@ -37,7 +37,7 @@ export const columnList = [
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,

2
src/option/warehouse/PreStorageTrainNumber.js

@ -48,7 +48,7 @@ export const columnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

4
src/option/warehouse/Prewarehouseorder.js

@ -19,7 +19,7 @@ export const columnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -580,7 +580,7 @@ export const packageColumnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/warehouse/distributionStockArticle.js

@ -41,7 +41,7 @@ export const columnList = [
label: '订单自编号',
type: 13,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/warehouse/warehouseRetentionRecord.js

@ -56,7 +56,7 @@ export const columnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/waybill/FreezeOrder.js

@ -19,7 +19,7 @@ export const columnList = [
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,

26
src/option/waybill/TemporaryStorageList.js

@ -19,7 +19,7 @@ export const columnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -600,7 +600,7 @@ export const packageColumnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -650,6 +650,28 @@ export const packageColumnList = [
sortable: true,
head: false,
},
{
prop: 'volume',
label: '方数',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'weight',
label: '重量',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'brand',
label: '品牌',

2
src/option/waybill/WarehousingByTrainNumber.js

@ -20,7 +20,7 @@ export const columnList = [
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,

2
src/option/waybill/WaybillOrderList.js

@ -30,7 +30,7 @@ export const columnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,

2
src/option/waybill/orderDetails.js

@ -31,7 +31,7 @@ export const packageListColumnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/option/waybill/orderPackageList.js

@ -31,7 +31,7 @@ export const packageListColumnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,

2
src/option/waybill/orderPackageListDetails.js

@ -31,7 +31,7 @@ export const packageListColumnList = [
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,

6
src/views/basic/coderule/basicTenantCode.vue

@ -259,7 +259,7 @@ const details = reactive<any>({
label: '编码类型',
type: 3,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -281,7 +281,7 @@ const details = reactive<any>({
label: '编码',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -291,7 +291,7 @@ const details = reactive<any>({
label: '操作',
type: 6,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: 'right',
sortable: false,

6
src/views/basic/coderule/basicTenantCode1.vue

@ -189,7 +189,7 @@ export default {
label: '编码类型',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -211,7 +211,7 @@ export default {
label: '编码',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -221,7 +221,7 @@ export default {
label: '操作',
type: 6,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: 'right',
sortable: false,

2
src/views/basicdata/brand/basicZonePrice.vue

@ -418,7 +418,7 @@ export default {
label: '操作',
type: 6,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: 'right',
hide: true,

4
src/views/basicdata/team/basicdataTeamStaff.vue

@ -196,7 +196,7 @@ export default {
label: '所属部门名称',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -206,7 +206,7 @@ export default {
label: '仓库名称',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

4
src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue

@ -218,7 +218,7 @@ const details = reactive({
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -363,7 +363,7 @@ const details = reactive({
label: '订单号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

18
src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue

@ -988,7 +988,7 @@ const showupt = value => {
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -1056,7 +1056,7 @@ const showupt = value => {
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -1157,7 +1157,7 @@ const showupt = value => {
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -1370,7 +1370,7 @@ const showupt = value => {
label: '订单自编码',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -1425,7 +1425,7 @@ const showupt = value => {
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -1537,7 +1537,7 @@ const showupt = value => {
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -1853,7 +1853,7 @@ const showdown = async value => {
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -2020,7 +2020,7 @@ const showdown = async value => {
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -2155,7 +2155,7 @@ const showdown = async value => {
label: '订单号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/views/basicdata/warehouse/tray/basicdataTrayedt.vue

@ -640,7 +640,7 @@ export default {
label: '订单自编号',
type: 30,
values: '',
width: '180',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/views/distribution/artery/AddVehicleStowage.vue

@ -252,7 +252,7 @@
</div>
<!-- 备注 -->
<el-form-item label="备注">
<el-form-item label="备注" style="width: 100%">
<el-input autosize v-model="form.remark" type="textarea" placeholder="备注" />
</el-form-item>
</el-form>

1
src/views/distribution/artery/truckLoadingDetails.vue

@ -489,6 +489,7 @@ const details = reactive<any>({
{ label: '装车', value: 1 },
{ label: '卸车', value: 2 },
{ label: '签收', value: 3 },
{ label: '滞留', value: 4 },
],
/** 有无数据 */
isDataOption: [

4
src/views/distribution/checkInventoryTask/createTask2.vue

@ -836,7 +836,7 @@ const InventoryDetails = ref([
label: '订单自编号',
type: 5,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
search: true,
@ -1069,7 +1069,7 @@ const contrast = ref([
label: '订单自编号',
type: 4,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
search: true,

4
src/views/distribution/checkInventoryTask/createTaskTemp.vue

@ -965,7 +965,7 @@ const InventoryDetails = ref([
label: '订单自编号',
type: 5,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
search: true,
@ -1264,7 +1264,7 @@ const contrast = ref([
label: '订单自编号',
type: 4,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
search: true,

2
src/views/distribution/deliverylist/distributionDeliveryList.vue

@ -437,7 +437,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

12
src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@ -1370,7 +1370,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -1614,7 +1614,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -1985,7 +1985,7 @@ export default {
label: '服务号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -2445,7 +2445,7 @@ export default {
prop: 'orderCode',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -2849,7 +2849,7 @@ export default {
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -3009,7 +3009,7 @@ export default {
label: '订单自编码',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue

@ -451,7 +451,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

18
src/views/distribution/inventory/distributionStockListDetails.vue

@ -248,8 +248,7 @@
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
</template>
<template #default="slotProps"> </template>
</tablecmt>
<!-- <div class="avue-crud__pagination" style="width: 100%">
<el-pagination
@ -363,19 +362,18 @@ export default {
locations: 0, //
isShowPrint: false,
html: '',
columnListarrs: {
//
FreezeDetails:[
{
FreezeDetails: [
{
prop: '',
label: '复选框',
type: 0,
width: 55,
fixed: true,
},
{
{
prop: '',
label: '序号',
type: 12,
@ -561,7 +559,7 @@ export default {
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -1213,13 +1211,13 @@ export default {
console.log('拆包明细');
// this.getOnChai(this.page2);
this.getunpacking(this.page3);
}else if (this.leibiao == 'FreezeDetails') {
} else if (this.leibiao == 'FreezeDetails') {
this.getFreezeDetails(this.page4);
}
const _node = document.querySelectorAll('.tableNode');
setNodeHeight(_node, '', true);
},
getFreezeDetails(page){
getFreezeDetails(page) {
let data = {
stockListId: this.$route.query.id,
// current: page.currentPage,

16
src/views/distribution/inventory/distrilbutionBillLading.vue

@ -848,7 +848,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -1298,7 +1298,7 @@ export default {
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -1693,7 +1693,7 @@ export default {
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -2903,8 +2903,8 @@ export default {
let data = {
billLodingIds: this.$route.query.id,
};
console.log(data,'data');
console.log(data, 'data');
this.Selfpickuploading = true; //
$_distrilbutionBillLading(data)
.then(res => {
@ -3120,7 +3120,7 @@ export default {
}
console.log(submitFormData, '最后要提交的参数');
this.Selfpickuploading = true; //
add(submitFormData)
.then(res => {
this.Selfpickuploading = false; //
@ -3273,8 +3273,8 @@ export default {
console.log(_unBillPackageEntityList, '删除的');
up.billPackageEntityList = _billPackageEntityList;
up.unBillPackageEntityList = _unBillPackageEntityList;
console.log(this.data,'data===>>>');
console.log(this.data, 'data===>>>');
if (this.data?.length) {
up.consigneeUnit = this.data[0].marketName;
} else if (this.dataList?.length) {

23
src/views/distribution/inventory/distrilbutionBillLadingList.vue

@ -10,7 +10,6 @@
<el-form-item label="入库时间:" class="el-times">
<!-- <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
<el-date-picker
v-model="stockupDate"
type="daterange"
@ -76,9 +75,7 @@
@click="handleBillAdd"
>创建自提</el-button
>
<el-button type="primary" @click="pickupCancellation"
>批量取消</el-button
>
<el-button type="primary" @click="pickupCancellation">批量取消</el-button>
<!-- <el-button
type="primary"
icon="el-icon-plus"
@ -108,7 +105,7 @@
<!-- 列表模块 -->
<tablecmt
class="tableNode"
class="tableNode"
:columnList="columnList"
:tableData="data"
:loading="loading"
@ -266,14 +263,14 @@ import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
import { getToken } from '@/utils/auth';
import dayjs from 'dayjs';
import { downloadXls, handleClearTableQuery ,setNodeHeight} from '@/utils/util';
import { downloadXls, handleClearTableQuery, setNodeHeight } from '@/utils/util';
import { ElMessage, ElMessageBox } from 'element-plus';
import MyPrint from '@/components/MyPrint/MyPrint.vue';
export default {
name: '/distribution/inventory/distrilbutionBillLadingList',
data() {
return {
Deliverytime:[],//
Deliverytime: [], //
columnList: [
{
prop: '',
@ -309,7 +306,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -887,7 +884,7 @@ export default {
cancelButtonText: '取消',
type: 'warning',
})
.then(async() => {
.then(async () => {
//
let data = {
billLodingIds: '',
@ -895,7 +892,7 @@ export default {
data.billLodingIds = this.selectionList.map(res => res.id).join(',');
console.log(data, '处理好的值');
this.loading = true; //
await $_distrilbutionBillLading(data)
await $_distrilbutionBillLading(data)
.then(res => {
console.log(res, '批量取消车成功');
this.onLoad(this.page);
@ -1141,11 +1138,11 @@ export default {
params.startDate = startDate;
params.entDate = entDate;
}
if(this.Deliverytime?.length){
if (this.Deliverytime?.length) {
let startDate = this.Deliverytime[0];
let entDate = this.Deliverytime[1];
params.pickUpTimeStart = startDate;
params.pickUpTimeEnd = entDate
params.pickUpTimeEnd = entDate;
}
getListOwnNUm(params).then(res => {
@ -1158,7 +1155,7 @@ export default {
console.log(',.,.已签收', this.signedFor, '全部', this.sumTotal);
}
});
this.data=[]
this.data = [];
const res = await getListOwn(
page.currentPage,
page.pageSize,

4
src/views/distribution/inventory/distrilbutionBillLadingView.vue

@ -310,7 +310,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -665,7 +665,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

8
src/views/distribution/reservation/reservationAddFrom copy.vue

@ -620,7 +620,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -845,7 +845,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -1128,7 +1128,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -1418,7 +1418,7 @@ export default {
label: '订单自编码',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,

10
src/views/distribution/reservation/reservationAddFrom.vue

@ -539,7 +539,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -773,7 +773,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -1058,7 +1058,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -1347,7 +1347,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -1665,7 +1665,7 @@ export default {
label: '订单自编码',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,

6
src/views/distribution/reservation/reservationDetails.vue

@ -435,7 +435,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -628,7 +628,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -753,7 +753,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,

2
src/views/distribution/signdetail/distributionSigndetailCopy.vue

@ -349,7 +349,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

6
src/views/distribution/signfor/distributionSignforedt.vue

@ -832,7 +832,7 @@ const menuData1 = ref([
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -1081,7 +1081,7 @@ const menuData2 = ref([
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -1640,7 +1640,7 @@ const menuDataB1 = ref([
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/views/distribution/signfor/distributionSignforedtTT.vue

@ -737,7 +737,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,

2
src/views/distribution/signfor/distributionSignfortreat.vue

@ -1067,7 +1067,7 @@ export default {
label: '订单自编码',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

6
src/views/distribution/stockup/distributionStockupDetails.vue

@ -552,7 +552,7 @@ export default {
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,
@ -817,7 +817,7 @@ export default {
label: '订单编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -992,7 +992,7 @@ export default {
label: '订单编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

6
src/views/distribution/stockup/distributionStockupDetailsSelf.vue

@ -541,7 +541,7 @@ export default {
label: '订单编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -964,7 +964,7 @@ export default {
label: '订单自编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -1209,7 +1209,7 @@ export default {
label: '订单编号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

5269
src/views/mail/order/add.vue

File diff suppressed because it is too large Load Diff

2
src/views/mail/order/list.vue

@ -409,7 +409,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/views/warehouse/parcelList/distributionParcelList.vue

@ -257,7 +257,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
sortable: true,

4
src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue

@ -259,7 +259,7 @@ export default {
label: '订单自编码',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
@ -534,7 +534,7 @@ export default {
label: '订单号',
type: 1,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

8
src/views/warehouse/warehouseRetentionRecord/warehouseRetentionDetails.vue

@ -306,7 +306,7 @@ export default {
label: '订单自编号',
type: 4,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
search: true,
@ -473,7 +473,7 @@ export default {
label: '订单自编号',
type: 4,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
search: true,
@ -627,7 +627,7 @@ export default {
label: '订单自编号',
type: 4,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
search: true,
@ -750,7 +750,7 @@ export default {
label: '订单自编号',
type: 4,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: true,
search: true,

2
src/views/warehouse/warehouseStock/warehouseStock.vue

@ -152,7 +152,7 @@ export default {
label: '订单自编码',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

2
src/views/warehouse/warehouseWaybill.vue

@ -444,7 +444,7 @@ export default {
label: '订单号',
type: 2,
values: '',
width: '300',
width: '200',
checkarr: [],
fixed: false,
sortable: true,

4
src/views/waybill/CreateZeroOrder.vue

@ -487,7 +487,7 @@
:key="item"
>
<!-- 加减按钮 -->
<div style="width: 55px; flex: none" class="flex-c-c" v-if="query.zeroEditStatus === 1">
<div style="width: 55px; flex: none" class="flex-c-c" v-if="query.zeroEditStatus !== 0">
<el-button
v-if="index === 0"
@click="handleAdd"
@ -637,7 +637,7 @@
<div
style="width: 55px; flex: none"
class="flex-c-c"
v-if="query.zeroEditStatus === 1"
v-if="query.zeroEditStatus !== 0"
></div>
<div style="width: 230px; flex: none">合计</div>
<!-- 货物名称 -->

Loading…
Cancel
Save