elink-star
/
epmet-work-pc
17
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'feature_bug' into dev

V4.3.3
mk 1 year ago
parent
6119550d3f 5b1e08119d
commit
84d2cd8fd3
2 changed files with 10 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/views/components/resiExpand/editExpand.vue
  2. 4
      src/views/components/resiExpand/index.vue

6
src/views/components/resiExpand/editExpand.vue
View File

@ -43,12 +43,14 @@
</el-input> </el-input>
</template> </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" <el-input :placeholder="`请输入${itemk.label}`" size="small" class="list_item_width_1-text"
:style="{ 'margin-right': itemk.label == '备注' ? '50px' : '' }" :style="{ 'margin-right': itemk.label == '备注' ? '50px' : '' }"
v-model.trim="form[itemj.id][itemk.formName]" clearable v-model.trim="form[itemj.id][itemk.formName]" clearable
@blur="checkNumberInput(itemj.id, itemk.formName)" @change.native="handleFormChange(itemj.id,itemk.formName,itemk.itemType)"> @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>
<template v-else-if="itemk.itemType == 'checkbox'"> <template v-else-if="itemk.itemType == 'checkbox'">

4
src/views/components/resiExpand/index.vue
View File

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

Write Preview
Loading…
Cancel
Save