diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
index a042aa1..b4dfa53 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
@@ -12,7 +12,16 @@
 <!--              <a-input placeholder="请输入流程表单号" v-model="queryParam.processId"></a-input>-->
 <!--            </a-form-item>-->
 <!--          </a-col>-->
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+<!--          <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
+<!--            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
+
+<!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+<!--              </a>-->
+<!--            </span>-->
+<!--          </a-col>-->
+          <a-col :xl="4" :lg="7" :md="8" :sm="16">
             <a-form-item label="供应商">
               <a-input placeholder="请输入供应商信息" v-model="queryParam.supplierId"></a-input>
             </a-form-item>
@@ -23,19 +32,19 @@
 <!--                <j-search-select-tag placeholder="请选择供应商描述" v-model="queryParam.supplierDescription" dict=",,"/>-->
 <!--              </a-form-item>-->
 <!--            </a-col>-->
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="物料组">
-                <j-search-select-tag placeholder="请选择物料组" v-model="queryParam.itemGroup" dict=",,"/>
+                <a-input placeholder="请选择物料组" v-model="queryParam.itemGroup" dict=",,"/>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="物料">
-                <j-search-select-tag placeholder="请选择物料" v-model="queryParam.item" dict=",,"/>
+                <a-input placeholder="请选择物料" v-model="queryParam.item" dict=",,"/>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="物料描述">
-                <j-search-select-tag placeholder="请选择物料描述" v-model="queryParam.itemDescription" dict=",,"/>
+                <a-input placeholder="请选择物料描述" v-model="queryParam.itemDescription" dict=",,"/>
               </a-form-item>
             </a-col>
 
@@ -60,61 +69,53 @@
 <!--                <a-input placeholder="请输入金额" v-model="queryParam.rates"></a-input>-->
 <!--              </a-form-item>-->
 <!--            </a-col>-->
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="仓储地点">
-                <j-search-select-tag placeholder="请选择仓储地点" v-model="queryParam.unitWasteWarehouseCodeId" dict=",,"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="存储仓位">
-                <j-search-select-tag placeholder="请选择存储仓位" v-model="queryParam.freightSpace" dict=",,"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="生产时间">
-                <j-date placeholder="请选择生产时间" v-model="queryParam.productionTime"></j-date>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="保质期">
-                <j-date placeholder="请选择保质期" v-model="queryParam.expirationDate"></j-date>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="批次">
-                <j-search-select-tag placeholder="请选择批次" v-model="queryParam.batch" dict=",,"/>
-              </a-form-item>
-            </a-col>
+<!--            <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
+<!--              <a-form-item label="仓储地点">-->
+<!--                <j-search-select-tag placeholder="请选择仓储地点" v-model="queryParam.unitWasteWarehouseCodeId" dict=",,"/>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
+<!--            <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
+<!--              <a-form-item label="存储仓位">-->
+<!--                <j-search-select-tag placeholder="请选择存储仓位" v-model="queryParam.freightSpace" dict=",,"/>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
+<!--            <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
+<!--              <a-form-item label="生产时间">-->
+<!--                <j-date placeholder="请选择生产时间" v-model="queryParam.productionTime"></j-date>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
+<!--            <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
+<!--              <a-form-item label="保质期">-->
+<!--                <j-date placeholder="请选择保质期" v-model="queryParam.expirationDate"></j-date>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
+<!--            <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
+<!--              <a-form-item label="批次">-->
+<!--                <j-search-select-tag placeholder="请选择批次" v-model="queryParam.batch" dict=",,"/>-->
+<!--              </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.arrivalNotice"></a-input>-->
 <!--              </a-form-item>-->
 <!--            </a-col>-->
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="入库时间">
-                <j-date placeholder="请选择入库时间" v-model="queryParam.inboundTime"></j-date>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="入库人">
-                <j-search-select-tag placeholder="请选择入库人" v-model="queryParam.librarySign" dict=",,"/>
-              </a-form-item>
-            </a-col>
+<!--            <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
+<!--              <a-form-item label="入库时间">-->
+<!--                <j-date placeholder="请选择入库时间" v-model="queryParam.inboundTime"></j-date>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
+<!--            <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
+<!--              <a-form-item label="入库人">-->
+<!--                <j-search-select-tag placeholder="请选择入库人" v-model="queryParam.librarySign" dict=",,"/>-->
+<!--              </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.accountingAttributes"></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 @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -130,7 +131,7 @@
       <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
       <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <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>
@@ -193,7 +194,7 @@
 
     <process-supplies-stronger-modal ref="modalForm" @ok="modalFormOk"></process-supplies-stronger-modal>
   </a-card>
-    <ProcessSuppliesStrongerLists v-if="item" @strongerExit = "strongerExit"/>
+    <!--<ProcessSuppliesStrongerLists v-if="item" @strongerExit = "strongerExit"/>-->
   </div>
 </template>
 
@@ -206,7 +207,6 @@
   import JDate from '@/components/jeecg/JDate.vue'
   import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
   import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
-  import ProcessSuppliesStrongerLists from '@views/suppliesstronger/modules/ProcessSuppliesStrongerLists'
 
   export default {
     name: 'ProcessSuppliesStrongerList',
@@ -216,7 +216,6 @@
       JSearchSelectTag,
       ProcessSuppliesStrongerModal,
       JSuperQuery,
-      ProcessSuppliesStrongerLists,
     },
     data () {
       return {
@@ -369,11 +368,13 @@
     },
     methods: {
       handleDetaills(){
-        this.item = true;
+        // this.item = true;
+       this.$router.push({path:'/src/views/suppliesstronger/ProcessSuppliesStrongerLists'})
       },
       strongerExit(){
         this.item = false;
       },
+
       initDictConfig(){
       },
       getSuperFieldList(){
@@ -391,9 +392,9 @@
         fieldList.push({type:'sel_search',value:'unitWasteWarehouseCodeId',text:'仓储地点',dictTable:'', dictText:'', dictCode:''})
         fieldList.push({type:'sel_search',value:'freightSpace',text:'存储仓位',dictTable:'', dictText:'', dictCode:''})
         fieldList.push({type:'date',value:'productionTime',text:'生产时间'})
-        fieldList.push({type:'date',value:'expirationDate',text:'保质期'})
+        fieldList.push({type:'string',value:'expirationDate',text:'保质期'})
         fieldList.push({type:'sel_search',value:'batch',text:'批次',dictTable:'', dictText:'', dictCode:''})
-        fieldList.push({type:'int',value:'arrivalNotice',text:'是否到货',dictCode:''})
+        fieldList.push({type:'string',value:'arrivalNotice',text:'是否到货',dictCode:''})
         fieldList.push({type:'date',value:'inboundTime',text:'入库时间'})
         fieldList.push({type:'sel_search',value:'librarySign',text:'入库人',dictTable:'', dictText:'', dictCode:''})
         fieldList.push({type:'string',value:'accountingAttributes',text:'核算属性',dictCode:''})
diff --git a/src/views/suppliesstronger/modules/ProcessSuppliesStrongerLists.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
similarity index 93%
rename from src/views/suppliesstronger/modules/ProcessSuppliesStrongerLists.vue
rename to src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
index c39016e..056c3bc 100644
--- a/src/views/suppliesstronger/modules/ProcessSuppliesStrongerLists.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
@@ -25,17 +25,17 @@
 <!--            </a-col>-->
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="物料组">
-                <j-search-select-tag placeholder="请选择物料组" v-model="queryParam.itemGroup" dict=",,"/>
+                <a-input placeholder="请选择物料组" v-model="queryParam.itemGroup" dict=",,"/>
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="物料">
-                <j-search-select-tag placeholder="请选择物料" v-model="queryParam.item" dict=",,"/>
+                <a-input placeholder="请选择物料" v-model="queryParam.item" dict=",,"/>
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="物料描述">
-                <j-search-select-tag placeholder="请选择物料描述" v-model="queryParam.itemDescription" dict=",,"/>
+                <a-input placeholder="请选择物料描述" v-model="queryParam.itemDescription" dict=",,"/>
               </a-form-item>
             </a-col>
 
@@ -62,12 +62,12 @@
 <!--            </a-col>-->
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="仓储地点">
-                <j-search-select-tag placeholder="请选择仓储地点" v-model="queryParam.unitWasteWarehouseCodeId" dict=",,"/>
+                <a-input placeholder="请选择仓储地点" v-model="queryParam.unitWasteWarehouseCodeId" dict=",,"/>
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="存储仓位">
-                <j-search-select-tag placeholder="请选择存储仓位" v-model="queryParam.freightSpace" dict=",,"/>
+                <a-input placeholder="请选择存储仓位" v-model="queryParam.freightSpace" dict=",,"/>
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
@@ -82,7 +82,7 @@
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="批次">
-                <j-search-select-tag placeholder="请选择批次" v-model="queryParam.batch" dict=",,"/>
+                <a-input placeholder="请选择批次" v-model="queryParam.batch" dict=",,"/>
               </a-form-item>
             </a-col>
 <!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
@@ -97,7 +97,7 @@
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="入库人">
-                <j-search-select-tag placeholder="请选择入库人" v-model="queryParam.librarySign" dict=",,"/>
+                <a-input placeholder="请选择入库人" v-model="queryParam.librarySign" dict=",,"/>
               </a-form-item>
             </a-col>
 <!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
@@ -131,7 +131,7 @@
       <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
 
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <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>
@@ -139,7 +139,7 @@
         <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
       </a-dropdown>
 
-      <a-button @click="handlereturn" type="primary" style="float-right: 8px">退出</a-button>
+
     </div>
 
     <!-- table区域-begin -->
@@ -207,7 +207,7 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ProcessSuppliesStrongerModal from './ProcessSuppliesStrongerModal'
+  import ProcessSuppliesStrongerModal from './modules/ProcessSuppliesStrongerModal'
   import JDate from '@/components/jeecg/JDate.vue'
   import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
   import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
diff --git a/src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue b/src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue
index 678da99..4328175 100644
--- a/src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue
+++ b/src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue
@@ -15,27 +15,27 @@
           </a-col>
           <a-col :span="8">
             <a-form-item label="供应商描述" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-search-select-tag v-decorator="['supplierDescription']" type="list" :trigger-change="true" placeholder="请输入供应商描述"  />
+              <a-input v-decorator="['supplierDescription']" type="list" :trigger-change="true" placeholder="请输入供应商描述"  />
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="物料组" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-search-select-tag v-decorator="['itemGroup']" type="list" :trigger-change="true" placeholder="请输入物料组"   />
+              <a-input v-decorator="['itemGroup']" type="list" :trigger-change="true" placeholder="请输入物料组"   />
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="物料" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-search-select-tag v-decorator="['item']" type="list" :trigger-change="true" placeholder="请输入物料"  />
+              <a-input v-decorator="['item']" type="list" :trigger-change="true" placeholder="请输入物料"  />
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="物料描述" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-search-select-tag v-decorator="['itemDescription']" type="list" :trigger-change="true" placeholder="请输入物料描述"   />
+              <a-input v-decorator="['itemDescription']" type="list" :trigger-change="true" placeholder="请输入物料描述"   />
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="计量单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-search-select-tag v-decorator="['unitMeasurement']" type="list" :trigger-change="true" placeholder="请输入计量单位"   />
+              <a-input v-decorator="['unitMeasurement']" type="list" :trigger-change="true" placeholder="请输入计量单位"   />
             </a-form-item>
           </a-col>
           <a-col :span="8">
@@ -55,12 +55,12 @@
           </a-col>
           <a-col :span="8">
             <a-form-item label="仓储地点" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-search-select-tag v-decorator="['unitWasteWarehouseCodeId']" type="list" :trigger-change="true" placeholder="请输入仓储地点"  />
+              <a-input v-decorator="['unitWasteWarehouseCodeId']" type="list" :trigger-change="true" placeholder="请输入仓储地点"  />
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="存储仓位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-search-select-tag v-decorator="['freightSpace']" type="list" :trigger-change="true" placeholder="请输入储存仓位"  />
+              <a-input v-decorator="['freightSpace']" type="list" :trigger-change="true" placeholder="请输入储存仓位"  />
             </a-form-item>
           </a-col>
           <a-col :span="8">
@@ -70,17 +70,17 @@
           </a-col>
           <a-col :span="8">
             <a-form-item label="保质期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择保质期" v-decorator="['expirationDate']" :trigger-change="true" style="width: 100%" />
+              <a-input placeholder="请选择保质期" v-decorator="['expirationDate']" :trigger-change="true"  />
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="批次" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-search-select-tag v-decorator="['batch']" type="list" :trigger-change="true" placeholder="请输入批次"  />
+              <a-input v-decorator="['batch']" type="list" :trigger-change="true" placeholder="请输入批次"  />
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="到货情况" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-search-select-tag v-decorator="['arrivalNotice']" dict=""  />
+              <a-input v-decorator="['arrivalNotice']" dict=""  />
             </a-form-item>
           </a-col>
           <a-col :span="8">
@@ -90,12 +90,12 @@
           </a-col>
           <a-col :span="8">
             <a-form-item label="入库人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-search-select-tag v-decorator="['librarySign']" type="list" :trigger-change="true" placeholder="请输入入库人"  />
+              <a-input v-decorator="['librarySign']" type="list" :trigger-change="true" placeholder="请输入入库人"  />
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="核算属性" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-search-select-tag v-decorator="['accountingAttributes']" type="list" :trigger-change="true" placeholder="请输入核算属性"  />
+              <a-input v-decorator="['accountingAttributes']" type="list" :trigger-change="true" placeholder="请输入核算属性"  />
             </a-form-item>
           </a-col>
           <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
diff --git a/src/views/waste/ProcessWasteList.vue b/src/views/waste/ProcessWasteList.vue
new file mode 100644
index 0000000..792aeb6
--- /dev/null
+++ b/src/views/waste/ProcessWasteList.vue
@@ -0,0 +1,313 @@
+<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="3" :lg="5" :md="5" :sm="18">
+            <a-form-item label="物资名称">
+              <a-input placeholder="请选择物资名称" v-model="queryParam.materialName" dict=",,"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="3" :lg="5" :md="5" :sm="18">
+            <a-form-item label="报废日期">
+              <j-date placeholder="请选择报废日期" v-model="queryParam.scrapDate"></j-date>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="3" :lg="5" :md="5" :sm="18">
+            <a-form-item label="物料码">
+              <a-input placeholder="请选择物料码" v-model="queryParam.descriptionId" dict=",,"/>
+            </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.brand"></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.typeSpecification"></a-input>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
+<!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--              <a-form-item label="单位">-->
+<!--                <j-search-select-tag placeholder="请选择单位" v-model="queryParam.unit" dict=",,"/>-->
+<!--              </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.number"></a-input>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
+          <a-col :xl="3" :lg="5" :md="5" :sm="18">
+            <a-form-item label="所属单位">
+              <a-input placeholder="请选择所属单位" v-model="queryParam.affiliation" dict=",,"/>
+            </a-form-item>
+          </a-col>
+            <a-col :xl="3" :lg="5" :md="5" :sm="18">
+              <a-form-item label="仓库位置">
+                <a-input placeholder="请选择仓库位置" v-model="queryParam.depositary" dict=",,"/>
+              </a-form-item>
+            </a-col>
+          <a-col :xl="3" :lg="5" :md="5" :sm="18">
+            <a-form-item label="创建人">
+              <a-input placeholder="请选择创建人" v-model="queryParam.createBy" dict=",,"/>
+            </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.scrappedBecause"></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" @click="searchQuery" icon="search">查询</a-button>
+      <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</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>
+
+    <process-waste-modal ref="modalForm" @ok="modalFormOk"></process-waste-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ProcessWasteModal from './modules/ProcessWasteModal'
+  import JDate from '@/components/jeecg/JDate.vue'
+  import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+
+  export default {
+    name: 'ProcessWasteList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      JDate,
+      JSearchSelectTag,
+      ProcessWasteModal,
+      JSuperQuery,
+    },
+    data () {
+      return {
+        description: '废旧物资库表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          // {
+          //   title:'创建人',
+          //   align:"center",
+          //   dataIndex: 'createBy_dictText'
+          // },
+          {
+            title:'物料码',
+            align:"center",
+            dataIndex: 'descriptionId'
+          },
+          {
+            title:'品牌',
+            align:"center",
+            dataIndex: 'brand'
+          },
+          {
+            title:'名称',
+            align:"center",
+            dataIndex: 'materialName'
+          },
+          {
+            title:'型号规格',
+            align:"center",
+            dataIndex: 'typeSpecification'
+          },
+          {
+            title:'单位',
+            align:"center",
+            dataIndex: 'unit'
+          },
+          {
+            title:'数量',
+            align:"center",
+            dataIndex: 'number'
+          },
+          {
+            title:'存放位置',
+            align:"center",
+            dataIndex: 'depositary'
+          },
+          {
+            title:'报废原因',
+            align:"center",
+            dataIndex: 'scrappedBecause'
+          },
+          {
+            title:'所属单位',
+            align:"center",
+            dataIndex: 'affiliation'
+          },
+          {
+            title:'报废日期',
+            align:"center",
+            dataIndex: 'scrapDate',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
+        ],
+        url: {
+          list: "/waste/processWaste/list",
+          delete: "/waste/processWaste/delete",
+          deleteBatch: "/waste/processWaste/deleteBatch",
+          exportXlsUrl: "/waste/processWaste/exportXls",
+          importExcelUrl: "waste/processWaste/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'sel_search',value:'createBy',text:'创建人',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'sel_search',value:'descriptionId',text:'物料码',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'brand',text:'品牌',dictCode:''})
+        fieldList.push({type:'sel_search',value:'materialName',text:'名称',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'typeSpecification',text:'型号规格',dictCode:''})
+        fieldList.push({type:'sel_search',value:'unit',text:'单位',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'int',value:'number',text:'数量',dictCode:''})
+        fieldList.push({type:'sel_search',value:'depositary',text:'存放位置',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'scrappedBecause',text:'报废原因',dictCode:''})
+        fieldList.push({type:'sel_search',value:'affiliation',text:'所属单位',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'date',value:'scrapDate',text:'报废日期'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/waste/modules/ProcessWasteForm.vue b/src/views/waste/modules/ProcessWasteForm.vue
new file mode 100644
index 0000000..5700a7a
--- /dev/null
+++ b/src/views/waste/modules/ProcessWasteForm.vue
@@ -0,0 +1,210 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form :form="form" slot="detail">
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="创建人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['createBy']" dict=""  />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="物料码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['descriptionId']" dict=""  />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="品牌" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['brand']" placeholder="请输入品牌"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="物资名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['materialName']" dict=""  />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="型号规格" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['typeSpecification']" placeholder="请输入型号规格"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['unit']" dict=""  />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input-number v-decorator="['number']" placeholder="请输入数量" style="width: 100%" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="存放位置" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['depositary']" dict=""  />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="报废原因" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['scrappedBecause']" placeholder="请输入报废原因"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="所属单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['affiliation']" dict=""  />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="报废日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择报废日期" v-decorator="['scrapDate']" :trigger-change="true" style="width: 100%" />
+            </a-form-item>
+          </a-col>
+          <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
+            <a-button @click="submitForm">提 交</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import { validateDuplicateValue } from '@/utils/util'
+  import JFormContainer from '@/components/jeecg/JFormContainer'
+  import JDate from '@/components/jeecg/JDate'  
+  import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
+
+  export default {
+    name: 'ProcessWasteForm',
+    components: {
+      JFormContainer,
+      JDate,
+      JSearchSelectTag,
+    },
+    props: {
+      //流程表单data
+      formData: {
+        type: Object,
+        default: ()=>{},
+        required: false
+      },
+      //表单模式：true流程表单 false普通表单
+      formBpm: {
+        type: Boolean,
+        default: false,
+        required: false
+      },
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        form: this.$form.createForm(this),
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/waste/processWaste/add",
+          edit: "/waste/processWaste/edit",
+          queryById: "/waste/processWaste/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return false
+          }
+          return true
+        }
+        return this.disabled
+      },
+      showFlowSubmitButton(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return true
+          }
+        }
+        return false
+      }
+    },
+    created () {
+      //如果是流程中表单，则需要加载流程表单data
+      this.showFlowData();
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'createBy','descriptionId','brand','materialName','typeSpecification','unit','number','depositary','scrappedBecause','affiliation','scrapDate'))
+        })
+      },
+      //渲染流程表单数据
+      showFlowData(){
+        if(this.formBpm === true){
+          let params = {id:this.formData.dataId};
+          getAction(this.url.queryById,params).then((res)=>{
+            if(res.success){
+              this.edit (res.result);
+            }
+          });
+        }
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            console.log("表单提交数据",formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+      popupCallback(row){
+        this.form.setFieldsValue(pick(row,'createBy','descriptionId','brand','materialName','typeSpecification','unit','number','depositary','scrappedBecause','affiliation','scrapDate'))
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/waste/modules/ProcessWasteModal.vue b/src/views/waste/modules/ProcessWasteModal.vue
new file mode 100644
index 0000000..674c1c3
--- /dev/null
+++ b/src/views/waste/modules/ProcessWasteModal.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="关闭">
+    <process-waste-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></process-waste-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ProcessWasteForm from './ProcessWasteForm'
+  export default {
+    name: 'ProcessWasteModal',
+    components: {
+      ProcessWasteForm
+    },
+    data () {
+      return {
+        title:'',
+        width:1024,
+        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/src/views/waste/modules/ProcessWasteModal__Style#Drawer.vue b/src/views/waste/modules/ProcessWasteModal__Style#Drawer.vue
new file mode 100644
index 0000000..56f149f
--- /dev/null
+++ b/src/views/waste/modules/ProcessWasteModal__Style#Drawer.vue
@@ -0,0 +1,83 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    :visible="visible">
+    <process-waste-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></process-waste-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 ProcessWasteForm from './ProcessWasteForm'
+
+  export default {
+    name: 'ProcessWasteModal',
+    components: {
+      ProcessWasteForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:1024,
+        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