diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js
index b4066525..ff5ed860 100644
--- a/jshERP-web/src/mixins/JeecgListMixin.js
+++ b/jshERP-web/src/mixins/JeecgListMixin.js
@@ -231,37 +231,6 @@ export const JeecgListMixin = {
});
}
},
- batchForceClose: function () {
- if(!this.url.forceCloseBatch){
- this.$message.error("请设置url.forceCloseBatch属性!")
- return
- }
- if (this.selectedRowKeys.length <= 0) {
- this.$message.warning('请选择一条记录!')
- } else {
- let ids = "";
- for (let a = 0; a < this.selectedRowKeys.length; a++) {
- ids += this.selectedRowKeys[a] + ","
- }
- let that = this
- this.$confirm({
- title: "确认强制结单",
- content: "是否强制结单选中数据?",
- onOk: function () {
- that.loading = true
- postAction(that.url.forceCloseBatch, {ids: ids}).then((res) => {
- if(res.code === 200){
- that.loadData()
- } else {
- that.$message.warning(res.data.message)
- }
- }).finally(() => {
- that.loading = false
- });
- }
- });
- }
- },
handleDelete: function (id) {
if(!this.url.delete){
this.$message.error("请设置url.delete属性!")
diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue
index 68b8fa49..8f512719 100644
--- a/jshERP-web/src/views/bill/SaleOrderList.vue
+++ b/jshERP-web/src/views/bill/SaleOrderList.vue
@@ -86,6 +86,7 @@
新增
删除
强制结单
+ 强制结单-以销定购
审核
反审核
导出
@@ -201,6 +202,8 @@
remark: ""
},
prefixNo: 'XSDD',
+ //以销定购开关
+ purchaseBySaleFlag: false,
labelCol: {
span: 5
},
@@ -258,6 +261,7 @@
delete: "/depotHead/delete",
deleteBatch: "/depotHead/deleteBatch",
forceCloseBatch: "/depotHead/forceCloseBatch",
+ forceClosePurchaseBatch: "/depotHead/forceClosePurchaseBatch",
batchSetStatusUrl: "/depotHead/batchSetStatus"
}
}
diff --git a/jshERP-web/src/views/bill/mixins/BillListMixin.js b/jshERP-web/src/views/bill/mixins/BillListMixin.js
index f7940af8..6fec16b6 100644
--- a/jshERP-web/src/views/bill/mixins/BillListMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillListMixin.js
@@ -1,5 +1,5 @@
import Vue from 'vue'
-import {getAction } from '@/api/manage'
+import { getAction, postAction } from '@/api/manage'
import { FormTypes } from '@/utils/JEditableTableUtil'
import {findBillDetailByNumber, findBySelectSup, findBySelectCus, findBySelectRetail, getUserList, getAccount, waitBillCount,
getCurrentSystemConfig, getPlatformConfigByKey} from '@/api/api'
@@ -107,6 +107,68 @@ export const BillListMixin = {
}
this.handleDetail(record, type, prefixNo);
},
+ batchForceClose: function () {
+ if(!this.url.forceCloseBatch){
+ this.$message.error("请设置url.forceCloseBatch属性!")
+ return
+ }
+ if (this.selectedRowKeys.length <= 0) {
+ this.$message.warning('请选择一条记录!')
+ } else {
+ let ids = "";
+ for (let a = 0; a < this.selectedRowKeys.length; a++) {
+ ids += this.selectedRowKeys[a] + ","
+ }
+ let that = this
+ this.$confirm({
+ title: "确认强制结单",
+ content: "是否强制结单选中数据?",
+ onOk: function () {
+ that.loading = true
+ postAction(that.url.forceCloseBatch, {ids: ids}).then((res) => {
+ if(res.code === 200){
+ that.loadData()
+ } else {
+ that.$message.warning(res.data.message)
+ }
+ }).finally(() => {
+ that.loading = false
+ });
+ }
+ });
+ }
+ },
+ batchForceClosePurchase: function () {
+ if(!this.url.forceClosePurchaseBatch){
+ this.$message.error("请设置url.forceClosePurchaseBatch属性!")
+ return
+ }
+ if (this.selectedRowKeys.length <= 0) {
+ this.$message.warning('请选择一条记录!')
+ } else {
+ let ids = "";
+ for (let a = 0; a < this.selectedRowKeys.length; a++) {
+ ids += this.selectedRowKeys[a] + ","
+ }
+ let that = this
+ this.$confirm({
+ title: "确认强制结单(以销定购)",
+ content: "是否强制结单选中数据?",
+ onOk: function () {
+ that.loading = true
+ postAction(that.url.forceClosePurchaseBatch, {ids: ids}).then((res) => {
+ if(res.code === 200){
+ that.loadData()
+ } else {
+ that.$message.warning(res.data.message)
+ }
+ }).finally(() => {
+ that.loading = false
+ });
+ }
+ });
+ }
+ },
handleApprove(record) {
this.$refs.modalForm.action = "approve";
this.$refs.modalForm.edit(record);