diff --git a/src/api/knifemold/receive.js b/src/api/knifemold/receive.js
index 49ccf91..1952786 100644
--- a/src/api/knifemold/receive.js
+++ b/src/api/knifemold/receive.js
@@ -33,5 +33,8 @@ export const printToolData =  data =>  createAPI(`toolMan/printToolData`,'POST',
 // 关闭接收
 export const closeReceiveStatus =  data =>  createAPI(`toolMan/closeReceiveStatus`,'POST',data)
 
+// 获取采购单信息
+export const getPRDetailInfo =  data =>  createAPI(`PRHeader/getPRDetailInfo`,'POST',data)
+
 
 
diff --git a/src/views/modules/knifemold/receive.vue b/src/views/modules/knifemold/receive.vue
index 863e635..4c0423b 100644
--- a/src/views/modules/knifemold/receive.vue
+++ b/src/views/modules/knifemold/receive.vue
@@ -85,9 +85,9 @@
             width="100"
             :label="buttons.operating">
             <template slot-scope="scope">
-              <a @click="closeReceive(scope.row)">{{'关闭'}}</a>
-              <a @click="initBannersFlag(scope.row)">{{buttons.receive}}</a>
-              <a @click="initFileModel(scope.row)">{{buttons.appendixInfo}}</a>
+              <a @click="closeReceive(scope.row)">{{ '关闭' }}</a>
+              <a @click="initBannersFlag(scope.row)">{{ buttons.receive }}</a>
+              <a @click="initFileModel(scope.row)">{{ buttons.appendixInfo }}</a>
             </template>
           </el-table-column>
         </el-table>
@@ -125,14 +125,15 @@
     </el-dialog>
 
     <el-dialog v-drag :close-on-click-modal="false" :visible.sync="poToolFlag" width="770px">
-      <span style="font-size: 13px" slot="title">  {{'接收单号:'+this.ifsToolData.transactionId + ' - 工具编码: ' + this.ifsToolData.toolId}}</span>
+      <span style="font-size: 13px"
+            slot="title">  {{ '接收单号:' + this.ifsToolData.transactionId + ' - 工具编码: ' + this.ifsToolData.toolId }}</span>
       <el-row>
         <el-col :span="24">
-          <el-button type="primary" :disabled="generateFlag" @click="initMailFlag()">{{buttons.generate}}</el-button>
-          <el-button type="primary" @click="printMethod('Y')">{{buttons.toolLabel}}</el-button>
-          <el-button type="primary" @click="printMethod('N')">{{buttons.screenLabel}}</el-button>
+          <el-button type="primary" :disabled="generateFlag" @click="initMailFlag()">{{ buttons.generate }}</el-button>
+          <el-button type="primary" @click="printMethod('Y')">{{ buttons.toolLabel }}</el-button>
+          <el-button type="primary" @click="printMethod('N')">{{ buttons.screenLabel }}</el-button>
           <el-button type="primary" :disabled="receiveQuantity>1" @click="setToolInstanceId()">
-            {{buttons.manualGenerate}}
+            {{ buttons.manualGenerate }}
           </el-button>
         </el-col>
       </el-row>
@@ -192,7 +193,8 @@
               :label="buttons.cz"
               align="center">
               <template slot-scope="scope">
-                <el-link v-if="scope.row.status == '已接收'" @click="editToolDetail(scope.row)">{{buttons.edit}}</el-link>
+                <el-link v-if="scope.row.status == '已接收'" @click="editToolDetail(scope.row)">{{ buttons.edit }}
+                </el-link>
               </template>
             </el-table-column>
           </el-table>
@@ -223,8 +225,8 @@
         </el-col>
       </el-row>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="manualInitMailFlag()">{{'确定'}}</el-button>
-        <el-button type="primary" @click="toolCodeFlag=false">{{'关闭'}}</el-button>
+        <el-button type="primary" @click="manualInitMailFlag()">{{ '确定' }}</el-button>
+        <el-button type="primary" @click="toolCodeFlag=false">{{ '关闭' }}</el-button>
     </span>
     </el-dialog>
     <el-dialog title="附件信息" :visible.sync="setUp.fileFlag" width="672px" :close-on-click-modal="false"
@@ -296,1516 +298,1534 @@
 </template>
 
 <script>
-  import column from "../common/column";
-  import {
-    searchSysLanguagePackList,
-    searchSysLanguageParam,
-    searchFunctionButtonList,
-    saveButtonList,
-    searchSysLanguage,
-    searchLanguageListByLanguageCode,
-    saveSysLanguageOne
-  } from "@/api/sysLanguage.js"
-  import {
-    saveTableDefaultList,
-    saveTableUser,
-    getTableDefaultListLanguage,
-    getTableUserListLanguage,
-    removerDefault,
-    removerUser
-  } from "@/api/table.js"
+import column from "../common/column";
+import {
+  searchSysLanguagePackList,
+  searchSysLanguageParam,
+  searchFunctionButtonList,
+  saveButtonList,
+  searchSysLanguage,
+  searchLanguageListByLanguageCode,
+  saveSysLanguageOne
+} from "@/api/sysLanguage.js"
+import {
+  saveTableDefaultList,
+  saveTableUser,
+  getTableDefaultListLanguage,
+  getTableUserListLanguage,
+  removerDefault,
+  removerUser
+} from "@/api/table.js"
 
-  import {
-    getViewIfsList,
-    getPoToolList,
-    getLocationList,
-    saveToolDetail,
-    updateIfsTool,
-    exportList,
-    getFileList,
-    printTool,
-    saveFileAssociate,
-    printToolData,
-    closeReceiveStatus
-  } from "@/api/knifemold/receive.js"
-  import {
-    getToolDetailList,
-    updateReceiveToolDetail,
-  } from '@/api/knifemold/tool-info.js'
+import {
+  getViewIfsList,
+  getPoToolList,
+  getLocationList,
+  saveToolDetail,
+  updateIfsTool,
+  exportList,
+  getFileList,
+  printTool,
+  saveFileAssociate,
+  printToolData,
+  closeReceiveStatus,
+  getPRDetailInfo
+} from "@/api/knifemold/receive.js"
+import {
+  getToolDetailList,
+  updateReceiveToolDetail,
+} from '@/api/knifemold/tool-info.js'
 
-  import getLodop from '@/utils/LodopFuncs.js'
-  import axios from "axios";
-  import Vue from "vue";
-  import upload from "../common/upload";
+import getLodop from '@/utils/LodopFuncs.js'
+import axios from "axios";
+import Vue from "vue";
+import upload from "../common/upload";
 
-  export default {
-    components: {
-      column
-      , upload
-    },
-    data() {
-      return {
-        toolEditFlag: false,
-        editToolData: {
-          toolInstanceId: '',
-          estUseQty: '',
-          site: '',
-          newToolInstanceId: ''
+export default {
+  components: {
+    column
+    , upload
+  },
+  data() {
+    return {
+      toolEditFlag: false,
+      editToolData: {
+        toolInstanceId: '',
+        estUseQty: '',
+        site: '',
+        newToolInstanceId: ''
+      },
+      toolCodeFlag: false,
+      pdfUrl: '',
+      fileList: [],
+      //设置
+      setUp: {
+        fileFlag: false,
+      },
+      selectList: {
+        select1: [{
+          value: 'Y',
+          label: '显示'
+        }, {
+          value: 'N',
+          label: '不显示'
+        }],
+        select2: [],
+      },
+      height: 0,
+      //搜索名称
+      inputSearch1: "工具编码",
+      inputSearch2: "工具名称",
+      inputSearch3: "接收数量",
+      inputSearch4: "使用寿命",
+      inputSearch5: "IQC检验",
+      inputSearch6: "上机检验",
+      inputSearch7: "录入库位",
+      inputSearch8: "横幅",
+      inputSearch9: "宽幅",
+      inputSearch10: "接收单号",
+      inputSearch11: "入库价格",
+      inputSearch12: "接收完成",
+      //横幅宽幅设定
+      bannersFlag: false,
+      bannersBut: false,
+      pdfVisible: false,
+      torNumacc: '',
+      torNumdown: '',
+      // 生成按钮是否可用
+      generateFlag: false,
+      // 接收数量
+      receiveQuantity: '',
+      // 使用寿命
+      serviceLife: '',
+      // 检验方式
+      radio: '',
+      // 录入库位
+      locationNo: '',
+      // 入库价格
+      invoicePrice: 0,
+      // 手工实例
+      toolInstanceId: '',
+      manual: 'N',
+      site: this.$store.state.user.site,
+      addLanguage: false,
+      functionId: this.$route.meta.menuId,
+      tableId: this.$route.meta.menuId + 'VIFS01',
+      value1: true,
+      visible: false,
+      showDefault: false,
+      poToolFlag: false,
+      poToolData: {},
+      ifsToolData: {},
+      queryViewIfs: {
+        //接收号
+        transactionId: '',
+        //工具编码搜索
+        toolId: "",
+        //工具名称搜索
+        description: "",
+        //工厂搜索
+        site: "",
+        //行数
+        limit: "",
+        //页数
+        page: "",
+        receiveFlag: 'N',
+      },
+      // 默认table 查询参数
+      queryTable: {
+        functionId: this.$route.meta.menuId,
+        tableId: this.$route.meta.menuId + 'VIFS01',
+        languageCode: this.$i18n.locale
+      },
+      // 用户table 查询参数
+      queryTableUser: {
+        userId: this.$store.state.user.name,
+        functionId: this.$route.meta.menuId,
+        tableId: this.$route.meta.menuId + 'VIFS01',
+        status: true,
+        languageCode: this.$i18n.locale
+      },
+      // 语言词典查询参数
+      querySysLanguageParam: {
+        languageCode: this.$i18n.locale
+      },
+      // 语言词典集合
+      sysLanguageParams: [],
+      // 用户table 配置集合
+      userColumnList: [],
+      // 展示列集
+      poToolColumnList: [
+        {
+          userId: this.$store.state.user.name,
+          serialNumber: '1001viewIfsTableTransactionId',
+          tableId: this.$route.meta.menuId + 'VIFS01',
+          tableName: "poToolTable",
+          columnProp: "toolInstanceId",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "实例编码",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
         },
-        toolCodeFlag: false,
-        pdfUrl: '',
-        fileList: [],
-        //设置
-        setUp: {
-          fileFlag: false,
+        {
+          userId: this.$store.state.user.name,
+          serialNumber: '1001viewIfsTableToolDescription',
+          tableId: this.$route.meta.menuId + 'VIFS01',
+          tableName: "poToolTable",
+          columnProp: "toolDescription",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "实例名称",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
         },
-        selectList: {
-          select1: [{
-            value: 'Y',
-            label: '显示'
-          }, {
-            value: 'N',
-            label: '不显示'
-          }],
-          select2: [],
+        {
+          userId: this.$store.state.user.name,
+          serialNumber: '1001viewIfsTableToolDescription',
+          tableId: this.$route.meta.menuId + 'VIFS01',
+          tableName: "poToolTable",
+          columnProp: "status",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "状态",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
         },
-        height: 0,
-        //搜索名称
-        inputSearch1: "工具编码",
-        inputSearch2: "工具名称",
-        inputSearch3: "接收数量",
-        inputSearch4: "使用寿命",
-        inputSearch5: "IQC检验",
-        inputSearch6: "上机检验",
-        inputSearch7: "录入库位",
-        inputSearch8: "横幅",
-        inputSearch9: "宽幅",
-        inputSearch10: "接收单号",
-        inputSearch11: "入库价格",
-        inputSearch12: "接收完成",
-        //横幅宽幅设定
-        bannersFlag: false,
-        bannersBut: false,
-        pdfVisible: false,
-        torNumacc: '',
-        torNumdown: '',
-        // 生成按钮是否可用
-        generateFlag: false,
-        // 接收数量
-        receiveQuantity: '',
-        // 使用寿命
-        serviceLife: '',
-        // 检验方式
-        radio: '',
-        // 录入库位
-        locationNo: '',
-        // 入库价格
-        invoicePrice: 0,
-        // 手工实例
-        toolInstanceId: '',
-        manual: 'N',
-        site: this.$store.state.user.site,
-        addLanguage: false,
+      ],
+      // 展示列集
+      columnList: [
+        {
+          userId: this.$store.state.user.name,
+          serialNumber: '1001viewIfsTableTransactionId',
+          tableId: this.$route.meta.menuId + 'VIFS01',
+          tableName: "viewIfsTable",
+          columnProp: "transactionId",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "接收单号",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          serialNumber: '1001viewIfsTableToolId',
+          tableId: this.$route.meta.menuId + 'VIFS01',
+          tableName: "viewIfsTable",
+          columnProp: "toolId",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "工具编码",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          serialNumber: '1001viewIfsTableDescription',
+          tableId: this.$route.meta.menuId + 'VIFS01',
+          tableName: "viewIfsTable",
+          columnProp: "description",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "工具名称",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          serialNumber: '1001viewIfsTableVendorNo',
+          tableId: this.$route.meta.menuId + 'VIFS01',
+          tableName: "viewIfsTable",
+          columnProp: "vendorNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "供应商编码",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          serialNumber: '1001viewIfsTableVendorName',
+          tableId: this.$route.meta.menuId + 'VIFS01',
+          tableName: "viewIfsTable",
+          columnProp: "vendorName",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "供应商名称",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          serialNumber: '1001viewIfsTableQuantity',
+          tableId: this.$route.meta.menuId + 'VIFS01',
+          tableName: "viewIfsTable",
+          columnProp: "quantity",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "数量",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          serialNumber: '1001viewIfsTableGenerateQuantity',
+          tableId: this.$route.meta.menuId + 'VIFS01',
+          tableName: "viewIfsTable",
+          columnProp: "generateQuantity",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "已接收数量",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        }, {
+          userId: this.$store.state.user.name,
+          serialNumber: '1001viewIfsTableGenerateQuantity',
+          tableId: this.$route.meta.menuId + 'VIFS01',
+          tableName: "viewIfsTable",
+          columnProp: "qtyReceived",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "入库数量",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+      ],
+      // 展示列集
+      columnList1: [
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 1001,
+        //   tableId: "common1002",
+        //   tableName: "commonLanguage",
+        //   columnProp: "functionId",
+        //   headerAlign: "center",
+        //   align: "center",
+        //   columnLabel: "功能编码",
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: false
+        // },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 1001,
+        //   tableId: "common1002",
+        //   tableName: "commonLanguage",
+        //   columnProp: "objectId",
+        //   headerAlign: "center",
+        //   align: "center",
+        //   columnLabel: "序列化编码",
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        // },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 1001,
+        //   tableId: "common1002",
+        //   tableName: "commonLanguage",
+        //   columnProp: "objectType",
+        //   headerAlign: "center",
+        //   align: "center",
+        //   columnLabel: "类型",
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        // },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 1001,
+        //   tableId: "common1002",
+        //   tableName: "commonLanguage",
+        //   columnProp: "languageValue",
+        //   headerAlign: "center",
+        //   align: "center",
+        //   columnLabel: "语言值",
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        // },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 1001,
+        //   tableId: "common1002",
+        //   tableName: "commonLanguage",
+        //   columnProp: "languageCode",
+        //   headerAlign: "center",
+        //   align: "center",
+        //   columnLabel: "语言编码",
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        // }
+      ],
+      // 展示列集
+      columnList2: [
+        {
+          userId: this.$store.state.user.name,
+          tableId: this.$route.meta.menuId + 'VIFS02',
+          tableName: "fileDetailTable",
+          columnProp: "fileName",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "文件名称",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          tableId: this.$route.meta.menuId + 'VIFS02',
+          tableName: "fileDetailTable",
+          columnProp: "createDate",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "创建时间",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 135,
+        },
+        {
+          userId: this.$store.state.user.name,
+          tableId: this.$route.meta.menuId + 'VIFS02',
+          tableName: "fileDetailTable",
+          columnProp: "createdBy",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "创建人",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 70,
+        },
+      ],
+      // 数据集
+      dataList: [],
+      currSelectList: [],
+      poToolList: [],
+      queryButton: {
         functionId: this.$route.meta.menuId,
         tableId: this.$route.meta.menuId + 'VIFS01',
-        value1: true,
-        visible: false,
-        showDefault: false,
-        poToolFlag: false,
-        poToolData: {},
-        ifsToolData: {},
-        queryViewIfs: {
-          //接收号
-          transactionId: '',
-          //工具编码搜索
-          toolId: "",
-          //工具名称搜索
-          description: "",
-          //工厂搜索
-          site: "",
-          //行数
-          limit: "",
-          //页数
-          page: "",
-          receiveFlag: 'N',
+        languageCode: this.$i18n.locale,
+        objectType: 'button'
+      },
+      buttons: {
+        cz: '操作',
+        receive: '接收',
+        add: '添加',
+        edit: '编辑',
+        delete: '删除',
+        deleteList: '批量删除',
+        operating: '操作',
+        search: '查询',
+        download: '导出',
+        settingTable: '设置列表',
+        defaultTable: '设置默认配置',
+        generate: "生成",
+        manualGenerate: "手动生成",
+        print: '打印',
+        appendixInfo: '附件信息',
+        fileDownload: '下载',
+        toolLabel: '工具标签',
+        screenLabel: '网版标签',
+      },
+      // 导出 start
+      exportData: [],
+      exportDataStandard: {
+        "功能编码": "functionId",
+        "序列化编码": "objectId",
+        "类型": "objectType",
+        "语言值": "languageValue"
+      },
+      exportName: "工具接收",
+      exportHeader: ["工具接收"],
+      exportFooter: [],
+      exportDefaultValue: "",
+      // 导出 end
+      buttonList: [
+        {
+          functionId: this.$route.meta.menuId,
+          languageValue: '接收',
+          objectId: 'receive',
+          objectType: "button",
+          tableId: this.$route.meta.menuId + 'VIFS01',
         },
-        // 默认table 查询参数
-        queryTable: {
+        {
           functionId: this.$route.meta.menuId,
+          languageValue: '生成',
+          objectId: 'generate',
+          objectType: "button",
           tableId: this.$route.meta.menuId + 'VIFS01',
-          languageCode: this.$i18n.locale
         },
-        // 用户table 查询参数
-        queryTableUser: {
-          userId: this.$store.state.user.name,
+        {
           functionId: this.$route.meta.menuId,
+          languageValue: '打印',
+          objectId: 'print',
+          objectType: "button",
+          tableId: this.$route.meta.menuId + 'VIFS01',
+        },
+        {
+          functionId: this.$route.meta.menuId,
+          languageValue: '关闭',
+          objectId: 'shutSown',
+          objectType: "button",
           tableId: this.$route.meta.menuId + 'VIFS01',
-          status: true,
-          languageCode: this.$i18n.locale
         },
-        // 语言词典查询参数
-        querySysLanguageParam: {
-          languageCode: this.$i18n.locale
+        {
+          functionId: this.$route.meta.menuId,
+          languageValue: '操作',
+          objectId: 'operating',
+          objectType: "button",
+          tableId: this.$route.meta.menuId + 'VIFS01',
         },
-        // 语言词典集合
-        sysLanguageParams: [],
-        // 用户table 配置集合
-        userColumnList: [],
-        // 展示列集
-        poToolColumnList: [
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: '1001viewIfsTableTransactionId',
-            tableId: this.$route.meta.menuId + 'VIFS01',
-            tableName: "poToolTable",
-            columnProp: "toolInstanceId",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "实例编码",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: false
-          },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: '1001viewIfsTableToolDescription',
-            tableId: this.$route.meta.menuId + 'VIFS01',
-            tableName: "poToolTable",
-            columnProp: "toolDescription",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "实例名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: false
-          },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: '1001viewIfsTableToolDescription',
-            tableId: this.$route.meta.menuId + 'VIFS01',
-            tableName: "poToolTable",
-            columnProp: "status",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "状态",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: false
-          },
-        ],
-        // 展示列集
-        columnList: [
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: '1001viewIfsTableTransactionId',
-            tableId: this.$route.meta.menuId + 'VIFS01',
-            tableName: "viewIfsTable",
-            columnProp: "transactionId",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "接收单号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: false
-          },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: '1001viewIfsTableToolId',
-            tableId: this.$route.meta.menuId + 'VIFS01',
-            tableName: "viewIfsTable",
-            columnProp: "toolId",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "工具编码",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: '1001viewIfsTableDescription',
-            tableId: this.$route.meta.menuId + 'VIFS01',
-            tableName: "viewIfsTable",
-            columnProp: "description",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "工具名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: '1001viewIfsTableVendorNo',
-            tableId: this.$route.meta.menuId + 'VIFS01',
-            tableName: "viewIfsTable",
-            columnProp: "vendorNo",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "供应商编码",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: '1001viewIfsTableVendorName',
-            tableId: this.$route.meta.menuId + 'VIFS01',
-            tableName: "viewIfsTable",
-            columnProp: "vendorName",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "供应商名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: '1001viewIfsTableQuantity',
-            tableId: this.$route.meta.menuId + 'VIFS01',
-            tableName: "viewIfsTable",
-            columnProp: "quantity",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "数量",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
-          {
-            userId: this.$store.state.user.name,
-            serialNumber: '1001viewIfsTableGenerateQuantity',
-            tableId: this.$route.meta.menuId + 'VIFS01',
-            tableName: "viewIfsTable",
-            columnProp: "generateQuantity",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "已接收数量",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          }, {
-            userId: this.$store.state.user.name,
-            serialNumber: '1001viewIfsTableGenerateQuantity',
-            tableId: this.$route.meta.menuId + 'VIFS01',
-            tableName: "viewIfsTable",
-            columnProp: "qtyReceived",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "入库数量",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
-        ],
-        // 展示列集
-        columnList1: [
-          // {
-          //   userId: this.$store.state.user.name,
-          //   functionId: 1001,
-          //   tableId: "common1002",
-          //   tableName: "commonLanguage",
-          //   columnProp: "functionId",
-          //   headerAlign: "center",
-          //   align: "center",
-          //   columnLabel: "功能编码",
-          //   columnHidden: false,
-          //   columnImage: false,
-          //   columnSortable: false,
-          //   sortLv: 0,
-          //   status: true,
-          //   fixed: false
-          // },
-          // {
-          //   userId: this.$store.state.user.name,
-          //   functionId: 1001,
-          //   tableId: "common1002",
-          //   tableName: "commonLanguage",
-          //   columnProp: "objectId",
-          //   headerAlign: "center",
-          //   align: "center",
-          //   columnLabel: "序列化编码",
-          //   columnHidden: false,
-          //   columnImage: false,
-          //   columnSortable: false,
-          //   sortLv: 0,
-          //   status: true,
-          //   fixed: '',
-          // },
-          // {
-          //   userId: this.$store.state.user.name,
-          //   functionId: 1001,
-          //   tableId: "common1002",
-          //   tableName: "commonLanguage",
-          //   columnProp: "objectType",
-          //   headerAlign: "center",
-          //   align: "center",
-          //   columnLabel: "类型",
-          //   columnHidden: false,
-          //   columnImage: false,
-          //   columnSortable: false,
-          //   sortLv: 0,
-          //   status: true,
-          //   fixed: '',
-          // },
-          // {
-          //   userId: this.$store.state.user.name,
-          //   functionId: 1001,
-          //   tableId: "common1002",
-          //   tableName: "commonLanguage",
-          //   columnProp: "languageValue",
-          //   headerAlign: "center",
-          //   align: "center",
-          //   columnLabel: "语言值",
-          //   columnHidden: false,
-          //   columnImage: false,
-          //   columnSortable: false,
-          //   sortLv: 0,
-          //   status: true,
-          //   fixed: '',
-          // },
-          // {
-          //   userId: this.$store.state.user.name,
-          //   functionId: 1001,
-          //   tableId: "common1002",
-          //   tableName: "commonLanguage",
-          //   columnProp: "languageCode",
-          //   headerAlign: "center",
-          //   align: "center",
-          //   columnLabel: "语言编码",
-          //   columnHidden: false,
-          //   columnImage: false,
-          //   columnSortable: false,
-          //   sortLv: 0,
-          //   status: true,
-          //   fixed: '',
-          // }
-        ],
-        // 展示列集
-        columnList2: [
-          {
-            userId: this.$store.state.user.name,
-            tableId: this.$route.meta.menuId + 'VIFS02',
-            tableName: "fileDetailTable",
-            columnProp: "fileName",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "文件名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: false
-          },
-          {
-            userId: this.$store.state.user.name,
-            tableId: this.$route.meta.menuId + 'VIFS02',
-            tableName: "fileDetailTable",
-            columnProp: "createDate",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "创建时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 135,
-          },
-          {
-            userId: this.$store.state.user.name,
-            tableId: this.$route.meta.menuId + 'VIFS02',
-            tableName: "fileDetailTable",
-            columnProp: "createdBy",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "创建人",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 70,
-          },
-        ],
-        // 数据集
-        dataList: [],
-        currSelectList: [],
-        poToolList: [],
-        queryButton: {
+        {
           functionId: this.$route.meta.menuId,
+          languageValue: '查询',
+          objectId: 'search',
+          objectType: "button",
           tableId: this.$route.meta.menuId + 'VIFS01',
-          languageCode: this.$i18n.locale,
-          objectType: 'button'
         },
-        buttons: {
-          cz: '操作',
-          receive: '接收',
-          add: '添加',
-          edit: '编辑',
-          delete: '删除',
-          deleteList: '批量删除',
-          operating: '操作',
-          search: '查询',
-          download: '导出',
-          settingTable: '设置列表',
-          defaultTable: '设置默认配置',
-          generate: "生成",
-          manualGenerate: "手动生成",
-          print: '打印',
-          appendixInfo: '附件信息',
-          fileDownload: '下载',
-          toolLabel: '工具标签',
-          screenLabel: '网版标签',
+        {
+          functionId: this.$route.meta.menuId,
+          languageValue: '导出',
+          objectId: 'download',
+          objectType: "button",
+          tableId: this.$route.meta.menuId + 'VIFS01',
         },
-        // 导出 start
-        exportData: [],
-        exportDataStandard: {
-          "功能编码": "functionId",
-          "序列化编码": "objectId",
-          "类型": "objectType",
-          "语言值": "languageValue"
+        {
+          functionId: this.$route.meta.menuId,
+          languageValue: '设置列表',
+          objectId: 'settingTable',
+          objectType: "button",
+          tableId: this.$route.meta.menuId + 'VIFS01',
         },
-        exportName: "工具接收",
-        exportHeader: ["工具接收"],
-        exportFooter: [],
-        exportDefaultValue: "",
-        // 导出 end
-        buttonList: [
-          {
-            functionId: this.$route.meta.menuId,
-            languageValue: '接收',
-            objectId: 'receive',
-            objectType: "button",
-            tableId: this.$route.meta.menuId + 'VIFS01',
-          },
-          {
-            functionId: this.$route.meta.menuId,
-            languageValue: '生成',
-            objectId: 'generate',
-            objectType: "button",
-            tableId: this.$route.meta.menuId + 'VIFS01',
-          },
-          {
-            functionId: this.$route.meta.menuId,
-            languageValue: '打印',
-            objectId: 'print',
-            objectType: "button",
-            tableId: this.$route.meta.menuId + 'VIFS01',
-          },
-          {
-            functionId: this.$route.meta.menuId,
-            languageValue: '关闭',
-            objectId: 'shutSown',
-            objectType: "button",
-            tableId: this.$route.meta.menuId + 'VIFS01',
-          },
-          {
-            functionId: this.$route.meta.menuId,
-            languageValue: '操作',
-            objectId: 'operating',
-            objectType: "button",
-            tableId: this.$route.meta.menuId + 'VIFS01',
-          },
-          {
-            functionId: this.$route.meta.menuId,
-            languageValue: '查询',
-            objectId: 'search',
-            objectType: "button",
-            tableId: this.$route.meta.menuId + 'VIFS01',
-          },
-          {
-            functionId: this.$route.meta.menuId,
-            languageValue: '导出',
-            objectId: 'download',
-            objectType: "button",
-            tableId: this.$route.meta.menuId + 'VIFS01',
-          },
-          {
-            functionId: this.$route.meta.menuId,
-            languageValue: '设置列表',
-            objectId: 'settingTable',
-            objectType: "button",
-            tableId: this.$route.meta.menuId + 'VIFS01',
-          },
-          {
-            functionId: this.$route.meta.menuId,
-            languageValue: '设置默认配置',
-            objectId: 'defaultTable',
-            objectType: "button",
-            tableId: this.$route.meta.menuId + 'VIFS01',
-          },
-        ],
-        languageList: [],
-        languageColumnList: [],
-        languageDataList: [],
-        queryLanguage: {},
-        // 数据集条件
-        querySysLanguagePack: {
-          page: 1,
-          limit: 1,
-          languageValue: '',
-          objectType: '',
-          objectId: ''
+        {
+          functionId: this.$route.meta.menuId,
+          languageValue: '设置默认配置',
+          objectId: 'defaultTable',
+          objectType: "button",
+          tableId: this.$route.meta.menuId + 'VIFS01',
         },
-        // 分页
-        pageIndex: 1,
-        pageSize: 100,
-        totalPage: 0,
-        dataListLoading: false,
-        dataListSelections: [],
-        addOrUpdateVisible: false,
-        insertFileList: [],
-        currentData: {},
+      ],
+      languageList: [],
+      languageColumnList: [],
+      languageDataList: [],
+      queryLanguage: {},
+      // 数据集条件
+      querySysLanguagePack: {
+        page: 1,
+        limit: 1,
+        languageValue: '',
+        objectType: '',
+        objectId: ''
+      },
+      // 分页
+      pageIndex: 1,
+      pageSize: 100,
+      totalPage: 0,
+      dataListLoading: false,
+      dataListSelections: [],
+      addOrUpdateVisible: false,
+      insertFileList: [],
+      currentData: {},
+    }
+  },
+  activated() {
+    // this.getDataList()
+    this.initViewIfsTable();
+    this.getLanguageList()
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.height = window.innerHeight - 220;
+    })
+  },
+  watch: {
+    radio() {
+      this.locationNo = ''
+    },
+    editToolData: {
+      deep: true,
+      handler: function (newV, oldV) {
+        if (this.editToolData.newToolInstanceId) {
+          this.editToolData.newToolInstanceId = this.editToolData.newToolInstanceId.toUpperCase()
+        }
       }
     },
-    activated() {
-      // this.getDataList()
-      this.initViewIfsTable();
-      this.getLanguageList()
+    locationNo() {
+      this.locationNo = this.locationNo.toUpperCase()
     },
-    mounted() {
-      this.$nextTick(() => {
-        this.height = window.innerHeight - 220;
-      })
+    toolInstanceId() {
+      this.toolInstanceId = this.toolInstanceId.toUpperCase()
     },
-    watch: {
-      radio() {
-        this.locationNo = ''
-      },
-      editToolData: {
-        deep: true,
-        handler: function (newV, oldV) {
-          if (this.editToolData.newToolInstanceId) {
-            this.editToolData.newToolInstanceId = this.editToolData.newToolInstanceId.toUpperCase()
+    poToolFlag() {
+      if (this.poToolFlag == false) {
+        this.initViewIfsTable()
+      }
+    }
+  },
+  methods: {
+    // 编辑工具接收信息
+    editToolDetail(row) {
+      this.getToolDetailList(row)
+      this.toolEditFlag = true
+    },
+    // 获取工具信息
+    getToolDetailList(row) {
+      let queryData = {
+        site: this.site,
+        toolInstanceId: row.toolInstanceId,
+      }
+      getToolDetailList(queryData).then(({data}) => {
+        if (data && data.code == 0 && data.rows) {
+          this.editToolData = {
+            newToolInstanceId: data.rows[0].toolInstanceId,
+            site: data.rows[0].site,
+            toolInstanceId: data.rows[0].toolInstanceId,
+            estUseQty: data.rows[0].estUseQty,
           }
         }
-      },
-      locationNo() {
-        this.locationNo = this.locationNo.toUpperCase()
-      },
-      toolInstanceId() {
-        this.toolInstanceId = this.toolInstanceId.toUpperCase()
-      },
-      poToolFlag() {
-        if (this.poToolFlag == false) {
-          this.initViewIfsTable()
+      })
+    },
+    // 修改接收信息
+    updateToolDetail() {
+      updateReceiveToolDetail(this.editToolData).then(({data}) => {
+        if (data.code == 0) {
+          this.$message.success(data.msg)
+          this.toolEditFlag = false
+          this.initPoToolTable()
+        } else {
+          this.$message.error(data.msg)
         }
+      })
+    },
+    childByValue(childValue) {
+      // childValue就是子组件传过来的值
+      this.fileList.push(childValue)
+      this.saveAssociate(childValue)
+    },
+    saveAssociate(row) {
+      let jsonList = [];
+      let jsonData = {
+        site: this.site,
+        sysOssId: row.id,
+        type: 'ReveiveFile',
+        associatedField1: this.currentData.transactionId,
       }
+      jsonList.push(jsonData)
+      saveFileAssociate(jsonList).then(({data}) => {
+
+      })
     },
-    methods: {
-      // 编辑工具接收信息
-      editToolDetail(row) {
-        this.getToolDetailList(row)
-        this.toolEditFlag = true
-      },
-      // 获取工具信息
-      getToolDetailList(row) {
-        let queryData = {
-          site: this.site,
-          toolInstanceId: row.toolInstanceId,
-        }
-        getToolDetailList(queryData).then(({data}) => {
-          if (data && data.code == 0 && data.rows) {
-            this.editToolData = {
-              newToolInstanceId:  data.rows[0].toolInstanceId,
-              site:  data.rows[0].site,
-              toolInstanceId:  data.rows[0].toolInstanceId,
-              estUseQty:  data.rows[0].estUseQty,
+    async printMethod(val) {
+      if (this.currSelectList.length <= 0) {
+        this.$alert('请选择工具信息！', '操作提示', {
+          confirmButtonText: '确定',
+          callback: action => {
+            this.bannersBut = false
+          }
+        });
+        return
+      }
+      let dto = {
+        site: this.currSelectList[0].site,
+        toolInstanceId: this.currSelectList[0].toolInstanceId
+      }
+      await printToolData(dto).then(({data}) => {
+        if (data.code == 0) {
+          let printDataList = []
+          for (const item of this.currSelectList) {
+            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: item.toolInstanceId
             }
+            printDataList.push(printData)
           }
-        })
-      },
-      // 修改接收信息
-      updateToolDetail() {
-        updateReceiveToolDetail(this.editToolData).then(({data}) => {
-          if (data.code == 0) {
-            this.$message.success(data.msg)
-            this.toolEditFlag = false
-            this.initPoToolTable()
+          if (val == 'Y') {
+            this.labelPrintGJ(printDataList)
           } else {
-            this.$message.error(data.msg)
+            this.labelPrintWB(printDataList)
           }
-        })
-      },
-      childByValue(childValue) {
-        // childValue就是子组件传过来的值
-        this.fileList.push(childValue)
-        this.saveAssociate(childValue)
-      },
-      saveAssociate(row) {
-        let jsonList = [];
-        let jsonData = {
-          site: this.site,
-          sysOssId: row.id,
-          type: 'ReveiveFile',
-          associatedField1: this.currentData.transactionId,
         }
-        jsonList.push(jsonData)
-        saveFileAssociate(jsonList).then(({data}) => {
+      })
 
-        })
-      },
-      async printMethod(val) {
-        if (this.currSelectList.length <= 0) {
-          this.$alert('请选择工具信息！', '操作提示', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.bannersBut = false
-            }
-          });
-          return
-        }
-        let dto = {
-          site: this.currSelectList[0].site,
-          toolInstanceId: this.currSelectList[0].toolInstanceId
+    },
+    labelPrintWB(printDataList) {
+      const LODOP = getLodop()
+      if (LODOP) {
+        //LODOP.SET_LICENSES("","7B5624CC84EF99D6B17F27DF4AF4310C","","");
+        //LODOP.SET_LICENSES("", "7B5624CC84EF99D6B17F27DF4AF4310C", "", "");
+        //循环调用打印机
+        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);
         }
-        await printToolData(dto).then(({data}) => {
-          if (data.code == 0) {
-            let printDataList = []
-            for (const item of this.currSelectList) {
-              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: item.toolInstanceId
-              }
-              printDataList.push(printData)
-            }
-            if (val == 'Y') {
-              this.labelPrintGJ(printDataList)
-            } else {
-              this.labelPrintWB(printDataList)
-            }
-          }
-        })
+        //LODOP.PRINT_DESIGN();
+        //LODOP.PREVIEW();
+        LODOP.PRINT();
 
-      },
-      labelPrintWB(printDataList) {
-        const LODOP = getLodop()
-        if (LODOP) {
-          //LODOP.SET_LICENSES("","7B5624CC84EF99D6B17F27DF4AF4310C","","");
-          //LODOP.SET_LICENSES("", "7B5624CC84EF99D6B17F27DF4AF4310C", "", "");
-          //循环调用打印机
-          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();
+      }
+    },
+    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);
 
-        }
-      },
-      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();
 
+      }
+    },
+    printMethod1(val) {
+      if (this.currSelectList.length <= 0) {
+        this.$alert('请选择工具信息！', '操作提示', {
+          confirmButtonText: '确定',
+          callback: action => {
+            this.bannersBut = false
           }
-          //LODOP.PRINT_DESIGN();
-          //LODOP.PREVIEW();
-          LODOP.PRINT();
-
-        }
-      },
-      printMethod1(val) {
-        if (this.currSelectList.length <= 0) {
-          this.$alert('请选择工具信息！', '操作提示', {
+        });
+        return
+      }
+      let reportFamily = ''
+      if (val == 'Y') {
+        reportFamily = '工具标签'
+      } else {
+        reportFamily = '网版标签'
+      }
+      let toolInstanceId = ''
+      for (let i = 0; i < this.currSelectList.length; i++) {
+        toolInstanceId += this.currSelectList[i].toolInstanceId + ";"
+      }
+      toolInstanceId = toolInstanceId.substring(0, toolInstanceId.length - 1)
+      let jsonData = {
+        reportFamily: reportFamily,
+        toolInstanceId: toolInstanceId,
+      }
+      printTool(jsonData).then(({data}) => {
+        if (data.code != 0) {
+          this.$alert(data.msg, '操作提示', {
             confirmButtonText: '确定',
             callback: action => {
               this.bannersBut = false
             }
           });
-          return
-        }
-        let reportFamily = ''
-        if (val == 'Y') {
-          reportFamily = '工具标签'
-        } else {
-          reportFamily = '网版标签'
         }
-        let toolInstanceId = ''
-        for (let i = 0; i < this.currSelectList.length; i++) {
-          toolInstanceId += this.currSelectList[i].toolInstanceId + ";"
+      })
+    },
+    // 文件下载
+    fileDownload(row) {
+      axios.get('/api/ftp/file/downFtpFile/' + row.id, {
+        responseType: 'blob',
+        headers: {
+          'Content-Type': 'application/json',
+          'token': Vue.cookie.get('token')
         }
-        toolInstanceId = toolInstanceId.substring(0, toolInstanceId.length - 1)
-        let jsonData = {
-          reportFamily: reportFamily,
-          toolInstanceId: toolInstanceId,
+      }).then(({data}) => {
+        // 不限制文件下载类型
+        const blob = new Blob([data], {type: "application/octet-stream"})
+        // 下载文件名称
+        const fileName = row.fileName
+        // a标签下载
+        const linkNode = document.createElement('a')
+        linkNode.download = fileName // a标签的download属性规定下载文件的名称
+        linkNode.style.display = 'none'
+        linkNode.href = URL.createObjectURL(blob) // 生成一个Blob URL
+        // if(val == 'Y'){
+        //   this.pdfVisible = true
+        //   this.pdfUrl = linkNode.href
+        // }else {
+        document.body.appendChild(linkNode)
+        linkNode.click() // 模拟在按钮上的一次鼠标单击
+        URL.revokeObjectURL(linkNode.href) // 释放URL 对象
+        document.body.removeChild(linkNode)
+        // }
+      })
+    },
+    filePreview(row) {
+      this.pdfVisible = true
+      this.pdfUrl = 'http://192.168.1.2:9002/file/' + row.newFileName
+    },
+    //初始化文件信息模态框
+    initFileModel(row) {
+      this.currentData = row
+      this.getFileList(row)
+      this.setUp.fileFlag = true
+    },
+    //获取申请单号文件信息
+    getFileList(row) {
+      let jsonData = {
+        site: row.site,
+        // type : 'PRFile',
+        associatedField1: row.transactionId
+      }
+      this.fileList = []
+      getFileList(jsonData).then(({data}) => {
+        if (data.code == 0) {
+          this.fileList = data.row
         }
-        printTool(jsonData).then(({data}) => {
-          if (data.code != 0) {
-            this.$alert(data.msg, '操作提示', {
-              confirmButtonText: '确定',
-              callback: action => {
-                this.bannersBut = false
-              }
-            });
+      })
+    },
+    getCurrSelectList(row) {
+      this.currSelectList = row
+    },
+    //检验横幅宽幅是否存在
+    saveBanners() {
+      this.bannersBut = true
+      if (this.torNumacc == "" || this.torNumacc <= 0) {
+        this.$alert('请输入正确的横幅！', '横幅', {
+          confirmButtonText: '确定',
+          callback: action => {
+            this.bannersBut = false
           }
-        })
-      },
-      // 文件下载
-      fileDownload(row) {
-        axios.get('/api/ftp/file/downFtpFile/' + row.id, {
-          responseType: 'blob',
-          headers: {
-            'Content-Type': 'application/json',
-            'token': Vue.cookie.get('token')
+        });
+        return
+      } else if (this.torNumdown == "" || this.torNumacc <= 0) {
+        this.$alert('请输入正确的宽幅！', '宽幅', {
+          confirmButtonText: '确定',
+          callback: action => {
+            this.bannersBut = false
           }
-        }).then(({data}) => {
-          // 不限制文件下载类型
-          const blob = new Blob([data], {type: "application/octet-stream"})
-          // 下载文件名称
-          const fileName = row.fileName
-          // a标签下载
-          const linkNode = document.createElement('a')
-          linkNode.download = fileName // a标签的download属性规定下载文件的名称
-          linkNode.style.display = 'none'
-          linkNode.href = URL.createObjectURL(blob) // 生成一个Blob URL
-          // if(val == 'Y'){
-          //   this.pdfVisible = true
-          //   this.pdfUrl = linkNode.href
-          // }else {
-          document.body.appendChild(linkNode)
-          linkNode.click() // 模拟在按钮上的一次鼠标单击
-          URL.revokeObjectURL(linkNode.href) // 释放URL 对象
-          document.body.removeChild(linkNode)
-          // }
-        })
-      },
-      filePreview(row) {
-        this.pdfVisible = true
-        this.pdfUrl = 'http://192.168.1.2:9002/file/' + row.newFileName
-      },
-      //初始化文件信息模态框
-      initFileModel(row) {
-        this.currentData = row
-        this.getFileList(row)
-        this.setUp.fileFlag = true
-      },
-      //获取申请单号文件信息
-      getFileList(row) {
-        let jsonData = {
-          site: row.site,
-          // type : 'PRFile',
-          associatedField1: row.transactionId
+        });
+        return
+      }
+      let updateData = {
+        site: this.site,
+        transactionId: this.ifsToolData.transactionId,
+        torNumacc: this.torNumacc,
+        torNumdown: this.torNumdown,
+      }
+      updateIfsTool(updateData).then(({data}) => {
+        this.bannersBut = false
+        if (data.code == 0) {
+          this.ifsToolData.torNumacc = this.torNumacc
+          this.ifsToolData.torNumacc = this.torNumacc
+          this.bannersFlag = false
+          this.$message.success(data.msg)
+          this.initPoToolTable()
+        } else {
+          this.$message.error(data.msg)
         }
-        this.fileList = []
-        getFileList(jsonData).then(({data}) => {
-          if (data.code == 0) {
-            this.fileList = data.row
+      })
+    },
+    // 手工生成
+    setToolInstanceId() {
+      this.toolCodeFlag = true
+      this.toolInstanceId = ''
+    },
+    manualInitMailFlag() {
+      this.generateFlag = true
+      if (this.toolInstanceId == null || this.toolInstanceId == '') {
+        this.$alert('请输入工具实例编码！', '接收数量', {
+          confirmButtonText: '确定',
+          callback: action => {
+            this.receiveQuantity = this.ifsToolData.quantity - this.ifsToolData.generateQuantity
+            this.generateFlag = false
           }
-        })
-      },
-      getCurrSelectList(row) {
-        this.currSelectList = row
-      },
-      //检验横幅宽幅是否存在
-      saveBanners() {
-        this.bannersBut = true
-        if (this.torNumacc == "" || this.torNumacc <= 0) {
-          this.$alert('请输入正确的横幅！', '横幅', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.bannersBut = false
-            }
-          });
-          return
-        } else if (this.torNumdown == "" || this.torNumacc <= 0) {
-          this.$alert('请输入正确的宽幅！', '宽幅', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.bannersBut = false
-            }
-          });
-          return
-        }
-        let updateData = {
-          site: this.site,
-          transactionId: this.ifsToolData.transactionId,
-          torNumacc: this.torNumacc,
-          torNumdown: this.torNumdown,
-        }
-        updateIfsTool(updateData).then(({data}) => {
-          this.bannersBut = false
-          if (data.code == 0) {
-            this.ifsToolData.torNumacc = this.torNumacc
-            this.ifsToolData.torNumacc = this.torNumacc
-            this.bannersFlag = false
-            this.$message.success(data.msg)
-            this.initPoToolTable()
-          } else {
-            this.$message.error(data.msg)
+        });
+        return
+      } else if (this.receiveQuantity == null || this.receiveQuantity == '') {
+        this.$alert('请输入接收数量！', '接收数量', {
+          confirmButtonText: '确定',
+          callback: action => {
+            this.receiveQuantity = this.ifsToolData.quantity - this.ifsToolData.generateQuantity
+            this.generateFlag = false
           }
-        })
-      },
-      // 手工生成
-      setToolInstanceId() {
-        this.toolCodeFlag = true
-        this.toolInstanceId = ''
-      },
-      manualInitMailFlag() {
-        this.generateFlag = true
-        if (this.toolInstanceId == null || this.toolInstanceId == '') {
-          this.$alert('请输入工具实例编码！', '接收数量', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.receiveQuantity = this.ifsToolData.quantity - this.ifsToolData.generateQuantity
-              this.generateFlag = false
-            }
-          });
-          return
-        } else if (this.receiveQuantity == null || this.receiveQuantity == '') {
-          this.$alert('请输入接收数量！', '接收数量', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.receiveQuantity = this.ifsToolData.quantity - this.ifsToolData.generateQuantity
-              this.generateFlag = false
-            }
-          });
-          return
-        } else if (this.receiveQuantity <= 0) {
-          this.$alert('请输入正确的接收数量！', '接收数量', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.receiveQuantity = this.ifsToolData.quantity - this.ifsToolData.generateQuantity
-              this.generateFlag = false
-            }
-          });
-          return
-        } else if (this.serviceLife == null || this.serviceLife == '') {
-          this.$alert('请输入使用寿命！', '使用寿命', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.serviceLife = 0
-              this.generateFlag = false
-            }
-          });
-          return
-        } else if (this.serviceLife <= 0) {
-          this.$alert('请输入正确的使用寿命！', '使用寿命', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.serviceLife = 0
-              this.generateFlag = false
-            }
-          });
-          return
-        } else if (this.invoicePrice <= 0) {
-          this.$alert('请输入入库价格！', '使用寿命', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.serviceLife = 0
-              this.generateFlag = false
-            }
-          });
-          return
-        }
-        if (this.radio == 'N') {
-          this.manualSaveToolInstanceId()
-        } else {
-          this.manualSaveToolInstanceId()
-        }
-      },
-      manualSaveToolInstanceId() {
-        let status;
-        if (this.radio == "Y") {
-          status = "出库"
+        });
+        return
+      } else if (this.receiveQuantity <= 0) {
+        this.$alert('请输入正确的接收数量！', '接收数量', {
+          confirmButtonText: '确定',
+          callback: action => {
+            this.receiveQuantity = this.ifsToolData.quantity - this.ifsToolData.generateQuantity
+            this.generateFlag = false
+          }
+        });
+        return
+      } else if (this.serviceLife == null || this.serviceLife == '') {
+        this.$alert('请输入使用寿命！', '使用寿命', {
+          confirmButtonText: '确定',
+          callback: action => {
+            this.serviceLife = 0
+            this.generateFlag = false
+          }
+        });
+        return
+      } else if (this.serviceLife <= 0) {
+        this.$alert('请输入正确的使用寿命！', '使用寿命', {
+          confirmButtonText: '确定',
+          callback: action => {
+            this.serviceLife = 0
+            this.generateFlag = false
+          }
+        });
+        return
+      } else if (this.invoicePrice <= 0) {
+        this.$alert('请输入入库价格！', '使用寿命', {
+          confirmButtonText: '确定',
+          callback: action => {
+            this.serviceLife = 0
+            this.generateFlag = false
+          }
+        });
+        return
+      }
+      if (this.radio == 'N') {
+        this.manualSaveToolInstanceId()
+      } else {
+        this.manualSaveToolInstanceId()
+      }
+    },
+    manualSaveToolInstanceId() {
+      let status;
+      if (this.radio == "Y") {
+        status = "出库"
+      } else {
+        status = "未投用"
+      }
+      let saveData = {
+        site: this.site,
+        toolId: this.ifsToolData.toolId,
+        description: this.ifsToolData.description,
+        userName: this.$store.state.user.name,
+        locationId: this.locationNo,
+        vendorNo: this.ifsToolData.vendorNo,
+        status: status,
+        estUseQty: this.serviceLife,
+        torNumacc: this.ifsToolData.torNumacc,
+        torNumdown: this.ifsToolData.torNumdown,
+        transactionId: this.ifsToolData.transactionId,
+        receiveQuantity: this.receiveQuantity,
+        type: this.radio,
+        orderNo: this.ifsToolData.orderNo,
+        releaseNo: this.ifsToolData.releaseNo,
+        sequenceNo: this.ifsToolData.sequenceNo,
+        lineItemNo: this.ifsToolData.lineItemNo,
+        vendorName: this.ifsToolData.vendorName,
+        invoicePrice: this.invoicePrice,
+        manual: 'Y',
+        toolInstanceId: this.toolInstanceId
+      }
+      let currQty = this.receiveQuantity
+      saveToolDetail(saveData).then(({data}) => {
+        this.generateFlag = false
+        if (data.code == 0) {
+          this.ifsToolData.generateQuantity += parseInt(currQty)
+          this.initPoToolTable()
+          this.toolCodeFlag = false
+          this.$message.success(data.msg)
         } else {
-          status = "未投用"
+          this.$message.error(data.msg)
         }
-        let saveData = {
+      })
+    },
+    //检验生成事件
+    initMailFlag() {
+      this.generateFlag = true
+      if (this.receiveQuantity == null || this.receiveQuantity == '') {
+        this.$alert('请输入接收数量！', '接收数量', {
+          confirmButtonText: '确定',
+          callback: action => {
+            this.receiveQuantity = this.ifsToolData.quantity - this.ifsToolData.generateQuantity
+            this.generateFlag = false
+          }
+        });
+        return
+      } else if (this.receiveQuantity <= 0) {
+        this.$alert('请输入正确的接收数量！', '接收数量', {
+          confirmButtonText: '确定',
+          callback: action => {
+            this.receiveQuantity = this.ifsToolData.quantity - this.ifsToolData.generateQuantity
+            this.generateFlag = false
+          }
+        });
+        return
+      } else if (this.serviceLife == null || this.serviceLife == '') {
+        this.$alert('请输入使用寿命！', '使用寿命', {
+          confirmButtonText: '确定',
+          callback: action => {
+            this.serviceLife = 0
+            this.generateFlag = false
+          }
+        });
+        return
+      } else if (this.serviceLife <= 0) {
+        this.$alert('请输入正确的使用寿命！', '使用寿命', {
+          confirmButtonText: '确定',
+          callback: action => {
+            this.serviceLife = 0
+            this.generateFlag = false
+          }
+        });
+        return
+      } else if (this.invoicePrice <= 0) {
+        this.$alert('请输入入库价格！', '使用寿命', {
+          confirmButtonText: '确定',
+          callback: action => {
+            this.serviceLife = 0
+            this.generateFlag = false
+          }
+        });
+        return
+      }
+      if (this.radio == 'N') {
+        this.saveToolInstanceId()
+      } else {
+        let queryLocation = {
           site: this.site,
-          toolId: this.ifsToolData.toolId,
-          description: this.ifsToolData.description,
-          userName: this.$store.state.user.name,
-          locationId: this.locationNo,
-          vendorNo: this.ifsToolData.vendorNo,
-          status: status,
-          estUseQty: this.serviceLife,
-          torNumacc: this.ifsToolData.torNumacc,
-          torNumdown: this.ifsToolData.torNumdown,
-          transactionId: this.ifsToolData.transactionId,
-          receiveQuantity: this.receiveQuantity,
-          type: this.radio,
-          orderNo: this.ifsToolData.orderNo,
-          releaseNo: this.ifsToolData.releaseNo,
-          sequenceNo: this.ifsToolData.sequenceNo,
-          lineItemNo: this.ifsToolData.lineItemNo,
-          vendorName: this.ifsToolData.vendorName,
-          invoicePrice: this.invoicePrice,
-          manual: 'Y',
-          toolInstanceId: this.toolInstanceId
+          locationid: this.locationNo,
+          limit: 1,
+          page: 1,
         }
-        let currQty = this.receiveQuantity
-        saveToolDetail(saveData).then(({data}) => {
-          this.generateFlag = false
+        this.saveToolInstanceId()
+        // this.initLocationFlag(queryLocation)
+      }
+
+    },
+    // 关闭接收
+    closeReceive(row) {
+      this.$confirm(`确定进行关闭接收操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        row.closeFlag = 'Y'
+        closeReceiveStatus(row).then(({data}) => {
           if (data.code == 0) {
-            this.ifsToolData.generateQuantity += parseInt(currQty)
-            this.initPoToolTable()
-            this.toolCodeFlag = false
             this.$message.success(data.msg)
-          } else {
-            this.$message.error(data.msg)
-          }
-        })
-      },
-      //检验生成事件
-      initMailFlag() {
-        this.generateFlag = true
-        if (this.receiveQuantity == null || this.receiveQuantity == '') {
-          this.$alert('请输入接收数量！', '接收数量', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.receiveQuantity = this.ifsToolData.quantity - this.ifsToolData.generateQuantity
-              this.generateFlag = false
-            }
-          });
-          return
-        } else if (this.receiveQuantity <= 0) {
-          this.$alert('请输入正确的接收数量！', '接收数量', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.receiveQuantity = this.ifsToolData.quantity - this.ifsToolData.generateQuantity
-              this.generateFlag = false
-            }
-          });
-          return
-        } else if (this.serviceLife == null || this.serviceLife == '') {
-          this.$alert('请输入使用寿命！', '使用寿命', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.serviceLife = 0
-              this.generateFlag = false
-            }
-          });
-          return
-        } else if (this.serviceLife <= 0) {
-          this.$alert('请输入正确的使用寿命！', '使用寿命', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.serviceLife = 0
-              this.generateFlag = false
-            }
-          });
-          return
-        } else if (this.invoicePrice <= 0) {
-          this.$alert('请输入入库价格！', '使用寿命', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.serviceLife = 0
-              this.generateFlag = false
-            }
-          });
-          return
-        }
-        if (this.radio == 'N') {
-          this.saveToolInstanceId()
-        } else {
-          let queryLocation = {
-            site: this.site,
-            locationid: this.locationNo,
-            limit: 1,
-            page: 1,
+            this.initViewIfsTable('Y')
           }
-          this.saveToolInstanceId()
-          // this.initLocationFlag(queryLocation)
-        }
-      },
-      // 关闭接收
-      closeReceive(row){
-        this.$confirm(`确定进行关闭接收操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          row.closeFlag = 'Y'
-          closeReceiveStatus(row).then(({data}) =>{
-            if (data.code == 0){
-              this.$message.success(data.msg)
-              this.initViewIfsTable('Y')
-            }
-          })
         })
+      })
 
-      },
-      //保存接收信息
-      saveToolInstanceId() {
-        let status;
-        if (this.radio == "Y") {
-          status = "出库"
+    },
+    //保存接收信息
+    saveToolInstanceId() {
+      let status;
+      if (this.radio == "Y") {
+        status = "出库"
+      } else {
+        status = "未投用"
+      }
+      let saveData = {
+        site: this.site,
+        toolId: this.ifsToolData.toolId,
+        description: this.ifsToolData.description,
+        userName: this.$store.state.user.name,
+        locationId: this.locationNo,
+        vendorNo: this.ifsToolData.vendorNo,
+        status: status,
+        estUseQty: this.serviceLife,
+        torNumacc: this.ifsToolData.torNumacc,
+        torNumdown: this.ifsToolData.torNumdown,
+        transactionId: this.ifsToolData.transactionId,
+        receiveQuantity: this.receiveQuantity,
+        type: this.radio,
+        orderNo: this.ifsToolData.orderNo,
+        releaseNo: this.ifsToolData.releaseNo,
+        sequenceNo: this.ifsToolData.sequenceNo,
+        lineItemNo: this.ifsToolData.lineItemNo,
+        vendorName: this.ifsToolData.vendorName,
+        invoicePrice: this.invoicePrice,
+        manual: 'N',
+        toolInstanceId: this.toolInstanceId
+      }
+      let currQty = this.receiveQuantity
+      saveToolDetail(saveData).then(({data}) => {
+        this.generateFlag = false
+        if (data.code == 0) {
+          this.ifsToolData.generateQuantity += parseInt(currQty)
+          this.initPoToolTable()
+          this.getPRDetailInfo()
         } else {
-          status = "未投用"
         }
-        let saveData = {
-          site: this.site,
-          toolId: this.ifsToolData.toolId,
-          description: this.ifsToolData.description,
-          userName: this.$store.state.user.name,
-          locationId: this.locationNo,
-          vendorNo: this.ifsToolData.vendorNo,
-          status: status,
-          estUseQty: this.serviceLife,
-          torNumacc: this.ifsToolData.torNumacc,
-          torNumdown: this.ifsToolData.torNumdown,
-          transactionId: this.ifsToolData.transactionId,
-          receiveQuantity: this.receiveQuantity,
-          type: this.radio,
-          orderNo: this.ifsToolData.orderNo,
-          releaseNo: this.ifsToolData.releaseNo,
-          sequenceNo: this.ifsToolData.sequenceNo,
-          lineItemNo: this.ifsToolData.lineItemNo,
-          vendorName: this.ifsToolData.vendorName,
-          invoicePrice: this.invoicePrice,
-          manual: 'N',
-          toolInstanceId: this.toolInstanceId
-        }
-        let currQty = this.receiveQuantity
-        saveToolDetail(saveData).then(({data}) => {
-          this.generateFlag = false
-          if (data.code == 0) {
-            this.ifsToolData.generateQuantity += parseInt(currQty)
-            this.initPoToolTable()
+        this.$alert(data.msg, '操作提示', {
+          confirmButtonText: '确定',
+          callback: action => {
+            this.addPRDetailFlag = false
+            this.bannersBut = false
+          }
+        });
+      })
+    },
+    //校验是否存在库位
+    async initLocationFlag(queryLocation) {
+      let locationFlag
+      await getLocationList(queryLocation).then(({data}) => {
+        if (data && data.code === 0) {
+          let list = data.rows.list
+          if (list.length > 0) {
+            this.saveToolInstanceId()
           } else {
+            this.$alert('请输入正确的库位！', '录入库位', {
+              confirmButtonText: '确定',
+              callback: action => {
+                this.serviceLife = 0
+                this.generateFlag = false
+              }
+            });
           }
-          this.$alert(data.msg, '操作提示', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.addPRDetailFlag = false
-              this.bannersBut = false
-            }
-          });
-        })
-      },
-      //校验是否存在库位
-      async initLocationFlag(queryLocation) {
-        let locationFlag
-        await getLocationList(queryLocation).then(({data}) => {
-          if (data && data.code === 0) {
-            let list = data.rows.list
-            if (list.length > 0) {
-              this.saveToolInstanceId()
-            } else {
-              this.$alert('请输入正确的库位！', '录入库位', {
-                confirmButtonText: '确定',
-                callback: action => {
-                  this.serviceLife = 0
-                  this.generateFlag = false
-                }
-              });
-            }
+        }
+      })
+      return locationFlag
+    },
+    //判断是否超过接收总数量
+    initQtyAlert() {
+      if (this.receiveQuantity > this.ifsToolData.quantity - this.ifsToolData.generateQuantity) {
+        this.$alert('超过当前接收数量！', '接收数量', {
+          confirmButtonText: '确定',
+          callback: action => {
+            this.receiveQuantity = this.ifsToolData.quantity - this.ifsToolData.generateQuantity
           }
-        })
-        return locationFlag
-      },
-      //判断是否超过接收总数量
-      initQtyAlert() {
-        if (this.receiveQuantity > this.ifsToolData.quantity - this.ifsToolData.generateQuantity) {
-          this.$alert('超过当前接收数量！', '接收数量', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.receiveQuantity = this.ifsToolData.quantity - this.ifsToolData.generateQuantity
-            }
-          });
+        });
+      }
+    },
+    //校验横幅宽幅是否存在
+    initBannersFlag(row) {
+      this.ifsToolData = row
+      if (this.ifsToolData.torNumacc == null || this.ifsToolData.torNumacc == "" || this.ifsToolData.torNumdown == null || this.ifsToolData.torNumdown == "") {
+        this.torNumacc = ''
+        this.torNumdown = ''
+        this.bannersFlag = true;
+      } else {
+        this.torNumacc = this.ifsToolData.torNumacc
+        this.torNumdown = this.ifsToolData.torNumdown
+        this.initPoToolTable()
+        this.getPRDetailInfo()
+      }
+    },
+    // 获取采购申请的寿命 , 单价
+    getPRDetailInfo() {
+      let query = {
+        site: this.$store.state.user.site,
+        //  接收号
+        requisitionno: this.ifsToolData.transactionId,
+      }
+      getPRDetailInfo(query).then(({data}) => {
+        if (data.code == 0) {
+          this.invoicePrice = data.data.price
+          this.serviceLife = data.data.lifespan
         }
-      },
-      //校验横幅宽幅是否存在
-      initBannersFlag(row) {
-        this.ifsToolData = row
-        if (this.ifsToolData.torNumacc == null || this.ifsToolData.torNumacc == "" || this.ifsToolData.torNumdown == null || this.ifsToolData.torNumdown == "") {
-          this.torNumacc = ''
-          this.torNumdown = ''
-          this.bannersFlag = true;
+      })
+    },
+    initPoToolTable() {
+      //是否显示加载效果
+      this.poToolFlag = true
+      this.dataListLoading = true
+      let queryPoTool = {
+        //  工具编码
+        toolId: this.ifsToolData.toolId,
+        //  工厂
+        site: this.site,
+        //  接收号
+        toolInstanceId: this.ifsToolData.transactionId,
+      }
+      this.receiveQuantity = this.ifsToolData.quantity - this.ifsToolData.generateQuantity
+      this.serviceLife = 0
+      this.radio = '0'
+      this.invoicePrice = 0
+      this.locationNo = ''
+      this.generateFlag = false
+      getPoToolList(queryPoTool).then(({data}) => {
+        if (data && data.code === 0) {
+          this.poToolList = data.rows
         } else {
-          this.torNumacc = this.ifsToolData.torNumacc
-          this.torNumdown = this.ifsToolData.torNumdown
-          this.initPoToolTable()
+          this.poToolList = []
         }
-      },
-      initPoToolTable() {
-        //是否显示加载效果
-        this.poToolFlag = true
-        this.dataListLoading = true
-        let queryPoTool = {
-          //  工具编码
-          toolId: this.ifsToolData.toolId,
-          //  工厂
-          site: this.site,
-          //  接收号
-          toolInstanceId: this.ifsToolData.transactionId,
+        this.dataListLoading = false
+      })
+    },
+    // 获取数据列表
+    initViewIfsTable(val) {
+      if (val == "Y") {
+        this.pageIndex = 1
+      }
+      //是否显示加载效果
+      this.dataListLoading = true
+      //显示数据条数
+      this.queryViewIfs.limit = this.pageSize
+      //分页页面
+      this.queryViewIfs.page = this.pageIndex
+      //设置工厂
+      this.queryViewIfs.site = this.site
+      //
+
+      getViewIfsList(this.queryViewIfs).then(({data}) => {
+        if (data && data.code === 0) {
+          this.dataList = data.rows.list
+          this.totalPage = data.rows.totalCount
+        } else {
+          this.dataList = []
+          this.totalPage = 0
         }
-        this.receiveQuantity = this.ifsToolData.quantity - this.ifsToolData.generateQuantity
-        this.serviceLife = 0
-        this.radio = '0'
-        this.invoicePrice = 0
-        this.locationNo = ''
-        this.generateFlag = false
-        getPoToolList(queryPoTool).then(({data}) => {
-          if (data && data.code === 0) {
-            this.poToolList = data.rows
-          } else {
-            this.poToolList = []
-          }
-          this.dataListLoading = false
-        })
-      },
-      // 获取数据列表
-      initViewIfsTable(val) {
-        if (val == "Y") {
-          this.pageIndex = 1
+        this.dataListLoading = false
+      })
+    },
+    // 收藏
+    favorites() {
+
+    },
+    // 获取多语言列表
+    getLanguageList() {
+      searchSysLanguage(this.queryLanguage).then(({data}) => {
+        this.languageList = data.rows
+      })
+    },
+    // 获取button的词典
+    getFunctionButtonList() {
+      searchFunctionButtonList(this.queryButton).then(({data}) => {
+        if (data.data.length > 0) {
+          this.buttons = data.data
+        } else {
+          saveButtonList(this.buttonList).then(({data}) => {
+          })
         }
-        //是否显示加载效果
-        this.dataListLoading = true
-        //显示数据条数
-        this.queryViewIfs.limit = this.pageSize
-        //分页页面
-        this.queryViewIfs.page = this.pageIndex
-        //设置工厂
-        this.queryViewIfs.site = this.site
-        //
+      })
+    },
+    // 获取语言词典
+    getSysLanguageParamList() {
+      searchSysLanguageParam(this.querySysLanguageParam).then(({data}) => {
+        this.sysLanguageParams = data.rows
+      })
+    },
+    // 打开页面设置
+    userSetting() {
+      this.visible = true;
+      this.getTableUserAll()
+    },
+    // 获取 用户的配置
+    getTableUserAll() {
+      let queryTable = {
+        userId: this.$store.state.user.name,
+        functionId: this.$route.meta.menuId,
+        tableId: this.tableId,
+        languageCode: this.$i18n.locale
+      }
+      this.visible = true;
+      this.$nextTick(() => {
 
-        getViewIfsList(this.queryViewIfs).then(({data}) => {
-          if (data && data.code === 0) {
-            this.dataList = data.rows.list
-            this.totalPage = data.rows.totalCount
-          } else {
-            this.dataList = []
-            this.totalPage = 0
-          }
-          this.dataListLoading = false
-        })
-      },
-      // 收藏
-      favorites() {
+        this.$refs.column.init(queryTable);
+      });
+    },
+    // 获取 用户保存的 格式列
+    getTableUserColumn() {
+      getTableUserListLanguage(this.queryTableUser).then(({data}) => {
+        if (data.rows.length > 0) {
+          //this.columnList = []
+          this.columnList = data.rows
+        } else {
+          this.getColumnList()
+        }
 
-      },
-      // 获取多语言列表
-      getLanguageList() {
-        searchSysLanguage(this.queryLanguage).then(({data}) => {
-          this.languageList = data.rows
-        })
-      },
-      // 获取button的词典
-      getFunctionButtonList() {
-        searchFunctionButtonList(this.queryButton).then(({data}) => {
-          if (data.data.length > 0) {
-            this.buttons = data.data
-          } else {
-            saveButtonList(this.buttonList).then(({data}) => {
-            })
-          }
-        })
-      },
-      // 获取语言词典
-      getSysLanguageParamList() {
-        searchSysLanguageParam(this.querySysLanguageParam).then(({data}) => {
-          this.sysLanguageParams = data.rows
-        })
-      },
-      // 打开页面设置
-      userSetting() {
-        this.visible = true;
-        this.getTableUserAll()
-      },
-      // 获取 用户的配置
-      getTableUserAll() {
-        let queryTable = {
-          userId: this.$store.state.user.name,
+      })
+    },
+    // 保存 默认配置 列
+    async saveColumnList() {
+      // 删除所有的该页面下保存的数据
+      if (this.userColumnList) {
+        //删除 user自定义的数据
+        await removerUser(this.queryTable)
+      }
+      // 删除默认配置
+      await removerDefault(this.queryTable)
+      // 保存页面 table属性
+      let sumColumnList = this.columnList.concat(this.columnList1);
+      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: null,
+          format: null,
           functionId: this.$route.meta.menuId,
-          tableId: this.tableId,
-          languageCode: this.$i18n.locale
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          serialNumber: null,
+          columnType: null,
+          align: null
         }
-        this.visible = true;
-        this.$nextTick(() => {
-
-          this.$refs.column.init(queryTable);
-        });
-      },
-      // 获取 用户保存的 格式列
-      getTableUserColumn() {
-        getTableUserListLanguage(this.queryTableUser).then(({data}) => {
-          if (data.rows.length > 0) {
-            //this.columnList = []
-            this.columnList = data.rows
-          } else {
-            this.getColumnList()
-          }
+      })
 
-        })
-      },
-      // 保存 默认配置 列
-      async saveColumnList() {
-        // 删除所有的该页面下保存的数据
-        if (this.userColumnList) {
-          //删除 user自定义的数据
-          await removerUser(this.queryTable)
+      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 removerDefault(this.queryTable)
-        // 保存页面 table属性
-        let sumColumnList = this.columnList.concat(this.columnList1);
-        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: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          }
-        })
-
-        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()
-      },
-      // 获取 tableDefault 列
-      getColumnList() {
-        getTableDefaultListLanguage(this.queryTable).then(({data}) => {
-          if (!data.rows.length == 0) {
-            // this.showDefault = false
-            this.columnList = data.rows
-          } else {
-            // this.showDefault = true
-          }
-        })
-      },
-      // 获取数据列表
-      getDataList() {
-        this.dataListLoading = true
-        this.querySysLanguagePack.limit = this.pageSize
-        this.querySysLanguagePack.page = this.pageIndex
-        searchSysLanguagePackList(this.querySysLanguagePack).then(({data}) => {
+      })
+      await saveButtonList(buttons)
+      this.getFunctionButtonList()
+      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
+        }
+      })
+    },
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true
+      this.querySysLanguagePack.limit = this.pageSize
+      this.querySysLanguagePack.page = this.pageIndex
+      searchSysLanguagePackList(this.querySysLanguagePack).then(({data}) => {
+        if (data && data.code === 0) {
+          this.dataList = data.page.list
+          this.totalPage = data.page.totalCount
+        } else {
+          this.dataList = []
+          this.totalPage = 0
+        }
+        this.dataListLoading = false
+      })
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.initViewIfsTable()
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.pageIndex = val
+      this.initViewIfsTable()
+    },
+    // 多选
+    selectionChangeHandle(val) {
+      this.dataListSelections = val
+    },
+    // 删除
+    deleteHandle(id) {
+      var ids = id ? [id] : this.dataListSelections.map(item => {
+        return item.id
+      })
+      this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$http({
+          url: this.$http.adornUrl('//prd/delete'),
+          method: 'post',
+          data: this.$http.adornData(ids, false)
+        }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
-          } else {
-            this.dataList = []
-            this.totalPage = 0
-          }
-          this.dataListLoading = false
-        })
-      },
-      // 每页数
-      sizeChangeHandle(val) {
-        this.pageSize = val
-        this.pageIndex = 1
-        this.initViewIfsTable()
-      },
-      // 当前页
-      currentChangeHandle(val) {
-        this.pageIndex = val
-        this.initViewIfsTable()
-      },
-      // 多选
-      selectionChangeHandle(val) {
-        this.dataListSelections = val
-      },
-      // 删除
-      deleteHandle(id) {
-        var ids = id ? [id] : this.dataListSelections.map(item => {
-          return item.id
-        })
-        this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$http({
-            url: this.$http.adornUrl('//prd/delete'),
-            method: 'post',
-            data: this.$http.adornData(ids, false)
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message.success('操作成功')
-              this.initViewIfsTable()
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        })
-      },
-      fields() {
-        let json = "{"
-        this.columnList.forEach((item, index) => {
-          if (index == this.columnList.length - 1) {
-            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+            this.$message.success('操作成功')
+            this.initViewIfsTable()
           } else {
-            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+            this.$message.error(data.msg)
           }
         })
-        json += "}"
-        let s = eval("(" + json + ")")
+      })
+    },
+    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() {
-        // 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
-        // TODO:构造需要下载的数据返回
-        exportList(this.queryViewIfs).then(({data}) => {
-          if (data && data.code === 0) {
-            return data.rows.list;
-          }
-        })
-        return this.dataList;
-      },
-      startDownload() {
-        //  this.exportData = this.dataList
-        console.log("数据开始")
-      },
-      finishDownload() {
-        console.log("数据下载完成")
-      }
+      return s
     },
-    created() {
-      this.getTableUserColumn()
-      this.getSysLanguageParamList()
-      this.getFunctionButtonList()
+    createExportData() {
+      // 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
+      // TODO:构造需要下载的数据返回
+      exportList(this.queryViewIfs).then(({data}) => {
+        if (data && data.code === 0) {
+          return data.rows.list;
+        }
+      })
+      return this.dataList;
+    },
+    startDownload() {
+      //  this.exportData = this.dataList
+      console.log("数据开始")
+    },
+    finishDownload() {
+      console.log("数据下载完成")
     }
+  },
+  created() {
+    this.getTableUserColumn()
+    this.getSysLanguageParamList()
+    this.getFunctionButtonList()
   }
+}
 </script>
 <style>
-  .sl-input {
-    background-color: transparent;
-    border: 0 !important;
-    font-size: 12px !important;
-    height: 12px !important;
-    line-height: 14px !important;
-    background-color: transparent !important;
-    width: 140px;
-  }
+.sl-input {
+  background-color: transparent;
+  border: 0 !important;
+  font-size: 12px !important;
+  height: 12px !important;
+  line-height: 14px !important;
+  background-color: transparent !important;
+  width: 140px;
+}
 
-  .sl-input:focus, textarea:focus {
+.sl-input:focus, textarea:focus {
 
-    outline: none;
+  outline: none;
 
-  }
+}
 
 </style>
diff --git a/src/views/modules/purchaseorder/purchaseRequisition.vue b/src/views/modules/purchaseorder/purchaseRequisition.vue
index 98bb68c..4465731 100644
--- a/src/views/modules/purchaseorder/purchaseRequisition.vue
+++ b/src/views/modules/purchaseorder/purchaseRequisition.vue
@@ -208,7 +208,9 @@
               </el-select>
             </el-form-item>
             <el-form-item :label="'工具编码'">
-              <span v-if="showToolIdList" slot="label" @click="getBaseList(70)"><el-link>{{ '工具编码' }}</el-link> </span>
+              <span v-if="showToolIdList" slot="label" @click="getBaseList(70)"><el-link>{{
+                  '工具编码'
+                }}</el-link> </span>
               <span v-else="showToolIdList" slot="label">{{ '工具编码' }}</span>
               <el-input style="text-align: left;width: 120px"
                         v-model="currentPRDetailData.partno"></el-input>
@@ -239,7 +241,7 @@
               ></el-input>
             </el-form-item>
             <el-form-item :label="'备注'">
-              <el-input  style="text-align: right;width: 315px"
+              <el-input style="text-align: right;width: 315px"
                         v-model="currentPRDetailData.remark"
               ></el-input>
             </el-form-item>
@@ -428,7 +430,10 @@ export default {
         orderref1: '',
         orderref2: '',
         sysOssEntityList: [],
-        addFlag: ''
+        addFlag: '',
+        lifespan: '',
+        toolInstanceId: '',
+        remark: ''
       },
       mainQueryData: {
         startDate: '',