From 8bdd3455dc7a1018a2a791fe85ca426c02a03cb3 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Thu, 9 Mar 2023 09:46:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=BA=86=E5=88=80=E6=A8=A1=202023?=
 =?UTF-8?q?=E5=B9=B43=E6=9C=889=E6=97=A5=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                               |   4 +-
 package-lock.json                             |  13 -
 package.json                                  |   1 -
 src/api/toolMan/tool-info.js                  |   3 +
 src/assets/scss/global.scss                   |   1 +
 src/main.js                                   |   4 -
 src/views/main-navbar.vue                     |   2 +-
 .../modules/bulletinBoard/toolDetailBoard.vue |  33 +-
 src/views/modules/sys/menu.vue                |   2 +-
 src/views/modules/toolMan/location.vue        |   8 +-
 .../modules/toolMan/quarantineLibrary.vue     |  42 +-
 src/views/modules/toolMan/tool-info.vue       | 626 +++++++++---------
 src/views/modules/toolMan/toolResume.vue      |   8 +-
 13 files changed, 410 insertions(+), 337 deletions(-)

diff --git a/config/index.js b/config/index.js
index ec04e02a..f7e33952 100644
--- a/config/index.js
+++ b/config/index.js
@@ -23,8 +23,8 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    host: '192.168.1.110', // can be overwritten by process.env.HOST
-    port: 8002, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    host: 'localhost', // can be overwritten by process.env.HOST
+    port: 8003, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
     notifyOnErrors: true,
diff --git a/package-lock.json b/package-lock.json
index a73a8b18..c0b40a2e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9557,14 +9557,6 @@
         }
       }
     },
-    "kr-print-designer": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/kr-print-designer/-/kr-print-designer-1.1.8.tgz",
-      "integrity": "sha512-uQGv/XyjdpSNT3WZeCp1TswCvSywz3iU0Si7El+TGSRyyIBjKuawUe3MKzQWK0N2bWQdpZCnctTWw/C3buu4CQ==",
-      "requires": {
-        "nanoid": "^1.0.1"
-      }
-    },
     "last-call-webpack-plugin": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-2.1.2.tgz",
@@ -10554,11 +10546,6 @@
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz",
       "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="
     },
-    "nanoid": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-1.3.4.tgz",
-      "integrity": "sha512-4ug4BsuHxiVHoRUe1ud6rUFT3WUMmjXt1W0quL0CviZQANdan7D8kqN5/maw53hmAApY/jfzMRkC57BNNs60ZQ=="
-    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
diff --git a/package.json b/package.json
index a69acf7f..07809003 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,6 @@
     "gulp-load-plugins": "2.0.5",
     "gulp-replace": "1.0.0",
     "gulp-shell": "0.8.0",
-    "kr-print-designer": "^1.1.8",
     "lodash": "4.17.5",
     "node-sass": "4.13.1",
     "npm": "^6.9.0",
diff --git a/src/api/toolMan/tool-info.js b/src/api/toolMan/tool-info.js
index b2df6f83..0b6b5bed 100644
--- a/src/api/toolMan/tool-info.js
+++ b/src/api/toolMan/tool-info.js
@@ -25,5 +25,8 @@ export const flagAdd = data => createAPI(`toolInfo/flagAdd`,'POST',data)
 // 获取工具使用记录
 export const updateSoToolInspectionApplyList = data => createAPI(`evaluated/updateSoToolInspectionApplyList`,'POST',data)
 
+// 工具实例出入记录
+export const getToolTransInfoList = data => createAPI(`toolInfo/getToolTransInfoList`,'POST',data)
+
 
 
diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss
index 34c298fd..03fa0ada 100644
--- a/src/assets/scss/global.scss
+++ b/src/assets/scss/global.scss
@@ -114,3 +114,4 @@
 /* el-form-item 间距 end*/
 
 
+
diff --git a/src/main.js b/src/main.js
index b621078e..588e5845 100644
--- a/src/main.js
+++ b/src/main.js
@@ -14,10 +14,6 @@ import JsonExcel from 'vue-json-excel'
 import i18n from '@/i18n/i18n'
 import './directives'
 import decimalUtil from '@/utils/decimalUtil'
-import KrPrintDesigner from "kr-print-designer";
-import "kr-print-designer/lib/kr-print-designer.css";
-
-Vue.use(KrPrintDesigner);
 
 Vue.component('downloadExcel', JsonExcel)
 
diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index a40c631d..7e40d2f7 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -1,7 +1,7 @@
 <template>
   <nav class="site-navbar" :class="'site-navbar--' + navbarLayoutType">
     <div class="site-navbar__header">
-      <h1 class="site-navbar__brand" @click="$router.push({ name: 'home' })">
+      <h1 class="site-navbar__brand">
         <el-menu
           class="site-navbar__menu"
           mode="horizontal">
diff --git a/src/views/modules/bulletinBoard/toolDetailBoard.vue b/src/views/modules/bulletinBoard/toolDetailBoard.vue
index 091014b7..145a0a9a 100644
--- a/src/views/modules/bulletinBoard/toolDetailBoard.vue
+++ b/src/views/modules/bulletinBoard/toolDetailBoard.vue
@@ -24,9 +24,20 @@
       <el-form-item :label="inputLabel.headerInput.label6">
         <el-input style="width: 100px;" v-model="queryData.endDays" onkeyup="value=value.replace(/[^\d]/g,'')"></el-input>
       </el-form-item>
+      <el-form-item :label="'状态'">
+        <el-select style="width: 100px;"  v-model="queryData.status">
+          <el-option value="" label="全部"></el-option>
+          <el-option value="已启用" label="已启用"></el-option>
+          <el-option value="在库" label="在库"></el-option>
+          <el-option value="出库" label="出库"></el-option>
+          <el-option value="退库" label="退库"></el-option>
+          <el-option value="维修中" label="维修中"></el-option>
+          <el-option value="已报废" label="已报废"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button>
-        <el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}}
+        <el-button @click="saveColumnList()" type="primary" v-show="false">{{buttons.defaultTable}}
         </el-button>
         <el-button @click="userSetting" type="primary">{{ buttons.settingTable}}</el-button>
         <download-excel
@@ -117,7 +128,7 @@ import {
             label3 : '开始使用次数',
             label4 : '结束使用次数',
             label5 : '呆滞天数',
-            label6 : '————',
+            label6 : '—',
           },
         },
         queryData : {
@@ -128,6 +139,7 @@ import {
           endActualuseQty : '',
           startDays : '',
           endDays : '',
+          status: ''
         },
         site : this.$store.state.user.site,
         userName : this.$store.state.user.name,
@@ -267,6 +279,23 @@ import {
             status: true,
             fixed: false
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 2701,
+            serialNumber: 'toolDetail2701SupplierName',
+            tableId: "toolDetail2701",
+            tableName: "common",
+            columnProp: "status",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 2701,
diff --git a/src/views/modules/sys/menu.vue b/src/views/modules/sys/menu.vue
index da74e677..dcf02ad4 100644
--- a/src/views/modules/sys/menu.vue
+++ b/src/views/modules/sys/menu.vue
@@ -2,7 +2,7 @@
   <div class="mod-menu">
     <el-form :inline="true" :model="dataForm">
       <el-form-item>
-        <el-button v-if="isAuth('sys:menu:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+        <el-button  v-if="isAuth('sys:menu:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
       </el-form-item>
     </el-form>
 
diff --git a/src/views/modules/toolMan/location.vue b/src/views/modules/toolMan/location.vue
index 3db3f06b..92a8d8e6 100644
--- a/src/views/modules/toolMan/location.vue
+++ b/src/views/modules/toolMan/location.vue
@@ -781,13 +781,13 @@ import {
               LODOP.SET_PRINT_STYLE("LineHeight",-2);
               LODOP.ADD_PRINT_BARCODE(3,3,300,120,"QRCode",row.locationId);
               LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-              LODOP.ADD_PRINT_TEXT(10,205,400,150,row.locationId );
-              LODOP.SET_PRINT_STYLEA(0,"FontSize",40);
+              LODOP.ADD_PRINT_TEXT(39,122,331,43,row.locationId );
+              LODOP.SET_PRINT_STYLEA(0,"FontSize",25);
             }
 
-            LODOP.PRINT_DESIGN();
+           // LODOP.PRINT_DESIGN();
             //LODOP.PREVIEW();
-            // LODOP.PRINT();
+             LODOP.PRINT();
             console.log("操作成功！")
           }
         }
diff --git a/src/views/modules/toolMan/quarantineLibrary.vue b/src/views/modules/toolMan/quarantineLibrary.vue
index e6b3107c..153230c6 100644
--- a/src/views/modules/toolMan/quarantineLibrary.vue
+++ b/src/views/modules/toolMan/quarantineLibrary.vue
@@ -328,6 +328,40 @@ import {
             status: true,
             fixed: false,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 2101,
+            serialNumber: 'library2101OactualuseQty',
+            tableId: "library2101",
+            tableName: "libraryTable",
+            columnProp: "actualuseQty",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "使用次数",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 2101,
+            serialNumber: 'library2101OrepairQty',
+            tableId: "library2101",
+            tableName: "libraryTable",
+            columnProp: "repairQty",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "维修次数",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 2101,
@@ -860,7 +894,7 @@ import {
         saveTableDefaultList(this.columnList).then(({data}) => {
           if (data.code == 0) {
             this.$message.success(data.msg)
-            this.showDefault = false
+            //this.showDefault = false
           } else {
             this.$message.error(data.msg)
           }
@@ -868,7 +902,7 @@ import {
         saveTableDefaultList(this.columnList1).then(({data}) => {
           if (data.code == 0) {
             this.$message.success(data.msg)
-            this.showDefault = false
+           // this.showDefault = false
           } else {
             this.$message.error(data.msg)
           }
@@ -883,10 +917,10 @@ import {
       getColumnList() {
         getTableDefaultListLanguage(this.queryTable).then(({data}) => {
           if (!data.rows.length == 0) {
-            this.showDefault = false
+           // this.showDefault = false
             this.columnList = data.rows
           } else {
-            this.showDefault = true
+           // this.showDefault = true
           }
         })
       },
diff --git a/src/views/modules/toolMan/tool-info.vue b/src/views/modules/toolMan/tool-info.vue
index 948bea08..1b38e2b0 100644
--- a/src/views/modules/toolMan/tool-info.vue
+++ b/src/views/modules/toolMan/tool-info.vue
@@ -1,10 +1,11 @@
 <template>
-  <div  >
+  <div>
     <el-main style="background-color: #B3C0D1;padding: 2px;">
 
-      <el-form :inline="true"  label-position="top" label-width="100px">
+      <el-form :inline="true" label-position="top" label-width="100px">
         <el-form-item :label="inputLabel.headerInput.label1">
-          <el-input style="width: 100px;" @focus="initToolHeaderModel()" readonly v-model="headerData.toolId" ></el-input> <!---->
+          <el-input style="width: 100px;" @focus="initToolHeaderModel()" readonly
+                    v-model="headerData.toolId"></el-input> <!---->
         </el-form-item>
         <el-form-item :label="inputLabel.headerInput.label2">
           <el-input style="width: 100px;" readonly v-model="headerData.toolDescription"></el-input>
@@ -13,71 +14,73 @@
           <el-input style="width: 100px;" readonly v-model="headerData.spec"></el-input>
         </el-form-item>
         <el-form-item :label="inputLabel.headerInput.label4">
-          <el-input style="width: 100px;"  readonly v-model="headerData.site"></el-input>
+          <el-input style="width: 100px;" readonly v-model="headerData.site"></el-input>
         </el-form-item>
         <el-form-item :label="inputLabel.headerInput.label5">
-          <el-input style="width: 100px;" readonly  v-model="headerData.familyId"></el-input>
+          <el-input style="width: 100px;" readonly v-model="headerData.familyId"></el-input>
         </el-form-item>
         <el-form-item :label="inputLabel.headerInput.label6">
-          <el-input style="width: 100px;"  readonly v-model="headerData.familyName"></el-input>
+          <el-input style="width: 100px;" readonly v-model="headerData.familyName"></el-input>
         </el-form-item>
         <el-form-item :label="inputLabel.headerInput.label7">
-          <el-input style="width: 100px;"  readonly v-model="headerData.umid"></el-input>
+          <el-input style="width: 100px;" readonly v-model="headerData.umid"></el-input>
         </el-form-item>
         <el-form-item :label="inputLabel.headerInput.label8">
-          <el-input style="width: 90px;"  readonly v-model="headerData.strActive"></el-input>
+          <el-input style="width: 90px;" readonly v-model="headerData.strActive"></el-input>
         </el-form-item>
         <el-form-item :label="inputLabel.headerInput.label17">
-          <el-input style="width: 80px;"  readonly v-model="headerData.torNumdown"></el-input>
+          <el-input style="width: 80px;" readonly v-model="headerData.torNumdown"></el-input>
         </el-form-item>
         <el-form-item :label="inputLabel.headerInput.label18">
-          <el-input style="width: 80px;"  readonly v-model="headerData.torNumacc"></el-input>
+          <el-input style="width: 80px;" readonly v-model="headerData.torNumacc"></el-input>
         </el-form-item>
       </el-form>
 
-      <el-form :inline="true"  label-position="top" label-width="100px">
+      <el-form :inline="true" label-position="top" label-width="100px">
         <el-form-item :label="inputLabel.headerInput.label9">
-          <el-input style="width: 100px;"  readonly v-model="headerData.codeNo"></el-input>
+          <el-input style="width: 100px;" readonly v-model="headerData.codeNo"></el-input>
         </el-form-item>
         <el-form-item :label="inputLabel.headerInput.label10">
-          <el-input style="width: 100px;"  readonly v-model="headerData.defaultLocationId"></el-input>
+          <el-input style="width: 100px;" readonly v-model="headerData.defaultLocationId"></el-input>
         </el-form-item>
         <el-form-item :label="inputLabel.headerInput.label11">
-          <el-input style="width: 100px;"  readonly v-model="headerData.strPartCreated"></el-input>
+          <el-input style="width: 100px;" readonly v-model="headerData.strPartCreated"></el-input>
         </el-form-item>
         <el-form-item :label="inputLabel.headerInput.label12">
-          <el-input style="width: 100px;"  readonly v-model="headerData.partNo"></el-input>
+          <el-input style="width: 100px;" readonly v-model="headerData.partNo"></el-input>
         </el-form-item>
         <el-form-item :label="inputLabel.headerInput.label14">
-          <el-input style="width: 100px;"  readonly v-model="headerData.strCreateDate"></el-input>
+          <el-input style="width: 100px;" readonly v-model="headerData.strCreateDate"></el-input>
         </el-form-item>
         <el-form-item :label="inputLabel.headerInput.label15">
-          <el-input style="width: 100px;"  readonly v-model="headerData.createdBy"></el-input>
+          <el-input style="width: 100px;" readonly v-model="headerData.createdBy"></el-input>
         </el-form-item>
         <el-form-item :label="inputLabel.headerInput.label13">
-          <el-input style="width: 205px;" readonly  v-model="headerData.remark"></el-input>
+          <el-input style="width: 205px;" readonly v-model="headerData.remark"></el-input>
         </el-form-item>
-        <el-form-item >
+        <el-form-item>
           <upload style="margin-top: 27px;"></upload>
         </el-form-item>
       </el-form>
 
     </el-main>
 
-    <el-container >
+    <el-container>
 
       <el-aside width="50%" style="padding: 0px 2px;">
-        <el-form :inline="true"  label-position="top" label-width="95px" style="padding: 5px;">
-          <el-form-item >
+        <el-form :inline="true" label-position="top" label-width="95px" style="padding: 5px;">
+          <el-form-item>
             <!--            <el-button  type="primary">{{ inputLabel.leftInput.label1 }}</el-button> &lt;!&ndash;@click="initViewIfsTable('Y')"&ndash;&gt;-->
-            <el-button  @click="initToolModel()" type="primary" v-show="showDefault">{{ buttons.edit }}</el-button>
-            <el-button  @click="printReport()" type="primary" v-show="showDefault">{{ buttons.print }}</el-button>
-            <el-button  @click="initFlagAdd()" type="primary" v-show="showDefault">{{ buttons.badApplication }}</el-button>
+            <el-button @click="initToolModel()" type="primary" v-show="showDefault">{{ buttons.edit }}</el-button>
+            <el-button @click="printReport()" type="primary" v-show="showDefault">{{ buttons.print }}</el-button>
+            <el-button @click="initFlagAdd()" type="primary" v-show="showDefault">{{ buttons.badApplication }}
+            </el-button>
           </el-form-item>
         </el-form>
-        <el-form :inline="true"  label-position="top" label-width="100px">
+        <el-form :inline="true" label-position="top" label-width="100px">
           <el-form-item :label="inputLabel.leftInput.label1">
-            <el-select @change="toolInstanceIdChange(currentDetailData.toolInstanceId)" v-model="currentDetailData.toolInstanceId" placeholder="请选择" style="width: 115px;">
+            <el-select @change="toolInstanceIdChange(currentDetailData.toolInstanceId)"
+                       v-model="currentDetailData.toolInstanceId" placeholder="请选择" style="width: 115px;">
               <el-option
                 v-for="item in selectList.select4"
                 :key="item.value"
@@ -87,63 +90,63 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="inputLabel.leftInput.label2">
-            <el-input style="width: 100px;" readonly  v-model="currentDetailData.status"></el-input>
+            <el-input style="width: 100px;" readonly v-model="currentDetailData.status"></el-input>
           </el-form-item>
           <el-form-item :label="inputLabel.leftInput.label3">
-            <el-input style="width: 100px;" readonly  v-model="currentDetailData.supplierId"></el-input>
+            <el-input style="width: 100px;" readonly v-model="currentDetailData.supplierId"></el-input>
           </el-form-item>
           <el-form-item :label="inputLabel.leftInput.label4">
-            <el-input style="width: 100px;"  readonly v-model="currentDetailData.supplierName"></el-input>
+            <el-input style="width: 100px;" readonly v-model="currentDetailData.supplierName"></el-input>
           </el-form-item>
         </el-form>
 
-        <el-form :inline="true"  label-position="top" label-width="100px">
+        <el-form :inline="true" label-position="top" label-width="100px">
           <el-form-item :label="inputLabel.leftInput.label5">
-            <el-input style="width: 115px;" readonly  v-model="currentDetailData.strPurchaseDate"></el-input>
+            <el-input style="width: 115px;" readonly v-model="currentDetailData.strPurchaseDate"></el-input>
           </el-form-item>
           <el-form-item :label="inputLabel.leftInput.label6">
-            <el-input style="width: 100px;"  readonly v-model="currentDetailData.steelSeal"></el-input>
+            <el-input style="width: 100px;" readonly v-model="currentDetailData.steelSeal"></el-input>
           </el-form-item>
           <el-form-item :label="inputLabel.leftInput.label7">
-            <el-input style="width: 100px;"  readonly v-model="currentDetailData.strPhaseInDate"></el-input>
+            <el-input style="width: 100px;" readonly v-model="currentDetailData.strPhaseInDate"></el-input>
           </el-form-item>
           <el-form-item :label="inputLabel.leftInput.label8">
-            <el-input style="width: 100px;"  readonly v-model="currentDetailData.strPhaseOutDate"></el-input>
+            <el-input style="width: 100px;" readonly v-model="currentDetailData.strPhaseOutDate"></el-input>
           </el-form-item>
         </el-form>
 
-        <el-form :inline="true"  label-position="top" label-width="100px">
+        <el-form :inline="true" label-position="top" label-width="100px">
           <el-form-item :label="inputLabel.leftInput.label9" class="number">
-            <el-input style="width: 115px " readonly  v-model="currentDetailData.estuseQty"></el-input>
+            <el-input style="width: 115px " readonly v-model="currentDetailData.estuseQty"></el-input>
           </el-form-item>
           <el-form-item :label="inputLabel.leftInput.label10" class="number">
-            <el-input style="width: 100px;"  readonly v-model="currentDetailData.actualuseQty"></el-input>
+            <el-input style="width: 100px;" readonly v-model="currentDetailData.actualuseQty"></el-input>
           </el-form-item>
           <el-form-item :label="inputLabel.leftInput.label11">
-            <el-input style="width: 100px;"  readonly v-model="currentDetailData.strCreateDate"></el-input>
+            <el-input style="width: 100px;" readonly v-model="currentDetailData.strCreateDate"></el-input>
           </el-form-item>
           <el-form-item :label="inputLabel.leftInput.label12">
-            <el-input style="width: 100px;"  readonly v-model="currentDetailData.createdBy"></el-input>
+            <el-input style="width: 100px;" readonly v-model="currentDetailData.createdBy"></el-input>
           </el-form-item>
         </el-form>
-        <el-form :inline="true"  label-position="top" label-width="100px">
+        <el-form :inline="true" label-position="top" label-width="100px">
           <el-form-item :label="inputLabel.leftInput.label13">
-            <el-input style="width: 115px;"  readonly v-model="currentDetailData.orderNo"></el-input>
+            <el-input style="width: 115px;" readonly v-model="currentDetailData.orderNo"></el-input>
           </el-form-item>
           <el-form-item :label="inputLabel.leftInput.label16">
-            <el-input style="width: 100px;"  readonly v-model="currentDetailData.locationId"></el-input>
+            <el-input style="width: 100px;" readonly v-model="currentDetailData.locationId"></el-input>
           </el-form-item>
           <el-form-item :label="inputLabel.leftInput.label17">
-            <el-input style="width: 100px;"  readonly v-model="currentDetailData.userDisplay"></el-input>
+            <el-input style="width: 100px;" readonly v-model="currentDetailData.userDisplay"></el-input>
           </el-form-item>
           <el-form-item :label="inputLabel.leftInput.label14">
-            <el-input style="width: 100px;"  readonly v-model="currentDetailData.remark"></el-input>
+            <el-input style="width: 100px;" readonly v-model="currentDetailData.remark"></el-input>
           </el-form-item>
         </el-form>
       </el-aside>
 
       <el-main style="padding: 0px;">
-        <el-form :inline="true"  label-position="top" label-width="100px">
+        <el-form :inline="true" label-position="top" label-width="100px">
           <el-form-item :label="inputLabel.rightInput.label1">
           </el-form-item>
         </el-form>
@@ -179,7 +182,7 @@
           </el-table-column>
         </el-table>
 
-        <el-form :inline="true"  label-position="top" label-width="100px">
+        <el-form :inline="true" label-position="top" label-width="100px">
           <el-form-item :label="inputLabel.rightInput.label2">
           </el-form-item>
         </el-form>
@@ -217,9 +220,10 @@
         </el-table>
       </el-main>
     </el-container>
-    <column  v-if="visible" ref="column" @refreshData="getTableUserColumn"></column>
+    <column v-if="visible" ref="column" @refreshData="getTableUserColumn"></column>
 
-    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.headerInput.label16" :visible.sync="setUp.toolHeaderFlag" width="485px">
+    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag
+               :title="inputLabel.headerInput.label16" :visible.sync="setUp.toolHeaderFlag" width="485px">
       <el-form :inline="true" label-position="left">
         <el-form-item :label="inputLabel.headerInput.label1">
           <el-input style="width: 110px;" v-model="queryHeaderData.likeToolId"></el-input>
@@ -227,9 +231,9 @@
         <el-form-item :label="inputLabel.headerInput.label2">
           <el-input style="width: 110px;" v-model="queryHeaderData.likeToolDescription"></el-input>
         </el-form-item>
-        <el-form-item >
+        <el-form-item>
           <!--            <el-button  type="primary">{{ inputLabel.leftInput.label1 }}</el-button> &lt;!&ndash;@click="initViewIfsTable('Y')"&ndash;&gt;-->
-          <el-button  @click="getToolHeaderList()" type="primary" v-show="showDefault">{{ buttons.search }}</el-button>
+          <el-button @click="getToolHeaderList()" type="primary" v-show="showDefault">{{ buttons.search }}</el-button>
         </el-form-item>
         <el-table
           id="commmon3"
@@ -238,7 +242,7 @@
           border
           v-loading="dataListLoading"
           style="width: 100%;"
-          @row-dblclick="rowDblclick" >
+          @row-dblclick="rowDblclick">
           <el-table-column
             v-for="(item,index) in columnList2" :key="index"
             :sortable="item.columnSortable"
@@ -257,7 +261,8 @@
     </el-dialog>
 
 
-    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.leftInput.label15" :visible.sync="setUp.toolEditFlag" width="620px">
+    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.leftInput.label15"
+               :visible.sync="setUp.toolEditFlag" width="620px">
       <el-form :inline="true" label-position="top">
         <el-form-item :label="inputLabel.leftInput.label1">
           <el-input style="width: 130px;" readonly v-model="editData.toolInstanceId"></el-input>
@@ -284,14 +289,14 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item :label="inputLabel.leftInput.label6">
-          <el-input style="width: 130px;"   v-model="editData.steelSeal"></el-input>
+          <el-input style="width: 130px;" v-model="editData.steelSeal"></el-input>
         </el-form-item>
         <el-form-item :label="inputLabel.leftInput.label7">
           <el-date-picker
             v-model="editData.strPhaseInDate"
             type="date"
             placeholder="选择日期"
-            value-format = "yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
             style="width: 130px;">
           </el-date-picker>
         </el-form-item>
@@ -300,28 +305,28 @@
             v-model="editData.strPhaseOutDate"
             type="date"
             placeholder="选择日期"
-            value-format = "yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
             style="width: 130px;">
           </el-date-picker>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top">
         <el-form-item :label="inputLabel.leftInput.label9">
-          <el-input style="width: 130px;"   v-model="editData.estuseQty"></el-input>
+          <el-input style="width: 130px;" v-model="editData.estuseQty"></el-input>
         </el-form-item>
         <el-form-item :label="inputLabel.leftInput.label10">
-          <el-input style="width: 130px;"  readonly v-model="editData.actualuseQty"></el-input>
+          <el-input style="width: 130px;" readonly v-model="editData.actualuseQty"></el-input>
         </el-form-item>
-        <!--<el-form-item :label="inputLabel.leftInput.label11">
-          <el-input style="width: 130px;"   v-model="editData.strCreateDate"></el-input>
+        <el-form-item :label="inputLabel.leftInput.label18 || '工程师账号'">
+          <el-input style="width: 130px;"   v-model="editData.engineer"></el-input>
         </el-form-item>
-        <el-form-item :label="inputLabel.leftInput.label12">
-          <el-input style="width: 130px;"   v-model="editData.createdBy"></el-input>
-        </el-form-item>-->
+<!--        <el-form-item :label="inputLabel.leftInput.label12">-->
+<!--          <el-input style="width: 130px;"   v-model="editData.createdBy"></el-input>-->
+<!--        </el-form-item>-->
       </el-form>
       <el-form :inline="true" label-position="top">
         <el-form-item :label="inputLabel.leftInput.label14">
-          <el-input style="width: 440px;"   v-model="editData.remark"></el-input>
+          <el-input style="width: 440px;" v-model="editData.remark"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -330,10 +335,12 @@
     </span>
     </el-dialog>
 
-    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.modelInput.label1" :visible.sync="setUp.modelFlag" width="350px">
-      <el-form  label-position="top">
+    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.modelInput.label1"
+               :visible.sync="setUp.modelFlag" width="350px">
+      <el-form label-position="top">
         <el-form-item :label="inputLabel.modelInput.label2">
-          <el-input type="textarea" :rows="3" placeholder="请输入内容" style="width: 300px;padding: 0px 3px;"  v-model="remark"></el-input>
+          <el-input type="textarea" :rows="3" placeholder="请输入内容" style="width: 300px;padding: 0px 3px;"
+                    v-model="remark"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -348,6 +355,9 @@
 
 <script>
   import column from "../common/column";
+  import {
+    getTblUserList,
+  } from "@/api/toolMan/receive.js"
   import {
     searchSysLanguagePackList,
     searchSysLanguageParam,
@@ -388,141 +398,142 @@
     },
     data() {
       return {
-        toolHeaderList :[],
-        queryHeaderData : {
-          site : this.$store.state.user.site,
-          toolId : '',
-          toolDescription : '',
-          likeToolId : '',
-          likeToolDescription : '',
+        toolHeaderList: [],
+        queryHeaderData: {
+          site: this.$store.state.user.site,
+          toolId: '',
+          toolDescription: '',
+          likeToolId: '',
+          likeToolDescription: '',
         },
-        editData : {},
-        setUp :{
-          toolEditFlag : false,
-          saveToolFlag : false,
-          toolHeaderFlag : false,
-          modelFlag : false,
-          saveModelFlag : false,
+        editData: {},
+        setUp: {
+          toolEditFlag: false,
+          saveToolFlag: false,
+          toolHeaderFlag: false,
+          modelFlag: false,
+          saveModelFlag: false,
         },
-        toolInstanceIdUseHist : [],
-        sfdcToolingHistList : [],
-        selectList:{
-          select1 : [{
+        toolInstanceIdUseHist: [],
+        sfdcToolingHistList: [],
+        selectList: {
+          select1: [{
             value: 'Y',
             label: '启用'
-          },{
+          }, {
             value: 'N',
             label: '禁用'
           }],
-          select2 :[{
+          select2: [{
             value: 'Y',
             label: '是'
-          },{
+          }, {
             value: 'N',
             label: '否'
           }],
-          select3 :[{
+          select3: [{
             value: 'P',
             label: '个人'
-          },{
+          }, {
             value: 'G',
             label: '组'
           }],
-          select4 : [],
-          select5 : [],
+          select4: [],
+          select5: [],
         },
-        inputLabel :{
-          headerInput : {
-            label1 : '工具编码',
-            label2 : '工具名称',
-            label3 : '规格型号',
-            label4 : '工厂编号',
-            label5 : '工具分类',
-            label6 : '工具分类名称',
-            label7 : '计量单位',
-            label8 : '在用',
-            label9 : '属性模块',
-            label10 : '默认库位',
-            label11 : '创建物料编码',
-            label12 : '物料编码',
-            label13 : '说明',
-            label14 : '录入日期',
-            label15 : '录入人',
-            label16 : '工具编码信息',
-            label17 : '横排数',
-            label18 : '竖排数',
+        inputLabel: {
+          headerInput: {
+            label1: '工具编码',
+            label2: '工具名称',
+            label3: '规格型号',
+            label4: '工厂编号',
+            label5: '工具分类',
+            label6: '工具分类名称',
+            label7: '计量单位',
+            label8: '在用',
+            label9: '属性模块',
+            label10: '默认库位',
+            label11: '创建物料编码',
+            label12: '物料编码',
+            label13: '说明',
+            label14: '录入日期',
+            label15: '录入人',
+            label16: '工具编码信息',
+            label17: '横排数',
+            label18: '竖排数',
           },
-          leftInput :{
-            label1 : '实例编号',
-            label2 : '状态',
-            label3 : '供应商编码',
-            label4 : '供应商名称',
-            label5 : '采购日期',
-            label6 : '钢印信息',
-            label7 : '入库日期',
-            label8 : '停用日期',
-            label9 : '预计使用次数',
-            label10 : '实际使用次数',
-            label11 : '录入日期',
-            label12 : '录入人',
-            label13 : '采购订单号',
-            label14 : '备注',
-            label15 : '工具实例信息',
-            label16 : '库位编码',
-            label17 : '工程师',
+          leftInput: {
+            label1: '实例编号',
+            label2: '状态',
+            label3: '供应商编码',
+            label4: '供应商名称',
+            label5: '采购日期',
+            label6: '钢印信息',
+            label7: '入库日期',
+            label8: '停用日期',
+            label9: '预计使用次数',
+            label10: '实际使用次数',
+            label11: '录入日期',
+            label12: '录入人',
+            label13: '采购订单号',
+            label14: '备注',
+            label15: '工具实例信息',
+            label16: '库位编码',
+            label17: '工程师',
+            label18: '工程师账号',
           },
-          rightInput :{
-            label1 : '工具使用记录:',
-            label2 : '工具维修记录:',
+          rightInput: {
+            label1: '工具使用记录:',
+            label2: '工具维修记录:',
           },
-          modelInput : {
-            label1 : '审核信息',
-            label2 : '不合格原因',
+          modelInput: {
+            label1: '审核信息',
+            label2: '不合格原因',
           },
         },
-        remark : '',
-        currentDetailData :{
+        remark: '',
+        currentDetailData: {
           actualuseQty: '',
-          createDate:'',
-          createdBy:'',
-          description:'',
+          createDate: '',
+          createdBy: '',
+          description: '',
           estUseQty: '',
-          inspectDuration:'',
-          lastUpdateBy:'',
-          latestInspectDate:'',
-          latestUseDate:'',
-          locationId:'',
-          phaseInDate:'',
-          phaseOutDate:'',
-          purchaseDate:'',
-          remark:'',
-          site:'',
-          status:'',
-          statusRef:'',
-          supplierId:'',
-          supplierName:'',
-          toolDescription:'',
-          toolId:'',
-          toolIndex:'',
-          toolInstanceId:'',
-          torNumacc:'',
-          torNumdown:'',
-          workCenterNo:'',
-          steelSeal : '',
-          strCreateDate:'',
-          strLatestInspectDate:'',
-          strLatestUseDate:'',
-          strPhaseInDate:'',
-          strPhaseOutDate:'',
-          strPurchaseDate:'',
+          inspectDuration: '',
+          lastUpdateBy: '',
+          latestInspectDate: '',
+          latestUseDate: '',
+          locationId: '',
+          phaseInDate: '',
+          phaseOutDate: '',
+          purchaseDate: '',
+          remark: '',
+          site: '',
+          status: '',
+          statusRef: '',
+          supplierId: '',
+          supplierName: '',
+          toolDescription: '',
+          toolId: '',
+          toolIndex: '',
+          toolInstanceId: '',
+          torNumacc: '',
+          torNumdown: '',
+          workCenterNo: '',
+          steelSeal: '',
+          strCreateDate: '',
+          strLatestInspectDate: '',
+          strLatestUseDate: '',
+          strPhaseInDate: '',
+          strPhaseOutDate: '',
+          strPurchaseDate: '',
         },
-        detailList : [],
-        headerData :{},
-        site : this.$store.state.user.site,
-        userName : this.$store.state.user.name,
+        detailList: [],
+        headerData: {},
+        site: this.$store.state.user.site,
+        userName: this.$store.state.user.name,
         // table高度
-        height:450,
-        tableHeight : 300,
+        height: 450,
+        tableHeight: 300,
         // 是否收藏
         favorite: false,
         addLanguage: false,
@@ -707,7 +718,7 @@
           //   fixed: false,
           // }
         ],
-        columnList2 :[
+        columnList2: [
           {
             userId: this.$store.state.user.name,
             functionId: 2501,
@@ -759,8 +770,8 @@
           download: '导出',
           settingTable: '设置列表',
           defaultTable: '设置默认配置',
-          print : "打印",
-          badApplication : '不良申请',
+          print: "打印",
+          badApplication: '不良申请',
         },
         // 导出 start
         exportData: [],
@@ -856,11 +867,11 @@
       }
     },
     mounted() {
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.height = window.innerHeight - 255;
       })
-      this.$nextTick(()=>{
-        this.tableHeight = (window.innerHeight - 350)/2;
+      this.$nextTick(() => {
+        this.tableHeight = (window.innerHeight - 350) / 2;
       })
     },
     activated() {
@@ -869,12 +880,12 @@
       this.getLanguageList()
     },
     methods: {
-      modelVerification(){
+      modelVerification() {
         this.saveModelFlag = true
-        if(this.remark == ''){
+        if (this.remark == '') {
           this.$alert('请输入原因！', '操作提示', {
             confirmButtonText: '确定',
-            type :"warning",
+            type: "warning",
             callback: action => {
               this.saveModelFlag = false
             }
@@ -886,11 +897,11 @@
         this.saveFlagAdd()
       },
       //判断是否新增不良信息
-      initFlagAdd(){
-        if(this.currentDetailData.status != '在库'){
+      initFlagAdd() {
+        if (this.currentDetailData.status != '在库') {
           this.$alert('当前工具状态不为在库！', '操作提示', {
             confirmButtonText: '确定',
-            type :"warning",
+            type: "warning",
             callback: action => {
 
             }
@@ -900,21 +911,21 @@
         this.remark = ''
         this.setUp.modelFlag = true
       },
-      saveFlagAdd(){
+      saveFlagAdd() {
         let applyType = "待隔离处理"
         let queryDate = {
-          site : this.currentDetailData.site,
-          toolInstanceId : this.currentDetailData.toolInstanceId,
-          applyType : this.currentDetailData.applyType,
-          newApplyType : applyType,
+          site: this.currentDetailData.site,
+          toolInstanceId: this.currentDetailData.toolInstanceId,
+          applyType: this.currentDetailData.applyType,
+          newApplyType: applyType,
         }
-        flagAdd(queryDate).then(({data}) =>{
-          if(data.success){
+        flagAdd(queryDate).then(({data}) => {
+          if (data.success) {
             this.updateOffInspection()
-          }else {
+          } else {
             this.$alert(data.msg, '操作提示', {
               confirmButtonText: '确定',
-              type :"warning",
+              type: "warning",
               callback: action => {
 
               }
@@ -923,43 +934,43 @@
         })
       },
       //更改工具不良信息
-      updateOffInspection(){
+      updateOffInspection() {
         let addFlag = "Y";
         let passFlag = "N";
         let status = "隔离";
         let applyType = "待隔离处理";
         let jsonData = {
-          id : 0,
-          passFlag : passFlag,
-          actCheckBy : this.userName,
-          site : this.currentDetailData.site,
-          toolInstanceId : this.currentDetailData.toolInstanceId,
-          status : status,
-          orderref1 : this.currentDetailData.orderref1,
-          toolId : this.currentDetailData.toolId,
-          applyType : this.currentDetailData.applyType,
-          newApplyType : applyType,
-          addFlag : addFlag,
-          checkBy :this.currentDetailData.checkBy,
+          id: 0,
+          passFlag: passFlag,
+          actCheckBy: this.userName,
+          site: this.currentDetailData.site,
+          toolInstanceId: this.currentDetailData.toolInstanceId,
+          status: status,
+          orderref1: this.currentDetailData.orderref1,
+          toolId: this.currentDetailData.toolId,
+          applyType: this.currentDetailData.applyType,
+          newApplyType: applyType,
+          addFlag: addFlag,
+          checkBy: this.currentDetailData.checkBy,
           // remark : this.currentDetailData.remark,
-          remark : this.remark,
+          remark: this.remark,
         }
         let jsonList = []
         jsonList.push(jsonData)
-        updateSoToolInspectionApplyList(jsonList).then(({data}) =>{
-          if(data.code == 0){
+        updateSoToolInspectionApplyList(jsonList).then(({data}) => {
+          if (data.code == 0) {
             this.toolInstanceIdChange()
           }
           this.$alert(data.msg, '操作提示', {
             confirmButtonText: '确定',
-            type :"warning",
+            type: "warning",
             callback: action => {
 
             }
           });
         })
       },
-      rowDblclick(row, column, event){
+      rowDblclick(row, column, event) {
         console.log(row)
         console.log(column)
         console.log(event)
@@ -969,94 +980,109 @@
         this.setUp.toolHeaderFlag = false
       },
       getTime(date) {
-        if(date != null && date != ''){
+        if (date != null && date != '') {
           var json_date = new Date(date).toJSON();
           return new Date(new Date(json_date) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '')
         }
       },
-      saveToolDetail(){
+      saveToolDetail() {
         this.setUp.saveToolFlag = true
         this.editData.purchaseDate = this.editData.strPurchaseDate
         this.editData.phaseInDate = this.editData.strPhaseInDate
         this.editData.phaseOutDate = this.editData.strPhaseOutDate
-        updateToolDetail(this.editData).then((data) =>{
-          if (data.code == 0 || data.data.code == 0) {
-            this.toolInstanceIdChange()
+
+         // 校验 工程师是否存在
+        let dto ={
+          site: this.site,
+          baseData:  'engineer',
+          engineer: this.editData.engineer
+        }
+        getTblUserList(dto).then(({data}) =>{
+          if (data.code == 0 && data.list.length >0 ){
+            updateToolDetail(this.editData).then((data) => {
+              if (data.code == 0 || data.data.code == 0) {
+                this.toolInstanceIdChange()
+              }
+              this.$alert(data.data.msg, '操作提示', {
+                confirmButtonText: '确定',
+                type: "warning",
+                callback: action => {
+                  this.setUp.toolEditFlag = false
+                }
+              });
+              this.setUp.saveToolFlag = false
+            })
+          }else {
+            this.$message.warning('工程师账号不存在')
+            this.setUp.saveToolFlag = false
           }
-          this.$alert(data.data.msg, '操作提示', {
-            confirmButtonText: '确定',
-            type :"warning",
-            callback: action => {
-              this.setUp.toolEditFlag = false
-            }
-          });
-          this.setUp.saveToolFlag = false
         })
+
       },
-      initToolHeaderModel(){
+      initToolHeaderModel() {
         this.toolHeaderList = []
         this.setUp.toolHeaderFlag = true
         this.queryHeaderData.likeToolId = ''
         this.queryHeaderData.likeToolDescription = ''
         this.getToolHeaderList()
       },
-      getToolHeaderList(){
-        getToolHeaderList(this.queryHeaderData).then(({data}) =>{
+      getToolHeaderList() {
+        getToolHeaderList(this.queryHeaderData).then(({data}) => {
           this.toolHeaderList = data.rows
         })
       },
-      initToolModel(){
+      initToolModel() {
         this.setUp.toolEditFlag = true
         this.setUp.saveToolFlag = false
         this.editData = JSON.parse(JSON.stringify(this.currentDetailData))
       },
       //获取工具使用记录
-      getSfdcToolingHistList(){
+      getSfdcToolingHistList() {
         let queryData = {
-          site : this.site,
-          toolInstanceId : this.currentDetailData.toolInstanceId
+          site: this.site,
+          toolInstanceId: this.currentDetailData.toolInstanceId
         }
-        getSfdcToolingHistList(queryData).then(({data}) =>{
+        getSfdcToolingHistList(queryData).then(({data}) => {
           this.sfdcToolingHistList = data.rows
         })
       },
       //获取工具使用记录
-      getToolInstanceIdUseHist(){
+      getToolInstanceIdUseHist() {
         let queryData = {
-          site : this.site,
-          toolInstanceId : this.currentDetailData.toolInstanceId
+          site: this.site,
+          toolInstanceId: this.currentDetailData.toolInstanceId
         }
-        getToolInstanceIdUseHist(queryData).then(({data}) =>{
+        getToolInstanceIdUseHist(queryData).then(({data}) => {
           this.toolInstanceIdUseHist = data.rows
         })
       },
-      toolInstanceIdChange(){
+      toolInstanceIdChange() {
         this.sfdcToolingHistList = []
         this.toolInstanceIdUseHist = []
         let queryData = {
-          site : this.site,
-          toolInstanceId : this.currentDetailData.toolInstanceId,
+          site: this.site,
+          toolInstanceId: this.currentDetailData.toolInstanceId,
         }
-        getToolDetailList(queryData).then(({data}) =>{
+        getToolDetailList(queryData).then(({data}) => {
           let list = data.rows
-          if(list.length > 0){
+          if (list.length > 0) {
             this.currentDetailData = list[0]
             this.getToolInstanceIdUseHist()
             this.getSfdcToolingHistList()
           }
         })
       },
-      getDetailList(){
+      getDetailList() {
         this.currentDetailData = {}
         this.selectList.select4 = []
         this.sfdcToolingHistList = []
         this.toolInstanceIdUseHist = []
         let queryData = {
-          site : this.site,
-          toolId : this.headerData.toolId,
-          toolDescription : this.headerData.toolDescription,
+          site: this.site,
+          toolId: this.headerData.toolId,
+          toolDescription: this.headerData.toolDescription,
         }
-        getToolDetailList(queryData).then(({data}) =>{
+        getToolDetailList(queryData).then(({data}) => {
           let list = data.rows
           for (let i = 0; i < list.length; i++) {
             let selectData = {
@@ -1065,53 +1091,50 @@
             }
             this.selectList.select4.push(selectData);
           }
-          if(list.length > 0){
+          if (list.length > 0) {
             this.currentDetailData = list[0]
             this.toolInstanceIdChange()
           }
         })
       },
       //获取主记录信息
-      getHeaderData(){
+      getHeaderData() {
         let queryData = {
-          site : this.site,
-          toolId : this.headerData.toolId,
-          toolDescription : this.headerData.toolDescription,
+          site: this.site,
+          toolId: this.headerData.toolId,
+          toolDescription: this.headerData.toolDescription,
         }
-        getToolHeaderData(queryData).then(({data}) =>{
+        getToolHeaderData(queryData).then(({data}) => {
           this.headerData = data.row
           this.getDetailList()
         })
       },
       // 打印方式
-      printReport(){
+      printReport() {
         let row = this.currentDetailData
         // alert( this.$store.state.user.site)
-        this.$lodop.print(temp, data);
         const LODOP = getLodop()
         if (LODOP) {
-          LODOP.SET_LICENSES("","13F0BE83846277CB60918577C6281375","","");
+          LODOP.SET_LICENSES("", "13F0BE83846277CB60918577C6281375", "", "");
           LODOP.PRINT_INIT("ToolInstanceID");
-          LODOP.SET_PRINT_PAGESIZE(0,80,40,"");
+          LODOP.SET_PRINT_PAGESIZE(0, 80, 40, "");
           LODOP.SET_PRINT_STYLE("FontSize", 12);
           LODOP.NewPage();
-
           LODOP.PRINT_INIT('')  //初始化
-          LODOP.SET_PRINT_PAGESIZE(0,1000,400,"");
-          LODOP.SET_PRINT_STYLE("FontSize",12);
-          LODOP.SET_PRINT_STYLE("LineHeight",-2);
-          LODOP.ADD_PRINT_BARCODE(3,3,300,120,"QRCode",row.toolInstanceId);
-          LODOP.ADD_PRINT_TEXT(10,115,400,150,"实例编码:");
-          LODOP.ADD_PRINT_TEXT(10,205,400,150,row.toolInstanceId );
-          LODOP.ADD_PRINT_TEXT(32,115,400,150,"工具名称:");
-          LODOP.ADD_PRINT_TEXT(32,205,400,150,row.toolDescription );
-          LODOP.ADD_PRINT_TEXT(54,115,400,150,"入库日期:");
-          LODOP.ADD_PRINT_TEXT(54,205,400,150,row.createDate);
-          LODOP.ADD_PRINT_TEXT(76,115,400,150,"库位号:");
-          LODOP.ADD_PRINT_TEXT(76,205,400,150,row.currLocationId);
-          LODOP.ADD_PRINT_TEXT(98,115,400,150,"供应商编码:");
-          LODOP.ADD_PRINT_TEXT(98,205,400,150,row.supplierId);
-
+          LODOP.SET_PRINT_PAGESIZE(0, 1000, 400, "");
+          LODOP.SET_PRINT_STYLE("FontSize", 12);
+          LODOP.SET_PRINT_STYLE("LineHeight", -2);
+          LODOP.ADD_PRINT_BARCODE(3, 3, 300, 120, "QRCode", row.toolInstanceId);
+          LODOP.ADD_PRINT_TEXT(10, 115, 400, 150, "实例编码:");
+          LODOP.ADD_PRINT_TEXT(10, 205, 400, 150, row.toolInstanceId);
+          LODOP.ADD_PRINT_TEXT(32, 115, 400, 150, "工具名称:");
+          LODOP.ADD_PRINT_TEXT(32, 205, 400, 150, row.toolDescription);
+          LODOP.ADD_PRINT_TEXT(54, 115, 400, 150, "入库日期:");
+          LODOP.ADD_PRINT_TEXT(54, 205, 400, 150, row.createDate);
+          LODOP.ADD_PRINT_TEXT(76, 115, 400, 150, "库位号:");
+          LODOP.ADD_PRINT_TEXT(76, 205, 400, 150, row.locationId);
+          LODOP.ADD_PRINT_TEXT(98, 115, 400, 150, "供应商编码:");
+          LODOP.ADD_PRINT_TEXT(98, 205, 400, 150, row.supplierId);
           // LODOP.PRINT_DESIGN();
           //LODOP.PREVIEW();
           LODOP.PRINT();
@@ -1119,41 +1142,41 @@
         }
       },
       // 校验用户是否收藏
-      favoriteIsOk(){
-        let userFavorite ={
-          userId:this.$store.state.user.id,
-          languageCode:this.$i18n.locale
+      favoriteIsOk() {
+        let userFavorite = {
+          userId: this.$store.state.user.id,
+          languageCode: this.$i18n.locale
         }
-        userFavoriteList(userFavorite).then(({data}) =>{
-          let size = data.list.filter(item => item.userId==userFavorite.menuId).length;
-          if (size>0){
+        userFavoriteList(userFavorite).then(({data}) => {
+          let size = data.list.filter(item => item.userId == userFavorite.menuId).length;
+          if (size > 0) {
             this.favorite = true
-          }else {
+          } else {
             this.favorite = false
           }
         })
       },
       // 收藏 OR 取消收藏
-      favoriteFunction(){
-        let userFavorite ={
+      favoriteFunction() {
+        let userFavorite = {
           userId: this.$store.state.user.id,
           functionId: this.$route.meta.menuId,
         }
-        if (this.favorite){
+        if (this.favorite) {
           // 取消收藏
           this.$confirm(`确定取消收藏`, '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
           }).then(() => {
-            removeUserFavorite(userFavorite).then(({data})=>{
+            removeUserFavorite(userFavorite).then(({data}) => {
               this.$message.success(data.msg)
               this.favorite = false
             })
           })
-        }else {
+        } else {
           // 收藏
-          saveUserFavorite(userFavorite).then(({data})=>{
+          saveUserFavorite(userFavorite).then(({data}) => {
             this.$message.success(data.msg)
             this.favorite = true
           })
@@ -1202,7 +1225,7 @@
       // 获取button的词典
       getFunctionButtonList() {
         searchFunctionButtonList(this.queryButton).then(({data}) => {
-          if (JSON.stringify(data.data)!=='{}') {
+          if (JSON.stringify(data.data) !== '{}') {
             this.buttons = data.data
           } else {
             saveButtonList(this.buttonList).then(({data}) => {
@@ -1334,23 +1357,23 @@
         })
       },
 
-      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+"\""+ ","
+      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 +="}"
+        json += "}"
         let s = eval("(" + json + ")")
         return s
       },
       createExportData() {
         // 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
         // TODO:构造需要下载的数据返回
-        if(this.dataListSelections.length>0){
+        if (this.dataListSelections.length > 0) {
           return this.dataListSelections;
         }
         return this.dataList;
@@ -1372,7 +1395,7 @@
   }
 </script>
 
-<style >
+<style>
   .el-header, .el-footer {
     background-color: #B3C0D1;
     color: #333;
@@ -1406,7 +1429,8 @@
   .el-container:nth-child(7) .el-aside {
     line-height: 320px;
   }
-  .number .el-input__inner{
+
+  .number .el-input__inner {
     text-align: right;
   }
 </style>
diff --git a/src/views/modules/toolMan/toolResume.vue b/src/views/modules/toolMan/toolResume.vue
index 216ca4d1..5d132a92 100644
--- a/src/views/modules/toolMan/toolResume.vue
+++ b/src/views/modules/toolMan/toolResume.vue
@@ -17,7 +17,7 @@
       </el-form-item>
       <el-form-item>
         <el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button>
-        <el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}}
+        <el-button @click="saveColumnList()"  type="primary" v-show="showDefault">{{buttons.defaultTable}}
         </el-button>
         <el-button @click="userSetting" type="primary">{{ buttons.settingTable}}</el-button>
         <download-excel
@@ -374,7 +374,7 @@ import {
             columnProp: "actualuseQty",
             headerAlign: "center",
             align: "center",
-            columnLabel: "已使用米数",
+            columnLabel: "已使用次数",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -392,7 +392,7 @@ import {
             columnProp: "estuseQty",
             headerAlign: "center",
             align: "right",
-            columnLabel: "预计使用米数",
+            columnLabel: "预计使用次数",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -784,7 +784,7 @@ import {
       })
     },
     activated() {
-      this.getDataList()
+      //this.getDataList()
       this.getLanguageList()
     },
     methods: {