|
@@ -465,13 +465,13 @@
|
|
<td class="col">{{printData1[index].weighingManagement.goodsName}}</td>
|
|
<td class="col">{{printData1[index].weighingManagement.goodsName}}</td>
|
|
<td class="col col-bgc">类型</td>
|
|
<td class="col col-bgc">类型</td>
|
|
<td class="col">{{printData1[index].weighingManagement.type}}</td>
|
|
<td class="col">{{printData1[index].weighingManagement.type}}</td>
|
|
- <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName != '大豆'?'容量(克/升)':'蛋白'}}</td>
|
|
|
|
|
|
+ <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName == '大豆'?'蛋白':'容量(克/升)'}}</td>
|
|
<td class="col">
|
|
<td class="col">
|
|
- {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.bulkDensity:''}}
|
|
|
|
|
|
+ {{printData1[index].weighingManagement.goodsName == '大豆'?printData1[index].qualityInspectionManagement.protein:printData1[index].qualityInspectionManagement.bulkDensity}}
|
|
</td>
|
|
</td>
|
|
- <td class="col col-bgc">不完善粒(%)</td>
|
|
|
|
|
|
+ <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName == '大豆'?'完整粒率(%)':'不完善粒(%)'}}</td>
|
|
<td class="col">
|
|
<td class="col">
|
|
- {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.imperfectGrain:''}}
|
|
|
|
|
|
+ {{printData1[index].weighingManagement.goodsName == '大豆'?printData1[index].qualityInspectionManagement.completeGrain:printData1[index].qualityInspectionManagement.imperfectGrain}}
|
|
</td>
|
|
</td>
|
|
</tr>
|
|
</tr>
|
|
<tr class="row">
|
|
<tr class="row">
|
|
@@ -684,7 +684,7 @@
|
|
<td class="col">
|
|
<td class="col">
|
|
{{ printData.qualityInspectionManagement.impurity}}
|
|
{{ printData.qualityInspectionManagement.impurity}}
|
|
</td>
|
|
</td>
|
|
- <td class="col">{{printData.qualityInspectionManagement?printData.qualityInspectionManagement.bulkDensity:''}}</td>
|
|
|
|
|
|
+ <td class="col">{{printData.goodsName== '大豆'?printData.qualityInspectionManagement.protein:printData.qualityInspectionManagement.bulkDensity}}</td>
|
|
<td class="col">{{ printData.grossWeight}}</td>
|
|
<td class="col">{{ printData.grossWeight}}</td>
|
|
<td class="col">{{ printData.tare}}</td>
|
|
<td class="col">{{ printData.tare}}</td>
|
|
<td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'
|
|
<td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'
|
|
@@ -708,7 +708,7 @@
|
|
<td class="col col-bgc">粮款</td>
|
|
<td class="col col-bgc">粮款</td>
|
|
<td class="col col-bgc">霉变粒</td>
|
|
<td class="col col-bgc">霉变粒</td>
|
|
<td class="col col-bgc">热损伤</td>
|
|
<td class="col col-bgc">热损伤</td>
|
|
- <td class="col col-bgc">不完善粒</td>
|
|
|
|
|
|
+ <td class="col col-bgc">{{printData.goodsName== '大豆'?'完整粒率(%)':"不完善粒"}}</td>
|
|
<td class="col col-bgc">扣重比</td>
|
|
<td class="col col-bgc">扣重比</td>
|
|
<td v-if="printData.type == '潮粮'" class="col col-bgc">扣量%</td>
|
|
<td v-if="printData.type == '潮粮'" class="col col-bgc">扣量%</td>
|
|
<td :colspan="printData.type == '潮粮'?1:2" class="col col-bgc">仓位号</td>
|
|
<td :colspan="printData.type == '潮粮'?1:2" class="col col-bgc">仓位号</td>
|
|
@@ -734,7 +734,7 @@
|
|
</td>
|
|
</td>
|
|
<td class="col "> {{printData.qualityInspectionManagement.mildewGrain}}</td>
|
|
<td class="col "> {{printData.qualityInspectionManagement.mildewGrain}}</td>
|
|
<td class="col "> {{printData.qualityInspectionManagement.jiaorenli}}</td>
|
|
<td class="col "> {{printData.qualityInspectionManagement.jiaorenli}}</td>
|
|
- <td class="col "> {{printData.qualityInspectionManagement.imperfectGrain}}</td>
|
|
|
|
|
|
+ <td class="col "> {{printData.goodsName== '大豆'?printData.qualityInspectionManagement.completeGrain:printData.qualityInspectionManagement.imperfectGrain}}</td>
|
|
<td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData.buckleWeightRatio}}</td>
|
|
<td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData.buckleWeightRatio}}</td>
|
|
<td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type == '潮粮'">{{ (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
|
|
<td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type == '潮粮'">{{ (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
|
|
<td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type == '潮粮'"></td>
|
|
<td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type == '潮粮'"></td>
|
|
@@ -875,7 +875,7 @@
|
|
<td class="col col-bgc">等级</td>
|
|
<td class="col col-bgc">等级</td>
|
|
<td class="col col-bgc">水分%</td>
|
|
<td class="col col-bgc">水分%</td>
|
|
<td class="col col-bgc">杂质%</td>
|
|
<td class="col col-bgc">杂质%</td>
|
|
- <td class="col col-bgc">{{printData.goodsName!= '大豆'?'容重':'蛋白'}}</td>
|
|
|
|
|
|
+ <td class="col col-bgc">{{printData.goodsName== '大豆'?'蛋白':'容重'}}</td>
|
|
<td class="col col-bgc">毛重</td>
|
|
<td class="col col-bgc">毛重</td>
|
|
<td class="col col-bgc">皮重</td>
|
|
<td class="col col-bgc">皮重</td>
|
|
<td class="col col-bgc">扣重</td>
|
|
<td class="col col-bgc">扣重</td>
|
|
@@ -895,7 +895,7 @@
|
|
<td class="col">
|
|
<td class="col">
|
|
{{ printData.qualityInspectionManagement.impurity}}
|
|
{{ printData.qualityInspectionManagement.impurity}}
|
|
</td>
|
|
</td>
|
|
- <td class="col">{{printData.qualityInspectionManagement?printData.qualityInspectionManagement.bulkDensity:''}}</td>
|
|
|
|
|
|
+ <td class="col">{{printData.goodsName== '大豆'?printData.qualityInspectionManagement.protein:printData.qualityInspectionManagement.bulkDensity}}</td>
|
|
<td class="col">{{ printData.grossWeight}}</td>
|
|
<td class="col">{{ printData.grossWeight}}</td>
|
|
<td class="col">{{ printData.tare}}</td>
|
|
<td class="col">{{ printData.tare}}</td>
|
|
<td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'
|
|
<td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'
|
|
@@ -919,7 +919,7 @@
|
|
<td class="col col-bgc">粮款</td>
|
|
<td class="col col-bgc">粮款</td>
|
|
<td class="col col-bgc">霉变粒</td>
|
|
<td class="col col-bgc">霉变粒</td>
|
|
<td class="col col-bgc">热损伤</td>
|
|
<td class="col col-bgc">热损伤</td>
|
|
- <td class="col col-bgc">不完善粒</td>
|
|
|
|
|
|
+ <td class="col col-bgc">{{printData.goodsName== '大豆'?'完整粒率(%)':'不完善粒'}}</td>
|
|
<td class="col col-bgc">扣重比</td>
|
|
<td class="col col-bgc">扣重比</td>
|
|
<td v-if="printData.type == '潮粮'" class="col col-bgc">扣量%</td>
|
|
<td v-if="printData.type == '潮粮'" class="col col-bgc">扣量%</td>
|
|
<td :colspan="printData.type == '潮粮'?1:2" class="col col-bgc">仓位号</td>
|
|
<td :colspan="printData.type == '潮粮'?1:2" class="col col-bgc">仓位号</td>
|
|
@@ -945,7 +945,7 @@
|
|
</td>
|
|
</td>
|
|
<td class="col "> {{printData.qualityInspectionManagement.mildewGrain}}</td>
|
|
<td class="col "> {{printData.qualityInspectionManagement.mildewGrain}}</td>
|
|
<td class="col "> {{printData.qualityInspectionManagement.jiaorenli}}</td>
|
|
<td class="col "> {{printData.qualityInspectionManagement.jiaorenli}}</td>
|
|
- <td class="col "> {{printData.qualityInspectionManagement.imperfectGrain}}</td>
|
|
|
|
|
|
+ <td class="col "> {{printData.goodsName== '大豆'?printData.qualityInspectionManagement.completeGrain:printData.qualityInspectionManagement.imperfectGrain}}</td>
|
|
<td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData.buckleWeightRatio}}</td>
|
|
<td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData.buckleWeightRatio}}</td>
|
|
<td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type != '潮粮'">{{ (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
|
|
<td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type != '潮粮'">{{ (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
|
|
<td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type != '潮粮'"></td>
|
|
<td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type != '潮粮'"></td>
|
|
@@ -1060,13 +1060,13 @@
|
|
<td class="col">{{tableData.goodsName}}</td>
|
|
<td class="col">{{tableData.goodsName}}</td>
|
|
<td class="col col-bgc">类型</td>
|
|
<td class="col col-bgc">类型</td>
|
|
<td class="col">{{tableData.type}}</td>
|
|
<td class="col">{{tableData.type}}</td>
|
|
- <td class="col col-bgc">{{tableData.goodsName != '大豆'?'容量(克/升)':'蛋白'}}</td>
|
|
|
|
|
|
+ <td class="col col-bgc">{{tableData.goodsName == '大豆'?'蛋白':'容量(克/升)'}}</td>
|
|
<td class="col">
|
|
<td class="col">
|
|
- {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}
|
|
|
|
|
|
+ {{tableData.goodsName == '大豆'?tableData.qualityInspectionManagement.protein:tableData.qualityInspectionManagement.bulkDensity}}
|
|
</td>
|
|
</td>
|
|
- <td class="col col-bgc">不完善粒(%)</td>
|
|
|
|
|
|
+ <td class="col col-bgc">{{tableData.goodsName == '大豆'?'完整粒率(%)':'不完善粒(%)'}}</td>
|
|
<td class="col">
|
|
<td class="col">
|
|
- {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.imperfectGrain:''}}
|
|
|
|
|
|
+ {{tableData.goodsName == '大豆'?tableData.qualityInspectionManagement.completeGrain:tableData.qualityInspectionManagement.imperfectGrain}}
|
|
</td>
|
|
</td>
|
|
</tr>
|
|
</tr>
|
|
<tr class="row">
|
|
<tr class="row">
|
|
@@ -1463,7 +1463,6 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- debugger
|
|
|
|
this.printData = JSON.parse(_data)
|
|
this.printData = JSON.parse(_data)
|
|
//地址过长截取
|
|
//地址过长截取
|
|
if (this.printData.identityAuthenticationInfo && this.printData.identityAuthenticationInfo.compAddress.length > 24) {
|
|
if (this.printData.identityAuthenticationInfo && this.printData.identityAuthenticationInfo.compAddress.length > 24) {
|
|
@@ -1489,7 +1488,6 @@
|
|
localStorage.getItem('selectPrint_selectCustomerList')
|
|
localStorage.getItem('selectPrint_selectCustomerList')
|
|
)
|
|
)
|
|
} else {
|
|
} else {
|
|
- debugger
|
|
|
|
if (cwprint == 'true') {
|
|
if (cwprint == 'true') {
|
|
this.customerList = JSON.parse(localStorage.getItem('printData1'))
|
|
this.customerList = JSON.parse(localStorage.getItem('printData1'))
|
|
}
|
|
}
|