mirror of
https://github.com/shawncai/ERP.git
synced 2024-09-20 06:56:07 +08:00
7/26日前修改
This commit is contained in:
parent
41c12c9109
commit
2dd91f0730
|
@ -483,7 +483,7 @@ for (let i = 0, l = newarr.length; i < l - 1; i++) {
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<script src=<%= BASE_URL %>/tinymce4.7.5/tinymce.min.js></script>
|
<script src=<%= BASE_URL %>/tinymce4.7.5/tinymce.min.js></script>
|
||||||
<script async defer type="text/javascript" src="https://maps.googleapis.com/maps/api/js?&key=AIzaSyCcpq4V2NmldO9DdD0LHkYdyMYDQt-7Miw"></script>
|
<script async defer type="text/javascript" src="https://maps.googleapis.com/maps/api/js?&key=AIzaSyB37jXlk9_-rcuRxc5YBB3qmLeKCl70UGU"></script>
|
||||||
<script src=<%= BASE_URL %>/tinymce4.7.5/markerwithlabel.js></script>
|
<script src=<%= BASE_URL %>/tinymce4.7.5/markerwithlabel.js></script>
|
||||||
<div id="app"></div>
|
<div id="app"></div>
|
||||||
</body>
|
</body>
|
||||||
|
|
|
@ -24,6 +24,9 @@ export function addinstallmentapply(query, query2, query4) {
|
||||||
// 分期申请列表
|
// 分期申请列表
|
||||||
export function applylist(query) {
|
export function applylist(query) {
|
||||||
var params = new URLSearchParams()
|
var params = new URLSearchParams()
|
||||||
|
if (query.applyNumber !== '' && query.applyNumber !== null && query.applyNumber !== undefined) {
|
||||||
|
params.append('applyNumber', query.applyNumber) // 你要传给后台的参数值 key/value
|
||||||
|
}
|
||||||
if (query.inquirePersonId !== '' && query.inquirePersonId !== null && query.inquirePersonId !== undefined) {
|
if (query.inquirePersonId !== '' && query.inquirePersonId !== null && query.inquirePersonId !== undefined) {
|
||||||
params.append('inquirePersonId', query.inquirePersonId) // 你要传给后台的参数值 key/value
|
params.append('inquirePersonId', query.inquirePersonId) // 你要传给后台的参数值 key/value
|
||||||
}
|
}
|
||||||
|
|
|
@ -717,3 +717,39 @@ export function updateotherenter5(query, query2, query3) {
|
||||||
data: params
|
data: params
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function updateotherenter6(query, query2, query3) {
|
||||||
|
var params = new URLSearchParams()
|
||||||
|
if (query !== '' && query !== null && query !== undefined) {
|
||||||
|
params.append('id', query) // 你要传给后台的参数值 key/value
|
||||||
|
}
|
||||||
|
if (query3 !== '' && query3 !== null && query3 !== undefined) {
|
||||||
|
params.append('judgePersonId', query3) // 你要传给后台的参数值 key/value
|
||||||
|
}
|
||||||
|
if (query2 !== '' && query2 !== null && query2 !== undefined) {
|
||||||
|
params.append('receiptStat', query2) // 你要传给后台的参数值 key/value
|
||||||
|
}
|
||||||
|
return request({
|
||||||
|
url: '/otherenter/updateotherenter',
|
||||||
|
method: 'post',
|
||||||
|
data: params
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export function updateotherenter7(query, query2, query3) {
|
||||||
|
var params = new URLSearchParams()
|
||||||
|
if (query !== '' && query !== null && query !== undefined) {
|
||||||
|
params.append('id', query) // 你要传给后台的参数值 key/value
|
||||||
|
}
|
||||||
|
if (query2 !== '' && query2 !== null && query2 !== undefined) {
|
||||||
|
params.append('judgeStat', query2) // 你要传给后台的参数值 key/value
|
||||||
|
}
|
||||||
|
if (query3 !== '' && query3 !== null && query3 !== undefined) {
|
||||||
|
params.append('judgePersonId', query3) // 你要传给后台的参数值 key/value
|
||||||
|
}
|
||||||
|
return request({
|
||||||
|
url: '/otherenter/updateotherenter',
|
||||||
|
method: 'post',
|
||||||
|
data: params
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
|
@ -4509,11 +4509,11 @@ export default {
|
||||||
allIncludeTaxMoney: 'allIncludeTaxMoney',
|
allIncludeTaxMoney: 'allIncludeTaxMoney',
|
||||||
allPlanMoney: 'allPlanMoney',
|
allPlanMoney: 'allPlanMoney',
|
||||||
allTaxMoney: 'allTaxMoney',
|
allTaxMoney: 'allTaxMoney',
|
||||||
applyPhone: 'applyPhone',
|
applyPhone: 'applicant contact#',
|
||||||
acceptPhone: 'acceptPhone',
|
acceptPhone: 'receiver contact#',
|
||||||
emergencyPhone: 'emergencyPhone',
|
emergencyPhone: 'TL/manager contact#',
|
||||||
outPhone: 'outPhone',
|
outPhone: 'stock out contact#',
|
||||||
sendPhone: 'sendPhone',
|
sendPhone: ' helper/deliverer contact#',
|
||||||
sendEmergencyPhone: 'sendEmergencyPhone',
|
sendEmergencyPhone: 'sendEmergencyPhone',
|
||||||
yearDepreciationRate: 'yearDepreciationRate',
|
yearDepreciationRate: 'yearDepreciationRate',
|
||||||
danhao: 'receiptNumber'
|
danhao: 'receiptNumber'
|
||||||
|
|
|
@ -4516,6 +4516,7 @@ export default {
|
||||||
sendPhone: '配送人电话',
|
sendPhone: '配送人电话',
|
||||||
sendEmergencyPhone: '配送紧急联系人电话',
|
sendEmergencyPhone: '配送紧急联系人电话',
|
||||||
yearDepreciationRate: '年残值率',
|
yearDepreciationRate: '年残值率',
|
||||||
danhao: '单号'
|
danhao: '单号',
|
||||||
|
actialdiffermoney: '实际差异金额'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -127,7 +127,7 @@
|
||||||
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
|
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button v-permission="['131-157-3']" v-show="scope.row.judgeStat === 0" type="primary" size="mini" @click="handleEdit(scope.row)">{{ $t('public.edit') }}</el-button>
|
<el-button v-permission="['131-157-3']" v-show="scope.row.judgeStat === 0" type="primary" size="mini" @click="handleEdit(scope.row)">{{ $t('public.edit') }}</el-button>
|
||||||
<el-button v-show="isReview(scope.row)" type="warning" size="mini" @click="handleReview(scope.row)">{{ $t('public.review') }}</el-button>
|
<el-button v-show="isReview(scope.row)" :loading="shloading" type="warning" size="mini" @click="handleReview(scope.row)">{{ $t('public.review') }}</el-button>
|
||||||
<el-button v-permission="['131-157-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
|
<el-button v-permission="['131-157-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
|
||||||
<el-button v-permission="['131-157-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
|
<el-button v-permission="['131-157-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
|
||||||
<el-button v-permission="['131-157-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
|
<el-button v-permission="['131-157-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
|
||||||
|
@ -184,6 +184,7 @@ export default {
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
shloading: false,
|
||||||
tableHeight: 200,
|
tableHeight: 200,
|
||||||
|
|
||||||
// 搜索数据----------------------
|
// 搜索数据----------------------
|
||||||
|
@ -474,6 +475,7 @@ export default {
|
||||||
},
|
},
|
||||||
// 审批操作
|
// 审批操作
|
||||||
handleReview(row) {
|
handleReview(row) {
|
||||||
|
this.shloading = true
|
||||||
this.reviewParms = {}
|
this.reviewParms = {}
|
||||||
this.reviewParms.id = row.id
|
this.reviewParms.id = row.id
|
||||||
this.reviewParms.judgePersonId = this.$store.getters.userId
|
this.reviewParms.judgePersonId = this.$store.getters.userId
|
||||||
|
@ -493,6 +495,7 @@ export default {
|
||||||
})
|
})
|
||||||
this.getlist()
|
this.getlist()
|
||||||
}
|
}
|
||||||
|
this.shloading = false
|
||||||
})
|
})
|
||||||
}).catch(action => {
|
}).catch(action => {
|
||||||
if (action === 'cancel') {
|
if (action === 'cancel') {
|
||||||
|
@ -525,6 +528,7 @@ export default {
|
||||||
})
|
})
|
||||||
// ================取消弹框结束
|
// ================取消弹框结束
|
||||||
}
|
}
|
||||||
|
this.shloading = false
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
// 批量操作
|
// 批量操作
|
||||||
|
|
|
@ -124,10 +124,10 @@
|
||||||
<el-form-item :label="$t('CheckReport.productCode')" prop="productCode" style="margin-left: 18px;width: 100%;margin-bottom: 0">
|
<el-form-item :label="$t('CheckReport.productCode')" prop="productCode" style="margin-left: 18px;width: 100%;margin-bottom: 0">
|
||||||
<el-input v-model="personalForm.productCode" style="margin-left: 18px;width:200px" @focus="handlemater"/>
|
<el-input v-model="personalForm.productCode" style="margin-left: 18px;width:200px" @focus="handlemater"/>
|
||||||
<my-mater :matercontrol.sync="matercontrol" @mater="mater"/>
|
<my-mater :matercontrol.sync="matercontrol" @mater="mater"/>
|
||||||
<detail-report :reportcontrol.sync="reportcontrol" :reportdata.sync="reportdata" @report="report"/>
|
<detail-report :reportcontrol.sync="reportcontrol" :number.sync="number3" :reportdata.sync="reportdata" @report="report"/>
|
||||||
<detail-report2 :reportcontrol2.sync="reportcontrol2" :reportdata2.sync="reportdata2" @report2="report2"/>
|
<detail-report2 :reportcontrol2.sync="reportcontrol2" :number.sync="number2" :reportdata2.sync="reportdata2" @report2="report2"/>
|
||||||
<detail-report3 :reportcontrol3.sync="reportcontrol3" :reportdata3.sync="reportdata3" @report3="report3"/>
|
<detail-report3 :reportcontrol3.sync="reportcontrol3" :number.sync="number4" :reportdata3.sync="reportdata3" @report3="report3"/>
|
||||||
<detail-report4 :reportcontrol4.sync="reportcontrol4" :reportdata4.sync="reportdata4" @report4="report4"/>
|
<detail-report4 :reportcontrol4.sync="reportcontrol4" :number.sync="number5" :reportdata4.sync="reportdata4" @report4="report4"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
|
@ -326,6 +326,10 @@ export default {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
|
number5: null,
|
||||||
|
number4: null,
|
||||||
|
number3: null,
|
||||||
|
number2: null,
|
||||||
outsourcecontrol: false,
|
outsourcecontrol: false,
|
||||||
// 判断是否大于源单数量
|
// 判断是否大于源单数量
|
||||||
judgequilty: null,
|
judgequilty: null,
|
||||||
|
@ -666,12 +670,16 @@ export default {
|
||||||
// 物品信息focus事件
|
// 物品信息focus事件
|
||||||
handlemater() {
|
handlemater() {
|
||||||
if (this.personalForm.sourceType === '1') {
|
if (this.personalForm.sourceType === '1') {
|
||||||
|
this.number3 = this.personalForm.sourceNumber
|
||||||
this.reportcontrol = true
|
this.reportcontrol = true
|
||||||
} else if (this.personalForm.sourceType === '2') {
|
} else if (this.personalForm.sourceType === '2') {
|
||||||
|
this.number2 = this.personalForm.sourceNumber
|
||||||
this.reportcontrol2 = true
|
this.reportcontrol2 = true
|
||||||
} else if (this.personalForm.sourceType === '3') {
|
} else if (this.personalForm.sourceType === '3') {
|
||||||
|
this.number4 = this.personalForm.sourceNumber
|
||||||
this.reportcontrol3 = true
|
this.reportcontrol3 = true
|
||||||
} else if (this.personalForm.sourceType === '4') {
|
} else if (this.personalForm.sourceType === '4') {
|
||||||
|
this.number5 = this.personalForm.sourceNumber
|
||||||
this.reportcontrol4 = true
|
this.reportcontrol4 = true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -1116,7 +1124,6 @@ export default {
|
||||||
regionId: this.$store.getters.regionId,
|
regionId: this.$store.getters.regionId,
|
||||||
inspectionPersonId: this.$store.getters.userId,
|
inspectionPersonId: this.$store.getters.userId,
|
||||||
isRecheck: 1,
|
isRecheck: 1,
|
||||||
sourceType: '2',
|
|
||||||
sampleQuantity: null,
|
sampleQuantity: null,
|
||||||
checkQuantity: null,
|
checkQuantity: null,
|
||||||
failedQuantity: '',
|
failedQuantity: '',
|
||||||
|
@ -1129,7 +1136,6 @@ export default {
|
||||||
}
|
}
|
||||||
this.judgequilty = null
|
this.judgequilty = null
|
||||||
this.inspectionPersonId = this.$store.getters.name
|
this.inspectionPersonId = this.$store.getters.name
|
||||||
this.supplierId = null
|
|
||||||
this.workCenterId = null
|
this.workCenterId = null
|
||||||
this.produceManagerId = null
|
this.produceManagerId = null
|
||||||
this.checkPersonId = this.$store.getters.name
|
this.checkPersonId = this.$store.getters.name
|
||||||
|
|
|
@ -71,6 +71,8 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
var _that
|
var _that
|
||||||
|
import { qualitychecklist } from '@/api/QualityCheck'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
props: {
|
props: {
|
||||||
reportcontrol: {
|
reportcontrol: {
|
||||||
|
@ -80,6 +82,10 @@ export default {
|
||||||
reportdata: {
|
reportdata: {
|
||||||
type: Array,
|
type: Array,
|
||||||
default: null
|
default: null
|
||||||
|
},
|
||||||
|
number: {
|
||||||
|
type: String,
|
||||||
|
default: null
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
|
@ -98,7 +104,17 @@ export default {
|
||||||
// 表格数据条数
|
// 表格数据条数
|
||||||
total: 0,
|
total: 0,
|
||||||
// 表格识别
|
// 表格识别
|
||||||
tableKey: 0
|
tableKey: 0,
|
||||||
|
getemplist: {
|
||||||
|
pageNum: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
judgeStat: 2,
|
||||||
|
receiptStat: 2,
|
||||||
|
repositoryId: this.$store.getters.repositoryId,
|
||||||
|
regionIds: this.$store.getters.regionIds,
|
||||||
|
isActive: 1,
|
||||||
|
checkNumber: this.number
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
|
@ -112,13 +128,24 @@ export default {
|
||||||
},
|
},
|
||||||
reportdata() {
|
reportdata() {
|
||||||
console.log(this.reportdata)
|
console.log(this.reportdata)
|
||||||
this.list = this.reportdata
|
// this.list = this.reportdata
|
||||||
|
},
|
||||||
|
number() {
|
||||||
|
this.getemplist.number = this.number
|
||||||
|
this.getdata()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
beforeCreate() {
|
beforeCreate() {
|
||||||
_that = this
|
_that = this
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
getdata() {
|
||||||
|
qualitychecklist(this.getemplist).then(res => {
|
||||||
|
if (res.data.ret === 200) {
|
||||||
|
this.list = res.data.data.content.list[0].qualityCheckDetailVos
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
handleCurrentChange(val) {
|
handleCurrentChange(val) {
|
||||||
console.log(val)
|
console.log(val)
|
||||||
this.choosedata = val
|
this.choosedata = val
|
||||||
|
|
|
@ -61,6 +61,8 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
var _that
|
var _that
|
||||||
|
import { searchstockArrival } from '@/api/StockArrival'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
props: {
|
props: {
|
||||||
reportcontrol2: {
|
reportcontrol2: {
|
||||||
|
@ -70,6 +72,10 @@ export default {
|
||||||
reportdata2: {
|
reportdata2: {
|
||||||
type: Array,
|
type: Array,
|
||||||
default: null
|
default: null
|
||||||
|
},
|
||||||
|
number: {
|
||||||
|
type: String,
|
||||||
|
default: null
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
|
@ -88,7 +94,17 @@ export default {
|
||||||
// 表格数据条数
|
// 表格数据条数
|
||||||
total: 0,
|
total: 0,
|
||||||
// 表格识别
|
// 表格识别
|
||||||
tableKey: 0
|
tableKey: 0,
|
||||||
|
getemplist: {
|
||||||
|
pageNum: 1,
|
||||||
|
pageSize: 100,
|
||||||
|
judgeStat: 2,
|
||||||
|
receiptStat: 2,
|
||||||
|
repositoryId: this.$store.getters.repositoryId,
|
||||||
|
regionIds: this.$store.getters.regionIds,
|
||||||
|
isActive: 2,
|
||||||
|
number: this.number
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
|
@ -101,13 +117,25 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
reportdata2() {
|
reportdata2() {
|
||||||
this.list = this.reportdata2
|
|
||||||
|
},
|
||||||
|
number() {
|
||||||
|
this.getemplist.number = this.number
|
||||||
|
this.getData()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
beforeCreate() {
|
beforeCreate() {
|
||||||
_that = this
|
_that = this
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
getData() {
|
||||||
|
searchstockArrival(this.getemplist).then(res => {
|
||||||
|
if (res.data.ret === 200) {
|
||||||
|
console.log('res.data', res.data)
|
||||||
|
this.list = res.data.data.content.list[0].stockArrivalDetailVos
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
handleCurrentChange(val) {
|
handleCurrentChange(val) {
|
||||||
console.log(val)
|
console.log(val)
|
||||||
this.choosedata = val
|
this.choosedata = val
|
||||||
|
|
|
@ -51,6 +51,8 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
var _that
|
var _that
|
||||||
|
import { producetasklist } from '@/api/ProduceTask'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
props: {
|
props: {
|
||||||
reportcontrol3: {
|
reportcontrol3: {
|
||||||
|
@ -60,6 +62,10 @@ export default {
|
||||||
reportdata3: {
|
reportdata3: {
|
||||||
type: Array,
|
type: Array,
|
||||||
default: null
|
default: null
|
||||||
|
},
|
||||||
|
number: {
|
||||||
|
type: String,
|
||||||
|
default: null
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
|
@ -78,7 +84,16 @@ export default {
|
||||||
// 表格数据条数
|
// 表格数据条数
|
||||||
total: 0,
|
total: 0,
|
||||||
// 表格识别
|
// 表格识别
|
||||||
tableKey: 0
|
tableKey: 0,
|
||||||
|
getemplist: {
|
||||||
|
pageNum: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
judgeStat: 2, receiptStat: 2,
|
||||||
|
repositoryId: this.$store.getters.repositoryId,
|
||||||
|
regionIds: this.$store.getters.regionIds,
|
||||||
|
isActive: 1,
|
||||||
|
taskNumber: this.number
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
|
@ -91,13 +106,24 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
reportdata3() {
|
reportdata3() {
|
||||||
this.list = this.reportdata3
|
// this.list = this.reportdata3
|
||||||
|
},
|
||||||
|
number() {
|
||||||
|
this.getemplist.taskNumber = this.number
|
||||||
|
this.getData()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
beforeCreate() {
|
beforeCreate() {
|
||||||
_that = this
|
_that = this
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
getData() {
|
||||||
|
producetasklist(this.getemplist).then(res => {
|
||||||
|
if (res.data.ret === 200) {
|
||||||
|
this.list = res.data.data.content.list[0].produceTaskDetailVos
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
handleCurrentChange(val) {
|
handleCurrentChange(val) {
|
||||||
console.log(val)
|
console.log(val)
|
||||||
this.choosedata = val
|
this.choosedata = val
|
||||||
|
|
|
@ -46,6 +46,7 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
var _that
|
var _that
|
||||||
|
import { searchoutsourcing } from '@/api/OutSourcing'
|
||||||
export default {
|
export default {
|
||||||
props: {
|
props: {
|
||||||
reportcontrol4: {
|
reportcontrol4: {
|
||||||
|
@ -55,6 +56,10 @@ export default {
|
||||||
reportdata4: {
|
reportdata4: {
|
||||||
type: Array,
|
type: Array,
|
||||||
default: null
|
default: null
|
||||||
|
},
|
||||||
|
number: {
|
||||||
|
type: String,
|
||||||
|
default: null
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
|
@ -73,7 +78,17 @@ export default {
|
||||||
// 表格数据条数
|
// 表格数据条数
|
||||||
total: 0,
|
total: 0,
|
||||||
// 表格识别
|
// 表格识别
|
||||||
tableKey: 0
|
tableKey: 0,
|
||||||
|
getemplist: {
|
||||||
|
isActive: 3,
|
||||||
|
judgeStat: 2,
|
||||||
|
receiptStat: 2,
|
||||||
|
pageNum: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
repositoryId: this.$store.getters.repositoryId,
|
||||||
|
regionIds: this.$store.getters.regionIds,
|
||||||
|
number: this.number
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
|
@ -86,13 +101,24 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
reportdata4() {
|
reportdata4() {
|
||||||
this.list = this.reportdata4
|
// this.list = this.reportdata4
|
||||||
|
},
|
||||||
|
number() {
|
||||||
|
this.getemplist.number = this.number
|
||||||
|
this.getdata()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
beforeCreate() {
|
beforeCreate() {
|
||||||
_that = this
|
_that = this
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
getdata() {
|
||||||
|
searchoutsourcing(this.getemplist).then(res => {
|
||||||
|
if (res.data.ret === 200) {
|
||||||
|
this.list = res.data.data.content.list[0].outsourcingEnterDetailVos
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
handleCurrentChange(val) {
|
handleCurrentChange(val) {
|
||||||
console.log(val)
|
console.log(val)
|
||||||
this.choosedata = val
|
this.choosedata = val
|
||||||
|
|
|
@ -84,7 +84,23 @@
|
||||||
@current-change="handleCurrentChange">
|
@current-change="handleCurrentChange">
|
||||||
<el-table-column :label="$t('public.id')" :resizable="false" align="center" min-width="150">
|
<el-table-column :label="$t('public.id')" :resizable="false" align="center" min-width="150">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ scope.row.number }}</span>
|
<el-popover
|
||||||
|
placement="right"
|
||||||
|
width="720"
|
||||||
|
trigger="hover">
|
||||||
|
<el-table :data="scope.row.stockArrivalDetailVos" border size="small">
|
||||||
|
<el-table-column :label="$t('Hmodule.wpbh')" min-width="200" property="productCode"/>
|
||||||
|
<el-table-column :label="$t('Hmodule.wpmc')" min-width="200" property="productName"/>
|
||||||
|
<el-table-column :label="$t('updates.dhsl')" min-width="100" property="arrivalQuantity"/>
|
||||||
|
<el-table-column :label="$t('Hmodule.gg')" min-width="100" property="typeName"/>
|
||||||
|
<!-- <el-table-column :label="$t('updates.jhrq')" min-width="200" property="deliveryDate"/> -->
|
||||||
|
<el-table-column :label="$t('updates.ys')" min-width="100" property="color"/>
|
||||||
|
<el-table-column :label="$t('Hmodule.dw')" min-width="100" property="unit"/>
|
||||||
|
</el-table>
|
||||||
|
<div slot="reference" class="name-wrapper">
|
||||||
|
<el-tag size="small">{{ scope.row.number }}</el-tag>
|
||||||
|
</div>
|
||||||
|
</el-popover>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column :label="$t('StockArrival.title')" :resizable="false" align="center" min-width="150">
|
<el-table-column :label="$t('StockArrival.title')" :resizable="false" align="center" min-width="150">
|
||||||
|
|
|
@ -81,7 +81,22 @@
|
||||||
@current-change="handleCurrentChange">
|
@current-change="handleCurrentChange">
|
||||||
<el-table-column :label="$t('public.id')" :resizable="false" align="center" min-width="150">
|
<el-table-column :label="$t('public.id')" :resizable="false" align="center" min-width="150">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ scope.row.checkNumber }}</span>
|
<el-popover
|
||||||
|
placement="right"
|
||||||
|
width="720"
|
||||||
|
trigger="hover">
|
||||||
|
<el-table :data="scope.row.qualityCheckDetailVos" border size="small">
|
||||||
|
<el-table-column :label="$t('Hmodule.wpbh')" min-width="200" property="productCode"/>
|
||||||
|
<el-table-column :label="$t('Hmodule.wpmc')" min-width="200" property="productName"/>
|
||||||
|
<el-table-column :label="$t('updates.dhsl')" min-width="100" property="arrivalQuantity"/>
|
||||||
|
<!-- <el-table-column :label="$t('updates.jhrq')" min-width="200" property="deliveryDate"/> -->
|
||||||
|
<el-table-column :label="$t('updates.ys')" min-width="100" property="color"/>
|
||||||
|
<el-table-column :label="$t('Hmodule.dw')" min-width="100" property="unit"/>
|
||||||
|
</el-table>
|
||||||
|
<div slot="reference" class="name-wrapper">
|
||||||
|
<el-tag size="small">{{ scope.row.checkNumber }}</el-tag>
|
||||||
|
</div>
|
||||||
|
</el-popover>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column :label="$t('QualityCheck.title')" :resizable="false" align="center" min-width="150">
|
<el-table-column :label="$t('QualityCheck.title')" :resizable="false" align="center" min-width="150">
|
||||||
|
|
|
@ -65,7 +65,19 @@
|
||||||
@current-change="handleCurrentChange">
|
@current-change="handleCurrentChange">
|
||||||
<el-table-column :label="$t('public.id')" :resizable="false" fixed="left" align="center" min-width="150">
|
<el-table-column :label="$t('public.id')" :resizable="false" fixed="left" align="center" min-width="150">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ scope.row.number }}</span>
|
<el-popover
|
||||||
|
placement="right"
|
||||||
|
width="720"
|
||||||
|
trigger="hover">
|
||||||
|
<el-table :data="scope.row.outsourcingEnterDetailVos" border size="small">
|
||||||
|
<el-table-column :label="$t('Hmodule.wpbh')" min-width="200" property="productCode"/>
|
||||||
|
<el-table-column :label="$t('Hmodule.wpmc')" min-width="200" property="productName"/>
|
||||||
|
<el-table-column :label="$t('Hmodule.dw')" min-width="100" property="unit"/>
|
||||||
|
</el-table>
|
||||||
|
<div slot="reference" class="name-wrapper">
|
||||||
|
<el-tag size="small">{{ scope.row.number }}</el-tag>
|
||||||
|
</div>
|
||||||
|
</el-popover>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column :label="$t('OutSourcing.title')" :resizable="false" fixed="left" align="center" min-width="150">
|
<el-table-column :label="$t('OutSourcing.title')" :resizable="false" fixed="left" align="center" min-width="150">
|
||||||
|
|
|
@ -87,7 +87,21 @@
|
||||||
@current-change="handleCurrentChange">
|
@current-change="handleCurrentChange">
|
||||||
<el-table-column :label="$t('ProduceTask.taskNumber')" :resizable="false" align="center" min-width="150">
|
<el-table-column :label="$t('ProduceTask.taskNumber')" :resizable="false" align="center" min-width="150">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ scope.row.taskNumber }}</span>
|
<el-popover
|
||||||
|
placement="right"
|
||||||
|
width="720"
|
||||||
|
trigger="hover">
|
||||||
|
<el-table :data="scope.row.produceTaskDetailVos" border size="small">
|
||||||
|
<el-table-column :label="$t('Hmodule.wpbh')" min-width="200" property="productCode"/>
|
||||||
|
<el-table-column :label="$t('Hmodule.wpmc')" min-width="200" property="productName"/>
|
||||||
|
<el-table-column :label="$t('Hmodule.gg')" min-width="100" property="productType"/>
|
||||||
|
<el-table-column :label="$t('updates.dhsl')" min-width="100" property="actualCheckQuantity"/>
|
||||||
|
<el-table-column :label="$t('Hmodule.dw')" min-width="100" property="unit"/>
|
||||||
|
</el-table>
|
||||||
|
<div slot="reference" class="name-wrapper">
|
||||||
|
<el-tag size="small">{{ scope.row.taskNumber }}</el-tag>
|
||||||
|
</div>
|
||||||
|
</el-popover>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column :label="$t('ProduceTask.title')" :resizable="false" align="center" min-width="150">
|
<el-table-column :label="$t('ProduceTask.title')" :resizable="false" align="center" min-width="150">
|
||||||
|
|
|
@ -265,7 +265,7 @@ export default {
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
|
|
@ -88,7 +88,7 @@
|
||||||
</template>
|
</template>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item> -->
|
</el-form-item> -->
|
||||||
<el-form-item :label="$t('Customer.newold')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
|
<el-form-item :label="$t('Customer.newold')" prop="newold" style="margin-left: 18px;width: 100%;margin-bottom: 0">
|
||||||
<el-select v-model="customerForm.newold" :value="customerForm.newold" :placeholder="$t('updates.qxz')" style="width: 200px">
|
<el-select v-model="customerForm.newold" :value="customerForm.newold" :placeholder="$t('updates.qxz')" style="width: 200px">
|
||||||
<el-option :label="$t('update4.bdkh')" value="1"/>
|
<el-option :label="$t('update4.bdkh')" value="1"/>
|
||||||
<el-option :label="$t('update4.fbdkh')" value="2"/>
|
<el-option :label="$t('update4.fbdkh')" value="2"/>
|
||||||
|
@ -225,6 +225,9 @@ export default {
|
||||||
},
|
},
|
||||||
// 客户信息规则数据
|
// 客户信息规则数据
|
||||||
customerFormrules: {
|
customerFormrules: {
|
||||||
|
newold: [
|
||||||
|
{ required: true, message: 'please input IS our customers', trigger: 'change' }
|
||||||
|
],
|
||||||
phone: [
|
phone: [
|
||||||
{ required: true, validator: checkphone, trigger: 'change' }
|
{ required: true, validator: checkphone, trigger: 'change' }
|
||||||
],
|
],
|
||||||
|
|
|
@ -202,7 +202,7 @@ export default {
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
|
|
@ -883,7 +883,7 @@ export default {
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
|
|
||||||
<el-input v-model="salePersonId" :placeholder="$t('InstallmentApply.salePersonId')" size="small" class="filter-item" @clear="restFilter" @keyup.enter.native="handleFilter" @focus="handlechooseStock"/>
|
<el-input v-model="salePersonId" :placeholder="$t('InstallmentApply.salePersonId')" size="small" class="filter-item" @clear="restFilter" @keyup.enter.native="handleFilter" @focus="handlechooseStock"/>
|
||||||
<my-emp :control.sync="stockControl" @stockName="stockName"/>
|
<my-emp :control.sync="stockControl" @stockName="stockName"/>
|
||||||
|
<el-input v-model="getemplist.applyNumber" :placeholder="$t('update4.danhao')" size="small" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
|
||||||
|
|
||||||
<el-popover
|
<el-popover
|
||||||
v-model="visible2"
|
v-model="visible2"
|
||||||
|
|
|
@ -159,7 +159,7 @@
|
||||||
<!--操作123-->
|
<!--操作123-->
|
||||||
<div class="buttons" style="position:fixed;bottom: 0;width: 100%;height: 40px; background: #fff;z-index: 99">
|
<div class="buttons" style="position:fixed;bottom: 0;width: 100%;height: 40px; background: #fff;z-index: 99">
|
||||||
|
|
||||||
<el-button v-no-more-click v-loading="issure" type="primary" style="background:#3696fd;border-color:#3696fd;width: 98px" @click="handlesave()">{{ $t('Hmodule.baoc') }}</el-button>
|
<el-button :loading="issure" type="primary" style="background:#3696fd;border-color:#3696fd;width: 98px" @click="handlesave()">{{ $t('Hmodule.baoc') }}</el-button>
|
||||||
<el-button type="danger" @click="handlecancel()">{{ $t('Hmodule.cancel') }}</el-button>
|
<el-button type="danger" @click="handlecancel()">{{ $t('Hmodule.cancel') }}</el-button>
|
||||||
</div>
|
</div>
|
||||||
<el-dialog :visible.sync="receiptVisible2" title="库存快照" class="normal" width="600px" center>
|
<el-dialog :visible.sync="receiptVisible2" title="库存快照" class="normal" width="600px" center>
|
||||||
|
@ -246,7 +246,7 @@ export default {
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
@ -603,126 +603,137 @@ export default {
|
||||||
// 保存操作
|
// 保存操作
|
||||||
handlesave() {
|
handlesave() {
|
||||||
this.issure = true
|
this.issure = true
|
||||||
const EnterDetail = this.$refs.editable.getRecords()
|
|
||||||
console.log(EnterDetail)
|
setTimeout(() => {
|
||||||
for (const i in EnterDetail) {
|
const EnterDetail = this.$refs.editable.getRecords()
|
||||||
if (EnterDetail[i].actualEnterQuantity === 0) {
|
console.log(EnterDetail)
|
||||||
|
for (const i in EnterDetail) {
|
||||||
|
if (EnterDetail[i].actualEnterQuantity === 0) {
|
||||||
|
this.$notify.error({
|
||||||
|
title: 'wrong',
|
||||||
|
message: '商品数量不能为0',
|
||||||
|
offset: 100
|
||||||
|
})
|
||||||
|
this.issure = false
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let i = 1
|
||||||
|
EnterDetail.map(function(elem) {
|
||||||
|
return elem
|
||||||
|
}).forEach(function(elem) {
|
||||||
|
if (elem.locationId === null || elem.locationId === '' || elem.locationId === undefined) {
|
||||||
|
i = 2
|
||||||
|
}
|
||||||
|
})
|
||||||
|
if (i === 2) {
|
||||||
this.$notify.error({
|
this.$notify.error({
|
||||||
title: 'wrong',
|
title: 'wrong',
|
||||||
message: '商品数量不能为0',
|
message: '商品货位不能为空',
|
||||||
offset: 100
|
offset: 100
|
||||||
})
|
})
|
||||||
this.issure = false
|
this.issure = false
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
console.log(this.personalForm)
|
||||||
let i = 1
|
console.log(EnterDetail)
|
||||||
EnterDetail.map(function(elem) {
|
if (EnterDetail.length === 0) {
|
||||||
return elem
|
this.$notify.error({
|
||||||
}).forEach(function(elem) {
|
title: 'wrong',
|
||||||
if (elem.locationId === null || elem.locationId === '' || elem.locationId === undefined) {
|
message: this.$t('prompt.mxbbnwk'),
|
||||||
i = 2
|
offset: 100
|
||||||
|
})
|
||||||
|
this.issure = false
|
||||||
|
return false
|
||||||
}
|
}
|
||||||
})
|
EnterDetail.map(function(elem) {
|
||||||
if (i === 2) {
|
return elem
|
||||||
this.$notify.error({
|
}).forEach(function(elem) {
|
||||||
title: 'wrong',
|
if (elem.locationId === null || elem.locationId === '' || elem.locationId === undefined) {
|
||||||
message: '商品货位不能为空',
|
delete elem.locationId
|
||||||
offset: 100
|
}
|
||||||
|
if (elem.productCode === null || elem.productCode === '' || elem.productCode === undefined) {
|
||||||
|
delete elem.productCode
|
||||||
|
}
|
||||||
|
if (elem.productName === null || elem.productName === '' || elem.productName === undefined) {
|
||||||
|
delete elem.productName
|
||||||
|
}
|
||||||
|
if (elem.color === null || elem.color === '' || elem.color === undefined) {
|
||||||
|
delete elem.color
|
||||||
|
}
|
||||||
|
if (elem.typeId === null || elem.typeId === '' || elem.typeId === undefined) {
|
||||||
|
delete elem.typeId
|
||||||
|
}
|
||||||
|
if (elem.unit === null || elem.unit === '' || elem.unit === undefined) {
|
||||||
|
delete elem.unit
|
||||||
|
}
|
||||||
|
if (elem.actualEnterQuantity === null || elem.actualEnterQuantity === '' || elem.actualEnterQuantity === undefined) {
|
||||||
|
delete elem.actualEnterQuantity
|
||||||
|
}
|
||||||
|
if (elem.enterQuantity === null || elem.enterQuantity === '' || elem.enterQuantity === undefined) {
|
||||||
|
delete elem.enterQuantity
|
||||||
|
}
|
||||||
|
if (elem.enterPrice === null || elem.enterPrice === '' || elem.enterPrice === undefined) {
|
||||||
|
delete elem.enterPrice
|
||||||
|
}
|
||||||
|
if (elem.enterMoney === null || elem.enterMoney === '' || elem.enterMoney === undefined) {
|
||||||
|
delete elem.enterMoney
|
||||||
|
}
|
||||||
|
if (elem.remarks === null || elem.remarks === '' || elem.remarks === undefined) {
|
||||||
|
delete elem.remarks
|
||||||
|
}
|
||||||
|
return elem
|
||||||
})
|
})
|
||||||
this.issure = false
|
const parms = JSON.stringify(EnterDetail)
|
||||||
return false
|
this.$refs.personalForm.validate((valid) => {
|
||||||
}
|
if (valid) {
|
||||||
console.log(this.personalForm)
|
this.$refs.editable.validate().then(valid => {
|
||||||
console.log(EnterDetail)
|
if (valid) {
|
||||||
if (EnterDetail.length === 0) {
|
console.log('newOrOld', this.personalForm.newOrOld)
|
||||||
this.$notify.error({
|
const Data = this.personalForm
|
||||||
title: 'wrong',
|
for (const key in Data) {
|
||||||
message: this.$t('prompt.mxbbnwk'),
|
if (Data[key] === '' || Data[key] === undefined || Data[key] === null) {
|
||||||
offset: 100
|
delete Data[key]
|
||||||
})
|
}
|
||||||
this.issure = false
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
EnterDetail.map(function(elem) {
|
|
||||||
return elem
|
|
||||||
}).forEach(function(elem) {
|
|
||||||
if (elem.locationId === null || elem.locationId === '' || elem.locationId === undefined) {
|
|
||||||
delete elem.locationId
|
|
||||||
}
|
|
||||||
if (elem.productCode === null || elem.productCode === '' || elem.productCode === undefined) {
|
|
||||||
delete elem.productCode
|
|
||||||
}
|
|
||||||
if (elem.productName === null || elem.productName === '' || elem.productName === undefined) {
|
|
||||||
delete elem.productName
|
|
||||||
}
|
|
||||||
if (elem.color === null || elem.color === '' || elem.color === undefined) {
|
|
||||||
delete elem.color
|
|
||||||
}
|
|
||||||
if (elem.typeId === null || elem.typeId === '' || elem.typeId === undefined) {
|
|
||||||
delete elem.typeId
|
|
||||||
}
|
|
||||||
if (elem.unit === null || elem.unit === '' || elem.unit === undefined) {
|
|
||||||
delete elem.unit
|
|
||||||
}
|
|
||||||
if (elem.actualEnterQuantity === null || elem.actualEnterQuantity === '' || elem.actualEnterQuantity === undefined) {
|
|
||||||
delete elem.actualEnterQuantity
|
|
||||||
}
|
|
||||||
if (elem.enterQuantity === null || elem.enterQuantity === '' || elem.enterQuantity === undefined) {
|
|
||||||
delete elem.enterQuantity
|
|
||||||
}
|
|
||||||
if (elem.enterPrice === null || elem.enterPrice === '' || elem.enterPrice === undefined) {
|
|
||||||
delete elem.enterPrice
|
|
||||||
}
|
|
||||||
if (elem.enterMoney === null || elem.enterMoney === '' || elem.enterMoney === undefined) {
|
|
||||||
delete elem.enterMoney
|
|
||||||
}
|
|
||||||
if (elem.remarks === null || elem.remarks === '' || elem.remarks === undefined) {
|
|
||||||
delete elem.remarks
|
|
||||||
}
|
|
||||||
return elem
|
|
||||||
})
|
|
||||||
const parms = JSON.stringify(EnterDetail)
|
|
||||||
this.$refs.personalForm.validate((valid) => {
|
|
||||||
if (valid) {
|
|
||||||
this.$refs.editable.validate().then(valid => {
|
|
||||||
if (valid) {
|
|
||||||
console.log('newOrOld', this.personalForm.newOrOld)
|
|
||||||
const Data = this.personalForm
|
|
||||||
for (const key in Data) {
|
|
||||||
if (Data[key] === '' || Data[key] === undefined || Data[key] === null) {
|
|
||||||
delete Data[key]
|
|
||||||
}
|
|
||||||
// if (key === 'judgeStat') {
|
// if (key === 'judgeStat') {
|
||||||
// delete Data[key]
|
// delete Data[key]
|
||||||
// }
|
// }
|
||||||
}
|
|
||||||
const parmss = JSON.stringify(Data)
|
|
||||||
addOutsourceEnter(parmss, parms, this.personalForm).then(res => {
|
|
||||||
console.log(res)
|
|
||||||
if (res.data.ret === 200) {
|
|
||||||
this.$notify({
|
|
||||||
title: 'successful',
|
|
||||||
message: 'save successful',
|
|
||||||
type: 'success',
|
|
||||||
offset: 100
|
|
||||||
})
|
|
||||||
this.issure = false
|
|
||||||
this.restAllForm()
|
|
||||||
this.$refs.editable.clear()
|
|
||||||
this.$refs.personalForm.clearValidate()
|
|
||||||
this.$refs.personalForm.resetFields()
|
|
||||||
} else {
|
|
||||||
this.$notify.error({
|
|
||||||
title: 'wrong',
|
|
||||||
message: res.data.msg,
|
|
||||||
offset: 100
|
|
||||||
})
|
|
||||||
this.issure = false
|
|
||||||
}
|
}
|
||||||
|
const parmss = JSON.stringify(Data)
|
||||||
|
addOutsourceEnter(parmss, parms, this.personalForm).then(res => {
|
||||||
|
console.log(res)
|
||||||
|
if (res.data.ret === 200) {
|
||||||
|
this.$notify({
|
||||||
|
title: 'successful',
|
||||||
|
message: 'save successful',
|
||||||
|
type: 'success',
|
||||||
|
offset: 100
|
||||||
|
})
|
||||||
|
this.issure = false
|
||||||
|
this.restAllForm()
|
||||||
|
this.$refs.editable.clear()
|
||||||
|
this.$refs.personalForm.clearValidate()
|
||||||
|
this.$refs.personalForm.resetFields()
|
||||||
|
} else {
|
||||||
|
this.$notify.error({
|
||||||
|
title: 'wrong',
|
||||||
|
message: res.data.msg,
|
||||||
|
offset: 100
|
||||||
|
})
|
||||||
|
this.issure = false
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}).catch(valid => {
|
||||||
|
this.$notify.error({
|
||||||
|
title: 'wrong',
|
||||||
|
message: 'Information is incomplete',
|
||||||
|
offset: 100
|
||||||
})
|
})
|
||||||
}
|
this.issure = false
|
||||||
}).catch(valid => {
|
return false
|
||||||
|
})
|
||||||
|
} else {
|
||||||
this.$notify.error({
|
this.$notify.error({
|
||||||
title: 'wrong',
|
title: 'wrong',
|
||||||
message: 'Information is incomplete',
|
message: 'Information is incomplete',
|
||||||
|
@ -730,17 +741,9 @@ export default {
|
||||||
})
|
})
|
||||||
this.issure = false
|
this.issure = false
|
||||||
return false
|
return false
|
||||||
})
|
}
|
||||||
} else {
|
})
|
||||||
this.$notify.error({
|
}, 1000 * 0.5)
|
||||||
title: 'wrong',
|
|
||||||
message: 'Information is incomplete',
|
|
||||||
offset: 100
|
|
||||||
})
|
|
||||||
this.issure = false
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
})
|
|
||||||
},
|
},
|
||||||
// 取消操作
|
// 取消操作
|
||||||
handlecancel() {
|
handlecancel() {
|
||||||
|
|
|
@ -194,7 +194,7 @@ export default {
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
|
|
@ -188,7 +188,7 @@
|
||||||
<!--操作-->
|
<!--操作-->
|
||||||
<div class="buttons" style="position:fixed;bottom: 0;width: 100%;height: 40px; background: #fff;z-index: 99">
|
<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>
|
<el-button :loading="saveloading" type="primary" style="background:#3696fd;border-color:#3696fd;width: 98px" @click="handlesave()">{{ $t('Hmodule.baoc') }}</el-button>
|
||||||
<el-button type="danger" @click="handlecancel()">{{ $t('Hmodule.cancel') }}</el-button>
|
<el-button type="danger" @click="handlecancel()">{{ $t('Hmodule.cancel') }}</el-button>
|
||||||
</div>
|
</div>
|
||||||
<el-dialog :visible.sync="receiptVisible2" title="库存快照" class="normal" width="600px" center>
|
<el-dialog :visible.sync="receiptVisible2" title="库存快照" class="normal" width="600px" center>
|
||||||
|
@ -249,10 +249,11 @@ export default {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
|
saveloading: false,
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
@ -680,157 +681,165 @@ export default {
|
||||||
},
|
},
|
||||||
// 保存操作
|
// 保存操作
|
||||||
handlesave() {
|
handlesave() {
|
||||||
const EnterDetail = this.deepClone(this.$refs.editable.getRecords())
|
this.saveloading = true
|
||||||
// 保存时同样商品不能有同一个批次
|
setTimeout(() => {
|
||||||
// let i = 0
|
const EnterDetail = this.deepClone(this.$refs.editable.getRecords())
|
||||||
// EnterDetail.map(function(elem) {
|
// 保存时同样商品不能有同一个批次
|
||||||
// return elem
|
// let i = 0
|
||||||
// }).forEach(function(elem) {
|
// EnterDetail.map(function(elem) {
|
||||||
// EnterDetail.map(function(elem2) {
|
// return elem
|
||||||
// return elem2
|
// }).forEach(function(elem) {
|
||||||
// }).forEach(function(elem2) {
|
// EnterDetail.map(function(elem2) {
|
||||||
// if (elem2.productCode === elem.productCode && elem2.batch === elem.batch) {
|
// return elem2
|
||||||
// i++
|
// }).forEach(function(elem2) {
|
||||||
// }
|
// if (elem2.productCode === elem.productCode && elem2.batch === elem.batch) {
|
||||||
// })
|
// i++
|
||||||
// })
|
// }
|
||||||
// console.log(i)
|
// })
|
||||||
// if (i > EnterDetail.length) {
|
// })
|
||||||
// this.$notify.error({
|
// console.log(i)
|
||||||
// title: 'wrong',
|
// if (i > EnterDetail.length) {
|
||||||
// message: '同样商品不能有同一个批次',
|
// this.$notify.error({
|
||||||
// offset: 100
|
// title: 'wrong',
|
||||||
// })
|
// message: '同样商品不能有同一个批次',
|
||||||
// return false
|
// offset: 100
|
||||||
// }
|
// })
|
||||||
// 批次货位不能为空
|
// return false
|
||||||
let j = 1
|
// }
|
||||||
EnterDetail.map(function(elem) {
|
// 批次货位不能为空
|
||||||
return elem
|
let j = 1
|
||||||
}).forEach(function(elem) {
|
EnterDetail.map(function(elem) {
|
||||||
if (elem.batch === null || elem.batch === undefined || elem.batch === '' || elem.location === null || elem.location === undefined || elem.location === '') {
|
return elem
|
||||||
j = 2
|
}).forEach(function(elem) {
|
||||||
}
|
if (elem.batch === null || elem.batch === undefined || elem.batch === '' || elem.location === null || elem.location === undefined || elem.location === '') {
|
||||||
})
|
j = 2
|
||||||
console.log(j)
|
}
|
||||||
if (j === 2) {
|
|
||||||
this.$notify.error({
|
|
||||||
title: 'wrong',
|
|
||||||
message: this.$t('prompt.pchwbnwk'),
|
|
||||||
offset: 100
|
|
||||||
})
|
})
|
||||||
return false
|
console.log(j)
|
||||||
}
|
if (j === 2) {
|
||||||
console.log(this.personalForm)
|
this.$notify.error({
|
||||||
console.log(EnterDetail)
|
title: 'wrong',
|
||||||
if (EnterDetail.length === 0) {
|
message: this.$t('prompt.pchwbnwk'),
|
||||||
this.$notify.error({
|
offset: 100
|
||||||
title: 'wrong',
|
})
|
||||||
message: this.$t('prompt.mxbbnwk'),
|
this.saveloading = false
|
||||||
offset: 100
|
return false
|
||||||
|
}
|
||||||
|
console.log(this.personalForm)
|
||||||
|
console.log(EnterDetail)
|
||||||
|
if (EnterDetail.length === 0) {
|
||||||
|
this.$notify.error({
|
||||||
|
title: 'wrong',
|
||||||
|
message: this.$t('prompt.mxbbnwk'),
|
||||||
|
offset: 100
|
||||||
|
})
|
||||||
|
this.saveloading = false
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
EnterDetail.map(function(elem) {
|
||||||
|
return elem
|
||||||
|
}).forEach(function(elem) {
|
||||||
|
elem.totalMoney = elem.outQuantity * elem.outPrice
|
||||||
|
if (elem.locationId === null || elem.locationId === '' || elem.locationId === undefined) {
|
||||||
|
delete elem.locationId
|
||||||
|
}
|
||||||
|
if (elem.productCode === null || elem.productCode === '' || elem.productCode === undefined) {
|
||||||
|
delete elem.productCode
|
||||||
|
}
|
||||||
|
if (elem.batch === null || elem.batch === '' || elem.batch === undefined || elem.batch === '不使用') {
|
||||||
|
delete elem.batch
|
||||||
|
}
|
||||||
|
if (elem.productName === null || elem.productName === '' || elem.productName === undefined) {
|
||||||
|
delete elem.productName
|
||||||
|
}
|
||||||
|
if (elem.color === null || elem.color === '' || elem.color === undefined) {
|
||||||
|
delete elem.color
|
||||||
|
}
|
||||||
|
if (elem.typeId === null || elem.typeId === '' || elem.typeId === undefined) {
|
||||||
|
delete elem.typeId
|
||||||
|
}
|
||||||
|
if (elem.unit === null || elem.unit === '' || elem.unit === undefined) {
|
||||||
|
delete elem.unit
|
||||||
|
}
|
||||||
|
if (elem.outQuantity === null || elem.outQuantity === '' || elem.outQuantity === undefined) {
|
||||||
|
delete elem.outQuantity
|
||||||
|
}
|
||||||
|
if (elem.enterQuantity === null || elem.enterQuantity === '' || elem.enterQuantity === undefined) {
|
||||||
|
delete elem.enterQuantity
|
||||||
|
}
|
||||||
|
if (elem.outPrice === null || elem.outPrice === '' || elem.outPrice === undefined) {
|
||||||
|
delete elem.outPrice
|
||||||
|
}
|
||||||
|
if (elem.totalMoney === null || elem.totalMoney === '' || elem.totalMoney === undefined) {
|
||||||
|
delete elem.totalMoney
|
||||||
|
}
|
||||||
|
if (elem.remarks === null || elem.remarks === '' || elem.remarks === undefined) {
|
||||||
|
delete elem.remarks
|
||||||
|
}
|
||||||
|
return elem
|
||||||
})
|
})
|
||||||
return false
|
console.log('123', 123)
|
||||||
}
|
const parms = JSON.stringify(EnterDetail)
|
||||||
EnterDetail.map(function(elem) {
|
this.$refs.personalForm.validate((valid) => {
|
||||||
return elem
|
if (valid) {
|
||||||
}).forEach(function(elem) {
|
console.log('223', 223)
|
||||||
elem.totalMoney = elem.outQuantity * elem.outPrice
|
this.$refs.editable.validate().then(valid => {
|
||||||
if (elem.locationId === null || elem.locationId === '' || elem.locationId === undefined) {
|
if (valid) {
|
||||||
delete elem.locationId
|
console.log('223', 323)
|
||||||
}
|
console.log(this.personalForm, parms)
|
||||||
if (elem.productCode === null || elem.productCode === '' || elem.productCode === undefined) {
|
const Data = this.personalForm
|
||||||
delete elem.productCode
|
for (const key in Data) {
|
||||||
}
|
if (Data[key] === '' || Data[key] === undefined || Data[key] === null) {
|
||||||
if (elem.batch === null || elem.batch === '' || elem.batch === undefined || elem.batch === '不使用') {
|
delete Data[key]
|
||||||
delete elem.batch
|
}
|
||||||
}
|
|
||||||
if (elem.productName === null || elem.productName === '' || elem.productName === undefined) {
|
|
||||||
delete elem.productName
|
|
||||||
}
|
|
||||||
if (elem.color === null || elem.color === '' || elem.color === undefined) {
|
|
||||||
delete elem.color
|
|
||||||
}
|
|
||||||
if (elem.typeId === null || elem.typeId === '' || elem.typeId === undefined) {
|
|
||||||
delete elem.typeId
|
|
||||||
}
|
|
||||||
if (elem.unit === null || elem.unit === '' || elem.unit === undefined) {
|
|
||||||
delete elem.unit
|
|
||||||
}
|
|
||||||
if (elem.outQuantity === null || elem.outQuantity === '' || elem.outQuantity === undefined) {
|
|
||||||
delete elem.outQuantity
|
|
||||||
}
|
|
||||||
if (elem.enterQuantity === null || elem.enterQuantity === '' || elem.enterQuantity === undefined) {
|
|
||||||
delete elem.enterQuantity
|
|
||||||
}
|
|
||||||
if (elem.outPrice === null || elem.outPrice === '' || elem.outPrice === undefined) {
|
|
||||||
delete elem.outPrice
|
|
||||||
}
|
|
||||||
if (elem.totalMoney === null || elem.totalMoney === '' || elem.totalMoney === undefined) {
|
|
||||||
delete elem.totalMoney
|
|
||||||
}
|
|
||||||
if (elem.remarks === null || elem.remarks === '' || elem.remarks === undefined) {
|
|
||||||
delete elem.remarks
|
|
||||||
}
|
|
||||||
return elem
|
|
||||||
})
|
|
||||||
console.log('123', 123)
|
|
||||||
const parms = JSON.stringify(EnterDetail)
|
|
||||||
this.$refs.personalForm.validate((valid) => {
|
|
||||||
if (valid) {
|
|
||||||
console.log('223', 223)
|
|
||||||
this.$refs.editable.validate().then(valid => {
|
|
||||||
if (valid) {
|
|
||||||
console.log('223', 323)
|
|
||||||
console.log(this.personalForm, parms)
|
|
||||||
const Data = this.personalForm
|
|
||||||
for (const key in Data) {
|
|
||||||
if (Data[key] === '' || Data[key] === undefined || Data[key] === null) {
|
|
||||||
delete Data[key]
|
|
||||||
}
|
|
||||||
// if (key === 'judgeStat') {
|
// if (key === 'judgeStat') {
|
||||||
// delete Data[key]
|
// delete Data[key]
|
||||||
// }
|
// }
|
||||||
}
|
|
||||||
const parmss = JSON.stringify(Data)
|
|
||||||
addOutsourceOut(parmss, parms, this.personalForm).then(res => {
|
|
||||||
console.log(res)
|
|
||||||
if (res.data.ret === 200) {
|
|
||||||
this.$notify({
|
|
||||||
title: 'successful',
|
|
||||||
message: 'save successful',
|
|
||||||
type: 'success',
|
|
||||||
offset: 100
|
|
||||||
})
|
|
||||||
this.restAllForm()
|
|
||||||
this.$refs.editable.clear()
|
|
||||||
this.$refs.personalForm.clearValidate()
|
|
||||||
this.$refs.personalForm.resetFields()
|
|
||||||
} else {
|
|
||||||
this.$notify.error({
|
|
||||||
title: 'wrong',
|
|
||||||
message: res.data.msg,
|
|
||||||
offset: 100
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
const parmss = JSON.stringify(Data)
|
||||||
|
addOutsourceOut(parmss, parms, this.personalForm).then(res => {
|
||||||
|
console.log(res)
|
||||||
|
if (res.data.ret === 200) {
|
||||||
|
this.$notify({
|
||||||
|
title: 'successful',
|
||||||
|
message: 'save successful',
|
||||||
|
type: 'success',
|
||||||
|
offset: 100
|
||||||
|
})
|
||||||
|
this.restAllForm()
|
||||||
|
this.$refs.editable.clear()
|
||||||
|
this.$refs.personalForm.clearValidate()
|
||||||
|
this.$refs.personalForm.resetFields()
|
||||||
|
} else {
|
||||||
|
this.$notify.error({
|
||||||
|
title: 'wrong',
|
||||||
|
message: res.data.msg,
|
||||||
|
offset: 100
|
||||||
|
})
|
||||||
|
}
|
||||||
|
this.saveloading = false
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}).catch(valid => {
|
||||||
|
this.$notify.error({
|
||||||
|
title: 'wrong',
|
||||||
|
message: 'Information is incomplete1',
|
||||||
|
offset: 100
|
||||||
})
|
})
|
||||||
}
|
this.saveloading = false
|
||||||
}).catch(valid => {
|
return false
|
||||||
|
})
|
||||||
|
} else {
|
||||||
this.$notify.error({
|
this.$notify.error({
|
||||||
title: 'wrong',
|
title: 'wrong',
|
||||||
message: 'Information is incomplete1',
|
message: 'Information is incomplete2',
|
||||||
offset: 100
|
offset: 100
|
||||||
})
|
})
|
||||||
|
this.saveloading = false
|
||||||
return false
|
return false
|
||||||
})
|
}
|
||||||
} else {
|
})
|
||||||
this.$notify.error({
|
}, 1000 * 0.5)
|
||||||
title: 'wrong',
|
|
||||||
message: 'Information is incomplete2',
|
|
||||||
offset: 100
|
|
||||||
})
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
})
|
|
||||||
},
|
},
|
||||||
// 取消操作
|
// 取消操作
|
||||||
handlecancel() {
|
handlecancel() {
|
||||||
|
|
|
@ -221,7 +221,7 @@ export default {
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
|
|
@ -183,7 +183,7 @@
|
||||||
</el-card>
|
</el-card>
|
||||||
<!--操作-->
|
<!--操作-->
|
||||||
<div class="buttons" style="position:fixed;bottom: 0;width: 100%;height: 40px; background: #fff;z-index: 99">
|
<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>
|
<el-button :loading="saveloading" type="primary" style="background:#3696fd;border-color:#3696fd;width: 98px" @click="handlesave()">{{ $t('Hmodule.baoc') }}</el-button>
|
||||||
<el-button type="danger" @click="handlecancel()">{{ $t('Hmodule.cancel') }}</el-button>
|
<el-button type="danger" @click="handlecancel()">{{ $t('Hmodule.cancel') }}</el-button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -211,6 +211,7 @@ export default {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
|
saveloading: false,
|
||||||
list3: [],
|
list3: [],
|
||||||
// 合计
|
// 合计
|
||||||
heji: 0,
|
heji: 0,
|
||||||
|
@ -472,102 +473,110 @@ export default {
|
||||||
},
|
},
|
||||||
// 保存操作
|
// 保存操作
|
||||||
handlesave() {
|
handlesave() {
|
||||||
// 加工后明细
|
this.saveloading = true
|
||||||
const EnterDetail = this.$refs.editable.getRecords()
|
|
||||||
// 原材料明细
|
setTimeout(() => {
|
||||||
const EnterDetail2 = this.$refs.editable2.getRecords()
|
// 加工后明细
|
||||||
if (EnterDetail2.length === 0) {
|
const EnterDetail = this.$refs.editable.getRecords()
|
||||||
this.$notify.error({
|
// 原材料明细
|
||||||
title: 'wrong',
|
const EnterDetail2 = this.$refs.editable2.getRecords()
|
||||||
message: this.$t('prompt.nonedetail'),
|
if (EnterDetail2.length === 0) {
|
||||||
offset: 100
|
|
||||||
})
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if (EnterDetail.length === 0) {
|
|
||||||
this.$notify.error({
|
|
||||||
title: 'wrong',
|
|
||||||
message: this.$t('prompt.mxbbnwk'),
|
|
||||||
offset: 100
|
|
||||||
})
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
EnterDetail.map(function(elem) {
|
|
||||||
return elem
|
|
||||||
}).forEach(function(elem) {
|
|
||||||
elem.reportCheckingQuantity = 0
|
|
||||||
elem.actualCheckingQuantity = 0
|
|
||||||
elem.qualifyQuantity = 0
|
|
||||||
elem.unqualifyQuantity = 0
|
|
||||||
if (elem.productCode === null || elem.productCode === '' || elem.productCode === undefined) {
|
|
||||||
delete elem.productCode
|
|
||||||
}
|
|
||||||
if (elem.productName === null || elem.productName === '' || elem.productName === undefined) {
|
|
||||||
delete elem.productName
|
|
||||||
}
|
|
||||||
if (elem.type === null || elem.type === '' || elem.type === undefined) {
|
|
||||||
delete elem.type
|
|
||||||
}
|
|
||||||
if (elem.unit === null || elem.unit === '' || elem.unit === undefined) {
|
|
||||||
delete elem.unit
|
|
||||||
}
|
|
||||||
if (elem.quantity === null || elem.quantity === '' || elem.quantity === undefined) {
|
|
||||||
delete elem.quantity
|
|
||||||
}
|
|
||||||
if (elem.money === null || elem.money === '' || elem.money === undefined) {
|
|
||||||
delete elem.money
|
|
||||||
}
|
|
||||||
if (elem.totalMoney === null || elem.totalMoney === '' || elem.totalMoney === undefined) {
|
|
||||||
delete elem.totalMoney
|
|
||||||
}
|
|
||||||
return elem
|
|
||||||
})
|
|
||||||
// 加工后明细
|
|
||||||
const parms2 = JSON.stringify(EnterDetail)
|
|
||||||
// 原材料明细
|
|
||||||
const parms3 = JSON.stringify(EnterDetail2)
|
|
||||||
const Data = this.personalForm
|
|
||||||
for (const key in Data) {
|
|
||||||
if (Data[key] === '' || Data[key] === undefined || Data[key] === null) {
|
|
||||||
delete Data[key]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const parms = JSON.stringify(Data)
|
|
||||||
this.$refs.personalForm.validate((valid) => {
|
|
||||||
if (valid) {
|
|
||||||
createoutFactory(parms, parms3, parms2, this.personalForm).then(res => {
|
|
||||||
console.log(res)
|
|
||||||
if (res.data.ret === 200) {
|
|
||||||
this.$notify({
|
|
||||||
title: 'successful',
|
|
||||||
message: 'save successful',
|
|
||||||
type: 'success',
|
|
||||||
offset: 100
|
|
||||||
})
|
|
||||||
this.restAllForm()
|
|
||||||
this.$refs.editable.clear()
|
|
||||||
this.$refs.editable2.clear()
|
|
||||||
this.$refs.personalForm.clearValidate()
|
|
||||||
this.$refs.personalForm.resetFields()
|
|
||||||
this.$refs.personalForm2.clearValidate()
|
|
||||||
this.$refs.personalForm2.resetFields()
|
|
||||||
} else {
|
|
||||||
this.$notify.error({
|
|
||||||
title: 'wrong',
|
|
||||||
message: res.data.msg,
|
|
||||||
offset: 100
|
|
||||||
})
|
|
||||||
}
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
this.$notify.error({
|
this.$notify.error({
|
||||||
title: 'wrong',
|
title: 'wrong',
|
||||||
message: 'Information is incomplete',
|
message: this.$t('prompt.nonedetail'),
|
||||||
offset: 100
|
offset: 100
|
||||||
})
|
})
|
||||||
|
this.saveloading = false
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
})
|
if (EnterDetail.length === 0) {
|
||||||
|
this.$notify.error({
|
||||||
|
title: 'wrong',
|
||||||
|
message: this.$t('prompt.mxbbnwk'),
|
||||||
|
offset: 100
|
||||||
|
})
|
||||||
|
this.saveloading = false
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
EnterDetail.map(function(elem) {
|
||||||
|
return elem
|
||||||
|
}).forEach(function(elem) {
|
||||||
|
elem.reportCheckingQuantity = 0
|
||||||
|
elem.actualCheckingQuantity = 0
|
||||||
|
elem.qualifyQuantity = 0
|
||||||
|
elem.unqualifyQuantity = 0
|
||||||
|
if (elem.productCode === null || elem.productCode === '' || elem.productCode === undefined) {
|
||||||
|
delete elem.productCode
|
||||||
|
}
|
||||||
|
if (elem.productName === null || elem.productName === '' || elem.productName === undefined) {
|
||||||
|
delete elem.productName
|
||||||
|
}
|
||||||
|
if (elem.type === null || elem.type === '' || elem.type === undefined) {
|
||||||
|
delete elem.type
|
||||||
|
}
|
||||||
|
if (elem.unit === null || elem.unit === '' || elem.unit === undefined) {
|
||||||
|
delete elem.unit
|
||||||
|
}
|
||||||
|
if (elem.quantity === null || elem.quantity === '' || elem.quantity === undefined) {
|
||||||
|
delete elem.quantity
|
||||||
|
}
|
||||||
|
if (elem.money === null || elem.money === '' || elem.money === undefined) {
|
||||||
|
delete elem.money
|
||||||
|
}
|
||||||
|
if (elem.totalMoney === null || elem.totalMoney === '' || elem.totalMoney === undefined) {
|
||||||
|
delete elem.totalMoney
|
||||||
|
}
|
||||||
|
return elem
|
||||||
|
})
|
||||||
|
// 加工后明细
|
||||||
|
const parms2 = JSON.stringify(EnterDetail)
|
||||||
|
// 原材料明细
|
||||||
|
const parms3 = JSON.stringify(EnterDetail2)
|
||||||
|
const Data = this.personalForm
|
||||||
|
for (const key in Data) {
|
||||||
|
if (Data[key] === '' || Data[key] === undefined || Data[key] === null) {
|
||||||
|
delete Data[key]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const parms = JSON.stringify(Data)
|
||||||
|
this.$refs.personalForm.validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
createoutFactory(parms, parms3, parms2, this.personalForm).then(res => {
|
||||||
|
console.log(res)
|
||||||
|
if (res.data.ret === 200) {
|
||||||
|
this.$notify({
|
||||||
|
title: 'successful',
|
||||||
|
message: 'save successful',
|
||||||
|
type: 'success',
|
||||||
|
offset: 100
|
||||||
|
})
|
||||||
|
this.restAllForm()
|
||||||
|
this.$refs.editable.clear()
|
||||||
|
this.$refs.editable2.clear()
|
||||||
|
this.$refs.personalForm.clearValidate()
|
||||||
|
this.$refs.personalForm.resetFields()
|
||||||
|
this.$refs.personalForm2.clearValidate()
|
||||||
|
this.$refs.personalForm2.resetFields()
|
||||||
|
} else {
|
||||||
|
this.$notify.error({
|
||||||
|
title: 'wrong',
|
||||||
|
message: res.data.msg,
|
||||||
|
offset: 100
|
||||||
|
})
|
||||||
|
}
|
||||||
|
this.saveloading = false
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
this.$notify.error({
|
||||||
|
title: 'wrong',
|
||||||
|
message: 'Information is incomplete',
|
||||||
|
offset: 100
|
||||||
|
})
|
||||||
|
this.saveloading = false
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}, 1000 * 0.5)
|
||||||
},
|
},
|
||||||
// 取消操作
|
// 取消操作
|
||||||
handlecancel() {
|
handlecancel() {
|
||||||
|
|
|
@ -155,7 +155,7 @@ export default {
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
|
|
@ -89,8 +89,8 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<el-form-item :label="$t('Product.color')" :rules="Iscategoryid === '08' || Iscategoryid === '04' || Iscategoryid === '03' || Iscategoryid === '' ? personalrules.colorId:[{ required: true, message: '请选择颜色', trigger: 'change' }]" prop="colorId" style="margin-left: 18px;width: 100%;margin-bottom: 0">
|
<el-form-item :label="$t('Product.color')" :rules=" Iscategoryid === '04' || Iscategoryid === '03' || Iscategoryid === '' ? personalrules.colorId:[{ required: true, message: '请选择颜色', trigger: 'change' }]" prop="colorId" style="margin-left: 18px;width: 100%;margin-bottom: 0">
|
||||||
<el-select ref="clear4" v-model="colorId" :disabled="Iscategoryid === '08' || Iscategoryid === '04' || Iscategoryid === '03' || Iscategoryid === ''" value-key="id" placeholder="请选择颜色" style="width: 200px" @change="color($event)" @focus="updatecate">
|
<el-select ref="clear4" v-model="colorId" :disabled=" Iscategoryid === '04' || Iscategoryid === '03' || Iscategoryid === ''" value-key="id" placeholder="请选择颜色" style="width: 200px" @change="color($event)" @focus="updatecate">
|
||||||
<el-option v-show="false" label="" value=""/>
|
<el-option v-show="false" label="" value=""/>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="(item, index) in colors"
|
v-for="(item, index) in colors"
|
||||||
|
@ -105,8 +105,8 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<el-form-item :label="$t('Product.diameterId')" :rules="Iscategoryid === '04' || Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '' || Iscategoryid === '05' || Iscategoryid === '06' || Iscategoryid === '07'? personalrules.diameterId:[{ required: true, message: '请选择直径规格', trigger: 'change' }]" prop="diameterId" style="margin-left: 18px;width: 100%;margin-bottom: 0">
|
<el-form-item :label="$t('Product.diameterId')" :rules="Iscategoryid === '08' || Iscategoryid === '04' || Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '' || Iscategoryid === '05' || Iscategoryid === '06' || Iscategoryid === '07'? personalrules.diameterId:[{ required: true, message: '请选择直径规格', trigger: 'change' }]" prop="diameterId" style="margin-left: 18px;width: 100%;margin-bottom: 0">
|
||||||
<el-select ref="clear5" v-model="diameterId" :disabled=" Iscategoryid === '04' || Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '' || Iscategoryid === '05' || Iscategoryid === '06' || Iscategoryid === '07'" value-key="id" placeholder="请选择直径规格" style="width: 200px" @change="diameter($event)" @focus="updatecate">
|
<el-select ref="clear5" v-model="diameterId" :disabled="Iscategoryid === '08' || Iscategoryid === '04' || Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '' || Iscategoryid === '05' || Iscategoryid === '06' || Iscategoryid === '07'" value-key="id" placeholder="请选择直径规格" style="width: 200px" @change="diameter($event)" @focus="updatecate">
|
||||||
<el-option v-show="false" label="" value=""/>
|
<el-option v-show="false" label="" value=""/>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="(item, index) in diameters"
|
v-for="(item, index) in diameters"
|
||||||
|
|
|
@ -268,7 +268,7 @@ export default {
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
|
|
@ -272,7 +272,7 @@ export default {
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,6 +56,16 @@
|
||||||
<el-input v-model="personalForm.diffMoney" disabled style="width: 200px" clearable/>
|
<el-input v-model="personalForm.diffMoney" disabled style="width: 200px" clearable/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
<el-col :span="6">
|
||||||
|
<el-form-item :label="$t('update4.actialdiffermoney')" prop="shouldMoney" style="margin-left: 18px;width: 100%;margin-bottom: 0">
|
||||||
|
<el-input-number v-model="personalForm.shouldMoney" :controls="false" :step="0.1" style="width: 200px"/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="6">
|
||||||
|
<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" @blur="judgeinvoce"/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<el-form-item :label="$t('ReturnExchange.applyNumber')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
|
<el-form-item :label="$t('ReturnExchange.applyNumber')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
|
||||||
<el-input v-model="personalForm.applyNumber" style="width: 200px" disabled clearable/>
|
<el-input v-model="personalForm.applyNumber" style="width: 200px" disabled clearable/>
|
||||||
|
@ -262,6 +272,8 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import { createsaleOut, getCustomerOutCount, checkInvoiceExist } from '@/api/SaleOut'
|
||||||
|
|
||||||
import '@/directive/noMoreClick/index.js'
|
import '@/directive/noMoreClick/index.js'
|
||||||
import { addReturnExchange } from '@/api/ReturnExchange'
|
import { addReturnExchange } from '@/api/ReturnExchange'
|
||||||
import { getdeptlist } from '@/api/EmployeeInformation'
|
import { getdeptlist } from '@/api/EmployeeInformation'
|
||||||
|
@ -319,7 +331,7 @@ export default {
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
@ -368,6 +380,9 @@ export default {
|
||||||
},
|
},
|
||||||
// 配送单规则数据
|
// 配送单规则数据
|
||||||
personalrules: {
|
personalrules: {
|
||||||
|
shouldMoney: [
|
||||||
|
{ required: true, message: 'please input actialdiffermoney:', trigger: 'blur' }
|
||||||
|
],
|
||||||
title: [
|
title: [
|
||||||
{ required: true, message: 'please input title', trigger: 'blur' }
|
{ required: true, message: 'please input title', trigger: 'blur' }
|
||||||
],
|
],
|
||||||
|
@ -457,6 +472,25 @@ export default {
|
||||||
_that = this
|
_that = this
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
judgeinvoce() {
|
||||||
|
console.log('this.$store.getters.countryId', this.$store.getters.countryId)
|
||||||
|
console.log('this.personalForm.invoiceNumber', this.personalForm.invoiceNumber)
|
||||||
|
if (!this.personalForm.invoiceNumber) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
checkInvoiceExist(this.personalForm.invoiceNumber, this.personalForm.repositoryId).then(res => {
|
||||||
|
if (res.data.ret === 200) {
|
||||||
|
if (res.data.data.content === true) {
|
||||||
|
this.$notify.error({
|
||||||
|
title: 'wrong',
|
||||||
|
message: this.$t('update4.fphcf'),
|
||||||
|
offset: 100
|
||||||
|
})
|
||||||
|
this.personalForm.invoiceNumber = null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
// 判断整车或者电池
|
// 判断整车或者电池
|
||||||
isEdit4(row) {
|
isEdit4(row) {
|
||||||
console.log('222', row)
|
console.log('222', row)
|
||||||
|
|
|
@ -576,7 +576,7 @@ export default {
|
||||||
pickerOptions3: {
|
pickerOptions3: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
|
|
@ -734,7 +734,7 @@ export default {
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
@ -2133,7 +2133,7 @@ export default {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
if (row.taxprice !== 0 && row.quantity !== 0 && row.discountMoney !== 0 && row.includeTaxCostMoney !== 0) {
|
if (row.taxprice !== 0 && row.quantity !== 0 && row.discountMoney !== 0 && row.includeTaxCostMoney !== 0) {
|
||||||
row.discountRate = (((isoverdiscount / row.includeTaxCostMoney)) * 100).toFixed(6)
|
row.discountRate = (((val / row.includeTaxCostMoney)) * 100).toFixed(6)
|
||||||
} else {
|
} else {
|
||||||
row.discountMoney = 0
|
row.discountMoney = 0
|
||||||
row.discountRate = 0
|
row.discountRate = 0
|
||||||
|
|
|
@ -229,7 +229,6 @@
|
||||||
:precision="6"
|
:precision="6"
|
||||||
:controls="false"
|
:controls="false"
|
||||||
:min="0"
|
:min="0"
|
||||||
:disabled="personalForm.isAppService === 1"
|
|
||||||
v-model="scope.row.discountMoney"
|
v-model="scope.row.discountMoney"
|
||||||
@change="getdiscountMoney(scope.row, $event, scope)"
|
@change="getdiscountMoney(scope.row, $event, scope)"
|
||||||
@input="notundefined(scope.row)"/>
|
@input="notundefined(scope.row)"/>
|
||||||
|
@ -653,7 +652,7 @@ export default {
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
@ -2169,9 +2168,12 @@ export default {
|
||||||
offset: 100
|
offset: 100
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
if (row.taxprice !== 0 && row.quantity !== 0 && row.discountMoney !== 0 && row.includeTaxCostMoney !== 0) {
|
||||||
if (row.taxprice !== 0 && row.quantity !== 0 && row.discountMoney !== 0) {
|
row.discountRate = (((isoverdiscount / row.includeTaxCostMoney)) * 100).toFixed(6)
|
||||||
row.discountRate = (((row.discountMoney / row.includeTaxCostMoney)) * 100).toFixed(6)
|
} else {
|
||||||
|
row.discountMoney = 0
|
||||||
|
row.discountRate = 0
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -2204,8 +2206,11 @@ export default {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (row.taxprice !== 0 && row.quantity !== 0 && row.discountMoney !== 0) {
|
if (row.taxprice !== 0 && row.quantity !== 0 && row.discountMoney !== 0 && row.includeTaxCostMoney !== 0) {
|
||||||
row.discountRate = (((row.discountMoney / row.includeTaxCostMoney)) * 100).toFixed(6)
|
row.discountRate = (((val / row.includeTaxCostMoney)) * 100).toFixed(6)
|
||||||
|
} else {
|
||||||
|
row.discountMoney = 0
|
||||||
|
row.discountRate = 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
@ -37,6 +37,21 @@
|
||||||
<my-repository :repositorycontrol.sync="repositorycontrol" @repositoryname="repositoryname"/>
|
<my-repository :repositorycontrol.sync="repositorycontrol" @repositoryname="repositoryname"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
<el-col v-show="ischina === 2" :span="6" style="height: 57px">
|
||||||
|
<el-form-item :label="$t('update4.isAppService')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
|
||||||
|
<el-radio-group v-model="personalForm.isAppService" style="width: 200px" @change="changeAppDiscount">
|
||||||
|
<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 v-show="ischina === 2" :span="6" style="height: 57px">
|
||||||
|
<el-form-item :label="$t('update4.appDiscount')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
|
||||||
|
<span style="margin-left: 20px;">
|
||||||
|
{{ personalForm.appDiscount }}
|
||||||
|
</span>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<el-form-item :label="$t('SaleOut.pointSupport')" prop="pointSupport" style="margin-left: 18px;width: 100%;margin-bottom: 0">
|
<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-input v-model="personalForm.pointSupport" :disabled="personalForm.customerType === '1'" style="width: 200px"/>
|
||||||
|
@ -89,7 +104,7 @@
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<el-form-item :label="$t('update4.customerPay')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
|
<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-input-number v-model="personalForm.customerPay" :controls="false" :step="0.1" :min="0" style="width: 200px" @change="updatePrice()" @blur="updatePrice()"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6" style="height: 57px">
|
<el-col :span="6" style="height: 57px">
|
||||||
|
@ -155,6 +170,7 @@
|
||||||
style="width: 200px"/>
|
style="width: 200px"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
|
@ -589,11 +605,12 @@ export default {
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
ischina: this.$store.getters.countryId,
|
||||||
isbendi: null,
|
isbendi: null,
|
||||||
projectmoney: 0,
|
projectmoney: 0,
|
||||||
control3: false,
|
control3: false,
|
||||||
|
@ -728,7 +745,9 @@ export default {
|
||||||
couponMoney: 0,
|
couponMoney: 0,
|
||||||
couponSupportOld: 0,
|
couponSupportOld: 0,
|
||||||
isFree: 2,
|
isFree: 2,
|
||||||
useMonth: null
|
useMonth: null,
|
||||||
|
isAppService: 2,
|
||||||
|
appDiscount: 0
|
||||||
},
|
},
|
||||||
// 销售订单规则数据
|
// 销售订单规则数据
|
||||||
personalrules: {
|
personalrules: {
|
||||||
|
@ -905,6 +924,10 @@ export default {
|
||||||
_that = this
|
_that = this
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
changeAppDiscount() {
|
||||||
|
this.updatePrice()
|
||||||
|
this.getReceivableMoney()
|
||||||
|
},
|
||||||
uniqueArray3(array, key) {
|
uniqueArray3(array, key) {
|
||||||
var result = [array[0]]
|
var result = [array[0]]
|
||||||
for (var i = 1; i < array.length; i++) {
|
for (var i = 1; i < array.length; i++) {
|
||||||
|
@ -1479,27 +1502,76 @@ export default {
|
||||||
console.log('filterfinally', filterfinally)
|
console.log('filterfinally', filterfinally)
|
||||||
console.log('this.projectmoney', this.projectmoney)
|
console.log('this.projectmoney', this.projectmoney)
|
||||||
|
|
||||||
// this.diffpricelist
|
switch (this.personalForm.isAppService) {
|
||||||
if (filterfinally.length !== 0) {
|
case 1:
|
||||||
console.log('this.projectmoney', this.projectmoney)
|
|
||||||
|
|
||||||
let needmoney = (Number(filterfinally[0].diffMoney) * Number(allbattery[0].quantity) - 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) + Number(this.projectmoney)
|
if (filterfinally.length !== 0) {
|
||||||
const needmoney2 = (Number(filterfinally[0].diffMoney) * Number(allbattery[0].quantity) - Number(this.personalForm.pointSupport) - Number(this.personalForm.ridMoney) - Number(this.personalForm.ridBikeMoney) - Number(this.personalForm.advanceMoney) - Number(this.personalForm.couponSupportOld)) + Number(this.personalForm.otherMoney) + Number(this.projectmoney)
|
console.log('this.projectmoney', this.projectmoney)
|
||||||
if (needmoney < 0) {
|
|
||||||
needmoney = 0
|
|
||||||
}
|
|
||||||
// this.$set(this.personalForm, 'receivableMoney', needmoney)
|
|
||||||
this.$set(this.personalForm, 'shouldMoney', needmoney)
|
|
||||||
|
|
||||||
// 未减去优惠券额的金额
|
let testneedmoney = (Number(filterfinally[0].diffMoney) * Number(allbattery[0].quantity) - 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) + Number(this.projectmoney)
|
||||||
this.$set(this.personalForm, 'receivableMoney2', needmoney2)
|
const testneedmoney2 = (Number(filterfinally[0].diffMoney) * Number(allbattery[0].quantity) - Number(this.personalForm.pointSupport) - Number(this.personalForm.ridMoney) - Number(this.personalForm.ridBikeMoney) - Number(this.personalForm.advanceMoney) - Number(this.personalForm.couponSupportOld)) + Number(this.personalForm.otherMoney) + Number(this.projectmoney)
|
||||||
} else {
|
if (testneedmoney < 0) {
|
||||||
// this.$set(this.personalForm, 'receivableMoney', 0)
|
testneedmoney = 0
|
||||||
this.$set(this.personalForm, 'shouldMoney', 0)
|
}
|
||||||
|
|
||||||
// 未减去优惠券额的金额
|
const appdiscount = Math.ceil(Number(testneedmoney) / 500) * 10
|
||||||
this.$set(this.personalForm, 'receivableMoney2', 0)
|
const appdiscount2 = Math.ceil(Number(testneedmoney2) / 500) * 10
|
||||||
|
|
||||||
|
const needmoney = Number(testneedmoney) - Number(appdiscount)
|
||||||
|
const needmoney2 = Number(testneedmoney2) - Number(appdiscount)
|
||||||
|
this.$set(this.personalForm, 'appDiscount', appdiscount)
|
||||||
|
// this.$set(this.personalForm, 'receivableMoney', needmoney)
|
||||||
|
this.$set(this.personalForm, 'shouldMoney', needmoney)
|
||||||
|
|
||||||
|
// 未减去优惠券额的金额
|
||||||
|
this.$set(this.personalForm, 'receivableMoney2', needmoney2)
|
||||||
|
} else {
|
||||||
|
this.$set(this.personalForm, 'appDiscount', 0)
|
||||||
|
// this.$set(this.personalForm, 'receivableMoney', 0)
|
||||||
|
this.$set(this.personalForm, 'shouldMoney', 0)
|
||||||
|
|
||||||
|
// 未减去优惠券额的金额
|
||||||
|
this.$set(this.personalForm, 'receivableMoney2', 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
break
|
||||||
|
case 2:
|
||||||
|
if (filterfinally.length !== 0) {
|
||||||
|
console.log('this.projectmoney', this.projectmoney)
|
||||||
|
|
||||||
|
let needmoney = (Number(filterfinally[0].diffMoney) * Number(allbattery[0].quantity) - 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) + Number(this.projectmoney)
|
||||||
|
const needmoney2 = (Number(filterfinally[0].diffMoney) * Number(allbattery[0].quantity) - Number(this.personalForm.pointSupport) - Number(this.personalForm.ridMoney) - Number(this.personalForm.ridBikeMoney) - Number(this.personalForm.advanceMoney) - Number(this.personalForm.couponSupportOld)) + Number(this.personalForm.otherMoney) + Number(this.projectmoney)
|
||||||
|
if (needmoney < 0) {
|
||||||
|
needmoney = 0
|
||||||
|
}
|
||||||
|
this.$set(this.personalForm, 'appDiscount', 0)
|
||||||
|
// this.$set(this.personalForm, 'receivableMoney', needmoney)
|
||||||
|
this.$set(this.personalForm, 'shouldMoney', needmoney)
|
||||||
|
|
||||||
|
// 未减去优惠券额的金额
|
||||||
|
this.$set(this.personalForm, 'receivableMoney2', needmoney2)
|
||||||
|
} else {
|
||||||
|
this.$set(this.personalForm, 'appDiscount', 0)
|
||||||
|
// this.$set(this.personalForm, 'receivableMoney', 0)
|
||||||
|
this.$set(this.personalForm, 'shouldMoney', 0)
|
||||||
|
|
||||||
|
// 未减去优惠券额的金额
|
||||||
|
this.$set(this.personalForm, 'receivableMoney2', 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
break
|
||||||
|
|
||||||
|
default:
|
||||||
|
this.$set(this.personalForm, 'appDiscount', 0)
|
||||||
|
// this.$set(this.personalForm, 'receivableMoney', 0)
|
||||||
|
this.$set(this.personalForm, 'shouldMoney', 0)
|
||||||
|
|
||||||
|
// 未减去优惠券额的金额
|
||||||
|
this.$set(this.personalForm, 'receivableMoney2', 0)
|
||||||
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// this.diffpricelist
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
isEdit5(row) {
|
isEdit5(row) {
|
||||||
|
@ -2127,9 +2199,12 @@ export default {
|
||||||
offset: 100
|
offset: 100
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
if (row.taxprice !== 0 && row.quantity !== 0 && row.discountMoney !== 0 && row.includeTaxCostMoney !== 0) {
|
||||||
if (row.taxprice !== 0 && row.quantity !== 0 && row.discountMoney !== 0) {
|
row.discountRate = (((isoverdiscount / row.includeTaxCostMoney)) * 100).toFixed(6)
|
||||||
row.discountRate = (((row.discountMoney / row.includeTaxCostMoney)) * 100).toFixed(6)
|
} else {
|
||||||
|
row.discountMoney = 0
|
||||||
|
row.discountRate = 0
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -2164,8 +2239,11 @@ export default {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (row.taxprice !== 0 && row.quantity !== 0 && row.discountMoney !== 0) {
|
if (row.taxprice !== 0 && row.quantity !== 0 && row.discountMoney !== 0 && row.includeTaxCostMoney !== 0) {
|
||||||
row.discountRate = (((row.discountMoney / row.includeTaxCostMoney)) * 100).toFixed(6)
|
row.discountRate = (((val / row.includeTaxCostMoney)) * 100).toFixed(6)
|
||||||
|
} else {
|
||||||
|
row.discountMoney = 0
|
||||||
|
row.discountRate = 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
@ -719,7 +719,7 @@ export default {
|
||||||
if (row.discountRate === 1) {
|
if (row.discountRate === 1) {
|
||||||
return 100
|
return 100
|
||||||
} else {
|
} else {
|
||||||
return row.discountRate
|
return row.discountRate * 100
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 计划金额
|
// 计划金额
|
||||||
|
|
|
@ -779,7 +779,7 @@ export default {
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
|
|
@ -773,7 +773,7 @@ export default {
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
|
|
@ -727,7 +727,7 @@ export default {
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
|
|
@ -374,7 +374,7 @@ export default {
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
<el-form-item :label="$t('StockArrival.sourceType')" prop="sourceType" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
|
<el-form-item :label="$t('StockArrival.sourceType')" prop="sourceType" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
|
||||||
<el-select v-model="personalForm.sourceType" size="mini" style="margin-left: 18px;width: 200px" @change="chooseType">
|
<el-select v-model="personalForm.sourceType" size="mini" style="margin-left: 18px;width: 200px" @change="chooseType">
|
||||||
<el-option value="1" label="采购订单" />
|
<el-option value="1" label="采购订单" />
|
||||||
<el-option value="2" label="无来源" />
|
<!-- <el-option value="2" label="无来源" /> -->
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
|
@ -178,9 +178,9 @@
|
||||||
<el-button v-permission="['104-116-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
|
<el-button v-permission="['104-116-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
|
||||||
<el-button v-permission="['104-116-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
|
<el-button v-permission="['104-116-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
|
||||||
<el-button v-permission2="['104-116-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
|
<el-button v-permission2="['104-116-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
|
||||||
<el-button v-permission="['104-116-45']" v-show="scope.row.judgeStat === 2" size="mini" type="primary" style="width: 107px" @click="handleMyReceipt1(scope.row)"><span style="margin-left: -15px;">生成采购入库单</span></el-button>
|
<!-- <el-button v-permission="['104-116-45']" v-show="scope.row.judgeStat === 2" size="mini" type="primary" style="width: 107px" @click="handleMyReceipt1(scope.row)"><span style="margin-left: -15px;">生成采购入库单</span></el-button>
|
||||||
<el-button v-permission="['104-116-46']" v-show="scope.row.judgeStat === 2" size="mini" type="primary" style="width: 107px" @click="handleMyReceipt2(scope.row)"><span style="margin-left: -15px;">生成质检报告单</span></el-button>
|
<el-button v-permission="['104-116-46']" v-show="scope.row.judgeStat === 2" size="mini" type="primary" style="width: 107px" @click="handleMyReceipt2(scope.row)"><span style="margin-left: -15px;">生成质检报告单</span></el-button>
|
||||||
<el-button v-permission="['104-116-47']" v-show="scope.row.judgeStat === 2" size="mini" type="primary" style="width: 107px" @click="handleMyReceipt3(scope.row)"><span style="margin-left: -15px;">生成采购退货单</span></el-button>
|
<el-button v-permission="['104-116-47']" v-show="scope.row.judgeStat === 2" size="mini" type="primary" style="width: 107px" @click="handleMyReceipt3(scope.row)"><span style="margin-left: -15px;">生成采购退货单</span></el-button> -->
|
||||||
<el-button :title="$t('updates.jc')" size="mini" type="primary" icon="el-icon-sort" circle @click="handleReceipt(scope.row)"/>
|
<el-button :title="$t('updates.jc')" size="mini" type="primary" icon="el-icon-sort" circle @click="handleReceipt(scope.row)"/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
<el-form-item :label="$t('StockArrival.sourceType')" prop="sourceType" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
|
<el-form-item :label="$t('StockArrival.sourceType')" prop="sourceType" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
|
||||||
<el-select v-model="personalForm.sourceType" size="mini" style="margin-left: 18px;width: 200px" @change="chooseType">
|
<el-select v-model="personalForm.sourceType" size="mini" style="margin-left: 18px;width: 200px" @change="chooseType">
|
||||||
<el-option value="1" label="采购订单" />
|
<el-option value="1" label="采购订单" />
|
||||||
<el-option value="2" label="无来源" />
|
<!-- <el-option value="2" label="无来源" /> -->
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
|
@ -401,7 +401,7 @@ export default {
|
||||||
inquiryTimes: 1,
|
inquiryTimes: 1,
|
||||||
inquiryDate: null,
|
inquiryDate: null,
|
||||||
sourceType: '3',
|
sourceType: '3',
|
||||||
currency: '1',
|
currency: '3',
|
||||||
exchangeRate: '1.0000'
|
exchangeRate: '1.0000'
|
||||||
},
|
},
|
||||||
// 采购申请单规则数据
|
// 采购申请单规则数据
|
||||||
|
|
|
@ -351,7 +351,7 @@ export default {
|
||||||
},
|
},
|
||||||
// 计算税额
|
// 计算税额
|
||||||
getTaxMoney2(row) {
|
getTaxMoney2(row) {
|
||||||
row.tax = Number(row.includeTaxMoney) - Number(row.money)
|
row.tax = (Number(row.includeTaxMoney) - Number(row.money)).toFixed(6)
|
||||||
|
|
||||||
return row.tax
|
return row.tax
|
||||||
},
|
},
|
||||||
|
|
|
@ -725,7 +725,7 @@ export default {
|
||||||
// } else {
|
// } else {
|
||||||
// row.tax = 0
|
// row.tax = 0
|
||||||
// }
|
// }
|
||||||
row.tax = Number(row.includeTaxMoney) - Number(row.money)
|
row.tax = (Number(row.includeTaxMoney) - Number(row.money)).toFixed(6)
|
||||||
|
|
||||||
return row.tax
|
return row.tax
|
||||||
},
|
},
|
||||||
|
|
|
@ -508,7 +508,7 @@ export default {
|
||||||
regionId: this.$store.getters.regionId,
|
regionId: this.$store.getters.regionId,
|
||||||
isVat: 1,
|
isVat: 1,
|
||||||
sourceType: '5',
|
sourceType: '5',
|
||||||
currency: '1',
|
currency: '3',
|
||||||
orderDate: null,
|
orderDate: null,
|
||||||
deptId: this.$store.getters.deptId,
|
deptId: this.$store.getters.deptId,
|
||||||
exchangeRate: '1.0000'
|
exchangeRate: '1.0000'
|
||||||
|
|
|
@ -899,6 +899,7 @@ export default {
|
||||||
this.personalForm.settleMode = val.settleMode
|
this.personalForm.settleMode = val.settleMode
|
||||||
this.personalForm.transportModeId = val.transportId
|
this.personalForm.transportModeId = val.transportId
|
||||||
this.personalForm.isVat = val.isVat
|
this.personalForm.isVat = val.isVat
|
||||||
|
this.$refs.editable.clear()
|
||||||
},
|
},
|
||||||
// 收货人返回数据
|
// 收货人返回数据
|
||||||
supplierName2(val) {
|
supplierName2(val) {
|
||||||
|
|
|
@ -710,6 +710,7 @@ export default {
|
||||||
this.personalForm.payMode = val.payMode
|
this.personalForm.payMode = val.payMode
|
||||||
this.personalForm.deliveryModeId = val.deliveryMode
|
this.personalForm.deliveryModeId = val.deliveryMode
|
||||||
this.personalForm.isVat = val.isVat
|
this.personalForm.isVat = val.isVat
|
||||||
|
this.$refs.editable.clear()
|
||||||
},
|
},
|
||||||
// 采购员focus事件
|
// 采购员focus事件
|
||||||
handlechooseStock() {
|
handlechooseStock() {
|
||||||
|
|
|
@ -163,7 +163,7 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { getdeptlist } from '@/api/BasicSettings'
|
import { getdeptlist } from '@/api/BasicSettings'
|
||||||
import { otherenterlist, deleteotherenter, updateotherenter5 } from '@/api/Stockenter'
|
import { otherenterlist, deleteotherenter, updateotherenter5, updateotherenter6, updateotherenter7 } from '@/api/Stockenter'
|
||||||
import waves from '@/directive/waves' // Waves directive
|
import waves from '@/directive/waves' // Waves directive
|
||||||
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
|
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
|
||||||
import permission from '@/directive/permission/index.js' // 权限判断指令
|
import permission from '@/directive/permission/index.js' // 权限判断指令
|
||||||
|
@ -299,7 +299,7 @@ export default {
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.reviewParms.judgeStat = 0
|
this.reviewParms.judgeStat = 0
|
||||||
const parms = JSON.stringify(this.reviewParms)
|
const parms = JSON.stringify(this.reviewParms)
|
||||||
updateotherenter5(parms).then(res => {
|
updateotherenter7(this.reviewParms.id, this.reviewParms.judgeStat, this.reviewParms.endPersonId).then(res => {
|
||||||
if (res.data.ret === 200) {
|
if (res.data.ret === 200) {
|
||||||
if (res.data.data.result === false) {
|
if (res.data.data.result === false) {
|
||||||
this.$message({
|
this.$message({
|
||||||
|
@ -334,6 +334,7 @@ export default {
|
||||||
this.reviewParms = {}
|
this.reviewParms = {}
|
||||||
this.reviewParms.id = row.id
|
this.reviewParms.id = row.id
|
||||||
this.reviewParms.endPersonId = this.$store.getters.userId
|
this.reviewParms.endPersonId = this.$store.getters.userId
|
||||||
|
console.log('parms')
|
||||||
this.$confirm(this.$t('prompt.qfjd'), this.$t('prompt.fjd'), {
|
this.$confirm(this.$t('prompt.qfjd'), this.$t('prompt.fjd'), {
|
||||||
distinguishCancelAndClose: true,
|
distinguishCancelAndClose: true,
|
||||||
confirmButtonText: this.$t('prompt.fjd'),
|
confirmButtonText: this.$t('prompt.fjd'),
|
||||||
|
@ -341,7 +342,8 @@ export default {
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.reviewParms.receiptStat = 2
|
this.reviewParms.receiptStat = 2
|
||||||
const parms = JSON.stringify(this.reviewParms)
|
const parms = JSON.stringify(this.reviewParms)
|
||||||
updateotherenter5(parms).then(res => {
|
|
||||||
|
updateotherenter6(this.reviewParms.id, this.reviewParms.receiptStat, this.reviewParms.endPersonId).then(res => {
|
||||||
if (res.data.ret === 200) {
|
if (res.data.ret === 200) {
|
||||||
this.$message({
|
this.$message({
|
||||||
type: 'success',
|
type: 'success',
|
||||||
|
@ -371,7 +373,7 @@ export default {
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.reviewParms.receiptStat = 3
|
this.reviewParms.receiptStat = 3
|
||||||
const parms = JSON.stringify(this.reviewParms)
|
const parms = JSON.stringify(this.reviewParms)
|
||||||
updateotherenter5(parms).then(res => {
|
updateotherenter6(this.reviewParms.id, this.reviewParms.receiptStat, this.reviewParms.endPersonId).then(res => {
|
||||||
if (res.data.ret === 200) {
|
if (res.data.ret === 200) {
|
||||||
this.$message({
|
this.$message({
|
||||||
type: 'success',
|
type: 'success',
|
||||||
|
|
|
@ -121,34 +121,15 @@
|
||||||
</template>
|
</template>
|
||||||
</el-editable-column>
|
</el-editable-column>
|
||||||
<el-editable-column v-if="jundgeprice()" :label="$t('updates.rkdj')" prop="enterPrice" align="center" />
|
<el-editable-column v-if="jundgeprice()" :label="$t('updates.rkdj')" prop="enterPrice" align="center" />
|
||||||
<el-editable-column v-if="jundgeprice()" :label="$t('updates.rkje')" prop="enterMoney" align="center" >
|
<el-editable-column v-if="jundgeprice()" :label="$t('updates.rkje')" prop="enterMoney" align="center" />
|
||||||
<template slot-scope="scope">
|
|
||||||
<p>{{ getSize(scope.row.actualEnterQuantity, scope.row.enterPrice) }}</p>
|
|
||||||
</template>
|
|
||||||
</el-editable-column>
|
|
||||||
<el-editable-column v-if="jundgeprice()" :label="$t('updates.slv')" prop="taxRate" align="center" />
|
<el-editable-column v-if="jundgeprice()" :label="$t('updates.slv')" prop="taxRate" align="center" />
|
||||||
<el-editable-column v-if="jundgeprice()" :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px"/>
|
<el-editable-column v-if="jundgeprice()" :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px"/>
|
||||||
<el-editable-column v-if="jundgeprice()" :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px"/>
|
<el-editable-column v-if="jundgeprice()" :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px"/>
|
||||||
|
|
||||||
<el-editable-column v-if="jundgeprice()" :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" min-width="150px">
|
<el-editable-column v-if="jundgeprice()" :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" min-width="150px" />
|
||||||
<template slot-scope="scope">
|
<el-editable-column v-if="jundgeprice()" :label="$t('updates.se')" prop="taxMoney" align="center" min-width="150px" />
|
||||||
<p>{{ scope.row.includeTaxMoney }}</p>
|
|
||||||
<!-- <p>{{ getTaxMoney(scope.row) }}</p> -->
|
|
||||||
</template>
|
|
||||||
</el-editable-column>
|
|
||||||
<el-editable-column v-if="jundgeprice()" :label="$t('updates.se')" prop="taxMoney" align="center" min-width="150px">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<p>{{ scope.row.taxMoney }}</p>
|
|
||||||
<!-- <p>{{ getTaxMoney2(scope.row) }}</p> -->
|
|
||||||
</template>
|
|
||||||
</el-editable-column>
|
|
||||||
<el-editable-column v-if="jundgeprice()" :label="$t('updates.ckl')" prop="discountRate" align="center" min-width="170px"/>
|
<el-editable-column v-if="jundgeprice()" :label="$t('updates.ckl')" prop="discountRate" align="center" min-width="170px"/>
|
||||||
<el-editable-column v-if="jundgeprice()" :label="$t('updates.cke')" prop="discountMoney" align="center" min-width="170px">
|
<el-editable-column v-if="jundgeprice()" :label="$t('updates.cke')" prop="discountMoney" align="center" min-width="170px"/>
|
||||||
<template slot-scope="scope">
|
|
||||||
<p>{{ scope.row.discountMoney }}</p>
|
|
||||||
<!-- <p>{{ getdiscountMoney(scope.row) }}</p> -->
|
|
||||||
</template>
|
|
||||||
</el-editable-column>
|
|
||||||
<el-editable-column :label="$t('updates.dcbm')" prop="batteryCode" align="center" />
|
<el-editable-column :label="$t('updates.dcbm')" prop="batteryCode" align="center" />
|
||||||
<el-editable-column :label="$t('updates.bz')" prop="remarks" align="center" />
|
<el-editable-column :label="$t('updates.bz')" prop="remarks" align="center" />
|
||||||
<el-editable-column :label="$t('CarStatList.orderNumber')" prop="orderNumber" align="center" />
|
<el-editable-column :label="$t('CarStatList.orderNumber')" prop="orderNumber" align="center" />
|
||||||
|
@ -438,10 +419,10 @@ export default {
|
||||||
}
|
}
|
||||||
this.heji1 = num
|
this.heji1 = num
|
||||||
this.heji2 = num2
|
this.heji2 = num2
|
||||||
this.allTaxMoney = num3
|
this.allTaxMoney = num4
|
||||||
this.allIncludeTaxMoney = num4
|
this.allIncludeTaxMoney = num3
|
||||||
this.allDiscountMoney = num5
|
this.allDiscountMoney = num5
|
||||||
this.allMoneyMoveDiscount = num4 - num5
|
this.allMoneyMoveDiscount = num3 - num5
|
||||||
this.reviewList = []
|
this.reviewList = []
|
||||||
const review = this.personalForm.approvalUseVos
|
const review = this.personalForm.approvalUseVos
|
||||||
for (const i in review) {
|
for (const i in review) {
|
||||||
|
|
|
@ -428,6 +428,8 @@ export default {
|
||||||
|
|
||||||
if (row.newTaxRate === 0) {
|
if (row.newTaxRate === 0) {
|
||||||
row.newPrice = row.newIncludeTaxPrice
|
row.newPrice = row.newIncludeTaxPrice
|
||||||
|
} else {
|
||||||
|
row.newPrice = row.newIncludeTaxPrice / (1 + row.newTaxRate / 100)
|
||||||
}
|
}
|
||||||
// if (row.taxPriceFlag === 1) {
|
// if (row.taxPriceFlag === 1) {
|
||||||
// row.newPrice = row.newIncludeTaxPrice / (1 + row.newTaxRate / 100)
|
// row.newPrice = row.newIncludeTaxPrice / (1 + row.newTaxRate / 100)
|
||||||
|
|
|
@ -67,10 +67,10 @@
|
||||||
border
|
border
|
||||||
size="small"
|
size="small"
|
||||||
style="width: 100%">
|
style="width: 100%">
|
||||||
<el-editable-column type="selection" min-width="55" align="center"/>
|
<el-editable-column type="selection" fixed="left" min-width="55" align="center"/>
|
||||||
<el-editable-column :label="$t('Hmodule.xh')" min-width="55" align="center" type="index"/>
|
<el-editable-column :label="$t('Hmodule.xh')" fixed="left" min-width="55" align="center" type="index"/>
|
||||||
<el-editable-column :label="$t('Hmodule.wpbh')" prop="productCode" align="center" min-width="150px"/>
|
<el-editable-column :label="$t('Hmodule.wpbh')" fixed="left" prop="productCode" align="center" min-width="150px"/>
|
||||||
<el-editable-column :label="$t('Hmodule.wpmc')" prop="productName" align="center" min-width="150px"/>
|
<el-editable-column :label="$t('Hmodule.wpmc')" fixed="left" prop="productName" align="center" min-width="150px"/>
|
||||||
<el-editable-column :label="$t('Hmodule.gg')" prop="type" align="center" min-width="150px"/>
|
<el-editable-column :label="$t('Hmodule.gg')" prop="type" align="center" min-width="150px"/>
|
||||||
<el-editable-column :label="$t('updates.ys')" prop="color" 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('Hmodule.dw')" prop="unit" align="center" min-width="150px"/>
|
||||||
|
@ -410,6 +410,9 @@ export default {
|
||||||
}
|
}
|
||||||
if (row.newTaxRate === 0) {
|
if (row.newTaxRate === 0) {
|
||||||
row.newPrice = row.newIncludeTaxPrice
|
row.newPrice = row.newIncludeTaxPrice
|
||||||
|
} else {
|
||||||
|
row.newPrice = row.newIncludeTaxPrice / (1 + row.newTaxRate / 100)
|
||||||
|
|
||||||
}
|
}
|
||||||
// if (row.taxPriceFlag === 1) {
|
// if (row.taxPriceFlag === 1) {
|
||||||
// row.newPrice = row.newIncludeTaxPrice / (1 + row.newTaxRate / 100)
|
// row.newPrice = row.newIncludeTaxPrice / (1 + row.newTaxRate / 100)
|
||||||
|
|
|
@ -133,6 +133,8 @@
|
||||||
:data.sync="list2"
|
:data.sync="list2"
|
||||||
:edit-config="{ showIcon: true, showStatus: true}"
|
:edit-config="{ showIcon: true, showStatus: true}"
|
||||||
:edit-rules="validRules"
|
:edit-rules="validRules"
|
||||||
|
:summary-method="getSummaries"
|
||||||
|
show-summary
|
||||||
class="click-table1"
|
class="click-table1"
|
||||||
stripe
|
stripe
|
||||||
border
|
border
|
||||||
|
@ -190,7 +192,7 @@
|
||||||
</el-select>
|
</el-select>
|
||||||
</template>
|
</template>
|
||||||
</el-editable-column>
|
</el-editable-column>
|
||||||
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0, precision: 6}, type: 'visible'}" :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px"/>
|
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {precision: 6}, type: 'visible'}" :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px"/>
|
||||||
</el-editable>
|
</el-editable>
|
||||||
</div>
|
</div>
|
||||||
</el-card>
|
</el-card>
|
||||||
|
@ -279,7 +281,7 @@ export default {
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
@ -357,6 +359,37 @@ export default {
|
||||||
_that = this
|
_that = this
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
// 总计
|
||||||
|
getSummaries(param) {
|
||||||
|
const { columns, data } = param
|
||||||
|
const sums = []
|
||||||
|
columns.forEach((column, index) => {
|
||||||
|
if (index === 0) {
|
||||||
|
sums[index] = 'summery'
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const values = data.map(item => Number(item[column.property]))
|
||||||
|
if (!values.every(value => isNaN(value))) {
|
||||||
|
sums[index] = values.reduce((prev, curr) => {
|
||||||
|
const value = Number(curr)
|
||||||
|
if (!isNaN(value)) {
|
||||||
|
return (Number(prev) + Number(curr)).toFixed(6)
|
||||||
|
} else {
|
||||||
|
return (Number(prev)).toFixed(6)
|
||||||
|
}
|
||||||
|
}, 0)
|
||||||
|
sums[index] += ''
|
||||||
|
} else {
|
||||||
|
sums[index] = ''
|
||||||
|
}
|
||||||
|
})
|
||||||
|
sums[1] = ''
|
||||||
|
sums[2] = ''
|
||||||
|
sums[3] = ''
|
||||||
|
sums[4] = ''
|
||||||
|
sums[5] = ''
|
||||||
|
return sums
|
||||||
|
},
|
||||||
// 上传图片
|
// 上传图片
|
||||||
handlepicsuccess(response) {
|
handlepicsuccess(response) {
|
||||||
const picarr = []
|
const picarr = []
|
||||||
|
|
|
@ -149,7 +149,7 @@
|
||||||
</el-select>
|
</el-select>
|
||||||
</template>
|
</template>
|
||||||
</el-editable-column>
|
</el-editable-column>
|
||||||
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0, precision: 6}, type: 'visible'}" :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px"/>
|
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {precision: 6}, type: 'visible'}" :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px"/>
|
||||||
</el-editable>
|
</el-editable>
|
||||||
</div>
|
</div>
|
||||||
</el-card>
|
</el-card>
|
||||||
|
|
|
@ -185,7 +185,7 @@ export default {
|
||||||
pickerOptions2: {
|
pickerOptions2: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
const _now = Date.now()
|
const _now = Date.now()
|
||||||
const seven = 10 * 24 * 60 * 60 * 1000
|
const seven = 30 * 24 * 60 * 60 * 1000
|
||||||
const sevenDays = _now - seven
|
const sevenDays = _now - seven
|
||||||
return time.getTime() > _now || time.getTime() < sevenDays
|
return time.getTime() > _now || time.getTime() < sevenDays
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue