售中体验单提成计算、高血糖血压问卷优化

stdiet-ui/src/components/HealthyForm/Form2.vue

@@ -1,34 +1,34 @@
 <template>
   <div>
-    <p class="p_title_1">{{healthyData['titleArray'][1]}}</p>
-    <p class="p_title_2">1、减脂经历</p>
-    <el-form-item label="(1) 用过哪些减脂方法（重点）" prop="experience" class="margin-left">
+    <p class="p_title_1">{{getTitle()}}</p>
+    <p class="p_title_2">1、{{getTitleKey()}}经历</p>
+    <el-form-item :label="'(1) 用过哪些'+getTitleKey()+'方法（重点）'" prop="experience" class="margin-left">
       <el-input
         type="textarea"
-        placeholder="请描述减脂方法"
+        :placeholder="'请描述'+getTitleKey()+'方法'"
         v-model="form.experience"
         maxlength="200"
         show-word-limit
         rows="3"
       ></el-input>
     </el-form-item>
-    <el-form-item label="(2) 减脂中遇到的困难（重点）" prop="difficulty" class="margin-left">
+    <el-form-item :label="'(2) '+getTitleKey()+'中遇到的困难（重点）'" prop="difficulty" class="margin-left">
       <el-input
         type="textarea"
-        placeholder="请描述减脂中遇到的困难"
+        :placeholder="'请描述'+getTitleKey()+'中遇到的困难'"
         v-model="form.difficulty"
         maxlength="200"
         show-word-limit
         rows="3"
       ></el-input>
     </el-form-item>
-    <el-form-item label="(3) 减脂过程中是否反弹" prop="rebound" class="margin-left">
+    <el-form-item :label="'(3)'+getTitleKey()+'过程中是否反弹'" prop="rebound" class="margin-left">
       <el-radio-group v-model="form.rebound" style="margin-left: 10px;">
         <el-radio :label="0" key="1">否</el-radio>
         <el-radio :label="1" key="2">是</el-radio>
       </el-radio-group>
     </el-form-item>
-    <el-form-item label="(4) 是否意识到生活习惯是减脂关键" prop="crux" class="margin-left">
+    <el-form-item :label="'(4) 是否意识到生活习惯是'+getTitleKey()+'关键'" prop="crux" class="margin-left">
       <el-radio-group v-model="form.crux" style="margin-left: 10px;">
         <el-radio :label="0" key="1">否</el-radio>
         <el-radio :label="1" key="2">是</el-radio>
@@ -49,7 +49,12 @@ export default {
     };
   },
   methods: {
-
+      getTitle(){
+          return this.healthyData.getTitle(this.form.conditioningProjectId, 1);
+      },
+      getTitleKey(){
+         return this.healthyData.getTitleKey(this.form.conditioningProjectId);
+      }
   },
   props: {
     form: {

stdiet-ui/src/components/HealthyForm/Form9.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <p class="p_title_1">{{titleNumFlag ? '十、体检报告' : healthyData['titleArray'][8]}}</p>
+    <p class="p_title_1">{{healthyData.extendHealthyIndex.indexOf(form.conditioningProjectId) != -1 ? '十、体检报告' : healthyData['titleArray'][8]}}</p>
     <p class="p_title_2">1、体检报告</p>
     <el-form-item label="(1) 请上传相应的体检报告" prop="fileList" class="margin-left">
       <el-upload style="margin-left: 20px;"

stdiet-ui/src/components/HealthyForm/FormExtended.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <p class="p_title_1">九、{{projectName[form.conditioningProjectId+'']}}信息评估</p>
+    <p class="p_title_1">九、{{healthyData.projectName[form.conditioningProjectId+'']}}信息评估</p>
     <!--高血糖-->
     <div v-show="form.conditioningProjectId == 6 || form.conditioningProjectId == 5">
             <div v-show="form.conditioningProjectId == 6">
@@ -198,8 +198,7 @@ export default {
   },
   data() {
     return {
-       healthyData:healthyData,
-       projectName:{'0':'减脂','5':'高血压','6':'高血糖'}
+       healthyData:healthyData
     };
   },
   methods: {