diff --git a/ant-design-vue-jeecg/src/views/kucun/admin/KucunList.vue b/ant-design-vue-jeecg/src/views/kucun/admin/KucunList.vue
index e69de29b..5f7ddc6b 100644
--- a/ant-design-vue-jeecg/src/views/kucun/admin/KucunList.vue
+++ b/ant-design-vue-jeecg/src/views/kucun/admin/KucunList.vue
@@ -0,0 +1,131 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="10" :lg="11" :md="12" :sm="24">
+            <a-form-item label="库存剩余">
+              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="queryParam.kcsy_begin"></a-input>
+              <span class="query-group-split-cust"></span>
+              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="queryParam.kcsy_end"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="名称">
+              <a-input placeholder="请输入名称" v-model="queryParam.temp1"></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="编号">
+                <a-input placeholder="请输入编号" v-model="queryParam.temp2"></a-input>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('库存信息')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <kucun-modal ref="modalForm" @ok="modalFormOk"></kucun-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import KucunModal from './modules/KucunModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
diff --git a/ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunForm.vue b/ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunForm.vue
index e69de29b..fd8a7c16 100644
--- a/ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunForm.vue
+++ b/ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunForm.vue
@@ -0,0 +1,97 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24" >
+            <a-form-model-item label="物品类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wuplx">
+              <j-dict-select-tag type="list" v-model="model.wuplx" dictCode="goods_category" placeholder="请选择物品类型" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24" v-if="this.model.wuplx==1">
+            <a-form-model-item label="面料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mlname">
+              <j-popup
+                v-model="model.mlname"
+                field="mlname"
+                org-fields="name,id,fabric_number"
+                dest-fields="mlname,mlid,mlbh"
+                code="findml"
+                :multi="true"
+                @input="popupCallback"
+                />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24"  v-if="this.model.wuplx==2">
+            <a-form-model-item label="辅料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="flname">
+              <j-popup
+                v-model="model.flname"
+                field="flname"
+                org-fields="id,contents"
+                dest-fields="flid,flname"
+                code="ckfindfl"
+                :multi="true"
+                @input="popupCallback"
+                />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24"  v-if="this.model.wuplx==3">
+            <a-form-model-item label="设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sbname">
+              <j-popup
+                v-model="model.sbname"
+                field="sbname"
+                org-fields="id,code,name"
+                dest-fields="sbid,sbbh,sbname"
+                code="ckfindsb"
+                :multi="true"
+                @input="popupCallback"
+                />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24" v-if="this.model.wuplx==4">
+            <a-form-model-item label="工具" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="gjname">
+              <j-popup
+                v-model="model.gjname"
+                field="gjname"
+                org-fields="id,name,nums"
+                dest-fields="gjid,gjbh,gjname"
+                code="kcfindgj"
+                :multi="true"
+                @input="popupCallback"
+              />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24"  v-if="this.model.wuplx==5">
+            <a-form-model-item label="商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="spname">
+              <j-popup
+                v-model="model.spname"
+                field="spname"
+                org-fields="id,goods_code,goods_name"
+                dest-fields="spid,spbh,spname"
+                code="kcfindsp"
+                :multi="true"
+                @input="popupCallback"
+              />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="库存剩余" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kcsy">
+              <a-input-number v-model="model.kcsy" placeholder="请输入库存剩余" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <!--<a-col :span="24">
+            <a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temp1">
+              <a-input v-model="model.temp1" placeholder="请输入名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temp2">
+              <a-input v-model="model.temp2" placeholder="请输入编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>-->
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
diff --git a/ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal.vue b/ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal.vue
index e69de29b..b4d17544 100644
--- a/ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal.vue
+++ b/ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <kucun-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></kucun-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import KucunForm from './KucunForm'
+  export default {
+    name: 'KucunModal',
+    components: {
+      KucunForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal__Style#Drawer.vue
index e69de29b..3c4c604e 100644
--- a/ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal__Style#Drawer.vue
+++ b/ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal__Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <kucun-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></kucun-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import KucunForm from './KucunForm'
+
+  export default {
+    name: 'KucunModal',
+    components: {
+      KucunForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file