Merge branch 'master' into b_lms2

lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue

@@ -37,6 +37,39 @@
             </el-select>
           </el-form-item>
 
+          <el-form-item label="立库层数">
+            <el-select
+              v-model="query.layer_num"
+              clearable
+              size="mini"
+              placeholder="层数"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in layerList"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="是否空位">
+            <el-select
+              v-model="query.is_have"
+              clearable
+              size="mini"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in isHaveList"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
           <el-form-item label="模糊搜索">
             <el-input
               v-model="query.search"
@@ -60,7 +93,18 @@
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-check"
+          size="mini"
+          @click="openOneCreate"
+        >
+          一键生成
+        </el-button>
+      </crudOperation>
 
       <!--表单组件-->
       <el-dialog
@@ -272,6 +316,8 @@
       <!--分页组件-->
       <pagination />
     </div>
+    <OneCreateDialog :dialog-show.sync="openOneCreateDialog" />
+
   </div>
 </template>
 
@@ -282,6 +328,9 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
+import OneCreateDialog from '@/views/wms/basedata/st/struct/OneCreateDialog'
+import crudSectattr from '@/views/wms/basedata/st/sect/sectattr'
+import crudUserStor, { getSect } from '@/views/wms/basedata/st/userStor/userStor'
 import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 /* import checkoutbill from "@/api/wms/st/core/outbill/checkoutbill";*/
 
@@ -359,9 +408,19 @@ export default {
       }
     }
     return {
+      openOneCreateDialog: false,
       sects: [],
       invtypelist: [],
       permission: {},
+      layerList: [
+        { 'label': '1层', 'value': '1' },
+        { 'label': '2层', 'value': '2' },
+        { 'label': '3层', 'value': '3' }
+      ],
+      isHaveList: [
+        { 'label': '空位', 'value': '1' },
+        { 'label': '有货', 'value': '2' }
+      ],
       rules: {
         struct_id: [
           { required: true, message: '仓位标识不能为空', trigger: 'blur' }
@@ -423,6 +482,9 @@ export default {
     sectChange(val) {
       this.form.sect_id = val[1]
     },
+    openOneCreate() {
+      this.openOneCreateDialog = true
+    },
     invtypeFormat(row) {
       for (const item of this.invtypelist) {
         if (item.code === row.inv_type) {