5月1日系统修改完成备份 2.0

src/view/maint/price.vue

@@ -2,16 +2,7 @@
 	<div>
 		<el-row>
 			<el-form :model="query" label-width="100px" inline="">
-				<el-form-item label="物料名称">
-					<el-input v-model="query.materialName" size="small" style="width: 300px;">
-						<el-button slot="append" icon="el-icon-search" @click="showMaterial"></el-button>
-					</el-input>
-				</el-form-item>
-				<el-form-item label="钢种">
-					<el-input v-model="query.standard" size="small" style="width: 300px;">
-						<el-button slot="append" icon="el-icon-search" @click="showMaterial"></el-button>
-					</el-input>
-				</el-form-item>
+				
 				<el-button type="info" @click="search" size="small">查询</el-button>
 				<el-button type="primary" @click="handleAdd" size="small">新增</el-button>
 			</el-form>

src/view/system/user.vue

@@ -10,15 +10,15 @@
 			<el-table v-loading="loading" :data="tableData" border>
 				<el-table-column prop="id" label="编号" width="60" v-if="isShow">
 				</el-table-column>
-				<el-table-column prop="userName" label="用户名" width="120">
+				<el-table-column prop="userName" label="登录用户名" width="180">
 				</el-table-column>
 				<el-table-column prop="password" label="密码" width="120">
 				</el-table-column>
-				<el-table-column prop="userDesc" label="姓名" width="120">
+				<el-table-column prop="userDesc" label="姓名" width="180">
 				</el-table-column>
 				<!-- <el-table-column prop="customerName" label="客户" width="270">
 				</el-table-column> -->
-				<el-table-column prop="attr3"  label="客户id" width="270">
+				<el-table-column prop="attr3"  label="客户id" width="270" v-if="isShow">
 				</el-table-column>
 
 				<el-table-column label="操作">
@@ -35,12 +35,12 @@
 
 
 
-		<el-dialog title="修改密码" :visible.sync="dialogVisible" width="500px">
+		<el-dialog title="修改用户信息" :visible.sync="dialogVisible" width="500px">
 			<el-form :model="user" label-width="100px">
 				<el-form-item label="用户编码" v-if="isShow">
 					<el-input v-model="user.id"></el-input>
 				</el-form-item>
-				<el-form-item label="用户名">
+				<el-form-item label="登录用户名">
 					<el-input v-model="user.userName"></el-input>
 				</el-form-item>
 				<el-form-item label="密码">
@@ -49,7 +49,7 @@
 				<el-form-item label="姓名">
 					<el-input v-model="user.userDesc"></el-input>
 				</el-form-item>
-				<el-form-item label="选择客户">
+				<el-form-item label="选择客户" v-if="isShow">
 					<el-input  v-model="user.attr3"  :readonly="true"><el-button @click="clearCustomer" slot="append" icon="el-icon-delete"></el-button><el-button @click="popCust" slot="append" icon="el-icon-search"></el-button></el-input>
 				</el-form-item>
 			<!-- 	<el-form-item label="客户id" v-if="false">
@@ -178,14 +178,14 @@
 					if (response.data.code == 0) {
 						this.$message({
 							type: 'success',
-							message: '保存成功!',
+							message: '保存成功！',
 						});
 						this.getTableData()
 						this.dialogVisible = false
 					} else {
 						this.$message({
 							type: 'error',
-							message: '保存失败' + response.data.msg,
+							message: '保存失败！' + response.data.msg,
 						});
 					}
 					// loading.close();