diff --git a/.env.development b/.env.development
index 605bb4a..91f061a 100644
--- a/.env.development
+++ b/.env.development
@@ -2,15 +2,15 @@
 ENV='development'
 
 # base api
-#VUE_APP_BASE_API = http://192.168.60.99:9004/
-#VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file
-#VUE_APP_OA_URL = http://192.168.60.18:2021
-#VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}'
+VUE_APP_BASE_API = http://192.168.60.99:9004/
+VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file
+VUE_APP_OA_URL = http://192.168.60.18:2021
+VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}'
 
-VUE_APP_BASE_API = http://192.168.60.99:8004/
-VUE_APP_UPLOAD_API = http://192.168.60.99:8004/api/admin/upload-file
-VUE_APP_OA_URL= http://suzhouhedaooa.langye.net
-VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}'
+#VUE_APP_BASE_API = http://192.168.60.99:8004/
+#VUE_APP_UPLOAD_API = http://192.168.60.99:8004/api/admin/upload-file
+#VUE_APP_OA_URL= http://suzhouhedaooa.langye.net
+#VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}'
 
 
 
diff --git a/src/views/materialfile/component/addMater.vue b/src/views/materialfile/component/addMater.vue
index 49ea605..02ea244 100644
--- a/src/views/materialfile/component/addMater.vue
+++ b/src/views/materialfile/component/addMater.vue
@@ -59,7 +59,7 @@
           </div>
         </div>
       </template>
-      <template v-slot:zhuangtai>
+<!--      <template v-slot:zhuangtai>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;"></span>状态：
@@ -68,7 +68,7 @@
             <el-input v-model="form.zhuangtai" placeholder="请填写状态" clearable style="width: 300px;"></el-input>
           </div>
         </div>
-      </template>
+      </template> -->
       <template v-slot:jiliangdanwei>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -79,31 +79,29 @@
           </div>
         </div>
       </template>
-      <template v-slot:suozaicangku>
+      <template v-slot:suozaicangku_id>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;"></span>所在仓库：
           </div>
           <div class="xy-table-item-content">
-            <el-select v-model="form.suozaicangku" style="width: 300px;" placeholder="请选择所在仓库">
+            <el-select v-model="form.suozaicangku_id" style="width: 300px;" placeholder="请选择所在仓库">
               <el-option
                 v-for="item in cangkuList"
-                :key="item.cangkumingcheng"
+                :key="item.id"
                 :label="item.cangkumingcheng"
-                :value="item.cangkumingcheng">
+                :value="item.id">
               </el-option>
             </el-select>
           </div>
         </div>
       </template>
-      <template v-slot:suozaihuojia>
+<!--      <template v-slot:suozaihuojia>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;"></span>所在货架：
           </div>
           <div class="xy-table-item-content">
-            <!-- <el-input v-model="form.suozaihuojia" placeholder="请填写所在货架" clearable style="width: 300px;"></el-input> -->
-
             <el-select v-model="form.suozaihuojia" style="width: 300px;" placeholder="请选择所在货架">
               <el-option
                 v-for="item in huojiaList"
@@ -114,7 +112,7 @@
             </el-select>
           </div>
         </div>
-      </template>
+      </template> -->
       <template v-slot:rukushijian>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -127,7 +125,7 @@
           </div>
         </div>
       </template>
-      <template v-slot:zichanyuanzhi>
+<!--      <template v-slot:zichanyuanzhi>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;"></span>资产原值：
@@ -136,7 +134,7 @@
             <el-input v-model="form.zichanyuanzhi" placeholder="请填写资产原值" clearable style="width: 300px;"></el-input>
           </div>
         </div>
-      </template>
+      </template> -->
       <template v-slot:shiyongnianxian>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -147,7 +145,7 @@
           </div>
         </div>
       </template>
-      <template v-slot:shiyongbumen>
+<!--      <template v-slot:shiyongbumen>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;"></span>使用部门：
@@ -156,7 +154,7 @@
             <el-input v-model="form.shiyongbumen" placeholder="请填写使用部门" clearable style="width: 300px;"></el-input>
           </div>
         </div>
-      </template>
+      </template> -->
       <template v-slot:shifouweigudingzichan>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -272,6 +270,7 @@
           zhuangtai:'',
           jiliangdanwei:'',
           suozaicangku:'',
+          suozaicangku_id:'',
           suozaihuojia:'',
           rukushijian:'',
           zichanyuanzhi:'',
@@ -338,6 +337,7 @@
           zhuangtai:res?.zhuangtai,
           jiliangdanwei:res?.jiliangdanwei,
           suozaicangku:res?.suozaicangku,
+          suozaicangku_id:res.suozaicangku_id?parseInt(res.suozaicangku_id):'',
           suozaihuojia:res?.suozaihuojia,
           rukushijian:res?.rukushijian,
           zichanyuanzhi:res?.zichanyuanzhi,
diff --git a/src/views/materialfile/index.vue b/src/views/materialfile/index.vue
index cc04f53..8c8bb2c 100644
--- a/src/views/materialfile/index.vue
+++ b/src/views/materialfile/index.vue
@@ -162,12 +162,12 @@
             prop: 'fenlei',
             align: 'center'
           },
-          {
-            label: "状态",
-            width: 180,
-            prop: 'zhuangtai',
-            align: 'center'
-          },
+          // {
+          //   label: "状态",
+          //   width: 180,
+          //   prop: 'zhuangtai',
+          //   align: 'center'
+          // },
           {
             label: "计量单位",
             width: 180,
@@ -177,44 +177,50 @@
           {
             label: "所在仓库",
             width: 180,
-            prop: 'suozaicangku',
-            align: 'center'
-          },
-          {
-            label: "所在货架",
-            width: 180,
-            prop: 'suozaihuojia',
+            prop: 'materialstorages_details.cangkumingcheng',
             align: 'center'
           },
+          // {
+          //   label: "所在货架",
+          //   width: 180,
+          //   prop: 'suozaihuojia',
+          //   align: 'center'
+          // },
           {
             label: "入库时间",
             width: 180,
             prop: 'rukushijian',
             align: 'center'
           },
-          {
-            label: "资产原值",
-            width: 180,
-            prop: 'zichanyuanzhi',
-            align: 'center'
-          },
+          // {
+          //   label: "资产原值",
+          //   width: 180,
+          //   prop: 'zichanyuanzhi',
+          //   align: 'center'
+          // },
           {
             label: "使用年限",
             width: 180,
             prop: 'shiyongnianxian',
             align: 'center'
           },
-          {
-            label: "使用部门",
-            width: 180,
-            prop: 'shiyongbumen',
-            align: 'center'
-          },
+          // {
+          //   label: "使用部门",
+          //   width: 180,
+          //   prop: 'shiyongbumen',
+          //   align: 'center'
+          // },
           {
             label: "是否为固定资产",
             width: 180,
             prop: 'shifouweigudingzichan',
             align: 'center'
+          },
+          {
+            label: "库存",
+            width: 180,
+            prop: 'inventorys_total',
+            align: 'center'
           },
           {
             label: "备注",
@@ -253,7 +259,7 @@
           {
             "key": "suozaicangku",
             "op": "eq",
-            "value": this.select.suozaicangku
+            "value": this.select.suozaicangku?this.select.suozaicangku:''
           },
 
           ],
@@ -324,7 +330,7 @@
       async exportExcel(sheetName) {
         const res = await index(Object.assign(this.select, {
           page: 1,
-          page_size: 99999,
+          page_size: 9999,
           table_name: this.customForm.tableName
         }))
         if (res.data) {
diff --git a/src/views/team/components/showTeam.vue b/src/views/team/components/showTeam.vue
new file mode 100644
index 0000000..4f5590b
--- /dev/null
+++ b/src/views/team/components/showTeam.vue
@@ -0,0 +1,96 @@
+<template>
+  <div>
+    <xy-dialog ref="dialog" :width='60' :is-show.sync="isShow" type="normal" title="花名册"
+      >
+      <template v-slot:normalContent>
+        <xy-table :list="bookList" :isPage="false"
+          :table-item="table">
+          <template v-slot:btns>
+                <div>
+                </div>
+          </template>
+
+        </xy-table>
+      </template>
+    </xy-dialog>
+
+  </div>
+</template>
+
+<script>
+  import {
+    index
+  } from "@/api/system/baseForm.js"
+  export default {
+
+    data() {
+      return {
+        isShow: false,
+        id: '',
+        tableName: 'books',
+        bookList: [],
+        table: [{
+          label: '序号',
+          type: 'index',
+          fixed: 'left',
+          width: 80,
+        }, {
+          label: '所在队伍',
+          prop: 'suozaiduiwu',
+          align: 'left',
+        }, {
+          label: '姓名',
+          prop: 'xingming',
+          align: 'left',
+          width: 120
+        }, {
+          label: '联系电话',
+          prop: 'lianxidianhua',
+          width: 120,
+        }, {
+          label: '创建日期',
+          prop: 'created_at',
+          width: 120,
+          formatter: (cell, data, value) => {
+            return value ? value.substring(0, 10) : ''
+          }
+        }],
+
+      }
+    },
+    created() {
+    },
+    methods: {
+      async getBooks() {
+        const res = await index({
+          table_name: 'books',
+          page: 1,
+          page_size: 999,
+          filter:[{
+            key:'team_id',
+            op:'eq',
+            value:this.id
+          }]
+        })
+        this.bookList = res.data
+      },
+    },
+    watch: {
+      isShow(newVal) {
+        if (newVal) {
+          this.getBooks()
+        } else {
+          this.bookList = []
+          this.$refs['dialog'].reset()
+        }
+      },
+    }
+
+  }
+</script>
+
+<style scoped lang="scss">
+  ::v-deep .xy-table-item-label {
+    min-width: 160px !important
+  }
+</style>
diff --git a/src/views/team/team.vue b/src/views/team/team.vue
index a24d483..41be1a5 100644
--- a/src/views/team/team.vue
+++ b/src/views/team/team.vue
@@ -26,14 +26,18 @@
               $refs['addTeam'].isShow=true">编辑</Button>
               <Poptip transfer confirm title="确认要删除吗？" @on-ok="delRow(scope.row.id)">
                 <Button type="primary" style="margin-left: 10px;" size="small" ghost>删除</Button>
-              </Poptip>
+              </Poptip>
+              <Button type="primary"  style="margin-left: 10px;" size="small" @click="
+              $refs['showTeam'].id=scope.row.id,
+              $refs['showTeam'].isShow=true">花名册</Button>
             </div>
           </template>
         </el-table-column>
       </template>
 
     </xy-table>
-    <addTeam ref="addTeam" @refresh="getList"></addTeam>
+    <addTeam ref="addTeam" @refresh="getList"></addTeam>
+    <showTeam ref="showTeam"></showTeam>
   </div>
 
 </template>
@@ -43,10 +47,12 @@
     index,
     destroy
   } from "@/api/system/baseForm.js"
-  import addTeam from './components/addTeam.vue'
+  import addTeam from './components/addTeam.vue'
+  import showTeam from './components/showTeam.vue'
   export default {
     components: {
-      addTeam,
+      addTeam,
+      showTeam
     },
     data() {