魏熙美 6 years ago
parent
commit
82baf6643e

+ 1
- 3
CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/UserController.java View File

164
     @ApiImplicitParams({
164
     @ApiImplicitParams({
165
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "name", value = "用户名"),
165
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "name", value = "用户名"),
166
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "tel", value = "手机号"),
166
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "tel", value = "手机号"),
167
-            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "remark", value = "备注"),
168
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "当前页"),
169
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "一页多少行"),
167
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "remark", value = "备注")
170
     })
168
     })
171
     @RequestMapping(value = "/user/operateadd", method = RequestMethod.POST)
169
     @RequestMapping(value = "/user/operateadd", method = RequestMethod.POST)
172
     public ResponseBean operateAdd(HttpSession session,
170
     public ResponseBean operateAdd(HttpSession session,

+ 1
- 1
CODE/smart-community/operate-api/src/main/resources/mapper/ToOperateTelMapper.xml View File

141
       <if test="name != null and name !=''">
141
       <if test="name != null and name !=''">
142
         and name like CONCAT('%', #{name,jdbcType=VARCHAR}, '%')
142
         and name like CONCAT('%', #{name,jdbcType=VARCHAR}, '%')
143
       </if>
143
       </if>
144
-      ORDER BY to_operate_tel.update_date desc
145
     </where>
144
     </where>
145
+    ORDER BY to_operate_tel.update_date desc
146
   </select>
146
   </select>
147
 </mapper>
147
 </mapper>

+ 1
- 1
VUECODE/smart-operate-manage/src/router/index.js View File

157
         path: '/phoneconfig/phoneconfigIndex',
157
         path: '/phoneconfig/phoneconfigIndex',
158
         component: () => import('@/views/phoneconfig/phoneconfigIndex'),
158
         component: () => import('@/views/phoneconfig/phoneconfigIndex'),
159
         name: 'phoneconfig-phoneconfigIndex',
159
         name: 'phoneconfig-phoneconfigIndex',
160
-        meta: { title: '物业号码管理', icon: 'table' }
160
+        meta: { title: '运营号码管理', icon: 'table' }
161
       },
161
       },
162
       {
162
       {
163
         path: '/phoneconfig/phoneconfigAdd',
163
         path: '/phoneconfig/phoneconfigAdd',

+ 2
- 2
VUECODE/smart-operate-manage/src/views/phoneconfig/phoneconfigAdd.vue View File

5
         <el-input v-model="ruleForm.name" placeholder="姓名"/>
5
         <el-input v-model="ruleForm.name" placeholder="姓名"/>
6
       </el-form-item>
6
       </el-form-item>
7
       <el-form-item class="filter-item" label="电话号码" prop="tel" >
7
       <el-form-item class="filter-item" label="电话号码" prop="tel" >
8
-        <el-input v-model.trim="ruleForm.tel" placeholder="号码" />
8
+        <el-input v-model.trim="ruleForm.tel" placeholder="号码" oninput="value=value.replace(/[^\d]/g,'')" />
9
       </el-form-item>
9
       </el-form-item>
10
       <el-form-item label="备注" prop="remark">
10
       <el-form-item label="备注" prop="remark">
11
         <el-input v-model="ruleForm.remark" placeholder="备注"/>
11
         <el-input v-model="ruleForm.remark" placeholder="备注"/>
37
       },
37
       },
38
       rules: {
38
       rules: {
39
         name: [
39
         name: [
40
-          { required: true, message: '名称', trigger: 'blur' }
40
+          { required: true, message: '请输入名称', trigger: 'blur' }
41
         ],
41
         ],
42
         tel: [
42
         tel: [
43
           { required: true, message: '请输入手机号', trigger: 'blur' },
43
           { required: true, message: '请输入手机号', trigger: 'blur' },

+ 1
- 1
VUECODE/smart-operate-manage/src/views/phoneconfig/phoneconfigIndex.vue View File

5
     <el-input v-model="listQuery.name" placeholder="名称"></el-input>
5
     <el-input v-model="listQuery.name" placeholder="名称"></el-input>
6
   </el-form-item>
6
   </el-form-item>
7
   <el-form-item label="号码">
7
   <el-form-item label="号码">
8
-    <el-input v-model="listQuery.tel" placeholder="号码"></el-input>
8
+    <el-input v-model="listQuery.tel" placeholder="号码" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
9
   </el-form-item>
9
   </el-form-item>
10
   <el-form-item label="备注">
10
   <el-form-item label="备注">
11
     <el-input v-model="listQuery.remark" placeholder="备注"></el-input>
11
     <el-input v-model="listQuery.remark" placeholder="备注"></el-input>

+ 6
- 6
VUECODE/smart-operate-manage/src/views/phoneconfig/phoneedit.vue View File

4
       <el-form-item label="姓名" prop="name">
4
       <el-form-item label="姓名" prop="name">
5
         <el-input v-model="ruleForm.name" placeholder="姓名"/>
5
         <el-input v-model="ruleForm.name" placeholder="姓名"/>
6
       </el-form-item>
6
       </el-form-item>
7
-      <el-form-item class="filter-item" label="电话号码" prop="tel" >
8
-        <el-input v-model.trim="ruleForm.tel" placeholder="号码" />
7
+      <el-form-item class="filter-item" label="电话号码" prop="tel">
8
+        <el-input v-model.trim="ruleForm.tel" placeholder="号码" oninput="value=value.replace(/[^\d]/g,'')"/>
9
       </el-form-item>
9
       </el-form-item>
10
-      <el-form-item label="备注" prop="remark">
10
+      <el-form-item label="备注">
11
         <el-input v-model="ruleForm.remark" placeholder="备注"/>
11
         <el-input v-model="ruleForm.remark" placeholder="备注"/>
12
       </el-form-item>
12
       </el-form-item>
13
       <el-form-item>
13
       <el-form-item>
37
       },
37
       },
38
       rules: {
38
       rules: {
39
         name: [
39
         name: [
40
-          { required: true, message: '名称', trigger: 'blur' }
40
+          { required: true, message: '请输入名称', trigger: 'blur' }
41
         ],
41
         ],
42
         tel: [
42
         tel: [
43
           { required: true, message: '请输入手机号', trigger: 'blur' },
43
           { required: true, message: '请输入手机号', trigger: 'blur' },
44
           { min: 11, max: 11, required: true, message: '请输入11位手机号', trigger: 'blur' }
44
           { min: 11, max: 11, required: true, message: '请输入11位手机号', trigger: 'blur' }
45
         ],
45
         ],
46
         remark: [
46
         remark: [
47
-          { required: true, message: '请选择角色', trigger: 'blur' }
47
+          { required: true, message: '请输入备注', trigger: 'blur' }
48
         ]
48
         ]
49
       }
49
       }
50
     }
50
     }
51
   },
51
   },
52
-  mounted() {  
52
+  mounted() {
53
       console.log('this.$route.query.id',this.$route.query.id)
53
       console.log('this.$route.query.id',this.$route.query.id)
54
       this.getOperateId(this.$route.query.id)
54
       this.getOperateId(this.$route.query.id)
55
   },
55
   },

+ 2
- 2
VUECODE/smart-property-manage/src/views/bill/info/index.vue View File

7
       <el-button type="info" @click="updateBill">修改</el-button>
7
       <el-button type="info" @click="updateBill">修改</el-button>
8
     </div>
8
     </div>
9
     <div class="bill-info-search">
9
     <div class="bill-info-search">
10
-      <span style="font-size: 14px; color:#888888">收费情况</span>
10
+      <span style="font-size: 16px; color:#606266; font-weight: bold;">收费情况</span>
11
       <el-form :model="formInline" inline="true" class="form-inline">
11
       <el-form :model="formInline" inline="true" class="form-inline">
12
         <el-form-item>
12
         <el-form-item>
13
           <span class="title-info">选择房子</span>
13
           <span class="title-info">选择房子</span>
557
   height: 40px;
557
   height: 40px;
558
   line-height: 40px;
558
   line-height: 40px;
559
   font-size:14px;
559
   font-size:14px;
560
-  color:#888888
560
+  color:#888888;
561
 }
561
 }
562
 .bill-info-search {
562
 .bill-info-search {
563
   margin-left: 20px;
563
   margin-left: 20px;

+ 13
- 4
VUECODE/smart-property-manage/src/views/systemResources/property/add/index.vue View File

1
 <template>
1
 <template>
2
   <div id="root">
2
   <div id="root">
3
-    <el-form :model="formInline" label-width="80px" class="form-class">
4
-      <el-form-item label="名称">
3
+    <el-form :model="formInline" :rules="rules" label-width="80px" class="form-class">
4
+      <el-form-item label="名称" prop="name">
5
         <el-input v-model="formInline.name"/>
5
         <el-input v-model="formInline.name"/>
6
       </el-form-item>
6
       </el-form-item>
7
-      <el-form-item label="号码">
8
-        <el-input v-model="formInline.tel"/>
7
+      <el-form-item label="号码" prop="tel">
8
+        <el-input v-model="formInline.tel" oninput="value=value.replace(/[^\d]/g,'')"/>
9
       </el-form-item>
9
       </el-form-item>
10
       <el-form-item label="备注">
10
       <el-form-item label="备注">
11
         <el-input v-model="formInline.remark"/>
11
         <el-input v-model="formInline.remark"/>
27
         name: '',
27
         name: '',
28
         tel: '',
28
         tel: '',
29
         remark: ''
29
         remark: ''
30
+      },
31
+      rules: {
32
+        name: [
33
+          { required: true, message: '请输入名称', trigger: 'blur' }
34
+        ],
35
+        tel: [
36
+          { required: true, message: '请输入手机号', trigger: 'blur' },
37
+          { min: 11, max: 11, required: true, message: '请输入11位手机号', trigger: 'blur' }
38
+        ]
30
       }
39
       }
31
     }
40
     }
32
   },
41
   },

+ 13
- 4
VUECODE/smart-property-manage/src/views/systemResources/property/edi/index.vue View File

1
 <template>
1
 <template>
2
   <div id="root">
2
   <div id="root">
3
-    <el-form :model="formInline" label-width="80px" class="form-class">
4
-      <el-form-item label="名称">
3
+    <el-form :model="formInline" :rules="rules" label-width="80px" class="form-class">
4
+      <el-form-item label="名称" prop="name">
5
         <el-input v-model="formInline.name"/>
5
         <el-input v-model="formInline.name"/>
6
       </el-form-item>
6
       </el-form-item>
7
-      <el-form-item label="号码">
8
-        <el-input v-model="formInline.tel"/>
7
+      <el-form-item label="号码" prop="tel">
8
+        <el-input v-model="formInline.tel" oninput="value=value.replace(/[^\d]/g,'')"/>
9
       </el-form-item>
9
       </el-form-item>
10
       <el-form-item label="备注">
10
       <el-form-item label="备注">
11
         <el-input v-model="formInline.remark"/>
11
         <el-input v-model="formInline.remark"/>
28
         name: '',
28
         name: '',
29
         tel: '',
29
         tel: '',
30
         remark: ''
30
         remark: ''
31
+      },
32
+      rules: {
33
+        name: [
34
+          { required: true, message: '请输入名称', trigger: 'blur' }
35
+        ],
36
+        tel: [
37
+          { required: true, message: '请输入手机号', trigger: 'blur' },
38
+          { min: 11, max: 11, required: true, message: '请输入11位手机号', trigger: 'blur' }
39
+        ]
31
       }
40
       }
32
     }
41
     }
33
   },
42
   },