mirror of
https://github.com/shawncai/ERP.git
synced 2024-09-20 06:56:07 +08:00
6/23日修改代码
This commit is contained in:
shawnzhang
parent
dd3ce93c69
commit
4bbf43d3a6
|
|
@ -57,6 +57,9 @@ export function searchexpenses(query) {
|
|||
if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
|
||||
params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
|
||||
}
|
||||
if (query.subjectCode !== '' && query.subjectCode !== null && query.subjectCode !== undefined) {
|
||||
params.append('subjectCode', query.subjectCode) // 你要传给后台的参数值 key/value
|
||||
}
|
||||
params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value
|
||||
params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value
|
||||
return request({
|
||||
|
|
|
|||
|
|
@ -11,6 +11,9 @@ export function addinstallmentapply(query, query2, query4) {
|
|||
if (query4.regionId !== '' && query4.regionId !== null && query4.regionId !== undefined) {
|
||||
params.append('regionId', query4.regionId) // 你要传给后台的参数值 key/value
|
||||
}
|
||||
if (query4.picids !== '' && query4.picids !== null && query4.picids !== undefined) {
|
||||
params.append('picids', query4.picids) // 你要传给后台的参数值 key/value
|
||||
}
|
||||
return request({
|
||||
url: '/installmentapply/addinstallmentapply',
|
||||
method: 'post',
|
||||
|
|
|
|||
|
|
@ -11,6 +11,9 @@ export function createtransfer(query, query2, query3) {
|
|||
if (query2.regionId !== '' && query2.regionId !== null && query2.regionId !== undefined) {
|
||||
params.append('regionId', query2.regionId) // 你要传给后台的参数值 key/value
|
||||
}
|
||||
if (query2.picids !== '' && query2.picids !== null && query2.picids !== undefined) {
|
||||
params.append('picids', query2.picids) // 你要传给后台的参数值 key/value
|
||||
}
|
||||
return request({
|
||||
url: '/transfer/create',
|
||||
method: 'post',
|
||||
|
|
@ -67,6 +70,9 @@ export function searchtransfer(query) {
|
|||
if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
|
||||
params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
|
||||
}
|
||||
if (query.subjectCode !== '' && query.subjectCode !== null && query.subjectCode !== undefined) {
|
||||
params.append('subjectCode', query.subjectCode) // 你要传给后台的参数值 key/value
|
||||
}
|
||||
params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value
|
||||
params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value
|
||||
return request({
|
||||
|
|
|
|||
|
|
@ -4447,6 +4447,19 @@ export default {
|
|||
escxssl: 'Number of used car sales',
|
||||
qxzyylx: 'please select Battery use type',
|
||||
yjhsl: 'Planned quantity',
|
||||
lbmc: 'classification name'
|
||||
lbmc: 'classification name',
|
||||
tjzxr: 'add co-maker',
|
||||
dbrxmwk: 'co-maker name is empty',
|
||||
dbrdhwk: 'co-maker phone is empty',
|
||||
dbrsjhcw: 'co-maker phone is wrong',
|
||||
dbrgxwk: 'co-maker relationship is empty',
|
||||
dbrdzwk: 'co-maker address is empty',
|
||||
dbrzjlxwk: 'co-maker valid ID is empty',
|
||||
dbrzjhmwk: 'co-maker ID no. is empty',
|
||||
dbrgscgsx: 'co-maker number is over',
|
||||
zxrwek: 'co-maker is empty',
|
||||
sfdk: 'Whether to deduct',
|
||||
qxzkh: 'please select customer'
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4457,6 +4457,8 @@ export default {
|
|||
dbrzjlxwk: '担保人证件类型为空',
|
||||
dbrzjhmwk: '担保人证件号码为空',
|
||||
dbrgscgsx: '担保人人数超过限制',
|
||||
zxrwek: '担保人为空'
|
||||
zxrwek: '担保人为空',
|
||||
sfdk: '是否抵扣',
|
||||
qxzkh: '请选择客户'
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ import Print from 'vue-print-nb'
|
|||
import * as filters from './filters' // global filters
|
||||
import _ from 'lodash'
|
||||
// 全局图片上传地址
|
||||
Vue.prototype.$upload = process.env.BASE_API
|
||||
// Vue.prototype.$upload = process.env.BASE_API
|
||||
Vue.use(Element, {
|
||||
size: Cookies.get('size') || 'medium', // set element-ui default size
|
||||
i18n: (key, value) => i18n.t(key, value)
|
||||
|
|
|
|||
|
|
@ -16,6 +16,17 @@
|
|||
:label="item.repositoryName"
|
||||
:value="item.id"/>
|
||||
</el-select>
|
||||
<el-cascader
|
||||
:options="suboptions"
|
||||
:props="props2"
|
||||
v-model="subjectdata"
|
||||
:show-all-levels="false"
|
||||
:placeholder="$t('updates.kmmc')"
|
||||
change-on-select
|
||||
filterable
|
||||
clearable
|
||||
@change="handlechangesubject"
|
||||
/>
|
||||
|
||||
<el-popover
|
||||
v-model="visible2"
|
||||
|
|
@ -296,6 +307,14 @@ export default {
|
|||
},
|
||||
data() {
|
||||
return {
|
||||
treedata: [],
|
||||
props2: {
|
||||
value: 'id',
|
||||
label: 'subjectName',
|
||||
children: 'subjectFinanceVos'
|
||||
},
|
||||
suboptions: [],
|
||||
subjectdata: [],
|
||||
repositories: [],
|
||||
tableHeight: 200,
|
||||
pickerOptions1: {
|
||||
|
|
@ -389,6 +408,7 @@ export default {
|
|||
activated() {
|
||||
this.getlist()
|
||||
this.handlerep()
|
||||
this.gettree2()
|
||||
setTimeout(() => {
|
||||
this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 140
|
||||
}, 100)
|
||||
|
|
@ -396,7 +416,7 @@ export default {
|
|||
mounted() {
|
||||
this.getlist()
|
||||
this.handlerep()
|
||||
|
||||
this.gettree2()
|
||||
setTimeout(() => {
|
||||
this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 140
|
||||
}, 100)
|
||||
|
|
@ -405,6 +425,68 @@ export default {
|
|||
_that = this
|
||||
},
|
||||
methods: {
|
||||
handlechangesubject(val) {
|
||||
console.log('val', val)
|
||||
if (val.length === 0) {
|
||||
this.getemplist.subjectCode = ''
|
||||
} else {
|
||||
const finid = val[val.length - 1]
|
||||
const needata = this.findtreedata(this.treedata, finid)
|
||||
console.log('needata', needata)
|
||||
this.getemplist.subjectCode = needata.subjectNumber
|
||||
}
|
||||
},
|
||||
findtreedata(val, val2) {
|
||||
let data;
|
||||
(val || []).map(i => {
|
||||
if (i.id === val2) {
|
||||
data = i
|
||||
} else {
|
||||
const child = this.findtreedata(i.subjectFinanceVos, val2)
|
||||
if (child) {
|
||||
data = child
|
||||
}
|
||||
}
|
||||
})
|
||||
return data
|
||||
},
|
||||
switchtreedata(val) {
|
||||
for (const i in val) {
|
||||
if (val[i].subjectNumber === '' || val[i].subjectNumber === null) {
|
||||
this.switchtreedata(val[i].subjectFinanceVos)
|
||||
} else {
|
||||
if (val[i].level > 3) {
|
||||
this.switchtreedata(val[i].subjectFinanceVos)
|
||||
}
|
||||
val[i].subjectName = val[i].subjectNumber + val[i].subjectName
|
||||
}
|
||||
}
|
||||
},
|
||||
processchildren(val) {
|
||||
for (const i in val) {
|
||||
if (val[i].subjectFinanceVos.length === 0) {
|
||||
delete val[i].subjectFinanceVos
|
||||
} else {
|
||||
this.processchildren(val[i].subjectFinanceVos)
|
||||
}
|
||||
// if (val[i].) {
|
||||
// }
|
||||
}
|
||||
return val
|
||||
},
|
||||
gettree2() {
|
||||
console.log(123)
|
||||
subjectList().then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
const newarr = res.data.data.content
|
||||
console.log('newarr', newarr)
|
||||
const testarr = this.switchtreedata(newarr)
|
||||
this.suboptions = this.processchildren(newarr)
|
||||
this.treedata = res.data.data.content
|
||||
}
|
||||
})
|
||||
console.log(321)
|
||||
},
|
||||
// 根据区域选择门店
|
||||
handlerep() {
|
||||
console.log('this.$store.getters.repositoryId', this.$store.getters.repositoryId)
|
||||
|
|
|
|||
|
|
@ -566,7 +566,7 @@
|
|||
<el-upload
|
||||
ref="upload"
|
||||
:auto-upload="true"
|
||||
:action="`${uploadapi}/upload/uploadpic`"
|
||||
:action="`${uplodaapi}/upload/uploadpic`"
|
||||
:data="paperData"
|
||||
:on-success="handlepicsuccess"
|
||||
class="upload-demo"
|
||||
|
|
@ -574,7 +574,6 @@
|
|||
multiple>
|
||||
<i class="el-icon-upload"/>
|
||||
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
|
||||
<div slot="tip" class="el-upload__tip">支持扩展名：.rar .zip .doc .docx...</div>
|
||||
</el-upload>
|
||||
</div>
|
||||
</el-card>
|
||||
|
|
@ -860,6 +859,7 @@ export default {
|
|||
// }
|
||||
// }
|
||||
return {
|
||||
uplodaapi: this.$store.getters.uploadApi,
|
||||
newcomarker: {
|
||||
suretyName: '',
|
||||
suretyPhone: '',
|
||||
|
|
@ -1832,7 +1832,11 @@ export default {
|
|||
return false
|
||||
}
|
||||
const judgeissecond = this.productForm.productCode.slice(10, 12)
|
||||
const judgecartype = this.productForm.productCode.slice(4, 8)
|
||||
const judgecartype = this.productForm.productCode.slice(3, 7)
|
||||
console.log('judgeissecond', judgeissecond)
|
||||
console.log('judgecartype', judgecartype)
|
||||
console.log('this.personalForm.firstMoney', Number(this.personalForm.firstMoney))
|
||||
|
||||
// 二手gb2
|
||||
if (judgeissecond === '00' && judgecartype === '0040' && Number(this.personalForm.firstMoney) < 5000) {
|
||||
this.$notify.error({
|
||||
|
|
@ -1864,6 +1868,7 @@ export default {
|
|||
|
||||
// 其他新车
|
||||
if (judgeissecond !== '00' && judgecartype !== '0040' && Number(this.personalForm.firstMoney) < 10000) {
|
||||
console.log('123')
|
||||
this.$notify.error({
|
||||
title: 'wrong',
|
||||
message: 'the new car firstMoney is wrong',
|
||||
|
|
@ -2008,6 +2013,7 @@ export default {
|
|||
})
|
||||
this.isclick = false
|
||||
this.restAllForm()
|
||||
this.$refs.upload.clearFiles()
|
||||
this.$refs.editable2.clear()
|
||||
this.$refs.personalForm.clearValidate()
|
||||
this.$refs.personalForm.resetFields()
|
||||
|
|
|
|||
|
|
@ -490,6 +490,16 @@
|
|||
</el-table>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card :body-style=" { padding: '5px' }" class="box-card" shadow="never" style="margin-top: 5px;margin-bottom: 20px">
|
||||
<div
|
||||
style=" display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;">
|
||||
<div v-for="(item, index) in personalForm.picPaths" :key="index" style="text-align: center;">
|
||||
<img :src="item" class="image" style="width: 30%">
|
||||
</div>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card class="box-card" style="margin-top: 15px" shadow="never">
|
||||
<h2 ref="geren" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">{{ $t('updates.bzxx') }}</h2>
|
||||
<div class="container" style="margin-top: 37px">
|
||||
|
|
|
|||
|
|
@ -1525,6 +1525,59 @@ export default {
|
|||
// 修改和取消按钮
|
||||
// 修改按钮
|
||||
handleEditok() {
|
||||
if (Number(this.personalForm.firstMoney) === 0) {
|
||||
this.$notify.error({
|
||||
title: 'wrong',
|
||||
message: 'firstMoney is 0',
|
||||
offset: 100
|
||||
})
|
||||
return false
|
||||
}
|
||||
const judgeissecond = this.productForm.productCode.slice(10, 12)
|
||||
const judgecartype = this.productForm.productCode.slice(3, 7)
|
||||
console.log('judgeissecond', judgeissecond)
|
||||
console.log('judgecartype', judgecartype)
|
||||
console.log('this.personalForm.firstMoney', Number(this.personalForm.firstMoney))
|
||||
|
||||
// 二手gb2
|
||||
if (judgeissecond === '00' && judgecartype === '0040' && Number(this.personalForm.firstMoney) < 5000) {
|
||||
this.$notify.error({
|
||||
title: 'wrong',
|
||||
message: 'the second gb2 firstMoney is wrong',
|
||||
offset: 100
|
||||
})
|
||||
return false
|
||||
}
|
||||
// 二手其他车
|
||||
if (judgeissecond === '00' && judgecartype !== '0040' && Number(this.personalForm.firstMoney) < 7000) {
|
||||
this.$notify.error({
|
||||
title: 'wrong',
|
||||
message: 'the second car firstMoney is wrong',
|
||||
offset: 100
|
||||
})
|
||||
return false
|
||||
}
|
||||
|
||||
// 新gb2
|
||||
if (judgeissecond !== '00' && judgecartype === '0040' && Number(this.personalForm.firstMoney) < 5000) {
|
||||
this.$notify.error({
|
||||
title: 'wrong',
|
||||
message: 'the gb2 firstMoney is wrong',
|
||||
offset: 100
|
||||
})
|
||||
return false
|
||||
}
|
||||
|
||||
// 其他新车
|
||||
if (judgeissecond !== '00' && judgecartype !== '0040' && Number(this.personalForm.firstMoney) < 10000) {
|
||||
console.log('123')
|
||||
this.$notify.error({
|
||||
title: 'wrong',
|
||||
message: 'the new car firstMoney is wrong',
|
||||
offset: 100
|
||||
})
|
||||
return false
|
||||
}
|
||||
if (this.productForm.productCode === null || this.productForm.productCode === undefined || this.productForm.productCode === '') {
|
||||
this.$notify.error({
|
||||
title: 'wrong',
|
||||
|
|
|
|||
|
|
@ -144,8 +144,9 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item :label="$t('SaleContract.saleRepositoryId')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
|
||||
<el-input v-model="saleRepositoryId" style="width: 200px" clearable/>
|
||||
<el-form-item :label="$t('SaleContract.saleRepositoryId')" style="margin-left: 18px;width: 100%;margin-bottom: 0" >
|
||||
<el-input v-model="saleRepositoryId" style="width: 200px" clearable @focus="handlechooseRep"/>
|
||||
<my-repository :repositorycontrol.sync="repositorycontrol" @repositoryname="repositoryname"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
|
|
@ -293,11 +294,11 @@
|
|||
<div ref="fuzhu" class="form-name" >{{ $t('updates.htmx') }}</div>
|
||||
<div class="buttons" style="margin-top: 35px;margin-bottom: 10px;">
|
||||
<el-button :disabled="canclick" @click="handleAddproduct">{{ $t('Hmodule.tjsp') }}</el-button>
|
||||
<my-detail :control.sync="control" @product="productdetail"/>
|
||||
<my-detail :control.sync="control" :personalform="personalForm" @product="productdetail"/>
|
||||
<el-button @click="handleAddpackage">{{ $t('otherlanguage.xztc') }}</el-button>
|
||||
<my-package :packagecontrol.sync="packagecontrol" :productnumber.sync="productnumber" @salePrice="salePrice" @packagedata="packagedata"/>
|
||||
<el-button type="primary" @click="checkStock()">{{ $t('updates.kckz') }}</el-button>
|
||||
<el-button :disabled="isinstallappley" type="danger" @click="$refs.editable.removeSelecteds()">{{ $t('Hmodule.delete') }}</el-button>
|
||||
<el-button type="danger" @click="$refs.editable.removeSelecteds()">{{ $t('Hmodule.delete') }}</el-button>
|
||||
|
||||
</div>
|
||||
<div class="container">
|
||||
|
|
@ -322,6 +323,7 @@
|
|||
<el-editable-column :label="$t('updates.ggxh')" prop="typeName" align="center" min-width="150px"/>
|
||||
<el-editable-column :label="$t('updates.ys')" prop="color" align="center" min-width="150px"/>
|
||||
<el-editable-column :label="$t('Hmodule.dw')" prop="unit" align="center" min-width="150px"/>
|
||||
<el-editable-column :label="$t('updates.kcsl')" prop="existStock" align="center" min-width="150px"/>
|
||||
<el-editable-column :label="$t('updates.jxf')" prop="performanceScore" align="center" min-width="150px"/>
|
||||
<el-editable-column :label="$t('updates.spjf')" prop="productScore" align="center" min-width="150px"/>
|
||||
<el-editable-column :edit-render="{name: 'ElInput', type: 'visible'}" :label="$t('updates.ddsl')" prop="quantity" align="center" min-width="150" >
|
||||
|
|
@ -493,11 +495,13 @@ import MyCustomer from '../SaleOpportunity/components/MyCustomer'
|
|||
import MyAgent from '../SaleOpportunity/components/MyAgent'
|
||||
import MyPackage from './components/MyPackage'
|
||||
import MyCustomer2 from './components/MyCustomer2'
|
||||
import MyRepository from './components/MyRepository'
|
||||
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
var _that
|
||||
export default {
|
||||
name: 'AddSaleContract',
|
||||
components: { MyAgent, MyPackage, MyCustomer, MyCustomer2, MyInstallmentapply, MyOpportunity, MyDelivery, MyPlan, MyApply, MySupplier, MyDetail, MyEmp },
|
||||
components: { MyAgent, MyRepository, MyPackage, MyCustomer, MyCustomer2, MyInstallmentapply, MyOpportunity, MyDelivery, MyPlan, MyApply, MySupplier, MyDetail, MyEmp },
|
||||
data() {
|
||||
const validatePass4 = (rule, value, callback) => {
|
||||
if (this.personalForm.customerId === undefined || this.personalForm.customerId === null || this.personalForm.customerId === '') {
|
||||
|
|
@ -556,6 +560,7 @@ export default {
|
|||
return time.getTime() < new Date().getTime() - 8.64e7
|
||||
}
|
||||
},
|
||||
repositorycontrol: false,
|
||||
saveloding: false,
|
||||
customercontrol2: false,
|
||||
picidsData: {
|
||||
|
|
@ -752,6 +757,16 @@ export default {
|
|||
_that = this
|
||||
},
|
||||
methods: {
|
||||
repositoryname(val) {
|
||||
this.saleRepositoryId = val.repositoryName
|
||||
this.personalForm.saleRepositoryId = val.id
|
||||
this.list2 = []
|
||||
this.list3 = []
|
||||
},
|
||||
// 出库仓库focus事件触发
|
||||
handlechooseRep() {
|
||||
this.repositorycontrol = true
|
||||
},
|
||||
geteachmoney() {
|
||||
const date = new Date()
|
||||
let byear = 0
|
||||
|
|
@ -955,7 +970,15 @@ export default {
|
|||
},
|
||||
// 数量变化其他参数
|
||||
queryStock(row) {
|
||||
console.log('1111')
|
||||
if (row.quantity > row.existStock) {
|
||||
this.$notify.error({
|
||||
title: 'wrong',
|
||||
message: 'quantity is over stock quantity',
|
||||
offset: 100
|
||||
})
|
||||
row.quantity = 1
|
||||
return false
|
||||
}
|
||||
if (row.discountRate === 0) {
|
||||
// row.discountMoney = 0
|
||||
} else {
|
||||
|
|
@ -986,6 +1009,14 @@ export default {
|
|||
},
|
||||
// 无来源添加商品
|
||||
handleAddproduct() {
|
||||
if (this.personalForm.saleRepositoryId === 0 || this.personalForm.saleRepositoryId === '0' || this.personalForm.saleRepositoryId === '') {
|
||||
this.$notify.error({
|
||||
title: 'wrong',
|
||||
message: 'please select repository',
|
||||
offset: 100
|
||||
})
|
||||
return false
|
||||
}
|
||||
this.control = true
|
||||
},
|
||||
// 判断权限
|
||||
|
|
@ -1398,6 +1429,10 @@ export default {
|
|||
// 含税价
|
||||
gettaxprice(row) {
|
||||
row.taxprice = (row.salePrice * (1 + row.taxRate / 100)).toFixed(6)
|
||||
// 查询库存数量
|
||||
countlist(this.personalForm.saleRepositoryId, this.$store.getters.regionIds, row.productCode).then(res => {
|
||||
row.existStock = res.data.data.content.list[0].existStock
|
||||
})
|
||||
return row.taxprice
|
||||
},
|
||||
getincludeTaxCostMoney(row) {
|
||||
|
|
@ -1661,7 +1696,7 @@ export default {
|
|||
}
|
||||
console.log('needcode', needcode)
|
||||
const judgeissecond = needcode.slice(10, 12)
|
||||
const judgecartype = needcode.slice(4, 8)
|
||||
const judgecartype = needcode.slice(3, 7)
|
||||
if (this.personalForm.isSecondApply === 1 || this.personalForm.sourceType === '2') {
|
||||
if (judgeissecond === '00' && judgecartype === '0040' && Number(this.personalForm.firstMoney) < 5000) {
|
||||
this.$notify.error({
|
||||
|
|
|
|||
|
|
@ -86,6 +86,11 @@
|
|||
<span>{{ scope.row.color }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('updates.kcsl')" :resizable="false" prop="color" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.existStock }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('Product.kpigrade')" :resizable="false" prop="kpiGrade" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.kpiGrade }}</span>
|
||||
|
|
@ -127,7 +132,7 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import { productlist, searchEmpCategory2 } from '@/api/Product'
|
||||
import { productlist, searchEmpCategory2, chooseProduct } from '@/api/Product'
|
||||
import waves from '@/directive/waves' // Waves directive
|
||||
import Pagination from '@/components/Pagination'
|
||||
import MySupplier from '../../Product/components/MySupplier'
|
||||
|
|
@ -150,6 +155,10 @@ export default {
|
|||
control: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
personalform: {
|
||||
type: Object,
|
||||
default: null
|
||||
}
|
||||
},
|
||||
data() {
|
||||
|
|
@ -157,7 +166,7 @@ export default {
|
|||
tiaoshu: 0,
|
||||
|
||||
tableHeight: 200,
|
||||
|
||||
query: this.personalform,
|
||||
// 供应商回显
|
||||
supplierid: '',
|
||||
// 供货商控制
|
||||
|
|
@ -205,6 +214,9 @@ export default {
|
|||
setTimeout(() => {
|
||||
this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 180
|
||||
}, 100)
|
||||
},
|
||||
personalform() {
|
||||
this.query = this.personalform
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
|
@ -217,9 +229,13 @@ export default {
|
|||
getlist() {
|
||||
// 商品列表数据
|
||||
this.listLoading = true
|
||||
productlist(this.getemplist).then(res => {
|
||||
this.getemplist.searchRepositoryId = this.query.saleRepositoryId
|
||||
|
||||
chooseProduct(this.getemplist).then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
this.list = res.data.data.content.list
|
||||
this.list = res.data.data.content.list.filter(item => {
|
||||
return item.existStock > 0
|
||||
})
|
||||
this.total = res.data.data.content.totalCount
|
||||
}
|
||||
setTimeout(() => {
|
||||
|
|
@ -244,14 +260,18 @@ export default {
|
|||
// 搜索
|
||||
handleFilter() {
|
||||
this.getemplist.pagenum = 1
|
||||
productlist(this.getemplist).then(res => {
|
||||
this.getemplist.searchRepositoryId = this.query.saleRepositoryId
|
||||
|
||||
chooseProduct(this.getemplist).then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
this.list = res.data.data.content.list
|
||||
this.list = res.data.data.content.list.filter(item => {
|
||||
return item.existStock > 0
|
||||
})
|
||||
this.total = res.data.data.content.totalCount
|
||||
// this.restFilter()
|
||||
} else {
|
||||
// this.restFilter()
|
||||
}
|
||||
setTimeout(() => {
|
||||
this.listLoading = false
|
||||
}, 0.5 * 100)
|
||||
})
|
||||
},
|
||||
// 批量操作
|
||||
|
|
|
|||
|
|
@ -1208,6 +1208,55 @@ export default {
|
|||
// 修改按钮
|
||||
handleEditok() {
|
||||
this.personalForm.installmentAllMoney = this.personalForm.totalMoney
|
||||
const EnterDetail2 = this.$refs.editable.getRecords()
|
||||
let needcode = ''
|
||||
for (const i in EnterDetail2) {
|
||||
if (EnterDetail2[i].productCode.slice(0, 2) === '01') {
|
||||
needcode = EnterDetail2[i].productCode
|
||||
}
|
||||
}
|
||||
console.log('needcode', needcode)
|
||||
const judgeissecond = needcode.slice(10, 12)
|
||||
const judgecartype = needcode.slice(3, 7)
|
||||
if (this.personalForm.isSecondApply === 1 || this.personalForm.sourceType === '2') {
|
||||
if (judgeissecond === '00' && judgecartype === '0040' && Number(this.personalForm.firstMoney) < 5000) {
|
||||
this.$notify.error({
|
||||
title: 'wrong',
|
||||
message: 'the second gb2 firstMoney is wrong',
|
||||
offset: 100
|
||||
})
|
||||
return false
|
||||
}
|
||||
// 二手其他车
|
||||
if (judgeissecond === '00' && judgecartype !== '0040' && Number(this.personalForm.firstMoney) < 7000) {
|
||||
this.$notify.error({
|
||||
title: 'wrong',
|
||||
message: 'the second car firstMoney is wrong',
|
||||
offset: 100
|
||||
})
|
||||
return false
|
||||
}
|
||||
|
||||
// 新gb2
|
||||
if (judgeissecond !== '00' && judgecartype === '0040' && Number(this.personalForm.firstMoney) < 5000) {
|
||||
this.$notify.error({
|
||||
title: 'wrong',
|
||||
message: 'the gb2 firstMoney is wrong',
|
||||
offset: 100
|
||||
})
|
||||
return false
|
||||
}
|
||||
|
||||
// 其他新车
|
||||
if (judgeissecond !== '00' && judgecartype !== '0040' && Number(this.personalForm.firstMoney) < 10000) {
|
||||
this.$notify.error({
|
||||
title: 'wrong',
|
||||
message: 'the new car firstMoney is wrong',
|
||||
offset: 100
|
||||
})
|
||||
return false
|
||||
}
|
||||
}
|
||||
this.$refs.personalForm.validate((valid) => {
|
||||
if (valid) {
|
||||
this.personalForm.repositoryId = this.$store.getters.repositoryId
|
||||
|
|
|
|||
278
src/views/SaleContract/components/MyRepository.vue
Normal file
278
src/views/SaleContract/components/MyRepository.vue
Normal file
|
|
@ -0,0 +1,278 @@
|
|||
<template>
|
||||
<el-dialog :visible.sync="repositoryVisible" :repositorycontrol="repositorycontrol" :close-on-press-escape="false" top="10px" title="选择仓库" append-to-body @close="$emit('update:repositorycontrol', false)">
|
||||
<div class="filter-container">
|
||||
<!-- 搜索条件栏目 -->
|
||||
<el-input v-model="getemplist.id" :placeholder="$t('Repository.id')" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
|
||||
<el-input v-model="getemplist.repositoryName" :placeholder="$t('Repository.repositoryname')" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
|
||||
<el-select v-model="getemplist.type" :value="getemplist.type" :placeholder="$t('Repository.type2')" class="filter-item" clearable>
|
||||
<el-option
|
||||
v-for="(item, index) in types"
|
||||
:key="index"
|
||||
:value="item.id"
|
||||
:label="item.categoryName"
|
||||
/>
|
||||
</el-select>
|
||||
<el-select v-model="getemplist.iseffective" :value="getemplist.iseffective" :placeholder="$t('Repository.iseffective')" class="filter-item" clearable>
|
||||
<el-option :label="$t('updates.qy')" value="1"/>
|
||||
<el-option :label="$t('updates.ty')" value="2"/>
|
||||
</el-select>
|
||||
<el-cascader
|
||||
:options="regions"
|
||||
:props="props"
|
||||
v-model="getemplistregions"
|
||||
:show-all-levels="false"
|
||||
:placeholder="$t('Hmodule.xzqy')"
|
||||
change-on-select
|
||||
filterable
|
||||
clearable
|
||||
class="filter-item"
|
||||
/>
|
||||
<el-select v-model="getemplist.countyrId" placeholder="请选择国家" class="filter-item" clearable>
|
||||
<el-option
|
||||
v-for="(item, index) in nations"
|
||||
:key="index"
|
||||
:label="item.name"
|
||||
:value="item.id"/>
|
||||
</el-select>
|
||||
<!-- 搜索按钮 -->
|
||||
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" style="width: 86px" @click="handleFilter">{{ $t('public.search') }}</el-button>
|
||||
<!-- 新建操作 -->
|
||||
<el-button v-waves class="filter-item" icon="el-icon-plus" type="success" style="width: 86px;" @click="handleAdd">{{ $t('public.add') }}</el-button>
|
||||
</div>
|
||||
<!-- 列表开始 -->
|
||||
<el-table
|
||||
v-loading="listLoading"
|
||||
ref="table"
|
||||
:key="tableKey"
|
||||
:data="list"
|
||||
:height="tableHeight"
|
||||
size="small"
|
||||
border
|
||||
fit
|
||||
highlight-current-row
|
||||
style="width: 100%;"
|
||||
@current-change="handleCurrentChange">
|
||||
<el-table-column :label="$t('Repository.id')" :resizable="false" prop="id" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.id }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('Repository.repositoryname')" :resizable="false" prop="repositoryName" align="center" width="200">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.repositoryName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('Repository.type2')" :resizable="false" prop="categoryName" align="center" width="230">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.categoryName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('Repository.iseffective')" :resizable="false" prop="stat" align="center" width="230">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.stat | iseffectiveFilter }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('Repository.managerPeople')" :resizable="false" align="center" width="200">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.managerName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('Repository.regionId')" :resizable="false" prop="regionName" align="center" width="250">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.regionName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!-- 列表结束 -->
|
||||
<el-button v-waves class="filter-item" type="success" style="width: 100px;float: left;margin-top: 10px" @click="handleConfirm">{{ $t('Hmodule.sure') }}</el-button>
|
||||
<pagination v-show="total>0" :total="total" :page.sync="getemplist.pagenum" :limit.sync="getemplist.pagesize" @pagination="getlist" />
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { regionlist, getcountrylist } from '@/api/public'
|
||||
import { searchRepCategory, searchRepository2 } from '@/api/Repository'
|
||||
import waves from '@/directive/waves' // Waves directive
|
||||
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
var _that
|
||||
export default {
|
||||
directives: { waves },
|
||||
components: { Pagination },
|
||||
filters: {
|
||||
iseffectiveFilter(status) {
|
||||
const statusMap = {
|
||||
1: '启用',
|
||||
2: '停用'
|
||||
}
|
||||
return statusMap[status]
|
||||
},
|
||||
genderFilter(status) {
|
||||
const statusMap = {
|
||||
1: '男',
|
||||
2: '女'
|
||||
}
|
||||
return statusMap[status]
|
||||
}
|
||||
},
|
||||
props: {
|
||||
repositorycontrol: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
tableHeight: 200,
|
||||
|
||||
// 仓库弹窗控制
|
||||
repositoryVisible: this.repositorycontrol,
|
||||
// 转化数据
|
||||
choosedata: '',
|
||||
// 类型列表
|
||||
types: [],
|
||||
// 国家列表
|
||||
nations: [],
|
||||
// 加载操作控制
|
||||
downloadLoading: false,
|
||||
// 表格数据
|
||||
list: [],
|
||||
// 表格数据条数
|
||||
total: 0,
|
||||
// 表格识别
|
||||
tableKey: 0,
|
||||
// 加载表格
|
||||
listLoading: true,
|
||||
// 仓库列表查询加展示参数
|
||||
getemplist: {
|
||||
repositoryName: '',
|
||||
type: '',
|
||||
iseffective: '',
|
||||
regionId: '',
|
||||
countyrId: '',
|
||||
id: '',
|
||||
stat: 1,
|
||||
loginRepositoryId: this.$store.getters.repositoryId,
|
||||
regionIds: this.$store.getters.regionIds,
|
||||
pagenum: 1,
|
||||
pagesize: 10
|
||||
},
|
||||
// 部门列表
|
||||
depts: [],
|
||||
// 区域级联数据转化
|
||||
props: {
|
||||
value: 'id',
|
||||
label: 'regionName',
|
||||
children: 'regionListVos'
|
||||
},
|
||||
// 区域数据
|
||||
regions: [],
|
||||
getemplistregions: [],
|
||||
getemplistregions0: []
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
repositorycontrol() {
|
||||
this.repositoryVisible = this.repositorycontrol
|
||||
this.getlist()
|
||||
|
||||
setTimeout(() => {
|
||||
this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 180
|
||||
}, 100)
|
||||
}
|
||||
},
|
||||
beforeCreate() {
|
||||
_that = this
|
||||
},
|
||||
methods: {
|
||||
getlist() {
|
||||
// 国家列表
|
||||
getcountrylist().then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
this.nations = res.data.data.content
|
||||
}
|
||||
})
|
||||
// 仓库列表数据
|
||||
this.listLoading = true
|
||||
searchRepository2(this.getemplist).then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
this.list = res.data.data.content.list
|
||||
this.total = res.data.data.content.totalCount
|
||||
}
|
||||
setTimeout(() => {
|
||||
this.listLoading = false
|
||||
}, 0.5 * 100)
|
||||
})
|
||||
// 仓库类型
|
||||
searchRepCategory().then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
console.log(res)
|
||||
this.types = res.data.data.content.list
|
||||
}
|
||||
})
|
||||
// 区域数据
|
||||
regionlist().then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
this.regions = this.tranKTree(res.data.data.content)
|
||||
}
|
||||
})
|
||||
},
|
||||
// 搜索
|
||||
handleFilter() {
|
||||
this.getemplist.pagenum = 1
|
||||
this.getemplist.regionId = this.getemplistregions[this.getemplistregions.length - 1]
|
||||
console.log(this.getemplist)
|
||||
searchRepository2(this.getemplist).then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
this.list = res.data.data.content.list
|
||||
this.total = res.data.data.content.totalCount
|
||||
this.repositoryVisible = true
|
||||
}
|
||||
})
|
||||
},
|
||||
// 新增数据
|
||||
handleAdd() {
|
||||
this.$router.push('/Repository/NewRepository')
|
||||
this.repositoryVisible = false
|
||||
},
|
||||
// 转化数据方法
|
||||
tranKTree(arr) {
|
||||
if (!arr || !arr.length) return
|
||||
return arr.map(item => ({
|
||||
id: item.id,
|
||||
regionName: item.regionName,
|
||||
regionListVos: this.tranKTree(item.regionListVos)
|
||||
}))
|
||||
},
|
||||
// 确认添加数据
|
||||
handleConfirm() {
|
||||
this.$emit('repositoryname', this.choosedata)
|
||||
this.repositoryVisible = false
|
||||
},
|
||||
// 选择仓库数据时的操作
|
||||
handleCurrentChange(val) {
|
||||
this.choosedata = val
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.ERP-container {
|
||||
margin: 50px 30px;
|
||||
}
|
||||
.filter-item{
|
||||
width: 140px;
|
||||
margin-left: 20px;
|
||||
}
|
||||
.form-name{
|
||||
font-size: 18px;
|
||||
color: #373e4f;
|
||||
margin-bottom: -20px;
|
||||
margin-top: 30px;
|
||||
}
|
||||
.container{
|
||||
margin-top: 2%;
|
||||
border: 1px solid #eceff6;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -454,12 +454,21 @@
|
|||
</el-form-item>
|
||||
<!-- <span style="color: red;margin-left: 52px;font-size: 14px">回收车金额：{{ huishou }}</span> -->
|
||||
</el-col>
|
||||
<el-col :span="6" style="height: 57px">
|
||||
<el-form-item :label="$t('update4.sfdk')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
|
||||
<el-radio-group v-model="isdeduct" style="width: 200px" @change="changeisdeduct">
|
||||
<el-radio :label="1" style="width: 100px">{{ $t('updates.yes') }}</el-radio>
|
||||
<el-radio :label="2">{{ $t('updates.no') }}</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</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-form-item>
|
||||
<!-- <span style="color: red;margin-left: 52px;font-size: 14px">回收车金额：{{ huishou }}</span> -->
|
||||
</el-col>
|
||||
|
||||
<el-col v-for="(item, index) in personalForm.couponSupports" :key="index" :span="6">
|
||||
<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"/>
|
||||
|
|
@ -712,6 +721,7 @@ export default {
|
|||
}
|
||||
}
|
||||
return {
|
||||
isdeduct: 1,
|
||||
saveloding: false,
|
||||
listLoading: false,
|
||||
pickerOptions1: {
|
||||
|
|
@ -982,6 +992,27 @@ export default {
|
|||
_that = this
|
||||
},
|
||||
methods: {
|
||||
changeisdeduct() {
|
||||
if (this.isdeduct === 2) {
|
||||
this.personalForm.advanceMoney = 0
|
||||
} else {
|
||||
if (!this.personalForm.customerId) {
|
||||
this.$notify.error({
|
||||
title: 'wrong',
|
||||
message: this.$t('update4.qxzkh'),
|
||||
offset: 100
|
||||
})
|
||||
return false
|
||||
}
|
||||
customerlist2(this.personalForm.customerId).then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
|
||||
this.getReceivableMoney()
|
||||
}
|
||||
})
|
||||
}
|
||||
this.getReceivableMoney()
|
||||
},
|
||||
// 复制添加
|
||||
getinformationcopy() {
|
||||
if (this.$store.getters.saleoutcopy) {
|
||||
|
|
@ -1168,7 +1199,11 @@ export default {
|
|||
|
||||
customerlist2(this.personalForm.customerId).then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
|
||||
if (this.isdeduct === 1) {
|
||||
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
|
||||
} else {
|
||||
this.personalForm.advanceMoney = 0
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
|
|
@ -1288,6 +1323,11 @@ export default {
|
|||
if (this.personalForm.couponSupportOld === null || this.personalForm.couponSupportOld === '' || this.personalForm.couponSupportOld === undefined) {
|
||||
this.personalForm.couponSupportOld = 0
|
||||
}
|
||||
|
||||
if (this.isdeduct === 2) {
|
||||
this.personalForm.advanceMoney = 0
|
||||
}
|
||||
|
||||
if (this.personalForm.sourceType === '1' || this.personalForm.sourceType === '3' || this.personalForm.sourceType === '4' || this.personalForm.sourceType === '5' || this.personalForm.sourceType === '6') {
|
||||
console.log('1')
|
||||
let needmoney = (this.heji3 - this.heji4 - Number(this.personalForm.pointSupport) - Number(this.personalForm.ridMoney) - Number(this.personalForm.ridBikeMoney) - Number(this.personalForm.advanceMoney) - Number(this.personalForm.couponSupportOld) - Number(this.personalForm.couponMoney)) + Number(this.personalForm.otherMoney)
|
||||
|
|
@ -1552,7 +1592,11 @@ export default {
|
|||
this.personalForm.customerId = this.$store.getters.empcontract3.customerId
|
||||
customerlist2(this.personalForm.customerId).then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
|
||||
if (this.isdeduct === 1) {
|
||||
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
|
||||
} else {
|
||||
this.personalForm.advanceMoney = 0
|
||||
}
|
||||
}
|
||||
})
|
||||
this.customerId = this.$store.getters.empcontract3.customerName
|
||||
|
|
@ -1632,7 +1676,11 @@ export default {
|
|||
this.$refs.editable.clear()
|
||||
}
|
||||
if (this.$store.getters.empcontract.receiveMoney) {
|
||||
this.personalForm.advanceMoney = this.$store.getters.empcontract.receiveMoney
|
||||
if (this.isdeduct === 1) {
|
||||
this.personalForm.advanceMoney = this.$store.getters.empcontract.receiveMoney
|
||||
} else {
|
||||
this.personalForm.advanceMoney = 0
|
||||
}
|
||||
}
|
||||
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 !== '') {
|
||||
|
|
@ -1641,7 +1689,11 @@ export default {
|
|||
this.personalForm.customerId = this.$store.getters.empcontract.customerId
|
||||
customerlist2(this.personalForm.customerId).then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
|
||||
if (this.isdeduct === 1) {
|
||||
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
|
||||
} else {
|
||||
this.personalForm.advanceMoney = 0
|
||||
}
|
||||
}
|
||||
})
|
||||
this.customerId = this.$store.getters.empcontract.customerName
|
||||
|
|
@ -2124,13 +2176,22 @@ export default {
|
|||
this.personalForm.customerId = val.id
|
||||
customerlist2(this.personalForm.customerId).then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
|
||||
if (this.isdeduct === 1) {
|
||||
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
|
||||
} else {
|
||||
this.personalForm.advanceMoney = 0
|
||||
}
|
||||
}
|
||||
})
|
||||
this.customerId = val.customerName
|
||||
this.personalForm.customerPhone = val.phoneNumber
|
||||
this.personalForm.address = val.address
|
||||
this.personalForm.advanceMoney = val.advanceMoney
|
||||
if (this.isdeduct === 1) {
|
||||
this.personalForm.advanceMoney = val.advanceMoney
|
||||
} else {
|
||||
this.personalForm.advanceMoney = 0
|
||||
}
|
||||
|
||||
this.point = val.point
|
||||
},
|
||||
agentdata(val) {
|
||||
|
|
@ -2138,7 +2199,11 @@ export default {
|
|||
this.personalForm.customerId = val.id
|
||||
customerlist2(this.personalForm.customerId).then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
|
||||
if (this.isdeduct === 1) {
|
||||
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
|
||||
} else {
|
||||
this.personalForm.advanceMoney = 0
|
||||
}
|
||||
}
|
||||
})
|
||||
this.customerId = val.agentName
|
||||
|
|
@ -2199,7 +2264,11 @@ export default {
|
|||
this.personalForm.customerId = val.customerId
|
||||
customerlist2(this.personalForm.customerId).then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
|
||||
if (this.isdeduct === 1) {
|
||||
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
|
||||
} else {
|
||||
this.personalForm.advanceMoney = 0
|
||||
}
|
||||
}
|
||||
})
|
||||
this.customerId = val.customerName
|
||||
|
|
@ -2238,7 +2307,11 @@ export default {
|
|||
this.personalForm.customerId = val.customerId
|
||||
customerlist2(this.personalForm.customerId).then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
|
||||
if (this.isdeduct === 1) {
|
||||
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
|
||||
} else {
|
||||
this.personalForm.advanceMoney = 0
|
||||
}
|
||||
}
|
||||
})
|
||||
this.customerId = val.customerName
|
||||
|
|
@ -2309,7 +2382,11 @@ export default {
|
|||
this.personalForm.customerId = val.customerId
|
||||
customerlist2(this.personalForm.customerId).then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
|
||||
if (this.isdeduct === 1) {
|
||||
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
|
||||
} else {
|
||||
this.personalForm.advanceMoney = 0
|
||||
}
|
||||
}
|
||||
})
|
||||
this.customerId = val.customerName
|
||||
|
|
@ -2336,7 +2413,11 @@ export default {
|
|||
this.personalForm.customerId = val.customerId
|
||||
customerlist2(this.personalForm.customerId).then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
|
||||
if (this.isdeduct === 1) {
|
||||
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
|
||||
} else {
|
||||
this.personalForm.advanceMoney = 0
|
||||
}
|
||||
}
|
||||
})
|
||||
this.customerId = val.customerName
|
||||
|
|
@ -2500,6 +2581,7 @@ export default {
|
|||
this.saleRepositoryId = this.$store.getters.repositoryName
|
||||
this.transferPersonId = null
|
||||
this.outPersonId = null
|
||||
this.isdeduct = 1
|
||||
this.getdatatime()
|
||||
},
|
||||
// 深拷贝
|
||||
|
|
|
|||
|
|
@ -370,12 +370,21 @@
|
|||
</el-form-item>
|
||||
<!-- <span style="color: red;margin-left: 52px;font-size: 14px">回收车金额：{{ huishou }}</span> -->
|
||||
</el-col>
|
||||
<el-col :span="6" style="height: 57px">
|
||||
<el-form-item :label="$t('update4.sfdk')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
|
||||
<el-radio-group v-model="isdeduct" style="width: 200px" @change="changeisdeduct">
|
||||
<el-radio :label="1" style="width: 100px">{{ $t('updates.yes') }}</el-radio>
|
||||
<el-radio :label="2">{{ $t('updates.no') }}</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<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-form-item>
|
||||
<!-- <span style="color: red;margin-left: 52px;font-size: 14px">回收车金额：{{ huishou }}</span> -->
|
||||
</el-col>
|
||||
|
||||
<el-col v-for="(item, index) in personalForm.couponSupports" :key="index" :span="6">
|
||||
<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"/>
|
||||
|
|
@ -594,6 +603,7 @@ export default {
|
|||
}
|
||||
}
|
||||
return {
|
||||
isdeduct: 1,
|
||||
ischina: this.$store.getters.countryId,
|
||||
listLoading: false,
|
||||
pickerOptions1: {
|
||||
|
|
@ -865,6 +875,27 @@ export default {
|
|||
_that = this
|
||||
},
|
||||
methods: {
|
||||
changeisdeduct() {
|
||||
if (this.isdeduct === 2) {
|
||||
this.personalForm.advanceMoney = 0
|
||||
} else {
|
||||
if (!this.personalForm.customerId) {
|
||||
this.$notify.error({
|
||||
title: 'wrong',
|
||||
message: this.$t('update4.qxzkh'),
|
||||
offset: 100
|
||||
})
|
||||
return false
|
||||
}
|
||||
customerlist2(this.personalForm.customerId).then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
this.personalForm.advanceMoney = res.data.data.content.advanceMoney
|
||||
this.getReceivableMoney()
|
||||
}
|
||||
})
|
||||
}
|
||||
this.getReceivableMoney()
|
||||
},
|
||||
getinformationcopy() {
|
||||
if (this.$store.getters.saleoutcopy) {
|
||||
this.personalForm = this.$store.getters.saleoutcopy
|
||||
|
|
@ -889,6 +920,9 @@ export default {
|
|||
},
|
||||
judgeinvoce() {
|
||||
console.log('this.personalForm.invoiceNumber', this.personalForm.invoiceNumber)
|
||||
if (!this.personalForm.invoiceNumber) {
|
||||
return
|
||||
}
|
||||
checkInvoiceExist(this.personalForm.invoiceNumber, this.personalForm.saleRepositoryId).then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
if (res.data.data.content === true) {
|
||||
|
|
@ -1214,9 +1248,15 @@ export default {
|
|||
if (!this.personalForm.otherMoney) {
|
||||
this.personalForm.otherMoney = 0
|
||||
}
|
||||
if (!this.personalForm.couponMoney) {
|
||||
this.personalForm.couponMoney = 0
|
||||
}
|
||||
if (this.personalForm.couponSupportOld === null || this.personalForm.couponSupportOld === '' || this.personalForm.couponSupportOld === undefined) {
|
||||
this.personalForm.couponSupportOld = 0
|
||||
}
|
||||
if (this.isdeduct === 2) {
|
||||
this.personalForm.advanceMoney = 0
|
||||
}
|
||||
|
||||
if (this.personalForm.isFree === 2) {
|
||||
if (this.personalForm.isAppService === 1) {
|
||||
|
|
|
|||
|
|
@ -88,16 +88,16 @@
|
|||
<span>{{ scope.row.color }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('Product.kpigrade')" :resizable="false" prop="kpiGrade" align="center" width="100">
|
||||
<el-table-column :label="$t('updates.kcsl')" :resizable="false" prop="existStock" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.kpiGrade }}</span>
|
||||
<span>{{ scope.row.existStock }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('Product.point')" :resizable="false" prop="point" align="center" width="100">
|
||||
<!-- <el-table-column :label="$t('Product.point')" :resizable="false" prop="point" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.point }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column> -->
|
||||
<el-table-column :label="$t('Product.saleprice')" :resizable="false" prop="costPrice" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.salePrice }}</span>
|
||||
|
|
|
|||
|
|
@ -88,6 +88,11 @@
|
|||
<span>{{ scope.row.color }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('updates.kcsl')" :resizable="false" prop="existStock" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.existStock }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('Product.kpigrade')" :resizable="false" prop="kpiGrade" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.kpiGrade }}</span>
|
||||
|
|
@ -235,7 +240,9 @@ export default {
|
|||
this.getemplist.searchRepositoryId = this.query.saleRepositoryId
|
||||
chooseProduct(this.getemplist).then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
this.list = res.data.data.content.list
|
||||
this.list = res.data.data.content.list.filter(item => {
|
||||
return item.existStock > 0
|
||||
})
|
||||
this.total = res.data.data.content.totalCount
|
||||
}
|
||||
setTimeout(() => {
|
||||
|
|
@ -262,7 +269,9 @@ export default {
|
|||
this.getemplist.pagenum = 1
|
||||
chooseProduct(this.getemplist).then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
this.list = res.data.data.content.list
|
||||
this.list = res.data.data.content.list.filter(item => {
|
||||
return item.existStock > 0
|
||||
})
|
||||
this.total = res.data.data.content.totalCount
|
||||
// this.restFilter()
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -6,13 +6,12 @@
|
|||
<el-input v-model="getemplist.productname" :placeholder="$t('Product.productname')" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
|
||||
<!-- <el-input v-model="supplierid" :placeholder="$t('Product.supplierid')" class="filter-item" clearable @keyup.enter.native="handleFilter" @focus="handlechoose"/> -->
|
||||
<my-supplier :control.sync="empcontrol" @supplierName="supplierName"/>
|
||||
<el-select v-model="getemplist.categoryid" :placeholder="$t('Hmodule.wpfl')" class="filter-item" clearable>
|
||||
<!-- <el-option :label="$t('otherlanguage.zc')" value="1"/> -->
|
||||
<!-- <el-select v-model="getemplist.categoryid" :placeholder="$t('Hmodule.wpfl')" class="filter-item" clearable>
|
||||
<el-option :label="$t('otherlanguage.pj')" value="2"/>
|
||||
<el-option :label="$t('otherlanguage.jgj')" value="3"/>
|
||||
<el-option :label="$t('otherlanguage.xhp')" value="4"/>
|
||||
<el-option :label="$t('otherlanguage.dc')" value="5"/>
|
||||
</el-select>
|
||||
</el-select> -->
|
||||
<!-- 更多搜索条件下拉栏 -->
|
||||
<el-popover
|
||||
v-model="visible2"
|
||||
|
|
@ -85,6 +84,11 @@
|
|||
<span>{{ scope.row.color }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('updates.kcsl')" :resizable="false" prop="existStock" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.existStock }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('Product.kpigrade')" :resizable="false" prop="kpiGrade" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.kpiGrade }}</span>
|
||||
|
|
@ -201,7 +205,7 @@ export default {
|
|||
productid: '',
|
||||
code: '',
|
||||
productname: '',
|
||||
categoryid: '',
|
||||
categoryid: '100',
|
||||
typeid: '',
|
||||
isactive: '',
|
||||
Productid: '',
|
||||
|
|
@ -304,7 +308,9 @@ export default {
|
|||
chooseProduct(this.getemplist).then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
console.log(res.data.data.content.list)
|
||||
this.list = res.data.data.content.list
|
||||
this.list = res.data.data.content.list.filter(item => {
|
||||
return item.existStock > 0
|
||||
})
|
||||
this.total = res.data.data.content.totalCount
|
||||
// this.restFilter()
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -406,7 +406,7 @@ export default {
|
|||
listLoading: true,
|
||||
// 采购申请查询加展示参数
|
||||
getemplist: {
|
||||
sortId: '1',
|
||||
sortId: '2',
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
repositoryId: this.$store.getters.repositoryId,
|
||||
|
|
|
|||
|
|
@ -194,6 +194,24 @@
|
|||
</el-editable>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card :body-style=" { padding: '5px' }" class="box-card" shadow="never" style="margin-top: 5px;margin-bottom: 20px">
|
||||
|
||||
<div ref="geren" class="form-name">{{ $t('updates.zjsc') }}</div>
|
||||
<div class="upload" style="margin-top: 25px">
|
||||
<el-upload
|
||||
ref="upload"
|
||||
:auto-upload="true"
|
||||
:action="`${uplodaapi}/upload/uploadpic`"
|
||||
:data="paperData"
|
||||
:on-success="handlepicsuccess"
|
||||
class="upload-demo"
|
||||
drag
|
||||
multiple>
|
||||
<i class="el-icon-upload"/>
|
||||
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
|
||||
</el-upload>
|
||||
</div>
|
||||
</el-card>
|
||||
<!--操作-->
|
||||
<div class="buttons" style="position:fixed;bottom: 0;width: 100%;height: 40px; background: #fff;z-index: 99">
|
||||
<el-button v-no-more-click type="primary" style="background:#3696fd;border-color:#3696fd;width: 98px" @click="handlesave()">{{ $t('Hmodule.baoc') }}</el-button>
|
||||
|
|
@ -234,6 +252,11 @@ export default {
|
|||
}
|
||||
}
|
||||
return {
|
||||
uplodaapi: this.$store.getters.uploadApi,
|
||||
// 证件额外参数
|
||||
paperData: {
|
||||
type: 18
|
||||
},
|
||||
accountcodes: [],
|
||||
showaccounts: false,
|
||||
accounts: [],
|
||||
|
|
@ -292,7 +315,8 @@ export default {
|
|||
regionId: this.$store.getters.regionId,
|
||||
handlePersonId: this.$store.getters.userId,
|
||||
currency: '1',
|
||||
transferType: '1'
|
||||
transferType: '1',
|
||||
picids: []
|
||||
},
|
||||
// 收入单规则数据
|
||||
personalrules: {
|
||||
|
|
@ -329,6 +353,14 @@ export default {
|
|||
_that = this
|
||||
},
|
||||
methods: {
|
||||
// 上传图片
|
||||
handlepicsuccess(response) {
|
||||
const picarr = []
|
||||
picarr.push(response.data.content.picId)
|
||||
this.personalForm.picids.push(response.data.content.picId)
|
||||
console.log('this.personalForm', this.personalForm)
|
||||
console.log(response.data.content.picId)
|
||||
},
|
||||
getcurrency() {
|
||||
const mycountry = this.$store.getters.countryId
|
||||
if (mycountry === 1) {
|
||||
|
|
@ -691,7 +723,8 @@ export default {
|
|||
repositoryId: this.$store.getters.repositoryId,
|
||||
regionId: this.$store.getters.regionId,
|
||||
currency: '1',
|
||||
transferType: '1'
|
||||
transferType: '1',
|
||||
picids: []
|
||||
}
|
||||
this.getcurrency()
|
||||
this.handlePersonId = this.$store.getters.name
|
||||
|
|
@ -805,6 +838,7 @@ export default {
|
|||
})
|
||||
this.$refs.editable.clear()
|
||||
this.restAllForm()
|
||||
this.$refs.upload.clearFiles()
|
||||
this.$refs.personalForm.clearValidate()
|
||||
this.$refs.personalForm.resetFields()
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -17,6 +17,17 @@
|
|||
:label="item.repositoryName"
|
||||
:value="item.id"/>
|
||||
</el-select>
|
||||
<el-cascader
|
||||
:options="suboptions"
|
||||
:props="props2"
|
||||
v-model="subjectdata"
|
||||
:show-all-levels="false"
|
||||
:placeholder="$t('updates.kmmc')"
|
||||
change-on-select
|
||||
filterable
|
||||
clearable
|
||||
@change="handlechangesubject"
|
||||
/>
|
||||
<el-popover
|
||||
v-model="visible2"
|
||||
placement="bottom"
|
||||
|
|
@ -257,6 +268,14 @@ export default {
|
|||
},
|
||||
data() {
|
||||
return {
|
||||
treedata: [],
|
||||
props2: {
|
||||
value: 'id',
|
||||
label: 'subjectName',
|
||||
children: 'subjectFinanceVos'
|
||||
},
|
||||
suboptions: [],
|
||||
subjectdata: [],
|
||||
repositories: [],
|
||||
tableHeight: 200,
|
||||
regions: [],
|
||||
|
|
@ -321,12 +340,12 @@ export default {
|
|||
// 开始时间到结束时间
|
||||
date: [],
|
||||
receiptVisible9: false,
|
||||
picPaths: [],
|
||||
treedata: []
|
||||
picPaths: []
|
||||
}
|
||||
},
|
||||
activated() {
|
||||
this.getlist()
|
||||
this.gettree2()
|
||||
setTimeout(() => {
|
||||
this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 140
|
||||
}, 100)
|
||||
|
|
@ -335,6 +354,7 @@ export default {
|
|||
this.getlist()
|
||||
this.getreginons()
|
||||
this.handlechange4()
|
||||
this.gettree2()
|
||||
setTimeout(() => {
|
||||
this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 140
|
||||
}, 100)
|
||||
|
|
@ -343,6 +363,68 @@ export default {
|
|||
_that = this
|
||||
},
|
||||
methods: {
|
||||
handlechangesubject(val) {
|
||||
console.log('val', val)
|
||||
if (val.length === 0) {
|
||||
this.getemplist.subjectCode = ''
|
||||
} else {
|
||||
const finid = val[val.length - 1]
|
||||
const needata = this.findtreedata(this.treedata, finid)
|
||||
console.log('needata', needata)
|
||||
this.getemplist.subjectCode = needata.subjectNumber
|
||||
}
|
||||
},
|
||||
findtreedata(val, val2) {
|
||||
let data;
|
||||
(val || []).map(i => {
|
||||
if (i.id === val2) {
|
||||
data = i
|
||||
} else {
|
||||
const child = this.findtreedata(i.subjectFinanceVos, val2)
|
||||
if (child) {
|
||||
data = child
|
||||
}
|
||||
}
|
||||
})
|
||||
return data
|
||||
},
|
||||
switchtreedata(val) {
|
||||
for (const i in val) {
|
||||
if (val[i].subjectNumber === '' || val[i].subjectNumber === null) {
|
||||
this.switchtreedata(val[i].subjectFinanceVos)
|
||||
} else {
|
||||
if (val[i].level > 3) {
|
||||
this.switchtreedata(val[i].subjectFinanceVos)
|
||||
}
|
||||
val[i].subjectName = val[i].subjectNumber + val[i].subjectName
|
||||
}
|
||||
}
|
||||
},
|
||||
processchildren(val) {
|
||||
for (const i in val) {
|
||||
if (val[i].subjectFinanceVos.length === 0) {
|
||||
delete val[i].subjectFinanceVos
|
||||
} else {
|
||||
this.processchildren(val[i].subjectFinanceVos)
|
||||
}
|
||||
// if (val[i].) {
|
||||
// }
|
||||
}
|
||||
return val
|
||||
},
|
||||
gettree2() {
|
||||
console.log(123)
|
||||
subjectList().then(res => {
|
||||
if (res.data.ret === 200) {
|
||||
const newarr = res.data.data.content
|
||||
console.log('newarr', newarr)
|
||||
const testarr = this.switchtreedata(newarr)
|
||||
this.suboptions = this.processchildren(newarr)
|
||||
this.treedata = res.data.data.content
|
||||
}
|
||||
})
|
||||
console.log(321)
|
||||
},
|
||||
// 根据区域选择门店
|
||||
handlechange4() {
|
||||
console.log('this.$store.getters.repositoryId', this.$store.getters.repositoryId)
|
||||
|
|
|
|||
|
|
@ -91,6 +91,16 @@
|
|||
</el-editable>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card :body-style=" { padding: '5px' }" class="box-card" shadow="never" style="margin-top: 5px;margin-bottom: 20px">
|
||||
<div
|
||||
style=" display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;">
|
||||
<div v-for="(item, index) in personalForm.picPaths" :key="index">
|
||||
<img :src="item" class="image" style="width: 30%">
|
||||
</div>
|
||||
</div>
|
||||
</el-card>
|
||||
<!--审核状态-->
|
||||
<el-card class="box-card" style="margin-top: 15px" shadow="never">
|
||||
<h2 ref="fuzhu" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">{{ $t('updates.spjl') }}</h2>
|
||||
|
|
|
|||
Loading…
Reference in a new issue