|
@@ -138,7 +138,7 @@
|
|
</el-tab-pane>
|
|
</el-tab-pane>
|
|
<el-tab-pane label="共享记录" name="outbound_records">
|
|
<el-tab-pane label="共享记录" name="outbound_records">
|
|
<avue-crud :option="optionOutboundRecords" v-model="formContacts" ref="outbound_records"
|
|
<avue-crud :option="optionOutboundRecords" v-model="formContacts" ref="outbound_records"
|
|
- :data="form.outboundRecordsList" @row-save="rowSave" @row-update="rowUpdate"
|
|
|
|
|
|
+ :data="form.shareSalesItemsList" @row-save="rowSave" @row-update="rowUpdate"
|
|
@resetColumn="resetColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 435)"
|
|
@resetColumn="resetColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 435)"
|
|
@saveColumn="saveColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 435)">
|
|
@saveColumn="saveColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 435)">
|
|
<!-- <template slot-scope="{type,size,row,index,disabled}" slot="menu">
|
|
<!-- <template slot-scope="{type,size,row,index,disabled}" slot="menu">
|
|
@@ -1000,16 +1000,20 @@ export default {
|
|
dialogWidth: "80%",
|
|
dialogWidth: "80%",
|
|
column: [{
|
|
column: [{
|
|
label: '支付编号',
|
|
label: '支付编号',
|
|
- prop: 'serialNumber'
|
|
|
|
|
|
+ prop: 'serialNumber',
|
|
|
|
+ overHidden: true,
|
|
}, {
|
|
}, {
|
|
label: '金额',
|
|
label: '金额',
|
|
- prop: 'amount'
|
|
|
|
|
|
+ prop: 'amount',
|
|
|
|
+ overHidden: true,
|
|
}, {
|
|
}, {
|
|
label: '类型',
|
|
label: '类型',
|
|
- prop: 'type'
|
|
|
|
|
|
+ prop: 'type',
|
|
|
|
+ overHidden: true,
|
|
}, {
|
|
}, {
|
|
label: '支付时间',
|
|
label: '支付时间',
|
|
- prop: 'createTime'
|
|
|
|
|
|
+ prop: 'createTime',
|
|
|
|
+ overHidden: true,
|
|
}]
|
|
}]
|
|
},
|
|
},
|
|
optionOutboundRecords: {},
|
|
optionOutboundRecords: {},
|
|
@@ -1030,28 +1034,34 @@ export default {
|
|
dialogTop: 25,
|
|
dialogTop: 25,
|
|
dialogWidth: "80%",
|
|
dialogWidth: "80%",
|
|
column: [{
|
|
column: [{
|
|
- label: '出库单号',
|
|
|
|
- prop: 'billno'
|
|
|
|
|
|
+ label: '商品名称',
|
|
|
|
+ prop: 'goodsName',
|
|
|
|
+ overHidden: true,
|
|
},
|
|
},
|
|
// {
|
|
// {
|
|
// label: '来源单号',
|
|
// label: '来源单号',
|
|
// prop: 'ordNo'
|
|
// prop: 'ordNo'
|
|
// },
|
|
// },
|
|
{
|
|
{
|
|
- label: '数量',
|
|
|
|
- prop: 'goodsTotalNum'
|
|
|
|
|
|
+ label: '商品数量',
|
|
|
|
+ prop: 'goodsNum',
|
|
|
|
+ overHidden: true,
|
|
|
|
+ }, {
|
|
|
|
+ label: '单价',
|
|
|
|
+ prop: 'price',
|
|
|
|
+ overHidden: true,
|
|
}, {
|
|
}, {
|
|
- label: '实际数量',
|
|
|
|
- prop: 'sendTotalNum'
|
|
|
|
|
|
+ label: '小计',
|
|
|
|
+ prop: 'subTotalMoney',
|
|
|
|
+ overHidden: true,
|
|
}, {
|
|
}, {
|
|
- label: '业务类型',
|
|
|
|
- prop: 'bizTypeName'
|
|
|
|
|
|
+ label: '共享公司',
|
|
|
|
+ prop: 'sharedCompanyName',
|
|
|
|
+ overHidden: true,
|
|
}, {
|
|
}, {
|
|
label: '状态',
|
|
label: '状态',
|
|
- prop: 'statusName'
|
|
|
|
- }, {
|
|
|
|
- label: '业务时间',
|
|
|
|
- prop: 'createTime'
|
|
|
|
|
|
+ prop: 'sharedStatus',
|
|
|
|
+ overHidden: true,
|
|
}]
|
|
}]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1167,7 +1177,18 @@ export default {
|
|
},
|
|
},
|
|
allClick(name) {
|
|
allClick(name) {
|
|
if (name == '派发销售单') {
|
|
if (name == '派发销售单') {
|
|
|
|
+ for (let item of this.selectionMultilist) {
|
|
|
|
+ if (!item.id) {
|
|
|
|
+ return this.$message.error("请保存数据");
|
|
|
|
+ }
|
|
|
|
+ if (item.sendNum == item.goodsNum) {
|
|
|
|
+ return this.$message.error("明细存在已派发完的数据,请重新选择");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
this.sharedCompany = null
|
|
this.sharedCompany = null
|
|
|
|
+ this.selectionMultilist.forEach(e => {
|
|
|
|
+ e.outGoodsTotalShipNum = 0
|
|
|
|
+ })
|
|
this.distributeVisible = true
|
|
this.distributeVisible = true
|
|
}
|
|
}
|
|
if (name == '撤销派发') {
|
|
if (name == '撤销派发') {
|
|
@@ -1245,7 +1266,8 @@ export default {
|
|
background: 'rgba(255,255,255,0.7)'
|
|
background: 'rgba(255,255,255,0.7)'
|
|
});
|
|
});
|
|
distributeShareSales(obj).then(res => {
|
|
distributeShareSales(obj).then(res => {
|
|
- this.$message.success("操作成功");
|
|
|
|
|
|
+ this.$message.success("操作成功")
|
|
|
|
+ this.distributeVisible = false
|
|
this.getDetail(this.form.id)
|
|
this.getDetail(this.form.id)
|
|
}).finally(() => {
|
|
}).finally(() => {
|
|
loading.close();
|
|
loading.close();
|