Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/saas/AppSpecialPeople/add.vue

@@ -95,6 +95,14 @@
             </div>
           </div>
 
+          <div class="item" v-if="item.type == 'money'">
+            <span class="label"><span class="tips"></span>{{ item.label }}</span>
+            <div class="value">
+              <u-input type="number" placeholder="请输入" v-model="form[item.formDbName]" input-align="right"
+                       placeholder-style="color:#999;font-size:16px;" height="48" :maxlength="item.maxlength" :clearable="false" @input="changeMoney"/>
+            </div>
+          </div>
+
           <div class="item" v-if="item.type == 'select'">
             <span class="label"><span class="tips"></span>{{ item.label }}</span>
             <div class="value" @click="selectClick(item.dict, item.formDbName)">
@@ -197,7 +205,7 @@ export default {
           list: [  // 精神病人
             {
               label: '家庭年收入',
-              type: 'number',
+              type: 'money',
               formDbName: 'income',
               maxlength: 9
             },
@@ -442,6 +450,13 @@ export default {
       }
     },
 
+    changeMoney() {
+      let moneyReg = /^([0-9]{1,5})(\.[0-9]{1,3}){0,1}$/
+      if (!moneyReg.test(this.form.income)) {
+        return this.$u.toast('输入的数字不能超过10万')
+      }
+    },
+
     confirmGirdSelect(e) {
       this.form.girdId = e[0].value
       this.form.girdName = e[0].label