From 012610ef9092ecd161b608a2536ac49aaef8e254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 10 May 2023 23:47:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B6=85=E5=87=BA=E5=85=B3=E8=81=94=E5=8D=95?=
=?UTF-8?q?=E6=8D=AE=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/bill/modules/SaleOutModal.vue | 2 +-
.../src/views/system/SystemConfigList.vue | 27 +++++++++++--------
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index e617d38c..dcb017dc 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/jshERP-web/src/views/system/SystemConfigList.vue b/jshERP-web/src/views/system/SystemConfigList.vue
index d22301be..3c455780 100644
--- a/jshERP-web/src/views/system/SystemConfigList.vue
+++ b/jshERP-web/src/views/system/SystemConfigList.vue
@@ -53,43 +53,40 @@
（如果启用则需要到用户管理进行分配仓库）
-
-
-
（如果启用则需要到用户管理进行分配客户）
-
-
+
- （如果启用则单据支持负库存录入）
+ （如果启用则单据支持负库存录入）
-
-
-
（如果启用则根据销售订单来定制采购订单，进货后再发给客户）
-
+
+
+
+ （如果启用则允许当前单据超出关联单据的商品数量进行出入库）
+
+
（如果启用则会根据单据录入自动更新商品单价，默认是启用状态）
-
@@ -151,6 +148,7 @@
customerFlagSwitch: false, //客户权限状态
minusStockFlagSwitch: false, //负库存状态
purchaseBySaleFlagSwitch: false, //以销定购状态
+ overLinkBillFlagSwitch: false, //超出关联单据状态
updateUnitPriceFlagSwitch: true, //更新单价状态
forceApprovalFlagSwitch: false, //强审核
multiLevelApprovalFlagSwitch: false, //多级审核
@@ -224,6 +222,9 @@
onPurchaseBySaleChange(checked) {
this.model.purchaseBySaleFlag = checked?'1':'0'
},
+ onOverLinkBillChange(checked) {
+ this.model.overLinkBillFlag = checked?'1':'0'
+ },
onUpdateUnitPriceChange(checked) {
this.model.updateUnitPriceFlag = checked?'1':'0'
},
@@ -266,6 +267,9 @@
if (record.purchaseBySaleFlag != null) {
this.purchaseBySaleFlagSwitch = record.purchaseBySaleFlag == '1' ? true : false;
}
+ if (record.overLinkBillFlag != null) {
+ this.overLinkBillFlagSwitch = record.overLinkBillFlag == '1' ? true : false;
+ }
if (record.updateUnitPriceFlag != null) {
this.updateUnitPriceFlagSwitch = record.updateUnitPriceFlag == '1' ? true : false;
}
@@ -348,6 +352,7 @@
this.customerFlagSwitch = false
this.minusStockFlagSwitch = false
this.purchaseBySaleFlagSwitch = false
+ this.overLinkBillFlagSwitch = false
this.updateUnitPriceFlagSwitch = true
this.forceApprovalFlagSwitch = false
this.multiLevelApprovalFlagSwitch = false