diff --git a/src/views/qualityManagement/FQC/qualityStatistics.vue b/src/views/qualityManagement/FQC/qualityStatistics.vue
index 3e68cd4..278a8e4 100644
--- a/src/views/qualityManagement/FQC/qualityStatistics.vue
+++ b/src/views/qualityManagement/FQC/qualityStatistics.vue
@@ -34,8 +34,9 @@
 				</el-form-item>
 				<el-form-item label=" ">
 					<el-button size="mini" type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
-					<el-button size="mini" type="warning" @click="exportDataEvent">EXCEL导出</el-button>
-					<el-button size="mini" type="success" @click="exportAllDataEvent">导出全部记录</el-button>
+					<el-button size="mini" type="warning" @click="exportAllDataEvent(false)">日生产报表导出</el-button>
+					<el-button size="mini" type="success" @click="exportAllDataEvent(true)">缺陷详情导出</el-button>
+					<!-- <el-button size="mini" type="success" @click="exportDataEvent">缺陷详情导出</el-button> -->
 				</el-form-item>
 			</el-form>
 		</div>
@@ -254,6 +255,9 @@
 					// { row: 0, col: 10, rowspan: 3, colspan: 0 },
 					// { row: 0, col: 11, rowspan: 3, colspan: 0 },
 				],
+				hiddenCells: [],
+				// 列表对照表
+				tableCellDict: [],
 				// 右键菜单
 				tableMenu: {
 					header: {
@@ -289,19 +293,16 @@
 			mergeTable(num) {
 				this.mergeCells = []
 				for (let i = 0; i < this.QualityStatisticsTable.length; i = i + num) {
-					this.mergeCells.push({ row: i, col: 0, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 1, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 2, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 3, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 4, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 5, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 6, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 7, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 8, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 9, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 10, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 11, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 12, rowspan: num, colspan: 0 })
+					let count = 13 - this.hiddenCells.length;
+					for (let j = 0; j < count; j++) {
+						this.mergeCells.push({ row: i, col: j, rowspan: num, colspan: 0 })
+					}
+					// if(this.hiddenCells.includes('工单号')){
+
+					// }
+					// this.mergeCells.push({ row: i, col: 10, rowspan: num, colspan: 0 })
+					// this.mergeCells.push({ row: i, col: 11, rowspan: num, colspan: 0 })
+					// this.mergeCells.push({ row: i, col: 12, rowspan: num, colspan: 0 })
 				}
 			},
 
@@ -386,11 +387,11 @@
 				this.$refs.xTable.openExport()
 			},
 			// 导出全部数据
-			exportAllDataEvent() {
+			exportAllDataEvent(isShowDetail = false) {
 				let data = { ...this.search, ...this.pagination };
 				data.type = this.search.reportType + 1;
-				data.isShowDetail = false;
-				let fileName = this.reportType_options[this.search.reportType].label + '.xlsx';
+				data.isShowDetail = isShowDetail;
+				let fileName = this.reportType_options[this.search.reportType].label + (isShowDetail ? '-缺陷详情' : '-日生产报表') + '.xlsx';
 				downloadStatisticsTableExcel(data).then(res => {
 					console.log(res);
 					let blobURL = URL.createObjectURL(res.data)
@@ -428,10 +429,10 @@
 				const $table = this.$refs.xTable
 				switch (menu.code) {
 				case 'hideColumn':
-					$table.hideColumn(column)
+					this.hideColumn(column);
 					break
 				case 'showAllColumn':
-					$table.resetColumn()
+					this.resetColumn()
 					break
 				case 'remove':
 					this.removeData(row)
@@ -441,6 +442,28 @@
 					break
 				}
 			},
+			// 隐藏列
+			hideColumn(column) {
+				const $table = this.$refs.xTable;
+				$table.hideColumn(column);
+				this.hiddenCells.push(column.title);
+				this.resetMergeTable();
+			},
+			// 取消所有隐藏列
+			resetColumn() {
+				const $table = this.$refs.xTable;
+				this.hiddenCells = [];
+				$table.resetColumn();
+				this.resetMergeTable();
+			},
+			resetMergeTable(){
+				if(this.search.reportType  === 3){
+					this.mergeTable(2);
+				}else{
+					this.mergeTable(3);
+				}
+				
+			},
 			// 删除数据
 			removeData(row) {
 				this.$confirm('此操作将永久删除该条记录, 是否继续?', '提示', {
diff --git a/src/views/wmsManagement/WmBlankInventory.vue b/src/views/wmsManagement/WmBlankInventory.vue
index 6fd9c53..dfbd1ef 100644
--- a/src/views/wmsManagement/WmBlankInventory.vue
+++ b/src/views/wmsManagement/WmBlankInventory.vue
@@ -85,7 +85,7 @@
 		<pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
 		<!-- 添加或修改毛坯库存表对话框 -->
-		<el-dialog :title="title" :lock-scroll="false" :visible.sync="open">
+		<el-dialog :title="title" :lock-scroll="false" :visible.sync="open" :close-on-click-modal="false">
 			<el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
 				<el-row :gutter="20">
 					<el-col :lg="12">
diff --git a/src/views/wmsManagement/WmCheckLog.vue b/src/views/wmsManagement/WmCheckLog.vue
index 3c41888..71c32ad 100644
--- a/src/views/wmsManagement/WmCheckLog.vue
+++ b/src/views/wmsManagement/WmCheckLog.vue
@@ -64,7 +64,7 @@
     <pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改盘点记录对话框 -->
-    <el-dialog :title="title" :lock-scroll="false" :visible.sync="open" >
+    <el-dialog :title="title" :lock-scroll="false" :visible.sync="open" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
         <el-row :gutter="20">
             
diff --git a/src/views/wmsManagement/WmCustom.vue b/src/views/wmsManagement/WmCustom.vue
index 5e3e9f5..95a80de 100644
--- a/src/views/wmsManagement/WmCustom.vue
+++ b/src/views/wmsManagement/WmCustom.vue
@@ -112,7 +112,7 @@
 		/>
 
 		<!-- 添加或修改客户信息对话框 -->
-		<el-dialog :title="title" :lock-scroll="false" :visible.sync="open">
+		<el-dialog :title="title" :lock-scroll="false" :visible.sync="open" :close-on-click-modal="false">
 			<el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
 				<el-row :gutter="20">
 					<el-col :lg="12">
diff --git a/src/views/wmsManagement/WmFgentryInspect.vue b/src/views/wmsManagement/WmFgentryInspect.vue
index b8e0103..5a1db54 100644
--- a/src/views/wmsManagement/WmFgentryInspect.vue
+++ b/src/views/wmsManagement/WmFgentryInspect.vue
@@ -85,7 +85,7 @@
     />
 
     <!-- 二级菜单区 -->
-    <el-dialog :title="first_level.title" :lock-scroll="false" :visible.sync="first_level.open" width="1200px" :show-close="false">
+    <el-dialog :title="first_level.title" :lock-scroll="false" :visible.sync="first_level.open" width="1200px" :show-close="false" :close-on-click-modal="false">
       <!-- 工具区 -->
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
diff --git a/src/views/wmsManagement/WmGoodsChangeLog.vue b/src/views/wmsManagement/WmGoodsChangeLog.vue
index a6b52f0..48300ec 100644
--- a/src/views/wmsManagement/WmGoodsChangeLog.vue
+++ b/src/views/wmsManagement/WmGoodsChangeLog.vue
@@ -66,7 +66,7 @@
 		<pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
 		<!-- 添加或修改仓库操作日志对话框 -->
-		<el-dialog :title="title" :lock-scroll="false" :visible.sync="open">
+		<el-dialog :title="title" :lock-scroll="false" :visible.sync="open" :close-on-click-modal="false">
 			<el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
 				<el-row :gutter="20">
 					<el-col :lg="12">
diff --git a/src/views/wmsManagement/WmMaterial.vue b/src/views/wmsManagement/WmMaterial.vue
index a6b0734..19b6cd3 100644
--- a/src/views/wmsManagement/WmMaterial.vue
+++ b/src/views/wmsManagement/WmMaterial.vue
@@ -7,587 +7,520 @@
  * @LastEditTime: (2024-03-16)
 -->
 <template>
-  <div class="app-container">
-    <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
-    <el-form
-      :model="queryParams"
-      size="small"
-      label-position="right"
-      inline
-      ref="queryForm"
-      :label-width="labelWidth"
-      v-show="showSearch"
-      @submit.native.prevent
-    >
-      <el-form-item label="物料号" prop="partnumber">
-        <el-input v-model="queryParams.partnumber" placeholder="请输入物料号（零件号）" :clearable="true" />
-      </el-form-item>
-      <el-form-item label="库存编码" prop="u8InventoryCode">
-        <el-input v-model="queryParams.u8InventoryCode" placeholder="请输入U8库存编码" :clearable="true" />
-      </el-form-item>
-      <el-form-item label="产品描述" prop="productName">
-        <el-input v-model="queryParams.productName" placeholder="产品描述（产品名称）" :clearable="true" />
-      </el-form-item>
-      <el-form-item label="产品颜色" prop="color">
-        <el-input v-model="queryParams.color" placeholder="请输入产品颜色" :clearable="true" />
-      </el-form-item>
-      <el-form-item label="规格" prop="specification">
-        <el-input v-model="queryParams.specification" placeholder="请输入规格（左右脚）" :clearable="true" />
-      </el-form-item>
-      <el-form-item label="显示描述" prop="description">
-        <el-input v-model="queryParams.description" placeholder="显示描述(产品描述+颜色+规格)" :clearable="true" />
-      </el-form-item>
-      <el-form-item label="物料代号" prop="search1">
-        <el-input v-model="queryParams.search1" placeholder="请输入物料代号" :clearable="true" />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-radio-group v-model="queryParams.status">
-          <el-radio-button v-for="item in statusOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{
+	<div class="app-container">
+		<!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
+		<el-form :model="queryParams" size="small" label-position="right" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" @submit.native.prevent>
+			<el-form-item label="物料号" prop="partnumber">
+				<el-input v-model="queryParams.partnumber" placeholder="请输入物料号（零件号）" :clearable="true" />
+			</el-form-item>
+			<el-form-item label="库存编码" prop="u8InventoryCode">
+				<el-input v-model="queryParams.u8InventoryCode" placeholder="请输入U8库存编码" :clearable="true" />
+			</el-form-item>
+			<el-form-item label="产品描述" prop="productName">
+				<el-input v-model="queryParams.productName" placeholder="产品描述（产品名称）" :clearable="true" />
+			</el-form-item>
+			<el-form-item label="产品颜色" prop="color">
+				<el-input v-model="queryParams.color" placeholder="请输入产品颜色" :clearable="true" />
+			</el-form-item>
+			<el-form-item label="规格" prop="specification">
+				<el-input v-model="queryParams.specification" placeholder="请输入规格（左右脚）" :clearable="true" />
+			</el-form-item>
+			<el-form-item label="显示描述" prop="description">
+				<el-input v-model="queryParams.description" placeholder="显示描述(产品描述+颜色+规格)" :clearable="true" />
+			</el-form-item>
+			<el-form-item label="物料代号" prop="search1">
+				<el-input v-model="queryParams.search1" placeholder="请输入物料代号" :clearable="true" />
+			</el-form-item>
+			<el-form-item label="状态" prop="status">
+				<el-radio-group v-model="queryParams.status">
+					<el-radio-button v-for="item in statusOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{
             item.dictLabel
           }}</el-radio-button>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label=" ">
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <!-- 工具区域 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" v-hasPermi="['business:wmmaterial:add']" plain icon="el-icon-plus" size="medium" @click="handleAdd"
-          >新增物料记录</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" v-hasPermi="['business:wmmaterial:add']" plain icon="el-icon-download" size="medium" @click="importmaterial"
-          >批量导入</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          :disabled="single"
-          v-hasPermi="['business:wmmaterial:edit']"
-          plain
-          icon="el-icon-edit"
-          size="medium"
-          @click="handleUpdate"
-          >批量修改</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          :disabled="multiple"
-          v-hasPermi="['business:wmmaterial:delete']"
-          plain
-          icon="el-icon-delete"
-          size="medium"
-          @click="handleDelete"
-          >批量删除</el-button
-        >
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+				</el-radio-group>
+			</el-form-item>
+			<el-form-item label=" ">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+		<!-- 工具区域 -->
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" v-hasPermi="['business:wmmaterial:add']" plain icon="el-icon-plus" size="medium" @click="handleAdd">新增物料记录</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="warning" v-hasPermi="['business:wmmaterial:add']" plain icon="el-icon-download" size="medium" @click="importmaterial">批量导入</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="success" :disabled="single" v-hasPermi="['business:wmmaterial:edit']" plain icon="el-icon-edit" size="medium" @click="handleUpdate">批量修改</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="danger" :disabled="multiple" v-hasPermi="['business:wmmaterial:delete']" plain icon="el-icon-delete" size="medium" @click="handleDelete">批量删除</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
 
-    <!-- 数据区域 -->
-    <el-table
-      :data="dataList"
-      v-loading="loading"
-      ref="table"
-      border
-      highlight-current-row
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="50" align="center" />
-      <el-table-column prop="partnumber" label="物料号" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="u8InventoryCode" label="库存编码" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="blankNum" label="毛坯号" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="unit" label="单位" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="productName" label="产品描述" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="color" label="产品颜色" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="specification" label="规格" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="description" label="显示描述" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="version" label="版本号" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="remarks" label="备注" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="status" label="状态" align="center">
-        <template slot-scope="scope">
-          <el-tag type="success" v-if="scope.row.status === 1">正常</el-tag>
-          <el-tag type="info" v-if="scope.row.status === 0">弃用</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="createdTime" label="创建时间" align="center" :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" width="140">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            v-hasPermi="['business:wmmaterial:edit']"
-            type="success"
-            icon="el-icon-edit"
-            title="编辑"
-            @click="handleUpdate(scope.row)"
-          ></el-button>
-          <el-button
-            size="mini"
-            v-hasPermi="['business:wmmaterial:delete']"
-            type="danger"
-            icon="el-icon-delete"
-            title="删除"
-            @click="handleDelete(scope.row)"
-          ></el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+		<!-- 数据区域 -->
+		<el-table :data="dataList" v-loading="loading" ref="table" border highlight-current-row @sort-change="sortChange" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="50" align="center" />
+			<el-table-column prop="partnumber" label="物料号" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="u8InventoryCode" label="库存编码" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="blankNum" label="毛坯号" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="unit" label="单位" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="productName" label="产品描述" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="color" label="产品颜色" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="specification" label="规格" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="description" label="显示描述" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="version" label="版本号" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="remarks" label="备注" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="status" label="状态" align="center">
+				<template slot-scope="scope">
+					<el-tag type="success" v-if="scope.row.status === 1">正常</el-tag>
+					<el-tag type="info" v-if="scope.row.status === 0">弃用</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="createdTime" label="创建时间" align="center" :show-overflow-tooltip="true" />
+			<el-table-column label="操作" align="center" width="140">
+				<template slot-scope="scope">
+					<el-button size="mini" v-hasPermi="['business:wmmaterial:edit']" type="success" icon="el-icon-edit" title="编辑" @click="handleUpdate(scope.row)"></el-button>
+					<el-button size="mini" v-hasPermi="['business:wmmaterial:delete']" type="danger" icon="el-icon-delete" title="删除" @click="handleDelete(scope.row)"></el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		<pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
-    <!-- 物料清单导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload
-        name="file"
-        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">
-          <!-- <div class="el-upload__tip" slot="tip"><el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的生产计划</div> -->
-          <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
-        </div>
-      </el-upload>
-      <el-tag type="warning">上次导入时间:{{ upload.time }}</el-tag>
+		<!-- 物料清单导入对话框 -->
+		<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+			<el-upload name="file" 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">
+					<!-- <div class="el-upload__tip" slot="tip"><el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的生产计划</div> -->
+					<span>仅允许导入xls、xlsx格式文件。</span>
+					<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
+				</div>
+			</el-upload>
+			<el-tag type="warning">上次导入时间:{{ upload.time }}</el-tag>
 
-      <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 slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitFileForm">确 定</el-button>
+				<el-button @click="upload.open = false">取 消</el-button>
+			</div>
+		</el-dialog>
 
-    <!-- 添加或修改物料记录表对话框 -->
-    <el-dialog :title="title" :lock-scroll="false" :visible.sync="open">
-      <el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
-        <el-row :gutter="20">
-          <el-col :lg="12">
-            <el-form-item label="物料号" prop="partnumber">
-              <el-input v-model="form.partnumber" placeholder="请输入物料号（零件号）" />
-            </el-form-item>
-          </el-col>
+		<!-- 添加或修改物料记录表对话框 -->
+		<el-dialog :title="title" :lock-scroll="false" :visible.sync="open" :close-on-click-modal="false">
+			<el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
+				<el-row :gutter="20">
+					<el-col :lg="12">
+						<el-form-item label="物料号" prop="partnumber">
+							<el-input v-model="form.partnumber" placeholder="请输入物料号（零件号）" />
+						</el-form-item>
+					</el-col>
 
-          <el-col :lg="12">
-            <el-form-item label="库存编码" prop="u8InventoryCode">
-              <el-input v-model="form.u8InventoryCode" placeholder="请输入U8库存编码" />
-            </el-form-item>
-          </el-col>
+					<el-col :lg="12">
+						<el-form-item label="库存编码" prop="u8InventoryCode">
+							<el-input v-model="form.u8InventoryCode" placeholder="请输入U8库存编码" />
+						</el-form-item>
+					</el-col>
 
-          <el-col :lg="12">
-            <el-form-item label="毛坯号" prop="blankNum">
-              <el-input v-model="form.blankNum" placeholder="请输入毛坯号" />
-            </el-form-item>
-          </el-col>
+					<el-col :lg="12">
+						<el-form-item label="毛坯号" prop="blankNum">
+							<el-input v-model="form.blankNum" placeholder="请输入毛坯号" />
+						</el-form-item>
+					</el-col>
 
-          <el-col :lg="12">
-            <el-form-item label="单位" prop="unit">
-              <el-input v-model="form.unit" placeholder="请输入单位(个)" />
-            </el-form-item>
-          </el-col>
+					<el-col :lg="12">
+						<el-form-item label="单位" prop="unit">
+							<el-input v-model="form.unit" placeholder="请输入单位(个)" />
+						</el-form-item>
+					</el-col>
 
-          <el-col :lg="12">
-            <el-form-item label="产品描述" prop="productName">
-              <el-input v-model="form.productName" placeholder="请输入产品描述（产品名称）" />
-            </el-form-item>
-          </el-col>
+					<el-col :lg="12">
+						<el-form-item label="产品描述" prop="productName">
+							<el-input v-model="form.productName" placeholder="请输入产品描述（产品名称）" />
+						</el-form-item>
+					</el-col>
 
-          <el-col :lg="12">
-            <el-form-item label="产品颜色" prop="color">
-              <el-input v-model="form.color" placeholder="请输入产品颜色" />
-            </el-form-item>
-          </el-col>
+					<el-col :lg="12">
+						<el-form-item label="产品颜色" prop="color">
+							<el-input v-model="form.color" placeholder="请输入产品颜色" />
+						</el-form-item>
+					</el-col>
 
-          <el-col :lg="12">
-            <el-form-item label="规格" prop="specification">
-              <el-input v-model="form.specification" placeholder="请输入规格（左右脚）" />
-            </el-form-item>
-          </el-col>
+					<el-col :lg="12">
+						<el-form-item label="规格" prop="specification">
+							<el-input v-model="form.specification" placeholder="请输入规格（左右脚）" />
+						</el-form-item>
+					</el-col>
 
-          <el-col :lg="12">
-            <el-form-item label="显示描述" prop="description">
-              <el-input v-model="form.description" placeholder="请输入显示描述(产品描述+颜色+规格)" />
-            </el-form-item>
-          </el-col>
+					<el-col :lg="12">
+						<el-form-item label="显示描述" prop="description">
+							<el-input v-model="form.description" placeholder="请输入显示描述(产品描述+颜色+规格)" />
+						</el-form-item>
+					</el-col>
 
-          <el-col :lg="12">
-            <el-form-item label="版本号" prop="version">
-              <el-input v-model="form.version" placeholder="请输入版本号" />
-            </el-form-item>
-          </el-col>
+					<el-col :lg="12">
+						<el-form-item label="版本号" prop="version">
+							<el-input v-model="form.version" placeholder="请输入版本号" />
+						</el-form-item>
+					</el-col>
 
-          <el-col :lg="12">
-            <el-form-item label="备注" prop="remarks">
-              <el-input v-model="form.remarks" placeholder="请输入备注" />
-            </el-form-item>
-          </el-col>
+					<el-col :lg="12">
+						<el-form-item label="备注" prop="remarks">
+							<el-input v-model="form.remarks" placeholder="请输入备注" />
+						</el-form-item>
+					</el-col>
 
-          <el-col :lg="12">
-            <el-form-item label="排序" prop="sort">
-              <el-input v-model="form.sort" placeholder="请输入排序(特殊排序)" />
-            </el-form-item>
-          </el-col>
+					<el-col :lg="12">
+						<el-form-item label="排序" prop="sort">
+							<el-input v-model="form.sort" placeholder="请输入排序(特殊排序)" />
+						</el-form-item>
+					</el-col>
 
-          <el-col :lg="12">
-            <el-form-item label="物料代号1" prop="search1">
-              <el-input v-model="form.search1" placeholder="请输入物料代号1" />
-            </el-form-item>
-          </el-col>
+					<el-col :lg="12">
+						<el-form-item label="物料代号1" prop="search1">
+							<el-input v-model="form.search1" placeholder="请输入物料代号1" />
+						</el-form-item>
+					</el-col>
 
-          <el-col :lg="12">
-            <el-form-item label="物料代号2" prop="search2">
-              <el-input v-model="form.search2" placeholder="请输入物料代号1" />
-            </el-form-item>
-          </el-col>
+					<el-col :lg="12">
+						<el-form-item label="物料代号2" prop="search2">
+							<el-input v-model="form.search2" placeholder="请输入物料代号1" />
+						</el-form-item>
+					</el-col>
 
-          <el-col :lg="12">
-            <el-form-item label="状态" prop="status">
-              <el-radio-group v-model="form.status">
-                <el-radio v-for="item in statusOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{ item.dictLabel }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-      </div>
-    </el-dialog>
-  </div>
+					<el-col :lg="12">
+						<el-form-item label="状态" prop="status">
+							<el-radio-group v-model="form.status">
+								<el-radio v-for="item in statusOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{ item.dictLabel }}</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="text" @click="cancel">取 消</el-button>
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+			</div>
+		</el-dialog>
+	</div>
 </template>
 <script>
-import { listWmMaterial, addWmMaterial, delWmMaterial, updateWmMaterial, getWmMaterial } from '@/api/wmsManagement/wmMaterial.js'
-import { getToken } from '@/utils/auth'
-import { formatDate } from '@/utils/index'
-export default {
-  name: 'wmmaterial',
-  data() {
-    return {
-      labelWidth: '100px',
-      formLabelWidth: '100px',
-      // 选中id数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 遮罩层
-      loading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        sort: null,
-        sortType: null,
-      },
-      // 弹出层标题
-      title: '',
-      // 操作类型 1、add 2、edit
-      opertype: 0,
-      // 是否显示弹出层
-      open: false,
-      // 表单参数
-      form: {},
-      columns: [
-        { index: 1, key: 'partnumber', label: `物料号（零件号）`, checked: true },
-        { index: 2, key: 'u8InventoryCode', label: `U8库存编码`, checked: true },
-        { index: 3, key: 'blankNum', label: `毛坯号`, checked: true },
-        { index: 4, key: 'unit', label: `单位`, checked: true },
-        { index: 5, key: 'productName', label: `产品描述（产品名称）`, checked: true },
-        { index: 6, key: 'color', label: `产品颜色`, checked: true },
-        { index: 7, key: 'specification', label: `规格（左右脚）`, checked: true },
-        { index: 8, key: 'description', label: `显示描述(产品描述+颜色+规格)`, checked: true },
-        { index: 9, key: 'version', label: `版本号`, checked: false },
-        { index: 10, key: 'remarks', label: `备注`, checked: false },
-        { index: 14, key: 'status', label: `状态（0-不可见 1-可见）`, checked: false },
-      ],
-      // 状态（0-不可见 1-可见）选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
-      statusOptions: [
-        {
-          dictLabel: '正常',
-          dictValue: 1,
-        },
-        {
-          dictLabel: '弃用',
-          dictValue: 0,
-        },
-      ],
-      // 数据列表
-      dataList: [],
-      // 总记录数
-      total: 0,
-      // 提交按钮是否显示
-      btnSubmitVisible: true,
-      // 表单校验
-      rules: {},
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: '最近一周',
-            onClick(picker) {
-              const end = new Date()
-              const start = new Date()
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-              picker.$emit('pick', [start, end])
-            },
-          },
-          {
-            text: '最近一个月',
-            onClick(picker) {
-              const end = new Date()
-              const start = new Date()
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-              picker.$emit('pick', [start, end])
-            },
-          },
-          {
-            text: '最近三个月',
-            onClick(picker) {
-              const end = new Date()
-              const start = new Date()
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-              picker.$emit('pick', [start, end])
-            },
-          },
-        ],
-      },
-      upload: {
-        time: null,
-        // 用户导入参数
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: '',
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: false,
-        // 设置上传的请求头部
-        headers: { Authorization: 'Bearer ' + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + '/mes/wm/WmMaterial/importData',
-      },
+	import { listWmMaterial, addWmMaterial, delWmMaterial, updateWmMaterial, getWmMaterial } from '@/api/wmsManagement/wmMaterial.js'
+	import { getToken } from '@/utils/auth'
+	import { formatDate } from '@/utils/index'
+	export default {
+		name: 'wmmaterial',
+		data() {
+			return {
+				labelWidth: '100px',
+				formLabelWidth: '100px',
+				// 选中id数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 遮罩层
+				loading: false,
+				// 显示搜索条件
+				showSearch: true,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					sort: null,
+					sortType: null,
+				},
+				// 弹出层标题
+				title: '',
+				// 操作类型 1、add 2、edit
+				opertype: 0,
+				// 是否显示弹出层
+				open: false,
+				// 表单参数
+				form: {},
+				columns: [
+					{ index: 1, key: 'partnumber', label: `物料号（零件号）`, checked: true },
+					{ index: 2, key: 'u8InventoryCode', label: `U8库存编码`, checked: true },
+					{ index: 3, key: 'blankNum', label: `毛坯号`, checked: true },
+					{ index: 4, key: 'unit', label: `单位`, checked: true },
+					{ index: 5, key: 'productName', label: `产品描述（产品名称）`, checked: true },
+					{ index: 6, key: 'color', label: `产品颜色`, checked: true },
+					{ index: 7, key: 'specification', label: `规格（左右脚）`, checked: true },
+					{ index: 8, key: 'description', label: `显示描述(产品描述+颜色+规格)`, checked: true },
+					{ index: 9, key: 'version', label: `版本号`, checked: false },
+					{ index: 10, key: 'remarks', label: `备注`, checked: false },
+					{ index: 14, key: 'status', label: `状态（0-不可见 1-可见）`, checked: false },
+				],
+				// 状态（0-不可见 1-可见）选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+				statusOptions: [
+				{
+					dictLabel: '正常',
+					dictValue: 1,
+				},
+				{
+					dictLabel: '弃用',
+					dictValue: 0,
+				}, ],
+				// 数据列表
+				dataList: [],
+				// 总记录数
+				total: 0,
+				// 提交按钮是否显示
+				btnSubmitVisible: true,
+				// 表单校验
+				rules: {},
+				pickerOptions: {
+					shortcuts: [
+					{
+						text: '最近一周',
+						onClick(picker) {
+							const end = new Date()
+							const start = new Date()
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+							picker.$emit('pick', [start, end])
+						},
+					},
+					{
+						text: '最近一个月',
+						onClick(picker) {
+							const end = new Date()
+							const start = new Date()
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+							picker.$emit('pick', [start, end])
+						},
+					},
+					{
+						text: '最近三个月',
+						onClick(picker) {
+							const end = new Date()
+							const start = new Date()
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+							picker.$emit('pick', [start, end])
+						},
+					}, ],
+				},
+				upload: {
+					time: null,
+					// 用户导入参数
+					// 是否显示弹出层（用户导入）
+					open: false,
+					// 弹出层标题（用户导入）
+					title: '',
+					// 是否禁用上传
+					isUploading: false,
+					// 是否更新已经存在的用户数据
+					updateSupport: false,
+					// 设置上传的请求头部
+					headers: { Authorization: 'Bearer ' + getToken() },
+					// 上传的地址
+					url: process.env.VUE_APP_BASE_API + '/mes/wm/WmMaterial/importData',
+				},
 
-      fullloading: null,
-    }
-  },
-  created() {
-    // 列表数据查询
-    this.getList()
+				fullloading: null,
+			}
+		},
+		created() {
+			// 列表数据查询
+			this.getList()
 
-    var dictParams = []
-  },
-  mounted() {
-    this.upload.time =formatDate(localStorage.getItem('material'))
-  },
-  methods: {
-    // 查询数据
-    getList() {
-      this.loading = true
-      listWmMaterial(this.queryParams).then((res) => {
-        if (res.code == 200) {
-          this.dataList = res.data.result
-          this.total = res.data.totalNum
-          this.loading = false
-        }
-      })
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 重置数据表单
-    reset() {
-      this.form = {
-        id: undefined,
-        partnumber: undefined,
-        u8InventoryCode: undefined,
-        blankNum: undefined,
-        unit: undefined,
-        productName: undefined,
-        color: undefined,
-        specification: undefined,
-        description: undefined,
-        version: undefined,
-        remarks: undefined,
-        sort: undefined,
-        search1: undefined,
-        search2: undefined,
-        status: 1,
-        createdBy: undefined,
-        createdTime: undefined,
-        updatedBy: undefined,
-        updatedTime: undefined,
-      }
-      this.resetForm('form')
-    },
-    // 重置查询操作
-    resetQuery() {
-      this.timeRange = []
-      this.resetForm('queryForm')
-      this.handleQuery()
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id)
-      this.single = selection.length != 1
-      this.multiple = !selection.length
-    },
-    // 自定义排序
-    sortChange(column) {
-      if (column.prop == null || column.order == null) {
-        this.queryParams.sort = undefined
-        this.queryParams.sortType = undefined
-      } else {
-        this.queryParams.sort = column.prop
-        this.queryParams.sortType = column.order
-      }
+			var dictParams = []
+		},
+		mounted() {
+			this.upload.time = formatDate(localStorage.getItem('material'))
+		},
+		methods: {
+			// 查询数据
+			getList() {
+				this.loading = true
+				listWmMaterial(this.queryParams).then((res) => {
+					if (res.code == 200) {
+						this.dataList = res.data.result
+						this.total = res.data.totalNum
+						this.loading = false
+					}
+				})
+			},
+			// 取消按钮
+			cancel() {
+				this.open = false
+				this.reset()
+			},
+			// 重置数据表单
+			reset() {
+				this.form = {
+					id: undefined,
+					partnumber: undefined,
+					u8InventoryCode: undefined,
+					blankNum: undefined,
+					unit: undefined,
+					productName: undefined,
+					color: undefined,
+					specification: undefined,
+					description: undefined,
+					version: undefined,
+					remarks: undefined,
+					sort: undefined,
+					search1: undefined,
+					search2: undefined,
+					status: 1,
+					createdBy: undefined,
+					createdTime: undefined,
+					updatedBy: undefined,
+					updatedTime: undefined,
+				}
+				this.resetForm('form')
+			},
+			// 重置查询操作
+			resetQuery() {
+				this.timeRange = []
+				this.resetForm('queryForm')
+				this.handleQuery()
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map((item) => item.id)
+				this.single = selection.length != 1
+				this.multiple = !selection.length
+			},
+			// 自定义排序
+			sortChange(column) {
+				if (column.prop == null || column.order == null) {
+					this.queryParams.sort = undefined
+					this.queryParams.sortType = undefined
+				} else {
+					this.queryParams.sort = column.prop
+					this.queryParams.sortType = column.order
+				}
 
-      this.handleQuery()
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = '新增物料'
-      this.opertype = 1
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const Ids = row.id || this.ids
+				this.handleQuery()
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1
+				this.getList()
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.reset()
+				this.open = true
+				this.title = '新增物料'
+				this.opertype = 1
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const Ids = row.id || this.ids
 
-      this.$confirm('是否确认删除数据项？')
-        .then(function () {
-          return delWmMaterial(Ids)
-        })
-        .then(() => {
-          this.handleQuery()
-          this.msgSuccess('删除成功')
-        })
-        .catch(() => {})
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      const id = row.id || this.ids
-      getWmMaterial(id).then((res) => {
-        const { code, data } = res
-        if (code == 200) {
-          this.open = true
-          this.title = '修改数据'
-          this.opertype = 2
+				this.$confirm('是否确认删除数据项？')
+					.then(function () {
+						return delWmMaterial(Ids)
+					})
+					.then(() => {
+						this.handleQuery()
+						this.msgSuccess('删除成功')
+					})
+					.catch(() => {})
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				this.reset()
+				const id = row.id || this.ids
+				getWmMaterial(id).then((res) => {
+					const { code, data } = res
+					if (code == 200) {
+						this.open = true
+						this.title = '修改数据'
+						this.opertype = 2
 
-          this.form = {
-            ...data,
-          }
-        }
-      })
-    },
-    // 状态（0-不可见 1-可见）字典翻译
-    statusFormat(row, column) {
-      return this.selectDictLabel(this.statusOptions, row.status)
-    },
-    /** 提交按钮 */
-    submitForm: function () {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          console.log(JSON.stringify(this.form))
+						this.form = {
+							...data,
+						}
+					}
+				})
+			},
+			// 状态（0-不可见 1-可见）字典翻译
+			statusFormat(row, column) {
+				return this.selectDictLabel(this.statusOptions, row.status)
+			},
+			/** 提交按钮 */
+			submitForm: function () {
+				this.$refs['form'].validate((valid) => {
+					if (valid) {
+						console.log(JSON.stringify(this.form))
 
-          if (this.form.id != undefined && this.opertype === 2) {
-            updateWmMaterial(this.form)
-              .then((res) => {
-                this.msgSuccess('修改成功')
-                this.open = false
-                this.getList()
-              })
-              .catch((err) => {
-                //TODO 错误逻辑
-              })
-          } else {
-            addWmMaterial(this.form)
-              .then((res) => {
-                this.msgSuccess('新增成功')
-                this.open = false
-                this.getList()
-              })
-              .catch((err) => {
-                //TODO 错误逻辑
-              })
-          }
-        }
-      })
-    },
+						if (this.form.id != undefined && this.opertype === 2) {
+							updateWmMaterial(this.form)
+								.then((res) => {
+									this.msgSuccess('修改成功')
+									this.open = false
+									this.getList()
+								})
+								.catch((err) => {
+									//TODO 错误逻辑
+								})
+						} else {
+							addWmMaterial(this.form)
+								.then((res) => {
+									this.msgSuccess('新增成功')
+									this.open = false
+									this.getList()
+								})
+								.catch((err) => {
+									//TODO 错误逻辑
+								})
+						}
+					}
+				})
+			},
 
-    //todo 导入文件
-    importmaterial() {
-      this.upload.open = true
-      this.upload.title = '物料清单批量导入'
-    },
-    //todo 下载模板
-    importTemplate() {
-      //  @/utils/ruoyi"
-      this.download('/mes/wm/WmMaterial/download_template', '物料清单导入模板')
-    },
+			//todo 导入文件
+			importmaterial() {
+				this.upload.open = true
+				this.upload.title = '物料清单批量导入'
+			},
+			//todo 下载模板
+			importTemplate() {
+				//  @/utils/ruoyi"
+				this.download('/mes/wm/WmMaterial/download_template', '物料清单导入模板')
+			},
 
-    // todo 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true
-    },
-    //todo  提交上传文件
-    submitFileForm() {
-      this.$refs.upload.submit()
-      this.fullloading = this.$loading({
-        lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)',
-      })
-      //保存数据
-      window.localStorage.setItem('material', new Date())
-    },
-    //todo 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      this.upload.open = false
-      this.upload.isUploading = false
-      this.$refs.upload.clearFiles()
-      this.fullloading.close()
-      if (response.code == 200) {
-        this.$alert(response.data, '导入结果', { dangerouslyUseHTMLString: true })
-      } else {
-        this.$alert(response.msg, '导入结果', {
-          dangerouslyUseHTMLString: true,
-          type: 'error',
-        })
-      }
-      this.upload.time = new Date()
+			// todo 文件上传中处理
+			handleFileUploadProgress(event, file, fileList) {
+				this.upload.isUploading = true
+			},
+			//todo  提交上传文件
+			submitFileForm() {
+				this.$refs.upload.submit()
+				this.fullloading = this.$loading({
+					lock: true,
+					text: 'Loading',
+					spinner: 'el-icon-loading',
+					background: 'rgba(0, 0, 0, 0.7)',
+				})
+				//保存数据
+				window.localStorage.setItem('material', new Date())
+			},
+			//todo 文件上传成功处理
+			handleFileSuccess(response, file, fileList) {
+				this.upload.open = false
+				this.upload.isUploading = false
+				this.$refs.upload.clearFiles()
+				this.fullloading.close()
+				if (response.code == 200) {
+					this.$alert(response.data, '导入结果', { dangerouslyUseHTMLString: true })
+				} else {
+					this.$alert(response.msg, '导入结果', {
+						dangerouslyUseHTMLString: true,
+						type: 'error',
+					})
+				}
+				this.upload.time = new Date()
 
-      this.getList()
-    },
-  },
-}
-</script>
+				this.getList()
+			},
+		},
+	}
+</script>
\ No newline at end of file
diff --git a/src/views/wmsManagement/WmOutOrder.vue b/src/views/wmsManagement/WmOutOrder.vue
index 378623e..17e1472 100644
--- a/src/views/wmsManagement/WmOutOrder.vue
+++ b/src/views/wmsManagement/WmOutOrder.vue
@@ -85,7 +85,7 @@
 		<pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
 		<!-- 添加或修改出货单对话框 -->
-		<el-dialog :title="title" :lock-scroll="false" :visible.sync="open">
+		<el-dialog :title="title" :lock-scroll="false" :visible.sync="open" :close-on-click-modal="false">
 			<el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth" size="mini">
 				<!-- 时间信息 -->
 				<el-row :gutter="10">
diff --git a/src/views/wmsManagement/WmpatchSearch.vue b/src/views/wmsManagement/WmpatchSearch.vue
index a934e69..a52ad34 100644
--- a/src/views/wmsManagement/WmpatchSearch.vue
+++ b/src/views/wmsManagement/WmpatchSearch.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="app-container">
 		<el-tabs v-model="activeName" @tab-click="handleClick">
-			<el-tab-pane label="仓库数据总看板" name="1"><TAB1 v-if="activeName === '1'"></TAB1></el-tab-pane>
+			<!-- <el-tab-pane label="仓库数据总看板" name="1"><TAB1 v-if="activeName === '1'"></TAB1></el-tab-pane> -->
 			<el-tab-pane label="入库记录根据批次号" name="2"><TAB2 v-if="activeName === '2'"></TAB2></el-tab-pane>
 			<el-tab-pane label="入库记录根据零件号" name="3"><TAB3 v-if="activeName === '3'"></TAB3></el-tab-pane>
 			<el-tab-pane label="出库记录根据批次号" name="4"><TAB4 v-if="activeName === '4'"></TAB4></el-tab-pane>
diff --git a/src/views/wmsManagement/components/TheBatchOutProductionDialog/TheBatchOutProductionDialog.vue b/src/views/wmsManagement/components/TheBatchOutProductionDialog/TheBatchOutProductionDialog.vue
index 19eff1d..f9244ee 100644
--- a/src/views/wmsManagement/components/TheBatchOutProductionDialog/TheBatchOutProductionDialog.vue
+++ b/src/views/wmsManagement/components/TheBatchOutProductionDialog/TheBatchOutProductionDialog.vue
@@ -197,6 +197,7 @@
 				if (fkOutOrderId === "" || fkOutOrderId === null) {
 					this.$confirm("工单号未填写，是否继续？继续则执行无工单号出库！", "操作提醒").then(() => {
 						this.doSelectOut();
+						this.getList();
 					}).catch(() => {
 						return;
 					})
diff --git a/src/views/wmsManagement/components/TheWmBlankRecord/TheWmBlankRecord.vue b/src/views/wmsManagement/components/TheWmBlankRecord/TheWmBlankRecord.vue
index 8e218d7..c207ddb 100644
--- a/src/views/wmsManagement/components/TheWmBlankRecord/TheWmBlankRecord.vue
+++ b/src/views/wmsManagement/components/TheWmBlankRecord/TheWmBlankRecord.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<el-dialog v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" title="库存记录" width="70%">
+		<el-dialog v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" title="库存记录" width="70%" :close-on-click-modal="false">
 			<el-form ref="elForm" inline :model="queryParams" :rules="rules" size="medium" :label-width="labelWidth">
 				<el-form-item label="类别" prop="type">
 					<el-select v-model="queryParams.type" placeholder="请选择类别">
diff --git a/src/views/wmsManagement/wmpackagelcl.vue b/src/views/wmsManagement/wmpackagelcl.vue
index 9335aeb..f6945db 100644
--- a/src/views/wmsManagement/wmpackagelcl.vue
+++ b/src/views/wmsManagement/wmpackagelcl.vue
@@ -83,7 +83,7 @@
 		<pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
 		<!-- 添加或修改拼箱/拆箱待打标签记录表对话框 -->
-		<el-dialog :title="title" :lock-scroll="false" :visible.sync="open">
+		<el-dialog :title="title" :lock-scroll="false" :visible.sync="open" :close-on-click-modal="false">
 			<el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
 				<el-row :gutter="20">
 					<el-col :lg="12">