|
|
@@ -2632,8 +2632,8 @@
|
|
|
<td>序号</td>
|
|
|
<td>入货日期</td>
|
|
|
<td>箱量(20GP)</td>
|
|
|
- <td v-if="radio == 1">重量(吨)</td>
|
|
|
- <td v-if="radio == 2">重量(千克)</td>
|
|
|
+ <td v-if="radio == 1">计划重量(吨)</td>
|
|
|
+ <td v-if="radio == 2">计划重量(千克)</td>
|
|
|
<td>件数</td>
|
|
|
<td v-if="radio == 1">入库重量(吨)</td>
|
|
|
<td v-if="radio == 2">入库重量(千克)</td>
|
|
|
@@ -2643,14 +2643,14 @@
|
|
|
<td>{{ index + 1 }}</td>
|
|
|
<td>{{ item.fBsdate | fBsdateFormat }}</td>
|
|
|
<td>{{ item.fCntqty }}</td>
|
|
|
- <td v-if="item.fGrossweight && radio == 1">
|
|
|
- {{ (item.fGrossweight / 1000).toFixed(4) }}
|
|
|
+ <td v-if="item.fPlannetweight && radio == 1">
|
|
|
+ {{ (item.fPlannetweight / 1000).toFixed(4) }}
|
|
|
</td>
|
|
|
- <td v-else-if="item.fGrossweight && radio == 2">
|
|
|
- {{ item.fGrossweight }}
|
|
|
+ <td v-else-if="item.fPlannetweight && radio == 2">
|
|
|
+ {{ item.fPlannetweight }}
|
|
|
</td>
|
|
|
<td v-else></td>
|
|
|
- <td>{{ item.fQty }}</td>
|
|
|
+ <td>{{ item.fPlanqty }}</td>
|
|
|
<td v-if="item.fNetweight && radio == 1">
|
|
|
{{ (item.fNetweight / 1000).toFixed(4) }}
|
|
|
</td>
|
|
|
@@ -2663,8 +2663,8 @@
|
|
|
<tr>
|
|
|
<td colspan="2">合计</td>
|
|
|
<td>{{ allfCntqty }}</td>
|
|
|
- <td v-if="radio == 1">{{ (allfGrossweight / 1000).toFixed(4) }}</td>
|
|
|
- <td v-if="radio == 2">{{ allfGrossweight }}</td>
|
|
|
+ <td v-if="radio == 1">{{ (allfPlannetweight / 1000).toFixed(4) }}</td>
|
|
|
+ <td v-if="radio == 2">{{ (allfPlannetweight).toFixed(0)}}</td>
|
|
|
<td>{{ allfPlanqty }}</td>
|
|
|
<td v-if="radio == 1">{{ (allfNetweight / 1000).toFixed(4) }}</td>
|
|
|
<td v-if="radio == 2">{{ allfNetweight }}</td>
|
|
|
@@ -2672,7 +2672,7 @@
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>备注</td>
|
|
|
- <td colspan="6"></td>
|
|
|
+ <td colspan="6">{{form.remark}}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td colspan="7">
|
|
|
@@ -3057,8 +3057,8 @@
|
|
|
<td>车号/箱号</td>
|
|
|
<td>入货日期</td>
|
|
|
<td>箱量</td>
|
|
|
- <td>重量</td>
|
|
|
- <td>件数</td>
|
|
|
+ <td>计划重量</td>
|
|
|
+ <td>计划件数</td>
|
|
|
<td>入库重量</td>
|
|
|
<td>入库件数</td>
|
|
|
</tr>
|
|
|
@@ -3066,11 +3066,11 @@
|
|
|
<td>{{ item.fTruckno }}/{{ item.fCntrno }}</td>
|
|
|
<td>{{ item.fBsdate }}</td>
|
|
|
<td>{{ item.fCntqty }}</td>
|
|
|
- <td v-if="item.fGrossweight && radio == 1">
|
|
|
- {{ (item.fGrossweight / 1000).toFixed(4) }}
|
|
|
+ <td v-if="item.fPlannetweight && radio == 1">
|
|
|
+ {{ (item.fPlannetweight / 1000).toFixed(4) }}
|
|
|
</td>
|
|
|
- <td v-else-if="item.fGrossweight && radio == 2">
|
|
|
- {{ item.fGrossweight }}
|
|
|
+ <td v-else-if="item.fPlannetweight && radio == 2">
|
|
|
+ {{ item.fPlannetweight }}
|
|
|
</td>
|
|
|
<td v-else></td>
|
|
|
<td>{{ item.fPlanqty }}</td>
|
|
|
@@ -3086,8 +3086,8 @@
|
|
|
<tr>
|
|
|
<td colspan="2">合计</td>
|
|
|
<td>{{ allfCntqty }}</td>
|
|
|
- <td v-if="radio == 1">{{ (allfGrossweight / 1000).toFixed(4) }}</td>
|
|
|
- <td v-if="radio == 2">{{ allfGrossweight }}</td>
|
|
|
+ <td v-if="radio == 1">{{ (allfPlannetweight / 1000).toFixed(4) }}</td>
|
|
|
+ <td v-if="radio == 2">{{ (allfPlannetweight).toFixed(0)}}</td>
|
|
|
<td>{{ allfPlanqty }}</td>
|
|
|
<td v-if="radio == 1">{{ (allfNetweight / 1000).toFixed(4) }}</td>
|
|
|
<td v-if="radio == 2">{{ allfNetweight }}</td>
|
|
|
@@ -3095,7 +3095,7 @@
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>备注</td>
|
|
|
- <td colspan="6"></td>
|
|
|
+ <td colspan="6">{{form.remark}}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td colspan="7">
|
|
|
@@ -3886,23 +3886,23 @@ export default {
|
|
|
{
|
|
|
surface: "8",
|
|
|
label: "fPlanqty",
|
|
|
- name: "结余库存",
|
|
|
+ name: "计划调拨件数",
|
|
|
checked: 0,
|
|
|
- width: 100,
|
|
|
+ width: 140,
|
|
|
},
|
|
|
{
|
|
|
surface: "9",
|
|
|
label: "fPlangrossweight",
|
|
|
- name: "结余毛重(kg)",
|
|
|
+ name: "计划调拨毛重(kg)",
|
|
|
checked: 0,
|
|
|
- width: 120,
|
|
|
+ width: 150,
|
|
|
},
|
|
|
{
|
|
|
surface: "10",
|
|
|
label: "fPlannetweight",
|
|
|
- name: "结余净重(kg)",
|
|
|
+ name: "计划调拨净重(kg)",
|
|
|
checked: 0,
|
|
|
- width: 120,
|
|
|
+ width: 150,
|
|
|
},
|
|
|
|
|
|
{
|
|
|
@@ -4165,6 +4165,7 @@ export default {
|
|
|
PrintingCrlist: [],
|
|
|
allCrfAmount: 0,
|
|
|
allCrfQty: 0,
|
|
|
+ allfPlannetweight:0,
|
|
|
// Cr打印弹窗是否开启
|
|
|
print_Cr: false,
|
|
|
// 税额总数
|
|
|
@@ -5927,22 +5928,26 @@ export default {
|
|
|
this.allfGrossweight = 0;
|
|
|
this.allfPlanqty = 0;
|
|
|
this.allfNetweight = 0;
|
|
|
+ this.allfPlannetweight=0;
|
|
|
this.allfQty = 0;
|
|
|
this.Printinglist.map((e) => {
|
|
|
if (e.fCntqty) {
|
|
|
- this.allfCntqty += e.fCntqty;
|
|
|
+ this.allfCntqty += Number(e.fCntqty);
|
|
|
}
|
|
|
if (e.fGrossweight) {
|
|
|
- this.allfGrossweight += e.fGrossweight;
|
|
|
+ this.allfGrossweight += Number(e.fGrossweight);
|
|
|
}
|
|
|
if (e.fPlanqty) {
|
|
|
- this.allfPlanqty += e.fPlanqty;
|
|
|
+ this.allfPlanqty += Number(e.fPlanqty);
|
|
|
}
|
|
|
if (e.fNetweight) {
|
|
|
- this.allfNetweight += e.fNetweight;
|
|
|
+ this.allfNetweight += Number(e.fNetweight);
|
|
|
}
|
|
|
if (e.fQty) {
|
|
|
- this.allfQty += e.fQty;
|
|
|
+ this.allfQty += Number(e.fQty);
|
|
|
+ }
|
|
|
+ if(e.fPlannetweight){
|
|
|
+ this.allfPlannetweight+=Number(e.fPlannetweight)
|
|
|
}
|
|
|
if (e.fBsdate) {
|
|
|
// let date = new Date(this.Printinglist[0].fBsdate);
|
QuKatie