diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 22e46cca..fdfa8f97 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -9,7 +9,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin') const HtmlWebpackPlugin = require('html-webpack-plugin') const ScriptExtHtmlWebpackPlugin = require('script-ext-html-webpack-plugin') const MiniCssExtractPlugin = require('mini-css-extract-plugin') -const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin') +// const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin') const UglifyJsPlugin = require('uglifyjs-webpack-plugin') function resolve(dir) { @@ -141,7 +141,7 @@ const webpackConfig = merge(baseWebpackConfig, { }), // Compress extracted CSS. We are using this plugin so that possible // duplicated CSS from different components can be deduped. - new OptimizeCSSAssetsPlugin() + // new OptimizeCSSAssetsPlugin() ] } }) diff --git a/src/api/SupplierAdjust.js b/src/api/SupplierAdjust.js index 365cf863..6bfd31e5 100644 --- a/src/api/SupplierAdjust.js +++ b/src/api/SupplierAdjust.js @@ -97,6 +97,18 @@ export function getSupplierDetailById(query) { if (query.supplierId !== '' && query.supplierId !== null && query.supplierId !== undefined) { params.append('supplierId', query.supplierId) // 你要传给后台的参数值 key/value } + if (query.productCode !== '' && query.productCode !== null && query.productCode !== undefined) { + params.append('productCode', query.productCode) // 你要传给后台的参数值 key/value + } + if (query.productName !== '' && query.productName !== null && query.productName !== undefined) { + params.append('productName', query.productName) // 你要传给后台的参数值 key/value + } + if (query.categoryId !== '' && query.categoryId !== null && query.categoryId !== undefined) { + params.append('categoryId', query.categoryId) // 你要传给后台的参数值 key/value + } + if (query.typeId !== '' && query.typeId !== null && query.typeId !== undefined) { + params.append('typeId', query.typeId) // 你要传给后台的参数值 key/value + } params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value return request({ diff --git a/src/views/Financecount/collectAndPay.vue b/src/views/Financecount/collectAndPay.vue index f83c01a1..06e08d60 100644 --- a/src/views/Financecount/collectAndPay.vue +++ b/src/views/Financecount/collectAndPay.vue @@ -537,12 +537,12 @@ export default { }, myytablehead({ row, column, rowIndex, columnIndex }) { // console.log('myindex=================>', row, column, rowIndex, columnIndex) - if (columnIndex === 13) { + if (columnIndex === 19) { return 'border-right:3px solid red' } }, myTable({ row, column, rowIndex, columnIndex }) { - if (columnIndex === 13) { + if (columnIndex === 19) { return 'border-right:3px solid red' } }, diff --git a/src/views/StockCount/stockTrackList.vue b/src/views/StockCount/stockTrackList.vue index 1fe07b17..1e2a2f60 100644 --- a/src/views/StockCount/stockTrackList.vue +++ b/src/views/StockCount/stockTrackList.vue @@ -337,10 +337,11 @@ export default { }, // 导出 handleExport() { + console.log('this.list', this.list) this.downloadLoading = true import('@/vendor/Export2Excel').then(excel => { const tHeader = ['供应商名称', '单据日期', '单据编号', '物品编号', '到货时间', '到货单号', '入库单号', '交货日期', '物品名称', '单位', '数量', '含税价', '含税金额', '到货数量', '到货金额', '已入库', '未入库', '已开票数', '未开票数', '已开票额', '未开票额'] - const filterVal = ['supplierName', 'receiptDate', 'orderNumber', 'productCode', 'arrivalDate', 'arrivalNumber', 'delayNum', 'deliveryDate', 'productName', 'unit', 'quantity', 'price', 'money', 'arrivalQuantity', 'arrivalMoney', 'enterQuantity', 'notenterQuantity', 'invoiceQuantity', 'notinvoiceQuantity', 'invoiceMoney', 'notinvoiceMoney'] + const filterVal = ['supplierName', 'receiptDate', 'orderNumber', 'productCode', 'arrivalDate', 'arrivalNumber', 'enterNumber', 'deliveryDate', 'productName', 'unit', 'quantity', 'price', 'money', 'arrivalQuantity', 'arrivalMoney', 'enterQuantity', 'notenterQuantity', 'invoiceQuantity', 'notinvoiceQuantity', 'invoiceMoney', 'notinvoiceMoney'] const data = this.formatJson(filterVal, this.list) excel.export_json_to_excel({ header: tHeader, @@ -526,6 +527,11 @@ export default { this.list[i].notenterQuantity = (this.list[i].quantity - this.list[i].enterQuantity).toFixed(6) this.list[i].notinvoiceQuantity = (this.list[i].quantity - this.list[i].invoiceQuantity).toFixed(6) this.list[i].notinvoiceMoney = (this.list[i].money - this.list[i].invoiceMoney).toFixed(6) + this.list[i].arrivalDate = this.list[i].orderArrivalVos[0].arrivalDate + this.list[i].arrivalNumber = this.list[i].orderArrivalVos[0].arrivalNumber + + this.list[i].enterDate = this.list[i].orderEnterVos[0].enterDate + this.list[i].enterNumber = this.list[i].orderEnterVos[0].enterNumber } this.total = res.data.data.content.totalCount // this.restFilter() diff --git a/src/views/Supplier/components/DetailList.vue b/src/views/Supplier/components/DetailList.vue index e5f4059c..a87e593d 100644 --- a/src/views/Supplier/components/DetailList.vue +++ b/src/views/Supplier/components/DetailList.vue @@ -143,11 +143,12 @@
@@ -162,6 +163,14 @@ + +
@@ -534,6 +543,7 @@ import { paylist } from '@/api/AdvancePay' import { searchstockArrival } from '@/api/StockArrival' import Pagination from '@/components/Pagination' // Secondary package based on el-pagination import permission from '@/directive/permission/index.js' // 权限判断指令 + var _that export default { components: { Pagination }, @@ -621,6 +631,12 @@ export default { }, data() { return { + showlist: [], + getemplist: { + pageNum: 1, + pageSize: 10 + }, + total4: 0, downloadLoading: false, // 延迟记录数据 tableData7: [], @@ -712,6 +728,8 @@ export default { detaildata() { this.personalForm = this.detaildata this.list2 = this.personalForm.supplierDetailVos + this.showlist = this.list2.slice(0, 10) + this.total4 = this.personalForm.supplierDetailVos.length this.tableData6 = this.personalForm.supplierPunishments }, detailid() { @@ -733,6 +751,17 @@ export default { _that = this }, methods: { + getlist(val) { + console.log('val', val) + console.log('this.list2', this.list2) + const previndex = (val.page - 1) * val.limit + const nextindex = val.page * val.limit + const quanlity = val.limit + console.log('previndex', previndex) + console.log('nextindex', nextindex) + this.showlist = this.list2.slice(previndex, nextindex) + console.log('showlist', this.showlist) + }, jundgeprice() { const value = ['1-22-24-115'] const roles = this.$store.getters && this.$store.getters.roles diff --git a/src/views/Supplier/components/MyDialog.vue b/src/views/Supplier/components/MyDialog.vue index 820601e2..472845bc 100644 --- a/src/views/Supplier/components/MyDialog.vue +++ b/src/views/Supplier/components/MyDialog.vue @@ -205,19 +205,20 @@
{{ $t('Hmodule.tjsp') }} - {{ $t('Hmodule.delete') }} + {{ $t('Hmodule.delete') }}
@@ -229,7 +230,7 @@ @@ -273,6 +274,14 @@ + +
@@ -398,6 +407,7 @@ + {{ $t('Hmodule.sure') }} @@ -413,12 +423,14 @@ import MyEmp from './MyEmp' import MyDetail from './MyDetail' import waves from '@/directive/waves' import permission from '@/directive/permission/index.js' // 权限判断指令 +import Pagination from '@/components/Pagination' + // import { forEach } from '../../../../../../OA前台代码/nwow_oa/src/lib/util' // Waves directive // eslint-disable-next-line no-unused-vars var _that export default { directives: { waves, permission }, - components: { MyDetail, MyEmp }, + components: { MyDetail, MyEmp, Pagination }, props: { editcontrol: { @@ -432,6 +444,13 @@ export default { }, data() { return { + showlist: [], + getemplist: { + pageNum: 1, + pageSize: 10 + }, + total: 0, + tableKey: 0, tableKey2: 0, listLoading: true, @@ -520,6 +539,8 @@ export default { this.personalForm = this.editdata this.buyerId = this.editdata.buyerName this.list2 = this._.cloneDeep(this.personalForm.supplierDetailVos) + this.total = this.personalForm.supplierDetailVos.length + this.showlist = this.list2.slice(0, 10) this.handlechange(this.personalForm.countryId) this.handlechange2(this.personalForm.provinceId) getRegion(this.personalForm.regionId).then(res => { @@ -539,6 +560,56 @@ export default { _that = this }, methods: { + handlechangeproportion() { + this.updateList() + }, + updateList() { + const previndex = (this.getemplist.pageNum - 1) * this.getemplist.pageSize + const nextindex = this.getemplist.pageNum * this.getemplist.pageSize + + for (let i = 0; i < this.showlist.length; i++) { + this.list2[previndex + i] = this.showlist[i] + } + }, + removedetail() { + this.$refs.editable.removeSelecteds() + console.log('this.$refs.editable.getRemoveRecords()', this.$refs.editable.getRemoveRecords()) + const deleteData = this.$refs.editable.getRemoveRecords() + console.log('showlist', this.showlist) + for (let i = 0; i < deleteData.length; i++) { + for (let j = 0; j < this.list2.length; j++) { + if (deleteData[i].id === this.list2[j].id) { + this.list2.splice(j, 1) + j-- + } + } + } + this.total = this.list2.length + + // const previndex = (this.getemplist.pageNum - 1) * this.getemplist.pageSize + // const nextindex = this.getemplist.pageNum * this.getemplist.pageSize + + // for (let i = 0; i < this.showlist.length; i++) { + // this.list2[previndex + i] = this.showlist[i] + // } + + console.log('this.getemplist', this.getemplist) + }, + getlist(val) { + console.log('val', val) + console.log('this.list2', this.list2) + const previndex = (val.page - 1) * val.limit + const nextindex = val.page * val.limit + const quanlity = val.limit + console.log('previndex', previndex) + console.log('nextindex', nextindex) + this.showlist = this.list2.slice(previndex, nextindex) + + console.log('showlist', this.showlist) + for (let i = 0; i < this.showlist.length; i++) { + this.list2[previndex + i] = this.showlist[i] + } + }, jundgeprice() { const value = ['1-22-24-115'] const roles = this.$store.getters && this.$store.getters.roles @@ -619,6 +690,7 @@ export default { } }, handlechoose2(scope) { + console.log('12') this.listLoading = true this.proporcontrol = true // this.kongscope = scope @@ -639,7 +711,7 @@ export default { }, productdetail(val) { console.log(val) - const nowlistdata = this.$refs.editable.getRecords() + const nowlistdata = this.list2 for (let i = 0; i < val.length; i++) { console.log(val[i].price) let m = 1 @@ -657,9 +729,13 @@ export default { // val[i].discountRate = 0 // val[i].price = val[i].purchasePrice if (m === 1) { - this.$refs.editable.insert(val[i]) + this.list2.push(val[i]) } } + + console.log('this.list2', this.list2) + this.showlist = this.list2.slice(0, 10) + this.total = this.list2.length }, // 国籍列表 getnationlist() { @@ -823,7 +899,7 @@ export default { this.personalForm.createPersonId = this.$store.getters.userId this.personalForm.countryId = this.$store.getters.countryId this.personalForm.modifyPersonId = this.$store.getters.userId - const EnterDetail = this.$refs.editable.getRecords() + const EnterDetail = this.list2 EnterDetail.map(function(elem) { return elem }).forEach(function(elem) { diff --git a/src/views/SupplierAdjust/components/DetailList.vue b/src/views/SupplierAdjust/components/DetailList.vue index 44c5af17..eba5322d 100644 --- a/src/views/SupplierAdjust/components/DetailList.vue +++ b/src/views/SupplierAdjust/components/DetailList.vue @@ -49,12 +49,14 @@
+ style="width: 100%" + > @@ -70,6 +72,13 @@ +
@@ -153,9 +162,15 @@