|
@@ -783,25 +783,25 @@
|
|
|
},
|
|
},
|
|
|
async saleOrderSubmit(id) {
|
|
async saleOrderSubmit(id) {
|
|
|
this.$refs.addDialogRef && this.$refs.addDialogRef.cancel();
|
|
this.$refs.addDialogRef && this.$refs.addDialogRef.cancel();
|
|
|
- const data = await getSaleOrderDetail(id);
|
|
|
|
|
|
|
+ // const data = await getSaleOrderDetail(id);
|
|
|
|
|
|
|
|
this.processSubmitDialogFlag = true;
|
|
this.processSubmitDialogFlag = true;
|
|
|
let businessType =
|
|
let businessType =
|
|
|
- data.needProduce == 1
|
|
|
|
|
|
|
+ this.current.needProduce == 1
|
|
|
? '有客户生产性订单'
|
|
? '有客户生产性订单'
|
|
|
- : data.needProduce == 2
|
|
|
|
|
|
|
+ : this.current.needProduce == 2
|
|
|
? '无客户生产性订单'
|
|
? '无客户生产性订单'
|
|
|
- : data.needProduce == 4
|
|
|
|
|
|
|
+ : this.current.needProduce == 4
|
|
|
? '不定向订单'
|
|
? '不定向订单'
|
|
|
: '库存式订单';
|
|
: '库存式订单';
|
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
|
let params = {
|
|
let params = {
|
|
|
- businessId: data.id,
|
|
|
|
|
|
|
+ businessId: this.current.id,
|
|
|
businessKey: 'sales_order_approve',
|
|
businessKey: 'sales_order_approve',
|
|
|
- formCreateUserId: data.createUserId,
|
|
|
|
|
|
|
+ formCreateUserId: this.current.createUserId,
|
|
|
variables: {
|
|
variables: {
|
|
|
- businessCode: data.orderNo,
|
|
|
|
|
- businessName: data.partaName,
|
|
|
|
|
|
|
+ businessCode: this.current.orderNo,
|
|
|
|
|
+ businessName: this.current.partaName,
|
|
|
businessType: businessType
|
|
businessType: businessType
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
@@ -820,10 +820,9 @@
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
async saleOrderSubmitOrGenerate(res) {
|
|
async saleOrderSubmitOrGenerate(res) {
|
|
|
-
|
|
|
|
|
this.tableList = [];
|
|
this.tableList = [];
|
|
|
- this.current = res;
|
|
|
|
|
- if (!res.generatePurchase && !res.generateProduce) {
|
|
|
|
|
|
|
+ this.current = await getSaleOrderDetail(res.id);
|
|
|
|
|
+ if (!this.current.generatePurchase && !this.current.generateProduce) {
|
|
|
this.saleOrderSubmit(res.id);
|
|
this.saleOrderSubmit(res.id);
|
|
|
} else {
|
|
} else {
|
|
|
const data = await getByRepeatBomAttribute(res.id);
|
|
const data = await getByRepeatBomAttribute(res.id);
|