diff --git a/src/views/wastematerials/ProcessWasteMaterialsList.vue b/src/views/wastematerials/ProcessWasteMaterialsList.vue
index d1a1a61..ce914a1 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsList.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsList.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card :bordered="false" v-if="!item">
+    <a-card :bordered="false">
       <!-- 查询区域 -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -15,28 +15,24 @@
                 <a-input placeholder="请输入物料" v-model="queryParam.material"></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.materialDescription"></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.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-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-form-item label="物料描述">
+                <a-input placeholder="请输入物料描述" v-model="queryParam.materialDescription"></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.accountingAttributes"></a-input>
+              </a-form-item>
             </a-col>
+<!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--              <a-form-item label="帐外物资库">-->
+<!--                &lt;!&ndash;                <a-input placeholder="帐外物资库" v-model="queryParam.materialsUnit"></a-input>&ndash;&gt;-->
+<!--                <a-select v-model="queryParam.materialsUnit" placeholder="请选择" >-->
+<!--                  <a-select-option v-for="(item,index) in libraryNames" :key="index" :value="item.id">{{item.libraryName}}</a-select-option>-->
+<!--                </a-select>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
           </a-row>
         </a-form>
       </div>
@@ -49,14 +45,8 @@
         <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>
+        <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+        <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
       </div>
 
       <!-- table区域-begin -->
@@ -100,18 +90,20 @@
             </a-button>
           </template>
 
-          <span slot="action" slot-scope="text, record">
-
+          <span slot="action" slot-scope="text, record" style="overflow: hidden;" class="table-page-search-submitButtons">
           <a-dropdown>
-            <a class="ant-dropdown-link" @click="handleDetails(record)">查看详情<a-icon type="down" /></a>
+            <a class="ant-dropdown-link" @click="handleDetail(record)">详情<a-icon type="down" /></a>
           </a-dropdown>
-        </span>
+          </span>
+
 
         </a-table>
+
+
       </div>
-      <process-waste-materials-modal ref="modalForm" @ok="modalFormOk" ></process-waste-materials-modal>
+
+      <process-waste-materials-modal ref="modalForm" @ok="modalFormOk"></process-waste-materials-modal>
     </a-card>
-    <ProcessWaste v-if="item"/>
   </div>
 
 </template>
@@ -121,21 +113,29 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ProcessWasteMaterialsModal from './modules/ProcessWasteMaterialsModal'
+  import ProcessWasteMaterialsModal from '@views/wastematerials/modules/ProcessWasteMaterialsModal'
+  import JDate from '@/components/jeecg/JDate.vue'
+  import { httpAction, getAction } from '@/api/manage'
   import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
-  import ProcessWaste from '@views/wastematerials/modules/ProcessWaste'
+  import ProcessWasteMaterialsLists from '@views/wastematerials/ProcessWasteMaterialsLists'
 
   export default {
     name: 'ProcessWasteMaterialsList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
+      ProcessWasteMaterialsLists,
+      JDate,
       ProcessWasteMaterialsModal,
       JSuperQuery,
-      ProcessWaste,
     },
     data () {
       return {
-        item: false,
+        // //帐外库存位置储存信息
+        // libraryNamesMessage: [],
+        // //供应商信息
+        // supplierMessage: [],
+        // //物料信息
+        // materialMessage: [],
         description: '账外物资库管理页面',
         // 表头
         columns: [
@@ -167,7 +167,7 @@
           {
             title:'计量单位',
             align:"center",
-            dataIndex: 'unitMeasurement'
+            dataIndex: 'materialsUnit'
           },
           {
             title:'现有数量',
@@ -177,27 +177,7 @@
           {
             title:'消耗数量',
             align:"center",
-            dataIndex: 'consumeNumber'
-          },
-          {
-            title:'物料描述',
-            align:"center",
-            dataIndex: 'materialDescription1'
-          },
-          {
-            title:'计量单位',
-            align:"center",
-            dataIndex: 'unitMeasurement1'
-          },
-          {
-            title:'现有数量',
-            align:"center",
-            dataIndex: 'existingNumber1'
-          },
-          {
-            title:'消耗数量',
-            align:"center",
-            dataIndex: 'consumeNumber1'
+            dataIndex: 'usageQuantity'
           },
           {
             title: '查看详情',
@@ -215,9 +195,14 @@
           exportXlsUrl: "/wastematerials/processWasteMaterials/exportXls",
           importExcelUrl: "wastematerials/processWasteMaterials/importExcel",
 
+          queryLibraryName: "/libraryassociation/processLibraryAssociation/list",
+          queryListmaterials: "/wastematerials/processWasteMaterials/materialGroup"
+
         },
         dictOptions:{},
         superFieldList:[],
+        libraryNames:[],
+        Listmaterials:[]
       }
     },
     created() {
@@ -229,32 +214,50 @@
       },
     },
     methods: {
-      handleDetails(){
-        this.item = true;
+      handleDetail(record){
+        this.$router.push({name:'src-views-wastematerials-ProcessWasteMaterialsLists',params:{material: record.material}})
       },
       initDictConfig(){
       },
       getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'supplier',text:'供应商',dictCode:''})
-        fieldList.push({type:'string',value:'supplierDescription',text:'供应商描述',dictCode:''})
-        fieldList.push({type:'string',value:'materialGroup',text:'物料组',dictCode:''})
-        fieldList.push({type:'string',value:'material',text:'物料',dictCode:''})
-        fieldList.push({type:'string',value:'materialDescription',text:'物料描述',dictCode:''})
-        fieldList.push({type:'string',value:'materialStorageId',text:'库存位置',dictCode:''})
-        fieldList.push({type:'string',value:'freightSpace',text:'库存仓位',dictCode:''})
-        fieldList.push({type:'string',value:'unitMeasurement',text:'计量单位',dictCode:''})
-        fieldList.push({type:'int',value:'existingNumber',text:'现有数量',dictCode:''})
-        fieldList.push({type:'string',value:'consumeNumber',text:'消耗数量',dictCode:''})
-        fieldList.push({type:'int',value:'number',text:'数量',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'price',text:'单价',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'money',text:'金额',dictCode:''})
-        fieldList.push({type:'date',value:'productionDate',text:'生产日期'})
-        fieldList.push({type:'date',value:'expirationDate',text:'保质期'})
-        fieldList.push({type:'string',value:'inboundTime',text:'入库时间',dictCode:''})
-        fieldList.push({type:'string',value:'warehousePeople',text:'入库人',dictCode:''})
-        fieldList.push({type:'string',value:'accountingAttributes',text:'核算属性',dictCode:''})
-        this.superFieldList = fieldList
+        // let fieldList=[];
+        // fieldList.push({type:'string',value:'supplier',text:'供应商',dictCode:''})
+        // fieldList.push({type:'string',value:'supplierDescription',text:'供应商描述',dictCode:''})
+        // fieldList.push({type:'string',value:'materialGroup',text:'物料组',dictCode:''})
+        // fieldList.push({type:'string',value:'material',text:'物料',dictCode:''})
+        // fieldList.push({type:'string',value:'materialDescription',text:'物料描述',dictCode:''})
+        // fieldList.push({type:'string',value:'materialStorageId',text:'库存位置',dictCode:''})
+        // fieldList.push({type:'string',value:'freightSpace',text:'库存仓位',dictCode:''})
+        // fieldList.push({type:'string',value:'materialsUnit',text:'计量单位',dictCode:''})
+        // fieldList.push({type:'int',value:'number',text:'数量',dictCode:''})
+        // fieldList.push({type:'BigDecimal',value:'price',text:'单价',dictCode:''})
+        // fieldList.push({type:'BigDecimal',value:'money',text:'金额',dictCode:''})
+        // fieldList.push({type:'date',value:'productionDate',text:'生产日期'})
+        // fieldList.push({type:'String',value:'expirationDate',text:'保质期'})
+        // fieldList.push({type:'Date',value:'inboundTime',text:'入库时间',dictCode:''})
+        // fieldList.push({type:'string',value:'warehousePeople',text:'入库人',dictCode:''})
+        // fieldList.push({type:'string',value:'accountingAttributes',text:'核算属性',dictCode:''})
+        // fieldList.push({type:'string',value:'libraryNames',text:'库存位置',dictCode:''})
+        // this.superFieldList = fieldList
+        let item ={
+          state : 0,
+          sort : 0
+        }
+        getAction(this.url.queryLibraryName,item).then((res)=>{
+          if(res.success){
+            this.libraryNames = res.result.records;
+            console.log("222222")
+            console.log(res.result.records);
+          }
+        });
+        getAction(this.url.queryListmaterials).then((res)=>{
+          if(res.success){
+            this.Listmaterials = res.result;
+            console.log("1111111")
+            console.log(res.result);
+            console.log("22222-22")
+          }
+        });
       }
     }
   }
diff --git a/src/views/wastematerials/ProcessWasteMaterialsLists.vue b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
new file mode 100644
index 0000000..4543880
--- /dev/null
+++ b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
@@ -0,0 +1,352 @@
+<template>
+  <div>
+    <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="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="供应商">
+                <a-input placeholder="请输入供应商" v-model="queryParam.supplier"></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.supplierDescription"></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.materialGroup"></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.material" :read-only="true"></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.materialDescription"></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.theirTeam"></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.productionDate"></j-date>
+              </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.expirationDate"></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="物资状态">
+                <a-input placeholder="请输入物资状态" v-model="queryParam.materialsState"></a-input>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <div class="table-operator">
+        <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+        <a-button type="primary" @click="searchReset" icon="reload">重置{{material}}</a-button>
+
+      </div>
+      <!-- 查询区域-END -->
+
+      <!-- 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>
+        </a-table>
+      </div>
+
+      <process-waste-materials-modal ref="modalForm" @ok="modalFormOk"></process-waste-materials-modal>
+    </a-card>
+  </div>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ProcessWasteMaterialsModal from '@views/wastematerials/modules/ProcessWasteMaterialsModal'
+  import { httpAction, getAction } from '@/api/manage'
+  import JDate from '@/components/jeecg/JDate.vue'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+  import ProcessWasteMaterialsList from '@views/wastematerials/ProcessWasteMaterialsList'
+
+  export default {
+    name: 'ProcessWasteMaterialsLists',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ProcessWasteMaterialsList,
+      JDate,
+      ProcessWasteMaterialsModal,
+      JSuperQuery,
+    },
+    data () {
+      return {
+        material: this.$route.params.material,
+        queryParam:{
+          supplier: null,
+          supplierDescription: null,
+          materialGroup : null,
+          material : this.$route.params.material,
+          materialDescription: null,
+          theirTeam: null,
+          productionDate: null,
+          expirationDate: null,
+          inboundTime: null,
+          materialsState: null,
+          del_flag: 0
+        },
+
+        description: '账外物资库管理页面',
+        dataSource:[],
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'供应商',
+            align:"center",
+            dataIndex: 'supplier'
+          },
+          {
+            title:'供应商描述',
+            align:"center",
+            dataIndex: 'supplierDescription'
+          },
+          {
+            title:'物料组',
+            align:"center",
+            dataIndex: 'materialGroup'
+          },
+          {
+            title:'物料',
+            align:"center",
+            dataIndex: 'material'
+          },
+          {
+            title:'物料描述',
+            align:"center",
+            dataIndex: 'materialDescription'
+          },
+          {
+            title:'库存位置',
+            align:"center",
+            dataIndex: 'materialStorageId'
+          },
+          {
+            title:'库存仓位',
+            align:"center",
+            dataIndex: 'freightSpace'
+          },
+          {
+            title:'计量单位',
+            align:"center",
+            dataIndex: 'materialsUnit'
+          },
+          {
+            title:'数量',
+            align:"center",
+            dataIndex: 'number'
+          },
+          {
+            title:'单价',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'金额',
+            align:"center",
+            dataIndex: 'money'
+          },
+          {
+            title:'生产日期',
+            align:"center",
+            dataIndex: 'productionDate',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'保质期',
+            align:"center",
+            dataIndex: 'expirationDate'
+          },
+          {
+            title:'入库时间',
+            align:"center",
+            dataIndex: 'inboundTime'
+          },
+          {
+            title:'入库人',
+            align:"center",
+            dataIndex: 'warehousePeople'
+          },
+          {
+            title:'核算属性',
+            align:"center",
+            dataIndex: 'accountingAttributes'
+          }
+        ],
+        url: {
+          list: "/wastematerials/processWasteMaterials/lists",
+          delete: "/wastematerials/processWasteMaterials/delete",
+          deleteBatch: "/wastematerials/processWasteMaterials/deleteBatch",
+          exportXlsUrl: "/wastematerials/processWasteMaterials/exportXls",
+          importExcelUrl: "wastematerials/processWasteMaterials/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      // 判断路由上是否存在参数，如果没有则跳转回帐外物资管理页面
+      this.judgeRouterParam();
+      this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      judgeRouterParam(){
+        if (this.$route.params.material == null){
+          this.$router.go(-1);
+        }
+      },
+      initDictConfig(){
+      },
+      searchQuery(){
+        getAction(this.url.list,this.queryParam).then((res)=>{
+          if(res.success){
+            console.log("resultsearch ：")
+            console.log(res.result);
+            console.log(this.queryParam)
+            this.dataSource=res.result.records;
+          }
+        });
+      },
+      searchReset(){
+        this.queryParam = {
+            supplier: null,
+            supplierDescription: null,
+            materialGroup : null,
+            material : this.$route.params.material,
+            materialDescription: null,
+            theirTeam: null,
+            productionDate: null,
+            expirationDate: null,
+            inboundTime: null,
+            materialsState: null,
+            del_flag: 0
+        },
+        getAction(this.url.list,this.queryParam).then((res)=>{
+          if(res.success){
+            console.log("resultsearch ：")
+            console.log(res.result);
+            console.log(this.queryParam)
+            this.dataSource=res.result.records;
+          }
+        });
+      },
+      loadData(){
+        getAction(this.url.list,this.queryParam).then((res)=>{
+          if(res.success){
+            console.log("result ：")
+            console.log(res.result)
+            console.log(this.queryParam)
+            this.dataSource=res.result.records;
+          }
+        });
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'supplier',text:'供应商',dictCode:''})
+        fieldList.push({type:'string',value:'supplierDescription',text:'供应商描述',dictCode:''})
+        fieldList.push({type:'string',value:'materialGroup',text:'物料组',dictCode:''})
+        fieldList.push({type:'string',value:'material',text:'物料',dictCode:''})
+        fieldList.push({type:'string',value:'materialDescription',text:'物料描述',dictCode:''})
+        fieldList.push({type:'string',value:'materialStorageId',text:'库存位置',dictCode:''})
+        fieldList.push({type:'string',value:'freightSpace',text:'库存仓位',dictCode:''})
+        fieldList.push({type:'string',value:'materialsUnit',text:'计量单位',dictCode:''})
+        fieldList.push({type:'int',value:'number',text:'数量',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'单价',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'money',text:'金额',dictCode:''})
+        fieldList.push({type:'date',value:'productionDate',text:'生产日期'})
+        fieldList.push({type:'String',value:'expirationDate',text:'保质期'})
+        fieldList.push({type:'date',value:'inboundTime',text:'入库时间',dictCode:''})
+        fieldList.push({type:'string',value:'warehousePeople',text:'入库人',dictCode:''})
+        fieldList.push({type:'string',value:'accountingAttributes',text:'核算属性',dictCode:''})
+        this.superFieldList = fieldList
+        console.log("superFieldList : ")
+        console.log(this.superFieldList)
+
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/wastematerials/modules/ProcessWasteMaterialsForm.vue b/src/views/wastematerials/modules/ProcessWasteMaterialsForm.vue
index 8481775..b7628eb 100644
--- a/src/views/wastematerials/modules/ProcessWasteMaterialsForm.vue
+++ b/src/views/wastematerials/modules/ProcessWasteMaterialsForm.vue
@@ -3,91 +3,82 @@
     <j-form-container :disabled="formDisabled">
       <a-form :form="form" slot="detail">
         <a-row>
-          <a-col :span="8">
+          <a-col :span="12">
             <a-form-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input v-decorator="['supplier']" placeholder="请输入供应商"  ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="8">
+          <a-col :span="12">
             <a-form-item label="供应商描述" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input v-decorator="['supplierDescription']" placeholder="请输入供应商描述"  ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="8">
+          <a-col :span="12">
             <a-form-item label="物料组" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input v-decorator="['materialGroup']" placeholder="请输入物料组"  ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="8">
+          <a-col :span="12">
             <a-form-item label="物料" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input v-decorator="['material']" placeholder="请输入物料"  ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="8">
+          <a-col :span="12">
             <a-form-item label="物料描述" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input v-decorator="['materialDescription']" placeholder="请输入物料描述"  ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="8">
+          <a-col :span="12">
+            <a-form-item label="所属工作队" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['theirTeam']" placeholder="请输入所属工作队"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
             <a-form-item label="库存位置" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input v-decorator="['materialStorageId']" placeholder="请输入库存位置"  ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="8">
+          <a-col :span="12">
             <a-form-item label="库存仓位" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input v-decorator="['freightSpace']" placeholder="请输入库存仓位"  ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="8">
-            <a-form-item label="计量单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['unitMeasurement']" placeholder="请输入计量单位"  ></a-input>
-            </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-number v-decorator="['price']" placeholder="请输入单价" style="width: 100%" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-number v-decorator="['money']" placeholder="请输入金额" style="width: 100%" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
+          <a-col :span="12">
             <a-form-item label="生产日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-date placeholder="请选择生产日期" v-decorator="['productionDate']" :trigger-change="true" style="width: 100%" />
             </a-form-item>
           </a-col>
-          <a-col :span="8">
+          <a-col :span="12">
             <a-form-item label="保质期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择保质期" v-decorator="['expirationDate']" :trigger-change="true" style="width: 100%" />
+              <a-input v-decorator="['expirationDate']" placeholder="请输入保质期"  ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="8">
+          <a-col :span="12">
             <a-form-item label="入库时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['inboundTime']" placeholder="请输入入库时间"  ></a-input>
+              <j-date v-decorator="['inboundTime']" placeholder="请输入入库时间"  ></j-date>
             </a-form-item>
           </a-col>
-          <a-col :span="8">
+          <a-col :span="12">
             <a-form-item label="入库人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input v-decorator="['warehousePeople']" placeholder="请输入入库人"  ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="8">
+          <a-col :span="12">
             <a-form-item label="核算属性" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input v-decorator="['accountingAttributes']" placeholder="请输入核算属性"  ></a-input>
             </a-form-item>
           </a-col>
+          <a-col :span="12">
+            <a-form-item label="物资状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['materialsState']" placeholder="请输入物资状态"  ></a-input>
+            </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>
@@ -98,13 +89,11 @@
   import pick from 'lodash.pick'
   import { validateDuplicateValue } from '@/utils/util'
   import JFormContainer from '@/components/jeecg/JFormContainer'
-  import JDate from '@/components/jeecg/JDate'  
 
   export default {
     name: 'ProcessWasteMaterialsForm',
     components: {
       JFormContainer,
-      JDate,
     },
     props: {
       //流程表单data
@@ -180,7 +169,7 @@
         this.model = Object.assign({}, record);
         this.visible = true;
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'supplier','supplierDescription','materialGroup','material','materialDescription','materialStorageId','freightSpace','unitMeasurement','existingNumber','consumeNumber','number','price','money','productionDate','expirationDate','inboundTime','warehousePeople','accountingAttributes'))
+          this.form.setFieldsValue(pick(this.model,'supplier','supplierDescription','materialGroup','material','materialDescription','materialStorageId','freightSpace','unit','number','price','money','productionDate','expirationDate','inboundTime','warehousePeople','accountingAttributes'))
         })
       },
       //渲染流程表单数据
@@ -226,7 +215,7 @@
         })
       },
       popupCallback(row){
-        this.form.setFieldsValue(pick(row,'supplier','supplierDescription','materialGroup','material','materialDescription','materialStorageId','freightSpace','unitMeasurement','existingNumber','consumeNumber','number','price','money','productionDate','expirationDate','inboundTime','warehousePeople','accountingAttributes'))
+        this.form.setFieldsValue(pick(row,'supplier','supplierDescription','materialGroup','material','materialDescription','materialStorageId','freightSpace','unit','number','price','money','productionDate','expirationDate','inboundTime','warehousePeople','accountingAttributes'))
       },
     }
   }