purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

初步给商品的扩展信息拆分成扩展1 扩展2 扩展3

Browse Source
This commit is contained in:
jishenghua
2025-03-24 23:17:10 +08:00
parent 91a985ff58
commit ce8af5bedd
8 changed files with 125 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
View File

@@ -74,6 +74,21 @@
<a-input placeholder="请输入制造商" v-model="queryParam.mfrs"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="8">
<a-form-item label="扩展1" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
<a-input placeholder="请输入扩展1" v-model="queryParam.otherField1"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="8">
<a-form-item label="扩展2" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
<a-input placeholder="请输入扩展2" v-model="queryParam.otherField2"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="8">
<a-form-item label="扩展3" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
<a-input placeholder="请输入扩展3" v-model="queryParam.otherField3"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="序列号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select placeholder="有无序列号" v-model="queryParam.enableSerialNumber">
@@ -155,6 +170,9 @@
brand: '',
categoryId: undefined,
mfrs: '',
otherField1:'',
otherField2:'',
otherField3:'',
enableSerialNumber: undefined,
enableBatchNumber: undefined
},
@@ -179,7 +197,9 @@
{dataIndex: 'unit', title: '单位'},
{dataIndex: 'sku', title: '多属性'},
{dataIndex: 'stock', title: '库存'},
{dataIndex: 'expand', title: '扩展信息'}
{dataIndex: 'otherField1', title: '扩展1'},
{dataIndex: 'otherField2', title: '扩展2'},
{dataIndex: 'otherField3', title: '扩展3'}
],
scrollTrigger: {},
dataSource: [],

12
jshERP-web/src/views/bill/mixins/BillModalMixin.js
View File

@@ -652,6 +652,9 @@ export const BillModalMixin = {
this.changeFormTypes(this.materialTable.columns, 'brand', 0)
this.changeFormTypes(this.materialTable.columns, 'mfrs', 0)
this.changeFormTypes(this.materialTable.columns, 'materialOther', 0)
this.changeFormTypes(this.materialTable.columns, 'otherField1', 0)
this.changeFormTypes(this.materialTable.columns, 'otherField1', 0)
this.changeFormTypes(this.materialTable.columns, 'otherField1', 0)
this.changeFormTypes(this.materialTable.columns, 'sku', 0)
},
//使得sku、序列号、批号、到期日等为显示
@@ -671,6 +674,15 @@ export const BillModalMixin = {
if(info.materialOther) {
this.changeFormTypes(this.materialTable.columns, 'materialOther', 1)
}
if(info.otherField1) {
this.changeFormTypes(this.materialTable.columns, 'otherField1', 1)
}
if(info.otherField2) {
this.changeFormTypes(this.materialTable.columns, 'otherField2', 1)
}
if(info.otherField3) {
this.changeFormTypes(this.materialTable.columns, 'otherField3', 1)
}
if(info.sku) {
this.changeFormTypes(this.materialTable.columns, 'sku', 1)
}

4
jshERP-web/src/views/bill/modules/PurchaseInModal.vue
View File

@@ -278,7 +278,9 @@
{ title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
{ title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
{ title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
{ title: '扩展1', key: 'otherField1', width: '4%', type: FormTypes.normal },
{ title: '扩展2', key: 'otherField2', width: '4%', type: FormTypes.normal },
{ title: '扩展3', key: 'otherField3', width: '4%', type: FormTypes.normal },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
{ title: '序列号', key: 'snList', width: '12%', type: FormTypes.popupJsh, kind: 'snAdd', multi: true },

23
jshERP-web/src/views/material/MaterialList.vue
View File

@@ -58,6 +58,21 @@
<a-input placeholder="请输入制造商查询" v-model="queryParam.mfrs"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="扩展1" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入扩展1查询" v-model="queryParam.otherField1"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="扩展2" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入扩展2查询" v-model="queryParam.otherField2"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="扩展3" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入扩展3查询" v-model="queryParam.otherField3"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select placeholder="请选择状态" v-model="queryParam.enabled">
@@ -254,7 +269,9 @@
color:'',
brand:'',
mfrs:'',
materialOther:'',
otherField1:'',
otherField2:'',
otherField3:'',
weight:'',
expiryNum:'',
enabled: undefined,
@@ -292,7 +309,9 @@
{title: '品牌', dataIndex: 'brand', width: 100, ellipsis:true},
{title: '助记码', dataIndex: 'mnemonic', width: 80, ellipsis:true},
{title: '类别', dataIndex: 'categoryName', width: 100, ellipsis:true},
{title: '扩展信息', dataIndex: 'materialOther', width: 100, ellipsis:true},
{title: '扩展1', dataIndex: 'otherField1', width: 100, ellipsis:true},
{title: '扩展2', dataIndex: 'otherField2', width: 100, ellipsis:true},
{title: '扩展3', dataIndex: 'otherField3', width: 100, ellipsis:true},
{title: '单位', dataIndex: 'unit', width: 100, ellipsis:true,
customRender:function (t,r,index) {
if (r) {