Merge remote-tracking branch 'origin/orderChange' into zhairh

2 years ago · cbaa69057e
parent 011a30345c ed011531b9
commit cbaa69057e
2 changed files with 2 additions and 2 deletions
--- a/src/views/basic/BusTypeChange.vue
+++ b/src/views/basic/BusTypeChange.vue
@ -4,7 +4,7 @@
            <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
                <el-form-item class="query-form-item">
                    <el-input
-                        v-model="filterQuery.originName"
+                        v-model="filterQuery.name"
                        placeholder="单据类型名称"
                        style="width: 200px"
                    ></el-input>
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@ -565,7 +565,7 @@
                    <el-col :span="12" class="el-col">
                        <el-form-item class="query-form-item" label="仓库等级:">
                            <el-select v-model="formData.level" placeholder="仓库等级" clearable @change="changeLevel"
-                                       :disabled="!mutiInvMode">
+                                       :disabled="mutiInvMode">
                                <el-option label="1 级库" :value='1'></el-option>
                                <el-option label="2 级库" :value='2'></el-option>
                                <el-option label="3 级库" :value='3'></el-option>