Skip to content

J
jiedao-app-operator-master
Commit da68387c authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

拆单线上反馈优化

parent a70a22c0
Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 123 deletions
src/views/ecw/order/splitApply/components/WarehouseRecord.vue
View file @ da68387c
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<el-table-column :label="$t('体积') + '(m³)'" prop="volume" /> <el-table-column :label="$t('体积') + '(m³)'" prop="volume" />
<el-table-column :label="$t('重量') + '(kg)'" prop="weight" /> <el-table-column :label="$t('重量') + '(kg)'" prop="weight" />
<el-table-column :label="$t('数量（个）')" prop="quantity" /> <el-table-column :label="$t('数量（个）')" prop="quantity" />
<!--<el-table-column :label="$t('入仓快递单号')" prop="expressNo" />--> <el-table-column :label="$t('入仓快递单号')" prop="expressNo" />
<!--<el-table-column :label="$t('首次入仓时间')" prop="inTime" > <!--<el-table-column :label="$t('首次入仓时间')" prop="inTime" >
<template slot-scope="{row}">{{row.inTime|parseTime}}</template> <template slot-scope="{row}">{{row.inTime|parseTime}}</template>
</el-table-column>--> </el-table-column>-->
......
src/views/ecw/order/splitApply/index.vue
View file @ da68387c
...@@ -5,10 +5,6 @@ ...@@ -5,10 +5,6 @@
<div slot="header" class="card-title">{{$t('拆单申请')}}-{{orderData.orderNo||''}}</div> <div slot="header" class="card-title">{{$t('拆单申请')}}-{{orderData.orderNo||''}}</div>
<div class="btn-header"> <div class="btn-header">
<span class="card-title">{{$t('原单信息')}}</span> <span class="card-title">{{$t('原单信息')}}</span>
<div>
<span v-if="orderData.abnormalState!=0" class="red">{{$t('异常无法拆单')}}</span>
<el-button v-else type="primary" @click="addSplit" :disabled="orderData.inWarehouseState==207">{{$t('新建拆单')}} </el-button>
</div>
</div> </div>
<el-descriptions :column="4"> <el-descriptions :column="4">
<el-descriptions-item :label="$t('唛头')"> <el-descriptions-item :label="$t('唛头')">
...@@ -128,92 +124,101 @@ ...@@ -128,92 +124,101 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<el-card class="card" v-if="splitData.length>0"> <el-card class="card">
<!-- 列表 --> <!-- 列表 -->
<div slot="header" class="card-title">{{$t('拆单信息')}}</div> <div slot="header" class="card-title flex">
<div v-for="(item, index) in splitData" :key="index"> <div style="flex: 1; display: flex; align-items: center">{{$t('拆单信息')}}</div>
<div class="btn-header"> <div>
<div> <span v-if="orderData.abnormalState!=0" class="red">{{$t('异常无法拆单')}}</span>
<p class="card-info"> <el-button v-else type="primary" @click="addSplit" :disabled="orderData.inWarehouseState==207">{{$t('新建拆单')}} </el-button>
<span class="card-title">
{{item.orderNo}}
</span>
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="item.transportId" />
<span>{{$t('发往')}}：{{importCityName(item.dstWarehouseId)}}</span>
</p>
</div>
<div>
<el-button type="primary" @click="addShop(index)">{{$t('放入')}}</el-button>
<el-button :disabled="index < splitData.length - 1" type="primary" plain @click="deleteSplit(item.id)">{{$t('删除')}}</el-button>
</div>
</div> </div>
<el-table v-if="item.orderSplitItemBackVOList" border :data="item.orderSplitItemBackVOList"> </div>
<el-table-column :label="$t('序号')" align="center" prop="id" type="index"> <template v-if="splitData.length>0">
<template slot-scope="scope"> <div v-for="(item, index) in splitData" :key="index">
<span>{{scope.$index + 1}}</span> <div class="btn-header">
</template> <div>
</el-table-column> <p class="card-info">
<el-table-column :label="$t('中文名')" align="center" prop="prodTitleZh" /> <span class="card-title">
<el-table-column :label="$t('英文名')" align="center" prop="prodTitleEn" /> {{item.orderNo}}
<el-table-column :label="$t('品牌')" align="center"> </span>
<template slot-scope="scope"> <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="item.transportId" />
<template v-if="scope.row.brandName">{{scope.row.brandName}}</template> <span>{{$t('发往')}}：{{importCityName(item.dstWarehouseId)}}</span>
<dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.feeType" /> </p>
</template> </div>
</el-table-column> <div>
<el-button type="primary" @click="addShop(index)">{{$t('放入')}}</el-button>
<el-button :disabled="index < splitData.length - 1" type="primary" plain @click="deleteSplit(item.id)">{{$t('删除')}}</el-button>
</div>
</div>
<el-table v-if="item.orderSplitItemBackVOList" border :data="item.orderSplitItemBackVOList">
<el-table-column :label="$t('序号')" align="center" prop="id" type="index">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('中文名')" align="center" prop="prodTitleZh" />
<el-table-column :label="$t('英文名')" align="center" prop="prodTitleEn" />
<el-table-column :label="$t('品牌')" align="center">
<template slot-scope="scope">
<template v-if="scope.row.brandName">{{scope.row.brandName}}</template>
<dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.feeType" />
</template>
</el-table-column>
<el-table-column :label="$t('入仓体积')" align="center" > <el-table-column :label="$t('入仓体积')" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.volume}}m³ {{scope.row.volume}}m³
</template> </template>
</el-table-column>
<el-table-column :label="$t('收费体积')" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.chargeVolume" @change="updateField(scope.row, 'chargeVolume')" size="mini" disabled>
<span slot="append">m³</span>
</el-input>
</template>
</el-table-column>
<el-table-column :label="$t('入仓重量')" align="center">
<template slot-scope="scope">
{{scope.row.weight}}kg
</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('收费重量')" align="center"> <el-table-column :label="$t('收费体积')" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.chargeWeight" @change="updateField(scope.row, 'chargeWeight')" size="mini" disabled> <el-input v-model="scope.row.chargeVolume" @change="updateField(scope.row, 'chargeVolume')" size="mini" disabled>
<span slot="append">kg</span> <span slot="append">m³</span>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('货值')" align="center"> <el-table-column :label="$t('入仓重量')" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.worth" @change="updateField(scope.row, 'worth')" size="mini" disabled> {{scope.row.weight}}kg
<span slot="append">{{ $t('元') }}</span> </template>
</el-input> </el-table-column>
</template> <el-table-column :label="$t('收费重量')" align="center">
</el-table-column> <template slot-scope="scope">
<el-table-column :label="$t('箱数')" align="center" prop="num"> <el-input v-model="scope.row.chargeWeight" @change="updateField(scope.row, 'chargeWeight')" size="mini" disabled>
<template slot-scope="scope"> <span slot="append">kg</span>
<el-button type="text" @click="currentWarehouseRecord=scope.row.specsRecordVOList"> </el-input>
{{ scope.row.num }} </template>
</el-button> </el-table-column>
</template> <el-table-column :label="$t('货值')" align="center">
</el-table-column> <template slot-scope="scope">
<el-table-column :label="$t('数量(个)')" align="center" prop="quantity"></el-table-column> <el-input v-model="scope.row.worth" @change="updateField(scope.row, 'worth')" size="mini" disabled>
<el-table-column :label="$t('操作')" align="center"> <span slot="append">{{ $t('元') }}</span>
<template slot-scope="scope"> </el-input>
<el-button size="mini" type="text" icon="el-icon-delete" @click="removeShop(scope.row.id)">{{$t('移出')}}</el-button> </template>
</template> </el-table-column>
</el-table-column> <el-table-column :label="$t('箱数')" align="center" prop="num">
</el-table> <template slot-scope="scope">
</div> <el-button type="text" @click="currentWarehouseRecord=scope.row.specsRecordVOList">
{{ scope.row.num }}
</el-button>
</template>
</el-table-column>
<el-table-column :label="$t('数量(个)')" align="center" prop="quantity"></el-table-column>
<el-table-column :label="$t('操作')" align="center">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-delete" @click="removeShop(scope.row.id)">{{$t('移出')}}</el-button>
</template>
</el-table-column>
</el-table>
</div>
</template>
<el-empty v-else></el-empty>
</el-card> </el-card>
<work-flow xmlkey="split_order" v-model="selectedUsers"></work-flow> <work-flow xmlkey="split_order" v-model="selectedUsers"></work-flow>
<div slot="footer" class="card footer_btn" v-if="orderData.abnormalState==0"> <div slot="footer" class="card footer_btn" v-if="orderData.abnormalState==0">
<template v-if="orderData.inWarehouseState!=207"> <template v-if="orderData.inWarehouseState!=207">
<el-button type="primary" @click="submitForm">{{$t('提交申请')}}</el-button> <el-button type="primary" @click="submitForm">{{$t('提交申请')}}</el-button>
<el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button> <el-button plain type="primary" @click="cancel">{{$t('取消')}}</el-button>
<el-button type="primary" @click="reset">{{$t('重置')}}</el-button> <el-button type="primary" @click="reset">{{$t('重置')}}</el-button>
</template> </template>
<template v-else> <template v-else>
...@@ -259,17 +264,22 @@ ...@@ -259,17 +264,22 @@
<el-option v-for="item in orderData.orderItemVOList" :label="item.prodTitleEn" :value="item.orderItemId" :key="item.prodTitleEn" ></el-option> <el-option v-for="item in orderData.orderItemVOList" :label="item.prodTitleEn" :value="item.orderItemId" :key="item.prodTitleEn" ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<div class="page-title">{{$t('品名可拆数据')}}</div> <el-card>
<div class="pl-20"> <div slot="header" class="page-title">{{$t('品名可拆数据')}}</div>
<span class="mr-10">{{$t('箱数')}}：{{ leftData.num || 0 }}</span> <div class="pl-20">
<span class="mr-10">{{ $t('入仓方数') }}：{{ leftData.volume || 0 }}m³</span> <span class="mr-10">{{$t('箱数')}}：{{ leftData.num || 0 }}</span>
<span class="mr-10">{{ $t('收费方数') }}：{{ leftData.chargeVolume || 0 }}m³</span> <span class="mr-10">{{ $t('入仓方数') }}：{{ leftData.volume || 0 }}m³</span>
<span class="mr-10">{{ $t('入仓重量') }}：{{ leftData.weight || 0 }}kg</span> <span class="mr-10">{{ $t('收费方数') }}：{{ leftData.chargeVolume || 0 }}m³</span>
<span class="mr-10">{{ $t('收费重量') }}：{{ leftData.chargeWeight || 0 }}kg</span> <span class="mr-10">{{ $t('入仓重量') }}：{{ leftData.weight || 0 }}kg</span>
<span class="mr-10">{{ $t('数量(个)') }}：{{ leftData.quantity || 0 }}</span> <span class="mr-10">{{ $t('收费重量') }}：{{ leftData.chargeWeight || 0 }}kg</span>
<span class="mr-10">{{ $t('剩余货值') }}：{{ leftData.worth || 0 }}{{ $t('元') }}</span> <span class="mr-10">{{ $t('数量(个)') }}：{{ leftData.quantity || 0 }}</span>
</div> <span class="mr-10">{{ $t('剩余货值') }}：{{ leftData.worth || 0 }}{{ $t('元') }}</span>
<div class="page-title">{{$t('可拆入仓记录')}}</div> </div>
</el-card>
<el-card class="mt-10">
<div slot="header" class="page-title">{{$t('可拆入仓记录')}}</div>
<el-table <el-table
:data="getOrderItemWarehouseIn(shopForm.orderItemId)" :data="getOrderItemWarehouseIn(shopForm.orderItemId)"
style="width: 100%"> style="width: 100%">
...@@ -328,13 +338,15 @@ ...@@ -328,13 +338,15 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="flex-between mt-20 mb-10"> </el-card>
<div class="page-title" style="margin: 0"> <el-card class="mt-10">
{{$t('已放入入仓记录')}} <div slot="header" class="flex-between mt-20 mb-10">
<div class="page-title" style="margin: 0">
{{$t('已放入入仓记录')}}
</div>
<el-button type="danger" size="mini" @click="clearAll">清空放入数据</el-button>
</div> </div>
<el-button type="danger" size="mini" @click="clearAll">清空放入数据</el-button> <el-table
</div>
<el-table
:data="shopForm.specsRecordVOList" :data="shopForm.specsRecordVOList"
style="width: 100%"> style="width: 100%">
<el-table-column :label="$t('箱数')" width="200px"> <el-table-column :label="$t('箱数')" width="200px">
...@@ -384,29 +396,34 @@ ...@@ -384,29 +396,34 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card>
<el-card class="mt-10">
<div slot="header" class="page-title">放入数据</div>
<div>
<div class="pl-20 mb-10">
<span class="mr-10">{{$t('箱数')}}：{{ putin.num || 0 }}，</span>
<span class="mr-10">{{ $t('数量(个)') }}：{{ putin.quantity || 0 }}，</span>
<span class="mr-10">{{ $t('入仓方数') }}：{{ putin.volume || 0 }}m³， </span>
<span class="mr-10">{{ $t('入仓重量') }}：{{ putin.weight || 0 }}kg</span>
</div>
<el-form-item :label="$t('收费方数')" prop="chargeVolume">
<el-input-number v-model="shopForm.chargeVolume" controls-position="right"></el-input-number>m³
</el-form-item>
<el-form-item :label="$t('收费重量')" prop="chargeWeight">
<el-input-number v-model="shopForm.chargeWeight" controls-position="right"></el-input-number>kg
</el-form-item>
<div class="page-title">放入数据</div> <el-form-item :label="$t('放入货值')">
<div class="pl-20 mb-10"> <el-input-number v-model="shopForm.worth" controls-position="right" :min="0" :max="mainOrderItem.worth">
<span class="mr-10">{{$t('箱数')}}：{{ putin.num || 0 }}，</span> <template slot="append">{{ $t('元') }}</template>
<span class="mr-10">{{ $t('数量(个)') }}：{{ putin.quantity || 0 }}，</span> </el-input-number>
<span class="mr-10">{{ $t('入仓方数') }}：{{ putin.volume || 0 }}m³， </span> </el-form-item>
<span class="mr-10">{{ $t('入仓重量') }}：{{ putin.weight || 0 }}kg</span> <el-form-item :label="$t('备注信息')">
</div> <el-input v-model="shopForm.remark"></el-input>
<el-form-item :label="$t('收费方数')" prop="chargeVolume"> </el-form-item>
<el-input-number v-model="shopForm.chargeVolume" controls-position="right"></el-input-number>m³ </div>
</el-form-item> </el-card>
<el-form-item :label="$t('收费重量')" prop="chargeWeight">
<el-input-number v-model="shopForm.chargeWeight" controls-position="right"></el-input-number>kg
</el-form-item>
<el-form-item :label="$t('放入货值')">
<el-input-number v-model="shopForm.worth" controls-position="right" :min="0" :max="mainOrderItem.worth">
<template slot="append">{{ $t('元') }}</template>
</el-input-number>
</el-form-item>
<el-form-item :label="$t('备注信息')">
<el-input v-model="shopForm.remark"></el-input>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="shopAdd" :disabled="!shopForm.specsRecordVOList || !shopForm.specsRecordVOList.length">{{$t('确定')}}</el-button> <el-button type="primary" @click="shopAdd" :disabled="!shopForm.specsRecordVOList || !shopForm.specsRecordVOList.length">{{$t('确定')}}</el-button>
...@@ -968,10 +985,10 @@ export default { ...@@ -968,10 +985,10 @@ export default {
}) })
that.open = false that.open = false
}, },
cancel(){ /*cancel(){
this.open = false this.open = false
this.form = {} this.form = {}
}, },*/
shopAdd(){ shopAdd(){
this.$refs["shopForm"].validate(valid => { this.$refs["shopForm"].validate(valid => {
if (!valid) { if (!valid) {
...@@ -1146,14 +1163,22 @@ export default { ...@@ -1146,14 +1163,22 @@ export default {
}, },
// 重置 // 重置
reset(){ reset(){
deleteAllSplit(this.queryParams.orderId).then(res => { return deleteAllSplit(this.queryParams.orderId).then(res => {
this.getList() this.getList()
}) })
},
// 取消
async cancel(){
await this.reset()
this.$store.dispatch('tagsView/delCurrentView')
} }
} }
} }
</script> </script>
<style scoped> <style scoped>
.page-title{
margin: 0;
}
.card-title{ .card-title{
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
......
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