Merge branch 'feature/11月迭代' of http://git.gicdev.com/gicmember/member

src/components/allCustomers/components/babyinfoDialog.vue

@@ -12,7 +12,7 @@
         <el-tab-pane
           v-for="(item,index) in fieldsList"
           :key="index"
-          :label="item.sonFields[0].fieldValue"
+          :label="item.form.name||item.bName"
           :name="`${index}`"
         />
       </el-tabs>
@@ -29,7 +29,6 @@
             type="text"
             maxlength="10"
             show-word-limit
-            placeholder="请输姓名"
             v-model="fieldsList[activeName].form.name"
             style="width: 160px;"
           />
@@ -119,7 +118,6 @@ export default {
             shoeSize: '',
           };
           el.sonFields.map(field => (el.form[filterObj[field.fieldName]] = field.fieldValue));
-          el.form.name = el.bName;
           return el;
         });
         this.fieldsList = JSON.parse(JSON.stringify(fieldList));