@@ -647,6 +648,7 @@ export default {
}
}
return {
+ flexAdvanceMoney: 0,
saveloading: false,
projectmoney: 0,
isbendi: null,
@@ -950,6 +952,19 @@ export default {
_that = this
},
methods: {
+ changeAdvanceMoney(val) {
+ console.log('val', val)
+ if (Number(val) > this.flexAdvanceMoney) {
+ this.$notify.error({
+ title: 'wrong',
+ message: this.$t('update4.chaguomorenyushoujine'),
+ offset: 100
+ })
+ this.personalForm.advanceMoney = 0
+ }
+ this.getReceivableMoney()
+ this.updatePrice()
+ },
uniqueArray3(array, key) {
var result = [array[0]]
for (var i = 1; i < array.length; i++) {
@@ -1002,6 +1017,7 @@ export default {
changeisdeduct() {
if (this.isdeduct === 2) {
this.personalForm.advanceMoney = 0
+ this.flexAdvanceMoney = 0
} else {
if (!this.personalForm.customerId) {
this.$notify.error({
@@ -1014,6 +1030,8 @@ export default {
customerlist2(this.personalForm.customerId).then(res => {
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
+
this.getReceivableMoney()
}
})
@@ -1259,6 +1277,7 @@ export default {
customerlist2(this.personalForm.customerId).then(res => {
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
@@ -1368,6 +1387,7 @@ export default {
}
if (!this.personalForm.advanceMoney) {
this.personalForm.advanceMoney = 0
+ this.flexAdvanceMoney = 0
}
if (!this.personalForm.otherMoney) {
this.personalForm.otherMoney = 0
@@ -1380,6 +1400,7 @@ export default {
}
if (this.isdeduct === 2) {
this.personalForm.advanceMoney = 0
+ this.flexAdvanceMoney = 0
}
if (!this.projectmoney) {
@@ -1725,6 +1746,7 @@ export default {
customerlist2(this.personalForm.customerId).then(res => {
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = this.$store.getters.empcontract3.customerName
@@ -1805,6 +1827,7 @@ export default {
}
if (this.$store.getters.empcontract.receiveMoney) {
this.personalForm.advanceMoney = this.$store.getters.empcontract.receiveMoney
+ this.flexAdvanceMoney = this.$store.getters.empcontract.receiveMoney
}
this.personalForm.sourceNumber = this.$store.getters.empcontract.number
if (this.$store.getters.empcontract.customerType !== null && this.$store.getters.empcontract.customerType !== undefined && this.$store.getters.empcontract.customerType !== '') {
@@ -1814,6 +1837,7 @@ export default {
customerlist2(this.personalForm.customerId).then(res => {
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = this.$store.getters.empcontract.customerName
@@ -2258,6 +2282,7 @@ export default {
this.personalForm.customerId = ''
this.customerId = ''
this.personalForm.advanceMoney = 0
+ this.flexAdvanceMoney = 0
},
// 选择客户focus
chooseCustomer() {
@@ -2278,12 +2303,15 @@ export default {
customerlist2(this.personalForm.customerId).then(res => {
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.customerName
this.personalForm.customerPhone = val.phoneNumber
this.personalForm.address = val.address
this.personalForm.advanceMoney = val.advanceMoney
+ this.flexAdvanceMoney = val.advanceMoney
+
this.point = val.point
this.$refs.editable3.clear()
},
@@ -2293,6 +2321,7 @@ export default {
customerlist2(this.personalForm.customerId).then(res => {
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.agentName
@@ -2354,6 +2383,7 @@ export default {
customerlist2(this.personalForm.customerId).then(res => {
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.customerName
@@ -2393,6 +2423,7 @@ export default {
customerlist2(this.personalForm.customerId).then(res => {
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.customerName
@@ -2463,6 +2494,7 @@ export default {
customerlist2(this.personalForm.customerId).then(res => {
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.customerName
@@ -2489,6 +2521,7 @@ export default {
customerlist2(this.personalForm.customerId).then(res => {
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.customerName
diff --git a/src/views/SaleOut/NewBatteryOut.vue b/src/views/SaleOut/NewBatteryOut.vue
index c0252148..a5265320 100644
--- a/src/views/SaleOut/NewBatteryOut.vue
+++ b/src/views/SaleOut/NewBatteryOut.vue
@@ -7,25 +7,25 @@
-
+
-
+
-
+
-
+
@@ -52,17 +52,17 @@
-
+
-
+
-
+
@@ -73,25 +73,25 @@
-
+
-
+
-
+
-
+
-
+ {{ $t('otherlanguage.yskdk') }}:{{ flexAdvanceMoney }}
-
+
@@ -112,7 +112,7 @@
-
+
@@ -155,7 +155,7 @@
-->
-
+
@@ -163,14 +163,14 @@
-
+
-
+
_now || time.getTime() < sevenDays
}
},
+ flexAdvanceMoney: 0,
ischina: this.$store.getters.countryId,
isbendi: null,
projectmoney: 0,
@@ -936,6 +937,19 @@ export default {
_that = this
},
methods: {
+ changeAdvanceMoney(val) {
+ console.log('val', val)
+ if (Number(val) > this.flexAdvanceMoney) {
+ this.$notify.error({
+ title: 'wrong',
+ message: this.$t('update4.chaguomorenyushoujine'),
+ offset: 100
+ })
+ this.personalForm.advanceMoney = 0
+ }
+ this.getReceivableMoney()
+ this.updatePrice()
+ },
changeAppDiscount() {
this.getReceivableMoney()
this.updatePrice()
@@ -1362,6 +1376,7 @@ export default {
console.log('res======', res)
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
@@ -1479,6 +1494,7 @@ export default {
}
if (!this.personalForm.advanceMoney) {
this.personalForm.advanceMoney = 0
+ this.flexAdvanceMoney = 0
}
if (!this.personalForm.otherMoney) {
this.personalForm.otherMoney = 0
@@ -1768,6 +1784,7 @@ export default {
console.log('res======', res)
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = this.$store.getters.empcontract3.customerName
@@ -1850,6 +1867,7 @@ export default {
}
if (this.$store.getters.empcontract.receiveMoney) {
this.personalForm.advanceMoney = this.$store.getters.empcontract.receiveMoney
+ this.flexAdvanceMoney = this.$store.getters.empcontract.receiveMoney
}
this.personalForm.sourceNumber = this.$store.getters.empcontract.number
if (this.$store.getters.empcontract.customerType !== null && this.$store.getters.empcontract.customerType !== undefined && this.$store.getters.empcontract.customerType !== '') {
@@ -1860,6 +1878,7 @@ export default {
console.log('res======', res)
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = this.$store.getters.empcontract.customerName
@@ -2292,6 +2311,7 @@ export default {
this.personalForm.customerId = ''
this.customerId = ''
this.personalForm.advanceMoney = 0
+ this.flexAdvanceMoney = 0
},
// 选择客户focus
chooseCustomer() {
@@ -2313,12 +2333,15 @@ export default {
console.log('res======', res)
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.customerName
this.personalForm.customerPhone = val.phoneNumber
this.personalForm.address = val.address
this.personalForm.advanceMoney = val.advanceMoney
+ this.flexAdvanceMoney = val.advanceMoney
+
this.point = val.point
},
agentdata(val) {
@@ -2329,6 +2352,7 @@ export default {
console.log('res======', res)
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.agentName
@@ -2393,6 +2417,7 @@ export default {
console.log('res======', res)
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.customerName
@@ -2435,6 +2460,7 @@ export default {
console.log('res======', res)
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.customerName
@@ -2512,6 +2538,7 @@ export default {
console.log('res======', res)
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.customerName
@@ -2541,6 +2568,7 @@ export default {
console.log('res======', res)
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.customerName
diff --git a/src/views/SaleOut/SaleOutList.vue b/src/views/SaleOut/SaleOutList.vue
index fa955221..5f6c07a6 100644
--- a/src/views/SaleOut/SaleOutList.vue
+++ b/src/views/SaleOut/SaleOutList.vue
@@ -470,7 +470,7 @@ export default {
},
isReview4(row) {
// 测试阶段临时
- if (row.judgeStat === 2) {
+ if (row.judgeStat === 2 || row.judgeStat === 1) {
return true
}
// 正式时放开
diff --git a/src/views/SaleOut/components/MyDialog.vue b/src/views/SaleOut/components/MyDialog.vue
index 552c0c69..b371bc9e 100644
--- a/src/views/SaleOut/components/MyDialog.vue
+++ b/src/views/SaleOut/components/MyDialog.vue
@@ -253,9 +253,10 @@
-
+
+
-
+ {{ $t('otherlanguage.yskdk') }}:{{ flexAdvanceMoney }}
@@ -816,6 +817,7 @@ export default {
return time.getTime() > _now || time.getTime() < sevenDays
}
},
+ flexAdvanceMoney: 0,
controlcategorysdetail: [],
chargecategorysdetail: [],
diffpricelist: [],
@@ -982,6 +984,7 @@ export default {
this.personalForm = this.editdata
this.shouldMoney = this.personalForm.shouldMoney
this.introducer = this.personalForm.introducerName
+ this.flexAdvanceMoney = this.personalForm.advanceMoney
if (this.personalForm.saleOutRetreatVos.length === 0) {
this.showreturn = false
} else {
@@ -1134,6 +1137,19 @@ export default {
_that = this
},
methods: {
+ changeAdvanceMoney(val) {
+ console.log('val', val)
+ if (Number(val) > this.flexAdvanceMoney) {
+ this.$notify.error({
+ title: 'wrong',
+ message: this.$t('update4.chaguomorenyushoujine'),
+ offset: 100
+ })
+ this.personalForm.advanceMoney = 0
+ }
+ this.getReceivableMoney()
+ this.updatePrice()
+ },
changeIntroducer() {
if (!this.introducer) {
this.personalForm.introducerMoney = null
@@ -1368,6 +1384,7 @@ export default {
}
if (!this.personalForm.advanceMoney) {
this.personalForm.advanceMoney = 0
+ this.flexAdvanceMoney = 0
}
if (!this.personalForm.otherMoney) {
this.personalForm.otherMoney = 0
@@ -1898,6 +1915,7 @@ export default {
console.log('res======', res)
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.customerName
@@ -2271,6 +2289,7 @@ export default {
this.personalForm.customerId = ''
this.customerId = ''
this.personalForm.advanceMoney = 0
+ this.flexAdvanceMoney = 0
},
// 选择客户focus
chooseCustomer() {
@@ -2292,6 +2311,7 @@ export default {
console.log('res======', res)
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.customerName
@@ -2307,6 +2327,7 @@ export default {
console.log('res======', res)
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.agentName
@@ -2365,6 +2386,7 @@ export default {
console.log('res======', res)
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.customerName
@@ -2407,6 +2429,7 @@ export default {
console.log('res======', res)
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.customerName
diff --git a/src/views/SaleOut/components/MyDialog2.vue b/src/views/SaleOut/components/MyDialog2.vue
index 1f1ad482..5f1b509e 100644
--- a/src/views/SaleOut/components/MyDialog2.vue
+++ b/src/views/SaleOut/components/MyDialog2.vue
@@ -202,9 +202,10 @@
-
+
+
-
+ {{ $t('otherlanguage.yskdk') }}:{{ flexAdvanceMoney }}
@@ -790,6 +791,7 @@ export default {
return time.getTime() > _now || time.getTime() < sevenDays
}
},
+ flexAdvanceMoney: 0,
isdeduct: 1,
controlcategorysdetail: [],
chargecategorysdetail: [],
@@ -945,6 +947,7 @@ export default {
editdata() {
this.personalForm = this.editdata
this.isbendi = this.editdata.isOwn
+ this.flexAdvanceMoney = this.personalForm.advanceMoney
this.shouldMoney = this.personalForm.shouldMoney
console.log('this.personalForm.shouldMoney', this.personalForm.shouldMoney)
if (this.personalForm.saleOutRetreatVos.length === 0) {
@@ -1115,6 +1118,19 @@ export default {
_that = this
},
methods: {
+ changeAdvanceMoney(val) {
+ console.log('val', val)
+ if (Number(val) > this.flexAdvanceMoney) {
+ this.$notify.error({
+ title: 'wrong',
+ message: this.$t('update4.chaguomorenyushoujine'),
+ offset: 100
+ })
+ this.personalForm.advanceMoney = 0
+ }
+ this.getReceivableMoney()
+ this.updatePrice()
+ },
updatePrice() {
console.log('999', 999)
if (this.personalForm.shouldMoney !== null && this.personalForm.shouldMoney !== '' && this.personalForm.shouldMoney !== undefined) {
@@ -1136,6 +1152,7 @@ export default {
changeisdeduct() {
if (this.isdeduct === 2) {
this.personalForm.advanceMoney = 0
+ this.flexAdvanceMoney = 0
} else {
if (!this.personalForm.customerId) {
this.$notify.error({
@@ -1148,6 +1165,8 @@ export default {
customerlist2(this.personalForm.customerId).then(res => {
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
+
this.getReceivableMoney()
}
})
@@ -1377,6 +1396,7 @@ export default {
}
if (!this.personalForm.advanceMoney) {
this.personalForm.advanceMoney = 0
+ this.flexAdvanceMoney = 0
}
if (!this.personalForm.otherMoney) {
this.personalForm.otherMoney = 0
@@ -1389,6 +1409,7 @@ export default {
}
if (this.isdeduct === 2) {
this.personalForm.advanceMoney = 0
+ this.flexAdvanceMoney = 0
}
if (!this.projectmoney) {
@@ -1934,6 +1955,7 @@ export default {
console.log('res======', res)
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.customerName
@@ -2301,6 +2323,7 @@ export default {
this.personalForm.customerId = ''
this.customerId = ''
this.personalForm.advanceMoney = 0
+ this.flexAdvanceMoney = 0
},
// 选择客户focus
chooseCustomer() {
@@ -2322,6 +2345,7 @@ export default {
console.log('res======', res)
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.customerName
@@ -2338,6 +2362,7 @@ export default {
console.log('res======', res)
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.agentName
@@ -2396,6 +2421,7 @@ export default {
console.log('res======', res)
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.customerName
@@ -2436,6 +2462,7 @@ export default {
console.log('res======', res)
if (res.data.ret === 200) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
+ this.flexAdvanceMoney = res.data.data.content.advanceMoney
}
})
this.customerId = val.customerName
diff --git a/src/views/SaleOut/components/MyDialog3.vue b/src/views/SaleOut/components/MyDialog3.vue
index 44448fc5..5dac393d 100644
--- a/src/views/SaleOut/components/MyDialog3.vue
+++ b/src/views/SaleOut/components/MyDialog3.vue
@@ -214,9 +214,10 @@
-
+
+
-
+ {{ $t('otherlanguage.yskdk') }}:{{ flexAdvanceMoney }}