|
|
@@ -3,7 +3,6 @@
|
|
|
<el-form label-width="100px" ref="formRef" :model="form">
|
|
|
<el-form-item
|
|
|
label="审批建议"
|
|
|
-
|
|
|
style="margin-bottom: 20px"
|
|
|
:rules="{
|
|
|
required: true,
|
|
|
@@ -41,7 +40,7 @@
|
|
|
icon="el-icon-circle-close"
|
|
|
type="danger"
|
|
|
size="mini"
|
|
|
- @click="handleAudit(0)"
|
|
|
+ @click="approveTaskWithVariables(0)"
|
|
|
v-if="
|
|
|
!['starter'].includes(taskDefinitionKey) &&
|
|
|
outInData.verifyStatus != 1
|
|
|
@@ -95,7 +94,11 @@
|
|
|
saleReturnProcessCancel,
|
|
|
getReturnSaleOrderrecordDetail
|
|
|
} from '@/api/bpm/components/saleManage/saleorder';
|
|
|
- import {approveTaskWithVariables, rejectTask,cancelTask} from '@/api/bpm/task';
|
|
|
+ import {
|
|
|
+ approveTaskWithVariables,
|
|
|
+ rejectTask,
|
|
|
+ cancelTask
|
|
|
+ } from '@/api/bpm/task';
|
|
|
import { listAllUserBind } from '@/api/system/organization';
|
|
|
import { getOutInBySourceBizNo } from '@/api/classifyManage';
|
|
|
// import outin from "@/api/warehouseManagement/outin";
|
|
|
@@ -164,13 +167,15 @@
|
|
|
storageData.isSkip = 1;
|
|
|
try {
|
|
|
this.isSaveLoading = true;
|
|
|
- res.productList.forEach((val,index)=>{
|
|
|
- val.receiveTotalWeight=storageData._packingList[index].weight
|
|
|
- val.materielDesignation=storageData._packingList[index].materielDesignation
|
|
|
- val.clientCode=storageData._packingList[index].clientCode
|
|
|
- val.engrave=storageData._packingList[index].engrave
|
|
|
- })
|
|
|
-
|
|
|
+ if (storageData?._packingList?.length) {
|
|
|
+ res.productList.forEach((val, index) => {
|
|
|
+ val.receiveTotalWeight = storageData._packingList[index].weight;
|
|
|
+ val.materielDesignation =
|
|
|
+ storageData._packingList[index].materielDesignation;
|
|
|
+ val.clientCode = storageData._packingList[index].clientCode;
|
|
|
+ val.engrave = storageData._packingList[index].engrave;
|
|
|
+ });
|
|
|
+ }
|
|
|
await UpdateReturnInformation(res);
|
|
|
await storageApi.storage(storageData);
|
|
|
approveTaskWithVariables({
|
|
|
@@ -193,6 +198,7 @@
|
|
|
this.$message.error('保存失败');
|
|
|
}
|
|
|
},
|
|
|
+
|
|
|
async handleAudit(status) {
|
|
|
//发起人补充
|
|
|
if (this.taskDefinitionKey === 'starter') {
|
