Skip to content
GitLab
Commit d2226876 authored by 季圣华's avatar 季圣华
Browse files

给单据增加颜色字段的展示

parent 60cefec9
Hide whitespace changes
Inline Side-by-side
jshERP-web/src/components/jeecgbiz/JSelectList.vue
View file @ d2226876
......@@ -23,7 +23,7 @@
props: {
modalWidth: {
type: Number,
default: 1200,
default: 1300,
required: false
},
value: {
......
jshERP-web/src/components/jeecgbiz/JSelectMaterial.vue
View file @ d2226876
......@@ -19,7 +19,7 @@
props: {
modalWidth: {
type: Number,
default: 1200,
default: 1300,
required: false
},
value: {
......
jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
View file @ d2226876
......@@ -106,6 +106,7 @@
{dataIndex: 'categoryName', title: '类别', width: 80},
{dataIndex: 'standard', title: '规格', width: 80},
{dataIndex: 'model', title: '型号', width: 80},
{dataIndex: 'color', title: '颜色', width: 80},
{dataIndex: 'unit', title: '单位', width: 60},
{dataIndex: 'sku', title: '多属性', width: 80},
{dataIndex: 'stock', title: '库存', width: 60},
......
jshERP-web/src/views/bill/dialog/BillDetail.vue
View file @ d2226876
......@@ -889,6 +889,7 @@
{ title: '名称', dataIndex: 'name'},
{ title: '规格', dataIndex: 'standard'},
{ title: '型号', dataIndex: 'model'},
{ title: '颜色', dataIndex: 'color'},
{ title: '扩展信息', dataIndex: 'materialOther'},
{ title: '库存', dataIndex: 'stock'},
{ title: '单位', dataIndex: 'unit'},
......@@ -904,6 +905,7 @@
{ title: '名称', dataIndex: 'name'},
{ title: '规格', dataIndex: 'standard'},
{ title: '型号', dataIndex: 'model'},
{ title: '颜色', dataIndex: 'color'},
{ title: '扩展信息', dataIndex: 'materialOther'},
{ title: '库存', dataIndex: 'stock'},
{ title: '单位', dataIndex: 'unit'},
......@@ -918,6 +920,7 @@
{ title: '名称', dataIndex: 'name'},
{ title: '规格', dataIndex: 'standard'},
{ title: '型号', dataIndex: 'model'},
{ title: '颜色', dataIndex: 'color'},
{ title: '扩展信息', dataIndex: 'materialOther'},
{ title: '库存', dataIndex: 'stock'},
{ title: '单位', dataIndex: 'unit'},
......@@ -934,6 +937,7 @@
{ title: '名称', dataIndex: 'name'},
{ title: '规格', dataIndex: 'standard'},
{ title: '型号', dataIndex: 'model'},
{ title: '颜色', dataIndex: 'color'},
{ title: '扩展信息', dataIndex: 'materialOther'},
{ title: '库存', dataIndex: 'stock'},
{ title: '单位', dataIndex: 'unit'},
......@@ -956,6 +960,7 @@
{ title: '名称', dataIndex: 'name'},
{ title: '规格', dataIndex: 'standard'},
{ title: '型号', dataIndex: 'model'},
{ title: '颜色', dataIndex: 'color'},
{ title: '扩展信息', dataIndex: 'materialOther'},
{ title: '库存', dataIndex: 'stock'},
{ title: '单位', dataIndex: 'unit'},
......@@ -977,6 +982,7 @@
{ title: '名称', dataIndex: 'name'},
{ title: '规格', dataIndex: 'standard'},
{ title: '型号', dataIndex: 'model'},
{ title: '颜色', dataIndex: 'color'},
{ title: '扩展信息', dataIndex: 'materialOther'},
{ title: '库存', dataIndex: 'stock'},
{ title: '单位', dataIndex: 'unit'},
......@@ -993,6 +999,7 @@
{ title: '名称', dataIndex: 'name'},
{ title: '规格', dataIndex: 'standard'},
{ title: '型号', dataIndex: 'model'},
{ title: '颜色', dataIndex: 'color'},
{ title: '扩展信息', dataIndex: 'materialOther'},
{ title: '库存', dataIndex: 'stock'},
{ title: '单位', dataIndex: 'unit'},
......@@ -1015,6 +1022,7 @@
{ title: '名称', dataIndex: 'name'},
{ title: '规格', dataIndex: 'standard'},
{ title: '型号', dataIndex: 'model'},
{ title: '颜色', dataIndex: 'color'},
{ title: '扩展信息', dataIndex: 'materialOther'},
{ title: '库存', dataIndex: 'stock'},
{ title: '单位', dataIndex: 'unit'},
......@@ -1037,6 +1045,7 @@
{ title: '名称', dataIndex: 'name'},
{ title: '规格', dataIndex: 'standard'},
{ title: '型号', dataIndex: 'model'},
{ title: '颜色', dataIndex: 'color'},
{ title: '扩展信息', dataIndex: 'materialOther'},
{ title: '库存', dataIndex: 'stock'},
{ title: '单位', dataIndex: 'unit'},
......@@ -1052,6 +1061,7 @@
{ title: '名称', dataIndex: 'name'},
{ title: '规格', dataIndex: 'standard'},
{ title: '型号', dataIndex: 'model'},
{ title: '颜色', dataIndex: 'color'},
{ title: '扩展信息', dataIndex: 'materialOther'},
{ title: '库存', dataIndex: 'stock'},
{ title: '单位', dataIndex: 'unit'},
......@@ -1067,6 +1077,7 @@
{ title: '名称', dataIndex: 'name'},
{ title: '规格', dataIndex: 'standard'},
{ title: '型号', dataIndex: 'model'},
{ title: '颜色', dataIndex: 'color'},
{ title: '扩展信息', dataIndex: 'materialOther'},
{ title: '库存', dataIndex: 'stock'},
{ title: '调入仓库', dataIndex: 'anotherDepotName'},
......@@ -1084,6 +1095,7 @@
{ title: '名称', dataIndex: 'name'},
{ title: '规格', dataIndex: 'standard'},
{ title: '型号', dataIndex: 'model'},
{ title: '颜色', dataIndex: 'color'},
{ title: '扩展信息', dataIndex: 'materialOther'},
{ title: '库存', dataIndex: 'stock'},
{ title: '单位', dataIndex: 'unit'},
......@@ -1100,6 +1112,7 @@
{ title: '名称', dataIndex: 'name'},
{ title: '规格', dataIndex: 'standard'},
{ title: '型号', dataIndex: 'model'},
{ title: '颜色', dataIndex: 'color'},
{ title: '扩展信息', dataIndex: 'materialOther'},
{ title: '库存', dataIndex: 'stock'},
{ title: '单位', dataIndex: 'unit'},
......
jshERP-web/src/views/bill/mixins/BillModalMixin.js
View file @ d2226876
......@@ -89,18 +89,8 @@ export const BillModalMixin = {
if(res && res.code === 200){
tab.dataSource = res.data.rows
for(let i=0; i<tab.dataSource.length; i++){
if(tab.dataSource[i].snList) {
this.changeFormTypes(this.materialTable.columns, 'snList', 1)
}
if(tab.dataSource[i].batchNumber) {
this.changeFormTypes(this.materialTable.columns, 'batchNumber', 1)
}
if(tab.dataSource[i].expirationDate) {
this.changeFormTypes(this.materialTable.columns, 'expirationDate', 1)
}
if(tab.dataSource[i].sku) {
this.changeFormTypes(this.materialTable.columns, 'sku', 1)
}
let info = tab.dataSource[i]
this.changeColumnShow(info)
}
typeof success === 'function' ? success(res) : ''
}
......@@ -260,16 +250,7 @@ export const BillModalMixin = {
let mArr = values
for (let i = 0; i < mList.length; i++) {
let mInfo = mList[i]
if(mInfo.sku) {
this.changeFormTypes(this.materialTable.columns, 'sku', 1)
}
if(mInfo.enableSerialNumber === "1") {
this.changeFormTypes(this.materialTable.columns, 'snList', 1)
}
if(mInfo.enableBatchNumber === "1") {
this.changeFormTypes(this.materialTable.columns, 'batchNumber', 1)
this.changeFormTypes(this.materialTable.columns, 'expirationDate', 1)
}
this.changeColumnShow(mInfo)
let mObj = this.parseInfoToObj(mInfo)
mObj.depotId = mInfo.depotId
mObj.stock = mInfo.stock
......@@ -294,16 +275,7 @@ export const BillModalMixin = {
let mArr = []
for (let i = 0; i < mList.length; i++) {
let mInfo = mList[i]
if(mInfo.sku) {
this.changeFormTypes(this.materialTable.columns, 'sku', 1)
}
if(mInfo.enableSerialNumber === "1") {
this.changeFormTypes(this.materialTable.columns, 'snList', 1)
}
if(mInfo.enableBatchNumber === "1") {
this.changeFormTypes(this.materialTable.columns, 'batchNumber', 1)
this.changeFormTypes(this.materialTable.columns, 'expirationDate', 1)
}
this.changeColumnShow(mInfo)
let mObj = {
rowKey: row.id,
values: this.parseInfoToObj(mInfo)
......@@ -424,6 +396,7 @@ export const BillModalMixin = {
name: mInfo.name,
standard: mInfo.standard,
model: mInfo.model,
color: mInfo.color,
materialOther: mInfo.materialOther,
unit: mInfo.commodityUnit,
sku: mInfo.sku,
......@@ -436,8 +409,24 @@ export const BillModalMixin = {
taxLastMoney: mInfo.billPrice
}
},
//控制sku、序列号、批号输入框的显示和隐藏状态
changeColumnShowOrHide(info) {
//使得型号、颜色、扩展信息、sku等为隐藏
changeColumnHide() {
this.changeFormTypes(this.materialTable.columns, 'model', 0)
this.changeFormTypes(this.materialTable.columns, 'color', 0)
this.changeFormTypes(this.materialTable.columns, 'materialOther', 0)
this.changeFormTypes(this.materialTable.columns, 'sku', 0)
},
//使得sku、序列号、批号、到期日等为显示
changeColumnShow(info) {
if(info.model) {
this.changeFormTypes(this.materialTable.columns, 'model', 1)
}
if(info.color) {
this.changeFormTypes(this.materialTable.columns, 'color', 1)
}
if(info.materialOther) {
this.changeFormTypes(this.materialTable.columns, 'materialOther', 1)
}
if(info.sku) {
this.changeFormTypes(this.materialTable.columns, 'sku', 1)
}
......@@ -573,16 +562,7 @@ export const BillModalMixin = {
let mList = res.data
if(mList && mList.length>0) {
let mInfo = mList[0]
if(mInfo.sku) {
this.changeFormTypes(this.materialTable.columns, 'sku', 1)
}
if(mInfo.enableSerialNumber === "1") {
this.changeFormTypes(this.materialTable.columns, 'snList', 1)
}
if(mInfo.enableBatchNumber === "1") {
this.changeFormTypes(this.materialTable.columns, 'batchNumber', 1)
this.changeFormTypes(this.materialTable.columns, 'expirationDate', 1)
}
this.changeColumnShow(mInfo)
item.depotId = mInfo.depotId
item.name = mInfo.name
item.standard = mInfo.standard
......
jshERP-web/src/views/bill/modules/AllocationOutModal.vue
View file @ d2226876
......@@ -123,6 +123,7 @@
{ title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
{ title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
{ title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
{ title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
{ title: '调入仓库', key: 'anotherDepotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true},
......@@ -161,7 +162,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.changeFormTypes(this.materialTable.columns, 'sku', 0)
this.changeColumnHide()
if (this.action === 'add') {
this.addInit(this.prefixNo)
this.fileList = []
......
jshERP-web/src/views/bill/modules/AssembleModal.vue
View file @ d2226876
......@@ -125,6 +125,7 @@
{ title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
{ title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
{ title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
{ title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
......@@ -162,7 +163,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.changeFormTypes(this.materialTable.columns, 'sku', 0)
this.changeColumnHide()
if (this.action === 'add') {
this.addInit(this.prefixNo)
this.fileList = []
......
jshERP-web/src/views/bill/modules/DisassembleModal.vue
View file @ d2226876
......@@ -125,6 +125,7 @@
{ title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
{ title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
{ title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
{ title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
......@@ -162,7 +163,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.changeFormTypes(this.materialTable.columns, 'sku', 0)
this.changeColumnHide()
if (this.action === 'add') {
this.addInit(this.prefixNo)
this.fileList = []
......
jshERP-web/src/views/bill/modules/OtherInModal.vue
View file @ d2226876
......@@ -132,6 +132,7 @@
{ title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
{ title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
{ title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
{ title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
......@@ -169,7 +170,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.changeFormTypes(this.materialTable.columns, 'sku', 0)
this.changeColumnHide()
if (this.action === 'add') {
this.addInit(this.prefixNo)
this.fileList = []
......
jshERP-web/src/views/bill/modules/OtherOutModal.vue
View file @ d2226876
......@@ -132,6 +132,7 @@
{ title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
{ title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
{ title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
{ title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
......@@ -169,7 +170,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.changeFormTypes(this.materialTable.columns, 'sku', 0)
this.changeColumnHide()
if (this.action === 'add') {
this.addInit(this.prefixNo)
this.fileList = []
......
jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
View file @ d2226876
......@@ -192,6 +192,7 @@
{ title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
{ title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
{ title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
{ title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
......@@ -243,10 +244,10 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.changeColumnHide()
this.changeFormTypes(this.materialTable.columns, 'snList', 0)
this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0)
this.changeFormTypes(this.materialTable.columns, 'expirationDate', 0)
this.changeFormTypes(this.materialTable.columns, 'sku', 0)
if (this.action === 'add') {
this.addInit(this.prefixNo)
this.fileList = []
......@@ -348,7 +349,7 @@
info.taxMoney = 0
info.taxLastMoney = info.allPrice
listEx.push(info)
this.changeColumnShowOrHide(info)
this.changeColumnShow(info)
}
tab.dataSource = listEx
typeof success === 'function' ? success(res) : ''
......
jshERP-web/src/views/bill/modules/PurchaseInModal.vue
View file @ d2226876
......@@ -193,6 +193,7 @@
{ title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
{ title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
{ title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
{ title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
......@@ -246,10 +247,10 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.changeColumnHide()
this.changeFormTypes(this.materialTable.columns, 'snList', 0)
this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0)
this.changeFormTypes(this.materialTable.columns, 'expirationDate', 0)
this.changeFormTypes(this.materialTable.columns, 'sku', 0)
this.changeFormTypes(this.materialTable.columns, 'preNumber', 0)
this.changeFormTypes(this.materialTable.columns, 'finishNumber', 0)
if (this.action === 'add') {
......@@ -363,7 +364,7 @@
info.taxMoney = 0
info.taxLastMoney = info.allPrice
listEx.push(info)
this.changeColumnShowOrHide(info)
this.changeColumnShow(info)
}
tab.dataSource = listEx
//给优惠后金额重新赋值
......
jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
View file @ d2226876
......@@ -132,6 +132,7 @@
{ title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
{ title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
{ title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
{ title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
......@@ -169,7 +170,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.changeFormTypes(this.materialTable.columns, 'sku', 0)
this.changeColumnHide()
if (this.action === 'add') {
this.addInit(this.prefixNo)
this.fileList = []
......
jshERP-web/src/views/bill/modules/RetailBackModal.vue
View file @ d2226876
......@@ -175,6 +175,7 @@
{ title: '名称', key: 'name', width: '9%', type: FormTypes.input, readonly: true },
{ title: '规格', key: 'standard', width: '6%', type: FormTypes.input, readonly: true },
{ title: '型号', key: 'model', width: '6%', type: FormTypes.input, readonly: true },
{ title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
{ title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.input, readonly: true },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
......@@ -212,7 +213,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.changeFormTypes(this.materialTable.columns, 'sku', 0)
this.changeColumnHide()
if (this.action === 'add') {
this.addInit(this.prefixNo)
this.fileList = []
......
jshERP-web/src/views/bill/modules/RetailOutModal.vue
View file @ d2226876
......@@ -177,6 +177,7 @@
{ title: '名称', key: 'name', width: '9%', type: FormTypes.input, readonly: true },
{ title: '规格', key: 'standard', width: '6%', type: FormTypes.input, readonly: true },
{ title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
{ title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
{ title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.input, readonly: true },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
......@@ -215,7 +216,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.changeFormTypes(this.materialTable.columns, 'sku', 0)
this.changeColumnHide()
if (this.action === 'add') {
this.addInit(this.prefixNo)
this.fileList = []
......
jshERP-web/src/views/bill/modules/SaleBackModal.vue
View file @ d2226876
......@@ -197,6 +197,7 @@
{ title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
{ title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
{ title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
{ title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
......@@ -248,10 +249,10 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.changeColumnHide()
this.changeFormTypes(this.materialTable.columns, 'snList', 0)
this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0)
this.changeFormTypes(this.materialTable.columns, 'expirationDate', 0)
this.changeFormTypes(this.materialTable.columns, 'sku', 0)
if (this.action === 'add') {
this.addInit(this.prefixNo)
this.personList.value = ''
......@@ -359,7 +360,7 @@
info.taxMoney = 0
info.taxLastMoney = info.allPrice
listEx.push(info)
this.changeColumnShowOrHide(info)
this.changeColumnShow(info)
}
tab.dataSource = listEx
typeof success === 'function' ? success(res) : ''
......
jshERP-web/src/views/bill/modules/SaleOrderModal.vue
View file @ d2226876
......@@ -135,6 +135,7 @@
{ title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
{ title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
{ title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
{ title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
......@@ -172,7 +173,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.changeFormTypes(this.materialTable.columns, 'sku', 0)
this.changeColumnHide()
if (this.action === 'add') {
this.addInit(this.prefixNo)
this.personList.value = ''
......
jshERP-web/src/views/bill/modules/SaleOutModal.vue
View file @ d2226876
......@@ -197,6 +197,7 @@
{ title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
{ title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
{ title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
{ title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
......@@ -248,10 +249,10 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.changeColumnHide()
this.changeFormTypes(this.materialTable.columns, 'snList', 0)
this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0)
this.changeFormTypes(this.materialTable.columns, 'expirationDate', 0)
this.changeFormTypes(this.materialTable.columns, 'sku', 0)
this.changeFormTypes(this.materialTable.columns, 'preNumber', 0)
this.changeFormTypes(this.materialTable.columns, 'finishNumber', 0)
if (this.action === 'add') {
......@@ -367,7 +368,7 @@
info.taxMoney = 0
info.taxLastMoney = info.allPrice
listEx.push(info)
this.changeColumnShowOrHide(info)
this.changeColumnShow(info)
}
tab.dataSource = listEx
//给优惠后金额重新赋值
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment