|
@@ -51,26 +51,37 @@ |
|
@@ -51,26 +51,37 @@ |
|
51
|
</el-col>
|
51
|
</el-col>
|
|
52
|
</el-row>
|
52
|
</el-row>
|
|
53
|
</el-row>
|
53
|
</el-row>
|
|
54
|
- <el-col :gutter="0" class="toolbar toobar_analysis" style="padding-top:0">
|
|
|
|
55
|
- <el-col :span="7">
|
|
|
|
56
|
- <div class="analysis_title">总单数:</div>
|
|
|
|
57
|
- <div class="analysis_text">20</div>
|
|
|
|
58
|
- </el-col>
|
|
|
|
59
|
- <el-col :span="1">
|
|
|
|
60
|
- <el-divider direction="vertical"></el-divider>
|
|
|
|
61
|
- </el-col>
|
|
|
|
62
|
- <el-col :span="7">
|
|
|
|
63
|
- <div class="analysis_title">总件数:</div>
|
|
|
|
64
|
- <div class="analysis_text">50</div>
|
|
|
|
65
|
- </el-col>
|
|
|
|
66
|
- <el-col :span="1">
|
|
|
|
67
|
- <el-divider direction="vertical"></el-divider>
|
|
|
|
68
|
- </el-col>
|
|
|
|
69
|
- <el-col :span="8">
|
|
|
|
70
|
- <div class="analysis_title">总重量:</div>
|
|
|
|
71
|
- <div class="analysis_text">150</div>
|
54
|
+ <el-row>
|
|
|
|
55
|
+ <el-col :gutter="0" class="toolbar toobar_analysis" style="margin-top: -25px;height: 100px">
|
|
|
|
56
|
+ <el-col :span="7" >
|
|
|
|
57
|
+ <div class="analysis_title">总单数:</div>
|
|
|
|
58
|
+ <div class="analysis_text">
|
|
|
|
59
|
+ <el-input v-model="total" readonly style="width: 100px">
|
|
|
|
60
|
+ </el-input>
|
|
|
|
61
|
+ </div>
|
|
|
|
62
|
+ </el-col>
|
|
|
|
63
|
+ <el-col :span="1">
|
|
|
|
64
|
+ <el-divider direction="vertical"></el-divider>
|
|
|
|
65
|
+ </el-col>
|
|
|
|
66
|
+ <el-col :span="7">
|
|
|
|
67
|
+ <div class="analysis_title">总件数:</div>
|
|
|
|
68
|
+ <div class="analysis_text">
|
|
|
|
69
|
+ <el-input v-model="pcsSum" readonly style="width: 100px">
|
|
|
|
70
|
+ </el-input>
|
|
|
|
71
|
+ </div>
|
|
|
|
72
|
+ </el-col>
|
|
|
|
73
|
+ <el-col :span="1">
|
|
|
|
74
|
+ <el-divider direction="vertical"></el-divider>
|
|
|
|
75
|
+ </el-col>
|
|
|
|
76
|
+ <el-col :span="7">
|
|
|
|
77
|
+ <div class="analysis_title">总重量:</div>
|
|
|
|
78
|
+ <div class="analysis_text">
|
|
|
|
79
|
+ <el-input v-model="weightSum" readonly style="font-size:12px;color:cornflowerblue;width: 100px">
|
|
|
|
80
|
+ </el-input>
|
|
|
|
81
|
+ </div>
|
|
|
|
82
|
+ </el-col>
|
|
72
|
</el-col>
|
83
|
</el-col>
|
|
73
|
- </el-col>
|
84
|
+ </el-row>
|
|
74
|
<!-- 列表区域-->
|
85
|
<!-- 列表区域-->
|
|
75
|
<el-row>
|
86
|
<el-row>
|
|
76
|
<template>
|
87
|
<template>
|
|
@@ -133,10 +144,14 @@ |
|
@@ -133,10 +144,14 @@ |
|
133
|
<el-table-column
|
144
|
<el-table-column
|
|
134
|
fixed="right"
|
145
|
fixed="right"
|
|
135
|
label="操作"
|
146
|
label="操作"
|
|
136
|
- width="200">
|
147
|
+ width="320">
|
|
137
|
<template slot-scope="scope">
|
148
|
<template slot-scope="scope">
|
|
138
|
<el-button type="warning" size="mini" @click="changeFhl(scope.row)">更改分单号</el-button>
|
149
|
<el-button type="warning" size="mini" @click="changeFhl(scope.row)">更改分单号</el-button>
|
|
139
|
-<!-- <el-button type="success" size="mini" @click="applyEdit(scope.row)">编辑</el-button>-->
|
150
|
+ <el-button type="primary" size="mini">分批出库</el-button>
|
|
|
|
151
|
+<!-- 件数重量尺寸-->
|
|
|
|
152
|
+ <el-button type="success" size="mini">分批改单</el-button>
|
|
|
|
153
|
+<!-- 单号-->
|
|
|
|
154
|
+ <!-- <el-button type="success" size="mini" @click="applyEdit(scope.row)">编辑</el-button>-->
|
|
140
|
<!-- <el-button type="danger" size="mini" @click="applyDel(scope.$index,scope.row)">删除</el-button>-->
|
155
|
<!-- <el-button type="danger" size="mini" @click="applyDel(scope.$index,scope.row)">删除</el-button>-->
|
|
141
|
</template>
|
156
|
</template>
|
|
142
|
</el-table-column>
|
157
|
</el-table-column>
|
|
@@ -381,8 +396,8 @@ |
|
@@ -381,8 +396,8 @@ |
|
381
|
</el-form-item>
|
396
|
</el-form-item>
|
|
382
|
</el-col>
|
397
|
</el-col>
|
|
383
|
<el-col :span="8">
|
398
|
<el-col :span="8">
|
|
384
|
- <el-form-item label="" :label-width="formLabelWidth" prop="dest4city">
|
|
|
|
385
|
- <el-input disabled v-model="detaForm.dest4city" autocomplete="off" size="small" style="width: 300px">
|
399
|
+ <el-form-item label="" :label-width="formLabelWidth" prop="shpcomid">
|
|
|
|
400
|
+ <el-input disabled v-model="detaForm.shpcomid" autocomplete="off" size="small" style="width: 300px">
|
|
386
|
<template slot="prepend">代理人代码</template>
|
401
|
<template slot="prepend">代理人代码</template>
|
|
387
|
</el-input>
|
402
|
</el-input>
|
|
388
|
</el-form-item>
|
403
|
</el-form-item>
|
|
@@ -504,6 +519,8 @@ |
|
@@ -504,6 +519,8 @@ |
|
504
|
},
|
519
|
},
|
|
505
|
creattime:'',
|
520
|
creattime:'',
|
|
506
|
total: 0,
|
521
|
total: 0,
|
|
|
|
522
|
+ pcsSum:'',
|
|
|
|
523
|
+ weightSum:'',
|
|
507
|
tableData:[],
|
524
|
tableData:[],
|
|
508
|
//新增编辑
|
525
|
//新增编辑
|
|
509
|
dialogMap: {
|
526
|
dialogMap: {
|
|
@@ -571,7 +588,7 @@ |
|
@@ -571,7 +588,7 @@ |
|
571
|
detaMap:'货物明细',
|
588
|
detaMap:'货物明细',
|
|
572
|
detaForm:{
|
589
|
detaForm:{
|
|
573
|
dest4: '',
|
590
|
dest4: '',
|
|
574
|
- dest4city: '',
|
591
|
+ shpcomid: '',
|
|
575
|
optime:'',
|
592
|
optime:'',
|
|
576
|
pcs: '',
|
593
|
pcs: '',
|
|
577
|
weight: '',
|
594
|
weight: '',
|
|
@@ -613,7 +630,6 @@ |
|
@@ -613,7 +630,6 @@ |
|
613
|
shprtel: '',
|
630
|
shprtel: '',
|
|
614
|
shpraddress: '',
|
631
|
shpraddress: '',
|
|
615
|
shprcountyr:'',
|
632
|
shprcountyr:'',
|
|
616
|
- shpcomid: '',
|
|
|
|
617
|
shpaeocode:'',
|
633
|
shpaeocode:'',
|
|
618
|
shpcustomerid: '',
|
634
|
shpcustomerid: '',
|
|
619
|
cnsnname: '',
|
635
|
cnsnname: '',
|
|
@@ -792,7 +808,7 @@ |
|
@@ -792,7 +808,7 @@ |
|
792
|
const _this = this
|
808
|
const _this = this
|
|
793
|
selectNewInventroys(this.queryInfo).then((response) => {
|
809
|
selectNewInventroys(this.queryInfo).then((response) => {
|
|
794
|
const res = response.data
|
810
|
const res = response.data
|
|
795
|
- // console.log(response.data)
|
811
|
+ console.log(response.data)
|
|
796
|
if (res.code !== '200') {
|
812
|
if (res.code !== '200') {
|
|
797
|
return _this.$message.error('获取消息收发记录，失败！')
|
813
|
return _this.$message.error('获取消息收发记录，失败！')
|
|
798
|
}
|
814
|
}
|
|
@@ -800,6 +816,8 @@ |
|
@@ -800,6 +816,8 @@ |
|
800
|
_this.tableData = res.data.list
|
816
|
_this.tableData = res.data.list
|
|
801
|
// 获取列表的总记录数
|
817
|
// 获取列表的总记录数
|
|
802
|
_this.total = res.data.total
|
818
|
_this.total = res.data.total
|
|
|
|
819
|
+ _this.pcsSum = res.data.pcsSum
|
|
|
|
820
|
+ _this.weightSum = res.data.weightSum
|
|
803
|
_this.$message.success('获取消息收发记录，成功！')
|
821
|
_this.$message.success('获取消息收发记录，成功！')
|
|
804
|
}).catch(error => {
|
822
|
}).catch(error => {
|
|
805
|
// 关闭加载
|
823
|
// 关闭加载
|
