Merge branch 'feature_bug' into dev

src/views/components/resiExpand/editExpand.vue

@@ -43,12 +43,14 @@
                                 </el-input>
                             </template>
 
-                            <template v-else-if="itemk.itemType == 'inputNum'">
+                            <template v-else-if="itemk.itemType == 'inputNum'" style="display:flex">
+                                <div style="display: flex;">
                                     <el-input :placeholder="`请输入${itemk.label}`" size="small" class="list_item_width_1-text"
                                     :style="{ 'margin-right': itemk.label == '备注' ? '50px' : '' }"
                                     v-model.trim="form[itemj.id][itemk.formName]" clearable
                                     @blur="checkNumberInput(itemj.id, itemk.formName)" @change.native="handleFormChange(itemj.id,itemk.formName,itemk.itemType)">
-                                </el-input><span class="u-data-tag">元</span>
+                                </el-input><span class="u-data-tag" style="margin-left: 10px;">元</span>
+                                </div>
                             </template>
 
                             <template v-else-if="itemk.itemType == 'checkbox'">

src/views/components/resiExpand/index.vue

@@ -36,11 +36,13 @@
                             </el-input>
                         </template>
                         <template v-else-if="itemk.itemType == 'inputNum'" >
+                            <div style="display:flex">
                                 <el-input :placeholder="`请输入${itemk.label}`" size="small" class="list_item_width_1-text"
                                 :style="{ 'margin-right': itemk.label == '备注' ? '50px' : '' }"
                                 v-model.trim="form[itemj.id][itemk.formName]" clearable
                                 @blur="checkNumberInput(itemj.id, itemk.formName)">
-                            </el-input><span class="u-data-tag">元</span>
+                            </el-input><span class="u-data-tag" style="margin-left: 10px;">元</span>
+                            </div>
                         </template>
                         <template v-else-if="itemk.itemType == 'checkbox'">
                             <el-checkbox-group size="small" v-model.trim="form[itemj.id][itemk.formName]" @change="handelChangeCheckBox(itemj)">