Commit 26e07ddd authored by 张锡奇's avatar 张锡奇

upload

parent 20c961a9
......@@ -60,7 +60,7 @@
<div>{{Number(v.nPieces||0).toLocaleString()}}</div>
</td>
<td>
<div>{{Number(v.nAmount||0).toLocaleString()}}</div>
<div>{{ v.sType == '收货' || v.sType == '检验' || v.sType == '成品入库' ? '' : Number(v.nAmount||0).toLocaleString()}}</div>
</td>
</tr>
</table>
......
......@@ -19,7 +19,7 @@
<div class="iCard" style="margin-bottom:8px;height:100%;" v-show="hdr.sType == '检验' && type == 'material'">
<div ref='chart' style="width:100%;height:100%;"/>
</div>
<div class="Table" v-show="hdr.sType == '检验'">
<div class="Table" :hidden="hdr.sType == '检验' && type == 'material'">
<customerTable :showFooter="true" :columns="columns" :list="list" :tableStyle="tableStyle"></customerTable>
</div>
</div>
......@@ -200,7 +200,6 @@ export default {
field:this.hdr.sType == '超期应付' ? 'sPayableNO' : 'sReceivableNO',
underline:true,
color:'#2d8cf0',
field:this.hdr.sType == '超期应付' ? params.row.sPayableNO : params.row.sReceivableNO,
render: (h,params) => {
return h('span',{
style: {
......@@ -312,8 +311,8 @@ export default {
if(this.hdr.sType == '检验' && this.type == 'material'){
this.$nextTick(async ()=>{
await this.init()
})
await this.getMaterialData();
})
window.onresize = ()=> {
var resizeWorldMapContainer = ()=> {
this.$refs['chart'].style.width = window.innerWidth+'px';
......
......@@ -430,6 +430,22 @@ export default {
underline:true
}
]
this.columns1 = [
{
width:'50%',
name:'产品',
align:'center',
field:'sMaterial',
color:'#2d8cf0',
underline:true,
},
{
width:'50%',
name:'数量',
align:'center',
field:'nQtyHTML',
}
]
}else if(this.hdr.sType == '成品入库'){
this.tabList = [
{
......@@ -464,6 +480,22 @@ export default {
underline:true
}
]
this.columns1 = [
{
width:'50%',
name:'产品',
align:'center',
field:'sMaterial',
color:'#2d8cf0',
underline:true,
},
{
width:'50%',
name:'数量',
align:'center',
field:'nQtyHTML',
}
]
}else if(this.hdr.sType == '销售退货' || this.hdr.sType == '采购退货'){
this.tabList = [
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment