Browse Source

YT-2797顺引发货记录增加【维护对账日期】功能,导入纳入受领书时,增加调整差异数据的功能

intex_online_narushoulingshu
张立 2 weeks ago
parent
commit
d592ece776
  1. 22
      src/components/ImportForm/src/ImportFormStep.vue
  2. 3
      src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue

22
src/components/ImportForm/src/ImportFormStep.vue

@ -89,7 +89,7 @@
</el-button> </el-button>
</div> </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 == 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> <el-button @click="dialogVisible = false">{{ t('ts.取 消') }}</el-button>
</div> </div>
</template> </template>
@ -312,6 +312,7 @@ const isShowLoading = ref(false)
/** 提交表单 */ /** 提交表单 */
const submitForm = async () => { const submitForm = async () => {
debugger
// //
if (active.value === 1) { if (active.value === 1) {
isShowLoading.value = true isShowLoading.value = true
@ -321,7 +322,24 @@ const submitForm = async () => {
isShowLoading.value = false isShowLoading.value = false
}else{ }else{
if (props.confirmFormSuccess) { 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)=>{ (msg)=>{
if(msg){ if(msg){
message.error(msg) message.error(msg)

3
src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue

@ -490,7 +490,8 @@ const searchFormClick = (searchData) => {
const confirmFormSuccess = (dataList,callback) => { const confirmFormSuccess = (dataList,callback) => {
DeliverRecordMainApi.inducedProductBatchUpdate(dataList).then(res=>{ MaintenanceBillDateApi.inducedProductBatchUpdate(dataList).then(res => {
console.log(res)
if (res && res.code == 200) { if (res && res.code == 200) {
getList() getList()
} }

Loading…
Cancel
Save