diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js
index 70c064b1..49df7f94 100644
--- a/vue/src/router/modules/vw_menu.js
+++ b/vue/src/router/modules/vw_menu.js
@@ -30,7 +30,7 @@ const vwMenudataRouter = {
name: 'Invoices',
meta: {
title: '发票汇总',
- roles: ['SettleAccount.Reports'],
+ roles: ['SettleAccount.Invoices'],
icon: '对比'
}
},
diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
index d5ccde75..83465868 100644
--- a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
@@ -32,6 +32,14 @@
@click="handleCancelBills()"
>取消出库(支持批量)
+ 删除出库单(支持批量)
+
{
+ let id = element.id;
+ params.push(id);
+ });
+ myalert = "选中项";
+ }
+ this.listDeleteQuery.billNum = this.listQuery.billNum ;
+ console.log("单据号：" + JSON.stringify(this.listDeleteQuery));
+ this.$confirm("是否删除" + myalert + "?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.$axios
+ .posts("/api/settleaccount/wmskanbanoutput/WmsOutPutDelete", this.listDeleteQuery)
+ .then((response) => {
+ const index = this.list.indexOf(row);
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ this.getList();
+ });
+ })
+ .catch(() => {
+ this.$message({
+ type: "info",
+ message: "已取消操作",
+ });
+ });
+ },
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
diff --git a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
index 058d50e6..fca5e7c3 100644
--- a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
@@ -32,6 +32,14 @@
@click="handleCancelBills()"
>取消出库(支持批量)
+
{
+ // let id = element.id;
+ // params.push(id);
+ // });
+ // myalert = "选中项";
+ // }
+ // this.$confirm("是否删除" + myalert + "?", "提示", {
+ // confirmButtonText: "确定",
+ // cancelButtonText: "取消",
+ // type: "warning",
+ // })
+ // .then(() => {
+ // this.$axios
+ // .posts("/api/settleaccount/Job/delete", params)
+ // .then((response) => {
+ // const index = this.list.indexOf(row);
+ // this.$notify({
+ // title: "成功",
+ // message: "删除成功",
+ // type: "success",
+ // duration: 2000,
+ // });
+ // this.getList();
+ // });
+ // })
+ // .catch(() => {
+ // this.$message({
+ // type: "info",
+ // message: "已取消操作",
+ // });
+ // });
+ // },
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
diff --git a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
index ac9479fe..6c6afa4d 100644
--- a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
@@ -32,6 +32,14 @@
@click="print()"
>取消出库(支持批量)
+ 删除出库单(支持批量)
+
{
+ let id = element.id;
+ params.push(id);
+ });
+ myalert = "选中项";
+ }
+ this.listDeleteQuery.billNum = this.listQuery.billNum ;
+ console.log("单据号：" + JSON.stringify(this.listDeleteQuery));
+ this.$confirm("是否删除" + myalert + "?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.$axios
+ .posts("/api/settleaccount/wmsSharePartoutput/WmsOutPutDelete", this.listDeleteQuery)
+ .then((response) => {
+ const index = this.list.indexOf(row);
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ this.getList();
+ });
+ })
+ .catch(() => {
+ this.$message({
+ type: "info",
+ message: "已取消操作",
+ });
+ });
+ },
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
diff --git a/vue/src/views/ux/billManage/vwOutOrder/detail.vue b/vue/src/views/ux/billManage/vwOutOrder/detail.vue
index 3e501f78..4d3d14c0 100644
--- a/vue/src/views/ux/billManage/vwOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/vwOutOrder/detail.vue
@@ -32,6 +32,14 @@
@click="handleCancelBills()"
>取消出库(支持批量)
+ 删除出库单(支持批量)
+
{
+ let id = element.id;
+ params.push(id);
+ });
+ myalert = "选中项";
+ }
+ this.listDeleteQuery.billNum = this.listQuery.billNum ;
+ console.log("单据号：" + JSON.stringify(this.listDeleteQuery));
+ this.$confirm("是否删除" + myalert + "?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.$axios
+ .posts("/api/settleaccount/wmsjitoutput/WmsOutPutDelete", this.listDeleteQuery)
+ .then((response) => {
+ const index = this.list.indexOf(row);
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ this.getList();
+ });
+ })
+ .catch(() => {
+ this.$message({
+ type: "info",
+ message: "已取消操作",
+ });
+ });
+ },
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
diff --git a/vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue
index cf762e52..f4ab7262 100644
--- a/vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue
@@ -32,6 +32,14 @@
@click="handleCancelBills()"
>取消出库(支持批量)
+ 删除出库单(支持批量)
+
{
+ let id = element.id;
+ params.push(id);
+ });
+ myalert = "选中项";
+ }
+ this.listDeleteQuery.billNum = this.listQuery.billNum ;
+ console.log("单据号：" + JSON.stringify(this.listDeleteQuery));
+ this.$confirm("是否删除" + myalert + "?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.$axios
+ .posts("/api/settleaccount/WMSHQFKanbanoutput/WmsOutPutDelete", this.listDeleteQuery)
+ .then((response) => {
+ const index = this.list.indexOf(row);
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ this.getList();
+ });
+ })
+ .catch(() => {
+ this.$message({
+ type: "info",
+ message: "已取消操作",
+ });
+ });
+ },
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
diff --git a/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue
index be0ae196..c3895aae 100644
--- a/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue
@@ -32,6 +32,15 @@
@click="handleCancelBills()"
>取消出库(支持批量)
+ 删除出库单(支持批量)
+
-
-
-
-
+ width="100"
+ >
@@ -134,7 +137,7 @@
:title="formTitle"
width="700px"
>
- 确认
@@ -230,6 +231,7 @@ export default {
return {};
},
},
+
listQuery: {
Filters: [
{
@@ -247,9 +249,18 @@ export default {
version: "",
guids: "",
billNum: "",
+<<<<<<< .mine
accountDate:"",
branchId:"",
outPutQty:"",
+=======
+ accountDate: "",
+
+
+>>>>>>> .theirs
+ },
+ listDeleteQuery: {
+ billNum: "",
},
page: 1,
JobversionValue: "",
@@ -261,9 +272,9 @@ export default {
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 230,
isEdit: false,
- accountDatelist:{
- accountDate:""
- }
+ accountDatelist: {
+ accountDate: "",
+ },
};
},
mounted() {
@@ -442,45 +453,94 @@ export default {
});
});
},
- print() {
+ print() {
this.dialogFormVisible = true;
},
//出库单
handleCreateBills(row) {
this.dialogFormVisible = true;
- this.listLoading = true;
- this.listOutPutQuery.guids = [];
- this.listOutPutQuery.version = this.customerInfo.version;
- this.listOutPutQuery.billNum = this.customerInfo.parentId;
- if (this.accountDatelist != "") {
- this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
- }
- //this.listOutPutQuery.accountDate = this.accountDatelist;
- console.log(
- "未选择时全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
- );
+ this.listLoading = true;
+ this.listOutPutQuery.guids = [];
+ this.listOutPutQuery.version = this.customerInfo.version;
+ this.listOutPutQuery.billNum = this.customerInfo.parentId;
+ if (this.accountDatelist != "") {
+ this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+ }
+ //this.listOutPutQuery.accountDate = this.accountDatelist;
+ console.log(
+ "未选择时全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
+ );
+
+ this.$axios
+ .posts(
+ "/api/settleaccount/WMSHQFKanbanoutput/WmsHQFKanbanOutPut-Pass",
+ this.listOutPutQuery
+ )
+ .then((response) => {
+ const index = this.list.indexOf(row);
+ this.$notify({
+ title: "成功",
+ message: "生成成功",
+ type: "success",
+ duration: 2000,
+ });
+ this.getList();
+ this.listLoading = false;
+ })
+ .catch(() => {
+ this.listLoading = false;
+ });
+ },
+ //删除出库单
+ handleDelete(row) {
+ var params = [];
+ let myalert = ""; //声明变量，其变量必须在此声明后使用
+ if (row) {
+ //单行
+ params.push(row.id);
+ myalert = row.name;
+ } else {
+ //多选
+ this.multipleSelection.forEach((element) => {
+ let id = element.id;
+ params.push(id);
+ });
+ myalert = "选中项";
+ }
+ // if (this.listDeleteQuery != "") {
+ // this.listQuery.billNum = this.listDeleteQuery.billNum;
+ // }
+ this.listDeleteQuery.billNum = this.listQuery.billNum ;
+ console.log("单据号：" + JSON.stringify(this.listDeleteQuery));
+ this.$confirm("是否删除" + myalert + "?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.$axios
+ .posts(
+ "/api/settleaccount/wmsHQFSharePartoutput/WmsOutPutDelete",
+ this.listDeleteQuery
+ )
- this.$axios
- .posts(
- "/api/settleaccount/WMSHQFKanbanoutput/WmsHQFKanbanOutPut-Pass",
- this.listOutPutQuery
- )
- .then((response) => {
- const index = this.list.indexOf(row);
- this.$notify({
- title: "成功",
- message: "生成成功",
- type: "success",
- duration: 2000,
+ .then((response) => {
+ const index = this.list.indexOf(row);
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ this.getList();
});
- this.getList();
- this.listLoading = false;
- this.dialogFormVisible = false;
- })
- .catch(() => {
- this.listLoading = false;
});
-
+ .catch(() => {
+ this.$message({
+ type: "info",
+ message: "已取消操作",
+ });
+ });
},
/** 刷新列表 */
handleHandle(data) {
diff --git a/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue
index e35c0b76..c1d2261a 100644
--- a/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue
@@ -32,6 +32,14 @@
@click="handleCancelBills()"
>取消出库(支持批量)
+ 删除出库单(支持批量)
+
{
+ let id = element.id;
+ params.push(id);
+ });
+ myalert = "选中项";
+ }
+ this.listDeleteQuery.billNum = this.listQuery.billNum ;
+ console.log("单据号：" + JSON.stringify(this.listDeleteQuery));
+ this.$confirm("是否删除" + myalert + "?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.$axios
+ .posts("/api/settleaccount/WmsHQHSharePartoutput/WmsOutPutDelete", this.listDeleteQuery)
+ .then((response) => {
+ const index = this.list.indexOf(row);
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ this.getList();
+ });
+ })
+ .catch(() => {
+ this.$message({
+ type: "info",
+ message: "已取消操作",
+ });
+ });
+ },
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
diff --git a/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
index ad3a7c9f..6f4473db 100644
--- a/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
@@ -32,6 +32,14 @@
@click="handleCancelBills()"
>取消出库(支持批量)
+ 删除出库单(支持批量)
+
{
+ let id = element.id;
+ params.push(id);
+ });
+ myalert = "选中项";
+ }
+ this.listDeleteQuery.billNum = this.listQuery.billNum ;
+ console.log("单据号：" + JSON.stringify(this.listDeleteQuery));
+ this.$confirm("是否删除" + myalert + "?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.$axios
+ .posts("/api/settleaccount/WmsHQHKanbanoutput/WmsOutPutDelete", this.listDeleteQuery)
+ .then((response) => {
+ const index = this.list.indexOf(row);
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ this.getList();
+ });
+ })
+ .catch(() => {
+ this.$message({
+ type: "info",
+ message: "已取消操作",
+ });
+ });
+ },
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
diff --git a/vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue
index 41df5754..553c542f 100644
--- a/vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue
@@ -32,6 +32,14 @@
@click="handleCancelBills()"
>取消出库(支持批量)
+ 删除出库单(支持批量)
+
{
+ let id = element.id;
+ params.push(id);
+ });
+ myalert = "选中项";
+ }
+ this.listDeleteQuery.billNum = this.listQuery.billNum ;
+ console.log("单据号：" + JSON.stringify(this.listDeleteQuery));
+ this.$confirm("是否删除" + myalert + "?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.$axios
+ .posts("/api/settleaccount/WmsHQMSharePartoutput/WmsOutPutDelete", this.listDeleteQuery)
+ .then((response) => {
+ const index = this.list.indexOf(row);
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ this.getList();
+ });
+ })
+ .catch(() => {
+ this.$message({
+ type: "info",
+ message: "已取消操作",
+ });
+ });
+ },
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
diff --git a/vue/src/views/ux/vw/dataInput/hq_m_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_m_outorder/detail.vue
index 0d1324c9..371fd003 100644
--- a/vue/src/views/ux/vw/dataInput/hq_m_outorder/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_m_outorder/detail.vue
@@ -32,6 +32,14 @@
@click="handleCancelBills()"
>取消出库(支持批量)
+ 删除出库单(支持批量)
+
{
+ let id = element.id;
+ params.push(id);
+ });
+ myalert = "选中项";
+ }
+ this.listDeleteQuery.billNum = this.listQuery.billNum ;
+ console.log("单据号：" + JSON.stringify(this.listDeleteQuery));
+ this.$confirm("是否删除" + myalert + "?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.$axios
+ .posts("/api/settleaccount/WMSHQMKanbanoutput/WmsOutPutDelete", this.listDeleteQuery)
+ .then((response) => {
+ const index = this.list.indexOf(row);
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ this.getList();
+ });
+ })
+ .catch(() => {
+ this.$message({
+ type: "info",
+ message: "已取消操作",
+ });
+ });
},
/** 刷新列表 */
handleHandle(data) {
diff --git a/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue
index a135c65a..dd97877b 100644
--- a/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue
@@ -31,6 +31,14 @@
icon="el-icon-download"
@click="handleCancelBills()"
>取消出库(支持批量)
+
+ 删除出库单(支持批量)
{
+ let id = element.id;
+ params.push(id);
+ });
+ myalert = "选中项";
+ }
+ this.listDeleteQuery.billNum = this.listQuery.billNum ;
+ console.log("单据号：" + JSON.stringify(this.listDeleteQuery));
+ this.$confirm("是否删除" + myalert + "?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+
+ .then(() => {
+ this.$axios
+ .posts("/api/settleaccount/WmsHQCaroutput/WmsOutPutDelete", this.listDeleteQuery)
+ .then((response) => {
+ const index = this.list.indexOf(row);
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ this.getList();
+ });
+ })
+ .catch(() => {
+ this.$message({
+ type: "info",
+ message: "已取消操作",
+ });
+ });
+ },
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
diff --git a/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue b/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue
index 21b355d0..13c8a6ea 100644
--- a/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue
@@ -702,7 +702,8 @@ export default {
//判断已经生成出库单的不能再生成出库操作
this.multipleSelection.forEach((element) => {
let state = element.fileName;
- if (state != "" && state != "已确认") {
+ if (state != "" && state != "已确认")
+ {
this.isEdit = true;
getbillNum += state + ",";
}
diff --git a/vue/src/views/ux/vw/dataInput/r3/index.vue b/vue/src/views/ux/vw/dataInput/r3/index.vue
index 2cc26d79..a88a127d 100644
--- a/vue/src/views/ux/vw/dataInput/r3/index.vue
+++ b/vue/src/views/ux/vw/dataInput/r3/index.vue
@@ -17,14 +17,14 @@
>导入文件（Excel）
- 导出Csv
-
+ -->