Merge remote-tracking branch 'origin/master'

src/views/wms/customer/index.vue

@@ -94,24 +94,6 @@
         </template>
       </el-table-column>
 			<el-table-column label="备注" align="center" prop="remark" />
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['wms:customer:edit']"
-					>修改</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['wms:customer:remove']"
-					>删除</el-button>
-				</template>
-			</el-table-column>
 		</el-table>
 
 		<pagination
@@ -237,11 +219,14 @@
                 </el-row>
 				<el-row :gutter="10" class="mb8">
 				  <el-col :span="12">
-						<el-form-item label="备注" prop="remark">
-							<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+				    <el-form-item label="客户类型" prop="clientType">
+            	<el-input v-model="form.clientType" placeholder="请输入客户类型" />
             </el-form-item>
           </el-col>
                   	<el-col :span="12">
+						<el-form-item label="备注" prop="remark">
+							<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+						</el-form-item>
                     </el-col>
                 </el-row>
 			</el-form>
@@ -326,20 +311,6 @@ export default {
 				enableFlag: [
 					{ required: true, message: "是否启用不能为空", trigger: "blur" }
 				],
-        contact1Email: [
-          {
-            type: "contact1Email",
-            message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
-        ],
-        contact2Email: [
-          {
-            type: "contact2Email",
-            message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
-        ],
         contact2Tel: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,

src/views/wms/supplier/index.vue

@@ -265,12 +265,12 @@
 				<el-row :gutter="10" class="mb8">
                   	<el-col :span="12">
 						<el-form-item label="英文描述" prop="enDesc">
-							<el-input v-model="form.enDesc" placeholder="请输入供应商代码" />
+							<el-input v-model="form.enDesc" placeholder="请输入英文描述" />
 						</el-form-item>
                     </el-col>
                     <el-col :span="12">
 						<el-form-item label="供应商类型" prop="supplierType">
-							<el-input v-model="form.supplierType" placeholder="请输入供应商名字" />
+							<el-input v-model="form.supplierType" placeholder="请输入供应商类型" />
 						</el-form-item>
                     </el-col>
                 </el-row>
@@ -313,7 +313,7 @@
 				<el-row :gutter="10" class="mb8">
                   	<el-col :span="12">
 						<el-form-item label="详细地址" prop="address">
-							<el-input v-model="form.address" type="textarea" placeholder="请输入内容" />
+							<el-input v-model="form.address" type="textarea" placeholder="请输入详细地址" />
 						</el-form-item>
                     </el-col>
                     <el-col :span="12">