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

8/5日修改

Browse source
This commit is contained in:
shawnzhang 2020-08-05 11:40:39 +08:00
parent 6ae5583cb3
commit 4f3b1a9fae
21 changed files with 74 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/api/DiffPrice.js
View file

@ -100,7 +100,7 @@ export function deleteDiffPrice(query, query2) {
// 获取电池分类
export function batteryList() {
var params = new URLSearchParams()
params.append('parentId', 1118) // 你要传给后台的参数值 key/value
params.append('parentId', 5) // 你要传给后台的参数值 key/value
return request({
url: '/productclassfy/batteryList',
method: 'post',

2
src/api/repair.js
View file

@ -198,6 +198,8 @@ export function repairprojectList(query) {
params.append('pagenum', query.pagenum) // 你要传给后台的参数值 key/value
params.append('pagesize', query.pagesize) // 你要传给后台的参数值 key/value
params.append('producttype', query.productType) // 你要传给后台的参数值 key/value
params.append('name', query.name) // 你要传给后台的参数值 key/value
return request({
url: '/admin/service/listserviceitem',
method: 'post',

1
src/lang/en.js
View file

@ -1576,6 +1576,7 @@ export default {
heji2: 'Total adjusted amount'
},
MaterialsList: {
productCode: 'productCode',
parentcolor: 'parentcolor',
bomNumber: 'BOM code',
parentBomNumber: 'parent BOM',

3
src/lang/zh.js
View file

@ -1576,6 +1576,7 @@ export default {
heji2: '调整金额合计'
},
MaterialsList: {
productCode: '父件编码',
parentcolor: '父件颜色',
bomNumber: 'BOM编码',
parentBomNumber: '上级BOM',
@ -1583,7 +1584,7 @@ export default {
isActive: '启用类型',
version: '版本',
summary: '摘要',
productName: '父件',
productName: '父件名称',
productName2: '物料名称',
unit: '单位',
productTypeId: '型号',

25
src/views/Financecount/collectAndPay.vue
View file

@ -81,18 +81,7 @@
sortable
width="240"
align="center"/>
<el-table-column
:label="$t('collectAndPay.preReturn')"
prop="preReturn"
sortable
width="240"
align="center"/>
<el-table-column
:label="$t('collectAndPay.stockRetreat')"
prop="stockRetreat"
sortable
width="240"
align="center"/>
<el-table-column
:label="$t('collectAndPay.collectMoney')"
prop="collectMoney"
@ -123,6 +112,18 @@
sortable
width="240"
align="center"/>
<el-table-column
:label="$t('collectAndPay.preReturn')"
prop="preReturn"
sortable
width="240"
align="center"/>
<el-table-column
:label="$t('collectAndPay.stockRetreat')"
prop="stockRetreat"
sortable
width="240"
align="center"/>
<el-table-column
:label="$t('collectAndPay.saleReturn')"
prop="saleReturn"

8
src/views/InstallmentApply/AddInstallmentApply.vue
View file

@ -1850,7 +1850,7 @@ export default {
console.log('this.personalForm.firstMoney', Number(this.personalForm.firstMoney))
// 二手gb2
if (judgeissecond === '00' && (judgecartype === '0040' || judgecartype === '0020') && Number(this.personalForm.firstMoney) < 5000) {
if (judgeissecond === '00' && (judgecartype === '0002' || judgecartype === '0005') && Number(this.personalForm.firstMoney) < 5000) {
this.$notify.error({
title: 'wrong',
message: 'the second gb2 firstMoney is wrong',
@ -1859,7 +1859,7 @@ export default {
return false
}
// 二手其他车
if (judgeissecond === '00' && (judgecartype !== '0040' && judgecartype !== '0020') && Number(this.personalForm.firstMoney) < 7000) {
if (judgeissecond === '00' && (judgecartype !== '0002' && judgecartype !== '0005') && Number(this.personalForm.firstMoney) < 7000) {
this.$notify.error({
title: 'wrong',
message: 'the second car firstMoney is wrong',
@ -1869,7 +1869,7 @@ export default {
}
// 新gb2
if (judgeissecond !== '00' && (judgecartype === '0040' || judgecartype === '0020') && Number(this.personalForm.firstMoney) < 5000) {
if (judgeissecond !== '00' && (judgecartype === '0002' || judgecartype === '0005') && Number(this.personalForm.firstMoney) < 5000) {
this.$notify.error({
title: 'wrong',
message: 'the gb2 firstMoney is wrong',
@ -1879,7 +1879,7 @@ export default {
}
// 其他新车
if (judgeissecond !== '00' && (judgecartype !== '0040' && judgecartype !== '0020') && Number(this.personalForm.firstMoney) < 10000) {
if (judgeissecond !== '00' && (judgecartype !== '0002' && judgecartype !== '0005') && Number(this.personalForm.firstMoney) < 10000) {
console.log('123')
this.$notify.error({
title: 'wrong',

9
src/views/InstallmentApply/components/MyDialog.vue
View file

@ -1525,6 +1525,7 @@ export default {
// 修改和取消按钮
// 修改按钮
handleEditok() {
this.personalForm.modifyPersonId = this.$store.getters.userId
if (Number(this.personalForm.firstMoney) === 0) {
this.$notify.error({
title: 'wrong',
@ -1540,7 +1541,7 @@ export default {
console.log('this.personalForm.firstMoney', Number(this.personalForm.firstMoney))
// 二手gb2
if (judgeissecond === '00' && judgecartype === '0040' && Number(this.personalForm.firstMoney) < 5000) {
if (judgeissecond === '00' && (judgecartype === '0002' || judgecartype === '0005') && Number(this.personalForm.firstMoney) < 5000) {
this.$notify.error({
title: 'wrong',
message: 'the second gb2 firstMoney is wrong',
@ -1549,7 +1550,7 @@ export default {
return false
}
// 二手其他车
if (judgeissecond === '00' && judgecartype !== '0040' && Number(this.personalForm.firstMoney) < 7000) {
if (judgeissecond === '00' && (judgecartype !== '0002' && judgecartype !== '0005') && Number(this.personalForm.firstMoney) < 7000) {
this.$notify.error({
title: 'wrong',
message: 'the second car firstMoney is wrong',
@ -1559,7 +1560,7 @@ export default {
}
// 新gb2
if (judgeissecond !== '00' && judgecartype === '0040' && Number(this.personalForm.firstMoney) < 5000) {
if (judgeissecond !== '00' && (judgecartype === '0002' || judgecartype === '0005') && Number(this.personalForm.firstMoney) < 5000) {
this.$notify.error({
title: 'wrong',
message: 'the gb2 firstMoney is wrong',
@ -1569,7 +1570,7 @@ export default {
}
// 其他新车
if (judgeissecond !== '00' && judgecartype !== '0040' && Number(this.personalForm.firstMoney) < 10000) {
if (judgeissecond !== '00' && (judgecartype !== '0002' && judgecartype !== '0005') && Number(this.personalForm.firstMoney) < 10000) {
console.log('123')
this.$notify.error({
title: 'wrong',

2
src/views/MaterialsList/MaterialsListli.vue
View file

@ -12,7 +12,7 @@
</el-select>
<el-input v-model="getemplist.productName" :placeholder="$t('MaterialsList.productName')" size="small" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
<el-input v-model="getemplist.productCode" :placeholder="$t('MaterialsList.productCode')" size="small" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
<el-select v-model="getemplist.judgeStat" :value="getemplist.judgeStat" :placeholder="$t('updates.spzt')" size="mini" clearable class="filter-item">
<el-option :label="$t('updates.wsh')" value="0"/>
<el-option :label="$t('updates.shz')" value="1"/>

1
src/views/Repair/RepairProject.vue
View file

@ -2,6 +2,7 @@
<div class="tab-container">
<div class="filter-container">
<el-input :placeholder="$t('repair.model')" v-model="listQuery.productType" style="width: 200px;" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
<el-input :placeholder="$t('repair.itemName')" v-model="listQuery.name" style="width: 200px;" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">{{ $t('table.search') }}</el-button>
<el-button v-permission="['54-67-80-1']" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">{{ $t('table.add') }}</el-button>
</div>

1
src/views/Repository/RepositoryList.vue
View file

@ -163,6 +163,7 @@
v-model="regionId"
:show-all-levels="false"
:placeholder="$t('Hmodule.xzqy')"
:change-on-select="true"
filterable
clearable
style="margin-left: 18px;width: 200px"

8
src/views/SaleContract/AddSaleContract.vue
View file

@ -1731,7 +1731,7 @@ export default {
console.log('judgeissecond', judgeissecond)
console.log('judgecartype', judgecartype)
if (this.personalForm.isSecondApply === 2) {
if (judgeissecond === '00' && (judgecartype === '0040' || judgecartype === '0020') && Number(this.personalForm.firstMoney) < 5000) {
if (judgeissecond === '00' && (judgecartype === '0002' || judgecartype === '0005') && Number(this.personalForm.firstMoney) < 5000) {
this.$notify.error({
title: 'wrong',
message: 'the second gb2 firstMoney is wrong',
@ -1740,7 +1740,7 @@ export default {
return false
}
// 二手其他车
if (judgeissecond === '00' && (judgecartype !== '0040' && judgecartype !== '0020') && Number(this.personalForm.firstMoney) < 7000) {
if (judgeissecond === '00' && (judgecartype !== '0002' && judgecartype !== '0005') && Number(this.personalForm.firstMoney) < 7000) {
this.$notify.error({
title: 'wrong',
message: 'the second car firstMoney is wrong',
@ -1750,7 +1750,7 @@ export default {
}
// 新gb2
if (judgeissecond !== '00' && (judgecartype === '0040' || judgecartype === '0020') && Number(this.personalForm.firstMoney) < 5000) {
if (judgeissecond !== '00' && (judgecartype === '0002' || judgecartype === '0005') && Number(this.personalForm.firstMoney) < 5000) {
this.$notify.error({
title: 'wrong',
message: 'the gb2 firstMoney is wrong',
@ -1760,7 +1760,7 @@ export default {
}
// 其他新车
if (judgeissecond !== '00' && (judgecartype !== '0040' && judgecartype !== '0020') && Number(this.personalForm.firstMoney) < 10000) {
if (judgeissecond !== '00' && (judgecartype !== '0002' && judgecartype !== '0005') && Number(this.personalForm.firstMoney) < 10000) {
this.$notify.error({
title: 'wrong',
message: 'the new car firstMoney is wrong',

8
src/views/SaleContract/components/MyDialog.vue
View file

@ -1347,7 +1347,7 @@ export default {
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' || judgecartype === '0020') && Number(this.personalForm.firstMoney) < 5000) {
if (judgeissecond === '00' && (judgecartype === '0002' || judgecartype === '0005') && Number(this.personalForm.firstMoney) < 5000) {
this.$notify.error({
title: 'wrong',
message: 'the second gb2 firstMoney is wrong',
@ -1356,7 +1356,7 @@ export default {
return false
}
// 二手其他车
if (judgeissecond === '00' && (judgecartype !== '0040' && judgecartype !== '0020') && Number(this.personalForm.firstMoney) < 7000) {
if (judgeissecond === '00' && (judgecartype !== '0002' && judgecartype !== '0005') && Number(this.personalForm.firstMoney) < 7000) {
this.$notify.error({
title: 'wrong',
message: 'the second car firstMoney is wrong',
@ -1366,7 +1366,7 @@ export default {
}
// 新gb2
if (judgeissecond !== '00' && (judgecartype === '0040' || judgecartype === '0020') && Number(this.personalForm.firstMoney) < 5000) {
if (judgeissecond !== '00' && (judgecartype === '0002' || judgecartype === '0005') && Number(this.personalForm.firstMoney) < 5000) {
this.$notify.error({
title: 'wrong',
message: 'the gb2 firstMoney is wrong',
@ -1376,7 +1376,7 @@ export default {
}
// 其他新车
if (judgeissecond !== '00' && (judgecartype !== '0040' && judgecartype !== '0020') && Number(this.personalForm.firstMoney) < 10000) {
if (judgeissecond !== '00' && (judgecartype !== '0002' && judgecartype !== '0005') && Number(this.personalForm.firstMoney) < 10000) {
this.$notify.error({
title: 'wrong',
message: 'the new car firstMoney is wrong',

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

@ -2631,17 +2631,13 @@ export default {
})
batteryList2(14).then(res => {
if (res.data.ret === 200) {
this.chargecategorysdetail = res.data.data.content.map(item => {
return item.id
})
this.chargecategorysdetail = [83]
}
})
batteryList2(8).then(res => {
if (res.data.ret === 200) {
this.controlcategorysdetail = res.data.data.content.map(item => {
return item.id
})
this.controlcategorysdetail = [35]
}
})
},
@ -2979,17 +2975,13 @@ export default {
const controlcategorys = await batteryList2(8).then(res => {
return res.data.data.content
})
const controlcategorysdetail = controlcategorys.map(item => {
return item.id
})
const controlcategorysdetail = [35]
const chargecategorys = await batteryList2(14).then(res => {
return res.data.data.content
})
const chargecategorysdetail = chargecategorys.map(item => {
return item.id
})
const chargecategorysdetail = [83]
const motocategorys = [9, 10, 218, 219, 318, 319, 415, 906]
const needbatterycategorys = await batteryList2(1118).then(res => {
const needbatterycategorys = await batteryList2(5).then(res => {
return res.data.data.content
})
setTimeout(() => {

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

@ -1106,15 +1106,11 @@ export default {
const controlcategorys = await batteryList2(8).then(res => {
return res.data.data.content
})
const controlcategorysdetail = controlcategorys.map(item => {
return item.id
})
const controlcategorysdetail = [35]
const chargecategorys = await batteryList2(14).then(res => {
return res.data.data.content
})
const chargecategorysdetail = chargecategorys.map(item => {
return item.id
})
const chargecategorysdetail = [83]
const motocategorys = [9, 10, 218, 219, 318, 319, 415, 906]
console.log('controlcategorysdetail', controlcategorysdetail)
const outproduct = this.$refs.editable.getRecords()
@ -2967,7 +2963,7 @@ export default {
},
// 保存操作
async handlesave() {
const needbatterycategorys = await batteryList2(1118).then(res => {
const needbatterycategorys = await batteryList2(5).then(res => {
return res.data.data.content
})
const battery1 = needbatterycategorys[0].productClassfyVos
@ -3287,14 +3283,14 @@ export default {
console.log('Number(this.personalForm.shouldMoney)', Number(this.personalForm.shouldMoney))
console.log('Number(this.personalForm.customerPay)', Number(this.personalForm.receivableMoney))
if (Number(this.personalForm.shouldMoney) !== Number(this.personalForm.receivableMoney) && this.$store.getters.countryId === 2) {
this.$notify.error({
title: 'wrong',
message: this.$t('update4.bcskyw'),
offset: 100
})
return false
}
// if (Number(this.personalForm.shouldMoney) !== Number(this.personalForm.receivableMoney) && this.$store.getters.countryId === 2) {
// this.$notify.error({
// title: 'wrong',
// message: this.$t('update4.bcskyw'),
// offset: 100
// })
// return false
// }
// eslint-disable-next-line use-isnan
if (this.personalForm.customerPay === '' || this.personalForm.customerPay === undefined || this.personalForm.customerPay === NaN || this.personalForm.customerPay === null) {
this.$notify.error({

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

@ -2464,17 +2464,13 @@ export default {
batteryList2(14).then(res => {
if (res.data.ret === 200) {
this.chargecategorysdetail = res.data.data.content.map(item => {
return item.id
})
this.chargecategorysdetail = [83]
}
})
batteryList2(8).then(res => {
if (res.data.ret === 200) {
this.controlcategorysdetail = res.data.data.content.map(item => {
return item.id
})
this.controlcategorysdetail = [35]
}
})
},
@ -2532,15 +2528,11 @@ export default {
const controlcategorys = await batteryList2(8).then(res => {
return res.data.data.content
})
const controlcategorysdetail = controlcategorys.map(item => {
return item.id
})
const controlcategorysdetail = [35]
const chargecategorys = await batteryList2(14).then(res => {
return res.data.data.content
})
const chargecategorysdetail = chargecategorys.map(item => {
return item.id
})
const chargecategorysdetail = [83]
setTimeout(() => {
// const EnterDetailgift = this.deepClone(this.$refs.editable2.getRecords())
const EnterDetail2 = this.deepClone(this.$refs.editable2.getRecords())

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

@ -2552,17 +2552,13 @@ export default {
batteryList2(14).then(res => {
if (res.data.ret === 200) {
this.chargecategorysdetail = res.data.data.content.map(item => {
return item.id
})
this.chargecategorysdetail = [83]
}
})
batteryList2(8).then(res => {
if (res.data.ret === 200) {
this.controlcategorysdetail = res.data.data.content.map(item => {
return item.id
})
this.controlcategorysdetail = [35]
}
})
},
@ -2619,17 +2615,13 @@ export default {
const controlcategorys = await batteryList2(8).then(res => {
return res.data.data.content
})
const controlcategorysdetail = controlcategorys.map(item => {
return item.id
})
const controlcategorysdetail = [35]
const chargecategorys = await batteryList2(14).then(res => {
return res.data.data.content
})
const chargecategorysdetail = chargecategorys.map(item => {
return item.id
})
const chargecategorysdetail = [83]
const motocategorys = [9, 10, 218, 219, 318, 319, 415, 906]
const needbatterycategorys = await batteryList2(1118).then(res => {
const needbatterycategorys = await batteryList2(5).then(res => {
return res.data.data.content
})
const battery1 = needbatterycategorys[0].productClassfyVos

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

@ -2435,17 +2435,13 @@ export default {
const controlcategorys = await batteryList2(8).then(res => {
return res.data.data.content
})
const controlcategorysdetail = controlcategorys.map(item => {
return item.id
})
const controlcategorysdetail = [35]
const chargecategorys = await batteryList2(14).then(res => {
return res.data.data.content
})
const chargecategorysdetail = chargecategorys.map(item => {
return item.id
})
const chargecategorysdetail = [83]
const motocategorys = [9, 10, 218, 219, 318, 319, 415, 906]
const needbatterycategorys = await batteryList2(1118).then(res => {
const needbatterycategorys = await batteryList2(5).then(res => {
return res.data.data.content
})

2
src/views/SaleOut/components/MyItem.vue
View file

@ -3,6 +3,8 @@
<div class="filter-container">
<!-- 搜索条件栏目 -->
<el-input v-model="getemplist.productType" :placeholder="$t('Product.code')" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
<el-input v-model="getemplist.productType" :placeholder="$t('Product.code')" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
<!-- 搜索按钮 -->
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" style="width: 86px" @click="handleFilter">{{ $t('public.search') }}</el-button>
<!-- 新建操作 -->

3
src/views/TearDown/components/MyMaterials.vue
View file

@ -8,6 +8,9 @@
<el-option value="2" label="设计BOM"/>
<el-option value="3" label="制造BOM"/>
</el-select>
<el-input v-model="getemplist.productName" :placeholder="$t('MaterialsList.productName')" size="small" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
<el-input v-model="getemplist.productCode" :placeholder="$t('MaterialsList.productCode')" size="small" 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"/>-->
<!-- 更多搜索条件下拉栏 -->

1
src/views/WarehouseAdjust/components/MyDialog.vue
View file

@ -321,6 +321,7 @@ export default {
this.personalForm.regionId = this.$store.getters.regionId
this.personalForm.createPersonId = this.$store.getters.userId
this.personalForm.countryId = this.$store.getters.countryId
this.personalForm.modifyPersonId = this.$store.getters.userId
console.log(this.personalForm)
const rest = this.$refs.editable.getRecords()
if (rest.length === 0) {

1
src/views/WarehouseAdjust/components/MyDialog2.vue
View file

@ -383,6 +383,7 @@ export default {
this.personalForm.regionId = this.$store.getters.regionId
this.personalForm.createPersonId = this.$store.getters.userId
this.personalForm.countryId = this.$store.getters.countryId
this.personalForm.modifyPersonId = this.$store.getters.userId
const EnterDetail = this.$refs.editable.getRecords()
console.log(EnterDetail)
if (EnterDetail.length === 0) {