朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 ffcd4e74300b62b08862d4fe1821d5190df63989 1 个父辈 df641460

进港业务申报界面优化

内嵌 并排对比
正在显示 6 个修改的文件 包含 426 行增加 和 229 行删除
... ... @@ -8,44 +8,36 @@
<el-row style="display: block;background-color: white;padding-left: 5px">
<el-row>
<el-col :span="6">
<span>
主单号
</span>
<el-input placeholder="" v-model="defaultQuery.awba" style="width: 150px">
<el-input placeholder="" v-model="defaultQuery.awba" style="width: 200px">
<template slot="prepend">主单号</template>
</el-input>
</el-col>
<el-col :span="6">
<span>
承运人
</span>
<el-input placeholder="" v-model="defaultQuery.carrier" style="width: 150px">
<el-input placeholder="" v-model="defaultQuery.carrier" style="width: 200px">
<template slot="prepend">承运人</template>
</el-input>
</el-col>
<el-col :span="6">
<span>
航班号
</span>
<el-input placeholder="" v-model="defaultQuery.flightno" style="width: 150px">
<el-input placeholder="" v-model="defaultQuery.flightno" style="width: 200px">
<template slot="prepend">航班号</template>
</el-input>
</el-col>
<el-col :span="6">
<span>
航班日期
</span>
<div class="ip">
航班日期 </div>
<el-date-picker
v-model="defaultQuery.flightdate"
value-format="yyyy-MM-dd"
type="date" style="width: 150px"
type="date" style="width: 130px"
placeholder="航班日期">
</el-date-picker>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<span>
业务状态
</span>
<el-select v-model="defaultQuery.status" placeholder="选择状态" style="width: 150px">
<div class="ip">
业务状态 </div>
<el-select v-model="defaultQuery.status" placeholder="选择状态" style="width: 120px">
<el-option
v-for="item in options"
:key="item.value"
... ... @@ -55,10 +47,9 @@
</el-select>
</el-col>
<el-col :span="6">
<span>
报文类型
</span>
<el-select v-model="defaultQuery.turntype" placeholder="报文类型" style="width: 150px">
<div class="ip">
报文类型 </div>
<el-select v-model="defaultQuery.turntype" placeholder="报文类型" style="width: 120px">
<el-option
v-for="item in options2"
:key="item.value"
... ... @@ -84,7 +75,8 @@
ref="multipleTable"
:data="tableData"
tooltip-effect="dark"
style="width: 100%">
style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
<el-table-column
fixed="left"
label="修改状态"
... ... @@ -158,9 +150,9 @@
</template>
</el-table-column>
<el-table-column
label="修改状态"
width="480">
label="修改状态" prop="operation" fixed="right" align="center" width="285">
<template slot-scope="scope">
<el-row type="flex" justify="space-between">
<el-button
v-if="scope.row.turntype=='MT6202'"
size="mini"
... ... @@ -177,14 +169,16 @@
v-if="scope.row.turntype=='MT6202'"
size="mini"
type="success"
@click="importEdit(scope.$index, scope.row)">编辑
@click="importEdit(scope.$index, scope.row)">编辑信息
</el-button>
<el-button
v-else
size="mini"
type="success"
@click="arriveEdit(scope.$index, scope.row)">编辑
@click="arriveEdit(scope.$index, scope.row)">编辑信息
</el-button>
</el-row>
<el-row type="flex" justify="space-between">
<el-button
v-if="scope.row.turntype=='MT6202'"
size="mini"
... ... @@ -209,15 +203,16 @@
size="mini"
type="danger"
:disabled="btDeleStatusFormater(scope.row.status)"
@click="importDel(scope.$index, scope.row)">申请分拨删除
@click="importDel(scope.$index, scope.row)">申请删除
</el-button>
<el-button
v-else
size="mini"
type="danger"
:disabled="btDeleStatusFormater(scope.row.status)"
@click="arriveDel(scope.$index, scope.row)">分拨运抵删除
@click="arriveDel(scope.$index, scope.row)">申请删除
</el-button>
</el-row>
</template>
</el-table-column>
</el-table>
... ... @@ -251,9 +246,11 @@
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="运单号" prop="awba">
<el-input disabled="" v-model="AruleForm.awba"></el-input>
<el-col :span="6">
<el-form-item label="" prop="awba">
<el-input disabled="" v-model="AruleForm.awba" style="width: 200px">
<template slot="prepend">运单号</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="15">
... ... @@ -268,28 +265,33 @@
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="承运人" prop="carrier">
<el-input disabled="" v-model="AruleForm.carrier"></el-input>
<el-form-item label="" prop="carrier">
<el-input disabled="" v-model="AruleForm.carrier" style="width: 200px">
<template slot="prepend">承运人</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="航班号" prop="flightno">
<el-input disabled="" v-model="AruleForm.flightno"></el-input>
<el-form-item label="" prop="flightno">
<el-input disabled="" v-model="AruleForm.flightno" style="width: 200px">
<template slot="prepend">航班号</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="航班日期" required>
<el-col :span="24">
<el-col :span="7">
<el-form-item label="" required>
<el-form-item prop="flightdate">
<el-date-picker disabled="" type="date" placeholder="选择日期" v-model="AruleForm.flightdate" style="width: 100%;"></el-date-picker>
<div class="ipt">
航班日期 </div>
<el-date-picker disabled="" type="date" placeholder="选择日期" v-model="AruleForm.flightdate" style="width: 130px;"></el-date-picker>
</el-form-item>
</el-col>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="海关关区" prop="customcode">
<el-col :span="24">
<el-select v-model="AruleForm.customcode" placeholder="请选择海关关区" style="width:100%">
<el-col :span="7">
<el-form-item label="" prop="customcode">
<div class="ipt">
海关关区 </div>
<el-select v-model="AruleForm.customcode" placeholder="请选择海关关区" style="width:120px">
<div v-if="dialogStatus === 'update'">
<el-option v-for="item in options3" :key="item.value" :label="item.label"
:value="item.value" ></el-option>
... ... @@ -299,48 +301,63 @@
:value="item.value" ></el-option>
</div>
</el-select>
</el-col>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="运抵件数" prop="turnpiece">
<el-form-item label="" prop="turnpiece">
<div v-if="dialogStatus === 'update'">
<el-input type="number" v-model="AruleForm.turnpiece"></el-input>
<el-input type="number" v-model="AruleForm.turnpiece" style="width: 200px">
<template slot="prepend">运抵件数</template>
</el-input>
</div>
<div v-else>
<el-input type="number" disabled="" v-model="AruleForm.turnpiece"></el-input>
<el-input type="number" disabled="" v-model="AruleForm.turnpiece" style="width: 200px">
<template slot="prepend">运抵件数</template>
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="运抵重量" prop="turnweight">
<el-form-item label="" prop="turnweight">
<div v-if="dialogStatus === 'update'">
<el-input type="number" v-model="AruleForm.turnweight"></el-input>
<el-input type="number" v-model="AruleForm.turnweight" style="width: 200px">
<template slot="prepend">运抵重量</template>
</el-input>
</div>
<div v-else>
<el-input type="number" disabled="" v-model="AruleForm.turnweight"></el-input>
<el-input type="number" disabled="" v-model="AruleForm.turnweight" style="width: 200px">
<template slot="prepend">运抵重量</template>
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="卸货地" prop="turnunloading">
<el-col :span="7">
<el-form-item label="" prop="turnunloading">
<div v-if="dialogStatus === 'update'">
<el-input v-model="AruleForm.turnunloading"></el-input>
<el-input v-model="AruleForm.turnunloading" style="width: 215px">
<template slot="prepend">卸货地</template>
</el-input>
</div>
<div v-else>
<el-input disabled="" v-model="AruleForm.turnunloading"></el-input>
<el-input disabled="" v-model="AruleForm.turnunloading" style="width: 215px">
<template slot="prepend">卸货地</template>
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="货物描述" prop="turnunloading">
<el-form-item label="" prop="turnunloading">
<div v-if="dialogStatus === 'update'">
<el-input v-model="AruleForm.goodsname"></el-input>
<el-input v-model="AruleForm.goodsname" style="width: 200px">
<template slot="prepend">货物描述</template>
</el-input>
</div>
<div v-else>
<el-input disabled="" v-model="AruleForm.goodsname"></el-input>
<el-input disabled="" v-model="AruleForm.goodsname" style="width: 200px">
<template slot="prepend">货物描述</template>
</el-input>
</div>
</el-form-item>
</el-col>
... ... @@ -360,8 +377,10 @@
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="运单号" prop="awba">
<el-input disabled="" v-model="IruleForm.awba"></el-input>
<el-form-item label="" prop="awba">
<el-input disabled="" v-model="IruleForm.awba" style="width: 200px">
<template slot="prepend">运单号</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="15">
... ... @@ -376,28 +395,33 @@
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="承运人" prop="carrier">
<el-input disabled="" v-model="IruleForm.carrier"></el-input>
<el-form-item label="" prop="carrier">
<el-input disabled="" v-model="IruleForm.carrier" style="width: 200px">
<template slot="prepend">运承运人单号</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="航班号" prop="flightno">
<el-input disabled="" v-model="IruleForm.flightno"></el-input>
<el-form-item label="" prop="flightno">
<el-input disabled="" v-model="IruleForm.flightno" style="width: 200px">
<template slot="prepend">航班号</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="航班日期" required>
<el-col :span="24">
<el-col :span="7">
<el-form-item label="" required>
<el-form-item prop="flightdate">
<el-date-picker disabled="" type="date" placeholder="选择日期" v-model="IruleForm.flightdate" style="width: 100%;"></el-date-picker>
<div class="ipt">
航班日期 </div>
<el-date-picker disabled="" type="date" placeholder="选择日期" v-model="IruleForm.flightdate" style="width: 130px;"></el-date-picker>
</el-form-item>
</el-col>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="海关关区" prop="customcode">
<el-col :span="24">
<el-select v-model="IruleForm.customcode" placeholder="请选择海关关区" style="width:100%">
<el-col :span="7">
<el-form-item label="" prop="customcode">
<div class="ipt">
海关关区 </div>
<el-select v-model="IruleForm.customcode" placeholder="请选择海关关区" style="width:120px">
<div v-if="dialogStatus === 'update'">
<el-option v-for="item in options3" :key="item.value" :label="item.label"
:value="item.value" ></el-option>
... ... @@ -407,68 +431,94 @@
:value="item.value" ></el-option>
</div>
</el-select>
</el-col>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="运抵件数" prop="turnpiece">
<el-form-item label="" prop="turnpiece">
<div v-if="dialogStatus === 'update'">
<el-input v-model="IruleForm.turnpiece"></el-input>
<el-input v-model="IruleForm.turnpiece" style="width: 200px">
<template slot="prepend">运抵件数</template>
</el-input>
</div>
<div v-else>
<el-input disabled="" v-model="IruleForm.turnpiece"></el-input>
<el-input disabled="" v-model="IruleForm.turnpiece" style="width: 200px">
<template slot="prepend">运抵件数</template>
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="运抵重量" prop="turnweight">
<el-form-item label="" prop="turnweight">
<div v-if="dialogStatus === 'update'">
<el-input v-model="IruleForm.turnweight"></el-input>
<el-input v-model="IruleForm.turnweight" style="width: 200px">
<template slot="prepend">运抵重量</template>
</el-input>
</div>
<div v-else>
<el-input disabled="" v-model="IruleForm.turnweight"></el-input>
<el-input disabled="" v-model="IruleForm.turnweight" style="width: 200px">
<template slot="prepend">运抵重量</template>
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="到达地" prop="turnunloading">
<el-col :span="7">
<el-form-item label="" prop="turnunloading">
<div v-if="dialogStatus === 'update'">
<el-input v-model="IruleForm.turnunloading"></el-input>
<el-input v-model="IruleForm.turnunloading" style="width: 200px">
<template slot="prepend">到达地</template>
</el-input>
</div>
<div v-else>
<el-input disabled="" v-model="IruleForm.turnunloading"></el-input>
<el-input disabled="" v-model="IruleForm.turnunloading" style="width: 200px">
<template slot="prepend">到达地</template>
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="拖车号" prop="pno">
<el-form-item label="" prop="pno">
<div v-if="dialogStatus === 'update'">
<el-input v-model="IruleForm.pno"></el-input>
<el-input v-model="IruleForm.pno" style="width: 200px">
<template slot="prepend">拖车号</template>
</el-input>
</div>
<div v-else>
<el-input disabled="" v-model="IruleForm.pno"></el-input>
<el-input disabled="" v-model="IruleForm.pno" style="width: 200px">
<template slot="prepend">拖车号</template>
</el-input>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="卸货地" prop="ext2">
<el-form-item label="" prop="ext2">
<div v-if="dialogStatus === 'update'">
<el-input v-model="IruleForm.ext2"></el-input>
<el-input v-model="IruleForm.ext2" style="width: 200px">
<template slot="prepend">卸货地</template>
</el-input>
</div>
<div v-else>
<el-input disabled="" v-model="IruleForm.ext2"></el-input>
<el-input disabled="" v-model="IruleForm.ext2" style="width: 200px">
<template slot="prepend">卸货地</template>
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="车辆所属" prop="ext1">
<el-form-item label="" prop="ext1">
<div v-if="dialogStatus === 'update'">
<el-input v-model="IruleForm.ext1"></el-input>
<el-input v-model="IruleForm.ext1" style="width: 200px">
<template slot="prepend">车辆所属</template>
</el-input>
</div>
<div v-else>
<el-input disabled="" v-model="IruleForm.ext1"></el-input>
<el-input disabled="" v-model="IruleForm.ext1" style="width: 200px">
<template slot="prepend">车辆所属</template>
</el-input>
</div>
</el-form-item>
</el-col>
... ... @@ -493,17 +543,44 @@
<el-row>
<el-dialog :title="'提交'+Reason[udStatus]+'信息'" :visible.sync="dialogFormVisible">
<el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm">
<el-form-item label="操作原因" prop="operreason">
<el-input type="textarea" v-model="Udform.operreason"></el-input>
</el-form-item>
<el-form-item label="操作人" prop="operperson">
<el-input v-model="Udform.operperson"></el-input>
</el-form-item>
<el-form-item label="联系电话" prop="opertel">
<el-input v-model="Udform.opertel"></el-input>
</el-form-item>
<!-- <el-form-item label="操作原因" prop="operreason">-->
<!-- <el-input type="textarea" v-model="Udform.operreason"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="操作人" prop="operperson">-->
<!-- <el-input v-model="Udform.operperson"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="联系电话" prop="opertel">-->
<!-- <el-input v-model="Udform.opertel"></el-input>-->
<!-- </el-form-item>-->
<el-row style="margin: 10px auto">
<el-col :span="22">
<el-form-item label="" prop="operreason">
<div class="ipt">
操作原因
</div>
<el-input autosize type="textarea" v-model="Udform.operreason" style="width: 80%">
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11" style="margin-right: 10px">
<el-form-item label="" prop="operperson">
<el-input v-model="Udform.operperson" style="width: 200px">
<template slot="prepend">操作人</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="" prop="opertel">
<el-input v-model="Udform.opertel" style="width: 250px">
<template slot="prepend">联系电话</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<div slot="footer" class="dialog-footer" style="margin-top: 30px" align="center">
<el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="deleteIdForm('Udform')">确 定</el-button>
</div>
... ... @@ -512,7 +589,8 @@
<!--明细列表弹出框-->
<el-row>
<el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%">
<el-table :data="gridData">
<el-table :data="gridData" style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" >
<el-table-column property="busdate" label="时间" width="160"></el-table-column>
<el-table-column property="username" label="操作人" width="130"></el-table-column>
<el-table-column property="buspiece" label="发送件数" width="130"></el-table-column>
... ... @@ -525,6 +603,38 @@
</el-container>
</template>
<style scoped>
.ip{
max-width: 100px;
margin-right: -6px;
display: inline-block;
background-color: #6F8294;
color: #ffffff;
border: 1px solid #DCDFE6;
vertical-align: middle;
padding: 5px 18px;
white-space: nowrap;
border-top-right-radius: 0px;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 0px;
font-size: 10px;
}
.ipt{
max-width: 100px;
margin-right: -4px;
display: inline-block;
background-color: #6F8294;
color: #ffffff;
border: 1px solid #DCDFE6;
vertical-align: middle;
padding: 0 18px;
white-space: nowrap;
border-top-right-radius: 0px;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 0px;
font-size: 10px;
}
.co{height: 36px;line-height: 36px;}
.co{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px}
.row-bg{background-color: white;padding:0px;}
... ... @@ -543,6 +653,7 @@
import {mapActions, mapGetters} from 'vuex'
import {loginedUserInfo} from "../../api/user";
export default{
name:'Allocatesearch',
data(){
return{
defaultQuery:{
... ...
... ... @@ -65,7 +65,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row class="row-bg">
<el-row>
<el-col :span="4" :offset="10">
<div class="grid-content">
<el-button type="primary" @click="submitForm('ruleForm')">下一步</el-button>
... ...
... ... @@ -72,7 +72,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row class="row-bg">
<el-row>
<el-col :span="4" :offset="10">
<div class="grid-content">
<el-button type="primary" @click="submitForm('ruleForm')">下一步</el-button>
... ...
... ... @@ -439,7 +439,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="9" style="margin-left: 55px">
<el-col :span="9">
<el-form-item label="" prop="customcode">
<div class="ip">
海关关区
... ... @@ -462,7 +462,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="9" style="margin-left: -35px">
<el-col :span="9" style="margin-left: -135px">
<el-form-item label="" prop="paymodel">
<div class="ip">
付费方式
... ... @@ -486,7 +486,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" style="margin-left: -10px">
<el-col :span="8">
<el-form-item label="" prop="goodsname">
<el-input v-model="ruleForm.goodsname" style="width: 250px">
<template slot="prepend">货物描述</template>
... ...
... ... @@ -24,10 +24,9 @@
<div class="grid-content">
<el-col :span="9">
<div class="grid-content">
<span>
主单号:
</span>
<el-input v-model="defaultQuery.awba" placeholder="请输入主单号" style="width: 180px"></el-input>
<el-input v-model="defaultQuery.awba" placeholder="请输入主单号" style="width: 250px">
<template slot="prepend">主单号</template>
</el-input>
</div>
</el-col>
<el-col :span="2"><div class="grid-content"><el-button type="primary" v-on:click="getMt5201List" size="mini">查询</el-button></div></el-col>
... ... @@ -46,7 +45,8 @@
:data="tableData"
tooltip-effect="dark"
v-loading="tableLoading"
style="width: 100%"
style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
@selection-change="handleSelectionChange"
row-key="uuid"
border
... ... @@ -125,39 +125,43 @@
<el-table-column
prop="operation"
label="操作"
width="550"
width="285"
show-overflow-tooltip>
<template slot-scope="scope">
<el-button
size="mini"
type="info"
@click="handleDetail(scope.$index, scope.row)">收发明细</el-button>
<el-button
v-if="scope.row.awbh==''||scope.row.awbh==null"
size="mini"
type="success"
@click="handleMain(scope.$index, scope.row)">编辑主单</el-button>
<el-button
v-else
size="mini"
type="success"
@click="handleFen(scope.$index, scope.row)">编辑分单
</el-button>
<el-button
size="mini"
type="primary"
:disabled="btSendStatusFormater(scope.row.status)"
@click="handleCreate(scope.$index, scope.row)">发送理货报</el-button>
<el-button
size="mini"
type="danger"
:disabled="btDeleStatusFormater(scope.row.status)"
@click="handleDelete(scope.$index, scope.row)">发送理货删除报</el-button>
<el-button
size="mini"
type="warning"
@click="UpdateStatus(scope.$index, scope.row)">更改状态
</el-button>
<el-row type="flex" justify="space-between">
<el-button
size="mini"
type="info"
@click="handleDetail(scope.$index, scope.row)">收发明细</el-button>
<el-button
v-if="scope.row.awbh==''||scope.row.awbh==null"
size="mini"
type="success"
@click="handleMain(scope.$index, scope.row)">编辑主单</el-button>
<el-button
v-else
size="mini"
type="success"
@click="handleFen(scope.$index, scope.row)">编辑分单
</el-button>
</el-row>
<el-row type="flex" justify="space-between">
<el-button
size="mini"
type="primary"
:disabled="btSendStatusFormater(scope.row.status)"
@click="handleCreate(scope.$index, scope.row)">发理货报</el-button>
<el-button
size="mini"
type="danger"
:disabled="btDeleStatusFormater(scope.row.status)"
@click="handleDelete(scope.$index, scope.row)">发删除报</el-button>
<el-button
size="mini"
type="warning"
@click="UpdateStatus(scope.$index, scope.row)">更改状态
</el-button>
</el-row>
</template>
</el-table-column>
</el-table>
... ... @@ -175,56 +179,68 @@
</el-col>
<el-row class="flightInfo">
<el-col :span="6">
<el-form-item label="运单号" prop="awba">
<el-form-item label="" prop="awba">
<div v-if="dialogStatus === 'update'">
<el-input disabled="" v-model="ruleForm.awba"></el-input>
<el-input disabled="" v-model="ruleForm.awba" style="width: 200px">
<template slot="prepend">运单号</template>
</el-input>
</div>
<div v-else>
<el-input v-model="ruleForm.awba"></el-input>
<el-input v-model="ruleForm.awba" style="width: 200px">
<template slot="prepend">运单号</template>
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="4" style="margin-right: -15px">
<div v-if="FenStatus === 'addAwbh'">
<el-form-item label="分单号" prop="awbh">
<el-input v-model="ruleForm.awbh"></el-input>
<el-form-item label="" prop="awbh">
<el-input v-model="ruleForm.awbh" style="width: 200px">
<template slot="prepend">分单号</template>
</el-input>
</el-form-item>
</div>
<div v-else>
<el-form-item style="display: none" label="分单号" prop="awbh">
<el-input v-model="ruleForm.awbh"></el-input>
<el-form-item style="display: none" label="" prop="awbh">
<el-input v-model="ruleForm.awbh" style="width: 200px">
<template slot="prepend">分单号</template>
</el-input>
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<el-form-item label="航班号" prop="flightno">
<el-input disabled="" v-model="ruleForm.flightno"></el-input>
<el-form-item label="" prop="flightno">
<el-input disabled="" v-model="ruleForm.flightno" style="width: 200px">
<template slot="prepend">航班号</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="航班日期" required>
<el-col :span="24">
<el-form-item prop="flightdate">
<el-col :span="9">
<el-form-item label="" required prop="flightdate">
<div class="ip">
航班日期 </div>
<el-date-picker disabled="" type="date" placeholder="选择日期" :clearable="false"
v-model="ruleForm.flightdate"
style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
style="width: 120px;"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row class="flightInfo">
<el-col :span="6">
<el-form-item label="起始站" prop="originstation">
<el-input disabled="" v-model="ruleForm.originstation" onkeyup="this.value=this.value.toUpperCase()"></el-input>
<el-form-item label="" prop="originstation">
<el-input style="width: 200px" disabled="" v-model="ruleForm.originstation" onkeyup="this.value=this.value.toUpperCase()">
<template slot="prepend">起始站</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="目的站" prop="destinationstation">
<el-input disabled="" v-model="ruleForm.destinationstation" onkeyup="this.value=this.value.toUpperCase()"></el-input>
<el-col :span="7">
<el-form-item label="" prop="destinationstation">
<el-input style="width: 200px" disabled="" v-model="ruleForm.destinationstation" onkeyup="this.value=this.value.toUpperCase()">
<template slot="prepend">目的站</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="2">
<el-button size="mini" type="primary" @click="dialogStatus==='create'?createData('ruleForm'):updateData('ruleForm')" style="float: right">保存</el-button>
</el-col>
</el-row>
... ... @@ -238,37 +254,48 @@
<el-row style="margin-bottom: 0px;">
<el-row class="product">
<el-col :span="6">
<el-form-item label="舱单件数" prop="pcs">
<el-input type="number" v-model="ruleForm.pcs"></el-input>
<el-form-item label="" prop="pcs">
<el-input type="number" v-model="ruleForm.pcs" style="width: 200px">
<template slot="prepend">舱单件数</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="舱单重量" prop="wei">
<el-input type="number" v-model="ruleForm.wei"></el-input>
<el-form-item label="" prop="wei">
<el-input type="number" v-model="ruleForm.wei" style="width: 200px">
<template slot="prepend">舱单重量</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="理货件数" prop="piece">
<el-input type="number" v-model="ruleForm.piece"></el-input>
<el-form-item label="" prop="piece">
<el-input type="number" v-model="ruleForm.piece" style="width: 200px">
<template slot="prepend">理货件数</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="理货重量" prop="weight">
<el-input type="number" v-model="ruleForm.weight"></el-input>
<el-form-item label="" prop="weight">
<el-input type="number" v-model="ruleForm.weight" style="width: 200px">
<template slot="prepend">理货重量</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-row>
<el-row class="flightInfo">
<el-col :span="6">
<el-form-item label="海关关区" prop="customcode">
<el-col :span="7">
<el-form-item label="" prop="customcode">
<div class="ip">
海关关区
</div>
<el-select v-model="ruleForm.customcode"
filterable
allow-create
default-first-option
remote
:remote-method="remoteMethod2"
:loading="loading" placeholder="请选择" style="display:inline">
:loading="loading" placeholder="请选择" style="width: 115px">
<el-option
v-for="item in customcodes"
:key="item.customcode"
... ... @@ -280,15 +307,16 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="卸货时间" required>
<el-col :span="24">
<el-col :span="12" style="margin-left: -45px">
<el-form-item label="" required>
<el-form-item prop="starttime">
<div class="ip">
卸货时间
</div>
<el-date-picker type="datetime" placeholder="选择日期" :clearable="false" value-format="yyyy-MM-dd HH:mm:ss"
v-model="ruleForm.starttime"
style="width: 100%;"></el-date-picker>
style="width: 200px;"></el-date-picker>
</el-form-item>
</el-col>
</el-form-item>
</el-col>
</el-row>
... ... @@ -311,7 +339,8 @@
<template>
<el-table
:data="tableData2"
style="width: 100%">
style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
<el-table-column
prop="awbh"
label="分单号"
... ... @@ -354,10 +383,10 @@
<el-col :span="2.5"><div class="grid-content"><el-button type="primary" v-on:click="addTally" size="mini">新增进港理货</el-button></div></el-col>
<el-col :span="2.5"><div class="grid-content"><el-button type="primary" size="mini" :disabled="batich" @click="batchdel()">批量发送删除报</el-button></div></el-col>
<el-col :span="2.5"><div class="grid-content"><el-button type="primary" size="mini" :disabled="batich" @click="batchaplly()">批量申请</el-button></div></el-col>
<el-col :span="2"><div class="grid-content"><el-button type="primary" @click="back" size="mini">返回</el-button></div></el-col>
<el-col :span="1.5"><div class="grid-content"><el-button type="primary" @click="back" size="mini">返回</el-button></div></el-col>
<el-col :span="2.5"><div class="grid-content"><span>主单数：{{sumNmmsCount}}</span></div></el-col>
<el-col :span="3.5"><div class="grid-content"><span>理货总件数：{{sumNmmsPrice}}</span></div></el-col>
<el-col :span="7"><div class="grid-content"><span>理货总重量：{{sumNmmsWeight}}</span></div></el-col>
<el-col :span="7.5"><div class="grid-content"><span>理货总重量：{{sumNmmsWeight}}</span></div></el-col>
</el-row>
<!--对话提示框-->
<el-row>
... ... @@ -377,17 +406,44 @@
<el-row>
<el-dialog :title="'提交'+Reason[udStatus]+'信息'" :visible.sync="dialogFormVisible">
<el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm">
<el-form-item label="操作原因" prop="operreason">
<el-input type="textarea" v-model="Udform.operreason"></el-input>
</el-form-item>
<el-form-item label="操作人" prop="operperson">
<el-input v-model="Udform.operperson"></el-input>
</el-form-item>
<el-form-item label="联系电话" prop="opertel">
<el-input v-model="Udform.opertel"></el-input>
</el-form-item>
<!-- <el-form-item label="操作原因" prop="operreason">-->
<!-- <el-input type="textarea" v-model="Udform.operreason"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="操作人" prop="operperson">-->
<!-- <el-input v-model="Udform.operperson"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="联系电话" prop="opertel">-->
<!-- <el-input v-model="Udform.opertel"></el-input>-->
<!-- </el-form-item>-->
<el-row style="margin: 10px auto">
<el-col :span="22">
<el-form-item label="" prop="operreason">
<div class="ip">
操作原因
</div>
<el-input autosize type="textarea" v-model="Udform.operreason" style="width: 80%">
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11" style="margin-right: 10px">
<el-form-item label="" prop="operperson">
<el-input v-model="Udform.operperson" style="width: 200px">
<template slot="prepend">操作人</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="" prop="opertel">
<el-input v-model="Udform.opertel" style="width: 250px">
<template slot="prepend">联系电话</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<div slot="footer" class="dialog-footer" style="margin-top: 30px" align="center">
<el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="deleteUdForm('Udform')">确 定</el-button>
</div>
... ... @@ -396,11 +452,12 @@
<!--明细列表弹出框-->
<el-row>
<el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%">
<el-table :data="gridData">
<el-table :data="gridData" style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
<el-table-column property="busdate" label="时间" width="160"></el-table-column>
<el-table-column property="username" label="操作人" width="130"></el-table-column>
<el-table-column property="buspiece" label="发送件数" width="130"></el-table-column>
<el-table-column property="busweight" label="发送重量" width="130"></el-table-column>
<el-table-column property="buspiece" label="发送件数" width="100"></el-table-column>
<el-table-column property="busweight" label="发送重量" width="100"></el-table-column>
<el-table-column property="cusrestext" label="回执内容"></el-table-column>
</el-table>
</el-dialog>
... ... @@ -409,6 +466,22 @@
</el-container>
</template>
<style scoped>
.ip{
max-width: 100px;
margin-right: -4px;
display: inline-block;
background-color: #6F8294;
color: #ffffff;
border: 1px solid #DCDFE6;
vertical-align: middle;
padding: 0 18px;
white-space: nowrap;
border-top-right-radius: 0px;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 0px;
font-size: 10px;
}
.grid-content{height: 36px;line-height: 36px;margin-right: 5px;}
.content{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px}
.row-bg,.co{background-color: white;}
... ... @@ -450,6 +523,7 @@
import {mapActions, mapGetters} from 'vuex'
import {loginedUserInfo} from "../../api/user";
export default {
name:'Tallymster',
data() {
return {
defaultQuery:{
... ...
... ... @@ -8,57 +8,51 @@
<el-row style="display: block;background-color: white">
<el-row>
<el-col :span="6">
<span>
主单号:
</span>
<el-input placeholder="" v-model="defaultQuery.awba" style="width: 150px">
<el-input placeholder="" v-model="defaultQuery.awba" style="width: 200px">
<template slot="prepend">主单号</template>
</el-input>
</el-col>
<el-col :span="6">
<span>
承运人:
</span>
<el-input placeholder="" v-model="vcarrier" style="width: 150px">
<el-input placeholder="" v-model="vcarrier" style="width: 200px">
<template slot="prepend">承运人</template>
</el-input>
</el-col>
<el-col :span="6">
<span>
航班号:
</span>
<el-input placeholder="" v-model="defaultQuery.flightno" style="width: 150px">
<el-input placeholder="" v-model="defaultQuery.flightno" style="width: 200px">
<template slot="prepend">航班号</template>
</el-input>
</el-col>
<el-col :span="6">
<span>
航班日期:
</span>
<div class="ip">
航班日期
</div>
<el-date-picker
v-model="defaultQuery.flightdate"
type="date"
value-format="yyyy-MM-dd" style="width: 150px"
value-format="yyyy-MM-dd" style="width: 120px"
placeholder="航班日期">
</el-date-picker>
</el-col>
</el-row>
<el-row >
<el-col :span="6">
<span>
业务状态:
</span>
<el-select v-model="defaultQuery.status" placeholder="选择状态" style="width: 140px">
<div class="ip">
业务状态
</div>
<el-select v-model="defaultQuery.status" placeholder="选择状态" style="width: 115px">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label" style="width: 140px"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-col>
<el-col :span="6">
<span>
报文类型:
</span>
<el-select v-model="defaultQuery.messageType" placeholder="报文类型" style="width: 140px">
<div class="ip">
报文类型
</div>
<el-select v-model="defaultQuery.messageType" placeholder="报文类型" style="width: 115px">
<el-option
v-for="item in options2"
:key="item.value"
... ... @@ -95,7 +89,8 @@
ref="multipleTable"
:data="tableData"
tooltip-effect="dark"
style="width: 100%"
style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
:default-sort = "{prop: 'date', order: 'descending'}"
@selection-change="handleSelectionChange">
<el-table-column
... ... @@ -227,6 +222,22 @@
</template>
<style scoped>
.ip{
max-width: 100px;
margin-right: -4px;
display: inline-block;
background-color: #6F8294;
color: #ffffff;
border: 1px solid #DCDFE6;
vertical-align: middle;
padding: 5px 18px;
white-space: nowrap;
border-top-right-radius: 0px;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 0px;
font-size: 10px;
}
.co{height: 36px;line-height: 36px;}
.co{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px}
.row-bg{background-color: white;padding:0px;}
... ... @@ -249,6 +260,7 @@
import {mapActions, mapGetters} from 'vuex'
import {loginedUserInfo} from "../../api/user";
export default {
name:'Waybill',
data() {
return {
defaultQuery:{
... ...