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

调整会员、供应商、客户的页面样式

parent 52b1c8ee
Hide whitespace changes
Inline Side-by-side
jshERP-web/src/views/system/MemberList.vue
View file @ 20e2c141
......@@ -8,8 +8,8 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="24">
<a-form-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入名称查询" v-model="queryParam.supplier"></a-input>
<a-form-item label="会员卡号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入会员卡号查询" v-model="queryParam.supplier"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
......@@ -135,7 +135,7 @@
align:"center",
scopedSlots: { customRender: 'action' },
},
{ title: '名称',dataIndex: 'supplier',width:150,align:"left"},
{ title: '会员卡号',dataIndex: 'supplier',width:150,align:"left"},
{ title: '联系人', dataIndex: 'contacts',width:70,align:"left"},
{ title: '手机号码', dataIndex: 'telephone',width:100,align:"left"},
{ title: '联系电话', dataIndex: 'phoneNum',width:100,align:"left"},
......
jshERP-web/src/views/system/modules/CustomerModal.vue
View file @ 20e2c141
......@@ -8,7 +8,7 @@
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:15%;height: 75%;overflow-y: hidden">
style="top:10%;height: 80%;overflow-y: hidden">
<template slot="footer">
<a-button key="back" v-if="isReadOnly" @click="handleCancel">
关闭
......@@ -16,81 +16,85 @@
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form" id="customerModal">
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
<a-input placeholder="请输入名称" v-decorator.trim="[ 'supplier', validatorRules.supplier]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系人">
<a-input placeholder="请输入联系人" v-decorator.trim="[ 'contacts' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号码">
<a-input placeholder="请输入手机号码" v-decorator.trim="[ 'telephone' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系电话">
<a-input placeholder="请输入联系电话" v-decorator.trim="[ 'phoneNum' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电子邮箱">
<a-input placeholder="请输入电子邮箱" v-decorator.trim="[ 'email' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="传真">
<a-input placeholder="请输入传真" v-decorator.trim="[ 'fax' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期初应收">
<a-input placeholder="请输入期初应收" v-decorator.trim="[ 'beginNeedGet' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期末应收">
<a-input v-decorator.trim="[ 'allNeedGet' ]" :readOnly="true" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="纳税人识别号">
<a-input placeholder="请输入纳税人识别号" v-decorator.trim="[ 'taxNum' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="税率(%)">
<a-input-number style="width:100%" placeholder="请输入税率" v-decorator.trim="[ 'taxRate' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开户行">
<a-input placeholder="请输入开户行" v-decorator.trim="[ 'bankName' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="账号">
<a-input placeholder="请输入账号" v-decorator.trim="[ 'accountNumber' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="地址">
<a-input placeholder="请输入地址" v-decorator.trim="[ 'address' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
<a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" />
</a-form-item>
</a-col>
<a-row class="form-row" :gutter="24">
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
<a-input placeholder="请输入名称" v-decorator.trim="[ 'supplier', validatorRules.supplier]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系人">
<a-input placeholder="请输入联系人" v-decorator.trim="[ 'contacts' ]" />
</a-form-item>
</a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号码">
<a-input placeholder="请输入手机号码" v-decorator.trim="[ 'telephone' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系电话">
<a-input placeholder="请输入联系电话" v-decorator.trim="[ 'phoneNum' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电子邮箱">
<a-input placeholder="请输入电子邮箱" v-decorator.trim="[ 'email' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="传真">
<a-input placeholder="请输入传真" v-decorator.trim="[ 'fax' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期初应收">
<a-input placeholder="请输入期初应收" v-decorator.trim="[ 'beginNeedGet' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期末应收">
<a-input v-decorator.trim="[ 'allNeedGet' ]" :readOnly="true" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="纳税人识别号">
<a-input placeholder="请输入纳税人识别号" v-decorator.trim="[ 'taxNum' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="税率(%)">
<a-input-number style="width:100%" placeholder="请输入税率" v-decorator.trim="[ 'taxRate' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开户行">
<a-input placeholder="请输入开户行" v-decorator.trim="[ 'bankName' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="账号">
<a-input placeholder="请输入账号" v-decorator.trim="[ 'accountNumber' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="地址">
<a-input placeholder="请输入地址" v-decorator.trim="[ 'address' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
<a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-spin>
</a-modal>
......
jshERP-web/src/views/system/modules/MemberModal.vue
View file @ 20e2c141
......@@ -16,41 +16,45 @@
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form" id="memberModal">
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
<a-input placeholder="请输入名称" v-decorator.trim="[ 'supplier', validatorRules.supplier]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系人">
<a-input placeholder="请输入联系人" v-decorator.trim="[ 'contacts' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号码">
<a-input placeholder="请输入手机号码" v-decorator.trim="[ 'telephone' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系电话">
<a-input placeholder="请输入联系电话" v-decorator.trim="[ 'phoneNum' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电子邮箱">
<a-input placeholder="请输入电子邮箱" v-decorator.trim="[ 'email' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
<a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" />
</a-form-item>
</a-col>
<a-row class="form-row" :gutter="24">
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号">
<a-input placeholder="请输入会员卡号" v-decorator.trim="[ 'supplier', validatorRules.supplier]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系人">
<a-input placeholder="请输入联系人" v-decorator.trim="[ 'contacts' ]" />
</a-form-item>
</a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号码">
<a-input placeholder="请输入手机号码" v-decorator.trim="[ 'telephone' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系电话">
<a-input placeholder="请输入联系电话" v-decorator.trim="[ 'phoneNum' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电子邮箱">
<a-input placeholder="请输入电子邮箱" v-decorator.trim="[ 'email' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
<a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-spin>
</a-modal>
......@@ -80,7 +84,7 @@
validatorRules:{
supplier:{
rules: [
{ required: true, message: '请输入名称!' },
{ required: true, message: '请输入会员卡号!' },
{ min: 2, max: 60, message: '长度在 2 到 60 个字符', trigger: 'blur' },
{ validator: this.validateSupplierName}
]
......@@ -154,7 +158,7 @@
if(!res.data.status){
callback();
} else {
callback("名称已经存在");
callback("会员卡号已经存在");
}
} else {
callback(res.data);
......
jshERP-web/src/views/system/modules/VendorModal.vue
View file @ 20e2c141
......@@ -8,7 +8,7 @@
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:15%;height: 75%;overflow-y: hidden">
style="top:10%;height: 80%;overflow-y: hidden">
<template slot="footer">
<a-button key="back" v-if="isReadOnly" @click="handleCancel">
关闭
......@@ -16,81 +16,85 @@
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form" id="vendorModal">
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
<a-input placeholder="请输入名称" v-decorator.trim="[ 'supplier', validatorRules.supplier]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系人">
<a-input placeholder="请输入联系人" v-decorator.trim="[ 'contacts' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号码">
<a-input placeholder="请输入手机号码" v-decorator.trim="[ 'telephone' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系电话">
<a-input placeholder="请输入联系电话" v-decorator.trim="[ 'phoneNum' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电子邮箱">
<a-input placeholder="请输入电子邮箱" v-decorator.trim="[ 'email' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="传真">
<a-input placeholder="请输入传真" v-decorator.trim="[ 'fax' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期初应付">
<a-input placeholder="请输入期初应付" v-decorator.trim="[ 'beginNeedPay' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期末应付">
<a-input v-decorator.trim="[ 'allNeedPay' ]" :readOnly="true" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="纳税人识别号">
<a-input placeholder="请输入纳税人识别号" v-decorator.trim="[ 'taxNum' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="税率(%)">
<a-input-number style="width:100%" placeholder="请输入税率" v-decorator.trim="[ 'taxRate' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开户行">
<a-input placeholder="请输入开户行" v-decorator.trim="[ 'bankName' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="账号">
<a-input placeholder="请输入账号" v-decorator.trim="[ 'accountNumber' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="地址">
<a-input placeholder="请输入地址" v-decorator.trim="[ 'address' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
<a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" />
</a-form-item>
</a-col>
<a-row class="form-row" :gutter="24">
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
<a-input placeholder="请输入名称" v-decorator.trim="[ 'supplier', validatorRules.supplier]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系人">
<a-input placeholder="请输入联系人" v-decorator.trim="[ 'contacts' ]" />
</a-form-item>
</a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号码">
<a-input placeholder="请输入手机号码" v-decorator.trim="[ 'telephone' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系电话">
<a-input placeholder="请输入联系电话" v-decorator.trim="[ 'phoneNum' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电子邮箱">
<a-input placeholder="请输入电子邮箱" v-decorator.trim="[ 'email' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="传真">
<a-input placeholder="请输入传真" v-decorator.trim="[ 'fax' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期初应付">
<a-input placeholder="请输入期初应付" v-decorator.trim="[ 'beginNeedPay' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期末应付">
<a-input v-decorator.trim="[ 'allNeedPay' ]" :readOnly="true" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="纳税人识别号">
<a-input placeholder="请输入纳税人识别号" v-decorator.trim="[ 'taxNum' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="税率(%)">
<a-input-number style="width:100%" placeholder="请输入税率" v-decorator.trim="[ 'taxRate' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开户行">
<a-input placeholder="请输入开户行" v-decorator.trim="[ 'bankName' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="账号">
<a-input placeholder="请输入账号" v-decorator.trim="[ 'accountNumber' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="地址">
<a-input placeholder="请输入地址" v-decorator.trim="[ 'address' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
<a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-spin>
</a-modal>
......
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