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

jshERP-web/src/views/system/MemberList.vue

@@ -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-form-item label="会员卡号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入名称查询" v-model="queryParam.supplier"></a-input>
+                  <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

@@ -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,6 +16,7 @@
     </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form" id="customerModal">
+        <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]" />
@@ -26,6 +27,8 @@
               <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' ]" />
@@ -91,6 +94,7 @@
               <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

@@ -16,9 +16,10 @@
     </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form" id="memberModal">
+        <a-row class="form-row" :gutter="24">
           <a-col :span="24/2">
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号">
-            <a-input placeholder="请输入名称" v-decorator.trim="[ 'supplier', validatorRules.supplier]" />
+              <a-input placeholder="请输入会员卡号" v-decorator.trim="[ 'supplier', validatorRules.supplier]" />
             </a-form-item>
           </a-col>
           <a-col :span="24/2">
@@ -26,6 +27,8 @@
               <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' ]" />
@@ -51,6 +54,7 @@
               <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

@@ -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,6 +16,7 @@
     </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form" id="vendorModal">
+        <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]" />
@@ -26,6 +27,8 @@
               <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' ]" />
@@ -91,6 +94,7 @@
               <a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" />
             </a-form-item>
           </a-col>
+        </a-row>
       </a-form>
     </a-spin>
   </a-modal>