From 090ca66a729c267d707f2b3ccb2d939f84432b90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sat, 3 Jul 2021 00:44:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A2=E5=8A=A1=E5=8D=95?=
=?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/bill/PurchaseBackList.vue | 7 +++-
jshERP-web/src/views/bill/PurchaseInList.vue | 9 +++--
jshERP-web/src/views/bill/SaleBackList.vue | 7 +++-
jshERP-web/src/views/bill/SaleOutList.vue | 9 +++--
.../src/views/bill/dialog/BillDetail.vue | 8 ++---
.../src/views/bill/modules/RetailOutModal.vue | 2 +-
.../views/financial/dialog/DebtBillList.vue | 4 +--
.../financial/mixins/FinancialModalMixin.js | 4 +--
.../views/material/modules/MaterialModal.vue | 4 +--
.../src/views/system/modules/UnitModal.vue | 35 +++++++++++--------
.../src/views/system/modules/VendorModal.vue | 5 ---
11 files changed, 57 insertions(+), 37 deletions(-)
diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue
index 4366e8a0..d3360957 100644
--- a/jshERP-web/src/views/bill/PurchaseBackList.vue
+++ b/jshERP-web/src/views/bill/PurchaseBackList.vue
@@ -152,7 +152,12 @@
return (record.discountMoney + record.discountLastMoney).toFixed(2);
}
},
- { title: '优惠后金额', dataIndex: 'discountLastMoney',width:100},
+ { title: '待收金额', dataIndex: 'needBackMoney',width:80,
+ customRender:function (text,record,index) {
+ let needBackMoney = record.discountLastMoney + record.otherMoney
+ return needBackMoney? needBackMoney.toFixed(2):''
+ }
+ },
{ title: '收款', dataIndex: 'changeAmount',width:50},
{
title: '操作',
diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue
index b4b13774..d0f83223 100644
--- a/jshERP-web/src/views/bill/PurchaseInList.vue
+++ b/jshERP-web/src/views/bill/PurchaseInList.vue
@@ -152,11 +152,16 @@
return (record.discountMoney + record.discountLastMoney).toFixed(2);
}
},
- { title: '优惠后金额', dataIndex: 'discountLastMoney',width:80},
+ { title: '待付金额', dataIndex: 'needInMoney',width:80,
+ customRender:function (text,record,index) {
+ let needInMoney = record.discountLastMoney + record.otherMoney
+ return needInMoney? needInMoney.toFixed(2):''
+ }
+ },
{ title: '付款', dataIndex: 'changeAmount',width:60},
{ title: '欠款', dataIndex: 'debt',width:60,
customRender:function (text,record,index) {
- let debt = record.discountLastMoney - record.changeAmount
+ let debt = record.discountLastMoney + record.otherMoney - record.changeAmount
return debt? debt.toFixed(2):''
}
},
diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue
index fc4025b5..fadb1161 100644
--- a/jshERP-web/src/views/bill/SaleBackList.vue
+++ b/jshERP-web/src/views/bill/SaleBackList.vue
@@ -152,7 +152,12 @@
return (record.discountMoney + record.discountLastMoney).toFixed(2);
}
},
- { title: '优惠后金额', dataIndex: 'discountLastMoney',width:100},
+ { title: '待付金额', dataIndex: 'needBackMoney',width:80,
+ customRender:function (text,record,index) {
+ let needBackMoney = record.discountLastMoney + record.otherMoney
+ return needBackMoney? needBackMoney.toFixed(2):''
+ }
+ },
{ title: '付款', dataIndex: 'changeAmount',width:50},
{
title: '操作',
diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue
index c6076aed..5a1ba2d0 100644
--- a/jshERP-web/src/views/bill/SaleOutList.vue
+++ b/jshERP-web/src/views/bill/SaleOutList.vue
@@ -152,11 +152,16 @@
return (record.discountMoney + record.discountLastMoney).toFixed(2);
}
},
- { title: '优惠后金额', dataIndex: 'discountLastMoney',width:80},
+ { title: '待收金额', dataIndex: 'needOutMoney',width:80,
+ customRender:function (text,record,index) {
+ let needOutMoney = record.discountLastMoney + record.otherMoney
+ return needOutMoney? needOutMoney.toFixed(2):''
+ }
+ },
{ title: '收款', dataIndex: 'changeAmount',width:60},
{ title: '欠款', dataIndex: 'debt',width:60,
customRender:function (text,record,index) {
- let debt = record.discountLastMoney - record.changeAmount
+ let debt = record.discountLastMoney + record.otherMoney - record.changeAmount
return debt? debt.toFixed(2):''
}
},
diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index af27c693..dfd3ef6f 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -524,7 +524,7 @@
-
+
{{model.payType}}
@@ -544,12 +544,12 @@
-
+
{{model.changeAmount}}
-
+
{{model.changeAmount}}
@@ -559,7 +559,7 @@
-
+
{{model.accountName}}
diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
index 369c6304..7bdeaa24 100644
--- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
@@ -35,7 +35,7 @@
-
+
现付
预付款
diff --git a/jshERP-web/src/views/financial/dialog/DebtBillList.vue b/jshERP-web/src/views/financial/dialog/DebtBillList.vue
index ab7e4f71..dc6659de 100644
--- a/jshERP-web/src/views/financial/dialog/DebtBillList.vue
+++ b/jshERP-web/src/views/financial/dialog/DebtBillList.vue
@@ -117,13 +117,13 @@
{ title: '操作员', dataIndex: 'userName',width:60},
{ title: '欠款', dataIndex: 'needDebt',width:70,
customRender:function (text,record,index) {
- return (record.discountLastMoney - record.changeAmount).toFixed(2);
+ return (record.discountLastMoney + record.otherMoney - record.changeAmount).toFixed(2);
}
},
{ title: '已收欠款', dataIndex: 'finishDebt',width:70 },
{ title: '待收欠款', dataIndex: 'debt',width:70,
customRender:function (text,record,index) {
- return (record.discountLastMoney - record.changeAmount - record.finishDebt).toFixed(2);
+ return (record.discountLastMoney + record.otherMoney - record.changeAmount - record.finishDebt).toFixed(2);
}
}
],
diff --git a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
index afaf0272..f1f14161 100644
--- a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
+++ b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
@@ -183,8 +183,8 @@ export const FinancialModalMixin = {
for(let i=0; i
-
-
+
+
diff --git a/jshERP-web/src/views/system/modules/UnitModal.vue b/jshERP-web/src/views/system/modules/UnitModal.vue
index 04386368..732e14f5 100644
--- a/jshERP-web/src/views/system/modules/UnitModal.vue
+++ b/jshERP-web/src/views/system/modules/UnitModal.vue
@@ -98,22 +98,27 @@
if (!err) {
that.confirmLoading = true;
let formData = Object.assign(this.model, values);
- let obj;
- if(!this.model.id){
- obj=addUnit(formData);
- }else{
- obj=editUnit(formData);
- }
- obj.then((res)=>{
- if(res.code === 200){
- that.$emit('ok');
- }else{
- that.$message.warning(res.data.message);
- }
- }).finally(() => {
+ if(formData.basicUnit === formData.otherUnit) {
+ that.$message.warning('抱歉，基本单位与副单位不能相同！');
that.confirmLoading = false;
- that.close();
- })
+ } else {
+ let obj;
+ if(!this.model.id){
+ obj=addUnit(formData);
+ }else{
+ obj=editUnit(formData);
+ }
+ obj.then((res)=>{
+ if(res.code === 200){
+ that.$emit('ok');
+ }else{
+ that.$message.warning(res.data.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+ }
}
})
},
diff --git a/jshERP-web/src/views/system/modules/VendorModal.vue b/jshERP-web/src/views/system/modules/VendorModal.vue
index 18c6328c..31602372 100644
--- a/jshERP-web/src/views/system/modules/VendorModal.vue
+++ b/jshERP-web/src/views/system/modules/VendorModal.vue
@@ -149,11 +149,6 @@
if (!err) {
that.confirmLoading = true;
let formData = Object.assign(this.model, values);
- if(this.model.beginNeedGet && this.model.beginNeedPay) {
- that.$message.warn("期初应收和期初应付不能同时输入");
- that.confirmLoading = false;
- return;
- }
formData.type = "供应商";
let obj;
if(!this.model.id){