diff --git a/src/api/warehouse/location.js b/src/api/warehouse/location.js
new file mode 100644
index 0000000..a7d658f
--- /dev/null
+++ b/src/api/warehouse/location.js
@@ -0,0 +1,17 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+//新增
+export const saveLocation= data => createAPI(`/location/info/append`,'post',data)
+
+//查询
+export const findLocation= data => createAPI(`/location/info/findAll`,'post',data)
+export const findByWarehouse= data => createAPI(`/warehouse/info/findAll`,'post',data)//查询仓库信息
+
+
+//修改
+export const updateLocation= data => createAPI(`/location/info/amend`,'post',data)
+
+//删除
+export const deleteLocation= data => createAPI(`/location/info/deleteById`,'post',data)
+
+
diff --git a/src/api/warehouse/stagingCode.js b/src/api/warehouse/stagingCode.js
new file mode 100644
index 0000000..dcf4415
--- /dev/null
+++ b/src/api/warehouse/stagingCode.js
@@ -0,0 +1,13 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+//新增
+export const saveStagingCode= data => createAPI(`/stag/code/append`,'post',data)
+
+//查询
+export const findStagingCode= data => createAPI(`stag/code/findAll`,'post',data)
+
+//修改
+export const updateStagingCode= data => createAPI(`stag/code/amend`,'post',data)
+
+//删除
+export const deleteStagingCode= data => createAPI(`/stag/code/deleteById`,'post',data)
diff --git a/src/views/modules/warehouse/location.vue b/src/views/modules/warehouse/location.vue
index f4d2312..dea8a4b 100644
--- a/src/views/modules/warehouse/location.vue
+++ b/src/views/modules/warehouse/location.vue
@@ -1,39 +1,51 @@
 <template>
   <div class="mod-config">
 
-    <!--    &lt;!&ndash; 收藏 &ndash;&gt;-->
-    <!--    <div>-->
-    <!--      <span @click="favoriteFunction()">-->
-    <!--        <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>-->
-    <!--      </span>-->
-    <!--    </div>-->
+<!--    &lt;!&ndash; 收藏 &ndash;&gt;-->
+<!--    <div>-->
+<!--      <span @click="favoriteFunction()">-->
+<!--        <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>-->
+<!--      </span>-->
+<!--    </div>-->
 
     <!-- 条件查询 -->
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
-      <!--      <el-form-item :label="'BU'">-->
-      <!--        <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 130px">-->
-      <!--          <el-option-->
-      <!--            v-for = "i in userBuList"-->
-      <!--            :key = "i.buNo"-->
-      <!--            :label = "i.buDesc"-->
-      <!--            :value = "i.buDesc">-->
-      <!--          </el-option>-->
-      <!--        </el-select>-->
-      <!--      </el-form-item>-->
-      <el-form-item :label="'仓库编码:'">
-        <el-input v-model="searchData.warehouseId" clearable style="width: 120px"></el-input>
-      </el-form-item>
+<!--      <el-form-item :label="'BU'">-->
+<!--        <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 130px">-->
+<!--          <el-option-->
+<!--            v-for = "i in userBuList"-->
+<!--            :key = "i.buNo"-->
+<!--            :label = "i.buDesc"-->
+<!--            :value = "i.buDesc">-->
+<!--          </el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item :label="'工厂编号:'">
         <el-input v-model="searchData.site" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'保管员:'">
-        <el-input v-model="searchData.keeper" clearable style="width: 120px"></el-input>
+      <el-form-item :label="'库位编码:'">
+        <el-input v-model="searchData.locationId" clearable style="width: 120px"></el-input>
+      </el-form-item>
+
+      <el-form-item :label="'库位名称:'">
+        <el-input v-model="searchData.locationName" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item label="是否为有效仓库:">
-        <el-select v-model="searchData.validStock" placeholder="请选择">
+      <el-form-item label="是否在使用:">
+        <el-select v-model="searchData.active" placeholder="请选择">
+          <el-option label="全部" value=""></el-option>
           <el-option label="是" value="Y"></el-option>
           <el-option label="否" value="N"></el-option>
-          <el-option label="" value=""></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="仓位编码:">
+        <el-select v-model="searchData.warehouseId" placeholder="请选择" clearable style="width: 120px">
+          <el-option
+            v-for="i in wareHouseList"
+            :key ="i.warehouseId"
+            :label="i.warehouseId"
+            :value="i.warehouseId">
+          </el-option>
         </el-select>
       </el-form-item>
 
@@ -103,54 +115,47 @@
 
     <!-- 新增和修改 -->
     <el-dialog title="检验方法" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
-
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="工厂编码:" prop="site" :rules="rules.site">
           <el-input v-model="modalData.site" style="width: 221px"></el-input>
         </el-form-item>
-        <el-form-item label="仓库编码:" prop="warehouseId" :rules="rules.warehouseId">
-          <el-input v-model="modalData.warehouseId" style="width: 221px"></el-input>
+        <el-form-item label="库位编码:" prop="locationId" :rules="rules.locationId">
+          <el-input v-model="modalData.locationId" style="width: 221px"></el-input>
         </el-form-item>
-        <el-form-item label="仓库名称:" prop="warehouseName" :rules="rules.warehouseName">
-          <el-input v-model="modalData.warehouseName" style="width: 221px"></el-input>
+        <el-form-item label="库位名称:" prop="locationName" :rules="rules.locationName">
+          <el-input v-model="modalData.locationName" style="width: 221px"></el-input>
         </el-form-item>
-        <el-form-item label="是否在使用:">
-          <el-select v-model="modalData.active" placeholder="请选择" style="width: 221px">
-            <el-option label="是" value="Y"></el-option>
-            <el-option label="否" value="N"></el-option>
-
-
+        <el-form-item label="仓位编码:">
+          <el-select v-model="modalData.warehouseId" placeholder="请选择" :rules="rules.warehouseId">
+            <el-option
+              v-for="i in wareHouseList"
+              :key ="i.warehouseId"
+              :label="i.warehouseId"
+              :value="i.warehouseId">
+            </el-option>
+<!--            <el-option label="是" value="Y"></el-option>-->
+<!--            <el-option label="否" value="N"></el-option>-->
           </el-select>
         </el-form-item>
       </el-form>
 
       <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item :label="'仓库类型'">
-          <el-input v-model="modalData.warehouseType" style="width: 221px"></el-input>
-        </el-form-item>
-
-        <el-form-item :label="'DB'">
-          <el-input v-model="modalData.warehouseTypeDB" style="width: 221px"></el-input>
-        </el-form-item>
-
-        <el-form-item :label="'管理员'">
+        <el-form-item :label="'保管员'">
           <el-input v-model="modalData.keeper" style="width: 221px"></el-input>
         </el-form-item>
-        <el-form-item :label="'公司编码'">
-          <el-input v-model="modalData.companyId" style="width: 221px"></el-input>
-        </el-form-item>
-        <el-form-item :label="'是否为有效仓库'">
-          <el-select v-model="modalData.validStock" placeholder="请选择" style="width: 221px">
+
+        <el-form-item :label="'是否在用'">
+          <el-select v-model="modalData.active" placeholder="请选择" style="width: 221px">
             <el-option label="是" value="Y"></el-option>
             <el-option label="否" value="N"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="'是否采用库位管理'">
-          <el-select v-model="modalData.useLocation" placeholder="请选择" style="width: 221px">
-            <el-option label="是" value="Y"></el-option>
-            <el-option :label="i.desc" :value="i.no" v-for="(i) in arr"></el-option>
-            <el-option label="否" value="N"></el-option>
-          </el-select>
+
+        <el-form-item :label="'库位描述'">
+          <el-input v-model="modalData.locationDescription" style="width: 221px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'备注'">
+          <el-input v-model="modalData.remarks" style="width: 221px"></el-input>
         </el-form-item>
 
       </el-form>
@@ -164,18 +169,20 @@
 
 <script>
 import {
-  findWarehouse, // 检验方法查询
-  saveWarehouse, // 检验方法新增
-  updateWarehouse, // 检验方法修改
-  deleteWarehouse, // 检验方法删除
+  findLocation, // 检验方法查询
+  saveLocation, // 检验方法新增
+  updateLocation, // 检验方法修改
+  deleteLocation, // 检验方法删除
+  findByWarehouse, //查询库区
   // inspectionTypeSearch, // 搜索所有检验类型
 //   // getSiteAndBuByUserName
-} from "@/api/warehouse/warehouse.js"
+} from "@/api/warehouse/location.js"
 // import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
 // import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
 export default {
   data () {
     return {
+      wareHouseList:'',
       // 是否收藏
       favorite: false,
       // 导出 start
@@ -184,15 +191,19 @@ export default {
       exportHeader: ["检验方法"],
       exportFooter: [],
       exportList: [],
+      warehouseData: {
+        id:'',
+        site: '',
+      },
       // 导出 end
       searchData: {
         id:'',
         site: '',
         userName: this.$store.state.user.name,
         warehouseId: '',
-        warehouseName: '',
-        keeper: '',
-        validStock: '',
+        locationId: '',
+        locationName: '',
+        active: '',
         page: 1,
         limit: 10,
       },
@@ -207,16 +218,15 @@ export default {
       modalData: {
         site: '',
         warehouseId: '',
-        warehouseName: '',
-        active: '',
-        warehouseType: '',
+        locationId: '',
+        active: 'Y',
+        locationName: '',
         creator: this.$store.state.user.name,
         // updateBy: this.$store.state.user.name,
-        warehouseTypeDB: '',
+        locationDescription: '',
         keeper: '',
-        companyId: '',
-        validStock: '',
-        useLocation: ''
+        remarks: '',
+        createTime: '',
       },
       // 标头展示
       columnList: [
@@ -244,7 +254,7 @@ export default {
           serialNumber: '100001004TableLocationId',
           tableId: "100001004Table",
           tableName: "库位编码",
-          columnWidth: 100,
+          columnWidth: 150,
           columnProp: 'locationId',
           headerAlign: 'center',
           align: "center",
@@ -259,14 +269,14 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 100001004,
-          serialNumber: '100001004TableWarehouseId',
+          serialNumber: '100001004TableLocationName',
           tableId: "100001004Table",
-          tableName: "仓库编码",
+          tableName: "库位名称",
           columnWidth: 150,
-          columnProp: 'warehouseId',
+          columnProp: 'locationName',
           headerAlign: 'center',
           align: "left",
-          columnLabel: '仓库编码',
+          columnLabel: '库位名称',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -277,14 +287,14 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 100001004,
-          serialNumber: '100001004TableLocationName',
+          serialNumber: '100001004TableWarehouseId',
           tableId: "100001004Table",
-          tableName: "库位名称",
-          columnWidth: 100,
-          columnProp: 'LocationName',
+          tableName: "仓位编码",
+          columnWidth: 150,
+          columnProp: 'warehouseId',
           headerAlign: 'center',
           align: "center",
-          columnLabel: '库位名称',
+          columnLabel: '仓位编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -295,14 +305,14 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 100001004,
-          serialNumber: '100001004TableInspectionKeeper',
+          serialNumber: '100001004TableKeeper',
           tableId: "100001004Table",
-          tableName: "保管员",
+          tableName: "仓库类型",
           columnWidth: 150,
           columnProp: 'keeper',
           headerAlign: 'center',
           align: "center",
-          columnLabel: '保管员',
+          columnLabel: '仓库类型',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -315,12 +325,12 @@ export default {
           functionId: 100001004,
           serialNumber: '100001004TableActive',
           tableId: "100001004Table",
-          tableName: "是否在使用",
+          tableName: "是否在用",
           columnWidth: 150,
-          columnProp: 'Active',
+          columnProp: 'active',
           headerAlign: 'center',
           align: "left",
-          columnLabel: '是否在使用',
+          columnLabel: '是否在用',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -334,7 +344,7 @@ export default {
           serialNumber: '100001004TableLocationDescription',
           tableId: "100001004Table",
           tableName: "库位描述",
-          columnWidth: 100,
+          columnWidth: 150,
           columnProp: 'locationDescription',
           headerAlign: 'center',
           align: "center",
@@ -352,7 +362,7 @@ export default {
           serialNumber: '100001004TableRemarks',
           tableId: "100001004Table",
           tableName: "备注",
-          columnWidth: 100,
+          columnWidth: 150,
           columnProp: 'remarks',
           headerAlign: 'center',
           align: "center",
@@ -370,7 +380,7 @@ export default {
           serialNumber: '100001004TableCreateTime',
           tableId: "100001004Table",
           tableName: "创建时间",
-          columnWidth: 100,
+          columnWidth: 150,
           columnProp: 'createTime',
           headerAlign: 'center',
           align: "center",
@@ -388,7 +398,7 @@ export default {
           serialNumber: '100001004TableCreator',
           tableId: "100001004Table",
           tableName: "创建人",
-          columnWidth: 80,
+          columnWidth: 150,
           columnProp: 'creator',
           headerAlign: 'center',
           align: "center",
@@ -402,38 +412,35 @@ export default {
         },
       ],
       rules: {
-        locationId:[
+        warehouseId:[
           {
             required: true,
             message: ' ',
             trigger: ['blur','change']
           }
         ],
-        site:[
+        locationId:[
           {
             required: true,
             message: ' ',
             trigger: ['blur','change']
           }
         ],
-        locationName:[
+        site:[
           {
             required: true,
             message: ' ',
             trigger: ['blur','change']
           }
         ],
-        warehouseId:[
+        locationName:[
           {
             required: true,
             message: ' ',
             trigger: ['blur','change']
           }
         ]
-
       },
-
-
       options: [],
       userBuList: [],
       authSearch: false,
@@ -444,14 +451,18 @@ export default {
     }
   },
 
+
+
   mounted () {
     this.$nextTick(() => {
       this.height = window.innerHeight - 180
     })
   },
 
+  //页面加载前初始化着两个方法
   created () {
     this.getDataList()
+    this.getWareHouseList()
   },
 
   methods: {
@@ -467,13 +478,19 @@ export default {
       })
     },
 
+    //根据warehouse查询warehouseId
+    getWareHouseList (){
+      findByWarehouse(``).then(({data}) =>{
+        this.wareHouseList=data.rows
+        }
+      )
+    },
     // 查询获取数据列表
-    getDataList () {
+    getDataList (){
       this.searchData.limit = this.pageSize
       this.searchData.page = this.pageIndex
-      findWarehouse(this.searchData).then(({data}) => {
+      findLocation(this.searchData).then(({data}) => {
         if (data.code === 0) {
-
           this.dataList = data.page.list
           this.pageIndex = data.page.currPage
           this.pageSize = data.page.pageSize
@@ -501,15 +518,13 @@ export default {
         flag: '1',
         site: '',
         creator: this.$store.state.user.name,
-        warehouseId: '',
-        warehouseName: '',
+        locationId: '',
+        locationName: '',
         active: 'Y',
-        warehouseType: '',
-        warehouseTypeDB: '',
+        warehouseId: '',
+        locationDescription: '',
         keeper: '',
-        companyId: '',
-        validStock: 'Y',
-        useLocation: 'Y'
+        remarks: '',
       }
       this.modalDisableFlag = false
       this.modalFlag = true
@@ -523,14 +538,12 @@ export default {
         site: row.site,
         creator: this.$store.state.user.name,
         warehouseId: row.warehouseId,
-        warehouseName: row.warehouseName,
+        locationId: row.locationId,
         active: row.active,
-        warehouseType: row.warehouseType,
-        warehouseTypeDB: row.warehouseTypeDB,
+        locationName: row.locationName,
+        locationDescription: row.locationDescription,
         keeper: row.keeper,
-        companyId: row.companyId,
-        validStock: row.validStock,
-        useLocation: row.useLocation
+        remarks: row.remarks,
       }
       this.modalDisableFlag = true
       this.modalFlag = true
@@ -543,15 +556,14 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        deleteWarehouse(row).then(({data}) => {
+        deleteLocation(row).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
             this.$message({
               message: '操作成功',
               type: 'success',
               duration: 1500,
-              onClose: () => {
-              }
+              onClose: () => {}
             })
           } else {
             this.$alert(data.msg, '错误', {
@@ -564,21 +576,25 @@ export default {
     },
 
     // 新增/修改方法
-    saveData() {
+    saveData () {
       if (this.modalData.site === '' || this.modalData.site == null) {
         this.$message.warning('请输入工厂编码！')
         return
       }
       if (this.modalData.warehouseId === '' || this.modalData.warehouseId == null) {
-        this.$message.warning('请输入仓库编码！')
+        this.$message.warning('请选择仓库编码！')
         return
       }
-      if (this.modalData.warehouseName === '' || this.modalData.warehouseName == null) {
-        this.$message.warning('请输入仓库名称！')
+      if(this.modalData.locationName === ''|| this.modalData.locationName == null){
+        this.$message.warning('请输入库位名称！')
+        return
+      }
+      if(this.modalData.locationId === ''|| this.modalData.locationId == null){
+        this.$message.warning('请输入库位编码！')
         return
       }
       if (this.modalData.flag === '1') { // 新增
-        saveWarehouse(this.modalData).then(({data}) => {
+        saveLocation(this.modalData).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
             this.modalFlag = false
@@ -586,8 +602,7 @@ export default {
               message: '操作成功',
               type: 'success',
               duration: 1500,
-              onClose: () => {
-              }
+              onClose: () => {}
             })
           } else {
             this.$alert(data.msg, '错误', {
@@ -596,7 +611,7 @@ export default {
           }
         })
       } else { // 修改
-        updateWarehouse(this.modalData).then(({data}) => {
+        updateLocation(this.modalData).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
             this.modalFlag = false
@@ -604,8 +619,7 @@ export default {
               message: '操作成功',
               type: 'success',
               duration: 1500,
-              onClose: () => {
-              }
+              onClose: () => {}
             })
           } else {
             this.$alert(data.msg, '错误', {
@@ -617,7 +631,7 @@ export default {
     },
 
     // 查询检验类型
-    inspectionTypeSearch() {
+    inspectionTypeSearch () {
       let tempData = {
         site: this.$store.state.user.site
       }
@@ -629,14 +643,13 @@ export default {
     },
 
     // 校验用户是否收藏
-    favoriteIsOk() {
+    favoriteIsOk () {
       let userFavorite = {
         userId: this.$store.state.user.id,
         languageCode: this.$i18n.locale
       }
-      userFavoriteList(userFavorite).then(({data}) => {
-        for (let i = 0; i < data.list.length; i++) {
-          if (this.$route.meta.menuId === data.list[i].menuId) {
+      userFavoriteList(userFavorite).then(({data}) => {for (let i = 0; i < data.list.length; i++) {
+          if(this.$route.meta.menuId === data.list[i].menuId){
             this.favorite = true
           }
         }
@@ -644,7 +657,7 @@ export default {
     },
 
     // 收藏 OR 取消收藏
-    favoriteFunction() {
+    favoriteFunction () {
       let userFavorite = {
         userId: this.$store.state.user.id,
         functionId: this.$route.meta.menuId,
@@ -667,19 +680,17 @@ export default {
     async createExportData() {
       this.searchData.limit = -1
       this.searchData.page = 1
-      await findWarehouse(this.searchData).then(({data}) => {
-        this.exportList = data.rows
+      await findLocation(this.searchData).then(({data}) => {
+        this.exportList= data.rows
       })
       return this.exportList
     },
 
-    startDownload() {
-    },
+    startDownload() {},
 
-    finishDownload() {
-    },
+    finishDownload() {},
 
-    fields() {
+    fields () {
       let json = "{"
       this.columnList.forEach((item, index) => {
         if (index == this.columnList.length - 1) {
@@ -694,7 +705,7 @@ export default {
     },
 
     // 动态列开始 获取 用户保存的 格式列
-    async getTableUserColumn(tableId, columnId) {
+    async getTableUserColumn (tableId, columnId) {
       let queryTableUser = {
         userId: this.$store.state.user.name,
         functionId: this.$route.meta.menuId,
@@ -726,7 +737,7 @@ export default {
     },
 
     // 获取 tableDefault 列
-    async getColumnList(tableId, columnId) {
+    async getColumnList (tableId, columnId) {
       let queryTable = {
         functionId: this.$route.meta.menuId,
         tableId: tableId,
@@ -755,11 +766,11 @@ export default {
     },
 
     //获取按钮的权限数据
-    getButtonAuthData() {
-      let searchFlag = this.isAuth(this.menuId + ":search")
-      let saveFlag = this.isAuth(this.menuId + ":save")
-      let updateFlag = this.isAuth(this.menuId + ":update")
-      let deleteFlag = this.isAuth(this.menuId + ":delete")
+    getButtonAuthData () {
+      let searchFlag = this.isAuth(this.menuId+":search")
+      let saveFlag = this.isAuth(this.menuId+":save")
+      let updateFlag = this.isAuth(this.menuId+":update")
+      let deleteFlag = this.isAuth(this.menuId+":delete")
       //处理页面的权限数据
       this.authSearch = !searchFlag
       this.authSave = !saveFlag
diff --git a/src/views/modules/warehouse/stagingCode.vue b/src/views/modules/warehouse/stagingCode.vue
new file mode 100644
index 0000000..e2e78e7
--- /dev/null
+++ b/src/views/modules/warehouse/stagingCode.vue
@@ -0,0 +1,593 @@
+<template>
+  <div class="mod-config">
+
+    <!-- 条件查询 -->
+    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item :label="'阶段代码:'">
+        <el-input v-model="searchData.phaseCode" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'阶段描述:'">
+        <el-input v-model="searchData.phaseDescription" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'阶段描述:'">
+        <el-input v-model="searchData.identificationCode" clearable style="width: 120px"></el-input>
+      </el-form-item>
+
+
+      <el-form-item :label="' '">
+        <el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button>
+        <el-button v-if="!authSave" type="primary" @click="addModal()">新增</el-button>
+        <download-excel
+          :fields="fields()"
+          :data="exportData"
+          type="xls"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{ "导出" }}
+        </download-excel>
+      </el-form-item>
+    </el-form>
+
+    <!-- 展示列表 -->
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      style="width: 100%;">
+      <el-table-column
+        v-for="(item,index) in columnList" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed==''?false:item.fixed"
+        :width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="160"
+        label="操作">
+        <template slot-scope="scope">
+          <a type="text" size="small" @click="updateModal(scope.row)">修改</a>
+          <a type="text" size="small" @click="deleteModal(scope.row)">删除</a>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 200, 500]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+    <!-- 新增和修改 -->
+    <el-dialog title="检验方法" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="阶段代码:" prop="site" >
+          <el-input v-model="modalData.phaseCode" style="width: 221px"></el-input>
+        </el-form-item>
+        <el-form-item label="阶段描述:" prop="locationId" >
+          <el-input v-model="modalData.phaseDescription" style="width: 221px"></el-input>
+        </el-form-item>
+        <el-form-item label="标识码:" prop="locationName" >
+          <el-input v-model="modalData.identificationCode" style="width: 221px"></el-input>
+        </el-form-item>
+
+      </el-form>
+
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveData()">保存</el-button>
+        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  findStagingCode, // 检验方法查询
+  saveStagingCode, // 检验方法新增
+  updateStagingCode, // 检验方法修改
+  deleteStagingCode, // 检验方法删除
+  // inspectionTypeSearch, // 搜索所有检验类型
+//   // getSiteAndBuByUserName
+} from "@/api/warehouse/stagingCode.js"
+export default {
+  data () {
+    return {
+      // 是否收藏
+      favorite: false,
+      // 导出 start
+      exportData: [],
+      exportName: "检验方法" + this.dayjs().format('YYYYMMDDHHmmss'),
+      exportHeader: ["检验方法"],
+      exportFooter: [],
+      exportList: [],
+      warehouseData: {
+        id:'',
+        site: '',
+      },
+      // 导出 end
+      searchData: {
+        id:'',
+        phaseCode: '',
+        phaseDescription: '',
+        identificationCode: '',
+        page: 1,
+        limit: 10,
+      },
+      pageIndex: 1,
+      pageSize: 20,
+      totalPage: 0,
+      height: 200,
+      dataList: [],
+      dataListLoading: false,
+      modalFlag: false,
+      modalDisableFlag: false,
+      modalData: {
+        phaseCode: '',
+        phaseDescription: '',
+        identificationCode: '',
+        createTime: '',
+      },
+      // 标头展示
+      columnList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100001005,
+          serialNumber: '100001005TablePhaseCode',
+          tableId: "100001005Table",
+          tableName: "阶段代码",
+          columnWidth: 285,
+          columnProp: 'phaseCode',
+          headerAlign: 'center',
+          align: "center",
+          columnLabel: '阶段代码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100001005,
+          serialNumber: '100001005TablePhaseDescription',
+          tableId: "100001005Table",
+          tableName: "阶段描述",
+          columnWidth: 285,
+          columnProp: 'phaseDescription',
+          headerAlign: 'center',
+          align: "center",
+          columnLabel: '阶段描述',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100001005,
+          serialNumber: '100001005TableIdentificationCode',
+          tableId: "100001005Table",
+          tableName: "标识码",
+          columnWidth: 285,
+          columnProp: 'identificationCode',
+          headerAlign: 'center',
+          align: "left",
+          columnLabel: '标识码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100001005,
+          serialNumber: '100001005TableCreateTime',
+          tableId: "100001005Table",
+          tableName: "创建时间",
+          columnWidth: 285,
+          columnProp: 'createTime',
+          headerAlign: 'center',
+          align: "center",
+          columnLabel: '创建时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100001005,
+          serialNumber: '100001005TableCreator',
+          tableId: "100001005Table",
+          tableName: "创建人",
+          columnWidth: 285,
+          columnProp: 'creator',
+          headerAlign: 'center',
+          align: "center",
+          columnLabel: '创建人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+      ],
+      rules: {
+        // warehouseId:[
+        //   {
+        //     required: true,
+        //     message: ' ',
+        //     trigger: ['blur','change']
+        //   }
+        // ],
+        // locationId:[
+        //   {
+        //     required: true,
+        //     message: ' ',
+        //     trigger: ['blur','change']
+        //   }
+        // ],
+        // site:[
+        //   {
+        //     required: true,
+        //     message: ' ',
+        //     trigger: ['blur','change']
+        //   }
+        // ],
+        // locationName:[
+        //   {
+        //     required: true,
+        //     message: ' ',
+        //     trigger: ['blur','change']
+        //   }
+        // ]
+      },
+      options: [],
+      userBuList: [],
+      authSearch: false,
+      authSave: false,
+      authUpdate: false,
+      authDelete: false,
+      menuId: this.$route.meta.menuId,
+    }
+  },
+
+
+
+  mounted () {
+    this.$nextTick(() => {
+      this.height = window.innerHeight - 180
+    })
+  },
+
+  //页面加载前初始化着两个方法
+  created () {
+    this.getDataList()
+  },
+
+  methods: {
+    // 获取用户的bu
+    getSiteAndBuByUserName () {
+      let tempData = {
+        username: this.$store.state.user.name,
+      }
+      getSiteAndBuByUserName(tempData).then(({data}) => {
+        if (data.code === 0) {
+          this.userBuList = data.rows
+        }
+      })
+    },
+    // 查询获取数据列表
+    getDataList (){
+      this.searchData.limit = this.pageSize
+      this.searchData.page = this.pageIndex
+      findStagingCode(this.searchData).then(({data}) => {
+        if (data.code === 0) {
+          this.dataList = data.page.list
+          this.pageIndex = data.page.currPage
+          this.pageSize = data.page.pageSize
+          this.totalPage = data.page.totalCount
+        }
+      })
+    },
+
+    // 每页数
+    sizeChangeHandle (val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
+    },
+
+    // 当前页
+    currentChangeHandle (val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+
+    // 新增按钮
+    addModal () {
+      this.modalData = {
+        flag: '1',
+        creator: this.$store.state.user.name,
+        phaseCode: '',
+        phaseDescription: '',
+        identificationCode: '',
+      }
+      this.modalDisableFlag = false
+      this.modalFlag = true
+    },
+
+    // 修改按钮
+    updateModal (row) {
+      this.modalData = {
+        flag: '2',
+        id:row.id,
+        phaseCode: row.phaseCode,
+        creator: this.$store.state.user.name,
+        phaseDescription: row.phaseDescription,
+        identificationCode: row.identificationCode,
+      }
+      this.modalDisableFlag = true
+      this.modalFlag = true
+    },
+
+    // 删除方法
+    deleteModal (row) {
+      this.$confirm(`是否删除这个检验方法?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteStagingCode(row).then(({data}) => {
+          if (data && data.code === 0) {
+            this.getDataList()
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      }).catch(() => {
+      })
+    },
+
+    // 新增/修改方法
+    saveData () {
+      // if (this.modalData.site === '' || this.modalData.site == null) {
+      //   this.$message.warning('请输入工厂编码！')
+      //   return
+      // }
+      // if (this.modalData.warehouseId === '' || this.modalData.warehouseId == null) {
+      //   this.$message.warning('请选择仓库编码！')
+      //   return
+      // }
+      // if(this.modalData.locationName === ''|| this.modalData.locationName == null){
+      //   this.$message.warning('请输入库位名称！')
+      //   return
+      // }
+      // if(this.modalData.locationId === ''|| this.modalData.locationId == null){
+      //   this.$message.warning('请输入库位编码！')
+      //   return
+      // }
+      if (this.modalData.flag === '1') { // 新增
+        saveStagingCode(this.modalData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.getDataList()
+            this.modalFlag = false
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      } else { // 修改
+        updateStagingCode(this.modalData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.getDataList()
+            this.modalFlag = false
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      }
+    },
+
+    // 查询检验类型
+    inspectionTypeSearch () {
+      let tempData = {
+        site: this.$store.state.user.site
+      }
+      inspectionTypeSearch(tempData).then(({data}) => {
+        if (data.code === 0) {
+          this.options = data.rows
+        }
+      })
+    },
+
+    // 校验用户是否收藏
+    favoriteIsOk () {
+      let userFavorite = {
+        userId: this.$store.state.user.id,
+        languageCode: this.$i18n.locale
+      }
+      userFavoriteList(userFavorite).then(({data}) => {for (let i = 0; i < data.list.length; i++) {
+          if(this.$route.meta.menuId === data.list[i].menuId){
+            this.favorite = true
+          }
+        }
+      })
+    },
+
+    // 收藏 OR 取消收藏
+    favoriteFunction () {
+      let userFavorite = {
+        userId: this.$store.state.user.id,
+        functionId: this.$route.meta.menuId,
+      }
+      if (this.favorite) {
+        removeUserFavorite(userFavorite).then(({data}) => {
+          this.$message.success(data.msg)
+          this.favorite = false
+        })
+      } else {
+        // 收藏
+        saveUserFavorite(userFavorite).then(({data}) => {
+          this.$message.success(data.msg)
+          this.favorite = true
+        })
+      }
+    },
+
+    //导出excel
+    async createExportData() {
+      this.searchData.limit = -1
+      this.searchData.page = 1
+      await findStagingCode(this.searchData).then(({data}) => {
+        this.exportList= data.rows
+      })
+      return this.exportList
+    },
+
+    startDownload() {},
+
+    finishDownload() {},
+
+    fields () {
+      let json = "{"
+      this.columnList.forEach((item, index) => {
+        if (index == this.columnList.length - 1) {
+          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+        } else {
+          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+        }
+      })
+      json += "}"
+      let s = eval("(" + json + ")")
+      return s
+    },
+
+    // 动态列开始 获取 用户保存的 格式列
+    async getTableUserColumn (tableId, columnId) {
+      let queryTableUser = {
+        userId: this.$store.state.user.name,
+        functionId: this.$route.meta.menuId,
+        tableId: tableId,
+        status: true,
+        languageCode: this.$i18n.locale
+      }
+      await getTableUserListLanguage(queryTableUser).then(({data}) => {
+        if (data.rows.length > 0) {
+          //this.columnList1 = []
+          switch (columnId) {
+            case 1:
+              this.columnList = data.rows
+              break;
+            // case 2:
+            //   this.columnDetailList = data.rows
+            //   break;
+            // case 3:
+            //   this.columnList2 = data.rows
+            //   break;
+            // case 4:
+            //   this.columnList3 = data.rows
+            //   break;
+          }
+        } else {
+          this.getColumnList(tableId, columnId)
+        }
+      })
+    },
+
+    // 获取 tableDefault 列
+    async getColumnList (tableId, columnId) {
+      let queryTable = {
+        functionId: this.$route.meta.menuId,
+        tableId: tableId,
+        languageCode: this.$i18n.locale
+      }
+      await getTableDefaultListLanguage(queryTable).then(({data}) => {
+        if (!data.rows.length == 0) {
+          switch (columnId) {
+            case 1:
+              this.columnList = data.rows
+              break;
+            // case 2:
+            //   this.columnDetailList = data.rows
+            //   break;
+            // case 3:
+            //   this.columnList2 = data.rows
+            //   break;
+            // case 4:
+            //   this.columnList3 = data.rows
+            //   break;
+          }
+        } else {
+          // this.showDefault = true.
+        }
+      })
+    },
+
+    //获取按钮的权限数据
+    getButtonAuthData () {
+      let searchFlag = this.isAuth(this.menuId+":search")
+      let saveFlag = this.isAuth(this.menuId+":save")
+      let updateFlag = this.isAuth(this.menuId+":update")
+      let deleteFlag = this.isAuth(this.menuId+":delete")
+      //处理页面的权限数据
+      this.authSearch = !searchFlag
+      this.authSave = !saveFlag
+      this.authUpdate = !updateFlag
+      this.authDelete = !deleteFlag
+    },
+  }
+}
+</script>