|
|
|
@ -151,6 +151,14 @@
|
|
|
|
</el-button
|
|
|
|
</el-button
|
|
|
|
>
|
|
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!-- <el-button-->
|
|
|
|
|
|
|
|
<!-- type="text"-->
|
|
|
|
|
|
|
|
<!-- size="small"-->
|
|
|
|
|
|
|
|
<!-- @click.native.stop="rollBack(scope.row)"-->
|
|
|
|
|
|
|
|
<!-- >撤回-->
|
|
|
|
|
|
|
|
<!-- </el-button-->
|
|
|
|
|
|
|
|
<!-- >-->
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-button
|
|
|
|
<el-button
|
|
|
|
type="text"
|
|
|
|
type="text"
|
|
|
|
@ -218,7 +226,8 @@
|
|
|
|
label="生产日期"
|
|
|
|
label="生产日期"
|
|
|
|
prop="productDate"
|
|
|
|
prop="productDate"
|
|
|
|
:show-overflow-tooltip="true"
|
|
|
|
:show-overflow-tooltip="true"
|
|
|
|
><template slot-scope="scope">
|
|
|
|
>
|
|
|
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<span>{{ convertDateFun(scope.row.productDate) }}</span>
|
|
|
|
<span>{{ convertDateFun(scope.row.productDate) }}</span>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
@ -226,9 +235,11 @@
|
|
|
|
label="失效日期"
|
|
|
|
label="失效日期"
|
|
|
|
prop="expireDate"
|
|
|
|
prop="expireDate"
|
|
|
|
:show-overflow-tooltip="true"
|
|
|
|
:show-overflow-tooltip="true"
|
|
|
|
> <template slot-scope="scope">
|
|
|
|
>
|
|
|
|
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
</template></el-table-column>
|
|
|
|
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="单据数量"
|
|
|
|
label="单据数量"
|
|
|
|
prop="erpCount"
|
|
|
|
prop="erpCount"
|
|
|
|
@ -376,7 +387,8 @@ import {getLocalJoinByUser} from "@/api/basic/busLocalType";
|
|
|
|
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
|
|
|
|
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
|
|
|
|
import {isBlank} from "@/utils/strUtil";
|
|
|
|
import {isBlank} from "@/utils/strUtil";
|
|
|
|
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
|
|
|
|
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
|
|
|
|
import {convertDate} from "@/utils/date"
|
|
|
|
import {convertDate} from "@/utils/date"
|
|
|
|
|
|
|
|
import {rollbackOrder} from "@/api/warehouse/stockOrder";
|
|
|
|
|
|
|
|
|
|
|
|
const formJson = {
|
|
|
|
const formJson = {
|
|
|
|
site_id: "",
|
|
|
|
site_id: "",
|
|
|
|
@ -394,7 +406,7 @@ export default {
|
|
|
|
|
|
|
|
|
|
|
|
data() {
|
|
|
|
data() {
|
|
|
|
return {
|
|
|
|
return {
|
|
|
|
convertDateFun:convertDate,
|
|
|
|
convertDateFun: convertDate,
|
|
|
|
query: {
|
|
|
|
query: {
|
|
|
|
page: 1,
|
|
|
|
page: 1,
|
|
|
|
limit: 10,
|
|
|
|
limit: 10,
|
|
|
|
@ -732,32 +744,49 @@ export default {
|
|
|
|
// this.dialogTableVisible = true;
|
|
|
|
// this.dialogTableVisible = true;
|
|
|
|
},
|
|
|
|
},
|
|
|
|
getUnitList() {
|
|
|
|
getUnitList() {
|
|
|
|
this.loading = true;
|
|
|
|
this.loading = true; this.loading = false;
|
|
|
|
|
|
|
|
|
|
|
|
unitListBykey(this.unitquery)
|
|
|
|
unitListBykey(this.unitquery)
|
|
|
|
.then((response) => {
|
|
|
|
.then((response) => {
|
|
|
|
this.loading = false;
|
|
|
|
|
|
|
|
this.unitlist = response.data.list || [];
|
|
|
|
this.unitlist = response.data.list || [];
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
this.loading = false;
|
|
|
|
this.loading = false;
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
intentDetail(row) {
|
|
|
|
// rollBack(row) {
|
|
|
|
// this.$router.push({
|
|
|
|
// this.$confirm('此操作将撤回单据到草稿状态，需重新提交, 是否继续?', '提示', {
|
|
|
|
// path: "../inout/detail",
|
|
|
|
// confirmButtonText: '确定',
|
|
|
|
// query: { id: row.id },
|
|
|
|
// cancelButtonText: '取消',
|
|
|
|
// });
|
|
|
|
// type: 'warning'
|
|
|
|
|
|
|
|
// }).then(() => {
|
|
|
|
|
|
|
|
// let param = {billNo: row.billNo};
|
|
|
|
|
|
|
|
// rollbackOrder(param).then((res) => {
|
|
|
|
|
|
|
|
// if (res.code === 20000) {
|
|
|
|
|
|
|
|
// this.$message.success("撤回成功");
|
|
|
|
|
|
|
|
// this.getList();
|
|
|
|
|
|
|
|
// } else {
|
|
|
|
|
|
|
|
// this.$message.error(res.message);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// })
|
|
|
|
|
|
|
|
// }).catch(() => {
|
|
|
|
|
|
|
|
// // this.$message.info('回退失败');
|
|
|
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
// },
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
intentDetail(row) {
|
|
|
|
this.codeDetailVisible = true;
|
|
|
|
this.codeDetailVisible = true;
|
|
|
|
this.idQuery.id = row.id;
|
|
|
|
this.idQuery.id = row.id;
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
successOrderExportPDFSetting(row) {
|
|
|
|
successOrderExportPDFSetting(row) {
|
|
|
|
this.idQuery.id = '';
|
|
|
|
this.idQuery.id = '';
|
|
|
|
if (this.$isNotBlank(row.id)) {
|
|
|
|
if (this.$isNotBlank(row.id)) {
|
|
|
|
this.idQuery.id = row.id;
|
|
|
|
this.idQuery.id = row.id;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.successOrderExportPDFSettingVisible = true;
|
|
|
|
this.successOrderExportPDFSettingVisible = true;
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
successOrderExportPDF(row) {
|
|
|
|
successOrderExportPDF(row) {
|
|
|
|
let tQuery = {
|
|
|
|
let tQuery = {
|
|
|
|
orderId: row.id,
|
|
|
|
orderId: row.id,
|
|
|
|
@ -786,11 +815,13 @@ export default {
|
|
|
|
}).catch(() => {
|
|
|
|
}).catch(() => {
|
|
|
|
this.loading = false;
|
|
|
|
this.loading = false;
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
closeDialog() {
|
|
|
|
closeDialog() {
|
|
|
|
this.successOrderExportPDFSettingVisible = false;
|
|
|
|
this.successOrderExportPDFSettingVisible = false;
|
|
|
|
this.getList();
|
|
|
|
this.getList();
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
|
|
|
|
|
|
|
|
selectUnit(row) {
|
|
|
|
selectUnit(row) {
|
|
|
|
this.unitUpdateQuery.id = this.curIndex;
|
|
|
|
this.unitUpdateQuery.id = this.curIndex;
|
|
|
|
@ -804,7 +835,8 @@ export default {
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
this.dialogTableVisible = false;
|
|
|
|
this.dialogTableVisible = false;
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
deleteOrders(data) {
|
|
|
|
deleteOrders(data) {
|
|
|
|
this.loading = true;
|
|
|
|
this.loading = true;
|
|
|
|
this.deleteData.id = data;
|
|
|
|
this.deleteData.id = data;
|
|
|
|
@ -824,14 +856,16 @@ export default {
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
tableRowClassName({row, rowIndex}) {
|
|
|
|
tableRowClassName({row, rowIndex}) {
|
|
|
|
if (row.reCount === row.count) {
|
|
|
|
if (row.reCount === row.count) {
|
|
|
|
return "success-row";
|
|
|
|
return "success-row";
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
return "warning-row";
|
|
|
|
return "warning-row";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
|
|
|
|
|
|
|
|
exportDialog(value) {
|
|
|
|
exportDialog(value) {
|
|
|
|
var mOrder = value;
|
|
|
|
var mOrder = value;
|
|
|
|
@ -880,7 +914,8 @@ export default {
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
uploadOrderDialog(value) {
|
|
|
|
uploadOrderDialog(value) {
|
|
|
|
@ -898,7 +933,8 @@ export default {
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
|
|
|
|
|
|
|
|
deleteDialog(rowId) {
|
|
|
|
deleteDialog(rowId) {
|
|
|
|
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
|
|
|
|
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
|
|
|
|
@ -911,10 +947,12 @@ export default {
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
closeDetailDialog(val) {
|
|
|
|
closeDetailDialog(val) {
|
|
|
|
this.codeDetailVisible = false;
|
|
|
|
this.codeDetailVisible = false;
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
closeManuDialog(val) {
|
|
|
|
closeManuDialog(val) {
|
|
|
|
this.addDialogVisible = false;
|
|
|
|
this.addDialogVisible = false;
|
|
|
|
if (val) {
|
|
|
|
if (val) {
|
|
|
|
@ -925,16 +963,19 @@ export default {
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
this.$message.error("选入失败");
|
|
|
|
this.$message.error("选入失败");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
cancelDialog() {
|
|
|
|
cancelDialog() {
|
|
|
|
this.addDialogVisible = false;
|
|
|
|
this.addDialogVisible = false;
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
importOrder(row) {
|
|
|
|
importOrder(row) {
|
|
|
|
this.orderId = row.id;
|
|
|
|
this.orderId = row.id;
|
|
|
|
this.billAction = row.action;
|
|
|
|
this.billAction = row.action;
|
|
|
|
this.curLocInv = row.locStorageCode;
|
|
|
|
this.curLocInv = row.locStorageCode;
|
|
|
|
this.addDialogVisible = true;
|
|
|
|
this.addDialogVisible = true;
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
getBusType() {
|
|
|
|
getBusType() {
|
|
|
|
let query = {
|
|
|
|
let query = {
|
|
|
|
code: this.filterQuery.invWarehouseCode,
|
|
|
|
code: this.filterQuery.invWarehouseCode,
|
|
|
|
@ -948,14 +989,16 @@ export default {
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
getActionName(action) {
|
|
|
|
getActionName(action) {
|
|
|
|
for (let i = 0; i < this.busTypes.length; i++) {
|
|
|
|
for (let i = 0; i < this.busTypes.length; i++) {
|
|
|
|
if (this.busTypes[i].action === action) {
|
|
|
|
if (this.busTypes[i].action === action) {
|
|
|
|
return this.busTypes[i].name;
|
|
|
|
return this.busTypes[i].name;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
getStorage() {
|
|
|
|
getStorage() {
|
|
|
|
this.storageList = [];
|
|
|
|
this.storageList = [];
|
|
|
|
filterAllByUser()
|
|
|
|
filterAllByUser()
|
|
|
|
@ -968,7 +1011,8 @@ export default {
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
invChange() {
|
|
|
|
invChange() {
|
|
|
|
this.filterQuery.invWarehouseCode = "";
|
|
|
|
this.filterQuery.invWarehouseCode = "";
|
|
|
|
this.subInvList = [];
|
|
|
|
this.subInvList = [];
|
|
|
|
@ -985,7 +1029,8 @@ export default {
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
getSubInvList() {
|
|
|
|
getSubInvList() {
|
|
|
|
@ -998,7 +1043,8 @@ export default {
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
|
|
|
|
|
|
|
|
subInvChange() {
|
|
|
|
subInvChange() {
|
|
|
|
this.getBusType();
|
|
|
|
this.getBusType();
|
|
|
|
@ -1011,14 +1057,17 @@ export default {
|
|
|
|
true: "danger",
|
|
|
|
true: "danger",
|
|
|
|
};
|
|
|
|
};
|
|
|
|
return statusMap[status];
|
|
|
|
return statusMap[status];
|
|
|
|
},
|
|
|
|
}
|
|
|
|
},
|
|
|
|
,
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
mounted() {
|
|
|
|
mounted() {
|
|
|
|
document.body.ondrop = function (event) {
|
|
|
|
document.body.ondrop = function (event) {
|
|
|
|
event.preventDefault();
|
|
|
|
event.preventDefault();
|
|
|
|
event.stopPropagation();
|
|
|
|
event.stopPropagation();
|
|
|
|
};
|
|
|
|
};
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
,
|
|
|
|
|
|
|
|
|
|
|
|
created() {
|
|
|
|
created() {
|
|
|
|
this.getStorage();
|
|
|
|
this.getStorage();
|
|
|
|
@ -1038,8 +1087,10 @@ export default {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
},
|
|
|
|
}
|
|
|
|
};
|
|
|
|
,
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
;
|
|
|
|
</script>
|
|
|
|
</script>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
anthonywj
2 years ago