修改相亲的用户修改新增 展示的 字段修改

src/components/UserMan/addblindDateuser.vue

@@ -90,11 +90,15 @@
         <el-form-item label="车产">
           <el-radio v-model="addMsg.CarInfo" v-for="(x,y) in CarInfoList" :key="y" :label="x.Id">{{x.Name}}</el-radio>
         </el-form-item>
-        <el-form-item label="年收入" prop="YearMoney" >
+        <el-form-item label="年收入">
+          <el-radio v-model="addMsg.YearMoneyType" v-for="(x,y) in yearMoneyList" :key="y" :label="x.Id">{{x.Name}}</el-radio>
+        </el-form-item>
+        
+        <!-- <el-form-item label="年收入" prop="YearMoney" >
           <el-input v-model="addMsg.YearMoney" style="width:478px" size="small" :min="0" type="number" placeholder="请输入年收入">
             <template slot="append">万</template>
           </el-input>
-        </el-form-item>
+        </el-form-item> -->
          <el-form-item label="现居地" >
           <el-cascader v-model="position2" @change="gejigguan2" :placeholder="addressName2"  :options="provinceList" @active-item-change="handleItemChange" :props="props" style="width: 478px"></el-cascader>
         </el-form-item>
@@ -128,15 +132,18 @@
 <!--            <template slot="append">万</template>-->
 <!--          </el-input>-->
 <!--        </el-form-item>-->
+        <el-form-item label="职业类型" >
+          <el-input v-model="addMsg.Industry" style="width:478px" size="small" placeholder="教育行业、旅游行业"></el-input>
+        </el-form-item>
         <el-form-item label="毕业学校" >
           <el-input v-model="addMsg.SchoolInfo" style="width:478px" size="small" placeholder="请输入学校"></el-input>
         </el-form-item>
-          <el-form-item label="工作单位" >
+          <!-- <el-form-item label="工作单位" >
           <el-input v-model="addMsg.WorkUnit" style="width:478px" size="small" placeholder="请输入学校"></el-input>
         </el-form-item>
         <el-form-item label="职位" >
           <el-input v-model="addMsg.Job" style="width:478px" size="small" placeholder="请输入工作"></el-input>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="籍贯" >
           <el-cascader v-model="position" @change="gejigguan" :placeholder="addressName"  :options="provinceList" @active-item-change="handleItemChange" :props="props" style="width: 478px"></el-cascader>
         </el-form-item>
@@ -251,6 +258,7 @@
           Marriage:0,
           HouseInfo:0,
           CarInfo:0,
+          YearMoneyType:0,
           OtherInfo:'',
           SchoolInfo:'',
           YearMoney:0,
@@ -349,6 +357,7 @@
         MarriageList:[],//婚姻
         HouseList:[],//房子情况
         CarInfoList:[],//车子情况
+        yearMoneyList:[],//年收入情况
         position:[],
         position2:[],
         addressName:'请选择籍贯',
@@ -366,6 +375,7 @@
       this.GetHouseInfoEnumList()//房子情况
       this.GetCarInfoEnumList()//车子情况
       this.getPosition(null) //地址的请求
+      this.getYearMoneyType()//获取年收入的枚举
 
     },
     methods: {
@@ -396,6 +406,12 @@
 
         });
       },
+      getYearMoneyType(){
+        this.apipost("/api/Miai/GetYearMoneyTypeEnumList", {}, (res) => {
+          this.yearMoneyList = res.data.data;
+          this.addMsg.YearMoneyType = this.yearMoneyList[0].Id
+        });
+      },
       Save(formName) {
         this.$refs[formName].validate((valid) => {
           if (valid) {
@@ -407,10 +423,10 @@
               this.Error('体重不能为空');
               return
             }
-            if(this.addMsg.YearMoney==''){
-              this.Error('年收入不能为空');
-              return
-            }
+            // if(this.addMsg.YearMoney==''){
+            //   this.Error('年收入不能为空');
+            //   return
+            // }
             if(this.addMsg.AlbumList.length < 2){
               this.Error('照片墙至少为2张');
               return

src/components/UserMan/blindDateUsersListEdit.vue

@@ -106,11 +106,14 @@
         <el-form-item label="车产">
           <el-radio v-model="addMsg.CarInfo" v-for="(x,y) in CarInfoList" :key="y" :label="x.Id">{{x.Name}}</el-radio>
         </el-form-item>
-        <el-form-item label="年收入" prop="YearMoney" >
+        <el-form-item label="年收入">
+          <el-radio v-model="addMsg.YearMoneyType" v-for="(x,y) in yearMoneyList" :key="y" :label="x.Id">{{x.Name}}</el-radio>
+        </el-form-item>
+        <!-- <el-form-item label="年收入" prop="YearMoney" >
           <el-input v-model="addMsg.YearMoney" style="width:478px" size="small" :min="0" type="number" placeholder="请输入年收入">
             <template slot="append">万</template>
           </el-input>
-        </el-form-item>
+        </el-form-item> -->
          <el-form-item label="现据地" >
           <el-cascader v-model="position2" @change="gejigguan2" :placeholder="addressName2"  :options="provinceList" @active-item-change="handleItemChange" :props="props" style="width: 478px"></el-cascader>
         </el-form-item>
@@ -141,15 +144,18 @@
 <!--            <template slot="append">万</template>-->
 <!--          </el-input>-->
 <!--        </el-form-item>-->
+        <el-form-item label="职业类型" >
+          <el-input v-model="addMsg.Industry" style="width:478px" size="small" placeholder="教育行业、旅游行业"></el-input>
+        </el-form-item>
         <el-form-item label="毕业学校" >
           <el-input v-model="addMsg.SchoolInfo" style="width:478px" size="small" placeholder="请输入学校"></el-input>
         </el-form-item>
-          <el-form-item label="工作单位" >
+          <!-- <el-form-item label="工作单位" >
           <el-input v-model="addMsg.WorkUnit" style="width:478px" size="small" placeholder="请输入工作"></el-input>
         </el-form-item>
         <el-form-item label="职位" >
           <el-input v-model="addMsg.Job" style="width:478px" size="small" placeholder="请输入工作"></el-input>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="籍贯" >
           <el-cascader v-model="position" @change="gejigguan" :placeholder="addressName"  :options="provinceList" @active-item-change="handleItemChange" :props="props" style="width: 478px"></el-cascader>
         </el-form-item>
@@ -344,6 +350,7 @@
         MarriageList:[],//婚姻
         HouseList:[],//房子情况
         CarInfoList:[],//车子情况
+        yearMoneyList:[],//年收入
         position:[],
         position2:[],
         addressName:'请选择籍贯',
@@ -360,6 +367,8 @@
       this.GetHouseInfoEnumList()//房子情况
       this.GetCarInfoEnumList()//车子情况
       this.getPosition(null) //地址的请求
+      this.getYearMoneyType()//获取年收入的枚举
+
       if (this.$route.query.UserId) {
         this.UserId = this.$route.query.UserId;
         this.getData()
@@ -380,10 +389,10 @@
               this.Error('体重不能为空');
               return
             }
-            if(this.addMsg.YearMoney==''){
-              this.Error('年收入不能为空');
-              return
-            }
+            // if(this.addMsg.YearMoney==''){
+            //   this.Error('年收入不能为空');
+            //   return
+            // }
             if(this.addMsg.AlbumList.length < 2){
               this.Error('照片墙至少为2张');
               return
@@ -594,6 +603,11 @@
           this.CarInfoList = res.data.data;
         });
       },
+      getYearMoneyType(){//年收入
+        this.apipost("/api/Miai/GetYearMoneyTypeEnumList", {}, (res) => {
+          this.yearMoneyList = res.data.data;
+        });
+      },
 
     },
     mounted() {

src/components/UserMan/components/seeDetail.vue

@@ -66,12 +66,12 @@ export default {
         { prop: "学历:", field: "EducationTypeStr", type: 1 },
         { prop: "房产:", field: "HouseInfoStr", type: 1 },
         { prop: "车产:", field: "CarInfoStr", type: 1 },
-        { prop: "年收入:", field: "YearMoney", type: 7 },
+        { prop: "年收入:", field: "YearMoneyTypeStr", type: 7 },
         { prop: "个人定位:", field: "DWPName", type: 6 },
         { prop: "毕业学校:", field: "SchoolInfo", type: 1 },
-
-        { prop: "工作单位:", field: "WorkUnit", type: 1 },
-        { prop: "职位:", field: "Job", type: 1 },
+        { prop: "职业类型:", field: "Industry", type: 1 },
+        // { prop: "工作单位:", field: "WorkUnit", type: 1 },
+        // { prop: "职位:", field: "Job", type: 1 },
         { prop: "籍贯:", field: "NativePlace", type: 6 },
         { prop: "真实姓名", field: "RealName", type: 1 },
         { prop: "身份证号:", field: "IDCardNo", type: 1 },