朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 2b2651d665a75cabddd3d9f1279d73e871c62873 1 个父辈 b8409bb2

快邮舱单申报 主分单编辑 分单显示

内嵌 并排对比
正在显示 2 个修改的文件 包含 130 行增加 和 41 行删除
... ... @@ -9,5 +9,9 @@ export const getExpressList = params => { return axios.get(`${baseUrl}/list`, {
export const awbaAdd = params => { return http.post(`${baseUrl}/awbaAdd`,params)};
export const awbahAdd = params => { return http.post(`${baseUrl}/awbhAdd`,params)};
export const awbaEdit = params => { return http.put(`${baseUrl}/awbaEdit`,params)};
export const awbhAdd = params => { return http.post(`${baseUrl}/awbhAdd`,params)};
export const awbhEdit = params => { return http.put(`${baseUrl}/awbhEdit`,params)};
... ...
... ... @@ -21,7 +21,7 @@
<el-button type="primary" @click="getList()">查询</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="expressAdd()">新增</el-button>
<el-button type="primary" @click="expressAdd()">新增主单</el-button>
</el-form-item>
</el-form>
</el-col>
... ... @@ -32,40 +32,36 @@
border
v-loading="listLoading"
lazy
:load="load"
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column prop="billno" label="主单号" width="180">
</el-table-column>
<el-table-column prop="voyageno" label="运输工具航次(班)号" width="180">
<el-table-column prop="assbillno" label="分单号" width="180">
</el-table-column>
<el-table-column prop="ieflag" label="进出口标识">
<el-table-column prop="flightNo" label="航班号" width="180">
</el-table-column>
<el-table-column prop="trafcnname" label="运输工具中文名称">
<el-table-column prop="flightDate" label="航班日期" width="180">
</el-table-column>
<el-table-column prop="trafenname" label="运输工具英文名称">
<el-table-column prop="maingname" label="分单主商品名称" width="180">
</el-table-column>
<el-table-column prop="ieflag" label="进出口标识" width="100px">
</el-table-column>
<el-table-column prop="grosswt" label="毛重">
</el-table-column>
<el-table-column prop="packno" label="件数">
</el-table-column>
<el-table-column prop="billnum" label="分运单总数">
</el-table-column>
<el-table-column prop="iedate" label="进出口日期">
</el-table-column>
<el-table-column prop="ieport" label="进出口岸代码">
<el-table-column prop="billnum" label="分运单总数" width="100px">
</el-table-column>
<el-table-column prop="tradename" label="经营单位名称">
<el-table-column prop="iedate" label="进出口日期" width="100px">
</el-table-column>
<el-table-column prop="inputopname" label="录入人姓名">
</el-table-column>
<el-table-column prop="inputcompanyname" label="录入单位名称">
</el-table-column>
<el-table-column label="操作" min-width="150">
<el-table-column label="操作" min-width="300px">
<template slot-scope="scope">
<el-button type="primary" size="small" v-if="scope.row.ext1 == 'awba'" @click="expressAwbhAdd(scope.$index, scope.row)">新增分单</el-button>
<el-button type="primary" size="small" v-if="scope.row.ext1 == 'awba'" @click="expressEditAwbaAdd(scope.$index, scope.row)">编辑主单</el-button>
<el-button type="primary" size="small" v-else @click="expressEditAwbhAdd(scope.$index, scope.row)">编辑分单</el-button>
</template>
</el-table-column>
</el-table>
... ... @@ -83,7 +79,7 @@
</el-pagination>
</el-col>
<!--新增主单弹框-->
<el-dialog title="快邮舱单主单新增" :visible.sync="expressAwbaAddVisible" width="60%">
<el-dialog :title="'快邮舱单'+awbatitle[dialogCommon]" :visible.sync="expressAwbaAddVisible" width="60%">
<el-form :model="expressAwbaAddModel" :rules="expressAwbaRules" ref="expressAwbaAddModel" >
<el-row>
<el-col :span="8">
... ... @@ -183,7 +179,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="经营单位名称" :label-width="expressAddlWidth" prop="tradename">
<el-input style="width: 80%" v-model="expressAwbaAddModel.tradename" autocomplete="off"></el-input>
<el-input style="width: 80%" type="textarea" v-model="expressAwbaAddModel.tradename" autocomplete="off"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -207,18 +203,18 @@
<el-row>
<el-col :span="8">
<el-form-item label="录入单位名称" :label-width="expressAddlWidth" prop="inputcompanyname">
<el-input style="width: 80%" v-model="expressAwbaAddModel.inputcompanyname" autocomplete="off"></el-input>
<el-input style="width: 80%" type="textarea" v-model="expressAwbaAddModel.inputcompanyname" autocomplete="off"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="expressAwbaAddVisible = false">取消</el-button>
<el-button type="primary" @click="expressAwbaAddSubmit()">提交</el-button>
<el-button type="primary" @click="dialogCommon=='add'?expressAwbaAddSubmit():expressAwbaEditSubmit()">提交</el-button>
</div>
</el-dialog>
<!--新增分单弹框-->
<el-dialog title="快邮舱单分单新增" :visible.sync="expressAwbhAddVisible" width="60%">
<el-dialog :title="'快邮舱单'+awbhtitle[dialogCommon]" :visible.sync="expressAwbhAddVisible" width="60%">
<el-form :model="expressAwbhAddModel" :rules="expressAwbhRules" ref="expressAwbhAddModel" >
<el-row>
<el-col :span="8">
... ... @@ -279,14 +275,14 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="expressAwbhAddVisible = false">取消</el-button>
<el-button type="primary" @click="expressAwbhAddSubmit()">提交</el-button>
<el-button type="primary" @click="dialogCommon=='add'?expressAwbhAddSubmit():expressAwbhEditSubmit()">提交</el-button>
</div>
</el-dialog>
</section>
</template>
<script>
import {getExpressList, awbaAdd, awbahAdd} from '../../api/express/express'
import {getExpressList, awbaAdd, awbaEdit, awbhAdd, awbhEdit} from '../../api/express/express'
import loginUserInfo from "../../api/base";
export default {
name: "express",
... ... @@ -436,7 +432,16 @@
tradecurr:"",
userid:"",
userName:"",
}
},
awbatitle:{
add:'主单新增',
edit:'主单编辑'
},
awbhtitle:{
add:'分单新增',
edit:'分单编辑'
},
dialogCommon: ''
}
},
methods: {
... ... @@ -461,16 +466,6 @@
this.listLoading = false;
});
},
/**
* 分单懒加载
*/
load(tree, treeNode, resolve) {
setTimeout(() => {
resolve([
])
}, 1000)
},
/**
* 多选单选
* @param val
... ... @@ -493,16 +488,16 @@
* 新增主单页面
*/
expressAdd(){
this.expressAwbaAddVisible = true
this.dialogCommon = 'add';
this.expressAwbaAddVisible = true;
if (this.$refs.expressAwbaAddModel != undefined){
this.$refs.expressAwbaAddModel.resetFields();
}
},
/**
* 新增提交
* 主单新增提交
*/
expressAwbaAddSubmit(){
this.$refs.expressAwbaAddModel.validate((valid) => {
if (valid) {
this.$confirm('确认提交吗？', '提示', {}).then(() => {
... ... @@ -534,9 +529,53 @@
});
},
/**
* 主单编辑
*/
expressEditAwbaAdd(index, row){
if (this.$refs.expressAwbhAddModel != undefined){
this.$refs.expressAwbhAddModel.resetFields();
}
this.dialogCommon = 'edit';
this.expressAwbaAddVisible = true;
this.expressAwbaAddModel = Object.assign({}, row);
},
/**
* 主单编辑提交
*/
expressAwbaEditSubmit(){
this.$refs.expressAwbaAddModel.validate((valid) => {
if (valid) {
this.$confirm('确认提交吗？', '提示', {}).then(() => {
//NProgress.start();
this.listLoading = true;
let para = Object.assign({}, this.expressAwbaAddModel);
awbaEdit(para).then((res) => {
if (res.data.code == 200){
this.$message({
message: '提交成功',
type: 'success'
});
this.$refs.expressAwbaAddModel.resetFields();
this.expressAwbaAddVisible = false;
this.getList();
}else {
this.$message({
message: '提交失败',
type: 'error'
});
}
}).catch(error => alert(error));
}).catch(() =>{
});
}
});
},
/**
* 新增分单页面
*/
expressAwbhAdd(index, row){
this.dialogCommon = 'add'
this.expressAwbhAddModel.billno = row.billno;
this.expressAwbhAddModel.flightNo = row.flightNo;
this.expressAwbhAddModel.flightDate = row.flightDate;
... ... @@ -545,6 +584,7 @@
if (this.$refs.expressAwbhAddModel != undefined){
this.$refs.expressAwbhAddModel.resetFields();
}
},
/**
* 新增分单提交
... ... @@ -558,7 +598,7 @@
this.expressAwbhAddModel.userName = loginUserInfo.username;
this.expressAwbhAddModel.userid = loginUserInfo.userId;
let para = Object.assign({}, this.expressAwbhAddModel);
awbahAdd(para).then((res) => {
awbhAdd(para).then((res) => {
if (res.data.code == 200){
this.$message({
message: '提交成功',
... ... @@ -579,7 +619,52 @@
});
}
});
}
},
/**
* 编辑分单页面
*/
expressEditAwbhAdd(index, row){
if (this.$refs.expressAwbhAddModel != undefined){
this.$refs.expressAwbhAddModel.resetFields();
}
this.dialogCommon = 'edit';
this.expressAwbhAddVisible = true;
this.expressAwbhAddModel = Object.assign({}, row);
},
/**
* 分单编辑
*/
expressAwbhEditSubmit(){
this.$refs.expressAwbhAddModel.validate((valid) => {
if (valid) {
this.$confirm('确认提交吗？', '提示', {}).then(() => {
//NProgress.start();
this.listLoading = true;
let para = Object.assign({}, this.expressAwbhAddModel);
awbhEdit(para).then((res) => {
if (res.data.code == 200){
this.$message({
message: '提交成功',
type: 'success'
});
this.$refs.expressAwbhAddModel.resetFields();
this.expressAwbhAddVisible = false;
this.getList();
}else {
this.$message({
message: '提交失败',
type: 'error'
});
}
}).catch(error => alert(error));
}).catch(() =>{
});
}
});
},
},
mounted() {
this.getList();
... ...