diff --git a/src/api/mes/selfMutualInspection.js b/src/api/mes/selfMutualInspection.js
new file mode 100644
index 0000000..dde9852
--- /dev/null
+++ b/src/api/mes/selfMutualInspection.js
@@ -0,0 +1,47 @@
+import request from '@/utils/request'
+
+// 查询自检互检列表
+export function listSelfMutualInspection(query) {
+  return request({
+    url: '/mes/inspectionReport/selfMutualInspectionList',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 查询自检互检上方和下方数据
+export function getSelfMutualInspectionData(query) {
+  return request({
+    url: '/mes/inspectionReport/selfMutualInspectionData',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询组线列表
+export function getLineCodeList(query) {
+  return request({
+    url: '/mes/inspectionReport/getLineCodeList',
+    method: 'get',
+    params: query
+  });
+}
+
+// 查询首检左侧
+export function listFirstInspectionLeft(query) {
+  return request({
+    url: '/mes/inspectionReport/listFirstInspectionLeft',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询首检右侧
+export function listFirstInspectionRight(query) {
+  return request({
+    url: '/mes/inspectionReport/listFirstInspectionRight',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/detailed.js b/src/api/wms/detailed.js
index bfb9f3f..ebd1b1d 100644
--- a/src/api/wms/detailed.js
+++ b/src/api/wms/detailed.js
@@ -49,3 +49,19 @@ export function delDetailed(storageId) {
 		method: 'delete'
 	});
 }
+
+// 查询
+export function BSKlist(data) {
+  return request({
+    url: '/wms/detailed/BSKlist',
+    method: 'post',
+    data: data
+  });
+}
+export function BSK(data) {
+  return request({
+    url: '/wms/detailed/BSK',
+    method: 'post',
+    data: data
+  });
+}
diff --git a/src/views/mes/firstInspection/index.vue b/src/views/mes/firstInspection/index.vue
new file mode 100644
index 0000000..b6d2e9e
--- /dev/null
+++ b/src/views/mes/firstInspection/index.vue
@@ -0,0 +1,576 @@
+<template>
+  <div class="app-container">
+    <div id="table" v-show="showTable">
+      <el-form class="print-selfMutualInspection">
+        <el-row>
+          <el-col :span="5">
+            <img src="@/assets/logo/lanjv.png" class="lanju-logo" />
+          </el-col>
+          <el-col class="tittle-text" :span="14">
+            <span>中山榄菊日化实业有限公司</span>
+          </el-col>
+          <el-col :span="5"> </el-col>
+        </el-row>
+        <el-row>
+          <el-col class="tittle-text">
+            <span>产品首检记录表</span>
+          </el-col>
+        </el-row>
+        <br>
+        <el-row>
+          <el-col :span="9">
+            <div>生产车间:黑蚊香车间</div>
+            <br />
+          </el-col>
+          <el-col :span="9">
+            <div>产品名称: {{ headerParameters.productName }}</div>
+            <br />
+          </el-col>
+          <el-col :span="6">
+            <div>检查人: {{ headerParameters.checkPeople }}</div>
+            <br />
+          </el-col>
+          <el-col :span="9">
+            <div>
+              生产产线:
+              <el-select
+                v-model="headerParameters.lineCode"
+                filterable
+                placeholder="请选择产线"
+                style="width: 160px"
+              >
+                <el-option
+                  v-for="item in lineCodeOption"
+                  :key="item.equipmentCode"
+                  :label="item.equipmentName"
+                  :value="item.equipmentCode"
+                >
+                </el-option>
+              </el-select>
+            </div>
+            <br />
+          </el-col>
+          <el-col :span="9">
+            <div>
+              检查日期:
+              <el-date-picker
+                clearable
+                v-model="headerParameters.checkDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择检查日期"
+              >
+              </el-date-picker>
+            </div>
+          </el-col>
+          <el-col :span="6">
+            <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-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handlePrintPre"
+              >打印
+            </el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <el-row>
+        <el-col :span="12">
+          <table class="bordered-table">
+            <tr>
+            <th v-for="item in leftTableTittle0" style="width:200px" :key="item.key">
+              {{ item.label }}
+            </th>
+            <!-- 动态渲染列名 -->
+            <th v-for="item in leftTableTittle" :key="item.key" :width = leftTableTittleWidth >
+              {{ item.label }}
+            </th>
+          </tr>
+
+            <tr>
+              <!-- 动态渲染列名 -->
+              <th v-for="(index, key) in leftTableData[0]" :key="key">
+                {{ key }}
+              </th>
+            </tr>
+            <tr v-for="item in leftTableData" :key="item.id">
+              <!-- 动态渲染列值 -->
+              <td v-for="(value, key) in item" :key="key">{{ value }}</td>
+            </tr>
+            <tr>
+              <td colspan = "1">异常处理</td>
+              <td :colspan = leftPropertyNum>{{ headerParameters.bz }}</td>
+            </tr>
+          </table>
+          <div>
+            备注:{{ headerParameters.remark }}
+          </div>
+        </el-col>
+
+        <el-col :span="12">
+          <table class="bordered-table">
+            <tr>
+            <th v-for="item in rightTableTittle0" style="width:200px" :key="item.key">
+              {{ item.label }}
+            </th>
+            <!-- 动态渲染列名 -->
+            <th v-for="item in rightTableTittle" :key="item.key" :width = rightTableTittleWidth >
+              {{ item.label }}
+            </th>
+          </tr>
+
+            <tr>
+              <!-- 动态渲染列名 -->
+              <th v-for="(index, key) in rightTableData[0]" :key="key">
+                {{ key }}
+              </th>
+            </tr>
+            <tr v-for="item in rightTableData" :key="item.id">
+              <!-- 动态渲染列值 -->
+              <td v-for="(value, key) in item" :key="key">{{ value }}</td>
+            </tr>
+            <tr>
+              <td colspan = "1">异常处理</td>
+              <td :colspan = rightPropertyNum>{{ headerParameters.bz }}</td>
+            </tr>
+          </table>
+          <div>
+            备注:{{ headerParameters.remark }}
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+
+    <div id="printPage" v-show="showPrintPage">
+      <br />
+      <br />
+      <br />
+      <el-row>
+        <el-col :span="5">
+          <img src="@/assets/logo/lanjv.png" class="lanju-logo-print" />
+        </el-col>
+        <el-col class="tittle-text-print" :span="14">
+          <span>中山榄菊日化实业有限公司</span>
+        </el-col>
+        <el-col :span="5"> </el-col>
+      </el-row>
+      <el-row>
+        <el-col class="tittle-text-print">
+          <span>产品首检记录表</span>
+        </el-col>
+      </el-row>
+      <br>
+      <br>
+      <br>
+      <el-row>
+        <el-col :span="11">
+          <div class="text-print">生产车间:黑蚊香车间</div>
+          <br />
+        </el-col>
+        <el-col :span="8">
+          <div class="text-print" >生产产线: {{ headerParameters.lineCode }}</div>
+          <br />
+        </el-col>
+        <el-col :span="5">
+          <div class="text-print">检查人: {{ headerParameters.checkPeople }}</div>
+          <br />
+        </el-col>
+        <el-col :span="19">
+          <div class="text-print">产品名称: {{ headerParameters.productName }}</div>
+          <br />
+        </el-col>
+        <el-col :span="5">
+          <div class="text-print">检查日期: {{ headerParameters.checkDate }}</div>
+          <br />
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <table class="bordered-table-print" border="1">
+            <tr>
+            <th v-for="item in leftTableTittle0" style="width:200px" :key="item.key">
+              {{ item.label }}
+            </th>
+            <!-- 动态渲染列名 -->
+            <th v-for="item in leftTableTittle" :key="item.key" :width = leftPrintTittleWidth >
+              {{ item.label }}
+            </th>
+          </tr>
+
+            <tr>
+              <th v-for="(index, key) in leftTableData[0]" :key="key">
+                {{ key }}
+              </th>
+            </tr>
+            <tr v-for="item in leftTableData" :key="item.id">
+              <td v-for="(value, key) in item" :key="key">{{ value }}</td>
+            </tr>
+            <tr>
+              <td colspan = "1">异常处理</td>
+              <td :colspan = leftPropertyNum>{{ headerParameters.bz }}</td>
+            </tr>
+          </table>
+          <div>
+            备注:{{ headerParameters.remark }}
+          </div>
+        </el-col>
+
+        <el-col :span="12">
+          <table class="bordered-table-print" border="1">
+            <tr>
+            <th v-for="item in rightTableTittle0" style="width:200px" :key="item.key">
+              {{ item.label }}
+            </th>
+            <!-- 动态渲染列名 -->
+            <th v-for="item in rightTableTittle" :key="item.key" :width = rightPrintTittleWidth >
+              {{ item.label }}
+            </th>
+          </tr>
+
+            <tr>
+              <th v-for="(index, key) in rightTableData[0]" :key="key">
+                {{ key }}
+              </th>
+            </tr>
+            <tr v-for="item in rightTableData" :key="item.id">
+              <td v-for="(value, key) in item" :key="key">{{ value }}</td>
+            </tr>
+            <tr>
+              <td colspan = "1">异常处理</td>
+              <td :colspan = rightPropertyNum>{{ headerParameters.bz }}</td>
+            </tr>
+          </table>
+          <div>
+            备注:{{ headerParameters.remark }}
+          </div>
+        </el-col>
+      </el-row>
+
+    </div>
+
+    <!-- <el-table :data="tableData">
+      <el-table-column
+        v-for="(value, key) in tableData"
+        :key="key"
+        :prop="value"
+        :label="value"
+      >
+      </el-table-column>
+    </el-table>
+  --></div>
+</template>
+
+<script>
+import {
+  listFirstInspectionLeft,
+  listFirstInspectionRight,
+  getSelfMutualInspectionData,
+  getLineCodeList,
+} from "@/api/mes/selfMutualInspection";
+
+export default {
+  name: "Item",
+  dicts: ["device_item_type", "device_loop_type"],
+  data() {
+    return {
+      printData: {
+        printable: "printPage",
+        ignore: ["no-print"],
+      },
+      lineCodeOption: [],
+      leftPropertyNum: null,
+      leftTableData: [],
+      leftTableTittle0: [],
+      leftTableTittle: [],
+      rightPropertyNum: null,
+      rightTableData: [],
+      rightTableTittle: [],
+      rightTableTittle0: [],
+      leftTableTittleWidth: null,
+      rightTableTittleWidth: null,
+      leftPrintTittleWidth: null,
+      rightPrintTittleWidth: null,
+      showPrintPage: false,
+      showTable: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {},
+      //表头参数
+      headerParameters: {
+        productionWorkshop: null, //生产车间
+        reportName: 'ConversionReportRight', //表类型
+        lineCode: null, //生产产线编码
+        checkPeople: null, //检查人
+        productName: null, //产品名称
+        checkDate: null, //检查日期
+        bz: null, //异常处理
+        remark: null, //备注
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    // this.getDate();
+    this.getLineCode();
+    this.getList();
+  },
+  methods: {
+    //预处理
+    handlePrintPre() {
+      this.showTable = false;//页面上的表格不显示
+      this.showPrintPage = true;//打印的表格显示
+      this.$nextTick(() => {
+        this.handlePrint()
+      })
+    },
+
+    //真正打印
+    handlePrint() {
+      printJS({
+        printable: this.printData.printable, // 'printPage', // 标签元素id
+        type: this.printData.type || "html",
+        maxWidth: 1500, // 最大宽度
+        font_size: "", // 设置字体大小
+        header: this.printData.header, // '表单',
+        targetStyles: ["*"],
+        style: "@page {margin:0 10mm};", // 可选-打印时去掉眉页眉尾
+        ignoreElements: this.printData.ignore || [], // ['no-print']
+        properties: this.printData.properties || null,
+      });
+      this.showTable = true;//页面上的表格显示
+      this.showPrintPage = false;//打印的表格不显示
+    },
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {};
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      if (this.headerParameters.lineCode == null) {
+        this.$modal.msg("您没有选择生产产线，请选择！");
+      } else if (this.headerParameters.checkDate == null) {
+        this.$modal.msg("您没有选择检查时间，请选择！");
+      } else {
+        this.getList();
+      }
+    },
+
+    getLineCode() {
+      getLineCodeList().then((response) => {
+        this.lineCodeOption = response;
+      });
+    },
+
+    /**获取默认查询时间段**/
+    // getDate() {
+    // 	let start = this.Fungetdate (0)
+    // 	this.headerParameters.checkDate = start;
+    // },
+    // Fungetdate (num) {
+    // 	var dd = new Date();
+    // 	dd.setDate(dd.getDate() + num);
+    // 	var y = dd.getFullYear();
+    // 	var m = dd.getMonth() + 1;//获取当前月份的日期
+    // 	var d = dd.getDate();
+    // 	return y + "-" + m +"-"+d;
+    // },
+
+    /** 重置按钮操作 */
+    resetQuery() {
+      (this.headerParameters.productionWorkshop = null), //生产车间
+        (this.headerParameters.lineCode = null), //生产产线
+        (this.headerParameters.checkPeople = null), //检查人
+        (this.headerParameters.productName = null), //产品名称
+        (this.headerParameters.checkDate = null), //检查日期
+        (this.headerParameters.bz = null), //异常处理
+        (this.headerParameters.remark = null), //备注
+        // this.getDate();
+        this.getList();
+    },
+
+    /** 查询检查项维护列表 */
+    getList() {
+      this.showTable = true;//页面上的表格显示
+      this.showPrintPage = false;//打印的表格不显示
+      this.leftTableData = [];
+      this.leftTableTittle = [];
+      this.leftTableTittle0 = [];
+      getSelfMutualInspectionData(this.headerParameters).then((response) => {
+        this.headerParameters.checkPeople = response.createBy; //检查人
+        this.headerParameters.productName = response.productName; //产品名称
+        this.headerParameters.remark = response.remark; //备注
+        this.headerParameters.bz = response.bz; //异常处理
+        //this.headerParameters.checkDate = response.checkDate 检查日期
+        //生产产线
+      });
+
+      listFirstInspectionLeft(this.headerParameters).then((response) => {
+        this.leftTableData = response;
+        this.leftPropertyNum = Object.keys(this.leftTableData[0]).length - 1; //属性个数
+        console.log('leftPropertyNum',this.leftPropertyNum);
+        this.leftTableTittleWidth = (440 / (this.leftPropertyNum)) + 'px';
+        this.leftPrintTittleWidth = (400 / (this.leftPropertyNum)) + 'px';
+
+        this.leftTableTittle0.push({
+          label: "项目",
+          key: 0,
+        });
+
+        for (let i = 0; i < this.leftPropertyNum; i++) {
+          this.leftTableTittle.push({
+            label: "检查时间",
+            key: i + 1,
+          });
+        }
+      });
+
+      this.rightTableData = [];
+      this.rightTableTittle = [];
+      this.rightTableTittle0 = [];
+
+      listFirstInspectionRight(this.headerParameters).then((response) => {
+        this.rightTableData = response;
+        this.rightPropertyNum = Object.keys(this.rightTableData[0]).length - 1; //属性个数
+        this.rightTableTittleWidth = (440 / (this.rightPropertyNum)) + 'px';
+        this.rightPrintTittleWidth = (400 / (this.leftPropertyNum)) + 'px';
+
+        this.rightTableTittle0.push({
+          label: "项目",
+          key: 0,
+        });
+
+        for (let i = 0; i < this.rightPropertyNum; i++) {
+          this.rightTableTittle.push({
+            label: "检查时间",
+            key: i + 1,
+          });
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style scoped>
+.tittle-text {
+  text-align: center;
+  font-size: 30px;
+  font-weight: 800;
+  color: black;
+}
+.lanju-logo {
+  margin-top: 15px;
+  margin-left: 15px;
+  height: 50px;
+}
+
+.bordered-table {
+  border-collapse: collapse; /* 确保边框合并为单一边框 */
+  width: 640px; /* 表格宽度 */
+}
+.bordered-table th,
+.bordered-table td {
+  border: 1px solid #ddd; /* 边框样式 */
+  padding: 8px; /* 单元格内边距 */
+  text-align: center; /* 文本对齐 */
+}
+.bordered-table-bottom {
+  border-collapse: collapse; /* 确保边框合并为单一边框 */
+  width: 640px; /* 表格宽度 */
+}
+.bordered-table-bottom td {
+  border: 1px solid #ddd; /* 边框样式 */
+  text-align: left; /* 文本对齐 */
+  width: 640px; /* 表格宽度 */
+  height: 35px; /* 表格高度 */
+}
+
+.bordered-table tr {
+  word-break:break-all;
+  word-wrap:break-word;
+  font-size: 12px;
+  border-collapse:collapse 
+}
+
+/* 下面是和打印有关系的 */
+.tittle-text-print {
+  text-align: center;
+  font-size: 50px;
+  font-weight: 800;
+  color: black;
+}
+.lanju-logo-print {
+  margin-top: 15px;
+  margin-left: 15px;
+  height: 75px;
+}
+
+.text-print {
+  text-align: left;
+  font-size: 20px;
+  color: black;
+}
+
+.bordered-table-print {
+  border-collapse: collapse; /* 确保边框合并为单一边框 */
+  width: 600px; /* 表格宽度 */
+}
+.bordered-table-print td {
+  text-align: center; /* 文本对齐 */
+}
+
+.bordered-table-bottom-print {
+  border-collapse: collapse; /* 确保边框合并为单一边框 */
+  width: 600px; /* 表格宽度 */
+}
+.bordered-table-bottom-print td{
+  text-align: left; /* 文本对齐 */
+  height: 35px; /* 表格宽度 */
+  width: 600px; /* 表格高度 */
+}
+
+.bordered-table-print tr {
+  word-break:break-all;
+  word-wrap:break-word;
+  font-size: 12px;
+  height: 35px; /* 表格高度 */
+  border-collapse:collapse
+}
+</style>
diff --git a/src/views/mes/selfMutualInspection/index.vue b/src/views/mes/selfMutualInspection/index.vue
new file mode 100644
index 0000000..0b8fc0f
--- /dev/null
+++ b/src/views/mes/selfMutualInspection/index.vue
@@ -0,0 +1,512 @@
+<template>
+  <div class="app-container">
+    <div id="table" v-show="showTable">
+      <el-form class="print-selfMutualInspection">
+        <el-row>
+          <el-col :span="5">
+            <img src="@/assets/logo/lanjv.png" class="lanju-logo" />
+          </el-col>
+          <el-col class="tittle-text" :span="14">
+            <span>中山榄菊日化实业有限公司</span>
+          </el-col>
+          <el-col :span="5"> </el-col>
+        </el-row>
+        <el-row>
+          <el-col class="tittle-text">
+            <span>自检互检记录表</span>
+          </el-col>
+        </el-row>
+        <br>
+        <el-row>
+          <el-col :span="10">
+            <div>生产车间:黑蚊香车间</div>
+            <br />
+          </el-col>
+          <el-col :span="9">
+            <div>产品名称: {{ headerParameters.productName }}</div>
+            <br />
+          </el-col>
+          <el-col :span="5">
+            <div>检查人: {{ headerParameters.checkPeople }}</div>
+            <br />
+          </el-col>
+          <el-col :span="10">
+            <div>
+              生产产线:
+              <el-select
+                v-model="headerParameters.lineCode"
+                filterable
+                placeholder="请选择产线"
+                style="width: 160px"
+              >
+                <el-option
+                  v-for="item in lineCodeOption"
+                  :key="item.equipmentCode"
+                  :label="item.equipmentName"
+                  :value="item.equipmentCode"
+                >
+                </el-option>
+              </el-select>
+            </div>
+            <br />
+          </el-col>
+          <el-col :span="9">
+            <div>
+              检查日期:
+              <el-date-picker
+                clearable
+                v-model="headerParameters.checkDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择检查日期"
+              >
+              </el-date-picker>
+            </div>
+          </el-col>
+          <el-col :span="5">
+            <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-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handlePrintPre"
+              >打印
+            </el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div>
+        <table class="bordered-table">
+          <tr>
+            <th v-for="item in tableTittle0" style="width:300px" :key="item.key">
+              {{ item.label }}
+            </th>
+            <!-- 动态渲染列名 -->
+            <th v-for="item in tableTittle" :key="item.key" :width = tableTittleWidth >
+              {{ item.label }}
+            </th>
+          </tr>
+
+          <tr>
+            <!-- 动态渲染列名 -->
+            <th v-for="(index, key) in tableData[0]" :key="key">{{ key }}</th>
+          </tr>
+
+          <tr v-for="item in tableData" :key="item.id">
+            <!-- 动态渲染列值 -->
+            <td columnspan="1" v-for="(value, key) in item" :key="key">
+              {{ value }}
+            </td>
+          </tr>
+
+          <tr>
+            <td colspan = "1">异常处理</td>
+            <td :colspan = propertyNum>{{ headerParameters.bz }}</td>
+          </tr>
+            <!-- <tr>
+              <td colspan = "1">备注</td>
+              <td :colspan = propertyNum>{{ headerParameters.remark }}</td>
+            </tr> -->
+        </table>
+      </div>
+      <br />
+      <div>
+        备注:{{ headerParameters.remark }}
+      </div>
+    </div>
+
+    <div id="printPage" v-show="showPrintPage">
+      <br />
+      <br />
+      <br />
+      <el-row>
+        <el-col :span="5">
+          <img src="@/assets/logo/lanjv.png" class="lanju-logo-print" />
+        </el-col>
+        <el-col class="tittle-text-print" :span="14">
+          <span>中山榄菊日化实业有限公司</span>
+        </el-col>
+        <el-col :span="5"> </el-col>
+      </el-row>
+      <el-row>
+        <el-col class="tittle-text-print">
+          <span>自检互检记录表</span>
+        </el-col>
+      </el-row>
+      <br />
+      <br />
+      <br />
+      <el-row>
+        <el-col :span="11">
+          <div class="text-print">生产车间:黑蚊香车间</div>
+          <br />
+        </el-col>
+        <el-col :span="9">
+          <div class="text-print">
+            生产产线: {{ headerParameters.lineCode }}
+          </div>
+          <br />
+        </el-col>
+        <el-col :span="4">
+          <div class="text-print">
+            检查人: {{ headerParameters.checkPeople }}
+          </div>
+          <br />
+        </el-col>
+        <el-col :span="20">
+          <div class="text-print">
+            产品名称: {{ headerParameters.productName }}
+          </div>
+          <br />
+        </el-col>
+        <el-col :span="4">
+          <div class="text-print">
+            检查日期: {{ headerParameters.checkDate }}
+          </div>
+          <br />
+        </el-col>
+      </el-row>
+      <row>
+        <el-col :span="24">
+          <table class="bordered-table-print" border="1">
+            <tr>
+            <th v-for="item in tableTittle0" style="width:300px" :key="item.key">
+              {{ item.label }}
+            </th>
+            <!-- 动态渲染列名 -->
+            <th v-for="item in tableTittle" :key="item.key" :width = tableTittleWidth >
+              {{ item.label }}
+            </th>
+          </tr>
+
+            <tr>
+              <th v-for="(index, key) in tableData[0]" :key="key">
+                {{ key }}
+              </th>
+            </tr>
+
+            <tr v-for="item in tableData" :key="item.id">
+              <td v-for="(value, key) in item" :key="key">{{ value }}</td>
+            </tr>
+
+            <tr>
+              <td colspan = "1">异常处理</td>
+              <td :colspan = propertyNum>{{ headerParameters.bz }}</td>
+            </tr>
+            <!-- <tr>
+              <td colspan = "1">备注</td>
+              <td :colspan = propertyNum>{{ headerParameters.remark }}</td>
+            </tr> -->
+          </table>
+        </el-col>
+      </row>
+      <div class="bottom-remark">
+        备注:{{ headerParameters.remark }}
+      </div>
+    </div>
+
+    <!-- <el-table :data="tableData">
+      <el-table-column
+        v-for="(value, key) in tableData"
+        :key="key"
+        :prop="value"
+        :label="value"
+      >
+      </el-table-column>
+    </el-table> -->
+  </div>
+</template>
+
+<script>
+import {
+  listSelfMutualInspection,
+  getSelfMutualInspectionData,
+  getLineCodeList,
+} from "@/api/mes/selfMutualInspection";
+
+export default {
+  name: "Item",
+  dicts: ["device_item_type", "device_loop_type"],
+  data() {
+    return {
+      printData: {
+        printable: "printPage",
+        ignore: ["no-print"],
+      },
+      showPrintPage: false,
+      showTable: false,
+      lineCodeOption: [],
+      propertyNum: null,
+      tableTittle0: [],
+      tableTittle: [],
+      tableTittleWidth: null,
+      tableData: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {},
+      //表头参数
+      headerParameters: {
+        reportName: "ConversionReport", //表类型
+        productionWorkshop: null, //生产车间
+        lineCode: null, //生产产线编码
+        checkPeople: null, //检查人
+        productName: null, //产品名称
+        checkDate: null, //检查日期
+        bz: null, //异常处理
+        remark: null, //备注
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    // this.getDate();
+    this.getLineCode();
+    this.getList();
+  },
+  methods: {
+    dynamicWidthStyle(){
+      return { width: `${1000 / this.propertyNum }px`}
+    },
+
+    //预处理
+    handlePrintPre() {
+      this.showTable = false; //页面上的表格不显示
+      this.showPrintPage = true; //打印的表格显示
+      this.$nextTick(() => {
+        this.handlePrint();
+      });
+    },
+
+    //真正打印
+    handlePrint() {
+      printJS({
+        printable: this.printData.printable, // 'printPage', // 标签元素id
+        type: this.printData.type || "html",
+        maxWidth: 1500, // 最大宽度
+        font_size: "", // 设置字体大小
+        header: this.printData.header, // '表单',
+        targetStyles: ["*"],
+        style: "@page {margin:0 10mm};", // 可选-打印时去掉眉页眉尾
+        ignoreElements: this.printData.ignore || [], // ['no-print']
+        properties: this.printData.properties || null,
+      });
+      this.showTable = true; //页面上的表格显示
+      this.showPrintPage = false; //打印的表格不显示
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {};
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      if (this.headerParameters.lineCode == null) {
+        this.$modal.msg("您没有选择生产产线，请选择！");
+      } else if (this.headerParameters.checkDate == null) {
+        this.$modal.msg("您没有选择检查时间，请选择！");
+      } else {
+        this.getList();
+      }
+    },
+
+    getLineCode() {
+      getLineCodeList().then((response) => {
+        this.lineCodeOption = response;
+      });
+    },
+
+    /**获取默认查询时间段**/
+    // getDate() {
+    // 	let start = this.Fungetdate (0)
+    // 	this.headerParameters.checkDate = start;
+    // },
+    // Fungetdate (num) {
+    // 	var dd = new Date();
+    // 	dd.setDate(dd.getDate() + num);
+    // 	var y = dd.getFullYear();
+    // 	var m = dd.getMonth() + 1;//获取当前月份的日期
+    // 	var d = dd.getDate();
+    // 	return y + "-" + m +"-"+d;
+    // },
+
+    /** 重置按钮操作 */
+    resetQuery() {
+      (this.headerParameters.productionWorkshop = null), //生产车间
+        (this.headerParameters.lineCode = null), //生产产线
+        (this.headerParameters.checkPeople = null), //检查人
+        (this.headerParameters.productName = null), //产品名称
+        (this.headerParameters.checkDate = null), //检查日期
+        (this.headerParameters.bz = null), //异常处理
+        (this.headerParameters.remark = null), //备注
+        // this.getDate();
+        this.getList();
+    },
+
+    /** 查询检查项维护列表 */
+    getList() {
+      this.showTable = true;//页面上的表格显示
+      this.showPrintPage = false;//打印的表格不显示
+      this.tableData = [];
+      this.tableTittle = [];
+      this.tableTittle0 = [];
+      this.propertyNum = null;
+      this.loading = true;
+      getSelfMutualInspectionData(this.headerParameters).then((response) => {
+        this.headerParameters.checkPeople = response.createBy; //检查人
+        this.headerParameters.productName = response.productName; //产品名称
+        this.headerParameters.remark = response.remark; //备注
+        this.headerParameters.bz = response.bz; //异常处理
+        //this.headerParameters.checkDate = response.checkDate 检查日期
+        //生产产线
+      });
+      listSelfMutualInspection(this.headerParameters).then((response) => {
+        this.tableData = response;
+        console.log("this.tableData", this.tableData);
+        this.propertyNum = Object.keys(this.tableData[0]).length - 1; //属性个数
+        this.tableTittle0.push({
+          label: "项目",
+          key: 0,
+        });
+        for (let i = 0; i < this.propertyNum; i++) {
+          this.tableTittle.push({
+            label: "检查时间",
+            key: i + 1,
+          });
+        }
+
+        this.tableTittleWidth = (1000 / (this.propertyNum)) + 'px';
+      });
+    },
+  },
+};
+</script>
+
+<style scoped>
+.tittle-text {
+  text-align: center;
+  font-size: 25px;
+  font-weight: 800;
+  color: black;
+}
+
+.lanju-logo {
+  margin-top: 15px;
+  margin-left: 15px;
+  height: 50px;
+}
+
+.bordered-table {
+  border-collapse: collapse; /* 确保边框合并为单一边框 */
+  width: 1300px; /* 表格宽度 */
+}
+
+.bordered-table th,
+
+.bordered-table td {
+  border: 1px solid #ddd; /* 边框样式 */
+  padding: 8px; /* 单元格内边距 */
+  text-align: center; /* 文本对齐 */
+}
+
+.bordered-table tr {
+  word-break:break-all;
+  word-wrap:break-word;
+  border-collapse:collapse
+}
+
+.bordered-table-bottom {
+  border-collapse: collapse; /* 确保边框合并为单一边框 */
+  width: 1300px; /* 表格宽度 */
+}
+
+.bordered-table-bottom td {
+  border: 1px solid #ddd; /* 边框样式 */
+  text-align: left; /* 文本对齐 */
+  width: 1300px; /* 表格宽度 */
+}
+
+/* 下面是和打印有关系的 */
+.tittle-text-print {
+  text-align: center;
+  font-size: 40px;
+  font-weight: 800;
+  color: black;
+}
+
+.lanju-logo-print {
+  margin-top: 15px;
+  margin-left: 15px;
+  height: 75px;
+}
+
+.text-print {
+  text-align: left;
+  font-size: 20px;
+  color: black;
+}
+
+.bordered-table-print {
+  border-collapse: collapse; /* 确保边框合并为单一边框 */
+  width: 1300px; /* 表格宽度 */
+}
+
+.bordered-table-print td {
+  text-align: center; /* 文本对齐 */
+  height: 30px; /* 表格高度 */
+}
+
+.bordered-table-bottom-print {
+  border-collapse: collapse; /* 确保边框合并为单一边框 */
+  width: 1300px; /* 表格宽度 */
+}
+
+.bordered-table-bottom-print td {
+  text-align: left; /* 文本对齐 */
+  height: 35px; /* 表格宽度 */
+  width: 1300px; /* 表格高度 */
+}
+
+.bottom-remark {
+  margin-top: 15px;
+}
+
+.bordered-table-print tr {
+  word-break:break-all;
+  word-wrap:break-word;
+  border-collapse:collapse
+}
+</style>
\ No newline at end of file
diff --git a/src/views/wms/linsDY/index.vue b/src/views/wms/linsDY/index.vue
new file mode 100644
index 0000000..22c3e93
--- /dev/null
+++ b/src/views/wms/linsDY/index.vue
@@ -0,0 +1,1317 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item>
+        <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"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['mes:pro:workorder:add']"
+        >上传SAP生产</el-button>
+      </el-col>-->
+
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-printer"
+          size="mini"
+          :disabled="single"
+          @click="printIdCard"
+          v-hasPermi="['mes:pro:workorder:edit']"
+        >打印标识卡
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="workorderList" @selection-change="handleSelectionChange"
+      row-key="workorderCode"
+      lazy
+      :load="treeLoad"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+    >
+      <el-table-column type="selection" align="center" />
+      <el-table-column label="工单ID" align="center" prop="storageId" v-if="false"/>
+      <el-table-column width="130" label="产品编码" align="center" prop="productCode" />
+      <el-table-column width="300" label="产品名称" align="center" prop="productName" :show-overflow-tooltip="true"/>
+      <el-table-column width="130" label="批次" align="center" prop="batchNumber"/>
+      <el-table-column width="120" label="数量" align="center" prop="amount"/>
+<!--      <el-table-column width="50" label="单位" align="center" prop="unit"/>-->
+      <el-table-column width="130" label="库区" align="center" prop="waCode"/>
+      <el-table-column width="120" label="生产日期" align="center" prop="userDefined4">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.userDefined4, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column width="120" label="每托数量" align="center" prop="userDefined2"/>
+      <el-table-column width="120" label="版次" align="center" prop="userDefined3"/>
+    </el-table>
+
+    <!-- 打印预览弹出层 -->
+    <el-dialog
+      title="工单信息"
+      :visible.sync="printDialogVisible"
+      width="1000px"
+    >
+      <div id="printFrom" class="my-print-box">
+
+        <el-form :ref="formRef" :model="form" :rules="validateRules">
+
+          <!-- 表头-工单信息 -->
+          <el-row class="my-print-head">
+            <el-col :offset="10" :span="4">生产工单</el-col>
+          </el-row>
+          <!-- 导航栏 -->
+          <el-row class="my-print-nav">
+            <el-col :span="4">工厂:{{ printData.factory }}</el-col>
+            <el-col :span="4">工作中心:{{ printData.workCenter }}</el-col>
+            <el-col :span="4">生产日期:{{ printData.productDate }}</el-col>
+            <el-col :span="4">打印日期:{{ printData.printDate }}</el-col>
+            <el-col :span="4">页次: 1/ 1</el-col>
+          </el-row>
+          <!-- 主数据 -->
+          <el-table
+            v-if="refreshNewWorkerTable"
+            v-loading="newWorkerLoading"
+            class="my-print-table"
+            :data="printData.workTable"
+            border
+            style="width: 100%">
+            <el-table-column
+              type="index"
+              label="序号"
+              width="50">
+            </el-table-column>
+            <el-table-column
+              prop="workorderCode"
+              label="生产工单"
+              width="130">
+            </el-table-column>
+            <el-table-column
+              prop="workorderCodeSap"
+              width="100" :formatter="orderCodeFormate"
+              label="生产订单">
+            </el-table-column>
+            <el-table-column
+              prop="productName"
+              label="物料名称"
+              width="180">
+            </el-table-column>
+            <el-table-column
+              prop="unit" width="50"
+              label="单位">
+            </el-table-column>
+            <!--
+            <el-table-column
+              prop="quantityProduced" width="80"
+              label="已生产数量">
+            </el-table-column>-->
+            <el-table-column
+              prop="quantitySplit" width="80"
+              label="拆分数量">
+            </el-table-column>
+            <el-table-column
+              prop="routeCode" width="90"
+              label="工艺编码">
+            </el-table-column>
+            <el-table-column
+              prop="prodLineCode" width="100"
+              label="产线设备">
+            </el-table-column>
+            <el-table-column label="班次" align="center" prop="shiftId" :formatter="shiftFormat" width="40">
+            </el-table-column>
+            <el-table-column label="工单状态" align="center" prop="status" width="50">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.workorder_type" :value="scope.row.status"/>
+              </template>
+            </el-table-column>
+            <!--
+            <el-table-column label="产品类型" align="center" prop="prodType">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.product_type" :value="scope.row.prodType"/>
+              </template>
+            </el-table-column>-->
+          </el-table>
+
+          <br/>
+          <!-- 底部 -->
+          <el-row class="my-print-foot">
+            <el-col :offset="1" :span="3">SAP-No:{{ printData.SAPNo }}</el-col>
+            <el-col :offset="1" :span="3">Z-PM-F-030-A.1</el-col>
+          </el-row>
+          <el-row class="my-print-foot">
+            <el-col :offset="1" :span="3">制单人:{{ printData.manufacture }}</el-col>
+            <el-col :offset="1" :span="3">审核人：{{ printData.auditor }}</el-col>
+          </el-row>
+
+        </el-form>
+
+
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handlePrint(printData)">打 印</el-button>
+      </span>
+    </el-dialog>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改生产工单对话框 -->
+    <!-- 工单修改模块 -->
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <!-- 拆分头pro -->
+      <el-table
+        border
+        v-if="refreshProTable"
+        v-loading="proLoading"
+        :data="productData"
+        row-key="orderCode"
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      >
+        <el-table-column width="60" align="center" label="序号" type="index"></el-table-column>
+        <el-table-column width="150" label="订单编号" prop="orderCode"/>
+        <el-table-column width="380" label="产品名称" align="center" prop="prodDesc"/>
+        <el-table-column width="60" label="单位" align="center" prop="unit"/>
+        <el-table-column width="130" label="产品数量" align="center" prop="quantity"/>
+        <el-table-column label="已拆分数量" align="center" prop="quantitySplit"/>
+        <el-table-column label="拆分数量" align="center" prop="atrr1"/>
+        <el-table-column label="生产版本" align="center" prop="atrr2"/>
+      </el-table>
+      <el-form class="my-margin" :model="splitForm" ref="dynamicForm" label-width="80px">
+        <!-- 编辑框 -->
+        <!-- 第一行 -->
+        <el-row>
+          <el-col :span="7">
+            <!-- 选择工艺 -->
+            <el-form-item size="small" label="选择工艺:" class="my-select my-first">
+              <el-select @change="routeChange" v-model="splitForm.routeCode" placeholder="请选择工艺">
+                <el-option v-for="item in routes" :key="item.routeCode" :label="item.routeName"
+                           :value="item.routeCode"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :offset="1" :span="7">
+            <!-- 工单日期 -->
+            <el-form-item size="small" label="工单日期: ">
+              <el-date-picker @change="checkDate" v-model="splitForm.productDate" type="date" placeholder="选择日期"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :offset="1" :span="7">
+            <!-- 选择班次 -->
+            <el-form-item size="small" label="选择班次:" class="my-select my-first">
+              <el-select @change="shiftChange" v-model="splitForm.shiftId" placeholder="请选择班次" clearable>
+                <el-option v-for="item in workShift" :key="item.shiftId" :label="item.shiftDesc"
+                           :value="item.shiftId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- 第二行 -->
+        <el-row>
+          <div v-if="splitForm.prodType == 'white'">
+            <el-col :span="7">
+              <!-- 选择物料 -->
+              <el-form-item size="small" label="投料名称:">
+                <el-input @focus="selectBPMateriel" readonly v-model="splitForm.materialName" placeholder="点击选择物料"/>
+              </el-form-item>
+              <el-form-item size="small" label="投料编码:">
+                <el-input readonly v-model="splitForm.materialCode" placeholder="点击选择物料" disabled/>
+              </el-form-item>
+            </el-col>
+            <el-col :offset="1" :span="7">
+              <!-- 拆分数量 -->
+              <el-form-item size="small" label="拆分数量:">
+                <el-input required type="number" @input="splitNumChange" v-model="splitForm.splitNum"></el-input>
+              </el-form-item>
+            </el-col>
+          </div>
+          <div v-else>
+            <el-col :span="7">
+              <!-- 拆分数量 -->
+              <el-form-item size="small" label="拆分数量:">
+                <el-input required type="number" @input="splitNumChange" v-model="splitForm.splitNum"></el-input>
+              </el-form-item>
+            </el-col>
+          </div>
+          <el-col :offset="1" :span="7">
+            <!-- 车数 -->
+            <el-form-item v-if="checkType" size="small" label="分配车数:">
+              <el-input disabled type="number" @input="changeCarNum" v-model="splitForm.carNum"></el-input>
+            </el-form-item>
+
+            <el-form-item v-else label="工单排序(插单<=0)" label-width="130px">
+              <el-input type="number" v-model="splitForm.sortNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="7">
+            <el-form-item label="选择设备:">
+             <div style="height: 130px;overflow-y: auto;">
+              <el-cascader
+                :options="eRouteOptions"
+                :props="eRouteProps"
+                v-model="splitForm.prodLineCodeArray"
+                clearable></el-cascader>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- 第三行 -->
+        <el-row v-for="(item, index) in formFields" :key="index">
+          <!-- 批次编号 -->
+          <el-col :span="7">
+            <el-form-item size="small" label="批次编号">
+              <el-input @blur="batchCodeChange" v-model="item.batchCode"></el-input>
+            </el-form-item>
+          </el-col>
+          <!-- 批次数量 -->
+          <el-col :offset="1" :span="7">
+            <el-form-item size="small" label="批次数量">
+              <el-input required @input="inBatch" type="number" v-model="item.batchQuantity"></el-input>
+            </el-form-item>
+          </el-col>
+          <!-- 操作 -->
+          <el-col :offset="1" :span="4">
+            <el-button size="small" v-if="formFields.length > 1" @click="removeField(index)" type="danger">删除
+            </el-button>
+            <el-button size="small" v-if="index === formFields.length - 1" @click="addField" type="primary">添加
+            </el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+      <!-- 拆分尾 -->
+      <el-table
+        border
+        :data="splitData"
+        v-if="refreshWorkerTable"
+        v-loading="workerLoading"
+        row-key="workorderCode"
+        style="width: 100%"
+        max-height="240"
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      >
+        <el-table-column width="60" align="center" label="序号" type="index"></el-table-column>
+        <el-table-column width="200" align="center" prop="workorderCode" label="工单号"></el-table-column>
+        <el-table-column width="100" align="center" prop="productDate" label="工单日期"></el-table-column>
+        <el-table-column width="150" align="center" label="生产线体设备">
+          <template slot-scope="scope">
+            <el-popover width="250" placement="top-start" trigger="hover" :content="scope.row.prodLineCode">
+              <span slot="reference" class="btn">{{ scope.row.prodLineCode }}</span>
+            </el-popover>
+          </template>
+        </el-table-column>
+        <el-table-column width="80" align="center" prop="quantitySplit" label="数量"></el-table-column>
+        <el-table-column width="60" label="单位" align="center" prop="unit"/>
+        <el-table-column width="90" label="工艺编码" align="center" prop="routeCode"/>
+        <el-table-column width="90" label="班次" align="center" prop="shiftDesc" :formatter="shiftFormat"/>
+        <el-table-column align="center" width="230" prop="batchCodeList" label="批次号"></el-table-column>
+        <el-table-column align="center" width="150" prop="batchNumList" label="批次数量"></el-table-column>
+      </el-table>
+      <!-- 测试 -->
+      <!-- 操作按钮 -->
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" v-if="showDetail">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!--组成白坯物料选择弹窗-->
+    <el-dialog
+      width="800px"
+      title="物料选择"
+      :visible.sync="innerBPVisible"
+      append-to-body>
+
+      <el-form :model="materielParams" ref="queryBPForm" size="small" :inline="true" v-show="showSearch"
+               label-width="68px">
+        <el-form-item label="物料编码" prop="productCode">
+          <el-input
+            v-model="materielParams.productCode"
+            placeholder="请输入物料编码"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item label="物料名称" prop="productCode">
+          <el-input
+            v-model="materielParams.productDescZh"
+            placeholder="请输入物料名称"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleMaterielQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <!-- 物料列表展示 -->
+      <el-table v-loading="loading" :data="materielList" @selection-change="selectionChange">
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column width="60" align="center" label="序号" type="index"></el-table-column>
+        <el-table-column label="物料编码" align="center" prop="productCode"/>
+        <el-table-column label="物料名称" align="center" prop="productDescZh"/>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="materielParams.pageNum"
+        :limit.sync="materielParams.pageSize"
+        @pagination="getBPMaterielList"
+      />
+
+      <el-button @click="subMaterielBP" class="my-materiel-btn" type="primary">确定</el-button>
+
+    </el-dialog>
+
+    <!-- 工单设备修改模块 -->
+    <el-dialog :title="titleM" :visible.sync="openM" width="1000px" append-to-body>
+      <el-table
+        border
+        v-if="refreshProTable"
+        v-loading="proLoading"
+        :data="productData"
+        row-key="orderCode"
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      >
+        <el-table-column width="60" align="center" label="序号" type="index"></el-table-column>
+        <el-table-column width="150" label="订单编号" prop="orderCode"/>
+        <el-table-column width="380" label="产品名称" align="center" prop="prodDesc"/>
+        <el-table-column width="60" label="单位" align="center" prop="unit"/>
+        <el-table-column width="130" label="产品数量" align="center" prop="quantity"/>
+        <el-table-column label="已拆分数量" align="center" prop="quantitySplit"/>
+        <el-table-column label="拆分数量" align="center" prop="atrr1"/>
+        <el-table-column label="生产版本" align="center" prop="atrr2"/>
+      </el-table>
+      <el-form class="my-margin" :model="splitFormM" ref="dynamicForm" label-width="80px">
+        <el-row>
+          <el-col :span="7">
+            <el-form-item label="选择设备:">
+             <div style="height: 130px;overflow-y: auto;">
+              <el-cascader
+                :options="eRouteOptionsM"
+                :props="eRouteProps"
+                v-model="splitFormM.prodLineCodeArray"
+                clearable></el-cascader>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <!-- 拆分尾 -->
+      <el-table
+        border
+        :data="splitData"
+        v-if="refreshWorkerTable"
+        v-loading="workerLoading"
+        row-key="workorderCode"
+        style="width: 100%"
+        max-height="240"
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      >
+        <el-table-column width="60" align="center" label="序号" type="index"></el-table-column>
+        <el-table-column width="200" align="center" prop="workorderCode" label="工单号"></el-table-column>
+        <el-table-column width="100" align="center" prop="productDate" label="工单日期"></el-table-column>
+        <el-table-column width="150" align="center" label="生产线体设备">
+          <template slot-scope="scope">
+            <el-popover width="250" placement="top-start" trigger="hover" :content="scope.row.prodLineCode">
+              <span slot="reference" class="btn">{{ scope.row.prodLineCode }}</span>
+            </el-popover>
+          </template>
+        </el-table-column>
+        <el-table-column width="80" align="center" prop="quantitySplit" label="数量"></el-table-column>
+        <el-table-column width="60" label="单位" align="center" prop="unit"/>
+        <el-table-column width="90" label="工艺编码" align="center" prop="routeCode"/>
+        <el-table-column width="90" label="班次" align="center" prop="shiftDesc" :formatter="shiftFormat"/>
+        <el-table-column align="center" width="230" prop="batchCodeList" label="批次号"></el-table-column>
+        <el-table-column align="center" width="150" prop="batchNumList" label="批次数量"></el-table-column>
+      </el-table>
+      <!-- 测试 -->
+      <!-- 操作按钮 -->
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormM">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 批次编辑 -->
+    <el-dialog :title="batchTitle" :visible.sync="batchOpen" width="1000px" append-to-body>
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="success"
+            plain
+            icon="el-icon-add"
+            size="mini"
+            @click="handleAddBatch"
+            v-hasPermi="['mes:pro:workorder:edit']"
+          >新增
+          </el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="batchSingle"
+            @click="handleUpdateBatch"
+            v-hasPermi="['mes:pro:workorder:edit']"
+          >修改
+          </el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-remove"
+            size="mini"
+            :disabled="batchSingle"
+            @click="handleRemoveBatch"
+            v-hasPermi="['mes:pro:workorder:edit']"
+          >删除
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table border v-loading="batchLoading" :data="batchData" @selection-change="batchSelectionChange"
+        ref="batchTable" row-key="orderCode"
+      >
+        <el-table-column type="selection" align="center" />
+        <el-table-column label="工单编号" align="center" prop="workorderCode" width="150"/>
+        <el-table-column label="当前批次号" align="center" prop="batchCode"/>
+        <el-table-column label="当前批次数量" align="center" prop="batchQuantity"/>
+        <el-table-column label="新批次号" align="center" prop="newBatchCode"/>
+        <el-table-column label="新批次数量" align="center" prop="newBatchQuantity"/>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="hangleCloseEditBatch">关 闭</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 批次编辑新增/修改页面 -->
+    <el-dialog :title="bEditTitle" :visible.sync="bEditOpen" width="600px" append-to-body>
+      <el-form :model="batchForm" ref="batchForm" :rules="batchRules" label-width="120px">
+        <el-form-item label="工单编号" prop="workorderCode">
+          <el-input v-model="batchForm.workorderCode" placeholder="" disabled></el-input>
+        </el-form-item>
+        <el-form-item v-if="editBatchFlag" label="当前批次号" prop="batchCode">
+          <el-input v-model="batchForm.batchCode" placeholder="请输入当前批次号" disabled></el-input>
+        </el-form-item>
+        <el-form-item v-if="editBatchFlag" label="当前批次数量" prop="batchQuantity">
+          <el-input type="number" v-model.number="batchForm.batchQuantity" placeholder="请输入当前批次数量" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="新批次号" prop="newBatchCode">
+          <el-input v-model="batchForm.newBatchCode" placeholder="请输入新批次号"></el-input>
+        </el-form-item>
+        <el-form-item label="新批次数量" prop="newBatchQuantity">
+          <el-input type="number" v-model.number="batchForm.newBatchQuantity" placeholder="请输入新批次数量"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="batchSubmitForm">确 定</el-button>
+        <el-button @click="batchCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!--标识卡打印-->
+    <ItemPrintID ref="printID" @onSelected="printIdFunc"/>
+  </div>
+</template>
+
+<script>
+import {
+  getWorkOrders,
+  listWorkorder,listWorkorderLevel0,getNextLevelWorkOrderList,
+  delWorkorder,
+  downWorkorder,
+  getOrderAndWork,getProSortNo,
+  getWorkBatchList,
+  subChangeWorkOrderPro,subChangeWorkOrderM,
+  checkWorkOrder,
+  getWorkOrderBatch,
+  getWorkOrderBatchInfo,
+  insertWorkOrderBatch,
+  updateWorkOrderBatch,
+  removeWorkOrderBatch,
+  getProdLineList
+} from '@/api/plan/workorder'
+import moment from 'moment';
+import ItemPrintID from './printID.vue';
+import { getProEquipment, getProRoutes, getProShifts,selectMaterielList} from '@/api/plan/order'
+import {prototype} from "clipboard";
+import {listDetailed, listDetailedunt,BSKlist} from "../../../api/wms/detailed";
+export default {
+  name: "Workorder",
+  dicts: ['product_type', 'workorder_type'],
+  components: {
+    ItemPrintID
+  },
+  data() {
+    return {
+      // 拆分车数换算值
+      converCarNum: null,
+      // 变更校验车数书否显示
+      checkType: false,
+      // 暂存线体code
+      proLineCode: null,
+      // 打印
+      formRef: 'form',
+      validateRules: [],
+      materielList:[],
+      printData: {
+        printable: 'printFrom',
+        ignore: ['no-print'],
+        workCenter: "暂无数据",
+        SAPNo: null,
+        manufacture: null,
+        auditor: null,
+        printDate: null,
+        factory: null,
+        productDate: null,
+        workTable: [],
+      },
+      printDialogVisible: false,
+      // 工单修改form
+      workForm: {},
+      // 首页-多选选中-用于工单变更
+      selectWork: null,
+      //工单遮罩层
+      workerLoading: false,
+      newWorkerLoading: false,
+      //工单重新渲染表格
+      refreshWorkerTable: true,
+      refreshNewWorkerTable: true,
+      // 拆分后工单list
+      splitData: [],
+      // 批次
+      formFields: [{
+        batchCode: '',
+        batchQuantity: ''
+      }],
+      // 工艺list
+      routes: [],
+      // 班次list
+      workShift: [],
+      // 成型机list
+      proline: [],
+      // 订单
+      productData: [],
+      // 订单遮罩层
+      proLoading: false,
+      // 订单重新渲染表格
+      refreshProTable: true,
+      // 拆分form
+      splitForm: {
+        prodLineCodeArray: [],
+        splitNum: null,
+        productDate: null,
+        shiftId: null,
+        routeCode: null,
+        carNum: 0,
+        prodType:null,
+        materialCode:null,
+        materialName:null
+      },
+      splitFormM: {
+        prodLineCodeArray: []
+      },
+      // 遮罩层
+      loading: true,
+      batchLoading: true,
+      // 选中数组
+      ids: [],
+      cods: [],
+      // 批次编辑列表
+      batchData: [],
+      // 非单个禁用
+      single: true,
+      batchSingle: true,
+      // 非多个禁用
+      multiple: true,
+      batchMultiple: true,
+      // 下达禁用
+      statuses: [],
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 生产工单表格数据
+      workorderList: [],
+      // 弹出层标题
+      title: "",
+      titleM:"",
+      batchTitle: "",
+      bEditTitle: "",
+      // 是否显示弹出层
+      open: false,
+      openM:false,
+      batchOpen: false,
+      bEditOpen: false,
+      // 是否禁止修改批次
+      editBatchFlag: false,
+      // 查询参数
+      queryParams: {
+        productDateArray: [new Date(), new Date()],
+        pageNum: 1,
+        pageSize: 10,
+        workorderCode: null,
+        workorderName: null,
+        orderId: null,
+        orderCode: null,
+        productId: null,
+        productCode: null,
+        productName: null,
+        productSpc: null,
+        unit: null,
+        quantityProduced: null,
+        quantitySplit: null,
+        routeCode: null,
+        prodLineCode: null,
+        productDate: new Date(),
+        shiftId: null,
+        parentOrder: null,
+        ancestors: null,
+        status: 'w0',
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+        prodType: null,
+        factoryCode: null,
+        endFlag: null
+      },
+      // 表单参数
+      form: {},
+      batchForm: {},
+      // 表单校验
+      rules: {
+        workorderCode: [
+          {required: true, message: "工单编码不能为空", trigger: "blur"}
+        ],
+        workorderName: [
+          {required: true, message: "工单名称不能为空", trigger: "blur"}
+        ],
+        orderId: [
+          {required: true, message: "订单id不能为空", trigger: "blur"}
+        ],
+        productCode: [
+          {required: true, message: "产品编号不能为空", trigger: "blur"}
+        ],
+        productName: [
+          {required: true, message: "产品名称不能为空", trigger: "blur"}
+        ],
+        unit: [
+          {required: true, message: "单位不能为空", trigger: "blur"}
+        ],
+      },
+      batchRules: {
+        workorderCode: [
+          {required: true, message: "工单编码不能为空", trigger: "blur"}
+        ],
+        batchCode: [
+          {required: true, message: "当前批次编码不能为空", trigger: "blur"}
+        ],
+        batchQuantity: [
+          {required: true, message: "当前批次数量不能为空", trigger: "blur"}
+        ]
+      },
+      prodLineList:[],
+      /**********************************/
+      eRouteProps: {multiple: true},
+      eRouteOptions: [],
+      eRouteOptionsM: [],
+      // 班次
+      workShift: [],
+      //组成白坯物料弹窗
+      innerBPVisible: false,
+      materielParams: {
+        mtart: 'material_type1',
+        productCode: null,
+        productDescZh: null,
+        pageNum: 1,
+        pageSize: 10,
+      },
+      materielBP: [],
+      showDetail:true
+    };
+
+  },
+  created() {
+    this.getList();
+    // 获取班次信息
+
+  },
+  methods: {
+		//产品编码格式化
+		productCodeFormate(row, column, cellValue){
+      if(cellValue !=null){
+			  return cellValue.slice(7,18);  //返回值
+      }
+		},
+    //订单编码格式化
+    orderCodeFormate(row, column, cellValue){
+      if(cellValue !=null){
+        return cellValue.slice(3,18);  //返回值
+      }
+
+		},
+    // 新增-物料搜索
+    handleMaterielQuery() {
+      this.materielQueryParams.pageNum = 1;
+      this.getMaterielList();
+    },
+
+    // 变更-车数数量校验
+    changeCarNum(num) {
+
+
+      // 请先输入订单数量
+      if (this.splitForm.splitNum == null) {
+        this.$message({
+          message: '请先输入拆分数量！',
+          type: 'warning'
+        })
+        this.splitForm.carNum = null;
+        return
+      }
+      // 车数不能超过拆分数量
+      if (Number(this.splitForm.splitNum) - Number(num) < 0) {
+        this.$message({
+          message: '车数不能超过拆分数量！',
+          type: 'warning'
+        })
+        num = this.splitForm.splitNum
+        this.splitForm.carNum = num;
+      }
+      // 不能为负数
+      if (num <= 0) {
+        this.$message({
+          message: '车数数量不能小于0！',
+          type: 'warning'
+        })
+        num = 1;
+        this.splitForm.carNum = num;
+      }
+      this.workForm.carNum = num;
+    },
+
+
+
+
+
+    // 首-查询生产工单列表
+    getList() {
+      this.loading = true;
+      this.queryParams.parentOrder = '0';//第一层只查母单
+
+      //第一层
+      BSKlist(this.queryParams).then(response => {
+        this.workorderList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+   // 工单详情按钮操作
+    handleDetail(row) {
+          // 数据初始化
+          this.reset();
+          this.splitData = [];
+          this.productData = [];
+          this.splitForm = {
+            prodLineCodeArray: [],
+            splitNum: null,
+            productDate: null,
+            shiftId: null,
+            routeCode: null,
+            carNum: null,
+            prodType:null,
+            materialCode:null,
+            materialName:null
+          }
+          this.formFields = []
+          this.converCarNum = null;
+
+          // 获取班次信息
+          getProShifts().then(response => {
+            this.workShift = response.data
+          })
+          // 获取工艺信息
+          getProRoutes(this.selectWork.productCode).then(response => {
+            this.routes = response.data
+            getProEquipment(this.selectWork.routeCode).then(response => {
+              this.proline = response.data
+            })
+            // 设置车数换算值
+            for (let i = 0; i < this.routes.length; i++) {
+              if (this.routes[i].routeCode == this.selectWork.routeCode) {
+                this.converCarNum = this.routes[i].carNumUnit;
+              }
+            }
+          })
+          // 获取工艺设备信息
+          getProEquipment(this.selectWork.routeCode).then(response2 => {
+            this.eRouteOptions = response2.data
+          })
+          // 获取批次信息list
+          getWorkBatchList(this.selectWork).then(response => {
+            this.formFields = response.data
+          })
+
+          // 获取工单和订单信息
+          // 在获取到新的数据后执行以下代码
+          this.proLoading = true // 设置加载状态为true，表示正在加载
+          this.workerLoading = true // 设置加载状态为true，表示正在加载
+          getOrderAndWork(this.selectWork).then(response => {
+            this.splitData.push(response.data.workOrder)
+            this.productData.push(response.data.order)
+
+            //订单产品类型
+            this.splitForm.prodType = this.splitData[0].prodType
+            this.checkType = false
+            this.refreshProTable = false // 先将refreshProTable设置为false，隐藏表格
+            this.refreshWorkerTable = false // 先将refreshProTable设置为false，隐藏表格
+            this.$nextTick(() => {
+              // 使用$nextTick来等待DOM更新完成
+              this.refreshProTable = true // 立即将refreshProTable设置为true，显示表格
+              this.proLoading = false // 设置加载状态为false，表示加载完成
+            })
+            this.$nextTick(() => {
+              // 使用$nextTick来等待DOM更新完成
+              this.refreshWorkerTable = true // 立即将refreshProTable设置为true，显示表格
+              this.workerLoading = false // 设置加载状态为false，表示加载完成
+            })
+
+            // 设置拆分数量
+            this.splitForm.splitNum = this.splitData[0].quantitySplit
+            // 设置选择机型
+            this.splitForm.prodLineCodeArray = response.data.workOrder.prodLineCodeArray
+            // 设置车数
+            this.splitForm.carNum = this.splitData[0].carNum
+            // 设置班次
+            this.splitForm.shiftId = this.splitData[0].shiftDesc
+            // 设置工艺
+            this.splitForm.routeCode = this.splitData[0].routeCode
+
+            //初始化日期为默认今天
+            if(this.splitData[0].productDate != null){
+               this.splitForm.productDate = this.splitData[0].productDate;
+            }else{
+               this.splitForm.productDate = new Date();
+            }
+            // 订单为成品
+            if (this.productData[0],prototype != 'white'){
+
+              if(this.splitData[0].sortNo != null){
+                this.splitForm.sortNo = this.splitData[0].sortNo
+              }
+
+              // 递归将拆分数量还原
+              function setAtrr1(order, work) {
+
+                order.quantitySplit = Number(order.quantitySplit) - Number(work.quantitySplit);
+                order.atrr1 = work.quantitySplit;
+
+                if (order.children !== undefined && work.children !== undefined) {
+                  setAtrr1(order.children[0], work.children[0]);
+                }
+              }
+              setAtrr1(this.productData[0], this.splitData[0]);
+            }
+
+          })
+
+          this.open = true;
+          this.title = "生产工单详情";
+          this.showDetail = false;
+        },
+    //工单设备修改开始-----》》》
+    editMachine(row) {
+        // 数据初始化
+        this.reset();
+        this.splitData = [];
+        this.productData = [];
+        this.splitFormM = {
+          prodLineCodeArray: [],
+        }
+
+        // 获取工艺设备信息
+        getProEquipment(this.selectWork.routeCode).then(response2 => {
+          this.eRouteOptionsM = response2.data
+        })
+
+        getOrderAndWork(this.selectWork).then(response => {
+          // 设置选择机型
+          this.splitFormM.prodLineCodeArray = response.data.workOrder.prodLineCodeArray
+          this.splitData.push(response.data.workOrder)
+          this.productData.push(response.data.order)
+          this.refreshProTable = false // 先将refreshProTable设置为false，隐藏表格
+          this.refreshWorkerTable = false // 先将refreshProTable设置为false，隐藏表格
+          this.$nextTick(() => {
+            // 使用$nextTick来等待DOM更新完成
+            this.refreshProTable = true // 立即将refreshProTable设置为true，显示表格
+            this.proLoading = false // 设置加载状态为false，表示加载完成
+          })
+          this.$nextTick(() => {
+            // 使用$nextTick来等待DOM更新完成
+            this.refreshWorkerTable = true // 立即将refreshProTable设置为true，显示表格
+            this.workerLoading = false // 设置加载状态为false，表示加载完成
+          })
+        })
+
+        this.openM = true;
+        this.titleM = "生产工单设备修改";
+
+    },
+     //工单设备修改结束-----《《《《《《
+
+    // 工单设备变更-变更提交按钮
+    submitFormM() {
+      //下面是请求处理
+      const data = {
+        proOrderWorkorder: this.selectWork,
+        prodLineCodeArray: this.splitFormM.prodLineCodeArray
+      }
+      subChangeWorkOrderM(data).then(response => {
+        if (response.code == 500) {
+          this.$modal.msgError(response.msg)
+          return
+        }
+        this.getList()
+        this.$modal.msgSuccess('提交成功')
+      })
+      // 清除缓存
+      this.splitFormM = {
+        prodLineCodeArray: []
+      }
+      this.openM = false
+    },
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.openM = false;
+      this.showDetail = true;
+      this.reset();
+    },
+    // 首-表单重置
+    reset() {
+      this.form = {
+        workorderId: null,
+        workorderCode: null,
+        workorderName: null,
+        orderId: null,
+        orderCode: null,
+        productId: null,
+        productCode: null,
+        productName: null,
+        productSpc: null,
+        unit: null,
+        quantityProduced: null,
+        quantitySplit: null,
+        routeCode: null,
+        prodLineCode: null,
+        prodLineCodeArray: [],
+        productDate: null,
+        shiftId: null,
+        parentOrder: null,
+        ancestors: null,
+        status: null,
+        remark: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        prodType: null,
+        factoryCode: null,
+        endFlag: null
+      };
+      this.resetForm("form");
+    },
+    resetBatchForm() {
+      this.batchForm = {
+        workorderCode: null,
+        batchCode: null,
+        batchQuantity: null,
+        newBatchCode: null,
+        newBatchQuantity: null,
+        attr1: null,
+      }
+      this.resetForm("batchForm");
+    },
+    // 首-搜索按钮操作
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    // 首-重置按钮操作
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 首-多选框选中数据
+    handleSelectionChange(selection) {
+      // 这里设置选中的工单信息--用于工单变更
+      this.selectWork = selection[0]
+
+      this.ids = selection.map(item => item.workorderId)
+      this.codes = selection.map(item => item.workorderCode)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+      this.statuses = selection.map(item => item.status)
+    },
+    batchSelectionChange(selection) {
+      this.batchids = selection.map(item => item.workorderId)
+      this.bWorkCodes = selection.map(item => item.workorderCode)
+      this.batchCodes = selection.map(item => item.batchCode)
+      this.batchSingle = selection.length !== 1
+      this.batchMultiple = !selection.length
+    },
+    // 首-新增按钮操作
+    handleAdd() {
+      alert("待建设")
+      //this.reset();
+      //this.open = true;
+      //this.title = "添加生产工单";
+    },
+    shiftFormat(row,column){
+      let array = this.workShift;
+      let value = '其他';
+      array.forEach((item) => {
+        if (item.shiftId == row.shiftId) {
+          value = item.shiftDesc
+        }
+      })
+      return value;
+    },
+    editBatch() {
+      if(this.selectWork.status == 'w0'){
+        this.$modal.msgError("还未派发请到工单变更进行调整！");
+        return;
+      }
+
+
+      this.batchLoading = true;
+      const workOrdercode = this.codes[0];
+      getWorkOrderBatch(workOrdercode).then(response => {
+        if(response.code == 200) {
+          this.batchData = response.rows;
+          this.batchOpen = true;
+          this.batchLoading = false;
+          this.batchTitle = "批次编辑";
+        }
+
+      })
+    },
+    hangleCloseEditBatch() {
+      this.batchOpen = false;
+      this.getList();
+    },
+
+    // 批次编辑新增
+    handleAddBatch() {
+      this.resetBatchForm();
+      this.batchForm.workorderCode = this.codes[0];
+      this.bEditOpen = true;
+      this.bEditTitle = "批次新增";
+      this.editBatchFlag = false;
+    },
+    // 批次编辑修改
+    handleUpdateBatch() {
+      this.editBatchFlag = true;
+      this.resetBatchForm();
+      const params = {
+        workorderCode: this.bWorkCodes[0],
+        batchCode: this.batchCodes[0]
+      }
+      getWorkOrderBatchInfo(params).then(response => {
+        this.batchForm = response.data;
+        this.bEditOpen = true;
+        this.bEditTitle = "批次修改";
+      });
+    },
+    // 批次编辑取消
+    batchCancel() {
+      this.bEditOpen = false;
+      this.editBatch();
+    },
+    // 批次编辑提交
+    batchSubmitForm() {
+      this.$refs["batchForm"].validate(valid => {
+				if (valid) {
+					if (this.batchForm.batchCode != null) {
+						updateWorkOrderBatch(this.batchForm).then(response => {
+              if(response.code === 200) {
+                this.$modal.msgSuccess("修改成功");
+              }else{
+                this.$modal.msgError(response.msg);
+              }
+							this.bEditOpen = false;
+							this.editBatch();
+						});
+					} else {
+						insertWorkOrderBatch(this.batchForm).then(response => {
+              if(response.code === 200) {
+                this.$modal.msgSuccess("新增成功");
+              }else{
+                this.$modal.msgError(response.msg);
+              }
+							this.bEditOpen = false;
+							this.editBatch();
+						});
+					}
+				}
+			});
+    },
+    // 删除批次
+    handleRemoveBatch() {
+      const workorderCode = this.bWorkCodes[0];
+      const batchCode = this.batchCodes[0];
+			this.$modal.confirm('是否确认删除批次编号为"' + batchCode + '"的数据项？').then(function() {
+				return removeWorkOrderBatch(batchCode,workorderCode);
+			}).then(() => {
+				this.editBatch();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {});
+    },
+
+    //新增-打开组成白坯选择物料窗口
+    selectBPMateriel() {
+      // 清除搜索缓存
+      this.materielParams.productCode = null;
+      this.materielParams.productDescZh = null;
+      this.innerBPVisible = true;
+      this.getBPMaterielList();
+    },
+    //新增-打开组成白坯选择物料窗口
+    getBPMaterielList() {
+      this.loading = true;
+      selectMaterielList(this.materielParams).then(response => {
+          this.materielList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    // 新增-打开组成白坯选择物料窗口-选中物料信息
+    selectionChange(e) {
+      this.materielBP = e;
+    },
+    // 新增-打开组成白坯选择物料窗口-确认选择物料
+    subMaterielBP() {
+      if (this.materielBP.length == 0) {
+        this.$message({
+          message: '请选择物料！',
+          type: 'warning'
+        })
+        return
+      }
+      if (this.materielBP.length > 1) {
+        this.$message({
+          message: '物料只能选择一个！',
+          type: 'warning'
+        })
+        return
+      }
+
+      this.splitForm.materialCode = this.materielBP[0].productCode;
+      this.splitForm.materialName = this.materielBP[0].productDescZh;
+
+      this.innerBPVisible = false;
+    },
+
+
+
+    /**打印标识卡弹出框**/
+    printIdCard() {
+      this.$refs.printID.init(this.selectWork.storageId);
+      this.$refs.printID.printDialogVisible = true;
+    },
+    //标识卡选择确认
+    printIdFunc(obj) {
+      this.form.userName = obj.code;
+      this.form.nickName = obj.name;
+    },
+  }
+};
+</script>
+<style>
+.el-row {
+  margin: 0;
+  padding: 0;
+}
+
+.el-col {
+  border-radius: 4px;
+}
+
+.bg-purple-dark {
+  background: #99a9bf;
+}
+
+.bg-purple {
+  background: #d3dce6;
+}
+
+.bg-purple-light {
+  background: #e5e9f2;
+}
+
+.grid-content {
+  border-radius: 4px;
+  min-height: 36px;
+}
+
+.row-bg {
+  padding: 10px 0;
+  background-color: #f9fafc;
+}
+
+.my-margin {
+  margin-top: 40px;
+  margin-bottom: 10px;
+}
+
+.my-print-head {
+  margin-top: 20px;
+  font-weight: bold;
+}
+
+.my-print-nav {
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+
+.my-print-table {
+
+}
+
+.my-print-foot {
+  margin-top: 20px;
+}
+.btn {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+</style>
diff --git a/src/views/wms/linsDY/printID.vue b/src/views/wms/linsDY/printID.vue
new file mode 100644
index 0000000..ff7b809
--- /dev/null
+++ b/src/views/wms/linsDY/printID.vue
@@ -0,0 +1,308 @@
+<template>
+  <div class="app-container">
+    <el-dialog title="" :visible.sync="printDialogVisible" width="1000px">
+      <div>
+        <el-form inline  label-width="80px">
+<!--          <el-form-item label="补打板次" prop="factory">-->
+<!--            <el-input v-model="idCardsNum" placeholder="请输入" style="width:100px"/>-->
+<!--          </el-form-item>-->
+<!--          <el-button type="primary" icon="el-icon-check" circle @click="showSupplementPrint()"/>-->
+
+<!--          <el-form-item label="增打批次" prop="batchCode">-->
+<!--            <el-select-->
+<!--              v-model="batchCode"-->
+<!--              placeholder="请选择批次"-->
+<!--              @change="$forceUpdate()"-->
+<!--              clearable-->
+<!--              style="width: 200px"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="item in batchCodeOption"-->
+<!--                :key="item.batchCode"-->
+<!--                :label="item.batchCode"-->
+<!--                :value="item.batchCode"-->
+<!--              ></el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="增打板次" prop="idCardsNumAdd">-->
+<!--            <el-input v-model="idCardsNumAdd" placeholder="请输入" style="width:100px"/>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="增打数量" prop="batchQuantity">-->
+<!--            <el-input v-model="batchQuantity" placeholder="请输入" style="width:100px"/>-->
+<!--          </el-form-item>-->
+<!--          <el-button type="primary" icon="el-icon-check" circle @click="showAddPrint()"/>-->
+        </el-form>
+      </div>
+
+      <div id="printFrom" class="my-print-box">
+        <div v-for="(item, index) in printData.idCardList" :key="index">
+          <el-form  class="print-card">
+            <el-row>
+              <el-col :span="7">
+                <img src="@/assets/logo/lanjv.png" class="report-logo" />
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col  class="center-text">
+                <span>产品标识卡</span>
+              </el-col>
+            </el-row>
+            <div class="custom-divider"></div>
+
+            <el-row class="my-print-foot">
+              <el-col :offset="1" :span="13">
+                <div class="card-div2">产品名称: {{ item.productName  }}</div><br />
+                <div class="card-div2">批次号: {{ item.batchCode }}</div><br />
+                <div class="card-div2">生产日期: {{ item.productDateStr }}</div><br />
+                <div class="card-div2">板次: {{ item.palletNo }}</div><br />
+                <div class="card-div2"><span>数量: {{ item.batchQuantity }}&nbsp;{{ item.unit }}</span>
+                                       <span style="margin-left: 15%;">子单数量: {{ item.umrez }}&nbsp;PC</span></div><br />
+              </el-col>
+              <el-col :offset="1" :span="9">
+                <canvas :id="'qrcode-' + index" class="qrcode"></canvas>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="margin-top: 10px;">
+            <table align="center" border="1" cellpadding="0" cellspacing="0" width="820">
+            <tr class="tr-row"><td class="tr-row-1"></td><td class="tr-row-2"></td></tr>
+            <tr class="tr-row"><td class="tr-row-1"></td><td class="tr-row-2"></td></tr>
+            <tr class="tr-row"><td class="tr-row-1"></td><td class="tr-row-2"></td></tr>
+            </table>
+          </div>
+          <div v-if="(index + 1) % 1 === 0" class="print-page"></div>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handlePrint(printData)">打 印</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+
+<script>
+
+import QRCode from 'qrcode';
+import {listDetailed, listDetailedunt,BSKlist,BSK} from "../../../api/wms/detailed";
+export default {
+  name: "printID",
+  components: {
+  },
+  data() {
+    return {
+      idCardsNum: null,//板次
+      idCardsNumAdd: null,//增打板次
+      batchCode: null,//批次
+      batchQuantity: null,//数量
+      optType: undefined,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      selectRow: {},
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      printDialogVisible: false,
+      // 打印
+      printData: {
+        printable: "printFrom",
+        ignore: ["no-print"],
+        workCenter: "暂无数据",
+        factory: null,
+        idCardList: [],
+        //gridStyle:'border: 1px solid lightgray; margin-bottom: -1px;'
+      },
+      workorderCode: '',
+      workorderId: '',
+      batchCodeOption: [],
+      //工单重新渲染表格
+      refreshWorkerTable: true,
+      // 表单校验
+      rules: {
+
+      },
+      tableIndex: "tableIndex",
+    };
+  },
+  created() {
+  },
+  mounted() {
+
+
+  },
+  methods: {
+      init(workorderId){
+        this.workorderId = workorderId;
+        this.idCardsNum = null;
+        this.idCardsNumAdd = null;
+        this.batchCode = null;
+        this.batchQuantity = null;
+        this.showSupplementPrint();
+      },
+
+    //初始化批次号选择框
+
+
+    // 打印预览-浏览器打印
+    handlePrint(params) {
+      printJS({
+      printable: params.printable,
+      type: params.type || 'html',
+      maxWidth: 1500,
+      font_size: "", // 设置字体大小
+      header: params.header, // '表单',
+      targetStyles: ['*'],
+      style: `
+       body { margin: 10mm; padding: 0; }
+        .print-page { page-break-after: always; }
+      `,
+      ignoreElements: params.ignore || [],
+    });
+    //打印完成后 版次变为空
+
+    },
+    // 打印预览-点击打印预览按钮-补打
+   async showSupplementPrint() {
+      console.log('执行了补充打印预览');
+      let params = {};
+      params.addFlag = '0'; //增打标志
+     params.workorderId = this.workorderId;
+      if(this.idCardsNum!=null){
+        params.palletNo = this.idCardsNum;
+      }
+     let response = await BSK({...params});
+     this.printData.idCardList = response;
+     this.$nextTick(() => {
+      this.printData.idCardList.forEach((item, index) => {
+        const canvas = document.getElementById('qrcode-' + index);
+        QRCode.toCanvas(canvas, item.palletCode, { width: 300 , margin:1 }, function (error) {
+          if (error) console.error(error);
+          console.log('success!');
+        });
+      });
+    })
+    },
+
+   //  // 打印预览-增打
+   // async showAddPrint() {
+   //    console.log('执行了新增打印预览');
+   //    let params = {};
+   //    if(this.idCardsNumAdd == null || this.batchCode == null || this.batchQuantity == null
+   //       ||this.idCardsNumAdd == '' || this.batchCode == '' || this.batchQuantity == ''
+   //    ){
+   //      this.$modal.msg("您填入的增打信息存在空值！");
+   //      return;
+   //    }else{
+   //      //产品名称  后台返回
+   //      //生产日期 后台返回
+   //      params.batchCode = this.batchCode;//批次号 需要选择
+   //      params.palletNo = this.idCardsNumAdd;//板次
+   //      params.batchQuantity = this.batchQuantity;//数量
+   //      params.addFlag = '1';//增打标志
+   //    }
+   //   let response = await getIdCardList({workorderCode:this.workorderCode,...params});
+   //   this.printData.idCardList = response;
+   //   if(this.printData.idCardList.length == 0){
+   //    this.$modal.msg("该板次已被正常打印，请填入正确板次！");
+   //   }else{
+   //    this.$nextTick(() => {
+   //    this.printData.idCardList.forEach((item, index) => {
+   //      const canvas = document.getElementById('qrcode-' + index);
+   //      QRCode.toCanvas(canvas, item.palletCode, { width: 300 , margin:1 }, function (error) {
+   //        if (error) console.error(error);
+   //        console.log('success!');
+   //        });
+   //      });
+   //    })
+   //    }
+   //  }
+  },
+};
+</script>
+<style scoped>
+.print-btn {
+  margin-bottom: 15px;
+  margin-left: 10px;
+}
+
+.center-text {
+  text-align: center;
+  font-size: 50px;
+  font-weight: 800;
+  color: black;
+}
+
+.report-logo {
+  margin-top: 15px;
+  margin-left: 15px;
+  height: 70px;
+}
+
+.button-container {
+  text-align: right;
+  margin-top: 10px;
+  margin-right: 10px;
+}
+
+.my-print-table {
+  font-size: 20px;
+}
+
+.my-print-foot {
+  font-size: 17px;
+}
+.my-print-foot2 {
+  font-size: 19px;
+}
+
+.my-print-box{
+  width:100%
+}
+.custom-divider {
+    width: 100%;
+    height: 1px;
+    background-color: #a5a4a4 !important;
+    margin: 20px 0 !important;
+    -webkit-print-color-adjust: exact;
+  }
+
+.print-page {
+  page-break-after: always;
+}
+@media print {
+  .custom-divider {
+    width: 100%;
+    height: 1px;
+    background-color: #a5a4a4 !important;
+    margin: 20px 0 !important;
+    -webkit-print-color-adjust: exact;
+  }
+}
+.card-div1{
+  font-size: 20px;
+  font-weight: 600;
+  padding-top: 14px;
+}
+.card-div2{
+  font-size: 25px;
+  font-weight: 700;
+  padding-top: 2px;
+  margin-left: 35px;
+}
+.tr-row {
+  height: 35px;
+}
+.tr-row-1 {
+  width: 246px;
+}
+.tr-row-2 {
+  width: 574px;
+}
+</style>