diff --git a/src/views/modules/warehouse/location.vue b/src/views/modules/warehouse/location.vue
index 43f3b99..066fb83 100644
--- a/src/views/modules/warehouse/location.vue
+++ b/src/views/modules/warehouse/location.vue
@@ -2,11 +2,11 @@
   <div class="mod-config">
     <el-row>
       <el-col :span="24">
-        <div>
-        <span @click="favoriteFunction()">
-         <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>
-        </span>
-        </div>
+<!--        <div>-->
+<!--        <span @click="favoriteFunction()">-->
+<!--         <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>-->
+<!--        </span>-->
+<!--        </div>-->
         <el-button @click="getDataList()" type="primary">查询</el-button>
         <el-button @click="initModel()" type="primary">新增</el-button>
 <!--        <el-button @click="saveColumnList()" type="primary" v-show="showDefault">设置默认配置</el-button>-->
@@ -108,7 +108,7 @@
           @size-change="sizeChangeHandle"
           @current-change="currentChangeHandle"
           :current-page="queryHeaderData.page"
-          :page-sizes="[5, 10, 20]"
+          :page-sizes="[20, 50, 100]"
           :page-size="queryHeaderData.size"
           :total="queryHeaderData.totalCount"
           layout="total, sizes, prev, pager, next, jumper">
@@ -148,27 +148,31 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="inputLabel.headerInput.label8">
-          <el-input style="width: 130px;" :readonly="setUp.readonlyFlag?'readonly':false" v-model="saveHeaderData.hold"></el-input>
-        </el-form-item>
-        <el-form-item :label="inputLabel.headerInput.label9">
-          <el-input style="width: 130px;" :readonly="setUp.readonlyFlag?'readonly':false" v-model="saveHeaderData.row"></el-input>
-        </el-form-item>
-        <el-form-item :label="inputLabel.headerInput.label10">
-          <el-input style="width: 130px;" :readonly="setUp.readonlyFlag?'readonly':false" v-model="saveHeaderData.storey"></el-input>
-        </el-form-item>
-        <el-form-item :label="inputLabel.headerInput.label11">
-          <el-input style="width: 130px;" :readonly="setUp.readonlyFlag?'readonly':false" v-model="saveHeaderData.box"></el-input>
-        </el-form-item>
-        <el-form-item :label="inputLabel.headerInput.label6">
-          <span style="cursor: pointer"  slot="label" @click="queryLocationGruop"><a>位置组编码</a></span>
-          <el-input style="width: 130px;" readonly v-model="saveHeaderData.locationGroupId"></el-input>
-        </el-form-item>
-        <el-form-item :label="inputLabel.headerInput.label7">
-          <el-input style="width: 130px;" readonly v-model="saveHeaderData.locationGroupDesc"></el-input>
-        </el-form-item>
+<!--        <el-form-item :label="inputLabel.headerInput.label8">-->
+<!--          <el-input style="width: 130px;" :readonly="setUp.readonlyFlag?'readonly':false" v-model="saveHeaderData.hold"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="inputLabel.headerInput.label9">-->
+<!--          <el-input style="width: 130px;" :readonly="setUp.readonlyFlag?'readonly':false" v-model="saveHeaderData.row"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="inputLabel.headerInput.label10">-->
+<!--          <el-input style="width: 130px;" :readonly="setUp.readonlyFlag?'readonly':false" v-model="saveHeaderData.storey"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="inputLabel.headerInput.label11">-->
+<!--          <el-input style="width: 130px;" :readonly="setUp.readonlyFlag?'readonly':false" v-model="saveHeaderData.box"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="inputLabel.headerInput.label6">-->
+<!--          <span style="cursor: pointer"  slot="label" @click="queryLocationGruop"><a>位置组编码</a></span>-->
+<!--          <el-input style="width: 130px;" readonly v-model="saveHeaderData.locationGroupId"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="inputLabel.headerInput.label7">-->
+<!--          <el-input style="width: 130px;" readonly v-model="saveHeaderData.locationGroupDesc"></el-input>-->
+<!--        </el-form-item>-->
         <el-form-item :label="inputLabel.headerInput.label12">
-          <el-input style="width: 130px;" v-model="saveHeaderData.locationType"></el-input>
+<!--          <el-input style="width: 130px;" v-model="saveHeaderData.locationType"></el-input>-->
+          <el-select  v-model="saveHeaderData.locationType" style="width: 130px;">
+            <el-option label="PICKING" value="PICKING"></el-option>
+            <el-option label="QA" value="QA"></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -292,7 +296,7 @@
           warehouseId: '',
           active: '',
           page:1,
-          size:5,
+          size:50,
           totalCount:0
         },
         setUp: {
@@ -477,22 +481,22 @@
             status: true,
             fixed: '',
           },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: 'location2601StrlocationGroupDesc',
-            tableId: this.$route.meta.menuId + 'LOTI01',
-            tableName: "locationTable",
-            columnProp: "locationGroupDesc",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "位置组描述",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
+          // {
+          //   userId: this.$store.state.user.name,
+          //   serialNumber: 'location2601StrlocationGroupDesc',
+          //   tableId: this.$route.meta.menuId + 'LOTI01',
+          //   tableName: "locationTable",
+          //   columnProp: "locationGroupDesc",
+          //   headerAlign: "center",
+          //   align: "center",
+          //   columnLabel: "位置组描述",
+          //   columnHidden: false,
+          //   columnImage: false,
+          //   columnSortable: false,
+          //   sortLv: 0,
+          //   status: true,
+          //   fixed: '',
+          // },
           {
             userId: this.$store.state.user.name,
             serialNumber: 'location2601StrlocationGroupDesc',
@@ -509,70 +513,70 @@
             status: true,
             fixed: '',
           },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: 'location2601StrActive',
-            tableId: this.$route.meta.menuId + 'LOTI01',
-            tableName: "locationTable",
-            columnProp: "hold",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "货舱",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: 'location2601StrActive',
-            tableId: this.$route.meta.menuId + 'LOTI01',
-            tableName: "locationTable",
-            columnProp: "row",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "行",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: 'location2601StrActive',
-            tableId: this.$route.meta.menuId + 'LOTI01',
-            tableName: "locationTable",
-            columnProp: "storey",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "层",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: 'location2601StrActive',
-            tableId: this.$route.meta.menuId + 'LOTI01',
-            tableName: "locationTable",
-            columnProp: "box",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "箱",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
+          // {
+          //   userId: this.$store.state.user.name,
+          //   serialNumber: 'location2601StrActive',
+          //   tableId: this.$route.meta.menuId + 'LOTI01',
+          //   tableName: "locationTable",
+          //   columnProp: "hold",
+          //   headerAlign: "center",
+          //   align: "center",
+          //   columnLabel: "货舱",
+          //   columnHidden: false,
+          //   columnImage: false,
+          //   columnSortable: false,
+          //   sortLv: 0,
+          //   status: true,
+          //   fixed: '',
+          // },
+          // {
+          //   userId: this.$store.state.user.name,
+          //   serialNumber: 'location2601StrActive',
+          //   tableId: this.$route.meta.menuId + 'LOTI01',
+          //   tableName: "locationTable",
+          //   columnProp: "row",
+          //   headerAlign: "center",
+          //   align: "center",
+          //   columnLabel: "行",
+          //   columnHidden: false,
+          //   columnImage: false,
+          //   columnSortable: false,
+          //   sortLv: 0,
+          //   status: true,
+          //   fixed: '',
+          // },
+          // {
+          //   userId: this.$store.state.user.name,
+          //   serialNumber: 'location2601StrActive',
+          //   tableId: this.$route.meta.menuId + 'LOTI01',
+          //   tableName: "locationTable",
+          //   columnProp: "storey",
+          //   headerAlign: "center",
+          //   align: "center",
+          //   columnLabel: "层",
+          //   columnHidden: false,
+          //   columnImage: false,
+          //   columnSortable: false,
+          //   sortLv: 0,
+          //   status: true,
+          //   fixed: '',
+          // },
+          // {
+          //   userId: this.$store.state.user.name,
+          //   serialNumber: 'location2601StrActive',
+          //   tableId: this.$route.meta.menuId + 'LOTI01',
+          //   tableName: "locationTable",
+          //   columnProp: "box",
+          //   headerAlign: "center",
+          //   align: "center",
+          //   columnLabel: "箱",
+          //   columnHidden: false,
+          //   columnImage: false,
+          //   columnSortable: false,
+          //   sortLv: 0,
+          //   status: true,
+          //   fixed: '',
+          // },
           {
             userId: this.$store.state.user.name,
             serialNumber: 'location2601StrActive',
@@ -845,31 +849,31 @@
           this.setUp.saveButton = false
           return
         }
-        if (!this.saveHeaderData.hold) {
-          this.$message.warning('请输入货舱!!')
-          this.setUp.saveButton = false
-          return
-        }
-        if (!this.saveHeaderData.row) {
-          this.$message.warning('请输入行!')
-          this.setUp.saveButton = false
-          return
-        }
-        if (!this.saveHeaderData.storey) {
-          this.$message.warning('请输入层!')
-          this.setUp.saveButton = false
-          return
-        }
-        if (!this.saveHeaderData.box) {
-          this.$message.warning('请输入箱!')
-          this.setUp.saveButton = false
-          return
-        }
-        if (!this.saveHeaderData.locationGroupId) {
-          this.$message.warning('请选择位置组编码!')
-          this.setUp.saveButton = false
-          return
-        }
+        // if (!this.saveHeaderData.hold) {
+        //   this.$message.warning('请输入货舱!!')
+        //   this.setUp.saveButton = false
+        //   return
+        // }
+        // if (!this.saveHeaderData.row) {
+        //   this.$message.warning('请输入行!')
+        //   this.setUp.saveButton = false
+        //   return
+        // }
+        // if (!this.saveHeaderData.storey) {
+        //   this.$message.warning('请输入层!')
+        //   this.setUp.saveButton = false
+        //   return
+        // }
+        // if (!this.saveHeaderData.box) {
+        //   this.$message.warning('请输入箱!')
+        //   this.setUp.saveButton = false
+        //   return
+        // }
+        // if (!this.saveHeaderData.locationGroupId) {
+        //   this.$message.warning('请选择位置组编码!')
+        //   this.setUp.saveButton = false
+        //   return
+        // }
         saveLocation(this.saveHeaderData).then(({data}) => {
           this.setUp.saveButton = false
           if (data.code == 0) {
@@ -898,13 +902,13 @@
         this.saveHeaderData.warehouseId = ''
         this.saveHeaderData.active = 'Y'
         this.saveHeaderData.hide = 'N'
-        this.saveHeaderData.locationGroupId = ''
-        this.saveHeaderData.locationGroupDesc = ''
+        this.saveHeaderData.locationGroupId = 'CS1'
+        this.saveHeaderData.locationGroupDesc = '第一个位置组'
         this.saveHeaderData.hold = ''
         this.saveHeaderData.row = ''
         this.saveHeaderData.storey = ''
         this.saveHeaderData.box = ''
-        this.saveHeaderData.locationType = ''
+        this.saveHeaderData.locationType = 'PICKING'
         if (row) {
           console.log("2 =" + row)
           this.setUp.readonlyFlag = true
@@ -1204,10 +1208,10 @@
       }
     },
     created() {
-      this.getTableUserColumn()
-      this.getSysLanguageParamList()
-      this.getFunctionButtonList()
-      this.favoriteIsOk()
+      // this.getTableUserColumn()
+      // this.getSysLanguageParamList()
+      // this.getFunctionButtonList()
+      // this.favoriteIsOk()
     }
   }
 </script>
diff --git a/src/views/modules/warehouse/warehouse.vue b/src/views/modules/warehouse/warehouse.vue
index a2e8ee1..54d5a40 100644
--- a/src/views/modules/warehouse/warehouse.vue
+++ b/src/views/modules/warehouse/warehouse.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="mod-config">
-    <div>
-        <span @click="favoriteFunction()">
-         <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"  ></icon-svg>
-        </span>
-    </div>
+<!--    <div>-->
+<!--        <span @click="favoriteFunction()">-->
+<!--         <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"  ></icon-svg>-->
+<!--        </span>-->
+<!--    </div>-->
     <el-form :inline="true" label-position="top">
       <el-form-item :label="inputLabel.headerInput.label1">
         <el-input style="width: 100px;" v-model="queryHeaderData.wareHouseId" ></el-input>
@@ -102,12 +102,7 @@
         <el-form :inline="true" label-position="top">
           <el-form-item :label="inputLabel.headerInput.label3">
             <el-select  v-model="saveHeaderData.wareHouseTypeDb" placeholder="请选择" style="width: 130px;">
-              <el-option
-                v-for="item in selectList.select2"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
+              <el-option label="normal" value="T"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item :label="inputLabel.headerInput.label4">
@@ -122,8 +117,8 @@
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
-          <el-button @click="setUp.reviewFlag = false">取消</el-button>
           <el-button type="primary" :disabled="setUp.saveButton" @click="saveHeaderFunction()">确定</el-button>
+           <el-button @click="setUp.reviewFlag = false">取消</el-button>
         </span>
       </el-dialog>
 
@@ -657,8 +652,8 @@ import {
         this.saveHeaderData.site = this.site
         this.saveHeaderData.wareHouseId = ''
         this.saveHeaderData.wareHouseName = ''
-        this.saveHeaderData.wareHouseType = ''
-        this.saveHeaderData.wareHouseTypeDb = ''
+        this.saveHeaderData.wareHouseType = 'normal'
+        this.saveHeaderData.wareHouseTypeDb = 'T'
         this.saveHeaderData.active = 'Y'
         this.saveHeaderData.useLocation = 'Y'
         this.saveHeaderData.validStock = 'Y'
@@ -740,39 +735,7 @@ import {
         }
 
       },
-      // 保存语言编辑
-      saveLanguageList(val) {
-        saveSysLanguageOne(val).then(({data}) => {
-          if (data.code == 0) {
-            this.$message.success(data.msg)
-          } else {
-            this.$message.error(data.msg)
-          }
-        })
-      },
-      // 编辑语言
-      addLanguageFun() {
-        if (this.querySysLanguagePack.languageCode) {
-          this.addLanguage = true
-          this.languageColumnList = []
-          let query = {
-            functionId: this.$route.meta.menuId,
-            tableId: "common1002",
-            languageCode: this.$i18n.locale
-          }
-          getTableDefaultListLanguage(query).then(({data}) => {
-            if (data.rows.length > 0) {
-              this.languageColumnList = data.rows
-            }
-          })
-          this.languageColumnList = this.columnList
-          searchLanguageListByLanguageCode(this.querySysLanguagePack).then(({data}) => {
-            this.languageDataList = data.rows
-          })
-        } else {
-          this.$message("请选中一种语言")
-        }
-      },
+
       // 获取多语言列表
       getLanguageList() {
         searchSysLanguage(this.queryLanguage).then(({data}) => {
@@ -967,10 +930,10 @@ import {
       }
     },
     created() {
-      this.getTableUserColumn()
-      this.getSysLanguageParamList()
-      this.getFunctionButtonList()
-      this.favoriteIsOk()
+      // this.getTableUserColumn()
+      // this.getSysLanguageParamList()
+      // this.getFunctionButtonList()
+      // this.favoriteIsOk()
     }
   }
 </script>