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

feat: 修改供应商

Browse source 
feat: 修改供应商
This commit is contained in:
shawnzhang 2021-05-31 09:20:37 +08:00
parent 3f666cd3a8
commit 181caec2e7
9 changed files with 287 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/webpack.prod.conf.js
View file

@ -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()
]
}
})

12
src/api/SupplierAdjust.js
View file

@ -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({

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

@ -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'
}
},

8
src/views/StockCount/stockTrackList.vue
View file

@ -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()

31
src/views/Supplier/components/DetailList.vue
View file

@ -143,11 +143,12 @@
<div class="container">
<el-editable
ref="editable"
:data.sync="list2"
:data.sync="showlist"
:edit-config="{ showIcon: true, showStatus: true}"
class="click-table1"
stripe
border
height="600px"
size="small"
style="width: 100%">
<el-editable-column :label="$t('Hmodule.xh')" fixed="left" width="55px" align="center" type="index"/>
@ -162,6 +163,14 @@
<el-editable-column v-if="jundgeprice()" :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="150px"/>
<el-editable-column v-if="jundgeprice()" :label="$t('updates.sl')" prop="taxRate" align="center" min-width="150px"/>
</el-editable>
<pagination
v-show="total > 0"
:total="total"
:page.sync="getemplist.pageNum"
:limit.sync="getemplist.pageSize"
@pagination="getlist"
/>
</div>
</el-card>
<el-card class="box-card" shadow="never" style="margin-top: 10px">
@ -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

90
src/views/Supplier/components/MyDialog.vue
View file

@ -205,19 +205,20 @@
<div class="buttons" style="margin-top: 35px;margin-bottom: 10px;">
<el-button @click="handleAddproduct">{{ $t('Hmodule.tjsp') }}</el-button>
<my-detail :control.sync="control" @product="productdetail"/>
<el-button type="danger" @click="$refs.editable.removeSelecteds()">{{ $t('Hmodule.delete') }}</el-button>
<el-button type="danger" @click="removedetail">{{ $t('Hmodule.delete') }}</el-button>
</div>
<div class="container">
<el-editable
ref="editable"
:key="tableKey2"
:data.sync="list2"
:data.sync="showlist"
:edit-config="{ showIcon: true, showStatus: true}"
:edit-rules="validRules"
class="click-table1"
stripe
border
size="small"
height="600px"
style="width: 100%">
<el-editable-column type="selection" min-width="55" align="center"/>
<el-editable-column :label="$t('Hmodule.xh')" min-width="55" align="center" type="index"/>
@ -229,7 +230,7 @@
<!-- <el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0,max: 100,precision: 6,controls:false}, type: 'visible'}" prop="proportion" align="center" label="供货比列(%)" min-width="150px"/>-->
<el-editable-column :edit-render="{name: 'ElInput', type: 'visible'}" label="供货比列(%)" prop="proportion" align="center" min-width="150px">
<template slot="edit" slot-scope="scope">
<el-input v-model="scope.row.proportion" @focus="handlechoose2(scope)"/>
<el-input v-model="scope.row.proportion" @focus="handlechoose2(scope)" @change="handlechangeproportion"/>
<!-- <my-supplier :control.sync="proporcontrol" :procode="procode" @supplierName="personName2(scope, $event)"/>-->
</template>
</el-editable-column>
@ -273,6 +274,14 @@
</template>
</el-editable-column>
</el-editable>
<pagination
v-show="total > 0"
:total="total"
:page.sync="getemplist.pageNum"
:limit.sync="getemplist.pageSize"
@pagination="getlist"
/>
</div>
</el-card>
<el-card class="box-card" shadow="never" style="margin-top: 10px">
@ -398,6 +407,7 @@
</template>
</el-table-column>
</el-table>
<el-button v-waves type="success" @click="handleConfirm">{{ $t('Hmodule.sure') }}</el-button>
</div>
</el-form-item>
@ -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) {

43
src/views/SupplierAdjust/components/DetailList.vue
View file

@ -49,12 +49,14 @@
<div class="container">
<el-editable
ref="editable"
:data.sync="list2"
:data.sync="showlist"
:edit-config="{ showIcon: true, showStatus: true}"
class="click-table1"
border
height="600px"
size="small"
style="width: 100%">
style="width: 100%"
>
<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" fixed="left" align="center" />
<el-editable-column :label="$t('Hmodule.wpmc')" prop="productName" fixed="left" align="center" />
@ -70,6 +72,13 @@
<el-editable-column :label="$t('updates.oldSalePrice')" prop="oldSalePrice" align="center" min-width="150px"/>
<el-editable-column :label="$t('updates.newSalePrice')" prop="newSalePrice" align="center" min-width="150px"/>
</el-editable>
<pagination
v-show="total > 0"
:total="total"
:page.sync="getemplist.pageNum"
:limit.sync="getemplist.pageSize"
@pagination="getlist"
/>
</div>
</el-card>
<el-card class="box-card" style="margin-top: 15px" shadow="never">
@ -153,9 +162,15 @@
<script>
import { searchstockArrival } from '@/api/StockArrival'
import { getPrintCount, addPrint } from '@/api/public'
import Pagination from '@/components/Pagination'
import printJS from 'print-js'
var _that
export default {
components: {
Pagination
},
filters: {
isVatFilter(status) {
const statusMap = {
@ -220,6 +235,12 @@ export default {
},
data() {
return {
showlist: [],
getemplist: {
pageNum: 1,
pageSize: 10
},
total: 0,
// 质检信息
Checkreportdata: [],
// 到货信息
@ -253,6 +274,8 @@ export default {
detaildata() {
this.personalForm = this.detaildata
this.list2 = this.personalForm.supplierAdjustDetailVos
this.showlist = this.list2.slice(0, 10)
this.total = this.personalForm.supplierAdjustDetailVos.length
this.reviewList = this.personalForm.approvalUseVos
this.stockArrivaldata.sourceNumber = this.personalForm.orderNumber
this.getstockArrivalList()
@ -262,6 +285,20 @@ 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)
},
test(val) {
console.log('val', val)
},
cutnull(data) {
for (const x in data) {
if (data[x] === null) { // 如果是null 把直接内容转为 ''
@ -280,6 +317,8 @@ export default {
return data
},
async printdata() {
// console.log('this.$ref.editable', this.$refs.editable)
const arr = this.cutnull(this.list2)
for (const i in arr) {
arr[i].step = Number(i) + 1

33
src/views/SupplierAdjust/components/MyDetail.vue
View file

@ -2,6 +2,28 @@
<el-dialog :visible.sync="productVisible" :control="control" :close-on-press-escape="false" :title="$t('Hmodule.xzsp')" top="10px" append-to-body @close="$emit('update:control', false)">
<div class="filter-container">
<!-- 搜索条件栏目 -->
<el-input v-model="getemplist.productCode" :placeholder="$t('Product.code')" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
<el-input v-model="getemplist.productName" :placeholder="$t('Product.productname')" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
<el-select v-model="getemplist.categoryId" :placeholder="$t('Hmodule.wpfl')" class="filter-item" clearable>
<el-option :label="$t('otherlanguage.zc')" value="1"/>
<el-option :label="$t('otherlanguage.pj')" value="2"/>
<el-option :label="$t('otherlanguage.jgj')" value="3"/>
<el-option :label="$t('otherlanguage.xhp')" value="4"/>
<el-option :label="$t('otherlanguage.dc')" value="5"/>
<el-option :label="$t('otherlanguage.xss')" value="6"/>
<el-option :label="$t('otherlanguage.pjj')" value="7"/>
<el-option :label="$t('otherlanguage.hj')" value="8"/>
</el-select>
<el-select v-model="getemplist.typeId" :placeholder="$t('Hmodule.qxzggxh')" clearable class="filter-item">
<el-option
v-for="(item, index) in types"
:key="index"
:label="item.categoryName"
:value="item.id"
/>
</el-select>
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" style="width: 86px" @click="handleFilter">{{ $t('public.search') }}</el-button>
<!-- 列表开始 -->
<el-table
v-loading="listLoading"
@ -134,6 +156,8 @@ export default {
methods: {
getlist() {
console.log('this.datalist', this.datalist)
this.getemplist.supplierId = this.datalist
// 商品列表数据
this.listLoading = true
getSupplierDetailById(this.getemplist).then(res => {
@ -164,14 +188,15 @@ export default {
// 搜索
handleFilter() {
this.getemplist.pagenum = 1
productlist(this.getemplist).then(res => {
getSupplierDetailById(this.getemplist).then(res => {
if (res.data.ret === 200) {
console.log('res', res)
this.list = res.data.data.content.list
this.total = res.data.data.content.totalCount
// this.restFilter()
} else {
// this.restFilter()
}
setTimeout(() => {
this.listLoading = false
}, 0.5 * 100)
})
},
// 批量操作

89
src/views/SupplierAdjust/components/MyDialog.vue
View file

@ -54,12 +54,12 @@
<div class="buttons" style="margin-top: 35px;margin-bottom: 10px;">
<el-button @click="handleAddproduct">{{ $t('Hmodule.tjsp') }}</el-button>
<my-detail :control.sync="control" :datalist = "datalist" @product="productdetail"/>
<el-button type="danger" @click="$refs.editable.removeSelecteds()">{{ $t('Hmodule.delete') }}</el-button>
<el-button type="danger" @click="removedetail">{{ $t('Hmodule.delete') }}</el-button>
</div>
<div class="container">
<el-editable
ref="editable"
:data.sync="list2"
:data.sync="showlist"
:edit-config="{ showIcon: true, showStatus: true}"
:edit-rules="validRules"
class="click-table1"
@ -125,6 +125,13 @@
</template>
</el-editable-column> -->
</el-editable>
<pagination
v-show="total > 0"
:total="total"
:page.sync="getemplist.pageNum"
:limit.sync="getemplist.pageSize"
@pagination="getlist"
/>
</div>
</el-card>
<el-card class="box-card" style="position: fixed;width: 1010px;z-index: 100;height: 70px;bottom: 0;" shadow="never">
@ -143,8 +150,9 @@ import { searchStockCategory } from '@/api/StockCategory'
import { searchCategory } from '@/api/Supplier'
import { searchsupplier } from '@/api/public'
import { search } from '@/api/Supplier'
import Pagination from '@/components/Pagination'
import MyEmp from './MyEmp'
import MyDetail from './MyDetail2'
import MyDetail from './MyDetail'
import MySupplier from './MySupplier'
import MyApply from './MyApply'
import MyPlan from './MyPlan'
@ -154,7 +162,7 @@ import MyContract from './MyContract'
// eslint-disable-next-line no-unused-vars
var _that
export default {
components: { MyContract, MyLnquiry, MyDelivery, MyPlan, MyApply, MySupplier, MyDetail, MyEmp },
components: { MyContract, MyLnquiry, MyDelivery, MyPlan, MyApply, MySupplier, MyDetail, MyEmp, Pagination },
props: {
editcontrol: {
type: Boolean,
@ -199,6 +207,14 @@ export default {
}
}
return {
showlist: [],
getemplist: {
pageNum: 1,
pageSize: 10
},
total: 0,
pickerOptions1: {
disabledDate: (time) => {
return time.getTime() < new Date().getTime() - 8.64e7
@ -338,6 +354,8 @@ export default {
this.stockPersonId = this.personalForm.stockPersonName
this.signPersonId = this.personalForm.signPersonName
this.list2 = this.personalForm.supplierAdjustDetailVos
this.total = this.personalForm.supplierAdjustDetailVos.length
this.showlist = this.list2.slice(0, 10)
const param = {}
param.id = this.personalForm.supplierId
search(param).then(res => {
@ -362,6 +380,53 @@ export default {
_that = this
},
methods: {
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]
}
},
getnewprice(row, scope) {
// if (row !== '' && row !== null && row !== undefined && scope.$index === 0) {
// if (row.newIncludeTaxPrice !== '' && row.newIncludeTaxPrice !== null && row.newIncludeTaxPrice !== undefined) {
@ -373,6 +438,7 @@ export default {
// }
// }
// }
this.updateList()
if (row.newTaxRate && row.newIncludeTaxPrice) {
row.newPrice = row.newIncludeTaxPrice / (1 + row.newTaxRate / 100)
}
@ -396,6 +462,7 @@ export default {
}
},
gettaxRate2(row, scope) {
this.updateList()
console.log('row========tax', row)
row.taxRateFlag = 1
if (row !== '' && row !== null && row !== undefined && scope.$index === 0) {
@ -934,7 +1001,8 @@ export default {
// 供应商列表返回数据
supplierName(val) {
console.log(val)
this.datalist = val.supplierDetailVos
this.datalist = val.id
this.$refs.editable.clear()
// for (let i = 0; i < val.supplierDetailVos.length; i++) {
// val.supplierDetailVos[i].id = ''
@ -1002,7 +1070,7 @@ export default {
}, 0.5 * 100)
})
console.log(val)
const nowlistdata = this.$refs.editable.getRecords()
const nowlistdata = this.list2
const nowlistdata2 = this.supplierIdDetail
for (let i = 0; i < val.length; i++) {
console.log(val[i].price)
@ -1037,8 +1105,11 @@ export default {
}
}
console.log('val[i]', val[i])
this.$refs.editable.insert(val[i])
this.list2.push(val[i])
}
this.showlist = this.list2.slice(0, 10)
this.total = this.list2.length
},
// 清空记录
restAllForm() {
@ -1091,7 +1162,7 @@ export default {
this.personalForm.modifyPersonId = this.$store.getters.userId
this.$refs.personalForm.validate((valid) => {
if (valid) {
const EnterDetail = this.deepClone(this.$refs.editable.getRecords())
const EnterDetail = this.deepClone(this.list2)
if (EnterDetail.length === 0) {
this.$notify.error({
title: 'wrong',
@ -1180,6 +1251,8 @@ export default {
})
return false
}
console.log('EnterDetail.', this.list2)
const parms2 = JSON.stringify(EnterDetail)
const Data = this.personalForm
for (const key in Data) {