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

优化商品页面的样式

Browse Source
This commit is contained in:
季圣华
2022-09-27 23:23:48 +08:00
parent 11834d714f
commit cdc98511fd
6 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jshERP-web/src/components/tools/ImportFileModal.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<a-modal <a-modal
:title="title" :title="title"
:width="400" :width="500"
:visible="visible" :visible="visible"
:confirm-loading="confirmLoading" :confirm-loading="confirmLoading"
:maskClosable="false" :maskClosable="false"

2
jshERP-web/src/views/bill/modules/OtherInModal.vue
View File

@@ -172,7 +172,7 @@
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal }, { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.normal }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.normal }, { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
{ title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号用逗号隔开', { title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号用逗号隔开，请少于100个字符',
validateRules: [{ pattern: /^.{1,100}$/, message: '请小于100位字符' }] validateRules: [{ pattern: /^.{1,100}$/, message: '请小于100位字符' }]
}, },
{ title: '批号', key: 'batchNumber', width: '7%', type: FormTypes.input }, { title: '批号', key: 'batchNumber', width: '7%', type: FormTypes.input },

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

@@ -269,7 +269,7 @@
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal }, { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.normal }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.normal }, { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
{ title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号用逗号隔开', { title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号用逗号隔开，请少于100个字符',
validateRules: [{ pattern: /^.{1,100}$/, message: '请小于100位字符' }] validateRules: [{ pattern: /^.{1,100}$/, message: '请小于100位字符' }]
}, },
{ title: '批号', key: 'batchNumber', width: '7%', type: FormTypes.input }, { title: '批号', key: 'batchNumber', width: '7%', type: FormTypes.input },

2
jshERP-web/src/views/bill/modules/RetailBackModal.vue
View File

@@ -231,7 +231,7 @@
{ title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.normal }, { title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.normal },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.normal }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
{ title: '单位', key: 'unit', width: '5%', type: FormTypes.normal }, { title: '单位', key: 'unit', width: '5%', type: FormTypes.normal },
{ title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号用逗号隔开', { title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号用逗号隔开，请少于100个字符',
validateRules: [{ pattern: /^.{1,100}$/, message: '请小于100位字符' }] validateRules: [{ pattern: /^.{1,100}$/, message: '请小于100位字符' }]
}, },
{ title: '批号', key: 'batchNumber', width: '8%', type: FormTypes.input }, { title: '批号', key: 'batchNumber', width: '8%', type: FormTypes.input },

2
jshERP-web/src/views/bill/modules/SaleBackModal.vue
View File

@@ -247,7 +247,7 @@
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal }, { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.normal }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.normal }, { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
{ title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号用逗号隔开', { title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号用逗号隔开，请少于100个字符',
validateRules: [{ pattern: /^.{1,100}$/, message: '请小于100位字符' }] validateRules: [{ pattern: /^.{1,100}$/, message: '请小于100位字符' }]
}, },
{ title: '批号', key: 'batchNumber', width: '7%', type: FormTypes.input }, { title: '批号', key: 'batchNumber', width: '7%', type: FormTypes.input },

64
jshERP-web/src/views/material/modules/MaterialModal.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<a-modal <j-modal
:title="title" :title="title"
:width="1300" :width="1300"
:visible="visible" :visible="visible"
@@ -98,50 +98,60 @@
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="序列号" data-step="9" data-title="序列号" <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="序列号" data-step="9" data-title="序列号"
data-intro="此处是商品的序列号开关，如果选择了有，则在采购入库单据需要录入该商品的序列号，在销售出库单据需要选择该商品的序列号进行出库"> data-intro="此处是商品的序列号开关，如果选择了有，则在采购入库单据需要录入该商品的序列号，在销售出库单据需要选择该商品的序列号进行出库">
<a-select placeholder="有无序列号" v-decorator="[ 'enableSerialNumber' ]"> <a-tooltip title="如果选择为有，则在采购入库单需要录入该商品的序列号">
<a-select-option value="1">有</a-select-option> <a-select placeholder="有无序列号" v-decorator="[ 'enableSerialNumber' ]">
<a-select-option value="0">无</a-select-option> <a-select-option value="1">有</a-select-option>
</a-select> <a-select-option value="0">无</a-select-option>
</a-select>
</a-tooltip>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="批号" data-step="10" data-title="批号" <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="批号" data-step="10" data-title="批号"
data-intro="此处是商品的批号开关，如果选择了有，则在采购入库单据需要录入该商品的批号和生产日期，在销售出库单据需要选择该商品的批号进行出库"> data-intro="此处是商品的批号开关，如果选择了有，则在采购入库单据需要录入该商品的批号和生产日期，在销售出库单据需要选择该商品的批号进行出库">
<a-select placeholder="有无批号" v-decorator="[ 'enableBatchNumber' ]"> <a-tooltip title="如果选择为有，则在采购入库单需要录入该商品的批号和生产日期">
<a-select-option value="1">有</a-select-option> <a-select placeholder="有无批号" v-decorator="[ 'enableBatchNumber' ]">
<a-select-option value="0">无</a-select-option> <a-select-option value="1">有</a-select-option>
</a-select> <a-select-option value="0">无</a-select-option>
</a-select>
</a-tooltip>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="24" v-if="!model.id"> <a-col :md="6" :sm="24" v-if="!model.id">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="多属性" data-step="11" data-title="多属性" <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="多属性" data-step="11" data-title="多属性"
data-intro="多属性是针对的sku商品（比如服装、鞋帽行业），此处开关如果启用就可以在下方进行多sku的配置，配置具体的颜色、尺码之类的组合"> data-intro="多属性是针对的sku商品（比如服装、鞋帽行业），此处开关如果启用就可以在下方进行多sku的配置，配置具体的颜色、尺码之类的组合">
<a-select mode="multiple" v-decorator="[ 'manySku' ]" showSearch optionFilterProp="children" <a-tooltip title="多属性针对服装、鞋帽等行业，配合生成条码一起使用">
placeholder="请选择多属性（可多选）" @change="onManySkuChange"> <a-select mode="multiple" v-decorator="[ 'manySku' ]" showSearch optionFilterProp="children"
<a-select-option v-for="(item,index) in materialAttributeList" :key="index" :value="item.value" :disabled="item.disabled"> placeholder="请选择多属性（可多选）" @change="onManySkuChange">
{{ item.name }} <a-select-option v-for="(item,index) in materialAttributeList" :key="index" :value="item.value" :disabled="item.disabled">
</a-select-option> {{ item.name }}
</a-select> </a-select-option>
</a-select>
</a-tooltip>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :md="6" :sm="24" v-if="manySkuSelected>=1"> <a-col :md="6" :sm="24" v-if="manySkuSelected>=1">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="skuOneTitle"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="skuOneTitle">
<a-select mode="multiple" v-decorator="[ 'skuOne' ]" showSearch optionFilterProp="children"> <a-tooltip title="选择之后请点击生成条码">
<a-select-option v-for="(item,index) in skuOneList" :key="index" :value="item.value"> <a-select mode="multiple" v-decorator="[ 'skuOne' ]" showSearch optionFilterProp="children" placeholder="请选择（可多选）" >
{{ item.name }} <a-select-option v-for="(item,index) in skuOneList" :key="index" :value="item.value">
</a-select-option> {{ item.name }}
</a-select> </a-select-option>
</a-select>
</a-tooltip>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="24" v-if="manySkuSelected>=2"> <a-col :md="6" :sm="24" v-if="manySkuSelected>=2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="skuTwoTitle"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="skuTwoTitle">
<a-select mode="multiple" v-decorator="[ 'skuTwo' ]" showSearch optionFilterProp="children"> <a-tooltip title="选择之后请点击生成条码">
<a-select-option v-for="(item,index) in skuTwoList" :key="index" :value="item.value"> <a-select mode="multiple" v-decorator="[ 'skuTwo' ]" showSearch optionFilterProp="children" placeholder="请选择（可多选）" >
{{ item.name }} <a-select-option v-for="(item,index) in skuTwoList" :key="index" :value="item.value">
</a-select-option> {{ item.name }}
</a-select> </a-select-option>
</a-select>
</a-tooltip>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="24" v-if="manySkuSelected>=1"> <a-col :md="6" :sm="24" v-if="manySkuSelected>=1">
@@ -247,7 +257,7 @@
</a-form> </a-form>
</a-spin> </a-spin>
<unit-modal ref="unitModalForm" @ok="unitModalFormOk"></unit-modal> <unit-modal ref="unitModalForm" @ok="unitModalFormOk"></unit-modal>
</a-modal> </j-modal>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'
@@ -797,7 +807,7 @@
this.meTable.dataSource = [] this.meTable.dataSource = []
} }
} else { } else {
this.$message.warning('请填写单位，注意不要勾选多单位！'); this.$message.warning('请填写单位（注意不要勾选多单位）');
this.barCodeSwitch = false; this.barCodeSwitch = false;
} }
}, },