|
|
@ -89,7 +89,7 @@ |
|
|
|
</el-button> |
|
|
|
</div> |
|
|
|
<el-button :disabled="formLoading || isShowLoading" type="primary" @click="submitForm" v-if="active == 0 || (active == 1 && !error)">{{ t('ts.下一步') }}</el-button> |
|
|
|
<el-button :disabled="formLoading || isShowLoading" type="primary" @click="submitForm" v-if="active == 2 || (active == 1 && error)">{{ t('ts.好的') }}</el-button> |
|
|
|
<!-- <el-button :disabled="formLoading || isShowLoading" type="primary" @click="submitForm" v-if="active == 2 || (active == 1 && error)">{{ t('ts.好的') }}</el-button> --> |
|
|
|
<el-button @click="dialogVisible = false">{{ t('ts.取 消') }}</el-button> |
|
|
|
</div> |
|
|
|
</template> |
|
|
@ -312,6 +312,7 @@ const isShowLoading = ref(false) |
|
|
|
|
|
|
|
/** 提交表单 */ |
|
|
|
const submitForm = async () => { |
|
|
|
debugger |
|
|
|
// 如果当前在确认数据步骤,调用确认函数 |
|
|
|
if (active.value === 1) { |
|
|
|
isShowLoading.value = true |
|
|
@ -321,7 +322,24 @@ const submitForm = async () => { |
|
|
|
isShowLoading.value = false |
|
|
|
}else{ |
|
|
|
if (props.confirmFormSuccess) { |
|
|
|
await props.confirmFormSuccess(props.tableObject.tableList, |
|
|
|
const pars= props.tableObject.tableList.map(obj => { |
|
|
|
return { |
|
|
|
id: obj.id || null , |
|
|
|
type: formRef.value.formModel.productionLineCode, |
|
|
|
orderNumber: formRef.value.formModel.customerOrderNumber, |
|
|
|
materialCode: obj.materialCode, |
|
|
|
backNumber: obj.backNumber, |
|
|
|
quantity: obj.incorporationQuantity, |
|
|
|
materialDesc: obj.materialDesc, |
|
|
|
startDate: formRef.value.formModelstartDate, |
|
|
|
startNo: formRef.value.formModel.startNo, |
|
|
|
endDate: formRef.value.formModel.endDate, |
|
|
|
endNo: formRef.value.formModel.endNo, |
|
|
|
customerCode: formRef.value.formModel.customerCode, |
|
|
|
notIncludedList: [], |
|
|
|
} |
|
|
|
}) |
|
|
|
await props.confirmFormSuccess(pars, |
|
|
|
(msg)=>{ |
|
|
|
if(msg){ |
|
|
|
message.error(msg) |
|
|
|