Skip to content
GitLab
"git@ustchcs.com:gujinli1118/eladmin.git" did not exist on "4b355067eba02c788b0cc97540f8bc256d0ea1a0"
Commit 3df276db authored by 季圣华's avatar 季圣华
Browse files

优化单据，增加退货单的链接和列表提示

parent 88985562
Hide whitespace changes
Inline Side-by-side
jshERP-web/src/views/bill/AllocationOutList.vue
View file @ 3df276db
...@@ -176,15 +176,7 @@ ...@@ -176,15 +176,7 @@
align:"center", width: 150, align:"center", width: 150,
scopedSlots: { customRender: 'action' }, scopedSlots: { customRender: 'action' },
}, },
{ title: '单据编号', dataIndex: 'number',width:160, { title: '单据编号', dataIndex: 'number',width:160},
customRender:function (text,record,index) {
if(record.linkNumber) {
return text + "[转]";
} else {
return text;
}
}
},
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true, { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
customRender:function (text,record,index) { customRender:function (text,record,index) {
if(text) { if(text) {
......
jshERP-web/src/views/bill/AssembleList.vue
View file @ 3df276db
...@@ -176,15 +176,7 @@ ...@@ -176,15 +176,7 @@
align:"center", width: 150, align:"center", width: 150,
scopedSlots: { customRender: 'action' }, scopedSlots: { customRender: 'action' },
}, },
{ title: '单据编号', dataIndex: 'number',width:160, { title: '单据编号', dataIndex: 'number',width:160},
customRender:function (text,record,index) {
if(record.linkNumber) {
return text + "[转]";
} else {
return text;
}
}
},
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true, { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
customRender:function (text,record,index) { customRender:function (text,record,index) {
if(text) { if(text) {
......
jshERP-web/src/views/bill/DisassembleList.vue
View file @ 3df276db
...@@ -176,15 +176,7 @@ ...@@ -176,15 +176,7 @@
align:"center", width: 150, align:"center", width: 150,
scopedSlots: { customRender: 'action' }, scopedSlots: { customRender: 'action' },
}, },
{ title: '单据编号', dataIndex: 'number',width:160, { title: '单据编号', dataIndex: 'number',width:160},
customRender:function (text,record,index) {
if(record.linkNumber) {
return text + "[转]";
} else {
return text;
}
}
},
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true, { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
customRender:function (text,record,index) { customRender:function (text,record,index) {
if(text) { if(text) {
......
jshERP-web/src/views/bill/OtherInList.vue
View file @ 3df276db
...@@ -193,15 +193,7 @@ ...@@ -193,15 +193,7 @@
scopedSlots: { customRender: 'action' }, scopedSlots: { customRender: 'action' },
}, },
{ title: '供应商', dataIndex: 'organName',width:120, ellipsis:true}, { title: '供应商', dataIndex: 'organName',width:120, ellipsis:true},
{ title: '单据编号', dataIndex: 'number',width:160, { title: '单据编号', dataIndex: 'number',width:160},
customRender:function (text,record,index) {
if(record.linkNumber) {
return text + "[转]";
} else {
return text;
}
}
},
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true, { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
customRender:function (text,record,index) { customRender:function (text,record,index) {
if(text) { if(text) {
......
jshERP-web/src/views/bill/OtherOutList.vue
View file @ 3df276db
...@@ -193,15 +193,7 @@ ...@@ -193,15 +193,7 @@
scopedSlots: { customRender: 'action' }, scopedSlots: { customRender: 'action' },
}, },
{ title: '客户', dataIndex: 'organName',width:120, ellipsis:true}, { title: '客户', dataIndex: 'organName',width:120, ellipsis:true},
{ title: '单据编号', dataIndex: 'number',width:160, { title: '单据编号', dataIndex: 'number',width:160},
customRender:function (text,record,index) {
if(record.linkNumber) {
return text + "[转]";
} else {
return text;
}
}
},
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true, { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
customRender:function (text,record,index) { customRender:function (text,record,index) {
if(text) { if(text) {
......
jshERP-web/src/views/bill/PurchaseBackList.vue
View file @ 3df276db
...@@ -205,11 +205,8 @@ ...@@ -205,11 +205,8 @@
{ title: '供应商', dataIndex: 'organName',width:120, ellipsis:true}, { title: '供应商', dataIndex: 'organName',width:120, ellipsis:true},
{ title: '单据编号', dataIndex: 'number',width:160, { title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) { customRender:function (text,record,index) {
if(record.linkNumber) { text = record.linkNumber?text+"[转]":text
return text + "[转]"; return text
} else {
return text;
}
} }
}, },
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true, { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
......
jshERP-web/src/views/bill/PurchaseInList.vue
View file @ 3df276db
...@@ -221,11 +221,9 @@ ...@@ -221,11 +221,9 @@
{ title: '供应商', dataIndex: 'organName',width:120, ellipsis:true}, { title: '供应商', dataIndex: 'organName',width:120, ellipsis:true},
{ title: '单据编号', dataIndex: 'number',width:160, { title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) { customRender:function (text,record,index) {
if(record.linkNumber) { text = record.linkNumber?text+"[订]":text
return text + "[订]"; text = record.hasBackFlag?text+"[退]":text
} else { return text
return text;
}
} }
}, },
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true, { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
......
jshERP-web/src/views/bill/PurchaseOrderList.vue
View file @ 3df276db
...@@ -185,11 +185,8 @@ ...@@ -185,11 +185,8 @@
{ title: '供应商', dataIndex: 'organName',width:120, ellipsis:true}, { title: '供应商', dataIndex: 'organName',width:120, ellipsis:true},
{ title: '单据编号', dataIndex: 'number',width:160, { title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) { customRender:function (text,record,index) {
if(record.linkNumber) { text = record.linkNumber?text+"[转]":text
return text + "[转]"; return text
} else {
return text;
}
} }
}, },
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true, { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
......
jshERP-web/src/views/bill/RetailBackList.vue
View file @ 3df276db
...@@ -205,11 +205,8 @@ ...@@ -205,11 +205,8 @@
{ title: '会员', dataIndex: 'organName',width:120, ellipsis:true}, { title: '会员', dataIndex: 'organName',width:120, ellipsis:true},
{ title: '单据编号', dataIndex: 'number',width:160, { title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) { customRender:function (text,record,index) {
if(record.linkNumber) { text = record.linkNumber?text+"[转]":text
return text + "[转]"; return text
} else {
return text;
}
} }
}, },
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true, { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
......
jshERP-web/src/views/bill/RetailOutList.vue
View file @ 3df276db
...@@ -199,11 +199,8 @@ ...@@ -199,11 +199,8 @@
{ title: '会员', dataIndex: 'organName',width:120, ellipsis:true}, { title: '会员', dataIndex: 'organName',width:120, ellipsis:true},
{ title: '单据编号', dataIndex: 'number',width:160, { title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) { customRender:function (text,record,index) {
if(record.linkNumber) { text = record.hasBackFlag?text+"[退]":text
return text + "[转]"; return text
} else {
return text;
}
} }
}, },
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true, { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
......
jshERP-web/src/views/bill/SaleBackList.vue
View file @ 3df276db
...@@ -205,11 +205,8 @@ ...@@ -205,11 +205,8 @@
{ title: '客户', dataIndex: 'organName',width:120, ellipsis:true}, { title: '客户', dataIndex: 'organName',width:120, ellipsis:true},
{ title: '单据编号', dataIndex: 'number',width:160, { title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) { customRender:function (text,record,index) {
if(record.linkNumber) { text = record.linkNumber?text+"[转]":text
return text + "[转]"; return text
} else {
return text;
}
} }
}, },
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true, { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
......
jshERP-web/src/views/bill/SaleOutList.vue
View file @ 3df276db
...@@ -221,11 +221,9 @@ ...@@ -221,11 +221,9 @@
{ title: '客户', dataIndex: 'organName',width:120, ellipsis:true}, { title: '客户', dataIndex: 'organName',width:120, ellipsis:true},
{ title: '单据编号', dataIndex: 'number',width:160, { title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) { customRender:function (text,record,index) {
if(record.linkNumber) { text = record.linkNumber?text+"[订]":text
return text + "[订]"; text = record.hasBackFlag?text+"[退]":text
} else { return text
return text;
}
} }
}, },
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true, { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
......
jshERP-web/src/views/bill/dialog/BillDetail.vue
View file @ 3df276db
...@@ -95,6 +95,13 @@ ...@@ -95,6 +95,13 @@
{{model.accountName}} {{model.accountName}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col v-if="model.hasBackFlag" :lg="24" :md="6" :sm="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退货单号">
<template v-for="(item, index) in linkNumberList">
<a @click="myHandleDetail(item.number)">{{item.number}}</a><br/>
</template>
</a-form-item>
</a-col>
</a-row> </a-row>
</a-col> </a-col>
</a-row> </a-row>
...@@ -346,6 +353,15 @@ ...@@ -346,6 +353,15 @@
{{model.debt}} {{model.debt}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col v-if="model.hasBackFlag" :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退货单号">
<template v-for="(item, index) in linkNumberList">
<a @click="myHandleDetail(item.number)">{{item.number}}</a><br/>
</template>
</a-form-item>
</a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col v-if="financialBillNoList.length" :span="6"> <a-col v-if="financialBillNoList.length" :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款单号"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款单号">
<template v-for="(item, index) in financialBillNoList"> <template v-for="(item, index) in financialBillNoList">
...@@ -608,7 +624,13 @@ ...@@ -608,7 +624,13 @@
{{model.debt}} {{model.debt}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"></a-col> <a-col v-if="model.hasBackFlag" :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退货单号">
<template v-for="(item, index) in linkNumberList">
<a @click="myHandleDetail(item.number)">{{item.number}}</a><br/>
</template>
</a-form-item>
</a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :span="6"> <a-col :span="6">
...@@ -1003,6 +1025,7 @@ ...@@ -1003,6 +1025,7 @@
billPrintFlag: false, billPrintFlag: false,
fileList: [], fileList: [],
purchaseBySaleFlag: false, purchaseBySaleFlag: false,
linkNumberList: [],
financialBillNoList: [], financialBillNoList: [],
tableWidth: { tableWidth: {
'width': '1500px' 'width': '1500px'
...@@ -1415,6 +1438,13 @@ ...@@ -1415,6 +1438,13 @@
} }
}) })
}, },
getBillListByLinkNumber(number) {
getAction('/depotHead/getBillListByLinkNumber', {number: number}).then(res => {
if(res && res.code === 200){
this.linkNumberList = res.data
}
})
},
getFinancialBillNoByBillId(billId) { getFinancialBillNoByBillId(billId) {
getAction('/accountHead/getFinancialBillNoByBillId', {billId: billId}).then(res => { getAction('/accountHead/getFinancialBillNoByBillId', {billId: billId}).then(res => {
if(res && res.code === 200){ if(res && res.code === 200){
...@@ -1453,6 +1483,7 @@ ...@@ -1453,6 +1483,7 @@
this.requestSubTableData(record, type, url, params); this.requestSubTableData(record, type, url, params);
this.initPlatform() this.initPlatform()
this.getSystemConfig() this.getSystemConfig()
this.getBillListByLinkNumber(this.model.number)
this.getFinancialBillNoByBillId(this.model.id) this.getFinancialBillNoByBillId(this.model.id)
}, },
requestSubTableData(record, type, url, params, success) { requestSubTableData(record, type, url, params, success) {
......
Supports Markdown
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