Skip to content

W
WX_h5
Commit 7cb79734 authored by 张锡奇's avatar 张锡奇
Browse files
Options

commit

parent 3ac46b98
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 16 deletions
src/view/tiip/kanban/operate.vue
View file @ 7cb79734
...@@ -114,14 +114,12 @@ export default { ...@@ -114,14 +114,12 @@ export default {
} }
}, },
routerToOperateDetail(row){ routerToOperateDetail(row){
if(row.sType != '成品入库' && row.sType != '收货'){ let data = util.deepClone(row);
let data = util.deepClone(row); data.begin_date = util.dateFormat(this.start,"yyyy-MM-dd");
data.begin_date = util.dateFormat(this.start,"yyyy-MM-dd"); data.end_date = (this.end?util.dateFormat(this.end,"yyyy-MM-dd"):util.dateFormat(new Date,"yyyy-MM-dd"))+' 23:59';
data.end_date = (this.end?util.dateFormat(this.end,"yyyy-MM-dd"):util.dateFormat(new Date,"yyyy-MM-dd"))+' 23:59'; this.$store.dispatch('saveKanbanHdr',data);
this.$store.dispatch('saveKanbanHdr',data); this.$store.dispatch('saveRefresh',true);
this.$store.dispatch('saveRefresh',true); this.$router.push({name:'tiipOperateDetail',type:row.sType})
this.$router.push({name:'tiipOperateDetail',type:row.sType})
}
} }
}, },
} }
......
src/view/tiip/kanban/operateCustomDetail.vue
View file @ 7cb79734
...@@ -111,7 +111,7 @@ export default { ...@@ -111,7 +111,7 @@ export default {
{key:"end_date",value:this.hdr.end_date} {key:"end_date",value:this.hdr.end_date}
]; ];
if(this.type == 'custom'){ if(this.type == 'custom'){
if(this.hdr.sType == '采购' || this.hdr.sType == '加工' || this.hdr.sType == '检验'){ if(this.hdr.sType == '采购' || this.hdr.sType == '加工' || this.hdr.sType == '检验' || this.hdr.sType == '收货' || this.hdr.sType == '成品入库'){
postData.push({key:"upbProviderGUID",value:this.customerItem.upbProviderGUID}) postData.push({key:"upbProviderGUID",value:this.customerItem.upbProviderGUID})
}else{ }else{
postData.push({key:"upbCustomerGUID",value:this.customerItem.upbCustomerGUID}) postData.push({key:"upbCustomerGUID",value:this.customerItem.upbCustomerGUID})
......
src/view/tiip/kanban/operateDetail.vue
View file @ 7cb79734
...@@ -259,6 +259,86 @@ export default { ...@@ -259,6 +259,86 @@ export default {
field:'nAmountHTML', field:'nAmountHTML',
} }
] ]
}else if(this.hdr.sType == '收货'){
this.tabList = [
{
value:'主信息',
key:'0'
},
{
value:'产品信息',
key:'1'
}
];
this.columns = [
{
width:'25%',
name:'供应商',
align:'center',
field:'sProviderNameHTML',
underline:true,
color:'#2d8cf0',
},
{
width:'20%',
name:'数量',
align:'center',
field:'nQtyHTML',
},
{
width:'25%',
name:'金额',
align:'center',
field:'nAmountHTML',
},
{
width:'30%',
name:'业务员',
align:'center',
field:'sCreatorHTML',
underline:true
}
]
}else if(this.hdr.sType == '成品入库'){
this.tabList = [
{
value:'主信息',
key:'0'
},
{
value:'产品信息',
key:'1'
}
];
this.columns = [
{
width:'25%',
name:'供应商',
align:'center',
field:'sProviderNameHTML',
underline:true,
color:'#2d8cf0',
},
{
width:'20%',
name:'数量',
align:'center',
field:'nQtyHTML',
},
{
width:'25%',
name:'金额',
align:'center',
field:'nAmountHTML',
},
{
width:'30%',
name:'仓管员',
align:'center',
field:'sCreatorHTML',
underline:true
}
]
}else{ }else{
this.columns = [ this.columns = [
{ {
...@@ -356,12 +436,16 @@ export default { ...@@ -356,12 +436,16 @@ export default {
{key:"begin_date",value:this.hdr.begin_date}, {key:"begin_date",value:this.hdr.begin_date},
{key:"end_date",value:this.hdr.end_date} {key:"end_date",value:this.hdr.end_date}
] ]
if(this.activeTab == '0' && this.hdr.sType == '加工'){ if(this.activeTab == '0'){
postData[0].value = 'Operation gai sType-customer'; postData[0].value = 'Operation gai sType-customer';
postData.push({key:'sProcessCategory',value:'坯布'}); if(this.hdr.sType == '加工'){
}else if(this.activeTab == '1' && this.hdr.sType == '加工'){ postData.push({key:'sProcessCategory',value:'坯布'});
postData[0].value = 'Operation gai sType-customer'; }
postData.push({key:'sProcessCategory',value:'成品布'}); }else if(this.activeTab == '1'){
if(this.hdr.sType == '加工'){
postData[0].value = 'Operation gai sType-customer';
postData.push({key:'sProcessCategory',value:'成品布'});
}
} }
let res = await this.request('getBoss',{ let res = await this.request('getBoss',{
data:postData, data:postData,
...@@ -369,9 +453,9 @@ export default { ...@@ -369,9 +453,9 @@ export default {
},'加载中',{}) },'加载中',{})
if(this.activeTab == 1 && this.hdr.sType != '加工'){ if(this.activeTab == 1 && this.hdr.sType != '加工'){
res.map(x=>{ res.map(x=>{
x.sMaterial = `<div><span style="color:#FF6633">${x.sSampleMaterialNo}</span><br><span style="color:black;">${x.sSampleMaterialName}</span></div>` x.sMaterial = `<div><span style="color:#FF6633">${x.sSampleMaterialNo}</span><br><span style="color:black;">${this.hdr.sType == '成品入库' ? x.sMaterialName : x.sSampleMaterialName}</span></div>`
x.nAmountHTML = `<div><span style="color:#339966;">${x.nAmount}</span></div>`; x.nAmountHTML = `<div><span style="color:#339966;">${x.nAmount}</span></div>`;
x.nQtyHTML = `<div><span">${x.nQty || x.nOutQty}</span></div>`; x.nQtyHTML = `<div><span">${x.nQty || x.nOutQty || x.nInQty}</span></div>`;
}) })
}else{ }else{
res.map(x=>{ res.map(x=>{
...@@ -382,6 +466,7 @@ export default { ...@@ -382,6 +466,7 @@ export default {
x.nQtyHTML = `<div><span">${x.nQty || x.nOutQty}</span></div>`; x.nQtyHTML = `<div><span">${x.nQty || x.nOutQty}</span></div>`;
x.sMaterialHTML = `<div><span">${x.sSampleMaterialNo || ''}<br>${x.sSampleMaterialName || ''}</span></div>`; x.sMaterialHTML = `<div><span">${x.sSampleMaterialNo || ''}<br>${x.sSampleMaterialName || ''}</span></div>`;
x.sFollowerNameHTML = `<div><span style="text-decoration:underline;">${x.sFollowerName || ''}</span></div>`; x.sFollowerNameHTML = `<div><span style="text-decoration:underline;">${x.sFollowerName || ''}</span></div>`;
x.sCreatorHTML = `<div><span style="text-decoration:underline;">${x.sCreator || ''}</span></div>`;
}) })
} }
this.list = res; this.list = res;
......
src/view/tiip/kanban/operateSaleDetail.vue
View file @ 7cb79734
...@@ -93,6 +93,8 @@ export default { ...@@ -93,6 +93,8 @@ export default {
] ]
if(this.hdr.sType == '采购' || this.hdr.sType == '加工'){ if(this.hdr.sType == '采购' || this.hdr.sType == '加工'){
postData.push({key:"upbFollowerGUID",value:this.orderItem.upbFollowerGUID}); postData.push({key:"upbFollowerGUID",value:this.orderItem.upbFollowerGUID});
}else if(this.hdr.sType == '收货' || this.hdr.sType == '成品入库'){
postData.push({key:"sCreator",value:this.orderItem.sCreator});
}else{ }else{
postData.push({key:"upbSalesGUID",value:this.orderItem.upbSalesGUID}); postData.push({key:"upbSalesGUID",value:this.orderItem.upbSalesGUID});
} }
...@@ -110,6 +112,10 @@ export default { ...@@ -110,6 +112,10 @@ export default {
} }
this.columns[0].field = 'sProviderNameHTML'; this.columns[0].field = 'sProviderNameHTML';
x.sProviderNameHTML = `<div><span style="text-decoration:underline;">${x.sProviderName || ''}</span></div>`; x.sProviderNameHTML = `<div><span style="text-decoration:underline;">${x.sProviderName || ''}</span></div>`;
}else if(this.hdr.sType == '收货' || this.hdr.sType == '成品入库'){
this.columns[0].name = '供应商名称';
this.columns[0].field = 'sProviderNameHTML';
x.sProviderNameHTML = `<div><span style="text-decoration:underline;">${x.sProviderName || ''}</span></div>`;
}else{ }else{
this.columns[0].name = '客户名称'; this.columns[0].name = '客户名称';
this.columns[0].field = 'sCustomerNameHTML'; this.columns[0].field = 'sCustomerNameHTML';
......
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