|
|
@@ -503,19 +503,6 @@
|
|
|
v-if="!columnNoRoutList.includes('签收时间')"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="priceValue"
|
|
|
- label="实际运价"
|
|
|
- width="100px"
|
|
|
- v-if="!columnNoRoutList.includes('实际运价')"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="detailsAmount"
|
|
|
- label="实际运费"
|
|
|
- width="100px"
|
|
|
- v-if="!columnNoRoutList.includes('实际运费')"
|
|
|
- ></el-table-column>
|
|
|
<el-table-column
|
|
|
prop="isAccept"
|
|
|
label="异地库接收标志"
|
|
|
@@ -871,18 +858,6 @@
|
|
|
<span>{{ steelMap.receiptAddress }}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="steelMapClass7">
|
|
|
- <div class="steelMapClass72" v-if="steelMap.priceValue != null">
|
|
|
- <span>系统建议运价:</span>
|
|
|
- <span>{{ steelMap.priceValue }}</span>
|
|
|
- <el-button
|
|
|
- type="success"
|
|
|
- circle
|
|
|
- v-if="!notRoutList.includes('capacityNo')"
|
|
|
- >修改</el-button
|
|
|
- >
|
|
|
- </div>
|
|
|
- </div>
|
|
|
</div>
|
|
|
<div class="table1">
|
|
|
<el-table
|
|
|
@@ -1252,18 +1227,19 @@
|
|
|
<div class="batchCapacityClass" style="margin:30px">
|
|
|
<el-form :inline="true">
|
|
|
<el-form-item>
|
|
|
- <span>批量修改收货客户电话:</span>
|
|
|
- <el-input
|
|
|
- v-model="consigneeTel"
|
|
|
- style="width:150px"
|
|
|
- :disabled="notRoutList.includes('consigeeTel')"
|
|
|
- ></el-input>
|
|
|
- <el-button
|
|
|
- type="success"
|
|
|
- circle
|
|
|
- @click="batchUpdateconsigneeTel"
|
|
|
- v-if="!notRoutList.includes('consigeeTel')"
|
|
|
- >提交</el-button>
|
|
|
+ <span>批量修改收货客户电话:</span>
|
|
|
+ <el-input
|
|
|
+ v-model="consigneeTel"
|
|
|
+ style="width:150px"
|
|
|
+ :disabled="notRoutList.includes('consigeeTel')"
|
|
|
+ ></el-input>
|
|
|
+ <el-button
|
|
|
+ type="success"
|
|
|
+ circle
|
|
|
+ @click="batchUpdateconsigneeTel"
|
|
|
+ v-if="!notRoutList.includes('consigeeTel')"
|
|
|
+ >提交</el-button
|
|
|
+ >
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
</div>
|
|
|
@@ -1524,7 +1500,7 @@ export default {
|
|
|
toggleRowIds: [],
|
|
|
capacityNo: null,
|
|
|
capacityId: null,
|
|
|
- consigneeTel:null,
|
|
|
+ consigneeTel: null,
|
|
|
batchCapacityList: [],
|
|
|
batchCapacityVisible: false,
|
|
|
isShowSaleLog: false,
|
|
|
@@ -1704,7 +1680,6 @@ export default {
|
|
|
'销售片区',
|
|
|
'抵达时间',
|
|
|
'签收时间',
|
|
|
- '系统建议运价',
|
|
|
// '摘要',
|
|
|
'排队开始时间',
|
|
|
'钢材科放行时间',
|
|
|
@@ -2120,6 +2095,7 @@ export default {
|
|
|
},
|
|
|
//删除计量实绩
|
|
|
linkageDeleteTransportOrder(row, steelMap) {
|
|
|
+ console.log(row)
|
|
|
if (row.netWeight != null && row.netWeight != '') {
|
|
|
//如果净重不为空
|
|
|
let arr = []
|
|
|
@@ -2127,7 +2103,8 @@ export default {
|
|
|
orderNumber: row.orderNo,
|
|
|
good: row.materialName,
|
|
|
goodspa: `${row.materialSpecification}(${row.materialModel})`,
|
|
|
- resultCrossWeightTime: row.grossWeightTime
|
|
|
+ resultCrossWeightTime: row.grossWeightTime,
|
|
|
+ saleMaterialId: row.saleMaterialId
|
|
|
}
|
|
|
arr.push(map)
|
|
|
this.axios
|
|
|
@@ -2628,7 +2605,7 @@ export default {
|
|
|
//上传抵达
|
|
|
let formData = new window.FormData()
|
|
|
this.fileListArrival.forEach((item, index) => {
|
|
|
- formData.append('file' + index, item.raw)
|
|
|
+ formData.append('file' + index, item.raw)
|
|
|
})
|
|
|
formData.append('orderNumber', this.orderNumber)
|
|
|
formData.append('resultArrivalAddress', this.location)
|
|
|
@@ -3532,21 +3509,21 @@ export default {
|
|
|
}
|
|
|
this.batchCapacityList.forEach(row => {
|
|
|
this.axios
|
|
|
- .post('/api/v1/ams/updateConsigneeTel', {
|
|
|
- saleOrderNo: row.saleOrderNo,
|
|
|
- saleOrderMaterialId: row.saleOrderMaterialId,
|
|
|
- consigneeTel: this.consigneeTel
|
|
|
- })
|
|
|
- .then(res => {
|
|
|
- if (res.data.code == '200') {
|
|
|
- this.$message.success('修改成功')
|
|
|
- } else {
|
|
|
+ .post('/api/v1/ams/updateConsigneeTel', {
|
|
|
+ saleOrderNo: row.saleOrderNo,
|
|
|
+ saleOrderMaterialId: row.saleOrderMaterialId,
|
|
|
+ consigneeTel: this.consigneeTel
|
|
|
+ })
|
|
|
+ .then(res => {
|
|
|
+ if (res.data.code == '200') {
|
|
|
+ this.$message.success('修改成功')
|
|
|
+ } else {
|
|
|
+ this.$message.error('修改失败')
|
|
|
+ }
|
|
|
+ })
|
|
|
+ .catch(() => {
|
|
|
this.$message.error('修改失败')
|
|
|
- }
|
|
|
- })
|
|
|
- .catch(() => {
|
|
|
- this.$message.error('修改失败')
|
|
|
- })
|
|
|
+ })
|
|
|
})
|
|
|
this.getSteelReport()
|
|
|
loading.close()
|
|
|
@@ -3983,11 +3960,6 @@ export default {
|
|
|
//查询，输入查询条件
|
|
|
onclick(obj) {
|
|
|
this.$store.commit('updateSaleSteelToggleIds', { isClear: 1 })
|
|
|
- // console.table(
|
|
|
- // this.$refs.tableRef.bodyWrapper.children[0].children[1].rows[2]
|
|
|
- // .offsetHeight
|
|
|
- // )
|
|
|
- // return
|
|
|
this.isRowClick = 0
|
|
|
const loading = this.$loading({
|
|
|
lock: true,
|
luobang