Skip to content

J
jiedao-app-operator-master
Commit ba38ec9b authored by zhoutong's avatar zhoutong
Browse files
Options

合包暂存

parent dd2cb199
Show whitespace changes
Inline Side-by-side
Showing with 159 additions and 27 deletions
src/views/ecw/box/indexAir.vue
View file @ ba38ec9b
......@@ -69,14 +69,18 @@
</template>
</el-table-column>
<el-table-column label="方数（预装/已装）" align="center" prop="squareNumber" />
<el-table-column label="重量（预装/已装）" align="center" prop="weight" />
<el-table-column :label="$t('状态')" align="center" prop="boxStatus">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BOX_SHIPMENT_STATUS" :value="scope.row.boxStatus" />
<el-table-column :label="$t('方数（预装/已装）')" align="center" prop="">
<template slot-scope="{row}">
{{row.boxStatistics.volume}}/{{row.boxStatistics.loadVolume}}
</template>
</el-table-column>
<el-table-column :label="$t('重量（预装/已装）')" align="center" prop="weight">
<template slot-scope="{row}">
{{row.boxStatistics.weight}}/{{row.boxStatistics.loadWeight}}
</template>
</el-table-column>
<el-table-column :label="$t('状态')" align="center" prop="shipmentStatusText" />
<el-table-column :label="$t('日期')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
......
src/views/ecw/box/shippingAir/nodePage/mergePkg/index.vue
View file @ ba38ec9b
<template>
<div>
<!-- 信息 -->
<el-card style="margin-top: 15px">
<el-descriptions :column="5" border>
<el-descriptions-item :label="$t('自编号')">{{ shipmentObj.selfNo }}</el-descriptions-item>
<el-row type="flex" style="margin-top: 15px; margin-bottom: 15px" justify="center">
<el-col :xs="24" :sm="24" :md="24" :lg="20" :xl="22">
<el-card>
<el-descriptions :column="4" border>
<el-descriptions-item :label="$t('自编号')">
{{shipmentObj.selfNo}}
</el-descriptions-item>
<el-descriptions-item :label="$t('运输方式')">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="shipmentObj.transportType" />
</el-descriptions-item>
<el-descriptions-item :label="$t('始发地')">
{{ importCityName(shipmentObj.startWarehouseId) }}
{{getCityName(shipmentObj.startWarehouseId)}}
</el-descriptions-item>
<el-descriptions-item :label="$t('目的地')">
{{ importCityName(shipmentObj.destWarehouseId) }}
{{getCityName(shipmentObj.destWarehouseId)}}
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-row style="margin-top: 15px">
<el-row>
<el-button size="small" type="primary" @click="addMergedialogVisible=true">{{$t('创建合箱')}}</el-button>
</el-row>
<el-row style="margin-top: 5px">
<el-table border :data="tallyList" @select="checkboxSelect" @select-all="checkboxSelect" max-height="600px">
<el-table-column type="selection" align="center" width="55" fixed="left" />
<el-table-column align="center" :label="$t('序号')" width="50" prop="tidanNum" />
<el-table-column :label="$t('订单号')" align="center" prop="orderNo">
<template slot-scope="scope">
<div>
{{scope.row.orderNo}}
</div>
<div style="color:blue;fontWeight:bold;">
{{ scope.row.isExternalWarehouse === 1 ? ('('+$t('外部仓')+')') : ''}}
</div>
<div style="color:red;fontWeight:bold;">
{{ scope.row.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}}
</div>
</template>
</el-table-column>
<el-table-column :label="$t('商品信息')" width="250px" align="center" prop="">
<template slot-scope="{row}">
{{$l(row,'prodTitle')}}
</template>
</el-table-column>
<el-table-column :label="$t('备案')" align="center" prop="feeType">
<template slot-scope="{row}">
<template v-if="row.brandName">{{row.brandName}}</template>
<dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" />
</template>
</el-table-column>
<el-table-column :label="$t('报关方式')" align="center" prop="customsType">
<template slot-scope="scope">
<div :class="scope.row.customsType !== 1 ? 'custom_type_red' : ''">
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
</div>
</template>
</el-table-column>
<el-table-column :label="$t('箱数')" align="center" prop="warehouseInInfo.cartonsNum">
<template slot-scope="scope">
<el-link type="primary" @click.native="showWarehouseLogs(scope.row)">
{{scope.row.warehouseInInfo.cartonsNum}}
</el-link>
<div style="color:blue;fontWeight:bold;">
{{ scope.row.multiSpecification === true ? '(多规格)' : ''}}
</div>
</template>
</el-table-column>
<el-table-column :label="$t('纸箱尺寸')" align="center" prop="warehouseInInfo.boxGauge">
</el-table-column>
<el-table-column :label="$t('体积')" align="center" prop="warehouseInInfo.volume">
</el-table-column>
<el-table-column :label="$t('重量')" align="center" prop="warehouseInInfo.weight">
</el-table-column>
<el-table-column :label="$t('数量（个）')" align="center" prop="quantity"></el-table-column>
<el-table-column :label="$t('储位')" align="center" prop="positionNo" width="250px">
<template slot-scope="scope">
{{notset(scope.row.positionNo)}}
</template>
</el-table-column>
<el-table-column :label="$t('状态')" align="center" prop="tallyStatus">
<template slot-scope="scope">
{{scope.row.tallyStatus === 1 ? $t('已理货') : $t('未理货')}}
</template>
</el-table-column>
<el-table-column :label="$t('理货时间')" align="center" prop="tallyTime">
<template slot-scope="scope">
{{formatDate(scope.row.tallyTime,'YYYY-MM-DD HH:mm:ss')}}
</template>
</el-table-column>
<el-table-column :label="$t('操作')" align="center" width="160" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button type="text" size="small" @click="tallyClick('single',scope.row)">{{$t('理货')}}</el-button>
<el-button type="text" size="small" @click="removeClick('single',scope.row)">{{$t('移出')}}</el-button>
</template>
</el-table-column>
</el-table>
</el-row>
</el-row>
<el-dialog custom-class="shipping-dialog" :title="$t('生成箱号')" :visible.sync="addMergedialogVisible" width="550px" :modal-append-to-body="false" append-to-body>
<el-form ref="addMergeForm" :model="addMergeForm" label-width="100px">
<el-form-item :label="$t('数量')" prop="num" :rules="[
{ required: true, message: this.$t('数量不能为空'), trigger: 'blur' }
]">
<el-input-number v-model="addMergeForm.num" :controls="false" :min="1" :precision="0" />
</el-form-item>
<el-form-item :label="$t('长')" prop="pkgLength">
<el-input-number v-model="addMergeForm.pkgLength" :controls="false" :precision="2" />
</el-form-item>
<el-form-item :label="$t('宽')" prop="pkgWidth">
<el-input-number v-model="addMergeForm.pkgWidth" :controls="false" :precision="2" />
</el-form-item>
<el-form-item :label="$t('高')" prop="pkgHight">
<el-input-number v-model="addMergeForm.pkgHight" :controls="false" :precision="2" />
</el-form-item>
</el-form>
<el-button size="small" type="primary" @click="addMerge">{{$t('确定')}}</el-button>
</el-dialog>
<el-row style="margin-top: 15px" class="operate-button">
<el-button size="small" type="primary" @click="tallyFinish">{{$t('完成理货')}}</el-button>
<el-button size="small" @click="cancel">{{$t('取消')}}</el-button>
</el-row>
</el-col>
</el-row>
</div>
</template>
......@@ -24,17 +134,35 @@ export default {
data() {
return {
// 出货信息
shipmentObj: this.$attrs.shipmentObj
shipmentObj: this.$attrs.shipmentObj,
addMergedialogVisible: false,
addMergeForm: {}
}
},
created() {
console.log(this.$attrs)
this.getList();
},
methods: {
computed: {
/* 获取仓库 */
importCityName(id) {
var arr = this.$attrs.warehouseList.filter((item) => item.id == id)
return arr.length > 0 ? this.$l(arr[0], 'title') : '/'
getCityName() {
return (id) => {
let arr = this.$attrs.warehouseList.filter((item) => item.id == id);
return arr.length > 0 ? this.$l(arr[0], "title") : this.$t("无");
};
},
},
methods: {
getList(){
getMergePkgList()
},
addMerge() {
this.$refs['addMergeForm'].validate((valid) => {
if (!valid) {
return
}
this.addMergeForm.shipmentId = this.$attrs.shipmentObj.id
createMergePkg(this.addMergeForm)
})
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment