Browse Source

修改部分干线bug

dev-xx
qb 10 months ago
parent
commit
f3b8bdfe2b
  1. 20
      src/option/waybill/ChangeOrder.js
  2. 1193
      src/views/basicdata/vehicle/basicdataVehicle2.vue
  3. 4
      src/views/distribution/artery/AddVehicleStowage.vue
  4. 11
      src/views/distribution/inventory/distrilbutionBillLadingList.vue

20
src/option/waybill/ChangeOrder.js

@ -187,16 +187,16 @@ export const columnList = [
// fixed: false, // fixed: false,
// sortable: true, // sortable: true,
// }, // },
{ // {
prop: '', // prop: '',
label: '操作', // label: '操作',
type: 6, // type: 6,
values: '', // values: '',
width: '200', // width: '200',
checkarr: [], // checkarr: [],
fixed: 'right', // fixed: 'right',
sortable: false, // sortable: false,
}, // },
]; ];
export const viewColumnList = [ export const viewColumnList = [

1193
src/views/basicdata/vehicle/basicdataVehicle2.vue

File diff suppressed because it is too large Load Diff

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

@ -74,6 +74,10 @@
<el-option <el-option
v-for="val in details.options" v-for="val in details.options"
:key="val.warehouseName" :key="val.warehouseName"
:disabled="
details.nodeInfoData.findIndex(value => value.nodeId === val.warehouseId) !==
-1
"
:label="val.warehouseName" :label="val.warehouseName"
:value="val.warehouseId" :value="val.warehouseId"
/> />

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

@ -257,13 +257,22 @@ export default {
columnList: [ columnList: [
{ {
prop: '', prop: '',
label: '序号', label: '复选框',
type: 0, type: 0,
values: '', values: '',
width: 55, width: 55,
checkarr: [], checkarr: [],
fixed: true, fixed: true,
}, },
{
prop: '',
label: '序号',
type: 12,
values: '',
width: 55,
checkarr: [],
fixed: true,
},
{ {
prop: 'pickupBatch', prop: 'pickupBatch',
label: '提货批次', label: '提货批次',

Loading…
Cancel
Save