diff --git a/src/views/modules/auditManagement/auditRules.vue b/src/views/modules/auditManagement/auditRules.vue
index 1a4364c..fa216a2 100644
--- a/src/views/modules/auditManagement/auditRules.vue
+++ b/src/views/modules/auditManagement/auditRules.vue
@@ -127,7 +127,7 @@
           <el-input style="width: 135px;" v-model="saveAuditRuleData.ruleId" :disabled="saveAuditRuleData.id!=0"></el-input>
         </el-form-item>
         <el-form-item :label="inputSearch6">
-          <el-input style="width: 135px;" v-model="saveAuditRuleData.ruleDesc" :disabled="saveAuditRuleData.id!=0"></el-input>
+          <el-input style="width: 135px;" v-model="saveAuditRuleData.ruleDesc" ></el-input>
         </el-form-item>
         <el-form-item :label="inputSearch7">
           <!--          <el-input style="width: 135px;" v-model="saveAuditRuleData.recordTypeDb"></el-input>-->
diff --git a/src/views/modules/auditManagement/auditType.vue b/src/views/modules/auditManagement/auditType.vue
index dd1482b..b0335b9 100644
--- a/src/views/modules/auditManagement/auditType.vue
+++ b/src/views/modules/auditManagement/auditType.vue
@@ -8,7 +8,7 @@
         </span>
       </div>
         <el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button>
-<!--        <el-button @click="initModel()" type="primary">{{buttons.add}}</el-button>-->
+        <el-button @click="initModel()" type="primary">{{buttons.add}}</el-button>
         <el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}}
         </el-button>
         <el-button @click="userSetting" type="primary">{{ buttons.settingTable}}</el-button>
@@ -92,7 +92,7 @@
             :label="buttons.cz">
             <template slot-scope="scope">
               <a @click="initModel(scope.row)">{{buttons.edit}}</a>
-<!--              <a @click="delAuditType(scope.row)">{{buttons.delete}}</a>-->
+              <a @click="delAuditType(scope.row)">{{buttons.delete}}</a>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/modules/knifemold/tool-info-list.vue b/src/views/modules/knifemold/tool-info-list.vue
index 5277f2a..985df4e 100644
--- a/src/views/modules/knifemold/tool-info-list.vue
+++ b/src/views/modules/knifemold/tool-info-list.vue
@@ -27,31 +27,33 @@
       <el-col :span="24">
         <el-form :inline="true" label-position="top">
           <el-form-item :label="'工具编码'">
-            <el-input style="width: 100px" v-model="queryTool.toolId" ></el-input>
+            <el-input style="width: 100px" v-model="queryTool.toolId"></el-input>
           </el-form-item>
           <el-form-item :label="'工具实例编码'">
-            <el-input style="width: 100px"  v-model="queryTool.toolInstanceId" ></el-input>
+            <el-input style="width: 100px" v-model="queryTool.toolInstanceId"></el-input>
           </el-form-item>
           <el-form-item :label="'工具名称'">
             <el-input style="width: 100px" v-model="queryTool.toolDescription"></el-input>
           </el-form-item>
           <el-form-item>
-            <span slot="label" @click="getBaseList(3,1)"><el-link>{{'供应商编码'}}</el-link> </span>
+            <span slot="label" @click="getBaseList(3,1)"><el-link>{{ '供应商编码' }}</el-link> </span>
             <el-input style="width: 100px" v-model="queryTool.supplierId"></el-input>
           </el-form-item>
           <el-form-item :label="'接收日期'">
             <el-date-picker style="width: 120px" v-model="queryTool.startDate"
                             value-format='yyyy-MM-dd 00:00:00'
-                            format = 'yyyy-MM-dd'
-            ></el-date-picker> -
+                            format='yyyy-MM-dd'
+            ></el-date-picker>
+            -
             <el-date-picker style="width: 120px" v-model="queryTool.endDate"
                             value-format='yyyy-MM-dd 23:59:59'
-                            format = 'yyyy-MM-dd'
+                            format='yyyy-MM-dd'
             ></el-date-picker>
           </el-form-item>
           <el-form-item :label="'使用比例'">
-            <el-input type="number"   style="width: 50px"  v-model="queryTool.startProp" ></el-input> -
-            <el-input type="number"  style="width: 50px" v-model="queryTool.endProp" ></el-input>
+            <el-input type="number" style="width: 50px" v-model="queryTool.startProp"></el-input>
+            -
+            <el-input type="number" style="width: 50px" v-model="queryTool.endProp"></el-input>
           </el-form-item>
         </el-form>
       </el-col>
@@ -64,7 +66,18 @@
           border
           v-loading="dataListLoading"
           highlight-current-row
-          >
+        >
+          <el-table-column
+            fixed="left"
+            header-align="center"
+            align="left"
+            width="100"
+            :label="'操作'">
+            <template slot-scope="scope">
+              <el-link @click="printMethod(scope.row,'Y')">工具标签</el-link>
+              <el-link @click="printMethod(scope.row,'N')">| 网版</el-link>
+            </template>
+          </el-table-column>
           <el-table-column
             v-for="(item,index) in columnList" :key="index"
             :sortable="item.columnSortable"
@@ -102,488 +115,609 @@
 </template>
 
 <script>
-  import column from "../common/column";
-  import Chooselist from '@/views/modules/common/Chooselist'
-  import {
-    searchSysLanguagePackList,
-    searchSysLanguageParam,
-    searchFunctionButtonList,
-    saveButtonList,
-    searchSysLanguage,
-    searchLanguageListByLanguageCode,
-    saveSysLanguageOne
-  } from "@/api/sysLanguage.js"
-  import {
-    saveTableDefaultList,
-    saveTableUser,
-    getTableDefaultListLanguage,
-    getTableUserListLanguage,
-    removerDefault,
-    removerUser
-  } from "@/api/table.js"
-  import {
-    getToolInfoList
-  } from '@/api/knifemold/tool-info.js'
+import getLodop from '@/utils/LodopFuncs.js'
+import column from "../common/column";
+import Chooselist from '@/views/modules/common/Chooselist'
+import {
+  searchSysLanguagePackList,
+  searchSysLanguageParam,
+  searchFunctionButtonList,
+  saveButtonList,
+  searchSysLanguage,
+  searchLanguageListByLanguageCode,
+  saveSysLanguageOne
+} from "@/api/sysLanguage.js"
+import {
+  saveTableDefaultList,
+  saveTableUser,
+  getTableDefaultListLanguage,
+  getTableUserListLanguage,
+  removerDefault,
+  removerUser
+} from "@/api/table.js"
+import {
+  getToolInfoList
+} from '@/api/knifemold/tool-info.js'
+import {
+  printToolData
+} from "@/api/knifemold/receive.js"
 
-  export default {
-    components: {
-      column,
-      Chooselist
-    },
-    data() {
-      return {
-        height: 0,
-        // 组件显示控制
-        visible: false,
-        showDefault: this.$store.state.user.userDev,
-        // 数据查询属性
-        tagNo:'',
-        dataListLoading: false,
-        queryTool: {
-          limit: 500,
-          page: 1,
-          supplierId: '',
-          toolId: '',
-          toolInstanceId: '',
-          locationId: '',
-          toolDescription: '',
-          startDate:'',
-          endDate:'',
-          startProp: null,
-          endProp:null
+export default {
+  components: {
+    column,
+    Chooselist
+  },
+  data() {
+    return {
+      height: 0,
+      // 组件显示控制
+      visible: false,
+      showDefault: this.$store.state.user.userDev,
+      // 数据查询属性
+      tagNo: '',
+      dataListLoading: false,
+      queryTool: {
+        limit: 500,
+        page: 1,
+        supplierId: '',
+        toolId: '',
+        toolInstanceId: '',
+        locationId: '',
+        toolDescription: '',
+        startDate: '',
+        endDate: '',
+        startProp: null,
+        endProp: null
+      },
+      pageIndex: 1,
+      pageSize: 100,
+      totalPage: 0,
+      // 数据集
+      dataList: [],
+      // ------------ 页面属性 ----------
+      // 默认table 查询参数
+      queryTable: {
+        functionId: this.$route.meta.menuId,
+        tableId: "toolInfo",
+        languageCode: this.$i18n.locale
+      },
+      // 用户table 查询参数
+      queryTableUser: {
+        userId: this.$store.state.user.name,
+        functionId: this.$route.meta.menuId,
+        tableId: "toolInfo",
+        status: true,
+        languageCode: this.$i18n.locale
+      },
+      // 获取页面按钮
+      queryButton: {
+        functionId: this.$route.meta.menuId,
+        tableId: 'toolInfo',
+        languageCode: this.$i18n.locale,
+        objectType: 'button'
+      },
+      // 展示列集
+      columnList: [
+        {
+          userId: this.$store.state.user.name,
+          serialNumber: 'toolDetail1101ToolId',
+          tableId: "toolOIRecord",
+          tableName: "common",
+          columnProp: "toolId",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "工具编码",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: 'left',
+          columnWidth: 140,
         },
-        pageIndex: 1,
-        pageSize: 100,
-        totalPage: 0,
-        // 数据集
-        dataList: [],
-        // ------------ 页面属性 ----------
-        // 默认table 查询参数
-        queryTable: {
-          functionId: this.$route.meta.menuId,
-          tableId: "toolInfo",
-          languageCode: this.$i18n.locale
+        {
+          userId: this.$store.state.user.name,
+          serialNumber: 'toolDetail1101ToolInstanceId',
+          tableId: "toolOIRecord",
+          tableName: "common",
+          columnProp: "toolInstanceId",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "工具实例编码",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140,
         },
-        // 用户table 查询参数
-        queryTableUser: {
+        {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          tableId: "toolInfo",
+          serialNumber: 'toolOIRecordtype',
+          tableId: "toolOIRecord",
+          tableName: "common",
+          columnProp: "toolDescription",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "工具名称",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 200,
+        },
+        {
+          userId: this.$store.state.user.name,
+          serialNumber: 'toolOIRecordCreateDate',
+          tableId: "toolOIRecord",
+          tableName: "common",
+          columnProp: "createDate",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "接收日期",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
           status: true,
-          languageCode: this.$i18n.locale
+          fixed: '',
+          columnWidth: 120,
         },
-        // 获取页面按钮
-        queryButton: {
+        {
+          userId: this.$store.state.user.name,
+          serialNumber: 'toolOIRecordStatus',
+          tableId: "toolOIRecord",
+          tableName: "common",
+          columnProp: "status",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "状态",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          serialNumber: 'toolOIRecordCurrLocationId',
+          tableId: "toolOIRecord",
+          tableName: "common",
+          columnProp: "currLocationId",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "库位编码",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          serialNumber: 'toolOIRecordCurrLocationId',
+          tableId: "toolOIRecord",
+          tableName: "common",
+          columnProp: "locationName",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "库位名称",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 160,
+        },
+        {
+          userId: this.$store.state.user.name,
+          serialNumber: 'toolOIRecordActualuseQty',
+          tableId: "toolOIRecord",
+          tableName: "common",
+          columnProp: "actualuseQty",
+          headerAlign: "center",
+          align: "right",
+          columnLabel: "已使用寿命",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          serialNumber: 'toolOIRecordEstuseQty',
+          tableId: "toolOIRecord",
+          tableName: "common",
+          columnProp: "estuseQty",
+          headerAlign: "center",
+          align: "right",
+          columnLabel: "预计使用寿命",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          serialNumber: 'toolOIRecordProp',
+          tableId: "toolOIRecord",
+          tableName: "common",
+          columnProp: "prop",
+          headerAlign: "center",
+          align: "right",
+          columnLabel: "使用比例",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+      ],
+      // 用户table 配置集合
+      userColumnList: [],
+      // 展示按钮
+      buttons: {
+        search: '查询',
+        download: '导出',
+        settingTable: '设置列表',
+        defaultTable: '设置默认配置',
+      },
+      // 按钮列表
+      buttonList: [
+        {
           functionId: this.$route.meta.menuId,
-          tableId: 'toolInfo',
-          languageCode: this.$i18n.locale,
-          objectType: 'button'
+          languageValue: '查询',
+          objectId: 'search',
+          objectType: "button",
+          tableId: "toolOIRecord"
         },
-        // 展示列集
-        columnList: [
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: 'toolDetail1101ToolId',
-            tableId: "toolOIRecord",
-            tableName: "common",
-            columnProp: "toolId",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "工具编码",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: 'left',
-            columnWidth: 140,
-          },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: 'toolDetail1101ToolInstanceId',
-            tableId: "toolOIRecord",
-            tableName: "common",
-            columnProp: "toolInstanceId",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "工具实例编码",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 140,
-          },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: 'toolOIRecordtype',
-            tableId: "toolOIRecord",
-            tableName: "common",
-            columnProp: "toolDescription",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "工具名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 200,
-          },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: 'toolOIRecordCreateDate',
-            tableId: "toolOIRecord",
-            tableName: "common",
-            columnProp: "createDate",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "接收日期",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120,
-          },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: 'toolOIRecordStatus',
-            tableId: "toolOIRecord",
-            tableName: "common",
-            columnProp: "status",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "状态",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100,
-          },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: 'toolOIRecordCurrLocationId',
-            tableId: "toolOIRecord",
-            tableName: "common",
-            columnProp: "currLocationId",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "库位编码",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120,
-          },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: 'toolOIRecordCurrLocationId',
-            tableId: "toolOIRecord",
-            tableName: "common",
-            columnProp: "locationName",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "库位名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 160,
-          },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: 'toolOIRecordActualuseQty',
-            tableId: "toolOIRecord",
-            tableName: "common",
-            columnProp: "actualuseQty",
-            headerAlign: "center",
-            align: "right",
-            columnLabel: "已使用寿命",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100,
-          },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: 'toolOIRecordEstuseQty',
-            tableId: "toolOIRecord",
-            tableName: "common",
-            columnProp: "estuseQty",
-            headerAlign: "center",
-            align: "right",
-            columnLabel: "预计使用寿命",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100,
-          },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: 'toolOIRecordProp',
-            tableId: "toolOIRecord",
-            tableName: "common",
-            columnProp: "prop",
-            headerAlign: "center",
-            align: "right",
-            columnLabel: "使用比例",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100,
-          },
-        ],
-        // 用户table 配置集合
-        userColumnList: [],
-        // 展示按钮
-        buttons: {
-          search: '查询',
-          download: '导出',
-          settingTable: '设置列表',
-          defaultTable: '设置默认配置',
+        {
+          functionId: this.$route.meta.menuId,
+          languageValue: '导出',
+          objectId: 'download',
+          objectType: "button",
+          tableId: "toolOIRecord"
+        },
+        {
+          functionId: this.$route.meta.menuId,
+          languageValue: '设置列表',
+          objectId: 'settingTable',
+          objectType: "button",
+          tableId: "toolOIRecord"
         },
-        // 按钮列表
-        buttonList: [
-          {
-            functionId: this.$route.meta.menuId,
-            languageValue: '查询',
-            objectId: 'search',
-            objectType: "button",
-            tableId: "toolOIRecord"
-          },
-          {
-            functionId: this.$route.meta.menuId,
-            languageValue: '导出',
-            objectId: 'download',
-            objectType: "button",
-            tableId: "toolOIRecord"
-          },
-          {
-            functionId: this.$route.meta.menuId,
-            languageValue: '设置列表',
-            objectId: 'settingTable',
-            objectType: "button",
-            tableId: "toolOIRecord"
-          },
-          {
-            functionId: this.$route.meta.menuId,
-            languageValue: '设置默认配置',
-            objectId: 'defaultTable',
-            objectType: "button",
-            tableId: "toolOIRecord"
-          },
-        ],
-        // ------------ 页面属性 end ----------
-        // 导出 start
-        exportData: [],
-        exportName: this.$route.meta.title,
-        exportHeader: [this.$route.meta.title],
-        exportFooter: [],
-        exportDefaultValue: "",
-        // 导出 end
+        {
+          functionId: this.$route.meta.menuId,
+          languageValue: '设置默认配置',
+          objectId: 'defaultTable',
+          objectType: "button",
+          tableId: "toolOIRecord"
+        },
+      ],
+      // ------------ 页面属性 end ----------
+      // 导出 start
+      exportData: [],
+      exportName: this.$route.meta.title,
+      exportHeader: [this.$route.meta.title],
+      exportFooter: [],
+      exportDefaultValue: "",
+      // 导出 end
+
+    }
+  },
+  activated() {
 
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.height = window.innerHeight - 220;
+    })
+  },
+  methods: {
+
+    printMethod(row, printType) {
+      let dto = {
+        site: this.$store.state.user.site,
+        toolInstanceId: row.toolInstanceId
+      }
+      printToolData(dto).then(({data}) => {
+        if (data.code == 0) {
+          let printDataList = []
+          let printData = {
+            SupplierName: data.data.SupplierName,
+            createDate: data.data.createDate,
+            createdBy: data.data.createdBy,
+            estUseQty: data.data.estUseQty,
+            locationId: data.data.locationId,
+            phaseInDate: data.data.phaseInDate,
+            site: data.data.site,
+            spec: data.data.spec,
+            status: data.data.status,
+            supplierId: data.data.supplierId,
+            toolDescription: data.data.toolDescription,
+            toolId: data.data.toolId,
+            toolInstanceId: row.toolInstanceId
+          }
+          printDataList.push(printData)
+          if (printType == 'Y') {
+            this.labelPrintGJ(printDataList)
+          } else {
+            this.labelPrintWB(printDataList)
+          }
+        }
+      })
+
+    },
+    labelPrintWB(printDataList) {
+      const LODOP = getLodop()
+      if (LODOP) {
+        //循环调用打印机
+        for (let i = 0; i < printDataList.length; i++) {
+          let printData = printDataList[i]
+          LODOP.NewPage();
+          LODOP.SET_PRINT_PAGESIZE(0, 700, 180, "");
+          LODOP.SET_PRINT_MODE("PRINT_NOCOLLATE", 1);
+          LODOP.ADD_PRINT_RECT(2, 5, 250, 67, 0, 1);
+          LODOP.ADD_PRINT_LINE(19, 5, 18, 255, 0, 1);
+          LODOP.ADD_PRINT_LINE(36, 5, 35, 205, 0, 1);
+          LODOP.ADD_PRINT_LINE(54, 5, 53, 205, 0, 1);
+          LODOP.ADD_PRINT_LINE(2, 65, 69, 66, 0, 1);
+          LODOP.ADD_PRINT_LINE(68, 205, 18, 206, 0, 1);
+          LODOP.ADD_PRINT_BARCODE(21, 208, 90, 60, "QRCode", printData.toolInstanceId);
+          LODOP.ADD_PRINT_TEXT(5, 9, 60, 14, "工具名称");
+          LODOP.ADD_PRINT_TEXT(21, 9, 60, 15, "工具编号");
+          LODOP.ADD_PRINT_TEXT(38, 9, 60, 15, "实例编号");
+          LODOP.ADD_PRINT_TEXT(55, 9, 60, 15, "经办人");
+          LODOP.ADD_PRINT_TEXT(4, 70, 180, 14, printData.toolDescription);
+          LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
+          LODOP.ADD_PRINT_TEXT(21, 71, 133, 14, printData.toolId);
+          LODOP.ADD_PRINT_TEXT(39, 71, 133, 14, printData.toolInstanceId);
+          LODOP.ADD_PRINT_TEXT(55, 71, 133, 14, printData.createdBy);
+        }
+        //LODOP.PRINT_DESIGN();
+        LODOP.PREVIEW();
+        // LODOP.PRINT();
       }
     },
-    activated() {
+    labelPrintGJ(printDataList) {
+      const LODOP = getLodop()
+      if (LODOP) {
+        //LODOP.SET_LICENSES("","7B5624CC84EF99D6B17F27DF4AF4310C","","");
+        //LODOP.SET_LICENSES("", "7B5624CC84E599D6B17F27DF40F4310C", "", "");
+        //循环调用打印机
+        for (let i = 0; i < printDataList.length; i++) {
+          let printData = printDataList[i]
+          LODOP.NewPage();
+          LODOP.SET_PRINT_PAGESIZE(0, 700, 540, "");
+          LODOP.ADD_PRINT_RECT(6, 5, 250, 190, 0, 1);
+          LODOP.ADD_PRINT_LINE(24, 5, 23, 255, 0, 1);
+          LODOP.ADD_PRINT_LINE(41, 5, 40, 255, 0, 1);
+          LODOP.ADD_PRINT_LINE(58, 5, 57, 255, 0, 1);
+          LODOP.ADD_PRINT_LINE(75, 5, 74, 255, 0, 1);
+          LODOP.ADD_PRINT_LINE(92, 5, 91, 255, 0, 1);
+          LODOP.ADD_PRINT_LINE(109, 5, 108, 255, 0, 1);
+          LODOP.ADD_PRINT_LINE(126, 5, 125, 178, 0, 1);
+          LODOP.ADD_PRINT_LINE(144, 5, 143, 178, 0, 1);
+          LODOP.ADD_PRINT_LINE(162, 5, 161, 178, 0, 1);
+          LODOP.ADD_PRINT_LINE(179, 5, 178, 255, 0, 1);
+          LODOP.ADD_PRINT_LINE(23, 65, 195, 66, 0, 1);
+          LODOP.ADD_PRINT_LINE(178, 177, 108, 178, 0, 1);
+          LODOP.ADD_PRINT_BARCODE(110, 183, 110, 85, "QRCode", printData.toolInstanceId);
+          LODOP.ADD_PRINT_TEXT(9, 94, 100, 14, "工具标签");
+          LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+          LODOP.ADD_PRINT_TEXT(26, 9, 60, 14, "工具名称");
+          LODOP.ADD_PRINT_TEXT(43, 9, 60, 15, "规格型号");
+          LODOP.ADD_PRINT_TEXT(60, 9, 60, 15, "工具编号");
+          LODOP.ADD_PRINT_TEXT(77, 9, 60, 15, "实例编号");
+          LODOP.ADD_PRINT_TEXT(94, 9, 60, 15, "厂商");
+          LODOP.ADD_PRINT_TEXT(111, 9, 60, 15, "入库日期");
+          LODOP.ADD_PRINT_TEXT(129, 9, 60, 15, "库位");
+          LODOP.ADD_PRINT_TEXT(147, 9, 60, 15, "经办人");
+          LODOP.ADD_PRINT_TEXT(181, 9, 60, 15, "检验签章");
+          LODOP.ADD_PRINT_TEXT(25, 72, 180, 14, printData.toolDescription);
+          LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
+          LODOP.ADD_PRINT_TEXT(42, 72, 180, 14, printData.spec); // 规格
+          LODOP.ADD_PRINT_TEXT(60, 72, 180, 14, printData.toolId);
+          LODOP.ADD_PRINT_TEXT(78, 71, 180, 14, printData.toolInstanceId);
+          LODOP.ADD_PRINT_TEXT(94, 71, 180, 14, printData.SupplierName);
+          LODOP.ADD_PRINT_TEXT(111, 71, 95, 14, this.dayjs(printData.createDate).format("YYYY-MM-DD"));
+          LODOP.ADD_PRINT_TEXT(130, 71, 95, 14, printData.locationId);
+          LODOP.ADD_PRINT_TEXT(148, 71, 95, 14, printData.createdBy);
+
 
+        }
+        //LODOP.PRINT_DESIGN();
+        LODOP.PREVIEW();
+        //LODOP.PRINT();
+      }
+    },
+    // ---------------  业务  -------------------
+    getDataList() {
+      this.dataListLoading = true
+      this.queryTool.limit = this.pageSize
+      this.queryTool.page = this.pageIndex
+      getToolInfoList(this.queryTool).then(({data}) => {
+        if (data.code == 0) {
+          this.dataList = data.data.list
+          this.pageIndex = data.data.currPage
+          this.pageSize = data.data.pageSize
+          this.totalPage = data.data.totalCount
+        }
+        this.dataListLoading = false
+      })
+    },
+    getBaseData(val) {
+      if (this.tagNo === 3) {
+        this.queryTool.supplierId = val.SupplierID
+      }
     },
-    mounted() {
+    // 获取基础数据列表
+    getBaseList(val, number) {
+      this.tagNo = val
       this.$nextTick(() => {
-        this.height = window.innerHeight - 220;
+        let strVal = "";
+        if (val === 3) {
+          strVal = this.queryTool.supplierId
+        }
+        this.$refs.baseList.init(val, strVal)
       })
     },
-    methods: {
-      // ---------------  业务  -------------------
-      getDataList() {
-        this.dataListLoading = true
-        this.queryTool.limit = this.pageSize
-        this.queryTool.page = this.pageIndex
-        getToolInfoList(this.queryTool).then(({data}) => {
-          if (data.code == 0) {
-            this.dataList = data.data.list
-            this.pageIndex = data.data.currPage
-            this.pageSize = data.data.pageSize
-            this.totalPage = data.data.totalCount
-          }
-          this.dataListLoading = false
-        })
-      },
-      getBaseData(val) {
-        if (this.tagNo === 3) {
-            this.queryTool.supplierId = val.SupplierID
+
+    // ---------------  业务 end -----------------
+    //  --------- 动态列配置 ----------
+    // 打开页面设置
+    userSetting() {
+      this.visible = true;
+      let queryTable = {
+        userId: this.$store.state.user.name,
+        functionId: this.$route.meta.menuId,
+        tableId: "common1001",
+        languageCode: this.$i18n.locale
+      }
+      this.$nextTick(() => {
+        this.$refs.column.init(queryTable);
+      });
+    },
+    // 保存 默认配置 列
+    async saveColumnList() {
+      // 删除所有的该页面下保存的数据
+      if (this.userColumnList) {
+        //删除 user自定义的数据
+        await removerUser(this.queryTable)
+      }
+      // 删除默认配置
+      await removerDefault(this.queryTable)
+      // 保存页面 table属性
+      let sumColumnList = this.columnList
+      sumColumnList = sumColumnList.map(item => {
+        return item = {
+          tableId: item.tableId,
+          tableName: item.tableName,
+          columnProp: item.columnProp,
+          columnLabel: item.columnLabel,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: item.columnSortable,
+          columnWidth: item.columnWidth,
+          headerAlign: item.headerAlign,
+          format: item.format,
+          functionId: this.$route.meta.menuId,
+          sortLv: item.sortLv,
+          status: true,
+          fixed: item.fixed,
+          serialNumber: item.serialNumber,
+          columnType: item.columnType,
+          align: item.align
         }
-      },
-      // 获取基础数据列表
-      getBaseList(val,number) {
-        this.tagNo = val
-        this.$nextTick(() => {
-          let strVal = "";
-          if (val === 3) {
-              strVal =  this.queryTool.supplierId
-          }
-          this.$refs.baseList.init(val, strVal)
-        })
-      },
+      })
 
-      // ---------------  业务 end -----------------
-      //  --------- 动态列配置 ----------
-      // 打开页面设置
-      userSetting() {
-        this.visible = true;
-        let queryTable = {
-          userId: this.$store.state.user.name,
+      await saveTableDefaultList(sumColumnList)
+      // 保存页面 button label title 属性
+      let buttons = this.buttonList.map(item => {
+        return item = {
           functionId: this.$route.meta.menuId,
-          tableId: "common1001",
-          languageCode: this.$i18n.locale
+          languageValue: item.languageValue,
+          objectId: item.objectId,
+          objectType: item.objectType,
+          tableId: item.tableId
         }
-        this.$nextTick(() => {
-          this.$refs.column.init(queryTable);
-        });
-      },
-      // 保存 默认配置 列
-      async saveColumnList() {
-        // 删除所有的该页面下保存的数据
-        if (this.userColumnList) {
-          //删除 user自定义的数据
-          await removerUser(this.queryTable)
+      })
+      await saveButtonList(buttons)
+      this.getFunctionButtonList()
+      this.getColumnList()
+    },
+    // 获取 用户保存的 格式列
+    getTableUserColumn() {
+      getTableUserListLanguage(this.queryTableUser).then(({data}) => {
+        if (data.rows.length > 0) {
+          //this.columnList = []
+          this.columnList = data.rows
+        } else {
+          this.getColumnList()
         }
-        // 删除默认配置
-        await removerDefault(this.queryTable)
-        // 保存页面 table属性
-        let sumColumnList = this.columnList
-        sumColumnList = sumColumnList.map(item => {
-          return item = {
-            tableId: item.tableId,
-            tableName: item.tableName,
-            columnProp: item.columnProp,
-            columnLabel: item.columnLabel,
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: item.columnSortable,
-            columnWidth: item.columnWidth,
-            headerAlign: item.headerAlign,
-            format: item.format,
-            functionId: this.$route.meta.menuId,
-            sortLv: item.sortLv,
-            status: true,
-            fixed: item.fixed,
-            serialNumber: item.serialNumber,
-            columnType: item.columnType,
-            align: item.align
-          }
-        })
 
-        await saveTableDefaultList(sumColumnList)
-        // 保存页面 button label title 属性
-        let buttons = this.buttonList.map(item => {
-          return item = {
-            functionId: this.$route.meta.menuId,
-            languageValue: item.languageValue,
-            objectId: item.objectId,
-            objectType: item.objectType,
-            tableId: item.tableId
-          }
-        })
-        await saveButtonList(buttons)
-        this.getFunctionButtonList()
-        this.getColumnList()
-      },
-      // 获取 用户保存的 格式列
-      getTableUserColumn() {
-        getTableUserListLanguage(this.queryTableUser).then(({data}) => {
-          if (data.rows.length > 0) {
-            //this.columnList = []
-            this.columnList = data.rows
-          } else {
-            this.getColumnList()
-          }
-
-        })
-      },
-      // 获取 tableDefault 列
-      getColumnList() {
-        getTableDefaultListLanguage(this.queryTable).then(({data}) => {
-          if (!data.rows.length == 0) {
-            // this.showDefault = false
-            this.columnList = data.rows
-          } else {
-            // this.showDefault = true
-          }
-        })
-      },
-      // 获取button的词典
-      getFunctionButtonList() {
-        searchFunctionButtonList(this.queryButton).then(({data}) => {
-          if (data.code == 0) {
-            this.buttons = data.data
-          } else {
-            // saveButtonList(this.buttonList).then(({data}) => {
-            // })
-          }
-        })
-      },
-      //  --------- 动态列配置 end ----------
-      //  --------- 分页 ----------
-      // 每页数
-      sizeChangeHandle(val) {
-        this.pageSize = val
-        this.pageIndex = 1
-        this.getDataList()
-      },
-      // 当前页
-      currentChangeHandle(val) {
-        this.pageIndex = val
-        this.getDataList()
-      },
-      //  --------- 分页 end ----------
-      //  --------- 导出 ----------
-      fields() {
-        let json = "{"
-        this.columnList.forEach((item, index) => {
-          if (index == this.columnList.length - 1) {
-            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
-          } else {
-            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
-          }
-        })
-        json += "}"
-        let s = eval("(" + json + ")")
-        return s
-      },
-      createExportData() {
-        // 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
-        return this.dataList;
-      },
-      startDownload() {
-      },
-      finishDownload() {
-      }
-      //  --------- 导出 end ----------
+      })
     },
-    created() {
-      this.getTableUserColumn()
-      this.getFunctionButtonList()
+    // 获取 tableDefault 列
+    getColumnList() {
+      getTableDefaultListLanguage(this.queryTable).then(({data}) => {
+        if (!data.rows.length == 0) {
+          // this.showDefault = false
+          this.columnList = data.rows
+        } else {
+          // this.showDefault = true
+        }
+      })
+    },
+    // 获取button的词典
+    getFunctionButtonList() {
+      searchFunctionButtonList(this.queryButton).then(({data}) => {
+        if (data.code == 0) {
+          this.buttons = data.data
+        } else {
+          // saveButtonList(this.buttonList).then(({data}) => {
+          // })
+        }
+      })
+    },
+    //  --------- 动态列配置 end ----------
+    //  --------- 分页 ----------
+    // 每页数
+    sizeChangeHandle(val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+    //  --------- 分页 end ----------
+    //  --------- 导出 ----------
+    fields() {
+      let json = "{"
+      this.columnList.forEach((item, index) => {
+        if (index == this.columnList.length - 1) {
+          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+        } else {
+          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+        }
+      })
+      json += "}"
+      let s = eval("(" + json + ")")
+      return s
+    },
+    createExportData() {
+      // 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
+      return this.dataList;
+    },
+    startDownload() {
+    },
+    finishDownload() {
     }
+    //  --------- 导出 end ----------
+  },
+  created() {
+    this.getTableUserColumn()
+    this.getFunctionButtonList()
   }
+}
 </script>
 <style>