This commit is contained in:
caoxinyu
2018-12-24 14:47:03 +08:00
parent cd052f438f
commit b77cc3ad55
3 changed files with 24 additions and 4 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

@@ -298,7 +298,7 @@
<el-button :disabled="disabledmoveInto" round type="primary" size="small" style="margin-top: 200px;margin-left: 45px" @click="moveInto()"></el-button> <el-button :disabled="disabledmoveInto" round type="primary" size="small" style="margin-top: 200px;margin-left: 45px" @click="moveInto()"></el-button>
</div> </div>
<div> <div>
<el-button round type="danger" size="small" style="margin-top: 50px;margin-left: 45px" @click="remove()"></el-button> <el-button :disabled="disabledremoveInto" round type="danger" size="small" style="margin-top: 50px;margin-left: 45px" @click="remove()"></el-button>
</div> </div>
</div> </div>
</div> </div>
@@ -314,8 +314,8 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="addCargoBox()">增加</el-button> <el-button :disabled="btnAdd" type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="addCargoBox()">增加</el-button>
<el-button type="danger" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 50px" @click="delCargoBox()">删除</el-button> <el-button :disabled="btnDel" type="danger" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 50px" @click="delCargoBox()">删除</el-button>
<el-popover <el-popover
placement="right" placement="right"
width="80" width="80"
@@ -406,7 +406,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="运输状态" prop="entryNameValue" label-width="110px"> <el-form-item label="运输状态" prop="entryNameValue" label-width="110px">
<el-select v-model="form1.运输状态" clearable filterable placeholder="请选择运输状态" style="width: 200px" size="small"> <el-select v-model="form1.运输状态" clearable filterable placeholder="请选择运输状态" style="width: 200px" size="small" disabled>
<el-option <el-option
v-for="item in Transport" v-for="item in Transport"
:key="item.value" :key="item.value"
@@ -615,6 +615,8 @@ export default {
}, },
data() { data() {
return { return {
btnAdd: false,
btnDel: false,
btnLoading: false, btnLoading: false,
table: [], table: [],
canvas: [], canvas: [],
@@ -629,6 +631,7 @@ export default {
委托车辆: '', 委托车辆: '',
发货日期: '', 发货日期: '',
装箱单名称: '', 装箱单名称: '',
运输状态: '',
a: 1, // 嵌套表格交换变量 a: 1, // 嵌套表格交换变量
b: 1, // 嵌套表格交换变量 b: 1, // 嵌套表格交换变量
flag1: '', // 发货单旗帜变量 flag1: '', // 发货单旗帜变量
@@ -647,6 +650,7 @@ export default {
invoiceNum: '', // 发货单编号 invoiceNum: '', // 发货单编号
detailedAddress: '', detailedAddress: '',
disabledmoveInto: false, disabledmoveInto: false,
disabledremoveInto: false,
people: '', people: '',
phoneNumber: '', phoneNumber: '',
cityValue: '', // 市名 cityValue: '', // 市名
@@ -1001,6 +1005,11 @@ export default {
}, },
searchCargoBox(row) { searchCargoBox(row) {
this.invoiceNum = row.发货单编号 this.invoiceNum = row.发货单编号
this.运输状态 = row.运输状态
this.运输状态 === '已签收' ? this.disabledremoveInto = true : this.disabledremoveInto = false
this.运输状态 === '已签收' ? this.disabledmoveInto = true : this.disabledmoveInto = false
this.运输状态 === '已签收' ? this.btnAdd = true : this.btnAdd = false
this.运输状态 === '已签收' ? this.btnDel = true : this.btnDel = false
this.getFileList() this.getFileList()
this.getSelect(searchCargoBox, ['货箱号', '货箱号编号'], 'cargoBox', this.invoiceNum) this.getSelect(searchCargoBox, ['货箱号', '货箱号编号'], 'cargoBox', this.invoiceNum)
}, },
@@ -1021,6 +1030,10 @@ export default {
} }
}).then(() => { }).then(() => {
this.getSelect(searchCargoBox, ['货箱号', '货箱号编号'], 'cargoBox', this.invoiceNum) this.getSelect(searchCargoBox, ['货箱号', '货箱号编号'], 'cargoBox', this.invoiceNum)
this.运输状态 === '已签收' ? this.disabledremoveInto = true : this.disabledremoveInto = false
this.运输状态 === '已签收' ? this.disabledmoveInto = true : this.disabledmoveInto = false
this.运输状态 === '已签收' ? this.btnAdd = true : this.btnAdd = false
this.运输状态 === '已签收' ? this.btnDel = true : this.btnDel = false
}) })
}) })
}, },
@@ -1040,6 +1053,10 @@ export default {
} }
}).then(() => { }).then(() => {
this.getSelect(searchCargoBox, ['货箱号', '货箱号编号'], 'cargoBox', this.invoiceNum) this.getSelect(searchCargoBox, ['货箱号', '货箱号编号'], 'cargoBox', this.invoiceNum)
this.运输状态 === '已签收' ? this.disabledremoveInto = true : this.disabledremoveInto = false
this.运输状态 === '已签收' ? this.disabledmoveInto = true : this.disabledmoveInto = false
this.运输状态 === '已签收' ? this.btnAdd = true : this.btnAdd = false
this.运输状态 === '已签收' ? this.btnDel = true : this.btnDel = false
}) })
}) })
}, },

View File

@@ -416,17 +416,20 @@ export default {
this.tableData1 = data.rows this.tableData1 = data.rows
this.total = data.total this.total = data.total
}) })
this.tableData2 = []
}, },
// 项目信息表格改变每页显示条数 // 项目信息表格改变每页显示条数
handleSizeChange(val) { handleSizeChange(val) {
this.PageCurrent = 1 this.PageCurrent = 1
this.PageSize = val this.PageSize = val
this.fetchTableData1() this.fetchTableData1()
this.tableData2 = []
}, },
// 项目信息表格翻页 // 项目信息表格翻页
handleCurrentChange(val) { handleCurrentChange(val) {
this.PageCurrent = val this.PageCurrent = val
this.fetchTableData1() this.fetchTableData1()
this.tableData2 = []
}, },
// 查询开票记录表格 // 查询开票记录表格
fetchTableData2(row) { fetchTableData2(row) {