diff --git a/src/views/mes/attached/index.vue b/src/views/mes/attached/index.vue
index 11d78c12..8a9427ff 100644
--- a/src/views/mes/attached/index.vue
+++ b/src/views/mes/attached/index.vue
@@ -186,6 +186,21 @@
           v-hasPermi="['mes:attached:export']"
         >导出</el-button>
       </el-col>
+
+      <el-col :span="1.5">
+        <div>
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-upload2"
+            size="mini"
+            @click="handleImport"
+            v-hasPermi="['mes:attached:import']"
+          >导入</el-button
+          >
+        </div>
+      </el-col>
+
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -217,6 +232,12 @@
       <el-table-column label="吸塑" align="center" prop="pvc" />
       <el-table-column label="支架盘" align="center" prop="supportPlate" />
       <el-table-column label="其它" align="center" prop="other" />
+
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="库检周期" align="center" prop="warehouseCycle" />
+      <el-table-column label="托盘上箱数" align="center" prop="palletNum" />
+      <el-table-column label="垛形" align="center" prop="packType" />
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width"  width="130">
         <template slot-scope="scope">
           <el-button
@@ -314,10 +335,65 @@
         <el-form-item label="其它" prop="other">
           <el-input v-model="form.other" placeholder="请输入其它" />
         </el-form-item>
+
+        <el-form-item label="库检周期" prop="warehouseCycle">
+          <el-input v-model="form.warehouseCycle" placeholder="请输入库检周期" />
+        </el-form-item>
+        <el-form-item label="托盘上箱数" prop="palletNum">
+          <el-input v-model="form.palletNum" placeholder="请输入托盘上箱数" />
+        </el-form-item>
+        <el-form-item label="垛形" prop="packType">
+          <el-input v-model="form.packType" placeholder="请输入垛形" />
+        </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
+
+
+        <!-- 用户导入对话框 -->
+        <el-dialog
+          :title="upload.title"
+          :visible.sync="upload.open"
+          width="400px"
+          append-to-body
+        >
+          <el-upload
+            ref="upload"
+            :limit="1"
+            accept=".xlsx, .xls"
+            :headers="upload.headers"
+            :action="upload.url + '?updateSupport=' + upload.updateSupport"
+            :disabled="upload.isUploading"
+            :on-progress="handleFileUploadProgress"
+            :on-success="handleFileSuccess"
+            :auto-upload="false"
+            drag
+          >
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+            <div class="el-upload__tip text-center" slot="tip">
+              <span>仅允许导入xls、xlsx格式文件。</span>
+              <el-link
+                type="primary"
+                :underline="false"
+                style="font-size: 12px; vertical-align: baseline"
+                @click="importTemplate"
+              >下载模板
+              </el-link>
+            </div>
+          </el-upload>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitFileForm">确 定</el-button>
+            <el-button @click="upload.open = false">取 消</el-button>
+          </div>
+        </el-dialog>
+
+
+
+
+
       </div>
     </el-dialog>
   </div>
@@ -325,12 +401,35 @@
 
 <script>
 import { listAttached, getAttached, delAttached, addAttached, updateAttached } from "@/api/mes/attached";
-
+import { getToken } from "@/utils/auth";
 export default {
   name: "Attached",
   dicts: ['sys_category'],
   data() {
     return {
+      // 导入数据
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: {
+          poolName: localStorage.getItem("USER_POOL_NAME_CURRENT"),
+          Authorization: "Bearer " + getToken(),
+        },
+        // 上传的地址
+        url:
+          process.env.VUE_APP_BASE_API + "/mes/attached/importFile",
+      },
+
+
+
+
       // 遮罩层
       loading: true,
       // 选中数组
@@ -370,6 +469,10 @@ export default {
         pvc: null,
         supportPlate: null,
         other: null,
+        createBy: null,
+        warehouseCycle: null,
+        palletNum: null,
+        packType: null
       },
       // 表单参数
       form: {},
@@ -420,7 +523,10 @@ export default {
         pvc: null,
         supportPlate: null,
         other: null,
-        createBy: null
+        createBy: null,
+        warehouseCycle: null,
+        palletNum: null,
+        packType: null
       };
       this.resetForm("form");
     },
@@ -492,7 +598,49 @@ export default {
       this.download('mes/attached/export', {
         ...this.queryParams
       }, `attached_${new Date().getTime()}.xlsx`)
-    }
+    },
+
+
+    // 导入-导入窗口打开
+    handleImport() {
+      this.upload.title = "物料附属信息信息导入";
+      this.upload.open = true;
+    },
+
+    // 导入-文件上传中处理
+    handleFileUploadProgress(event, file) {
+      this.upload.isUploading = true;
+    },
+
+    // 导入-文件上传成功处理
+    handleFileSuccess(response) {
+      debugger;
+      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.getList();
+    },
+
+    // 导入-提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+
+    // 导入-下载模板
+    importTemplate() {
+      this.download(
+        "/mes/attached/importTemplate",
+        {},
+        `sparePartsLedger_template_${new Date().getTime()}.xlsx`
+      );
+    },
   }
 };
 </script>