diff --git a/jshERP-web/public/doc/member_template.xls b/jshERP-web/public/doc/member_template.xls index 43bc06b6..1fde4a3a 100644 Binary files a/jshERP-web/public/doc/member_template.xls and b/jshERP-web/public/doc/member_template.xls differ diff --git a/jshERP-web/src/views/system/MemberList.vue b/jshERP-web/src/views/system/MemberList.vue index b604dfad..0431df27 100644 --- a/jshERP-web/src/views/system/MemberList.vue +++ b/jshERP-web/src/views/system/MemberList.vue @@ -8,8 +8,8 @@ - - + + @@ -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"}, diff --git a/jshERP-web/src/views/system/modules/CustomerModal.vue b/jshERP-web/src/views/system/modules/CustomerModal.vue index 4f0b0570..9721f629 100644 --- a/jshERP-web/src/views/system/modules/CustomerModal.vue +++ b/jshERP-web/src/views/system/modules/CustomerModal.vue @@ -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"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jshERP-web/src/views/system/modules/MemberModal.vue b/jshERP-web/src/views/system/modules/MemberModal.vue index 7573ed5d..9691b7e8 100644 --- a/jshERP-web/src/views/system/modules/MemberModal.vue +++ b/jshERP-web/src/views/system/modules/MemberModal.vue @@ -16,41 +16,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -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); diff --git a/jshERP-web/src/views/system/modules/VendorModal.vue b/jshERP-web/src/views/system/modules/VendorModal.vue index 2c017251..40b96a4f 100644 --- a/jshERP-web/src/views/system/modules/VendorModal.vue +++ b/jshERP-web/src/views/system/modules/VendorModal.vue @@ -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"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +