|
@@ -68,6 +68,19 @@
|
|
clearable
|
|
clearable
|
|
></el-input>
|
|
></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
+
|
|
|
|
+ <el-form-item>
|
|
|
|
+ <label class="el-form-item__label" style="width: auto;"
|
|
|
|
+ >计量单号:</label
|
|
|
|
+ >
|
|
|
|
+ <el-input
|
|
|
|
+ style="width:200px"
|
|
|
|
+ v-model="weightNoParam"
|
|
|
|
+ placeholder="请输入查询条件"
|
|
|
|
+ clearable
|
|
|
|
+ ></el-input>
|
|
|
|
+ </el-form-item>
|
|
|
|
+
|
|
<el-form-item>
|
|
<el-form-item>
|
|
<el-button type="primary" class="btn" @click="onclick">
|
|
<el-button type="primary" class="btn" @click="onclick">
|
|
<i class="el-icon-search"></i>
|
|
<i class="el-icon-search"></i>
|
|
@@ -84,6 +97,10 @@
|
|
>批量保存</el-button
|
|
>批量保存</el-button
|
|
>
|
|
>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
+
|
|
|
|
+ <el-form-item>
|
|
|
|
+ <el-checkbox v-model="isNullwagonNo" label="显示未填车号" @change="onclick" border></el-checkbox>
|
|
|
|
+ </el-form-item>
|
|
</el-form>
|
|
</el-form>
|
|
</div>
|
|
</div>
|
|
<div class="main">
|
|
<div class="main">
|
|
@@ -515,7 +532,9 @@ export default {
|
|
filterToStationList: [],
|
|
filterToStationList: [],
|
|
filterUnloadPlaceList: [],
|
|
filterUnloadPlaceList: [],
|
|
tableRowIndex: '',
|
|
tableRowIndex: '',
|
|
- isRowClick: 0
|
|
|
|
|
|
+ isRowClick: 0,
|
|
|
|
+ weightNoParam: null,
|
|
|
|
+ isNullwagonNo: false
|
|
}
|
|
}
|
|
},
|
|
},
|
|
created() {
|
|
created() {
|
|
@@ -555,6 +574,12 @@ export default {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
batchOperate() {
|
|
batchOperate() {
|
|
|
|
+ const loading = this.$loading({
|
|
|
|
+ lock: true,
|
|
|
|
+ text: '正在保存',
|
|
|
|
+ spinner: 'el-icon-loading',
|
|
|
|
+ background: 'rgba(0, 0, 0, 0.7)'
|
|
|
|
+ })
|
|
if (getCookie('orgCode') == 'shouhuokehu') {
|
|
if (getCookie('orgCode') == 'shouhuokehu') {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -594,10 +619,17 @@ export default {
|
|
.then(res => {
|
|
.then(res => {
|
|
if (res.data.code == '200') {
|
|
if (res.data.code == '200') {
|
|
this.$message.success('批量保存成功')
|
|
this.$message.success('批量保存成功')
|
|
- this.getRequestUrl()
|
|
|
|
|
|
+ //this.getRequestUrl()
|
|
|
|
+ this.onclick();
|
|
}
|
|
}
|
|
|
|
+ loading.close();
|
|
|
|
+ })
|
|
|
|
+ .catch(e => {
|
|
|
|
+ this.$message.error(e)
|
|
|
|
+ loading.close();
|
|
})
|
|
})
|
|
console.log(this.$refs.tableRef.data)
|
|
console.log(this.$refs.tableRef.data)
|
|
|
|
+
|
|
},
|
|
},
|
|
handleSelectWarehouse(row, index, item) {
|
|
handleSelectWarehouse(row, index, item) {
|
|
console.log(item)
|
|
console.log(item)
|
|
@@ -653,6 +685,12 @@ export default {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
operate(row) {
|
|
operate(row) {
|
|
|
|
+ const loading = this.$loading({
|
|
|
|
+ lock: true,
|
|
|
|
+ text: '正在保存',
|
|
|
|
+ spinner: 'el-icon-loading',
|
|
|
|
+ background: 'rgba(0, 0, 0, 0.7)'
|
|
|
|
+ })
|
|
if (getCookie('orgCode') == 'shouhuokehu') {
|
|
if (getCookie('orgCode') == 'shouhuokehu') {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -679,19 +717,31 @@ export default {
|
|
.then(res => {
|
|
.then(res => {
|
|
if (res.data.code == '200') {
|
|
if (res.data.code == '200') {
|
|
this.$message.success('保存成功')
|
|
this.$message.success('保存成功')
|
|
- this.getRequestUrl()
|
|
|
|
|
|
+ //this.getRequestUrl()
|
|
|
|
+ this.onclick();
|
|
} else {
|
|
} else {
|
|
this.$message.error(res.data.data)
|
|
this.$message.error(res.data.data)
|
|
- this.getRequestUrl()
|
|
|
|
|
|
+ //this.getRequestUrl()
|
|
|
|
+ this.onclick();
|
|
}
|
|
}
|
|
|
|
+ loading.close();
|
|
})
|
|
})
|
|
.catch(e => {
|
|
.catch(e => {
|
|
this.$message.error(e)
|
|
this.$message.error(e)
|
|
- this.getRequestUrl()
|
|
|
|
|
|
+ //this.getRequestUrl()
|
|
|
|
+ this.onclick();
|
|
|
|
+ loading.close();
|
|
})
|
|
})
|
|
|
|
+
|
|
},
|
|
},
|
|
//查询事件
|
|
//查询事件
|
|
onclick() {
|
|
onclick() {
|
|
|
|
+ const loading = this.$loading({
|
|
|
|
+ lock: true,
|
|
|
|
+ text: '正在获取数据',
|
|
|
|
+ spinner: 'el-icon-loading',
|
|
|
|
+ background: 'rgba(0, 0, 0, 0.7)'
|
|
|
|
+ })
|
|
if (getCookie('orgCode') == 'shouhuokehu') {
|
|
if (getCookie('orgCode') == 'shouhuokehu') {
|
|
let consigneeLoginName =
|
|
let consigneeLoginName =
|
|
JSON.parse(getCookie('userInfo')).userCode || getCookie('loginName')
|
|
JSON.parse(getCookie('userInfo')).userCode || getCookie('loginName')
|
|
@@ -747,6 +797,10 @@ export default {
|
|
toTheStation +
|
|
toTheStation +
|
|
'&sendStation=' +
|
|
'&sendStation=' +
|
|
sendStation +
|
|
sendStation +
|
|
|
|
+ '&weightNoParam=' +
|
|
|
|
+ this.weightNoParam +
|
|
|
|
+ '&isNullwagonNo=' +
|
|
|
|
+ this.isNullwagonNo +
|
|
'&i=' +
|
|
'&i=' +
|
|
new Date(),
|
|
new Date(),
|
|
this.filterMap
|
|
this.filterMap
|
|
@@ -755,10 +809,21 @@ export default {
|
|
this.tableData = res.data.data
|
|
this.tableData = res.data.data
|
|
this.showSummariesPosition()
|
|
this.showSummariesPosition()
|
|
this.getSpanArr(this.tableData)
|
|
this.getSpanArr(this.tableData)
|
|
|
|
+ loading.close();
|
|
|
|
+ })
|
|
|
|
+ .catch(e => {
|
|
|
|
+ this.$message.error(e)
|
|
|
|
+ loading.close();
|
|
})
|
|
})
|
|
},
|
|
},
|
|
//获取后台数据
|
|
//获取后台数据
|
|
getRequestUrl() {
|
|
getRequestUrl() {
|
|
|
|
+ const loading = this.$loading({
|
|
|
|
+ lock: true,
|
|
|
|
+ text: '正在获取数据',
|
|
|
|
+ spinner: 'el-icon-loading',
|
|
|
|
+ background: 'rgba(0, 0, 0, 0.7)'
|
|
|
|
+ })
|
|
let map = {}
|
|
let map = {}
|
|
if (getCookie('orgCode') == 'shouhuokehu') {
|
|
if (getCookie('orgCode') == 'shouhuokehu') {
|
|
let consigneeLoginName =
|
|
let consigneeLoginName =
|
|
@@ -776,6 +841,11 @@ export default {
|
|
this.tableData = res.data.data
|
|
this.tableData = res.data.data
|
|
this.getSpanArr(this.tableData)
|
|
this.getSpanArr(this.tableData)
|
|
this.showSummariesPosition()
|
|
this.showSummariesPosition()
|
|
|
|
+ loading.close();
|
|
|
|
+ })
|
|
|
|
+ .catch(e => {
|
|
|
|
+ this.$message.error(e)
|
|
|
|
+ loading.close();
|
|
})
|
|
})
|
|
},
|
|
},
|
|
//刷新
|
|
//刷新
|