|
@@ -121,7 +121,7 @@ export default class AddOrder extends Vue {
|
|
load = false;
|
|
load = false;
|
|
freeAmount="";
|
|
freeAmount="";
|
|
productTotal:any=0;
|
|
productTotal:any=0;
|
|
- userName:any='';//用户信息
|
|
|
|
|
|
+ userInfo:any='';//用户信息
|
|
orderValue:any={}; //新增订单值
|
|
orderValue:any={}; //新增订单值
|
|
radioPay=0;
|
|
radioPay=0;
|
|
activeNames:Array<any> =['1','2','3','4','5','save'];
|
|
activeNames:Array<any> =['1','2','3','4','5','save'];
|
|
@@ -217,7 +217,7 @@ export default class AddOrder extends Vue {
|
|
compConfig:{
|
|
compConfig:{
|
|
attr:{
|
|
attr:{
|
|
// placeholder:'请输入订单日期',
|
|
// placeholder:'请输入订单日期',
|
|
- // disabled:true,
|
|
|
|
|
|
+ disabled:true,
|
|
data:[{
|
|
data:[{
|
|
label:'手工下单',
|
|
label:'手工下单',
|
|
value:'ERP'
|
|
value:'ERP'
|
|
@@ -482,28 +482,28 @@ export default class AddOrder extends Vue {
|
|
placeholder:'发票类型',
|
|
placeholder:'发票类型',
|
|
clearable:true,
|
|
clearable:true,
|
|
data:[{
|
|
data:[{
|
|
- value: '1',
|
|
|
|
|
|
+ value: '个人电子普通',
|
|
label: '个人电子普通'
|
|
label: '个人电子普通'
|
|
}, {
|
|
}, {
|
|
- value: '2',
|
|
|
|
|
|
+ value: '单位电子普通',
|
|
label: '单位电子普通'
|
|
label: '单位电子普通'
|
|
}, {
|
|
}, {
|
|
- value: '3',
|
|
|
|
|
|
+ value: '个人纸质普通',
|
|
label: '个人纸质普通'
|
|
label: '个人纸质普通'
|
|
}, {
|
|
}, {
|
|
- value: '4',
|
|
|
|
|
|
+ value: '单位纸质普通',
|
|
label: '单位纸质普通'
|
|
label: '单位纸质普通'
|
|
}, {
|
|
}, {
|
|
- value: '5',
|
|
|
|
|
|
+ value: '个人电子增值税',
|
|
label: '个人电子增值税'
|
|
label: '个人电子增值税'
|
|
}, {
|
|
}, {
|
|
- value: '6',
|
|
|
|
|
|
+ value: '单位电子增值税',
|
|
label: '单位电子增值税'
|
|
label: '单位电子增值税'
|
|
}, {
|
|
}, {
|
|
- value: '7',
|
|
|
|
|
|
+ value: '个人纸质增值税',
|
|
label: '个人纸质增值税'
|
|
label: '个人纸质增值税'
|
|
}, {
|
|
}, {
|
|
- value: '8',
|
|
|
|
|
|
+ value: '单位纸质增值税',
|
|
label: '单位纸质增值税'
|
|
label: '单位纸质增值税'
|
|
}]
|
|
}]
|
|
}
|
|
}
|
|
@@ -658,8 +658,8 @@ export default class AddOrder extends Vue {
|
|
}
|
|
}
|
|
},{
|
|
},{
|
|
span:6,
|
|
span:6,
|
|
- label:'支付账号',
|
|
|
|
- prop:'buyerAccount',
|
|
|
|
|
|
+ label:'支付单号',
|
|
|
|
+ prop:'outerPayId',
|
|
component:'by-input',
|
|
component:'by-input',
|
|
rules:[
|
|
rules:[
|
|
{ required: true, message: '请选择支付日期', trigger: 'change' }
|
|
{ required: true, message: '请选择支付日期', trigger: 'change' }
|
|
@@ -674,7 +674,7 @@ export default class AddOrder extends Vue {
|
|
[{
|
|
[{
|
|
span:6,
|
|
span:6,
|
|
label:'支付金额',
|
|
label:'支付金额',
|
|
- prop:'buyerAccount',
|
|
|
|
|
|
+ prop:'amount',
|
|
component:'by-input',
|
|
component:'by-input',
|
|
rules:[
|
|
rules:[
|
|
{ required: true, message: '请输入支付金额', trigger: 'blur' }
|
|
{ required: true, message: '请输入支付金额', trigger: 'blur' }
|
|
@@ -688,8 +688,8 @@ export default class AddOrder extends Vue {
|
|
}
|
|
}
|
|
},{
|
|
},{
|
|
span:6,
|
|
span:6,
|
|
- label:'买家账号',
|
|
|
|
- prop:'buyerPaymentId',
|
|
|
|
|
|
+ label:'买家收款账号',
|
|
|
|
+ prop:'buyerAccount',
|
|
component:'by-input',
|
|
component:'by-input',
|
|
compConfig:{
|
|
compConfig:{
|
|
attr:{
|
|
attr:{
|
|
@@ -699,8 +699,8 @@ export default class AddOrder extends Vue {
|
|
}
|
|
}
|
|
},{
|
|
},{
|
|
span:6,
|
|
span:6,
|
|
- label:'收款账号',
|
|
|
|
- prop:'sellerId',
|
|
|
|
|
|
+ label:'卖家收款账号',
|
|
|
|
+ prop:'sellerAccount',
|
|
component:'by-input',
|
|
component:'by-input',
|
|
compConfig:{
|
|
compConfig:{
|
|
attr:{
|
|
attr:{
|
|
@@ -729,8 +729,8 @@ export default class AddOrder extends Vue {
|
|
this.orderValue.isPay = v;
|
|
this.orderValue.isPay = v;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- mounted(){
|
|
|
|
- this.userName = this.$store.getters.name;
|
|
|
|
|
|
+ created(){
|
|
|
|
+ this.userInfo = this.$store.getters.userInfo;
|
|
}
|
|
}
|
|
show(){
|
|
show(){
|
|
this.baseConfig = (this as any).$lodash.cloneDeep(this.config);
|
|
this.baseConfig = (this as any).$lodash.cloneDeep(this.config);
|
|
@@ -814,7 +814,7 @@ export default class AddOrder extends Vue {
|
|
|
|
|
|
}else{
|
|
}else{
|
|
let value:any = (this.$refs.baseform as any).getValue();
|
|
let value:any = (this.$refs.baseform as any).getValue();
|
|
- value.createBy = this.userName;
|
|
|
|
|
|
+ value.createBy = this.userInfo.userName;
|
|
(this.$refs.baseform as any).setValue(value);
|
|
(this.$refs.baseform as any).setValue(value);
|
|
}
|
|
}
|
|
(this.$refs.baseform as any).setConfig(this.baseConfig);
|
|
(this.$refs.baseform as any).setConfig(this.baseConfig);
|
|
@@ -896,17 +896,17 @@ export default class AddOrder extends Vue {
|
|
//商品处理
|
|
//商品处理
|
|
productHandle(data:Array<any>,isGift:boolean){
|
|
productHandle(data:Array<any>,isGift:boolean){
|
|
let nowData = (this.$refs.table as any).getValue();
|
|
let nowData = (this.$refs.table as any).getValue();
|
|
- let ids='';
|
|
|
|
|
|
+ let names='';
|
|
if(data.length > 0){
|
|
if(data.length > 0){
|
|
for(const item of data){
|
|
for(const item of data){
|
|
let t = true;
|
|
let t = true;
|
|
let v = isGift ? 1 : 0;
|
|
let v = isGift ? 1 : 0;
|
|
for(const t_item of nowData){
|
|
for(const t_item of nowData){
|
|
if(item.id == t_item.itemId && t_item.isGift == v){
|
|
if(item.id == t_item.itemId && t_item.isGift == v){
|
|
- if(!ids){
|
|
|
|
- ids = item.skuCode
|
|
|
|
|
|
+ if(!names){
|
|
|
|
+ names = item.skuTitle
|
|
}else{
|
|
}else{
|
|
- ids = ids + ',' + item.skuCode
|
|
|
|
|
|
+ names = names + ',' + item.skuTitle
|
|
}
|
|
}
|
|
t = false;
|
|
t = false;
|
|
break;
|
|
break;
|
|
@@ -917,7 +917,7 @@ export default class AddOrder extends Vue {
|
|
obj.name = item.skuTitle; //商品名称
|
|
obj.name = item.skuTitle; //商品名称
|
|
obj.skuId = item.skuCode; //商品编码
|
|
obj.skuId = item.skuCode; //商品编码
|
|
obj.itemId = item.id;
|
|
obj.itemId = item.id;
|
|
- obj.styleId = item.newNumber; //款式编码
|
|
|
|
|
|
+ obj.styleId = item.itemNumber; //款式编码
|
|
obj.qty = 1;
|
|
obj.qty = 1;
|
|
if(isGift){
|
|
if(isGift){
|
|
obj.price = 0; //单价
|
|
obj.price = 0; //单价
|
|
@@ -929,7 +929,7 @@ export default class AddOrder extends Vue {
|
|
|
|
|
|
obj.basePrice = item.price; //原价
|
|
obj.basePrice = item.price; //原价
|
|
obj.amount = item.price;
|
|
obj.amount = item.price;
|
|
- obj.stock = item.stock;
|
|
|
|
|
|
+ // obj.stock = item.stock;
|
|
nowData.push(obj)
|
|
nowData.push(obj)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -940,9 +940,9 @@ export default class AddOrder extends Vue {
|
|
this.payAmountChange();
|
|
this.payAmountChange();
|
|
}
|
|
}
|
|
this.totalNum();
|
|
this.totalNum();
|
|
- if(ids){
|
|
|
|
|
|
+ if(names){
|
|
let name = isGift ? '赠品' : '商品';
|
|
let name = isGift ? '赠品' : '商品';
|
|
- this.$alert(name+'“'+ids+'”已存在!', '提示', {
|
|
|
|
|
|
+ this.$alert(name+'“'+names+'”已存在!', '提示', {
|
|
confirmButtonText: '确定',
|
|
confirmButtonText: '确定',
|
|
callback: action => {}
|
|
callback: action => {}
|
|
});
|
|
});
|
|
@@ -1065,6 +1065,7 @@ export default class AddOrder extends Vue {
|
|
if(payFormValue.payDate){
|
|
if(payFormValue.payDate){
|
|
payFormValue.payDate = payFormValue.payDate + ' 00:00:00'
|
|
payFormValue.payDate = payFormValue.payDate + ' 00:00:00'
|
|
}
|
|
}
|
|
|
|
+ payFormValue.sellerId = this.userInfo.userId;
|
|
this.orderValue.pays.push(payFormValue);
|
|
this.orderValue.pays.push(payFormValue);
|
|
resolve();
|
|
resolve();
|
|
}).catch(()=>{
|
|
}).catch(()=>{
|