md
This commit is contained in:
linfso
parent
7bfec582f1
commit
e83fd9a80f
@ -437,59 +437,6 @@ export default {
|
||||
|
||||
this.form = {...this.form};
|
||||
|
||||
// listEmisWaybill({billCode:this.form.billCode}).then(response => {
|
||||
// this.loading = false;
|
||||
// let scanDate = new Date();
|
||||
// if(response.code != 200){
|
||||
// this.$modal.msgError(response.msg);
|
||||
// return;
|
||||
// }
|
||||
// let rows = response.rows;
|
||||
// if(!rows || rows.length == 0){
|
||||
// this.$modal.msgError("未查到单号");
|
||||
// this.form.billCode=null;
|
||||
// return;
|
||||
// }
|
||||
// if(rows.length>0) {
|
||||
// let rsItem = rows[0];
|
||||
// console.log(rsItem);
|
||||
// this.tempRecord =Object.assign({}, rsItem)
|
||||
// // tempRecord.notifySite = tempRecord.sendSiteCode;
|
||||
// // tempRecord.notifySiteName = tempRecord.sendSiteName;
|
||||
// this.tempRecord.scanSiteCode=this.form.scanSiteCode;
|
||||
// this.tempRecord.scanSite=this.form.scanSite;
|
||||
// this.tempRecord.scanDate=scanDate;
|
||||
// this.tempRecord.scanMan=this.form.scanMan;
|
||||
// this.tempRecord.scanManCode=this.form.scanManCode;
|
||||
// this.tempRecord.dataFrom="PC";
|
||||
// this.notifySiteDataSource=[
|
||||
// {
|
||||
// notifySiteCode:this.tempRecord.sendSiteCode,
|
||||
// notifySiteName:this.tempRecord.sendSiteName,
|
||||
// },
|
||||
// {
|
||||
// notifySiteCode:this.tempRecord.dispatchUnderlingSiteCode,
|
||||
// notifySiteName:this.tempRecord.dispatchUnderlingSiteName,
|
||||
// }
|
||||
// ]
|
||||
// if(this.tempRecord.sendSiteCode == this.$store.getters.ownerSiteCode){
|
||||
// this.form.notifySiteCode = this.tempRecord.dispatchUnderlingSiteCode;
|
||||
// this.form.notifySiteName = this.tempRecord.dispatchUnderlingSiteName;
|
||||
// }
|
||||
// // else if(this.tempRecord.dispatchUnderlingSiteCode == this.$store.getters.ownerSiteCode){
|
||||
// // this.form.notifySiteCode = this.tempRecord.sendSiteCode;
|
||||
// // this.form.notifySiteName = this.tempRecord.sendSiteName;
|
||||
// // }
|
||||
// else{
|
||||
// this.form.notifySiteCode = this.tempRecord.sendSiteCode;
|
||||
// this.form.notifySiteName = this.tempRecord.sendSiteName;
|
||||
// }
|
||||
// // this.billInputDisabled = true;
|
||||
// // this.emisWaybillList.push(tempRecord);
|
||||
// // this.dataMap[this.form.billCode]=tempRecord;
|
||||
// }
|
||||
// // this.form.billCode=null;
|
||||
// })
|
||||
},
|
||||
async handleRegister(){
|
||||
if(this.form.notifySiteCode==null || this.form.notifySiteCode==''){
|
||||
@ -609,34 +556,6 @@ export default {
|
||||
scanDate:parseTime(item.scanDate || new Date())
|
||||
}
|
||||
)
|
||||
// problemInfoList.push({
|
||||
// billCode: item.billCode,
|
||||
// problemType: item.problemType,
|
||||
// problemTitle: null,
|
||||
// problemCause: item.remark,
|
||||
// sendSite: item.sendSiteName,
|
||||
// sendSiteCode: item.sendSiteCode,
|
||||
// registerManCode: item.registerManCode,
|
||||
// registerManDept: null,
|
||||
// registerSiteCode: item.registerSiteCode,
|
||||
// registerDate: item.registerDate,
|
||||
// registerSaveDate: null,
|
||||
// dataFrom: item.dataFrom,
|
||||
// status: null,//item.waybillStatus,//？？？？？？？？是否正确
|
||||
// isSendSiteRegister: null,
|
||||
// // blReversion: false,//？？？？？？？？是否正确
|
||||
// blReversion: null,
|
||||
// reversionStr: null,
|
||||
// reversionMan: null,
|
||||
// reversionManCode: null,
|
||||
// reversionDate: null,
|
||||
// blCheckok: null,
|
||||
// blSee: null,
|
||||
// filePath: item.picUrl,
|
||||
// modifySiteCode: null,
|
||||
// delFlag: item.delFlag,//？？？？？？？？是否正确
|
||||
// remark: item.remark,//？？？？？？？？是否正确
|
||||
// })
|
||||
}
|
||||
});
|
||||
|
||||
@ -664,16 +583,6 @@ export default {
|
||||
this.emisWaybillList = newList;
|
||||
this.$modal.msgSuccess(scanRstItem.message);
|
||||
});
|
||||
// problemInfoList.forEach(item => {
|
||||
// addEmisWaybillProblemInfo(item).then(response => {
|
||||
// // debugger;
|
||||
// if(response.code != "200"){
|
||||
// this.$modal.msgError(response.msg);
|
||||
// return;
|
||||
// }
|
||||
// this.$modal.msgSuccess(response.msg);
|
||||
// })
|
||||
// })
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
@ -691,7 +600,7 @@ export default {
|
||||
this.emisWaybillList = newList;
|
||||
this.open = false;
|
||||
},
|
||||
submitFormBatch(){
|
||||
async submitFormBatch(){
|
||||
if(this.formBatch.billCode==null || this.formBatch.billCode==''){
|
||||
this.$modal.msgError("输入单号后回车");
|
||||
return;
|
||||
@ -709,9 +618,29 @@ export default {
|
||||
// return;
|
||||
// }
|
||||
// }
|
||||
// 如果已定制账单，则需要先从账单移除
|
||||
if(this.form.problemType==151 || this.form.problemType==173 || this.form.problemType==170){
|
||||
let qBillParam ={
|
||||
pageNum:1,
|
||||
pageSize:1,
|
||||
billCode:bcList[bc].trim()
|
||||
}
|
||||
let res=await listEmisSettleSubBill(qBillParam);
|
||||
if(res.code==200){
|
||||
let dataArr=res.rows;
|
||||
if(dataArr.length>0){
|
||||
let itemSubBill=dataArr[0];
|
||||
if(itemSubBill.blMerge==1){
|
||||
this.$modal.msgError("单号:"+bcList[bc].trim()+"-已生成客户账单，请联系财务移除该单后再登记！");
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let exitlist = this.emisWaybillList.filter(item => (item.billCode == bcList[bc].trim() && item.problemId == this.form.problemId));
|
||||
if(exitlist.length > 0){
|
||||
this.$modal.msgError("单号："+ bcList[bc].trim() + ", 已存在");
|
||||
this.$modal.msgError("单号:"+ bcList[bc].trim() + ", 已存在");
|
||||
continue;
|
||||
}else{
|
||||
this.addToList(bcList[bc].trim());
|
||||
|
||||
Loading…
Reference in New Issue
Block a user