shawncai/ERP
1
1
Fork 0
mirror of https://github.com/shawncai/ERP.git synced 2024-09-20 06:56:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改erp菲律宾和无锡

Browse source 
修改erp菲律宾和无锡
This commit is contained in:
shawnzhang 2020-12-29 16:47:09 +08:00
parent b49b2059c9
commit 232f461b33
15 changed files with 246 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/lang/en.js
View file

@ -4579,6 +4579,7 @@ export default {
hexiaojinefanwei: 'Verified amount range.',
hexiaojinedengyuling: 'Verified amount=0.',
hexiaojinedayueling: 'Verified amount >0.',
shifouquerenfuk: 'Confirm the payment ?'
shifouquerenfuk: 'Confirm the payment ?',
chaguomorenyushoujine: 'advanceMoney is wrong'
}
}

3
src/lang/zh.js
View file

@ -4579,6 +4579,7 @@ export default {
hexiaojinefanwei: '核销金额范围',
hexiaojinedengyuling: '核销金额=0',
hexiaojinedayueling: '核销金额>0',
shifouquerenfuk: '是否确认付款'
shifouquerenfuk: '是否确认付款',
chaguomorenyushoujine: '超过客户预收抵扣'
}
}

11
src/views/CheckReport/CheckReportList.vue
View file

@ -35,6 +35,17 @@
<el-select v-model="getemplist.checkMode" :value="getemplist.checkMode" size="small" placeholder="检验方式" clearable style="width: 40%;float: left;margin-left: 20px;margin-top: 20px">
<el-option value="1" label="抽样"/>
</el-select>
<el-select v-model="getemplist.receiptStat" :value="getemplist.receiptStat" :placeholder="$t('updates.djzt')" size="small" clearable style="width: 40%;float: right;margin-right: 20px;margin-top: 20px">
<el-option :label="$t('updates.zd')" value="1"/>
<el-option :label="$t('updates.zx')" value="2"/>
<el-option :label="$t('updates.jd')" value="3"/>
</el-select>
<el-select v-model="getemplist.judgeStat" :value="getemplist.judgeStat" :placeholder="$t('updates.spzt')" size="small" clearable style="width: 40%;float: left;margin-left: 20px;margin-top: 20px">
<el-option :label="$t('updates.wsh')" value="0"/>
<el-option :label="$t('updates.shz')" value="1"/>
<el-option :label="$t('updates.shtg')" value="2"/>
<el-option :label="$t('updates.shptg')" value="3"/>
</el-select>
<el-date-picker
v-model="date"
type="daterange"

4
src/views/SaleOrder/SaleOrderList.vue
View file

@ -451,8 +451,8 @@ export default {
this.getlist()
} else {
this.$message({
type: 'success',
message: this.$t('prompt.fspcg')
type: 'error',
message: res.msg
})
}
})

62
src/views/SaleOut/AddSaleOut.vue
View file

@ -451,7 +451,7 @@
<div class="container" style="margin-top: 37px">
<el-form ref="personalForm3" :model="personalForm" :rules="personalrules" :inline="true" label-position="left" size="mini" status-icon class="demo-ruleForm" label-width="130px">
<el-row>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('SaleOut.pointSupport')" prop="pointSupport" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="personalForm.pointSupport" :disabled="personalForm.customerType === '1'" style="width: 200px"/>
</el-form-item>
@ -461,7 +461,7 @@
<el-input-number v-model="personalForm.couponSupportOld" :controls="false" :step="0.1" :min="0" style="width: 200px" @blur="getReceivableMoney"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('SaleOut.couponRemark')" :rules="(personalForm.couponSupportOld === 0 || personalForm.couponSupportOld === '') ? personalrules.couponRemark:[{ required: true, message: 'please select couponRemark', trigger: 'change' }]" prop="couponRemark" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-select ref="clear3" v-model="personalForm.couponRemark" style="width: 200px">
<el-option value="1" label="tax rebate amount"/>
@ -472,7 +472,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('SaleOut.ridMoney')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="personalForm.ridMoney" disabled style="width: 200px"/>
</el-form-item>
@ -494,19 +494,20 @@
</el-col>
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('otherlanguage.yskdk')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="personalForm.advanceMoney" disabled style="width: 200px"/>
<el-input-number v-model="personalForm.advanceMoney" :controls="false" :step="0.1" :min="0" style="width: 200px" @change="changeAdvanceMoney()"/>
</el-form-item>
<!-- <span style="color: red;margin-left: 52px;font-size: 14px">回收车金额：{{ huishou }}</span> -->
<span style="margin-left: 18px;color: red;font-size: 14px">{{ $t('otherlanguage.yskdk') }}：{{ flexAdvanceMoney }}</span>
</el-col>
<el-col v-for="(item, index) in personalForm.couponSupports" :key="index" :span="6">
<el-col v-for="(item, index) in personalForm.couponSupports" :key="index" :span="6" style="height: 57px">
<el-form-item :label="$t('SaleOut.couponSupport') + (index + 1)" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="item.couponSupport" style="margin-left: 18px;width: 130px" @blur="changeCoupon"/>
<el-button v-show="index === personalForm.couponSupports.length -1" icon="el-icon-plus" type="success" @click="addDomain" />
</el-form-item>
</el-col>
<!-- 前两个改变会影响后面的改变 要加change事件 -->
<el-col :span="6" style="height: 57px">
<el-col :span="6" style="height: 57px;padding-top: 27px">
<el-form-item :label="$t('update4.shouldMoney')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<span style="margin-left: 20px;">
{{ personalForm.shouldMoney }}
@ -518,21 +519,21 @@
<el-input-number v-model="personalForm.customerPay" :controls="false" :step="0.1" :min="0" style="width: 200px" @change="updatePrice()"/>
</el-form-item>
</el-col>
<el-col :span="6" style="height: 57px">
<el-col :span="6" style="height: 57px;padding-top: 27px">
<el-form-item :label="$t('update4.changeMoney')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<span style="margin-left: 20px;">
{{ personalForm.changeMoney }}
</span>
</el-form-item>
</el-col>
<el-col :span="6" style="height: 57px">
<el-col :span="6" style="height: 57px;padding-top: 27px">
<el-form-item :label="$t('update4.receivableMoney')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<span style="margin-left: 20px;">
{{ personalForm.receivableMoney }}
</span>
</el-form-item>
</el-col>
<el-col :span="6" style="height: 57px">
<el-col :span="6" style="height: 57px;padding-top: 27px">
<el-form-item :label="$t('update4.unpayMoney')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<span style="margin-left: 20px;">
{{ personalForm.unpayMoney }}
@ -751,6 +752,7 @@ export default {
}
}
return {
flexAdvanceMoney: 0,
introducercontrol: false,
introducer: '',
isdeduct: 1,
@ -1033,6 +1035,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
@ -1053,6 +1068,7 @@ export default {
changeisdeduct() {
if (this.isdeduct === 2) {
this.personalForm.advanceMoney = 0
this.flexAdvanceMoney = 0
this.getReceivableMoney()
} else {
if (!this.personalForm.customerId) {
@ -1066,6 +1082,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.getReceivableMoney()
}
})
@ -1263,8 +1280,10 @@ export default {
if (res.data.ret === 200) {
if (this.isdeduct === 1) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
this.flexAdvanceMoney = res.data.data.content.advanceMoney
} else {
this.personalForm.advanceMoney = 0
this.flexAdvanceMoney = 0
}
}
})
@ -1375,6 +1394,7 @@ export default {
}
if (!this.personalForm.advanceMoney) {
this.personalForm.advanceMoney = 0
this.flexAdvanceMoney = 0
}
if (!this.personalForm.otherMoney) {
this.personalForm.otherMoney = 0
@ -1388,6 +1408,7 @@ export default {
if (this.isdeduct === 2) {
this.personalForm.advanceMoney = 0
this.flexAdvanceMoney = 0
}
if (this.personalForm.sourceType === '1' || this.personalForm.sourceType === '3' || this.personalForm.sourceType === '4' || this.personalForm.sourceType === '5' || this.personalForm.sourceType === '6') {
@ -1657,8 +1678,10 @@ export default {
if (res.data.ret === 200) {
if (this.isdeduct === 1) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
this.flexAdvanceMoney = res.data.data.content.advanceMoney
} else {
this.personalForm.advanceMoney = 0
this.flexAdvanceMoney = 0
}
}
})
@ -1741,8 +1764,10 @@ export default {
if (this.$store.getters.empcontract.receiveMoney) {
if (this.isdeduct === 1) {
this.personalForm.advanceMoney = this.$store.getters.empcontract.receiveMoney
this.flexAdvanceMoney = this.$store.getters.empcontract.receiveMoney
} else {
this.personalForm.advanceMoney = 0
this.flexAdvanceMoney = 0
}
}
this.personalForm.sourceNumber = this.$store.getters.empcontract.number
@ -1754,8 +1779,10 @@ export default {
if (res.data.ret === 200) {
if (this.isdeduct === 1) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
this.flexAdvanceMoney = res.data.data.content.advanceMoney
} else {
this.personalForm.advanceMoney = 0
this.flexAdvanceMoney = 0
}
}
})
@ -2227,6 +2254,7 @@ export default {
this.personalForm.customerId = ''
this.customerId = ''
this.personalForm.advanceMoney = 0
this.flexAdvanceMoney = 0
},
// 选择客户focus
chooseCustomer() {
@ -2246,8 +2274,10 @@ export default {
if (res.data.ret === 200) {
if (this.isdeduct === 1) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
this.flexAdvanceMoney = res.data.data.content.advanceMoney
} else {
this.personalForm.advanceMoney = 0
this.flexAdvanceMoney = 0
}
}
@ -2258,8 +2288,10 @@ export default {
this.personalForm.address = val.address
if (this.isdeduct === 1) {
this.personalForm.advanceMoney = val.advanceMoney
this.flexAdvanceMoney = val.advanceMoney
} else {
this.personalForm.advanceMoney = 0
this.flexAdvanceMoney = 0
}
this.point = val.point
@ -2271,8 +2303,10 @@ export default {
if (res.data.ret === 200) {
if (this.isdeduct === 1) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
this.flexAdvanceMoney = res.data.data.content.advanceMoney
} else {
this.personalForm.advanceMoney = 0
this.flexAdvanceMoney = 0
}
}
})
@ -2336,8 +2370,10 @@ export default {
if (res.data.ret === 200) {
if (this.isdeduct === 1) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
this.flexAdvanceMoney = res.data.data.content.advanceMoney
} else {
this.personalForm.advanceMoney = 0
this.flexAdvanceMoney = 0
}
}
})
@ -2382,8 +2418,10 @@ export default {
if (res.data.ret === 200) {
if (this.isdeduct === 1) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
this.flexAdvanceMoney = res.data.data.content.advanceMoney
} else {
this.personalForm.advanceMoney = 0
this.flexAdvanceMoney = 0
}
}
})
@ -2461,8 +2499,10 @@ export default {
if (res.data.ret === 200) {
if (this.isdeduct === 1) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
this.flexAdvanceMoney = res.data.data.content.advanceMoney
} else {
this.personalForm.advanceMoney = 0
this.flexAdvanceMoney = 0
}
}
this.getReceivableMoney()
@ -2496,8 +2536,10 @@ export default {
if (res.data.ret === 200) {
if (this.isdeduct === 1) {
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
this.flexAdvanceMoney = res.data.data.content.advanceMoney
} else {
this.personalForm.advanceMoney = 0
this.flexAdvanceMoney = 0
}
}
})

57
src/views/SaleOut/NewAccessoriesOut.vue
View file

@ -239,12 +239,12 @@
<template slot="edit" slot-scope="scope">
<el-input v-if="isEdit2(scope.row)" v-model="scope.row.carCode" clearable @blur="getInfo(scope.row)"/>
<span v-else>{{ scope.row.carCode }}</span>
</template>:fixed="isfixed"
</template>
</el-editable-column>
<el-editable-column :edit-render="{name: 'ElInput', type: 'visible'}" :label="$t('updates.djbm')" prop="motorCode" align="center" min-width="150" >
<template slot="edit" slot-scope="scope">
<el-input v-if="isEdit2(scope.row)" v-model="scope.row.motorCode" clearable @blur="getInfo3(scope.row)"/>
<span v-else>{{ scope.row.motorCode }}</span>" :fixed="isfixed
<span v-else>{{ scope.row.motorCode }}</span>"
</template>
</el-editable-column>
<el-editable-column :edit-render="{name: 'ElInput', type: 'visible'}" :label="$t('updates.dcbm')" prop="batteryCode" align="center" min-width="150" >
@ -380,17 +380,17 @@
<div class="container" style="margin-top: 37px">
<el-form ref="personalForm3" :model="personalForm" :rules="personalrules" :inline="true" label-position="left" size="mini" status-icon class="demo-ruleForm" label-width="130px">
<el-row>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('SaleOut.pointSupport')" prop="pointSupport" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="personalForm.pointSupport" :disabled="personalForm.customerType === '1'" style="width: 200px"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('collectAndPay.couponSupportOld')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input-number v-model="personalForm.couponSupportOld" :controls="false" :step="0.1" :min="0" style="width: 200px" @blur="getReceivableMoney"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('SaleOut.couponRemark')" :rules="(personalForm.couponSupportOld === 0 || personalForm.couponSupportOld === '') ? personalrules.couponRemark:[{ required: true, message: 'please select couponRemark', trigger: 'change' }]" prop="couponRemark" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-select ref="clear3" v-model="personalForm.couponRemark" style="width: 200px">
<el-option value="1" label="tax rebate amount"/>
@ -401,13 +401,13 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('SaleOut.ridMoney')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="personalForm.ridMoney" disabled style="width: 200px"/>
</el-form-item>
<!-- <span style="color: red;margin-left: 52px;font-size: 14px">预售款金额：{{ yushou }}</span> -->
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('SaleOut.ridBikeMoney')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="personalForm.ridBikeMoney" disabled style="width: 200px"/>
</el-form-item>
@ -421,14 +421,15 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('otherlanguage.yskdk')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="personalForm.advanceMoney" disabled style="width: 200px"/>
<el-input-number v-model="personalForm.advanceMoney" :controls="false" :step="0.1" :min="0" style="width: 200px" @change="changeAdvanceMoney()"/>
</el-form-item>
<!-- <span style="color: red;margin-left: 52px;font-size: 14px">回收车金额：{{ huishou }}</span> -->
<span style="margin-left: 18px;color: red;font-size: 14px">{{ $t('otherlanguage.yskdk') }}：{{ flexAdvanceMoney }}</span>
</el-col>
<el-col v-for="(item, index) in personalForm.couponSupports" :key="index" :span="6">
<el-col v-for="(item, index) in personalForm.couponSupports" :key="index" :span="6" style="height: 57px">
<el-form-item :label="$t('SaleOut.couponSupport') + (index + 1)" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="item.couponSupport" style="margin-left: 18px;width: 130px" @blur="changeCoupon"/>
<el-button v-show="index === personalForm.couponSupports.length -1" icon="el-icon-plus" type="success" @click="addDomain" />
@ -449,7 +450,7 @@
</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('update4.customerPay')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input-number v-model="personalForm.customerPay" :controls="false" :step="0.1" :min="0" style="width: 200px" @change="updatePrice()"/>
</el-form-item>
@ -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

62
src/views/SaleOut/NewBatteryOut.vue
View file

@ -7,25 +7,25 @@
<div class="container" style="margin-top: 25px">
<el-form ref="personalForm" :model="personalForm" :rules="personalrules" :inline="true" size="mini" status-icon class="demo-ruleForm" label-position="left" label-width="130px">
<el-row>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('SaleOut.invoiceNumber')" prop="invoiceNumber" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="personalForm.invoiceNumber" style="width: 200px" clearable @blur="judgeinvoce"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('SaleOut.customerName')" prop="customerId" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="customerId" style="width: 200px" @focus="chooseCustomer"/>
<my-customer :customercontrol.sync="customercontrol" @customerdata="customerdata"/>
<my-agent :agentcontrol.sync="agentcontrol" @agentdata="agentdata"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('SaleOut.customerPhone')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="personalForm.customerPhone" style="width: 200px" clearable/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('SaleOut.salePersonId')" prop="salePersonId" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="salePersonId" style="width: 200px" @focus="handlechooseStock"/>
<my-emp :control.sync="stockControl" @stockName="stockName"/>
@ -52,17 +52,17 @@
</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('SaleOut.pointSupport')" prop="pointSupport" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="personalForm.pointSupport" :disabled="personalForm.customerType === '1'" style="width: 200px"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('collectAndPay.couponSupportOld')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input-number v-model="personalForm.couponSupportOld" :controls="false" :step="0.1" :min="0" style="width: 200px" @blur="getReceivableMoney"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('SaleOut.couponRemark')" :rules="(personalForm.couponSupportOld === 0 || personalForm.couponSupportOld === '') ? personalrules.couponRemark:[{ required: true, message: 'please select couponRemark', trigger: 'change' }]" prop="couponRemark" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-select ref="clear3" v-model="personalForm.couponRemark" style="width: 200px">
<el-option value="1" label="tax rebate amount"/>
@ -73,25 +73,25 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('SaleOut.ridMoney')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="personalForm.ridMoney" disabled style="width: 200px"/>
</el-form-item>
<!-- <span style="color: red;margin-left: 52px;font-size: 14px">预售款金额：{{ yushou }}</span> -->
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('SaleOut.ridBikeMoney')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="personalForm.ridBikeMoney" disabled style="width: 200px"/>
</el-form-item>
<!-- <span style="color: red;margin-left: 52px;font-size: 14px">回收车金额：{{ huishou }}</span> -->
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('otherlanguage.yskdk')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="personalForm.advanceMoney" disabled style="width: 200px"/>
<el-input-number v-model="personalForm.advanceMoney" :controls="false" :step="0.1" :min="0" style="width: 200px" @change="changeAdvanceMoney()"/>
</el-form-item>
<!-- <span style="color: red;margin-left: 52px;font-size: 14px">回收车金额：{{ huishou }}</span> -->
<span style="margin-left: 18px;color: red;font-size: 14px">{{ $t('otherlanguage.yskdk') }}：{{ flexAdvanceMoney }}</span>
</el-col>
<el-col v-for="(item, index) in personalForm.couponSupports" :key="index" :span="6">
<el-col v-for="(item, index) in personalForm.couponSupports" :key="index" :span="6" style="height: 57px">
<el-form-item :label="$t('SaleOut.couponSupport') + (index + 1)" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="item.couponSupport" style="margin-left: 18px;width: 130px" @blur="changeCoupon"/>
<el-button v-show="index === personalForm.couponSupports.length -1" icon="el-icon-plus" type="success" @click="addDomain" />
@ -112,7 +112,7 @@
</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('update4.customerPay')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input-number v-model="personalForm.customerPay" :controls="false" :step="0.1" :min="0" style="width: 200px" @change="updatePrice()" @blur="updatePrice()"/>
</el-form-item>
@ -155,7 +155,7 @@
</el-radio-group>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('tongyo.useType')" prop="useType" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-select v-model="personalForm.useType" style="width: 200px" @change="changeusetype">
<el-option :label="$t('tongyo.jy')" value="1"/>
@ -163,14 +163,14 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('tongyo.useMonth')" prop="useMonth" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-select v-model="personalForm.useMonth" style="width: 200px" @change="getReceivableMoney" @focus="getusemonth">
<el-option v-for="(item, index) in mouesitems" :key="index" :value="item" :label="item"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 57px">
<el-form-item :label="$t('SaleOut.outDate')" prop="outDate" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-date-picker
v-model="personalForm.outDate"
@ -622,6 +622,7 @@ export default {
return time.getTime() > _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

2
src/views/SaleOut/SaleOutList.vue
View file

@ -470,7 +470,7 @@ export default {
},
isReview4(row) {
// 测试阶段临时
if (row.judgeStat === 2) {
if (row.judgeStat === 2 || row.judgeStat === 1) {
return true
}
// 正式时放开

27
src/views/SaleOut/components/MyDialog.vue
View file

@ -253,9 +253,10 @@
</el-col>
<el-col :span="12">
<el-form-item :label="$t('otherlanguage.yskdk')" style="width: 100%;">
<el-input v-model="personalForm.advanceMoney" disabled style="margin-left: 18px;width: 200px"/>
<el-input-number v-model="personalForm.advanceMoney" :controls="false" :step="0.1" :min="0" style="width: 200px" @change="changeAdvanceMoney()"/>
</el-form-item>
<!-- <span style="color: red;font-size: 14px">回收车金额：{{ huishou }}</span> -->
<span style="margin-left: 18px;color: red;font-size: 14px">{{ $t('otherlanguage.yskdk') }}：{{ flexAdvanceMoney }}</span>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('SaleOut.introducer')" style="width: 100%;">
@ -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

31
src/views/SaleOut/components/MyDialog2.vue
View file

@ -202,9 +202,10 @@
</el-col>
<el-col :span="12">
<el-form-item :label="$t('otherlanguage.yskdk')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="personalForm.advanceMoney" disabled style="width: 200px"/>
<el-input-number v-model="personalForm.advanceMoney" :controls="false" :step="0.1" :min="0" style="width: 200px" @change="changeAdvanceMoney()"/>
</el-form-item>
<!-- <span style="color: red;margin-left: 52px;font-size: 14px">回收车金额：{{ huishou }}</span> -->
<span style="margin-left: 18px;color: red;font-size: 14px">{{ $t('otherlanguage.yskdk') }}：{{ flexAdvanceMoney }}</span>
</el-col>
<el-col v-for="(item, index) in personalForm.couponSupports" :key="index" :span="12">
@ -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

27
src/views/SaleOut/components/MyDialog3.vue
View file

@ -214,9 +214,10 @@
</el-col>
<el-col :span="12">
<el-form-item :label="$t('otherlanguage.yskdk')" style="width: 100%;">
<el-input v-model="personalForm.advanceMoney" disabled style="margin-left: 18px;width: 200px"/>
<el-input-number v-model="personalForm.advanceMoney" :controls="false" :step="0.1" :min="0" style="width: 200px" @change="changeAdvanceMoney()"/>
</el-form-item>
<!-- <span style="color: red;font-size: 14px">回收车金额：{{ huishou }}</span> -->
<span style="margin-left: 18px;color: red;font-size: 14px">{{ $t('otherlanguage.yskdk') }}：{{ flexAdvanceMoney }}</span>
</el-col>
<!-- <el-col :span="12">
<el-form-item :label="$t('collectAndPay.isfree')" style="width: 100%;">
@ -745,6 +746,7 @@ export default {
return time.getTime() > _now || time.getTime() < sevenDays
}
},
flexAdvanceMoney: 0,
saveloding: false,
projectmoney: 0,
isbendi: null,
@ -913,6 +915,7 @@ export default {
editdata() {
this.personalForm = this.editdata
this.isbendi = this.editdata.isOwn
this.flexAdvanceMoney = this.personalForm.advanceMoney
if (this.personalForm.saleOutRetreatVos.length === 0) {
this.showreturn = false
} else {
@ -1073,6 +1076,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++) {
@ -1311,6 +1327,7 @@ export default {
}
if (!this.personalForm.advanceMoney) {
this.personalForm.advanceMoney = 0
this.flexAdvanceMoney = 0
}
if (!this.personalForm.otherMoney) {
this.personalForm.otherMoney = 0
@ -1917,6 +1934,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
@ -2284,6 +2302,7 @@ export default {
this.personalForm.customerId = ''
this.customerId = ''
this.personalForm.advanceMoney = 0
this.flexAdvanceMoney = 0
},
// 选择客户focus
chooseCustomer() {
@ -2306,6 +2325,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
@ -2321,6 +2341,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
@ -2379,6 +2400,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
@ -2419,6 +2441,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

2
src/views/StockAlarm/StockAlarmList.vue
View file

@ -283,7 +283,7 @@ export default {
console.log('this.list', this.list)
this.downloadLoading = true
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['编号', '物品编码', '物品名称', '规格型号', '单位', '库存下限', '库存上限', '现有库存', '报警类型']
const tHeader = [this.$t('InventoryReplenishment.id'), this.$t('SmartReplenishmentList.productCode'), this.$t('SmartReplenishmentList.productName'), this.$t('Hmodule.ggxh'), this.$t('Hmodule.dw'), this.$t('StockAlarm.downStock'), this.$t('inventoryAlarm.upStock'), this.$t('inventoryAlarm.onStock'), this.$t('StockAlarm.flag')]
const filterVal = ['id', 'code', 'productName', 'typeName', 'stockMeasurement', 'downStock', 'upStock', 'existStock', 'alarmTypeName']
const data = this.formatJson(filterVal, this.list)
excel.export_json_to_excel({

11
src/views/StockInvoice/AddStockInvoice.vue
View file

@ -24,10 +24,6 @@
<el-col :span="6">
<el-form-item
:label="$t('StockInvoice.invoiceNumber')"
:rules="personalForm.invoiceType === '1'? personalrules.invoiceNumber: [
{ required: true, validator: validatePass5, trigger: 'blur'}
]"
prop="invoiceNumber"
style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="personalForm.invoiceNumber" style="width: 200px" clearable/>
</el-form-item>
@ -169,7 +165,6 @@
:edit-config="{ showIcon: true, showStatus: true}"
:edit-rules="validRules"
:summary-method="getSummaries"
:class="click-table1"
:show-summary="jundgeprice()"
stripe
border
@ -565,7 +560,7 @@ export default {
const hasPermission = roles.some(role => {
return permissionRoles.includes(role)
})
console.log('hasPermission=======', hasPermission)
// console.log('hasPermission=======', hasPermission)
return hasPermission
},
getcurrency() {
@ -873,7 +868,9 @@ export default {
}
}
const newarr = val.concat(mychecklist)
const newnewarr = this.uniqueArray(newarr, 'productCode', 'sourceNumber')
// const newnewarr = this.uniqueArray(newarr, 'productCode', 'sourceNumber')
const newnewarr = newarr
// const obj = {}
// const processaction = newarr.reduce((cur, next) => {
// obj[next.sourceNumber] ? '' : obj[next.sourceNumber] = true && cur.push(next)

3
src/views/StockPlan/AddStockPlan.vue
View file

@ -456,8 +456,7 @@ export default {
mounted() {
this.getcopydata()
this.getinformation()
// this.getinformation()
},
activated() {
this.getcopydata()

1
src/views/Storagemove/StoragemoveList.vue
View file

@ -833,6 +833,7 @@ export default {
isReview(row) {
const userepository = this.$store.getters.repositoryId
console.log(this.$store.getters.userId)
console.log(this.$store.getters.regionId)
console.log('userepository', userepository)
if (row.moveType === 1) {
console.log('row', row)