Merge remote-tracking branch 'origin/master'

src/views/inout/IoDealOrder.vue

@@ -202,30 +202,30 @@
       <!--单据业务详情-->
       <el-tab-pane>
         <span slot="label">单据 {{ currentRow == null ? '' : currentRow.billNo }}-业务扫码校验结果</span>
-        <el-form :inline="true" :model="bizQuery" class="query-form" size="mini">
-          <el-form-item class="query-form-item" label="物资名称:">
-            <el-input
-              v-model="bizQuery.productName"
-              placeholder="请输入物资名称"
-              clearable
-            >
-            </el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button-group>
-              <el-button
-                type="primary"
-                icon="el-icon-refresh"
-                @click="onBizReset"
-              >重置
-              </el-button>
-              <el-button type="primary" @click="onBizSubmit"
-                         icon="el-icon-search"
-              >查询
-              </el-button>
-            </el-button-group>
-          </el-form-item>
-        </el-form>
+        <!--<el-form :inline="true" :model="bizQuery" class="query-form" size="mini">-->
+        <!--  <el-form-item class="query-form-item" label="物资名称:">-->
+        <!--    <el-input-->
+        <!--      v-model="bizQuery.productName"-->
+        <!--      placeholder="请输入物资名称"-->
+        <!--      clearable-->
+        <!--    >-->
+        <!--    </el-input>-->
+        <!--  </el-form-item>-->
+        <!--  <el-form-item>-->
+        <!--    <el-button-group>-->
+        <!--      <el-button-->
+        <!--        type="primary"-->
+        <!--        icon="el-icon-refresh"-->
+        <!--        @click="onBizReset"-->
+        <!--      >重置-->
+        <!--      </el-button>-->
+        <!--      <el-button type="primary" @click="onBizSubmit"-->
+        <!--                 icon="el-icon-search"-->
+        <!--      >查询-->
+        <!--      </el-button>-->
+        <!--    </el-button-group>-->
+        <!--  </el-form-item>-->
+        <!--</el-form>-->
         <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
                   :row-style="rowStyle"
                   row-key="id"