Merge remote-tracking branch 'origin/master'

src/views/controlPlatform/control.vue

@@ -87,7 +87,9 @@
             <el-divider class="controlDivider" />
             <el-row>
               <div style="float: right">
-                <el-button size="mini">本月</el-button>
+                <el-radio-group v-model="month">
+                  <el-radio :label="1">本月</el-radio>
+                </el-radio-group>
               </div>
             </el-row>
             <div id="echarts-leaveMessage" class="span_1">
@@ -234,7 +236,8 @@ export default {
       isEdit: false,
       open: false,
       title: '',
-      form: {}
+      form: {},
+      month: 1
     }
   },
   computed: {

src/views/operationsManagement/member/info/index.vue

@@ -514,6 +514,20 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="期待:" prop="memHalfDesire">
+                <el-input
+                  v-model="form.memHalfDesire"
+                  type="textarea"
+                  placeholder="请输入期待"
+                  clearable
+                  :disabled="secondFromDisabled"
+                  :maxlength="200"
+                  size="small"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="备注:" prop="remarks">
                 <el-input
@@ -627,6 +641,7 @@ export default {
         memIntroduce: [{ required: true, message: '请输入自我介绍', trigger: 'blur' }],
         memHobby: [{ required: true, message: '请输入兴趣爱好', trigger: 'blur' }],
         memFuturePlan: [{ required: true, message: '请输入未来规划', trigger: 'blur' }],
+        memHalfDesire: [{ required: true, message: '请输入期待', trigger: 'blur' }],
         memResidence: [{ required: true, message: '请选择居住地', trigger: 'change' }],
         memNative: [{ required: true, message: '请选择籍贯', trigger: 'change' }],
         memRealName: [{ required: false, message: '请输入真实姓名', trigger: 'blur' }],