diff --git a/src/views/business/resource/gsp/comps/rkjl/Bj.vue b/src/views/business/resource/gsp/comps/rkjl/Bj.vue
index 9be8d98..6aa3efc 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Bj.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Bj.vue
@@ -32,7 +32,7 @@
           <!-- 入库时间 -->
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.rksj')" prop="rksj">
-              <el-date-picker v-model="form.rksj" type="datetime" format="yyyy-MM-dd HH:mm"
+              <el-date-picker v-model="form.rksj" type="datetime" format="yyyy-MM-dd HH:mm:ss"
                 value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('form.placeholderInput')">
               </el-date-picker>
             </el-form-item>
@@ -53,8 +53,8 @@
           <!-- 有效期 -->
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.yxq')" prop="yxq">
-              <el-date-picker v-model="form.yxq" type="date" format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd" :placeholder="$t('form.placeholderInput')">
+              <el-date-picker v-model="form.yxq" type="datetime" format="yyyy-MM-dd  HH:mm:ss"
+                value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('form.placeholderInput')">
               </el-date-picker>
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue b/src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue
index e1ab2f8..e72b361 100644
--- a/src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue
@@ -62,7 +62,6 @@
 </template>
 
 <script>
-import { js } from "@/api/business/gsp/gspRkjl"
 import { mapGetters } from 'vuex'
 import { getToken } from "@/utils/auth"
 export default {
@@ -120,7 +119,7 @@ export default {
       this.upload.isUploading = false
       this.$refs.upload.clearFiles()
       this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
-      this.getList()
+      this.$emit('callback')
     },
     // 提交上传文件
     submitFileForm() {
@@ -132,6 +131,8 @@ export default {
       this.$refs.upload.submit()
     },
     cancel() {
+      this.upload.isUploading = false
+      this.$refs.upload.clearFiles()
       this.open = false
     },
     reset() {
@@ -145,16 +146,7 @@ export default {
       this.reset()
       this.open = true
     },
-    save() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          js(this.form).then(response => {
-            this.open = false
-            this.$emit('callback')
-          })
-        }
-      })
-    }
+
   }
 }
 </script>
diff --git a/src/views/business/resource/gsp/comps/rkjl/Xq.vue b/src/views/business/resource/gsp/comps/rkjl/Xq.vue
index c9f0c9b..38a256c 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Xq.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Xq.vue
@@ -154,7 +154,7 @@ export default {
     },
     show(row) {
       this.$modal.loading()
-      this.queryJcgjParams.ffjlId = row.id
+      this.queryJcgjParams.gspRkjlId = row.id
       info({ id: row.id }).then(response => {
         this.form = response.data
         this.open = true
diff --git a/src/views/business/storageLocation/comps/StorageLocationImport.vue b/src/views/business/storageLocation/comps/StorageLocationImport.vue
new file mode 100644
index 0000000..3e62f5a
--- /dev/null
+++ b/src/views/business/storageLocation/comps/StorageLocationImport.vue
@@ -0,0 +1,158 @@
+<template>
+  <div>
+    <!-- 存储位置导入 -->
+    <el-dialog :title="$t('page.business.resource.gsp.dr')" :visible.sync="open" width="600px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="24">
+            <el-upload  ref="upload" :data="form" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+              :action="upload.url" :disabled="upload.isUploading"
+              :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+              <i class="el-icon-upload"></i>
+              <div class="el-upload__text">{{ $t('page.business.resource.gsp.tzsc') }}<em>{{
+                $t('page.business.resource.gsp.djsc') }}</em></div>
+              <div class="el-upload__tip text-center" slot="tip">
+                <span>{{ $t('page.business.resource.gsp.wjgs') }}</span>
+                <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+                  @click="importTemplate">{{ $t('page.business.resource.gsp.xzmb') }}</el-link>
+              </div>
+            </el-upload>
+          </el-col>
+        </el-row>
+        <el-row style="margin-top: 30px;">
+          <el-col :span="12">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signerPsw')" prop="qmrmm">
+              <div class="sbzdtcma"> <input type="text"></div>
+              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent v-model="form.qmrmm" show-password maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="qmbz">
+              <el-input type="textarea" v-model="form.qmbz" :rows="2" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { getToken } from "@/utils/auth"
+export default {
+  name: "StorageLocationImport",
+  data() {
+    return {
+      open: false,
+      form: {
+        qmrmm: null,
+        qmbz: null
+      },
+      rules: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      },
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/system/business/storageLocation/importData"
+      },
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    // 下载模板
+    importTemplate() {
+      this.download('/system/business/storageLocation/importTemplate', {
+      }, `【模板】存储位置.xlsx`)
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false
+      this.upload.isUploading = false
+      this.$refs.upload.clearFiles()
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
+      this.$emit('callback')
+    },
+    // 提交上传文件
+    submitFileForm() {
+      const file = this.$refs.upload.uploadFiles
+      if (!file || file.length === 0 || !file[0].name.toLowerCase().endsWith('.xls') && !file[0].name.toLowerCase().endsWith('.xlsx')) {
+        this.$modal.msgError("请选择后缀为 “xls”或“xlsx”的文件。")
+        return
+      }
+      this.$refs.upload.submit()
+    },
+    cancel() {
+      this.upload.isUploading = false
+      this.$refs.upload.clearFiles()
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        qmyy: this.$t('page.system.storageLocation.addStroageLocation'),
+        qmrmm: null
+      }
+      this.resetForm("form")
+    },
+    show() {
+      this.reset()
+      this.open = true
+    },
+
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss"  scoped>
+
+::v-deep .el-upload-dragger {
+  width: 560px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/business/storageLocation/list.vue b/src/views/business/storageLocation/list.vue
index fdc0748..424dfb4 100644
--- a/src/views/business/storageLocation/list.vue
+++ b/src/views/business/storageLocation/list.vue
@@ -30,6 +30,11 @@
         <el-button type="primary" plain @click="handleAdd" v-hasPermi="['business:storageLocation:add']">{{
           $t('page.system.storageLocation.add') }}</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <!-- 导入 -->
+        <el-button type="primary" @click="handleImport" v-hasPermi="['business:storageLocation:import']">{{
+          $t('page.business.resource.gsp.dr') }}</el-button>
+      </el-col>
     </el-row>
 
     <el-table v-loading="loading" :data="list">
@@ -59,8 +64,9 @@
 
 
     <StorageLocationDetail ref="storageLocationDetail" />
-    <Bj ref="Bj"  @callback="handleQuery"/>
-    <Xz ref="Xz"   @callback="handleQuery"/>
+    <Bj ref="Bj" @callback="handleQuery" />
+    <Xz ref="Xz" @callback="handleQuery" />
+    <StorageLocationImport ref="StorageLocationImport" @callback="handleQuery"/>
   </div>
 </template>
 
@@ -73,9 +79,10 @@ import { mapGetters } from 'vuex'
 import StorageLocationDetail from './comps/detail'
 import Bj from "./comps/Bj";
 import Xz from "./comps/Xz";
+import StorageLocationImport from "./comps/StorageLocationImport"
 export default {
   name: 'StorageLocation',
-  components: { BusinessSelect, SelectDept, StorageLocationDetail, Bj, Xz },
+  components: { BusinessSelect, SelectDept, StorageLocationDetail, Bj, Xz, StorageLocationImport },
 
   data() {
     return {
@@ -109,6 +116,9 @@ export default {
     this.getList()
   },
   methods: {
+    handleImport() {
+      this.$refs.StorageLocationImport.show()
+    },
     /** 查询列表 */
     getList() {
       this.loading = true