Merge remote-tracking branch 'origin/master'

src/core/script/RCSScript.ts

@@ -98,4 +98,23 @@ export default class RCSScript implements RCS {
       option
     })
   }
+
+  constructor() {
+    window['takeInLp'] = takeInLp
+    window['takeOutLp'] = takeOutLp
+    window['moveDemo'] = moveDemo
+    window['moveSpec'] = moveSpec
+  }
+}
+
+function takeInLp() {
+}
+
+function takeOutLp() {
+}
+
+function moveDemo() {
+}
+
+function moveSpec() {
 }

src/views/inventory/query.vue

@@ -135,7 +135,7 @@ function serverSideDatasource(params: IServerSideGetRowsParams) {
             class="query-form flex-item-fixed"
             :data="state.queryData"
             :formFields="data.formFields"
-            :columnCount="2"
+            :columnCount="4"
             layout="bothFixed"
             labelWidth="85px"
             inputWidth="200px"