|
@@ -50,6 +50,7 @@
|
|
|
style="width: 100%"
|
|
|
:data="tableData"
|
|
|
:loading="tableLoading"
|
|
|
+ height="500"
|
|
|
@on-select="tableOnSelect"
|
|
|
@on-select-cancel="tableOnCancel"
|
|
|
@on-select-all="tableOnSelect"
|
|
@@ -157,7 +158,7 @@
|
|
|
<span class="mustSpan">*</span>
|
|
|
</Col>
|
|
|
<Col span="6" class-name="tables">
|
|
|
-<<<<<<< HEAD
|
|
|
+ <<<<<<< HEAD
|
|
|
<Select
|
|
|
clearable
|
|
|
v-model="addForm.wllx"
|
|
@@ -171,9 +172,14 @@
|
|
|
>{{ item.label }}</Option
|
|
|
>
|
|
|
</Select>
|
|
|
-=======
|
|
|
- <InputNumber v-model="addForm.scjg" :active-change="false" style="width: 95%" placeholder="请输入" />
|
|
|
->>>>>>> 993f14895312276e3ad5f478f3efdabcf1a19f1d
|
|
|
+ =======
|
|
|
+ <InputNumber
|
|
|
+ v-model="addForm.scjg"
|
|
|
+ :active-change="false"
|
|
|
+ style="width: 95%"
|
|
|
+ placeholder="请输入"
|
|
|
+ />
|
|
|
+ >>>>>>> 993f14895312276e3ad5f478f3efdabcf1a19f1d
|
|
|
</Col>
|
|
|
<Col span="6" class-name="tables">
|
|
|
市场价格(元)
|