From 6cf32b7ae9d7ebdf52dc853c681f35ef65de69fe Mon Sep 17 00:00:00 2001 From: shawnzhang Date: Thu, 18 Mar 2021 17:43:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=97=A0=E9=94=A1?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8F=91=E7=A5=A8=E5=92=8C=E8=8F=B2=E5=BE=8B?= =?UTF-8?q?=E5=AE=BE=E6=8D=A2=E8=B4=A7=E5=8D=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat: 修改无锡采购发票和菲律宾换货单问题 --- src/api/OutSourceEnter.js | 3 + src/lang/en.js | 4 +- src/lang/zh.js | 6 +- src/views/CheckReport/AddCheckReport.vue | 10 +- src/views/Financecount/collectAndPay.vue | 7 +- .../InstallmentApply/AddInstallmentApply.vue | 18 +- .../InstallmentApply/components/MyDialog.vue | 18 +- .../InstallmentApply/components/MyPackage.vue | 2 +- .../OutSourceEnter/OutSourceEnterList.vue | 49 ++- .../OutSourceEnter/components/DetailList3.vue | 20 +- src/views/OutSourcing/AddOutSourcing.vue | 4 +- .../OutSourcing/components/DetailList.vue | 2 + src/views/OutSourcing/components/MyDialog.vue | 2 + .../OutSourcing/components/MyMaterials.vue | 2 + src/views/Receipt/components/MyDialog.vue | 5 + src/views/Recycling/components/MyDetail.vue | 2 +- .../ReturnExchange/AddReturnExchange.vue | 73 +++- .../ReturnExchange/components/DetailList.vue | 1 + .../ReturnExchange/components/MyDialog.vue | 66 +++- src/views/SaleOut/AddSaleOut.vue | 2 +- src/views/SaleOut/components/MyDialog.vue | 2 +- src/views/SaleReceipt/AddReceipt.vue | 23 +- src/views/SaleReceipt/components/MyDialog.vue | 14 +- src/views/ShouldPayList/index.vue | 5 + src/views/StockArrival/StockArrivalList.vue | 29 +- src/views/StockInvoice/AddRedStockInvoice.vue | 31 +- src/views/StockInvoice/AddStockInvoice.vue | 279 +++++++++++--- src/views/StockInvoice/StockInvoiceList.vue | 5 + .../StockInvoice/components/DetailList.vue | 25 +- .../StockInvoice/components/MyDialog.vue | 250 ++++++++++-- src/views/StockInvoice/components/MyEnter.vue | 3 +- .../StockInvoice/components/MyFactory.vue | 222 +++++++++++ .../StockInvoice/components/MyOutsource.vue | 359 ++++++++++++++++++ src/views/StockOrder/StockOrderList.vue | 19 + .../Storagemove/components/DetailList.vue | 14 +- src/views/Storagemove/components/MyEdit2.vue | 12 +- 36 files changed, 1392 insertions(+), 196 deletions(-) create mode 100644 src/views/StockInvoice/components/MyFactory.vue create mode 100644 src/views/StockInvoice/components/MyOutsource.vue diff --git a/src/api/OutSourceEnter.js b/src/api/OutSourceEnter.js index f0e9cdf0..5c5e62c0 100644 --- a/src/api/OutSourceEnter.js +++ b/src/api/OutSourceEnter.js @@ -81,6 +81,9 @@ export function outsourceEnterlist(query) { if (query.customerId !== '' && query.customerId !== null && query.customerId !== undefined) { params.append('customerId', query.customerId) // 你要传给后台的参数值 key/value } + if (query.outFactoryName !== '' && query.outFactoryName !== null && query.outFactoryName !== undefined) { + params.append('outFactoryName', query.outFactoryName) // 你要传给后台的参数值 key/value + } params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value return request({ diff --git a/src/lang/en.js b/src/lang/en.js index 67e99f59..80d2054e 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -4620,6 +4620,8 @@ export default { shoukuandanzhinajin: 'collection bill(penalty)', shoukandajlreceiptNumber: 'compensation bill Number', shoukandanquerenshouk: 'verify received payment', - querenmingxi: ' verify detail' + querenmingxi: ' verify detail', + zhehoujine: 'zhehoujine', + zhehouhanshuijine: 'zhehouhanshuijine' } } diff --git a/src/lang/zh.js b/src/lang/zh.js index 419b72dc..405221a8 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -4626,7 +4626,9 @@ export default { querenfanhuan: '确认返还库存', shengchengpeichangdan: '生成赔偿单', quedingfanhuan: '确定返还？', - queding: '确定' - + queding: '确定', + zhehoujine: '折后金额', + zhehouhanshuijine: '折后含税金额', + zhehoujineheji: '折后金额合计' } } diff --git a/src/views/CheckReport/AddCheckReport.vue b/src/views/CheckReport/AddCheckReport.vue index fbdf2a26..d184b946 100644 --- a/src/views/CheckReport/AddCheckReport.vue +++ b/src/views/CheckReport/AddCheckReport.vue @@ -123,11 +123,11 @@ - - - - - + + + + + diff --git a/src/views/Financecount/collectAndPay.vue b/src/views/Financecount/collectAndPay.vue index 043e746e..eeafe9c6 100644 --- a/src/views/Financecount/collectAndPay.vue +++ b/src/views/Financecount/collectAndPay.vue @@ -87,7 +87,12 @@ sortable width="240" align="center"/> - + - + @@ -1131,6 +1131,22 @@ export default { _that = this }, methods: { + handleChangeDays(val) { + const date = new Date() + const day = date.getDate() + console.log('day', day) + let maxDays = 0 + if (day + 15 >= 31) { + maxDays = 31 + } else { + maxDays = val + 15 + } + if (val > maxDays) { + this.$nextTick(() => { + this.personalForm.installmentDays = day + }) + } + }, haveAccessAddress2() { confirmAddress(this.personalForm.permanentAddress).then(res => { console.log('xxx', res) diff --git a/src/views/InstallmentApply/components/MyDialog.vue b/src/views/InstallmentApply/components/MyDialog.vue index 5be525ec..06580de1 100644 --- a/src/views/InstallmentApply/components/MyDialog.vue +++ b/src/views/InstallmentApply/components/MyDialog.vue @@ -176,7 +176,7 @@ - + @@ -1042,6 +1042,22 @@ export default { _that = this }, methods: { + handleChangeDays(val) { + const date = new Date() + const day = date.getDate() + console.log('day', day) + let maxDays = 0 + if (day + 15 >= 31) { + maxDays = 31 + } else { + maxDays = val + 15 + } + if (val > maxDays) { + this.$nextTick(() => { + this.personalForm.installmentDays = day + }) + } + }, cancel2() { this.comakerVisible = false this.newcomarker = {} diff --git a/src/views/InstallmentApply/components/MyPackage.vue b/src/views/InstallmentApply/components/MyPackage.vue index 42d87137..ec56b287 100644 --- a/src/views/InstallmentApply/components/MyPackage.vue +++ b/src/views/InstallmentApply/components/MyPackage.vue @@ -111,7 +111,7 @@ export default { default: null }, packagerepository: { - type: Number, + type: [Number, String], default: null } }, diff --git a/src/views/OutSourceEnter/OutSourceEnterList.vue b/src/views/OutSourceEnter/OutSourceEnterList.vue index ec461726..537328b4 100644 --- a/src/views/OutSourceEnter/OutSourceEnterList.vue +++ b/src/views/OutSourceEnter/OutSourceEnterList.vue @@ -11,6 +11,8 @@ :value="item.id" :label="item.deptName"/> + + {{ scope.row.title }} - + - + diff --git a/src/views/OutSourcing/components/DetailList.vue b/src/views/OutSourcing/components/DetailList.vue index 0ca5c12f..ab16f26e 100644 --- a/src/views/OutSourcing/components/DetailList.vue +++ b/src/views/OutSourcing/components/DetailList.vue @@ -107,6 +107,7 @@ + @@ -142,6 +143,7 @@ + diff --git a/src/views/OutSourcing/components/MyDialog.vue b/src/views/OutSourcing/components/MyDialog.vue index 901db996..6546e5fa 100644 --- a/src/views/OutSourcing/components/MyDialog.vue +++ b/src/views/OutSourcing/components/MyDialog.vue @@ -137,6 +137,7 @@ + @@ -190,6 +191,7 @@

{{ getdiscountMoney(scope.row.includeTaxMoney, scope.row.discountRate, scope.row) }}

 + diff --git a/src/views/OutSourcing/components/MyMaterials.vue b/src/views/OutSourcing/components/MyMaterials.vue index 546f2b3b..3b30c6a1 100644 --- a/src/views/OutSourcing/components/MyMaterials.vue +++ b/src/views/OutSourcing/components/MyMaterials.vue @@ -320,6 +320,7 @@ export default { totalMoney: 0, enterQuantity: 0, damageQuantity: 0, + taxRate: item.taxRate, idx: item.id, includeTaxPrice: item.includeTaxPrice, discountRate: item.discountRate @@ -360,6 +361,7 @@ export default { for (const j in finalproduct) { if (productDetail[i].idx === finalproduct[j].idx) { // finalproduct[j].money = productDetail[i].money + finalproduct[j].taxRate = productDetail[i].taxRate finalproduct[j].price = productDetail[i].price finalproduct[j].includeTaxPrice = productDetail[i].includeTaxPrice finalproduct[j].includeTaxMoney = Number(productDetail[i].includeTaxPrice) * productDetail[i].quantity diff --git a/src/views/Receipt/components/MyDialog.vue b/src/views/Receipt/components/MyDialog.vue index a43a3b1f..8df8fc53 100644 --- a/src/views/Receipt/components/MyDialog.vue +++ b/src/views/Receipt/components/MyDialog.vue @@ -1079,6 +1079,9 @@ export default { }, // 保存操作 handlesave() { + delete this.personalForm.receiptDetails + delete this.personalForm.approvalUseVos + if (this.personalForm.couponSupportOld === null || this.personalForm.couponSupportOld === '' || this.personalForm.couponSupportOld === undefined) { this.personalForm.couponSupportOld = 0 } @@ -1181,6 +1184,8 @@ export default { const parms = JSON.stringify(Data) this.$refs.personalForm.validate((valid) => { if (valid) { + console.log('parms', parms) + console.log('parms2', parms2) updatereceipt2(parms, parms2).then(res => { if (res.data.ret === 200) { this.$notify({ diff --git a/src/views/Recycling/components/MyDetail.vue b/src/views/Recycling/components/MyDetail.vue index 67337f98..6dda0475 100644 --- a/src/views/Recycling/components/MyDetail.vue +++ b/src/views/Recycling/components/MyDetail.vue @@ -187,7 +187,7 @@ export default { productid: '', code: '', productname: '', - categoryid: '99', + categoryid: '', typeid: '', isactive: '', Productid: '', diff --git a/src/views/ReturnExchange/AddReturnExchange.vue b/src/views/ReturnExchange/AddReturnExchange.vue index 42e52f97..484fcba6 100644 --- a/src/views/ReturnExchange/AddReturnExchange.vue +++ b/src/views/ReturnExchange/AddReturnExchange.vue @@ -71,6 +71,15 @@ + + + + + + + + + @@ -108,6 +117,7 @@ _now || time.getTime() < sevenDays } }, + talbeKey: 1, + saleOutData: {}, saveLoading: false, moreaction: [], productnumber: null, @@ -395,7 +407,8 @@ export default { stat: '1', diffMoney: '0.00', sourceMoney: '0.00', - isManila: 2 + isManila: 2, + saleType: '' }, // 配送单规则数据 personalrules: { @@ -462,8 +475,17 @@ export default { } console.log('num1', num1) console.log('num2', num2) - this.personalForm.shouldMoney = (num2 - num1).toFixed(6) - this.personalForm.diffMoney = (num2 - num1).toFixed(6) + + this.personalForm.shouldMoney = (num2 - Number(this.saleOutData.shouldMoney)).toFixed(6) + this.personalForm.diffMoney = (num2 - Number(this.saleOutData.shouldMoney)).toFixed(6) + + // if (this.personalForm.saleType === '1') { + // this.personalForm.shouldMoney = (num2 - num1).toFixed(6) + // this.personalForm.diffMoney = (num2 - num1).toFixed(6) + // } else if (this.personalForm.saleType === '2') { + // this.personalForm.shouldMoney = 0 - Number(this.saleOutData.shouldMoney) + // this.personalForm.diffMoney = 0 - Number(this.saleOutData.shouldMoney) + // } }, deep: true, immediate: true @@ -481,8 +503,16 @@ export default { console.log('list3', this.list3) console.log('num1', num1) console.log('num2', num2) - this.personalForm.shouldMoney = (num2 - num1).toFixed(6) - this.personalForm.diffMoney = (num2 - num1).toFixed(6) + this.personalForm.shouldMoney = (num2 - Number(this.saleOutData.shouldMoney)).toFixed(6) + this.personalForm.diffMoney = (num2 - Number(this.saleOutData.shouldMoney)).toFixed(6) + // if (this.personalForm.saleType === '1') { + // this.personalForm.shouldMoney = (num2 - Number(this.saleOutData.shouldMoney)).toFixed(6) + // this.personalForm.diffMoney = (num2 - Number(this.saleOutData.shouldMoney)).toFixed(6) + // } else if (this.personalForm.saleType === '2') { + // this.personalForm.shouldMoney = this.saleOutData.shouldMoney + + // this.personalForm.diffMoney = this.saleOutData.shouldMoney + // } }, deep: true, immediate: true @@ -496,6 +526,23 @@ export default { _that = this }, methods: { + /** + * + * @param val 改变数据 + */ + handleChangeSaleType(val) { + console.log('val', val) + console.log('this.personalForm.saleOutData', this.saleOutData) + if (this.saleOutData.saleType === 2 && val === '1') { + this.$set(this.personalForm, 'sourceMoney', this.saleOutData.shouldMoney) + this.personalForm.shouldMoney = 0 - Number(this.saleOutData.shouldMoney) + this.personalForm.diffMoney = 0 - Number(this.saleOutData.shouldMoney) + } else if (this.saleOutData.saleType === 2 && val === '2') { + this.$set(this.personalForm, 'sourceMoney', this.saleOutData.shouldMoney) + this.personalForm.shouldMoney = 0 - Number(this.saleOutData.shouldMoney) + this.personalForm.diffMoney = 0 - Number(this.saleOutData.shouldMoney) + } + }, // 批量操作 handleSelectionChange(val) { console.log(val) @@ -993,6 +1040,7 @@ export default { saleOutDetail(val) { console.log('saleout data', val) this.list2 = val + this.talbeKey = Math.random() // this.$refs.editable.clear() // for (let i = 0; i < val.length; i++) { // this.$refs.editable.insert(val[i]) @@ -1000,16 +1048,24 @@ export default { }, saleOutdata(val) { console.log(val) + this.saleOutData = val // this.personalForm.isManila = val.isManila this.personalForm.applyNumber = val.applyNumber this.personalForm.sourceNumber = val.number - this.personalForm.sourceMoney = val.allIncludeTaxMoney this.personalForm.customerType = String(val.customerType) + this.personalForm.saleType = String(val.saleType) + if (this.personalForm.saleType === '1') { + this.personalForm.sourceMoney = val.allIncludeTaxMoney + this.personalForm.diffMoney = val.allIncludeTaxMoney + } else if (this.personalForm.saleType === '2') { + this.personalForm.sourceMoney = val.shouldMoney + this.personalForm.diffMoney = val.shouldMoney + } this.Issource = true this.customerId = val.customerName this.personalForm.customerPhone = val.phoneNumber this.personalForm.customerId = val.customerId - this.personalForm.diffMoney = val.actualMoney + // this.personalForm.sourceMoney = val.actualMoney this.repositoryId = val.saleRepositoryName this.personalForm.repositoryId = val.saleRepositoryId @@ -1076,7 +1132,8 @@ export default { customerType: '2', exchangeDate: null, stat: '1', - isManila: 2 + isManila: 2, + saleType: '' } this.customerId = '' diff --git a/src/views/ReturnExchange/components/DetailList.vue b/src/views/ReturnExchange/components/DetailList.vue index d27b0aa6..dbe753a7 100644 --- a/src/views/ReturnExchange/components/DetailList.vue +++ b/src/views/ReturnExchange/components/DetailList.vue @@ -328,6 +328,7 @@ export default { detaildata() { this.personalForm = this.detaildata this.testMoney = this.detaildata.diffMoney + this.personalForm.shouldMoney = this.detaildata.shouldMoney this.list2 = this.personalForm.returnExchangeRetreatVos this.list3 = this.personalForm.returnExchangeOutVos for (const i in this.list2) { diff --git a/src/views/ReturnExchange/components/MyDialog.vue b/src/views/ReturnExchange/components/MyDialog.vue index aa16d0b1..fdc7b3fe 100644 --- a/src/views/ReturnExchange/components/MyDialog.vue +++ b/src/views/ReturnExchange/components/MyDialog.vue @@ -64,6 +64,14 @@ + + + + + + + + @@ -100,6 +108,7 @@ _now || time.getTime() < sevenDays } }, + talbeKey: 1, + saleOutData: {}, batchlist: [], packagecontrol: false, // 选择的数据 @@ -417,6 +428,8 @@ export default { this.customerId = this.personalForm.customerName this.handlePersonId = this.personalForm.handlePersonName this.repositoryId = this.personalForm.repositoryName + this.personalForm.shouldMoney = this.detaildata.shouldMoney + this.list2 = this.personalForm.returnExchangeRetreatVos for (const i in this.list2) { this.list2[i].taxPrice = this.list2[i].salePrice + this.list2[i].taxMoney @@ -435,7 +448,12 @@ export default { } console.log('num1', num1) console.log('num2', num2) - this.personalForm.diffMoney = (num2 - num1).toFixed(6) + console.log('this.saleOutData', this.saleOutData) + + if (this.saleOutData) { + this.personalForm.shouldMoney = (num2 - Number(this.saleOutData.shouldMoney)).toFixed(6) + this.personalForm.diffMoney = (num2 - Number(this.saleOutData.shouldMoney)).toFixed(6) + } }, deep: true, immediate: true @@ -453,7 +471,11 @@ export default { console.log('list3', this.list3) console.log('num1', num1) console.log('num2', num2) - this.personalForm.diffMoney = (num2 - num1).toFixed(6) + console.log('this.saleOutData', this.saleOutData) + if (this.saleOutData) { + this.personalForm.shouldMoney = (num2 - Number(this.saleOutData.shouldMoney)).toFixed(6) + this.personalForm.diffMoney = (num2 - Number(this.saleOutData.shouldMoney)).toFixed(6) + } }, deep: true, immediate: true @@ -466,6 +488,23 @@ export default { _that = this }, methods: { + /** + * + * @param val 改变数据 + */ + handleChangeSaleType(val) { + console.log('val', val) + console.log('this.personalForm.saleOutData', this.saleOutData) + if (this.saleOutData.saleType === 2 && val === '1') { + this.$set(this.personalForm, 'sourceMoney', this.saleOutData.shouldMoney) + this.personalForm.shouldMoney = 0 - Number(this.saleOutData.shouldMoney) + this.personalForm.diffMoney = 0 - Number(this.saleOutData.shouldMoney) + } else if (this.saleOutData.saleType === 2 && val === '2') { + this.$set(this.personalForm, 'sourceMoney', this.saleOutData.shouldMoney) + this.personalForm.shouldMoney = 0 - Number(this.saleOutData.shouldMoney) + this.personalForm.diffMoney = 0 - Number(this.saleOutData.shouldMoney) + } + }, isEdit4(row) { console.log('222', row) const re = row.productCode.slice(0, 2) @@ -843,24 +882,35 @@ export default { }, // 源单类型为销售出库单时 saleOutDetail(val) { - this.$refs.editable.clear() - for (let i = 0; i < val.length; i++) { - this.$refs.editable.insert(val[i]) - } + this.list2 = val + this.talbeKey = Math.random() + // this.$refs.editable.clear() + // for (let i = 0; i < val.length; i++) { + // this.$refs.editable.insert(val[i]) + // } }, saleOutdata(val) { console.log(val) + this.saleOutData = val this.personalForm.applyNumber = val.applyNumber this.personalForm.sourceNumber = val.number - this.personalForm.sourceMoney = val.allIncludeTaxMoney + // this.personalForm.sourceMoney = val.allIncludeTaxMoney this.personalForm.customerType = String(val.customerType) + this.personalForm.saleType = String(val.saleType) + if (this.personalForm.saleType === '1') { + this.personalForm.sourceMoney = val.allIncludeTaxMoney + this.personalForm.diffMoney = val.allIncludeTaxMoney + } else if (this.personalForm.saleType === '2') { + this.personalForm.sourceMoney = val.shouldMoney + this.personalForm.diffMoney = val.shouldMoney + } this.Issource = true this.customerId = val.customerName // this.personalForm.isManila = val.isManila this.personalForm.customerPhone = val.phoneNumber this.personalForm.customerId = val.customerId - this.personalForm.diffMoney = val.actualMoney + // this.personalForm.diffMoney = val.actualMoney // this.personalForm.sourceMoney = val.actualMoney this.repositoryId = val.saleRepositoryName this.personalForm.repositoryId = val.saleRepositoryId diff --git a/src/views/SaleOut/AddSaleOut.vue b/src/views/SaleOut/AddSaleOut.vue index f56e5b04..89b26976 100644 --- a/src/views/SaleOut/AddSaleOut.vue +++ b/src/views/SaleOut/AddSaleOut.vue @@ -1924,7 +1924,7 @@ export default { // } } else if (val === '6') { this.IsSourceNumber = true - this.Isproduct = true + this.Isproduct = false this.personalForm.saleType = '1' } else if (val === '2') { this.Isproduct = true diff --git a/src/views/SaleOut/components/MyDialog.vue b/src/views/SaleOut/components/MyDialog.vue index da9854f1..2692658d 100644 --- a/src/views/SaleOut/components/MyDialog.vue +++ b/src/views/SaleOut/components/MyDialog.vue @@ -1968,7 +1968,7 @@ export default { // } } else if (val === '6') { this.IsSourceNumber = true - this.Isproduct = true + this.Isproduct = false this.personalForm.saleType = '1' } else if (val === '2') { this.Isproduct = true diff --git a/src/views/SaleReceipt/AddReceipt.vue b/src/views/SaleReceipt/AddReceipt.vue index 15aa0795..3a4e530f 100644 --- a/src/views/SaleReceipt/AddReceipt.vue +++ b/src/views/SaleReceipt/AddReceipt.vue @@ -123,9 +123,7 @@ @@ -301,6 +299,23 @@ export default { callback() } } + const validatePass8 = (rule, value, callback) => { + console.log('value', value) + console.log('this.$store.getters.countryId', this.$store.getters.countryId) + if (this.$store.getters.countryId === 2 && value.length !== 8) { + callback(new Error('发票号位数不正确')) + } else { + callback() + } + // :rules="$store.getters.countryId === 2? personalrules.invoiceNumber: [ + // { required: true, validator:validatePass8, trigger: 'blur' } + // ]" + // if (this.personalForm.deductionMoney > this.yufu) { + // callback(new Error('抵扣额不可大于预付款')) + // } else { + // callback() + // } + } return { repositorycontrol: false, // 收款门店 @@ -366,7 +381,7 @@ export default { // 销售订单规则数据 personalrules: { invoiceNumber: [ - { message: '请输入发票号', trigger: 'blur' } + { required: true, validator: validatePass8, trigger: 'blur' } ], customerPay: [ { required: true, message: '请输入客户支付金额', trigger: 'change' } diff --git a/src/views/SaleReceipt/components/MyDialog.vue b/src/views/SaleReceipt/components/MyDialog.vue index 5c103efd..f941050e 100644 --- a/src/views/SaleReceipt/components/MyDialog.vue +++ b/src/views/SaleReceipt/components/MyDialog.vue @@ -120,9 +120,6 @@ @@ -289,6 +286,15 @@ export default { callback() } } + const validatePass8 = (rule, value, callback) => { + console.log('value', value) + console.log('this.$store.getters.countryId', this.$store.getters.countryId) + if (this.$store.getters.countryId === 2 && value.length !== 8) { + callback(new Error('发票号位数不正确')) + } else { + callback() + } + } return { personalForm2: { couponSupports: [ @@ -345,7 +351,7 @@ export default { // 销售订单规则数据 personalrules: { invoiceNumber: [ - { message: '请输入发票号', trigger: 'change' } + { required: true, validator: validatePass8, trigger: 'blur' } ], customerPay: [ { required: true, message: '请输入客户支付金额', trigger: 'change' } diff --git a/src/views/ShouldPayList/index.vue b/src/views/ShouldPayList/index.vue index ea830387..cbef160b 100644 --- a/src/views/ShouldPayList/index.vue +++ b/src/views/ShouldPayList/index.vue @@ -64,6 +64,11 @@ {{ scope.row.supplierName }} + + + - + - + - + - + @@ -652,10 +652,10 @@ export default { const newarr = res.data.data.content.list.map(item => { return item.stockArrivalDetailVos }) - console.table('newarr==============', newarr) + // console.table('newarr==============', newarr) const newarr2 = [].concat.apply([], newarr) const processarr = this._.cloneDeep(newarr2) - console.table('newarr2==============', newarr2) + // console.table('newarr2==============', newarr2) for (const i in needlist) { for (const j in processarr) { if (needlist[i].id === processarr[j].stockArrivalId) { @@ -731,22 +731,7 @@ export default { this.getemplist.endTime = this.date[1] } this.getemplist.pageNum = 1 - searchstockArrival(this.getemplist).then(res => { - if (res.data.ret === 200) { - this.list = res.data.data.content.list - for (const j in this.list) { - const newarr = [] - for (const i in this.list[j].stockArrivalDetailVos) { - newarr.push(this.list[j].stockArrivalDetailVos[i].productName) - } - this.list[j].presentdata = newarr.join(' || ') - } - this.total = res.data.data.content.totalCount - // this.restFilter() - } else { - // this.restFilter() - } - }) + this.getlist() }, // 采购人focus事件 handlechooseStock() { diff --git a/src/views/StockInvoice/AddRedStockInvoice.vue b/src/views/StockInvoice/AddRedStockInvoice.vue index 580ddc8a..4817d506 100644 --- a/src/views/StockInvoice/AddRedStockInvoice.vue +++ b/src/views/StockInvoice/AddRedStockInvoice.vue @@ -192,21 +192,6 @@ @input="gettaxRate(scope.row)"/> - - - - - - - - - + + + + + + + + + + diff --git a/src/views/StockInvoice/AddStockInvoice.vue b/src/views/StockInvoice/AddStockInvoice.vue index f555bd10..ceb15418 100644 --- a/src/views/StockInvoice/AddStockInvoice.vue +++ b/src/views/StockInvoice/AddStockInvoice.vue @@ -9,8 +9,9 @@ - + + @@ -39,13 +40,19 @@ - + + + + + + + @@ -153,6 +160,8 @@
{{ $t('updates.cydzxz') }} + + {{ $t('Hmodule.delete') }} @@ -164,6 +173,7 @@ --> + + + + + + - -