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

给单据增加sku字段

parent 1f166552
Hide whitespace changes
Inline Side-by-side
jshERP-web/src/components/jeecg/JEditableTable.vue
View file @ 5bf41a3b
......@@ -743,7 +743,7 @@
>
<span
v-show="col.type === formTypes.inputNumber"
style="padding: 0 10px;"
style="padding: 0 2px;"
>{{statisticsColumns[col.key]}}</span>
</div>
</template>
......@@ -770,7 +770,7 @@
import JSelectMaterial from '@/components/jeecgbiz/JSelectMaterial'
// 行高，需要在实例加载完成前用到
let rowHeight = 61
let rowHeight = 42
export default {
name: 'JEditableTable',
......@@ -2754,7 +2754,7 @@
@borderColor: #e8e8e8;
@border: 1px solid @borderColor;
/* tr & td 之间的间距 */
@spacing: 8px;
@spacing: 2px;
.input-table {
max-width: 100%;
......@@ -2894,7 +2894,7 @@
.td {
/*flex: 1;*/
padding: 14px @spacing 14px 0;
padding: 6px @spacing 6px 0;
justify-content: center;
&:last-child {
......@@ -2908,7 +2908,7 @@
list-style: none;
position: relative;
display: inline-block;
padding: 4px 11px;
padding: 2px 2px;
width: 100%;
height: 32px;
font-size: 14px;
......
jshERP-web/src/components/jeecgbiz/JSelectMaterial.vue
View file @ 5bf41a3b
......@@ -19,7 +19,7 @@
props: {
modalWidth: {
type: Number,
default: 1100,
default: 1200,
required: false
},
value: {
......
jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
View file @ 5bf41a3b
......@@ -99,6 +99,7 @@
{dataIndex: 'standard', title: '规格', width: 80},
{dataIndex: 'model', title: '型号', width: 80},
{dataIndex: 'unit', title: '单位', width: 60},
{dataIndex: 'sku', title: '多属性', width: 100},
{dataIndex: 'stock', title: '库存', width: 50},
{dataIndex: 'expand', title: '扩展信息', width: 80}
],
......
jshERP-web/src/views/bill/AllocationOutList.vue
View file @ 5bf41a3b
......@@ -145,16 +145,6 @@
},
// 表头
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:40,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{ title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) {
if(record.linkNumber) {
......
jshERP-web/src/views/bill/AssembleList.vue
View file @ 5bf41a3b
......@@ -145,16 +145,6 @@
},
// 表头
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:40,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{ title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) {
if(record.linkNumber) {
......
jshERP-web/src/views/bill/DisassembleList.vue
View file @ 5bf41a3b
......@@ -145,16 +145,6 @@
},
// 表头
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:40,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{ title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) {
if(record.linkNumber) {
......
jshERP-web/src/views/bill/OtherInList.vue
View file @ 5bf41a3b
......@@ -155,16 +155,6 @@
},
// 表头
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:40,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{ title: '供应商', dataIndex: 'organName',width:120},
{ title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) {
......
jshERP-web/src/views/bill/OtherOutList.vue
View file @ 5bf41a3b
......@@ -155,16 +155,6 @@
},
// 表头
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:40,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{ title: '客户', dataIndex: 'organName',width:120},
{ title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) {
......
jshERP-web/src/views/bill/PurchaseBackList.vue
View file @ 5bf41a3b
......@@ -155,16 +155,6 @@
},
// 表头
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:40,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{ title: '供应商', dataIndex: 'organName',width:120},
{ title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) {
......
jshERP-web/src/views/bill/PurchaseInList.vue
View file @ 5bf41a3b
......@@ -156,16 +156,6 @@
},
// 表头
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:40,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{ title: '供应商', dataIndex: 'organName',width:120},
{ title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) {
......
jshERP-web/src/views/bill/PurchaseOrderList.vue
View file @ 5bf41a3b
......@@ -163,16 +163,6 @@
},
// 表头
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:40,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{ title: '供应商', dataIndex: 'organName',width:120},
{ title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) {
......
jshERP-web/src/views/bill/RetailBackList.vue
View file @ 5bf41a3b
......@@ -155,16 +155,6 @@
},
// 表头
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:40,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{ title: '会员', dataIndex: 'organName',width:120},
{ title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) {
......
jshERP-web/src/views/bill/RetailOutList.vue
View file @ 5bf41a3b
......@@ -155,16 +155,6 @@
},
// 表头
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:40,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{ title: '会员', dataIndex: 'organName',width:120},
{ title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) {
......
jshERP-web/src/views/bill/SaleBackList.vue
View file @ 5bf41a3b
......@@ -155,16 +155,6 @@
},
// 表头
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:40,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{ title: '客户', dataIndex: 'organName',width:120},
{ title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) {
......
jshERP-web/src/views/bill/SaleOrderList.vue
View file @ 5bf41a3b
......@@ -163,16 +163,6 @@
},
// 表头
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:40,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{ title: '客户', dataIndex: 'organName',width:120},
{ title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) {
......
jshERP-web/src/views/bill/SaleOutList.vue
View file @ 5bf41a3b
......@@ -156,16 +156,6 @@
},
// 表头
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:40,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{ title: '客户', dataIndex: 'organName',width:120},
{ title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) {
......
jshERP-web/src/views/bill/dialog/BillDetail.vue
View file @ 5bf41a3b
......@@ -854,6 +854,7 @@
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '调入仓库', dataIndex: 'anotherDepotName', width: '8%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
......@@ -869,6 +870,7 @@
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
......@@ -884,6 +886,7 @@
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
......@@ -898,6 +901,7 @@
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
......@@ -912,13 +916,14 @@
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'}
],
purchaseBackColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '8%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '7%'},
{ title: '条码', dataIndex: 'barCode', width: '10%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'},
......@@ -926,17 +931,18 @@
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '含税单价', dataIndex: 'taxUnitPrice', width: '6%'},
{ title: '含税单价', dataIndex: 'taxUnitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '税率(%)', dataIndex: 'taxRate', width: '6%'},
{ title: '税率(%)', dataIndex: 'taxRate', width: '5%'},
{ title: '税额', dataIndex: 'taxMoney', width: '5%'},
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '6%'},
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'}
],
purchaseInColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '8%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '7%'},
{ title: '条码', dataIndex: 'barCode', width: '10%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'},
......@@ -944,13 +950,14 @@
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '含税单价', dataIndex: 'taxUnitPrice', width: '6%'},
{ title: '含税单价', dataIndex: 'taxUnitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '税率(%)', dataIndex: 'taxRate', width: '6%'},
{ title: '税率(%)', dataIndex: 'taxRate', width: '5%'},
{ title: '税额', dataIndex: 'taxMoney', width: '5%'},
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '6%'},
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'}
],
purchaseOrderColumns: [
......@@ -962,6 +969,7 @@
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
......@@ -976,6 +984,7 @@
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
......@@ -990,13 +999,14 @@
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'}
],
saleBackColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '8%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '7%'},
{ title: '条码', dataIndex: 'barCode', width: '10%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'},
......@@ -1004,13 +1014,14 @@
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '含税单价', dataIndex: 'taxUnitPrice', width: '6%'},
{ title: '含税单价', dataIndex: 'taxUnitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '税率(%)', dataIndex: 'taxRate', width: '6%'},
{ title: '税率(%)', dataIndex: 'taxRate', width: '5%'},
{ title: '税额', dataIndex: 'taxMoney', width: '5%'},
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '6%'},
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'}
],
saleOrderColumns: [
......@@ -1022,13 +1033,14 @@
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'}
],
saleOutColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '8%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '7%'},
{ title: '条码', dataIndex: 'barCode', width: '10%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'},
......@@ -1036,13 +1048,14 @@
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '含税单价', dataIndex: 'taxUnitPrice', width: '6%'},
{ title: '含税单价', dataIndex: 'taxUnitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '税率(%)', dataIndex: 'taxRate', width: '6%'},
{ title: '税率(%)', dataIndex: 'taxRate', width: '5%'},
{ title: '税额', dataIndex: 'taxMoney', width: '5%'},
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '6%'},
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'}
]
}
......
jshERP-web/src/views/bill/mixins/BillModalMixin.js
View file @ 5bf41a3b
......@@ -196,6 +196,7 @@ export const BillModalMixin = {
model: res.data.model,
materialOther: res.data.materialOther,
unit: res.data.commodityUnit,
sku: res.data.sku,
operNumber: 1,
unitPrice: res.data.billPrice,
taxUnitPrice: res.data.billPrice,
......
jshERP-web/src/views/bill/modules/AllocationOutModal.vue
View file @ 5bf41a3b
......@@ -77,7 +77,7 @@
data () {
return {
title:"操作",
width: '1450px',
width: '1600px',
moreStatus: false,
// 新增时子表默认添加几行空数据
addDefaultRowNum: 1,
......@@ -100,19 +100,20 @@
loading: false,
dataSource: [],
columns: [
{ title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
{ title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
},
{ title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, multi: false,
{ title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
validateRules: [{ required: true, message: '${title}不能为空' }]
},
{ title: '名称', key: 'name', width: '8%', type: FormTypes.input, readonly: true },
{ 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: 'materialOther', width: '6%', 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: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true},
{ title: '调入仓库', key: 'anotherDepotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true},
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
{ title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
{ title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
validateRules: [{ required: true, message: '${title}不能为空' }]
},
......
jshERP-web/src/views/bill/modules/AssembleModal.vue
View file @ 5bf41a3b
......@@ -78,7 +78,7 @@
data () {
return {
title:"操作",
width: '1450px',
width: '1600px',
moreStatus: false,
// 新增时子表默认添加几行空数据
addDefaultRowNum: 1,
......@@ -102,18 +102,19 @@
dataSource: [],
columns: [
{ title: '商品类型',key: 'mType',width:'7%', type: FormTypes.input, readonly: true },
{ title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
{ title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
},
{ title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, multi: false,
{ title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
validateRules: [{ required: true, message: '${title}不能为空' }]
},
{ title: '名称', key: 'name', width: '8%', type: FormTypes.input, readonly: true },
{ 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: 'materialOther', width: '6%', 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 },
{ title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
{ title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
validateRules: [{ required: true, message: '${title}不能为空' }]
},
......
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