From 68798abdc75bbb6a6f762e6fc836bc7308dbf34a Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 19 Feb 2024 14:06:34 +0800
Subject: [PATCH] =?UTF-8?q?2024-02-19=20=E7=89=A9=E6=96=99=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/part/bomSearch3.js                    |   26 +
 src/api/part/masterPartInformation.js         |   81 +
 src/api/part/partInformation.js               |   70 +-
 src/api/part/routingManagement.js             |   36 +
 .../part/routingOperationWorkGuidelines.js    |   55 +
 .../base/propertiesItem/propertiesItem.vue    |    6 +-
 .../base/propertiesItem/propertiesModel.vue   |    6 +-
 .../customerInformationManagement.vue         |    6 +-
 src/views/modules/part/bomManagement.vue      |   32 +-
 src/views/modules/part/bomSearch3.vue         |  894 +++++++++
 .../modules/part/partCatalogInformation.vue   | 1701 ++++++++++++++++
 src/views/modules/part/partInformation.vue    | 1768 ++++++++++++++---
 src/views/modules/part/routingManagement.vue  |  641 ++++--
 .../part/routingOperationWorkGuidelines.vue   | 1350 +++++++++++++
 .../modules/part/routingWorkGuidelines.vue    |  617 ++++++
 15 files changed, 6819 insertions(+), 470 deletions(-)
 create mode 100644 src/api/part/bomSearch3.js
 create mode 100644 src/api/part/masterPartInformation.js
 create mode 100644 src/api/part/routingOperationWorkGuidelines.js
 create mode 100644 src/views/modules/part/bomSearch3.vue
 create mode 100644 src/views/modules/part/partCatalogInformation.vue
 create mode 100644 src/views/modules/part/routingOperationWorkGuidelines.vue
 create mode 100644 src/views/modules/part/routingWorkGuidelines.vue

diff --git a/src/api/part/bomSearch3.js b/src/api/part/bomSearch3.js
new file mode 100644
index 0000000..c857942
--- /dev/null
+++ b/src/api/part/bomSearch3.js
@@ -0,0 +1,26 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+/**
+ * bom列表查询
+ * @param data
+ * @returns {*}
+ */
+export const bomSearchHeader = data => createAPI(`/plm/bomSearch3/bomSearchHeader`,'post',data)
+
+/**
+ * 查询bom替代树形
+ * @param data
+ * @returns {*}
+ */
+export const getAlternativeTree = data => createAPI(`/plm/bomSearch3/getAlternativeTree`,'post',data)
+
+/**
+ * 查询子物料
+ * @param data
+ * @returns {*}
+ */
+export const getComponentPartList = data => createAPI(`/plm/bomSearch3/getComponentPartList`,'post',data)
+
+
+
+
diff --git a/src/api/part/masterPartInformation.js b/src/api/part/masterPartInformation.js
new file mode 100644
index 0000000..b5d5553
--- /dev/null
+++ b/src/api/part/masterPartInformation.js
@@ -0,0 +1,81 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+/**
+ * master part 物料信息列表查询
+ * @param data
+ * @returns {*}
+ */
+export const masterPartSearch = data => createAPI(`/plm/masterPartInformation/masterPartSearch`,'post',data)
+
+/**
+ * master part 物料信息新增
+ * @param data
+ * @returns {*}
+ */
+export const masterPartInformationSave = data => createAPI(`/plm/masterPartInformation/masterPartInformationSave`,'post',data)
+
+/**
+ * master part 物料信息编辑
+ * @param data
+ * @returns {*}
+ */
+export const masterPartInformationEdit = data => createAPI(`/plm/masterPartInformation/masterPartInformationEdit`,'post',data)
+
+/**
+ * master part 物料信息删除
+ * @param data
+ * @returns {*}
+ */
+export const masterPartInformationDelete = data => createAPI(`/plm/masterPartInformation/masterPartInformationDelete`,'post',data)
+
+/**
+ * master part 查询物料属性
+ * @param data
+ * @returns {*}
+ */
+export const getMasterPartItem = data => createAPI(`/plm/masterPartInformation/getMasterPartItem`,'post',data)
+
+/**
+ * master part 获取模板属性
+ * @param data
+ * @returns {*}
+ */
+export const getItemLists = data => createAPI(`/plm/masterPartInformation/getItemLists`,'post',data)
+
+/**
+ * master part 新增物料属性
+ * @param data
+ * @returns {*}
+ */
+export const addMasterPartItem = data => createAPI(`/plm/masterPartInformation/addMasterPartItem`,'post',data)
+
+/**
+ * master part 删除物料属性
+ * @param data
+ * @returns {*}
+ */
+export const deleteMasterPartItem = data => createAPI(`/plm/masterPartInformation/deleteMasterPartItem`,'post',data)
+
+/**
+ * master part 修改物料属性值
+ * @param data
+ * @returns {*}
+ */
+export const commitItemValue = data => createAPI(`/plm/masterPartInformation/commitItemValue`,'post',data)
+
+/**
+ * master part 查询未选择的物料属性
+ * @param data
+ * @returns {*}
+ */
+export const queryMasterPartItem = data => createAPI(`/plm/masterPartInformation/queryMasterPartItem`,'post',data)
+
+
+
+
+
+
+
+
+
+
diff --git a/src/api/part/partInformation.js b/src/api/part/partInformation.js
index 4562a6d..771d135 100644
--- a/src/api/part/partInformation.js
+++ b/src/api/part/partInformation.js
@@ -6,18 +6,21 @@ import { createAPI } from "@/utils/httpRequest.js";
  * @returns {*}
  */
 export const partInformationSearch = data => createAPI(`/plm/partInformation/partInformationSearch`,'post',data)
+
 /**
  * 材料信息新增
  * @param data
  * @returns {*}
  */
 export const partInformationSave = data => createAPI(`/plm/partInformation/partInformationSave`,'post',data)
+
 /**
  * 材料信息编辑
  * @param data
  * @returns {*}
  */
 export const partInformationEdit = data => createAPI(`/plm/partInformation/partInformationEdit`,'post',data)
+
 /**
  * 材料信息删除
  * @param data
@@ -86,42 +89,107 @@ export const getAgentListBy = data => createAPI(`/plm/partInformation/getAgentLi
  */
 export const deleteAgent = data => createAPI(`/plm/partInformation/deleteAgent`,'post',data)
 
-
 /**
  * 查询材料信息
  * @param data
  * @returns {*}
  */
 export const searchPartList = (data) => createAPI(`/plm/partInformation/searchPartList`,'get',data);
+
 export const searchPart = (data) => createAPI(`/plm/partInformation/searchPart`,'get',data);
+
 /**
  * 获取制造商列表
  */
 export const getManufacturerList = data => createAPI(`/plm/partInformation/getManufacturerList`,'post',data)
+
 /**
  * 获取材料制造商
  */
 export const getPartManufacturer = data => createAPI(`/plm/partInformation/getPartManufacturer`,'post',data)
+
 /**
  * 根据条件查询可选制造商
  */
 export const getManufacturerListBy = data => createAPI(`/plm/partInformation/getManufacturerListBy`,'post',data)
+
 /**
  * 新增物料制造商
  * @param data
  */
 export const addPartManufacturer = data => createAPI(`/plm/partInformation/addPartManufacturer`,'post',data)
+
 /**
  * 删除物料制造商
  */
 export const deletePartManufacturer = data => createAPI(`/plm/partInformation/deletePartManufacturer`,'post',data)
+
 /**
  * 删除物料制造商(单删)
  */
 export const deleteManufacturer = data => createAPI(`/plm/partInformation/deleteManufacturer`,'post',data)
 
+
+/**
+ * 获取库位列表
+ */
+export const getLocationList = data => createAPI(`/plm/partInformation/getLocationList`,'post',data)
+
+/**
+ * 获取材料库位
+ */
+export const getDefaultLocation = data => createAPI(`/plm/partInformation/getDefaultLocation`,'post',data)
+
+/**
+ * 根据条件查询可选库位
+ */
+export const getLocationListBy = data => createAPI(`/plm/partInformation/getLocationListBy`,'post',data)
+
+/**
+ * 新增物料库位
+ * @param data
+ */
+export const addDefaultLocation = data => createAPI(`/plm/partInformation/addDefaultLocation`,'post',data)
+
+/**
+ * 删除物料库位
+ */
+export const deleteDefaultLocation = data => createAPI(`/plm/partInformation/deleteDefaultLocation`,'post',data)
+
+/**
+ * 删除物料库位(单删)
+ */
+export const deleteLocation = data => createAPI(`/plm/partInformation/deleteLocation`,'post',data)
+
+
+
 /**
  * 修改物料属性值
  */
 export const commitItemValue = data => createAPI(`/plm/partInformation/commitItemValue`,'post',data)
 
+/**
+ * 删除模板属性
+ */
+export const deleteItem = data => createAPI(`/plm/partInformation/deleteItem`,'post',data)
+
+/**
+ * 获取模板属性
+ */
+export const getItemLists = data => createAPI(`/plm/partInformation/getItemLists`,'post',data)
+
+/**
+ * 新增物料属性
+ */
+export const addPartItem = data => createAPI(`/plm/partInformation/addPartItem`,'post',data)
+
+/**
+ * 删除物料属性
+ */
+export const deletePartItem = data => createAPI(`/plm/partInformation/deletePartItem`,'post',data)
+
+/**
+ * 查询未选择的物料属性
+ */
+export const queryPartItem = data => createAPI(`/plm/partInformation/queryPartItem`,'post',data)
+
diff --git a/src/api/part/routingManagement.js b/src/api/part/routingManagement.js
index b60b84e..641797e 100644
--- a/src/api/part/routingManagement.js
+++ b/src/api/part/routingManagement.js
@@ -124,6 +124,42 @@ export const queryOperationList = data => createAPI(`/plm/routingManagement/quer
  * @returns {*}
  */
 export const getRottingRevision = data => createAPI(`/plm/routingManagement/getRottingRevision`,'post',data)
+/**
+ * 获取 routingTools
+ * @param data
+ * @returns {*}
+ */
+export const searchRoutingTools = data => createAPI(`/plm/routingManagement/searchRoutingTools`,'post',data)
+/**
+ * 新增 routingTools
+ * @param data
+ * @returns {*}
+ */
+export const routingToolSave = data => createAPI(`/plm/routingManagement/routingToolSave`,'post',data)
+/**
+ * 根据替代查询工序列表
+ * @param data
+ * @returns {*}
+ */
+export const queryOperationListByAlternative = data => createAPI(`/plm/routingManagement/queryOperationListByAlternative`,'post',data)
+/**
+ * 根据物料查询替代
+ * @param data
+ * @returns {*}
+ */
+export const queryAlternativeListByPartNo = data => createAPI(`/plm/routingManagement/queryAlternativeListByPartNo`,'post',data)
+/**
+ * 编辑 routingTools
+ * @param data
+ * @returns {*}
+ */
+export const routingToolEdit = data => createAPI(`/plm/routingManagement/routingToolEdit`,'post',data)
+/**
+ * 删除 routingTools
+ * @param data
+ * @returns {*}
+ */
+export const deleteRoutingTool = data => createAPI(`/plm/routingManagement/deleteRoutingTool`,'post',data)
 
 
 
diff --git a/src/api/part/routingOperationWorkGuidelines.js b/src/api/part/routingOperationWorkGuidelines.js
new file mode 100644
index 0000000..9e219a7
--- /dev/null
+++ b/src/api/part/routingOperationWorkGuidelines.js
@@ -0,0 +1,55 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+/**
+ * routing 替代列表查询
+ * @param data
+ * @returns {*}
+ */
+export const routingSearchAlternative = data => createAPI(`/plm/workGuidelines/routingSearchAlternative`,'post',data)
+
+/**
+ * 获取 workGuideline
+ * @param data
+ * @returns {*}
+ */
+export const getRoutingWorkGuideline = data => createAPI(`/plm/workGuidelines/getRoutingWorkGuideline`,'post',data)
+
+/**
+ * 获取 workGuideline
+ * @param data
+ * @returns {*}
+ */
+export const getGuidelineSeq = data => createAPI(`/plm/workGuidelines/getGuidelineSeq`,'post',data)
+
+/**
+ * 新增 workGuideline
+ * @param data
+ * @returns {*}
+ */
+export const workGuidelineSave = data => createAPI(`/plm/workGuidelines/workGuidelineSave`,'post',data)
+
+/**
+ * 编辑 workGuideline
+ * @param data
+ * @returns {*}
+ */
+export const workGuidelineEdit = data => createAPI(`/plm/workGuidelines/workGuidelineEdit`,'post',data)
+
+/**
+ * 删除 workGuideline
+ * @param data
+ * @returns {*}
+ */
+export const deleteWorkGuideline = data => createAPI(`/plm/workGuidelines/deleteWorkGuideline`,'post',data)
+
+/**
+ * workGuidelines 列表查询
+ * @param data
+ * @returns {*}
+ */
+export const workGuidelinesSearch = data => createAPI(`/plm/workGuidelines/workGuidelinesSearch`,'post',data)
+
+
+
+
+
diff --git a/src/views/modules/base/propertiesItem/propertiesItem.vue b/src/views/modules/base/propertiesItem/propertiesItem.vue
index 171c132..920d712 100644
--- a/src/views/modules/base/propertiesItem/propertiesItem.vue
+++ b/src/views/modules/base/propertiesItem/propertiesItem.vue
@@ -11,7 +11,8 @@
         <el-select filterable v-model="searchData.itemType" style="width: 120px">
           <el-option label="全部" value=""></el-option>
           <el-option label="A" value="A"></el-option>
-          <el-option label="B" value="B"></el-option>
+          <el-option label="IP" value="IP"></el-option>
+          <el-option label="MP" value="MP"></el-option>
           <el-option label="BM" value="BM"></el-option>
         </el-select>
       </el-form-item>
@@ -111,7 +112,8 @@
         <el-form-item :label="'属性类型'" prop="itemType" :rules="rules.itemType">
           <el-select filterable v-model="modalData.itemType" :disabled="modalDisableFlag" style="width: 120px">
             <el-option label="A" value="A"></el-option>
-            <el-option label="B" value="B"></el-option>
+            <el-option label="IP" value="IP"></el-option>
+            <el-option label="MP" value="MP"></el-option>
             <el-option label="BM" value="BM"></el-option>
           </el-select>
         </el-form-item>
diff --git a/src/views/modules/base/propertiesItem/propertiesModel.vue b/src/views/modules/base/propertiesItem/propertiesModel.vue
index c1b946b..8e32d60 100644
--- a/src/views/modules/base/propertiesItem/propertiesModel.vue
+++ b/src/views/modules/base/propertiesItem/propertiesModel.vue
@@ -11,7 +11,8 @@
         <el-select filterable v-model="searchData.functionType" style="width: 120px">
           <el-option label="全部" value=""></el-option>
           <el-option label="A" value="A"></el-option>
-          <el-option label="B" value="B"></el-option>
+          <el-option label="IP" value="IP"></el-option>
+          <el-option label="MP" value="MP"></el-option>
           <el-option label="BM" value="BM"></el-option>
         </el-select>
       </el-form-item>
@@ -123,7 +124,8 @@
         <el-form-item :label="'属性模板类型'" >
           <el-select filterable v-model="modalData.functionType" :disabled="modalDisableFlag" style="width: 120px">
             <el-option label="A" value="A"></el-option>
-            <el-option label="B" value="B"></el-option>
+            <el-option label="IP" value="IP"></el-option>
+            <el-option label="MP" value="MP"></el-option>
             <el-option label="BM" value="BM"></el-option>
           </el-select>
         </el-form-item>
diff --git a/src/views/modules/customer/customerInformationManagement.vue b/src/views/modules/customer/customerInformationManagement.vue
index 939feb7..8850373 100644
--- a/src/views/modules/customer/customerInformationManagement.vue
+++ b/src/views/modules/customer/customerInformationManagement.vue
@@ -104,10 +104,10 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="年营业额">
-          <el-input v-model="modalData.turnoverOfYear" :readonly="detailModalFlag" style="width: 222px"></el-input>
+          <el-input class="inlineNumber numInput" v-model="modalData.turnoverOfYear" :readonly="detailModalFlag" type="number" style="width: 222px"></el-input>
         </el-form-item>
-        <el-form-item label="年潜在投入">
-          <el-input v-model="modalData.potentialRevenueOfYear" :readonly="detailModalFlag" style="width: 222px"></el-input>
+        <el-form-item label="年预估投入">
+          <el-input class="inlineNumber numInput" v-model="modalData.potentialRevenueOfYear" :readonly="detailModalFlag" type="number" style="width: 222px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue
index 1b36108..f7fe0cb 100644
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
@@ -107,14 +107,8 @@
             <el-option label="Prototype" value="Prototype"></el-option>
           </el-select>
         </el-form-item>
-<!--        <el-form-item :label="'类型'" prop="typeFlag" :rules="rules.typeFlag">-->
-<!--          <el-select v-model="modalData.typeFlag" disabled style="width: 142px">-->
-<!--            <el-option label="BOM" value="B"></el-option>-->
-<!--            <el-option label="配方" value="F"></el-option>-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
         <el-form-item :label="'净重'">
-          <el-input class="numInput" v-model="modalData.netWeight" type="number" @input="handleInput(modalData.netWeight,1)" style="width: 120px"></el-input>
+          <el-input class="inlineNumber numInput" v-model="modalData.netWeight" type="number" @input="handleInput(modalData.netWeight,1)" style="width: 120px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
@@ -188,7 +182,7 @@
               <el-input v-model="detailData.status" readonly style="width: 221px"></el-input>
             </el-form-item>
             <el-form-item :label="'最小订单数'">
-              <el-input class="numInput" v-model="detailData.minLotQty" @input="handleInput(detailData.minLotQty,2)" type="number" readonly style="width: 221px"></el-input>
+              <el-input class="inlineNumber numInput" v-model="detailData.minLotQty" @input="handleInput(detailData.minLotQty,2)" type="number" readonly style="width: 221px"></el-input>
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="detailData" style="margin-left: 7px">
@@ -266,7 +260,7 @@
           <el-input v-model="saveDetailData.status" disabled style="width: 235px"></el-input>
         </el-form-item>
         <el-form-item :label="'最小订单数'" prop="minLotQty" :rules="detailRules.minLotQty">
-          <el-input class="numInput" v-model="saveDetailData.minLotQty" @input="handleInput(saveDetailData.minLotQty,3)" type="number" style="width: 235px"></el-input>
+          <el-input class="inlineNumber numInput" v-model="saveDetailData.minLotQty" @input="handleInput(saveDetailData.minLotQty,3)" type="number" style="width: 235px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="saveDetailData" style="margin-left: 5px">
@@ -366,7 +360,7 @@
     <el-dialog title="新增子物料" :close-on-click-modal="false" v-drag :visible.sync="componentSaveModal" width="800px">
       <el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px">
         <el-form-item :label="'序号'" prop="lineSequence" :rules="componentRules.lineSequence">
-          <el-input class="numInput" v-model="componentData.lineSequence" type="number" style="width: 49px"></el-input>
+          <el-input class="inlineNumber numInput" v-model="componentData.lineSequence" type="number" style="width: 49px"></el-input>
         </el-form-item>
         <el-form-item prop="componentPart" :rules="componentRules.componentPart">
           <span v-if="!componentDisableFlag" slot="label" @click="queryComponentPartList()"><a herf="#">子物料编码</a></span>
@@ -382,13 +376,13 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px">
         <el-form-item :label="'单位用量'" prop="qtyPerAssembly" :rules="componentRules.qtyPerAssembly">
-          <el-input class="numInput" v-model="componentData.qtyPerAssembly" @input="handleInput16(componentData.qtyPerAssembly,1)" type="number" style="width: 144px"></el-input>
+          <el-input class="inlineNumber numInput" v-model="componentData.qtyPerAssembly" @input="handleInput16(componentData.qtyPerAssembly,1)" type="number" style="width: 144px"></el-input>
         </el-form-item>
         <el-form-item :label="'调机量'" prop="componentScrap" :rules="componentRules.componentScrap">
-          <el-input class="numInput" v-model="componentData.componentScrap" @input="handleInput(componentData.componentScrap,5)" type="number" style="width: 80px"></el-input>
+          <el-input class="inlineNumber numInput" v-model="componentData.componentScrap" @input="handleInput(componentData.componentScrap,5)" type="number" style="width: 80px"></el-input>
         </el-form-item>
         <el-form-item :label="'损耗率%'" prop="shrinkageFactor" :rules="componentRules.shrinkageFactor">
-          <el-input class="numInput" v-model="componentData.shrinkageFactor" @input="handleInputB(componentData.shrinkageFactor)" type="number" style="width: 80px"></el-input>
+          <el-input class="inlineNumber numInput" v-model="componentData.shrinkageFactor" @input="handleInputB(componentData.shrinkageFactor)" type="number" style="width: 80px"></el-input>
         </el-form-item>
         <el-form-item>
           <span slot="label" @click="queryOperationList()"><a>工序</a></span>
@@ -1477,7 +1471,6 @@ export default {
         printUnit: row.printUnit,
         printUnitName: row.printUnitName,
       }
-      console.log(row)
       // 查bom明细
       queryBomDetail(this.modalData).then(({data}) => {
         if (data && data.code === 0) {
@@ -2456,7 +2449,7 @@ export default {
      */
     queryOperationList () {
       this.operationData.partNo = this.modalData.partNo
-      // 查询所有检验模板
+      // 查询所有
       queryOperationList(this.operationData).then(({data}) => {
         if (data && data.code === 0) {
           this.operationList = data.rows
@@ -2548,6 +2541,15 @@ export default {
 .numInput /deep/ .el-input__inner{
   text-align: right;
 }
+/deep/  .inlineNumber input::-webkit-outer-spin-button,
+/deep/  .inlineNumber input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+
+}
+/deep/  .inlineNumber input[type="number"]{
+  -moz-appearance: textfield;
+  padding-right: 5px !important;
+}
 </style>
 
 
diff --git a/src/views/modules/part/bomSearch3.vue b/src/views/modules/part/bomSearch3.vue
new file mode 100644
index 0000000..667de08
--- /dev/null
+++ b/src/views/modules/part/bomSearch3.vue
@@ -0,0 +1,894 @@
+<template>
+  <div class="mod-config">
+    <!-- 查询条件 -->
+    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item :label="'物料编码'">
+        <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'物料名称'">
+        <el-input v-model="searchData.partDesc" clearable style="width: 200px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'制造类型'">
+        <el-select v-model="searchData.bomType" clearable style="width: 120px">
+          <el-option label="Manufacturing" value="Manufacturing"></el-option>
+          <el-option label="Repair" value="Repair"></el-option>
+          <el-option label="Purchase" value="Purchase"></el-option>
+          <el-option label="Prototype" value="Prototype"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="'BOM版本号'">
+        <el-input v-model="searchData.engChgLevel" type="number" style="width: 100px"></el-input>
+      </el-form-item>
+      <el-form-item :label="' '">
+        <el-button :loading="queryLoading" @click="getDataList()">查询</el-button>
+        <download-excel
+          :fields="fields()"
+          :data="exportData"
+          type="xls"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{ "导出" }}
+        </download-excel>
+      </el-form-item>
+    </el-form>
+
+    <!-- bom列表 -->
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      ref="bomHeaderTable"
+      @row-click="headerClickRow"
+      @current-change="changeCurrentRow"
+      style="width: 100%">
+      <el-table-column
+        v-for="(item,index) in columnList" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed === ''?false:item.fixed"
+        :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页插件 -->
+    <el-pagination style="margin-top: 0px"
+                   @size-change="sizeChangeHandle"
+                   @current-change="currentChangeHandle"
+                   :current-page="pageIndex"
+                   :page-sizes="[20, 50, 100, 200, 500]"
+                   :page-size="pageSize"
+                   :total="totalPage"
+                   layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+    <!-- 页签 -->
+    <el-tabs v-model="activeTable" style="width: 100%" :style="{height: secondHeight + 'px'}" type="border-card" @tab-click="tabClick" class="customer-tab">
+      <!-- Graphical Structure页签 -->
+      <el-tab-pane label="Graphical Structure" name="GraphicalStructure">
+        <el-row>
+          <el-col :style="{width: leftWidth + 'px',height: secondHeight - 48 + 'px'}" class="down-tree">
+            <el-tree
+              :data="treeData"
+              node-key="nodeKey"
+              :default-expand-all=false
+              @node-click="handleNodeClick"
+              :props="defaultProps">
+            </el-tree>
+          </el-col>
+          <el-col :style="{width: rightWidth + 'px',height: secondHeight - 50 + 'px'}" style="margin-left: 10px">
+            <el-form :inline="true" label-position="top">
+              <el-form-item :label="'物料编码'">
+                <el-input v-model="alternativeData.partNo" readonly style="width: 120px"></el-input>
+              </el-form-item>
+              <el-form-item :label="'物料名称'">
+                <el-input v-model="alternativeData.partDesc" readonly style="width: 200px"></el-input>
+              </el-form-item>
+              <el-form-item :label="'Bom版本号'">
+                <el-input v-model="alternativeData.engChgLevel" readonly style="width: 80px"></el-input>
+              </el-form-item>
+              <el-form-item :label="'制造类型'">
+                <el-input v-model="alternativeData.bomType" readonly style="width: 120px"></el-input>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top">
+              <el-form-item :label="'替代编码'">
+                <el-input v-model="alternativeData.alternativeNo" readonly style="width: 120px"></el-input>
+              </el-form-item>
+              <el-form-item :label="'替代名称'">
+                <el-input v-model="alternativeData.alternativeDescription" readonly style="width: 200px"></el-input>
+              </el-form-item>
+              <el-form-item :label="'最小订单数'">
+                <el-input v-model="alternativeData.minLotQty" readonly style="width: 80px"></el-input>
+              </el-form-item>
+              <el-form-item :label="'状态'">
+                <el-input v-model="alternativeData.status" readonly style="width: 120px"></el-input>
+              </el-form-item>
+            </el-form>
+            <el-table
+              :height="secondHeight-130"
+              :data="componentPartList"
+              border
+              style="width: 100%">
+              <el-table-column
+                v-for="(item,index) in componentPartColumnList" :key="index"
+                :sortable="item.columnSortable"
+                :prop="item.columnProp"
+                :header-align="item.headerAlign"
+                :show-overflow-tooltip="item.showOverflowTooltip"
+                :align="item.align"
+                :fixed="item.fixed==''?false:item.fixed"
+                :min-width="item.columnWidth"
+                :label="item.columnLabel">
+                <template slot-scope="scope">
+                  <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+                  <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-col>
+        </el-row>
+      </el-tab-pane>
+    </el-tabs>
+
+    <!-- chooseList模态框 -->
+    <ChooseList ref="baseList" @getBaseData="getBaseData"></ChooseList>
+  </div>
+</template>
+
+<script>
+import {
+  bomSearchHeader, // bom列表查询
+  getAlternativeTree, // 查询bom替代树形
+  getComponentPartList, // 查询子物料
+} from '@/api/part/bomSearch3.js'
+import ChooseList from '@/views/modules/common/Chooselist'
+import dayjs from "dayjs";
+
+export default {
+  // 组件
+  components: {
+    ChooseList
+  },
+  // 监听
+  watch: {
+    searchData: {
+      deep: true,
+      handler: function (newV, oldV) {
+        this.searchData.partNo = this.searchData.partNo.toUpperCase()
+      }
+    }
+  },
+  // 对象
+  data () {
+    return {
+      // 导出
+      exportData: [],
+      exportName: 'bom查询' + this.dayjs().format('YYYYMMDDHHmmss'),
+      exportHeader: ['bom查询'],
+      exportFooter: [],
+      resultList: [],
+      // ======== 行高 ========
+      height: 200,
+      secondHeight: 200,
+      leftWidth: 300,
+      rightWidth: '',
+      // ======== 分页 ========
+      pageIndex: 1,
+      pageSize: 50,
+      totalPage: 0,
+      // 条件查询
+      searchData: {
+        site: this.$store.state.user.site,
+        partNo: '',
+        partDesc: '',
+        bomType: '',
+        engChgLevel: '',
+        page: 1,
+        limit: 10
+      },
+      // loading
+      queryLoading: false,
+      // 初始页签
+      activeTable: 'GraphicalStructure',
+      // ======== 数据对象 ========
+      alternativeData: {
+        site: '',
+        partNo: '',
+        partDesc: '',
+        bomType: '',
+        engChgLevel: '',
+        alternativeNo: '',
+        alternativeDescription: '',
+        minLotQty: '',
+        noteText: '',
+        status: '',
+      },
+      // ======== 选中的当前行数据 ========
+      headerCurrentRow: {},
+      defaultProps: {
+        children: "informationList",
+        label: "nodeKey",
+      },
+      // ======== 数据列表 ========
+      dataList: [],
+      treeData: [],
+      componentPartList: [],
+      // ======== 列表表头 ========
+      columnList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table1PartNo',
+          tableId: '104009Table1',
+          tableName: 'BOMHeader表',
+          columnProp: 'partNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '物料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table1PartDesc',
+          tableId: '104009Table1',
+          tableName: 'BOMHeader表',
+          columnProp: 'partDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '物料名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 200
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table1BomType',
+          tableId: '104009Table1',
+          tableName: 'BOMHeader表',
+          columnProp: 'bomType',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '制造类型',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table1EngChgLevel',
+          tableId: '104009Table1',
+          tableName: 'BOMHeader表',
+          columnProp: 'engChgLevel',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: 'BOM版本号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table1engRevision',
+          tableId: '104009Table1',
+          tableName: 'BOMHeader表',
+          columnProp: 'engRevision',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '工程版本号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table1NetWeight',
+          tableId: '104009Table1',
+          tableName: 'BOMHeader表',
+          columnProp: 'netWeight',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '净重',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table1EffPhaseInDate',
+          tableId: '104009Table1',
+          tableName: 'BOMHeader表',
+          columnProp: 'effPhaseInDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '开始时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 130
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table1EffPhaseOutDate',
+          tableId: '104009Table1',
+          tableName: 'BOMHeader表',
+          columnProp: 'effPhaseOutDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '结束时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 130
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table1CreateDate',
+          tableId: '104009Table1',
+          tableName: 'BOMHeader表',
+          columnProp: 'createDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '创建时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 130
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table1CreateBy',
+          tableId: '104009Table1',
+          tableName: 'BOMHeader表',
+          columnProp: 'createBy',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '创建人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table1UpdateDate',
+          tableId: '104009Table1',
+          tableName: 'BOMHeader表',
+          columnProp: 'updateDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '更新时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 130
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table1UpdateBy',
+          tableId: '104009Table1',
+          tableName: 'BOMHeader表',
+          columnProp: 'updateBy',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '更新人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        }
+      ],
+      componentPartColumnList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table2LineSequence',
+          tableId: '104009Table2',
+          tableName: 'BOMComponent表',
+          columnProp: 'lineSequence',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '序号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 60
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table2ComponentPart',
+          tableId: '104009Table2',
+          tableName: 'BOMComponent表',
+          columnProp: 'componentPart',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '物料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table2ComponentPartDesc',
+          tableId: '104009Table2',
+          tableName: 'BOMComponent表',
+          columnProp: 'componentPartDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '物料名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table2QtyPerAssembly',
+          tableId: '104009Table2',
+          tableName: 'BOMComponent表',
+          columnProp: 'qtyPerAssembly',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '单位用量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table2ComponentScrap',
+          tableId: '104009Table2',
+          tableName: 'BOMComponent表',
+          columnProp: 'componentScrap',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '调机量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table2ShrinkageFactor',
+          tableId: '104009Table2',
+          tableName: 'BOMComponent表',
+          columnProp: 'shrinkageFactor',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '损耗率',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table2PrintUnitName',
+          tableId: '104009Table2',
+          tableName: 'BOMComponent表',
+          columnProp: 'printUnitName',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '单位',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 60
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table2IssueType',
+          tableId: '104009Table2',
+          tableName: 'BOMComponent表',
+          columnProp: 'issueTypeName',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '生产属性',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table2OperationDesc',
+          tableId: '104009Table2',
+          tableName: 'BOMComponent表',
+          columnProp: 'operationName',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '工序',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table2IssueToLoc',
+          tableId: '104009Table2',
+          tableName: 'BOMComponent表',
+          columnProp: 'issueToLocName',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '发料库位',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104009,
+          serialNumber: '104009Table2NoteText',
+          tableId: '104009Table2',
+          tableName: 'BOMComponent表',
+          columnProp: 'noteText',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '备注',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150
+        },
+      ]
+      // ======== 必填规则 ========
+
+      // ======== 复选数据集 ========
+
+      // ======== 模态框开关控制 ========
+
+    }
+  },
+
+  mounted () {
+    this.$nextTick(() => {
+      this.height = window.innerHeight / 2 - 240
+      /*第二个表格高度的动态调整*/
+      this.secondHeight = window.innerHeight - this.height - 175
+      this.rightWidth = window.innerWidth - this.leftWidth - 275
+    })
+  },
+
+  created () {
+    this.getDataList()
+  },
+  // js
+  methods: {
+    // ======== 分页相关方法 ========
+    /**
+     * 每页数
+     * @param val
+     */
+    sizeChangeHandle (val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
+    },
+
+    /**
+     * 当前页
+     * @param val
+     */
+    currentChangeHandle (val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+
+    // ======== 列表数据操作方法 ========
+    /**
+     * 获取数据列表
+     */
+    getDataList () {
+      this.searchData.limit = this.pageSize
+      this.searchData.page = this.pageIndex
+      this.queryLoading = true
+      bomSearchHeader(this.searchData).then(({data}) => {
+        if (data.code === 0) {
+          this.dataList = data.page.list
+          this.pageIndex = data.page.currPage
+          this.pageSize = data.page.pageSize
+          this.totalPage = data.page.totalCount
+          // 判断是否全部存在数据
+          if(this.totalPage > 0){
+            // 设置选中行
+            this.$refs.bomHeaderTable.setCurrentRow(this.dataList[0])
+            // 加载当前的页签的table
+            this.refreshCurrentTabTable()
+            this.headerClickRow(this.dataList[0])
+          }
+        }
+        this.queryLoading = false
+      })
+    },
+
+    /**
+     * 单机选中信息
+     * @param row
+     */
+    headerClickRow (row) {
+      this.$refs.bomHeaderTable.toggleRowSelection(row)
+      this.headerCurrentRow = JSON.parse(JSON.stringify(row))
+    },
+
+    /**
+     * 树节点单机事件
+     * @param e
+     * @param node
+     */
+    handleNodeClick (e, node) {
+      this.alternativeData = {
+        site: e.site,
+        partNo: e.partNo,
+        partDesc: e.partDesc,
+        bomType: e.bo,
+        engChgLevel: e.engChgLevel,
+        alternativeNo: e.alternativeNo,
+        alternativeDescription: e.alternativeDescription,
+        minLotQty: e.minLotQty,
+        noteText: e.noteText,
+        status: e.status,
+      }
+      // 查询替代子物料
+      getComponentPartList(e).then(({data}) => {
+        if (data && data.code === 0) {
+          this.componentPartList = data.rows
+        } else {
+          this.componentPartList = []
+        }
+      })
+    },
+    // ======== 页签切换相关方法 ========
+    /**
+     * 列表表格选择替换
+     * @param tab
+     * @param event
+     */
+    tabClick (tab, event) {
+      // 刷新列表数据
+      this.refreshCurrentTabTable()
+    },
+
+    /**
+     * 当前值发生变化的时候修改
+     * @param row
+     * @param oldRow
+     */
+    changeCurrentRow (row, oldRow) {
+      // 判断是否是获取焦点的事件
+      if (row) {
+        this.headerCurrentRow = JSON.parse(JSON.stringify(row))
+        //刷新当前页表
+        this.refreshCurrentTabTable()
+        // 重置
+        this.alternativeData = {
+          site: '',
+          partNo: '',
+          partDesc: '',
+          bomType: '',
+          engChgLevel: '',
+          alternativeNo: '',
+          alternativeDescription: '',
+          minLotQty: '',
+          noteText: '',
+          status: '',
+        }
+        this.componentPartList = []
+      }
+    },
+
+    /**
+     * 刷新页签的table数据
+     */
+    refreshCurrentTabTable () {
+      if (this.activeTable === 'GraphicalStructure') {
+        // 获取bom替代树形
+        this.getAlternativeTree()
+      }
+    },
+
+    /**
+     * 获取bom替代树形
+     */
+    getAlternativeTree () {
+      getAlternativeTree(this.headerCurrentRow).then(({data}) => {
+        if (data && data.code === 0) {
+          this.treeData = data.rows
+        } else {
+          this.treeData = []
+        }
+      })
+    },
+
+    // ======== chooseList相关方法 ========
+    /**
+     * 获取基础数据列表S
+     * @param val
+     * @param type
+     */
+    getBaseList (val, type) {
+      this.tagNo = val
+      this.$nextTick(() => {
+        let strVal = ''
+        if (val === 117) {
+          strVal = this.componentData.issueToLoc
+        }
+        this.$refs.baseList.init(val, strVal)
+      })
+    },
+    /**
+     * 列表方法的回调
+     * @param val
+     */
+    getBaseData (val) {
+      if (this.tagNo === 117) {
+        this.componentData.issueToLoc = val.location_id
+        this.componentData.issueToLocName = val.location_name
+      }
+    },
+
+    // ======== 导出相关方法 ========
+    /**
+     * 导出excel
+     */
+    async createExportData () {
+      this.searchData.limit = -1
+      this.searchData.page = 1
+      await bomSearchHeader(this.searchData).then(({data}) => {
+        this.resultList = data.page.list
+      })
+      return this.resultList
+    },
+    startDownload () {},
+    finishDownload () {},
+    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
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.down-tree{
+  height: 470px;
+  display: block;
+  overflow-y: scroll;
+}
+/deep/ .el-tabs--border-card>.el-tabs__content{
+  padding: 5px;
+}
+</style>
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/part/partCatalogInformation.vue b/src/views/modules/part/partCatalogInformation.vue
new file mode 100644
index 0000000..9c20b96
--- /dev/null
+++ b/src/views/modules/part/partCatalogInformation.vue
@@ -0,0 +1,1701 @@
+<template>
+  <div class="mod-config">
+    <!-- 查询条件 -->
+    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item :label="'物料编码'">
+        <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'物料描述'">
+        <el-input v-model="searchData.partDesc" clearable style="width: 210px"></el-input>
+      </el-form-item>
+      <el-form-item :label="' '">
+        <el-button @click="getDataList()">查询</el-button>
+        <el-button type="primary" @click="addModal()">新增</el-button>
+        <el-button type="primary" @click="delModal()">删除</el-button>
+        <download-excel
+          :fields="fields()"
+          :data="exportData"
+          type="xls"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{ "导出" }}
+        </download-excel>
+      </el-form-item>
+    </el-form>
+
+    <!-- 物料列表 -->
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      ref="partTable"
+      @row-click="partClickRow"
+      @selection-change="selectionPart"
+      @current-change="changeCurrentRow"
+      style="width: 100%;">
+      <el-table-column
+        type="selection"
+        header-align="center"
+        align="center"
+        :selectable="selectFlag"
+        width="50">
+      </el-table-column>
+      <el-table-column
+        v-for="(item,index) in columnList" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed === ''?false:item.fixed"
+        :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="100"
+        label="操作">
+        <template slot-scope="scope">
+          <a type="text" size="small" @click="updateModal(scope.row)">编辑</a>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <selectDiv ref="selectDiv"></selectDiv>
+
+    <!-- 分页插件 -->
+    <el-pagination style="margin-top: 0px"
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 200, 500]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+    <!-- 物料新增/编辑模态框 -->
+    <el-dialog :title="modalData.title" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="737px">
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="物料编码" prop="partNo" :rules="rules.partNo">
+          <el-input v-model="modalData.partNo" clearable style="width: 120px" :disabled="modalDisableFlag"></el-input>
+        </el-form-item>
+        <el-form-item label="物料描述" prop="partDesc" :rules="rules.partDesc" style="margin-left: -10px">
+          <el-input v-model="modalData.partDesc" clearable style="width: 330px"></el-input>
+        </el-form-item>
+        <el-form-item style="margin-top: 5px">
+          <el-checkbox v-model="modalData.conditionCodeUsageDb" true-label="Y">允许条件代码</el-checkbox><br>
+          <el-checkbox v-model="modalData.multilevelTrackingDb" true-label="Y">多级跟踪</el-checkbox>
+          <el-checkbox v-model="modalData.allowAsNotConsumedDb" true-label="Y">允许为未使用</el-checkbox>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item prop="codeDesc" :rules="rules.codeDesc">
+          <span slot="label" @click="getBaseList(22)"><a herf="#">属性模板</a></span>
+          <el-input v-model="modalData.codeNo" style="width: 120px"></el-input>
+          <el-input v-model="modalData.codeDesc" disabled style="width: 330px"></el-input>
+        </el-form-item>
+        <el-form-item label="批次/批次跟踪">
+          <el-select v-model="modalData.lotTrackingCode" style="width: 230px">
+            <el-option label="Lot Tracking" value="Lot Tracking"></el-option>
+            <el-option label="Not Lot Tracking" value="Not Lot Tracking"></el-option>
+            <el-option label="Order Based" value="Order Based"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item prop="groupName" :rules="rules.groupName">
+          <span slot="label" @click="getBaseList(109)"><a herf="#">物料分组</a></span>
+          <el-input v-model="modalData.partMainGroup" style="width: 120px"></el-input>
+          <el-input v-model="modalData.groupName" disabled style="width: 330px"></el-input>
+        </el-form-item>
+        <el-form-item label="批量规则">
+          <el-select v-model="modalData.lotQuantityRule" :disabled="modalData.lotTrackingCode === 'Not Lot Tracking'" style="width: 230px">
+            <el-option label="One Lot Per Production Order" value="One Lot Per Production Order"></el-option>
+            <el-option label="Many Lots Per Production Order" value="Many Lots Per Production Order"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="净重" prop="weightNet" :rules="rules.weightNet">
+          <el-input class="inlineNumber numInput" v-model="modalData.weightNet" @input="handleInput(modalData.weightNet,1)" type="number" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="净重单位" prop="uomForWeightNet" :rules="rules.uomForWeightNet" style="margin-left: -10px">
+          <dict-data-select v-if="modalFlag" v-model="modalData.uomForWeightNet" style="width: 330px" :use-default-value="false" dict-type="part_uom_for_weight_net"></dict-data-select>
+        </el-form-item>
+        <el-form-item label="子批次规则">
+          <el-select v-model="modalData.subLotRule" :disabled="modalData.lotTrackingCode === 'Not Lot Tracking'" style="width: 230px">
+            <el-option label="Sub Lots Allowed" value="Sub Lots Allowed"></el-option>
+            <el-option label="No Sub Lots Allowed" value="No Sub Lots Allowed"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="体积" prop="volumeNet" :rules="rules.volumeNet">
+          <el-input class="inlineNumber numInput" v-model="modalData.volumeNet" @input="handleInput(modalData.volumeNet,2)" type="number" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="体积单位" prop="uomForVolumeNet" :rules="rules.uomForVolumeNet" style="margin-left: -10px">
+          <dict-data-select v-if="modalFlag" v-model="modalData.uomForVolumeNet" style="width: 330px" dict-type="part_uom_for_volume_net"></dict-data-select>
+        </el-form-item>
+        <el-form-item label="组件批次规则">
+          <el-select v-model="modalData.componentLotRule" :disabled="modalData.lotTrackingCode === 'Not Lot Tracking'" style="width: 230px">
+            <el-option label="Many Lots Allowed" value="Many Lots Allowed"></el-option>
+            <el-option label="One Lot Allowed" value="One Lot Allowed"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:35px;margin-top: 25px;text-align:center">
+        <el-button type="primary" @click="saveData()">保存</el-button>
+        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 页签 -->
+    <el-tabs v-model="activeTable" style="width: 100%" :style="{height: secondHeight + 'px'}" type="border-card" @tab-click="tabClick" class="customer-tab">
+      <!-- 物料属性页签 -->
+      <el-tab-pane label="物料属性" name="part_item">
+        <el-form label-position="top" style="margin-top: 2px; margin-left: 2px;">
+          <el-button type="primary" @click="addOrDelItem">新增/删除</el-button>
+          <el-button type="primary" @click="updateItemValue">编辑</el-button>
+        </el-form>
+        <el-table
+          :data="partItemList"
+          :height="secondHeight - 60"
+          border
+          style="width: 100%;">
+          <el-table-column
+            v-for="(item,index) in columnItemList" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed==''?false:item.fixed"
+            :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+
+    <!-- 物料属性值编辑模态框 -->
+    <el-dialog title="物料属性" :close-on-click-modal="false" v-drag :visible.sync="updateItemModelFlag" width="1000px">
+      <div class="rq ">
+        <el-table
+          :data="updatePartItemList"
+          height="350px"
+          border
+          style="width: 100%;">
+          <el-table-column
+            v-for="(item,index) in updateColumnItemList" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed==''?false:item.fixed"
+            :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="textValue"
+            header-align="center"
+            align="right"
+            min-width="80"
+            label="文本值">
+            <template slot-scope="scope">
+              <el-input v-if="scope.row.valueTypeDb === 'T' && scope.row.valueChooseFlag === 'N'" v-model="scope.row.textValue" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+              <el-select v-if="scope.row.valueTypeDb === 'T' && scope.row.valueChooseFlag === 'Y'" v-model="scope.row.textValue" style="width: 180px" placeholder="请选择">
+                <el-option v-for="item in scope.row.availableValueList" :key="index" :label="item.availableValue" :value="item.availableValue"></el-option>
+              </el-select>
+              <el-input v-if="scope.row.valueTypeDb !== 'T'" v-model="scope.row.textValue" disabled style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="numValue"
+            header-align="center"
+            align="right"
+            min-width="80"
+            label="数字值">
+            <template slot-scope="scope">
+              <el-input v-if="scope.row.valueTypeDb === 'N' && scope.row.valueChooseFlag === 'N'" v-model="scope.row.numValue" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+              <el-select v-if="scope.row.valueTypeDb === 'N' && scope.row.valueChooseFlag === 'Y'" v-model="scope.row.numValue" style="width: 180px" placeholder="请选择">
+                <el-option v-for="item in scope.row.availableValueList" :key="index" :label="item.availableValue" :value="item.availableValue"></el-option>
+              </el-select>
+              <el-input v-if="scope.row.valueTypeDb !== 'N'" v-model="scope.row.numValue" disabled style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="commitItemValue()">保存</el-button>
+        <el-button type="primary" @click="updateItemModelFlag=false">关闭</el-button>
+      </span>
+    </el-dialog>
+
+    <el-dialog title="新增" :close-on-click-modal="false" v-drag :visible.sync="fastAddFlag" width="1000px">
+      <div style="font-size: 12px">
+        <el-form :inline="true" label-position="top" :model="itemData">
+          <el-form-item :label="'属性编码'">
+            <el-input v-model="itemData.propertiesItemNo" clearable style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'属性名称'">
+            <el-input v-model="itemData.itemDesc" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item :label="' '">
+            <el-button type="primary" @click="queryMasterPartItem()">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-container style="margin-top: 0px;">
+        <el-main style="width: 350px;padding: 1px">
+          <span style="font-size: 12px" >可选属性：</span>
+          <el-table
+            height="400px"
+            :data="itemList1"
+            border
+            ref="itemTable1"
+            @row-click="itemClickRow1"
+            @selection-change="selectionItem1"
+            highlight-current-row
+            style="width: 100%">
+            <el-table-column
+              type="selection"
+              header-align="center"
+              align="center"
+              :selectable="selectFlag"
+              width="50">
+            </el-table-column>
+            <el-table-column
+              prop="itNo"
+              header-align="center"
+              align="center"
+              min-width="80"
+              label="属性编码">
+            </el-table-column>
+            <el-table-column
+              prop="itemDesc"
+              header-align="center"
+              align="center"
+              min-width="200"
+              label="属性名称">
+            </el-table-column>
+          </el-table>
+        </el-main>
+        <el-main style="width: 10px;padding: 1px">
+          <div style="margin-top: 200px;margin-left: 18px">
+            <el-button type="primary" @click="addItem()">添加>></el-button>
+          </div>
+          <div style="margin-top: 15px;margin-left: 18px">
+            <el-button type="primary" @click="deleteItem()">删除<<</el-button>
+          </div>
+        </el-main>
+        <el-main style="width: 350px;padding: 1px">
+          <span style="font-size: 12px" >已有属性：</span>
+          <el-table
+            height="400px"
+            :data="itemList2"
+            border
+            ref="itemTable2"
+            @row-click="itemClickRow2"
+            @selection-change="selectionItem2"
+            highlight-current-row
+            style="width: 100%">
+            <el-table-column
+              type="selection"
+              header-align="center"
+              align="center"
+              :selectable="selectFlag"
+              width="50">
+            </el-table-column>
+            <el-table-column
+              prop="itNo"
+              header-align="center"
+              align="center"
+              min-width="80"
+              label="属性编码">
+            </el-table-column>
+            <el-table-column
+              prop="itemDesc"
+              header-align="center"
+              align="center"
+              min-width="200"
+              label="属性名称">
+            </el-table-column>
+          </el-table>
+        </el-main>
+      </el-container>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="fastAddFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- chooseList模态框 -->
+    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
+  </div>
+</template>
+
+<script>
+  import {
+    masterPartSearch, // 物料信息列表查询
+    masterPartInformationSave, // 物料信息新增
+    masterPartInformationEdit, // 物料信息编辑
+    masterPartInformationDelete, // 物料信息删除
+    getMasterPartItem, // 查询物料属性
+    commitItemValue, // 修改物料属性值
+    getItemLists, // 获取模板属性
+    addMasterPartItem, // 新增物料属性
+    deleteMasterPartItem, // 删除物料属性
+    queryMasterPartItem,
+  } from '@/api/part/masterPartInformation.js'
+  import Chooselist from '@/views/modules/common/Chooselist'
+  import DictDataSelect from '../sys/dict-data-select.vue'
+  export default {
+    components: {
+      DictDataSelect,
+      Chooselist
+    },
+    watch: {
+      searchData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.searchData.partNo = this.searchData.partNo.toUpperCase()
+        }
+      },
+      modalData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.modalData.partNo = this.modalData.partNo.toUpperCase()
+        }
+      }
+    },
+    data () {
+      return {
+        // 导出
+        exportData: [],
+        exportName: '物料档案管理' + this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader: ['物料档案管理'],
+        exportFooter: [],
+        resultList: [],
+        // ======== 行高 ========
+        height: 200,
+        secondHeight: 200,
+        // ======== 分页 ========
+        pageIndex: 1,
+        pageSize: 50,
+        totalPage: 0,
+        selectedDataNum: 0,
+        tempCodeNo: '',
+        // 条件查询
+        searchData: {
+          site: this.$store.state.user.site,
+          partNo: '',
+          partDesc: '',
+          page: 1,
+          limit: 10
+        },
+        // 其它
+        // 初始页签
+        activeTable: 'part_item',
+        // ======== 数据对象 ========
+        modalData: {
+          flag: '',
+          title: '',
+          site: this.$store.state.user.site,
+          partNo: '',
+          partDesc: '',
+          partMainGroup: '',
+          groupName: '',
+          weightNet: '',
+          uomForWeightNet: '',
+          volumeNet: '',
+          uomForVolumeNet: '',
+          codeNo: '',
+          codeDesc: '',
+          conditionCodeUsageDb: '',
+          multilevelTrackingDb: '',
+          allowAsNotConsumedDb: '',
+          lotTrackingCode: '',
+          lotQuantityRule: '',
+          subLotRule: '',
+          componentLotRule: '',
+          createDate: '',
+          createBy: '',
+          updateDate: '',
+          updateBy: ''
+        },
+        itemData: {
+          site: this.$store.state.user.site,
+          partNo: '',
+          propertiesItemNo: '',
+          codeNo: '',
+          itemDesc: '',
+          textValue: '',
+          numValue: '',
+          recordType: 'MP'
+        },
+        // ======== 数据列表 ========
+        dataList: [],
+        partItemList: [],
+        updatePartItemList: [],
+        availableValueList:[],
+        itemSelections1: [],
+        itemSelections2: [],
+        itemList1:[],
+        itemList2:[],
+        // ======== 列表表头 ========
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table1PartNo',
+            tableId: '104001Table1',
+            tableName: '物料信息表',
+            columnProp: 'partNo',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '物料编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table1PartDesc',
+            tableId: '104001Table1',
+            tableName: '物料信息表',
+            columnProp: 'partDesc',
+            headerAlign: 'center',
+            align: 'left',
+            columnLabel: '物料描述',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table1WeightNet',
+            tableId: '104001Table1',
+            tableName: '物料信息表',
+            columnProp: 'weightNet',
+            headerAlign: 'center',
+            align: 'right',
+            columnLabel: '净重',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table1UomForWeightNet',
+            tableId: '104001Table1',
+            tableName: '物料信息表',
+            columnProp: 'uomForWeightNet',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '净重单位',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table1VolumeNet',
+            tableId: '104001Table1',
+            tableName: '物料信息表',
+            columnProp: 'volumeNet',
+            headerAlign: 'center',
+            align: 'right',
+            columnLabel: '体积',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table1UomForVolumeNet',
+            tableId: '104001Table1',
+            tableName: '物料信息表',
+            columnProp: 'uomForVolumeNet',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '体积单位',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 60
+          },
+
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table1GroupName',
+            tableId: '104001Table1',
+            tableName: '物料信息表',
+            columnProp: 'groupName',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '物料分组',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table1CodeDesc',
+            tableId: '104001Table1',
+            tableName: '物料信息表',
+            columnProp: 'codeDesc',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '属性模板',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table1ConditionCodeUsageDb',
+            tableId: '104001Table1',
+            tableName: '物料信息表',
+            columnProp: 'conditionCodeUsageDb',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '允许条件代码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table1MultilevelTrackingDb',
+            tableId: '104001Table1',
+            tableName: '物料信息表',
+            columnProp: 'multilevelTrackingDb',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '多级跟踪',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table1AllowAsNotConsumedDb',
+            tableId: '104001Table1',
+            tableName: '物料信息表',
+            columnProp: 'allowAsNotConsumedDb',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '允许为未使用',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table1LotTrackingCode',
+            tableId: '104001Table1',
+            tableName: '物料信息表',
+            columnProp: 'lotTrackingCode',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '批次/批次跟踪',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table1LotQuantityRule',
+            tableId: '104001Table1',
+            tableName: '物料信息表',
+            columnProp: 'lotQuantityRule',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '批量规则',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table1SubLotRule',
+            tableId: '104001Table1',
+            tableName: '物料信息表',
+            columnProp: 'subLotRule',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '子批次规则',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table1ComponentLotRule',
+            tableId: '104001Table1',
+            tableName: '物料信息表',
+            columnProp: 'componentLotRule',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '组件批次规则',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table1CreateDate',
+            tableId: '104001Table1',
+            tableName: '物料信息表',
+            columnProp: 'createDate',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '创建时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 160
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table1CreateBy',
+            tableId: '104001Table1',
+            tableName: '物料信息表',
+            columnProp: 'createBy',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '创建人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table1UpdateDate',
+            tableId: '104001Table1',
+            tableName: '物料信息表',
+            columnProp: 'updateDate',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '更新时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 160
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table1UpdateBy',
+            tableId: '104001Table1',
+            tableName: '物料信息表',
+            columnProp: 'updateBy',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '更新人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          }
+        ],
+        columnItemList:  [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table2PropertiesItemID',
+            tableId: "104001Table2",
+            tableName: "物料属性表",
+            columnProp: 'propertiesItemNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '属性编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 90,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table2PropertiesItemDesc',
+            tableId: "104001Table2",
+            tableName: "物料属性表",
+            columnProp: 'itemDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '属性名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 90,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table2ValueType',
+            tableId: "104001Table2",
+            tableName: "物料属性表",
+            columnProp: 'valueType',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '属性类型',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 70,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table2ValueChooseFlag',
+            tableId: "104001Table2",
+            tableName: "物料属性表",
+            columnProp: 'textValue',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '文本值',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 70,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table2ValueChooseFlag',
+            tableId: "104001Table2",
+            tableName: "物料属性表",
+            columnProp: 'numValue',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '数字值',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 70,
+          },
+        ],
+        updateColumnItemList: [
+          {
+          userId: this.$store.state.user.name,
+          functionId: 104001,
+          serialNumber: '104001Table6PropertiesItemID',
+          tableId: "104001Table6",
+          tableName: "物料属性表",
+          columnProp: 'propertiesItemNo',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '属性编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: true,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 90,
+        },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table6PropertiesItemDesc',
+            tableId: "104001Table6",
+            tableName: "物料属性表",
+            columnProp: 'itemDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '属性名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 90,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table6ValueType',
+            tableId: "104001Table6",
+            tableName: "物料属性表",
+            columnProp: 'valueType',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '属性类型',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 70,
+          },
+        ],
+        // ======== 必填规则 ========
+        rules: {
+          partNo: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          partDesc: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          umName: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          familyName: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          groupName: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          codeDesc: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          manufacturerName: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          active: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          agentName: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          partType: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          productGroupId3: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          productGroupId4: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          weightNet: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          uomForWeightNet: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          volumeNet: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          uomForVolumeNet: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          lotTrackingCode: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+        },
+        // ======== 复选数据集 ========
+        partSelections: [],
+        // ======== 选中的当前行数据 ========
+        partCurrentRow: {},
+        // ======== 模态框开关控制 ========
+        modalFlag: false,
+        modalDisableFlag: false,
+        itemChooseFlag: false,
+        itemTextDisableFlag: false,
+        itemNumberDisableFlag: false,
+        itemModalDisableFlag: false,
+        itemModalFlag: false,
+        agentModelFlag: false,
+        manufacturerModelFlag: false,
+        updateItemModelFlag: false,
+        fastAddFlag: false
+      }
+    },
+
+    mounted () {
+      this.$nextTick(() => {
+        this.height = window.innerHeight / 2 - 30
+        /*第二个表格高度的动态调整*/
+        this.secondHeight = window.innerHeight - this.height - 180
+      })
+    },
+
+    created () {
+      this.getDataList()
+    },
+
+    methods: {
+
+      focusNextInput (index, type) {
+        let aaa = ''
+        if (this.updatePartItemList.length - 1 === index) {
+          aaa = `${type}0`
+        } else {
+          aaa = `${type}${index + 1}`
+        }
+        this.$nextTick(() => {
+          this.$refs[aaa].focus()
+        })
+      },
+
+      /**
+       * 编辑物料属性
+       */
+      updateItemValue () {
+        let tempData = {
+          site: this.$store.state.user.site,
+          partNo: this.partCurrentRow.partNo,
+          codeNo: this.partCurrentRow.codeNo,
+          recordType: 'MP'
+        }
+        getMasterPartItem(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.updatePartItemList = data.rows
+            this.updateItemModelFlag = true
+          } else {
+            this.updatePartItemList = []
+          }
+        })
+      },
+
+      /**
+       * 新增/删除物料属性
+       */
+      addOrDelItem () {
+        this.itemSelections1 = null
+        this.itemSelections2 = null
+        this.itemData.propertiesItemNo = ''
+        this.itemData.itemDesc = ''
+        let tempData = {
+          site: this.$store.state.user.site,
+          partNo: this.partCurrentRow.partNo,
+          codeNo: this.partCurrentRow.codeNo,
+          recordType: 'MP'
+        }
+        getItemLists(tempData).then(({data}) => {
+          this.itemList1 = data.row1
+          this.itemList2 = data.row2
+        })
+        this.fastAddFlag = true
+      },
+      // 可选属性
+      itemClickRow1 (row) {
+        this.$refs.itemTable1.toggleRowSelection(row)
+      },
+      // 已有属性
+      itemClickRow2 (row) {
+        this.$refs.itemTable2.toggleRowSelection(row)
+      },
+      selectionItem1 (val) {
+        this.itemSelections1 = val
+      },
+      selectionItem2 (val) {
+        this.itemSelections2 = val
+      },
+      // 物料项目新增
+      addItem () {
+        if (this.itemSelections1 == null || this.itemSelections1.length === 0) {
+          this.$message.warning('请选择可选属性！')
+          return
+        }
+        let inData = {
+          site: this.$store.state.user.site,
+          partNo: this.partCurrentRow.partNo,
+          codeNo: this.partCurrentRow.codeNo,
+          codeDesc: this.partCurrentRow.codeDesc,
+          recordType: 'MP',
+          itemList: this.itemSelections1
+        }
+        addMasterPartItem(inData).then(({data}) => {
+          if (data && data.code === 0) {
+            getItemLists(inData).then(({data}) => {
+              this.itemList1 = data.row1
+              this.itemList2 = data.row2
+            })
+            this.getMasterPartItem()
+            this.itemSelections1 = []
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      // 物料项目删除
+      deleteItem () {
+        if (this.itemSelections2 == null || this.itemSelections2.length === 0) {
+          this.$alert("请选择已有属性！", '提示', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        let inData = {
+          site: this.$store.state.user.site,
+          partNo: this.partCurrentRow.partNo,
+          codeNo: this.partCurrentRow.codeNo,
+          codeDesc: this.partCurrentRow.codeDesc,
+          recordType: 'MP',
+          itemList: this.itemSelections2
+        }
+        deleteMasterPartItem(inData).then(({data}) => {
+          if (data && data.code === 0) {
+            getItemLists(inData).then(({data}) => {
+              this.itemList1 = data.row1
+              this.itemList2 = data.row2
+            })
+            this.getMasterPartItem()
+            this.itemSelections2 = []
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      // 查询物料项目
+      queryMasterPartItem () {
+        this.itemData.partNo = this.partCurrentRow.partNo
+        this.itemData.codeNo = this.partCurrentRow.codeNo
+        this.itemData.partNo = this.partCurrentRow.partNo
+        queryMasterPartItem(this.itemData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.itemList1 = data.rows
+          } else {
+            this.itemList1 = []
+          }
+        })
+      },
+
+      // 确认修改物料属性
+      commitItemValue () {
+        let tempData = {
+          itemList: JSON.parse(JSON.stringify(this.updatePartItemList))
+        }
+        commitItemValue(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.getMasterPartItem()
+            this.updateItemModelFlag = false
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+
+      // ======= 正则校验 =======
+      handleInput (value, type) {
+        // 大于等于0，且只能输入4位小数
+        let val = value.replace(/^\D*([0-9]\d*\.?\d{0,4})?.*$/,'$1')
+        if (val === null || val === undefined || val === '') {
+          val = 0
+        }
+        if (type === 1) {
+          this.modalData.weightNet = val
+        } else if (type === 2) {
+          this.modalData.volumeNet = val
+        }
+      },
+
+      // ======== 分页相关方法 ========
+      /**
+       * 每页数
+       * @param val
+       */
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      /**
+       * 当前页
+       * @param val
+       */
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+
+      // ======== 页签切换相关方法 ========
+      /**
+       * 未知
+       * @returns {boolean}
+       */
+      selectFlag () {
+        return true
+      },
+      /**
+       * 列表表格选择替换
+       * @param tab
+       * @param event
+       */
+      tabClick (tab, event) {
+        // 刷新列表数据
+        this.refreshCurrentTabTable()
+      },
+      /**
+       * 当前值发生变化的时候修改
+       * @param row
+       * @param oldRow
+       */
+      changeCurrentRow (row, oldRow) {
+        // 判断是否是获取焦点的事件
+        if (row) {
+          this.partCurrentRow = JSON.parse(JSON.stringify(row))
+          // 刷新当前页表
+          this.refreshCurrentTabTable()
+        }
+      },
+      /**
+       * 刷新页签的table数据
+       */
+      refreshCurrentTabTable () {
+        if (this.activeTable === 'part_item') {
+          this.getMasterPartItem()
+        }
+      },
+
+      // ======== 列表数据刷新方法 ========
+      /**
+       * 查询物料属性
+       */
+      getMasterPartItem () {
+        let tempData = {
+          site: this.$store.state.user.site,
+          partNo: this.partCurrentRow.partNo,
+          codeNo: this.partCurrentRow.codeNo,
+          recordType: 'MP'
+        }
+        getMasterPartItem(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.partItemList = data.rows
+          } else {
+            this.partItemList = []
+          }
+        })
+      },
+      // ======== 列表数据刷新方法 ========
+      /**
+       * 获取数据列表
+       */
+      getDataList () {
+        this.searchData.limit = this.pageSize
+        this.searchData.page = this.pageIndex
+        masterPartSearch(this.searchData).then(({data}) => {
+          if (data.code === 0) {
+            this.dataList = data.page.list
+            this.pageIndex = data.page.currPage
+            this.pageSize = data.page.pageSize
+            this.totalPage = data.page.totalCount
+            this.$refs.selectDiv.setLengthAll( this.dataList.length)
+            // 判断是否全部存在数据
+            if (this.totalPage > 0) {
+              // 设置选中行
+              this.$refs.partTable.setCurrentRow(this.dataList[0])
+              // 加载当前的页签的table
+              this.refreshCurrentTabTable()
+              this.partClickRow(this.dataList[0])
+            }
+          }
+        })
+      },
+
+      // ======== 新增/编辑模态框 ========
+      /**
+       * 物料信息新增模态框
+       */
+      addModal () {
+        this.modalData = {
+          site: this.$store.state.user.site,
+          flag: '1',
+          title: '物料新增',
+          partNo: '',
+          partDesc: '',
+          partMainGroup: '',
+          groupName: '',
+          weightNet: '',
+          uomForWeightNet: '',
+          volumeNet: '',
+          uomForVolumeNet: '',
+          codeNo: '',
+          codeDesc: '',
+          conditionCodeUsageDb: '',
+          multilevelTrackingDb: '',
+          allowAsNotConsumedDb: '',
+          lotTrackingCode: '',
+          lotQuantityRule: '',
+          subLotRule: '',
+          componentLotRule: '',
+          createBy: this.$store.state.user.name
+        }
+        this.modalDisableFlag = false
+        this.modalFlag = true
+      },
+      /**
+       * 物料信息编辑模态框
+       * @param row
+       */
+      updateModal (row) {
+        this.modalData = {
+          flag: '2',
+          title: '物料编辑',
+          site: this.$store.state.user.site,
+          partNo: row.partNo,
+          partDesc: row.partDesc,
+          partMainGroup: row.partMainGroup,
+          groupName: row.groupName,
+          weightNet: row.weightNet,
+          uomForWeightNet: row.uomForWeightNet,
+          volumeNet: row.volumeNet,
+          uomForVolumeNet: row.uomForVolumeNet,
+          codeNo: row.codeNo,
+          codeDesc: row.codeDesc,
+          conditionCodeUsageDb: row.conditionCodeUsageDb,
+          multilevelTrackingDb: row.multilevelTrackingDb,
+          allowAsNotConsumedDb: row.allowAsNotConsumedDb,
+          lotTrackingCode: row.lotTrackingCode,
+          lotQuantityRule: row.lotQuantityRule,
+          subLotRule: row.subLotRule,
+          componentLotRule: row.componentLotRule,
+          updateBy: this.$store.state.user.name
+        }
+        this.modalDisableFlag = true
+        this.modalFlag = true
+      },
+      /**
+       * 返回列表唯一值
+       * @param row
+       * @returns {string|[{trigger: string, message: string, required: boolean}]|*}
+       */
+      getRowKeys (row) {
+        // 唯一值，一般都为id
+        return row.agentId
+      },
+
+      // ======== 新增/编辑/删除方法 ========
+      /**
+       * 物料信息新增/编辑
+       */
+      saveData () {
+        if (this.modalData.partNo === '' || this.modalData.partNo == null) {
+          this.$message.warning('请填写物料编码！')
+          return
+        }
+        if (this.modalData.partDesc === '' || this.modalData.partDesc == null) {
+          this.$message.warning('请填写物料描述！')
+          return
+        }
+        if (this.modalData.codeNo === '' || this.modalData.codeNo == null) {
+          this.$message.warning('请选择属性模板！')
+          return
+        }
+        if (this.modalData.partMainGroup === '' || this.modalData.partMainGroup == null) {
+          this.$message.warning('请选择分组！')
+          return
+        }
+        if ( this.modalData.weightNet === '' || this.modalData.weightNet == null) {
+          this.$message.warning('请填写净重！')
+          return
+        }
+        if (this.modalData.uomForWeightNet === '' || this.modalData.uomForWeightNet == null) {
+          this.$message.warning('请选择净重单位！')
+          return
+        }
+        if (this.modalData.volumeNet === '' || this.modalData.volumeNet == null) {
+          this.$message.warning('请填写净体积！')
+          return
+        }
+        if (this.modalData.uomForVolumeNet === '' || this.modalData.uomForVolumeNet == null) {
+          this.$message.warning('请选择净体积单位！')
+          return
+        }
+        if (this.modalData.flag === '1') {
+          masterPartInformationSave(this.modalData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.getDataList()
+              this.modalFlag = false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        } else {
+          masterPartInformationEdit(this.modalData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.getDataList()
+              this.modalFlag = false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }
+      },
+      /**
+       * 物料信息删除
+       */
+      delModal () {
+        if (this.partSelections.length === 0) {
+          this.$message.warning('请勾选要删除的物料信息！')
+          return
+        }
+        this.$confirm(`是否删除这 `+ this.partSelections.length +` 条物料信息?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let tempData = {
+            informationList: this.partSelections
+          }
+          masterPartInformationDelete(tempData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.getDataList()
+              this.partSelections = []
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
+
+      // ======== 列表操作方法 ========
+      /**
+       * 单机选中物料信息
+       * @param row
+       */
+      partClickRow (row) {
+        this.$refs.partTable.toggleRowSelection(row)
+        this.partCurrentRow = JSON.parse(JSON.stringify(row))
+      },
+      /**
+       * 复选物料信息
+       * @param val
+       */
+      selectionPart (val) {
+        this.partSelections = val
+        this.$refs.selectDiv.setLengthselected(this.partSelections.length)
+      },
+
+      // ======== chooseList相关方法 ========
+      /**
+       * 获取基础数据列表S
+       * @param val
+       * @param type
+       */
+      getBaseList (val, type) {
+        this.tagNo = val
+        this.tempCodeNo = this.modalData.codeNo
+        this.$nextTick(() => {
+          let strVal = ''
+          if (val === 107) {
+            strVal = this.modalData.umId
+          } else if (val === 109) {
+            strVal = this.modalData.partMainGroup
+          } else if (val === 22) {
+            strVal = this.modalData.codeNo
+          }
+          this.$refs.baseList.init(val, strVal)
+        })
+      },
+      /**
+       * 列表方法的回调
+       * @param val
+       */
+      getBaseData (val) {
+        if (this.tagNo === 107) {
+          this.modalData.umId = val.um_id
+          this.modalData.umName = val.um_name
+        } else if (this.tagNo === 109) {
+          this.modalData.partMainGroup = val.group_id
+          this.modalData.groupName = val.group_name
+        } else if (this.tagNo === 22) {
+          if (this.modalData.flag === '2') {
+            if (val.Code_no != this.tempCodeNo) {
+              this.$confirm(`更换属性模板将替换下方物料属性数据，请确认?`, '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                this.modalData.codeNo = val.Code_no
+                this.$set(this.modalData, 'codeDesc', val.Code_desc)
+              }).catch(() => {
+              })
+            }
+          } else {
+            this.modalData.codeNo = val.Code_no
+            this.$set(this.modalData, 'codeDesc', val.Code_desc)
+          }
+        }
+      },
+
+      // ======== 导出相关方法 ========
+      /**
+       * 导出excel
+       */
+      async createExportData () {
+        this.searchData.limit = -1
+        this.searchData.page = 1
+        await masterPartSearch(this.searchData).then(({data}) => {
+          this.resultList = data.page.list
+        })
+        return this.resultList
+      },
+
+      startDownload () {},
+
+      finishDownload () {},
+
+      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
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+/deep/ .customer-tab .el-tabs__content {
+  padding: 0px !important;
+  height: 459px;
+}
+/deep/ .customer-tab .el-tabs__content {
+  height: 294px;
+}
+.numInput /deep/ .el-input__inner{
+  text-align: right;
+}
+/deep/  .inlineNumber input::-webkit-outer-spin-button,
+/deep/  .inlineNumber input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+
+}
+/deep/  .inlineNumber input[type="number"]{
+  -moz-appearance: textfield;
+  padding-right: 5px !important;
+}
+</style>
+
diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue
index 0f23216..d5bb0d1 100644
--- a/src/views/modules/part/partInformation.vue
+++ b/src/views/modules/part/partInformation.vue
@@ -115,137 +115,455 @@
     </el-pagination>
 
     <!-- 物料新增/编辑模态框 -->
-    <el-dialog :title="modalData.title" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="960px">
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+    <el-dialog :title="modalData.title" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="1000px">
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
         <el-form-item label="物料编码" prop="partNo" :rules="rules.partNo">
-          <el-input v-model="modalData.partNo" clearable style="width: 120px" :disabled="modalDisableFlag"></el-input>
+          <el-input v-model="modalData.partNo" clearable style="width: 128px" :disabled="modalDisableFlag"></el-input>
         </el-form-item>
         <el-form-item label="物料描述" prop="partDesc" :rules="rules.partDesc" style="margin-left: -10px">
           <el-input v-model="modalData.partDesc" clearable style="width: 330px"></el-input>
         </el-form-item>
-        <el-form-item label="规格型号">
-          <el-input v-model="modalData.spec" clearable style="width: 205px"></el-input>
-        </el-form-item>
-        <el-form-item label="物料类别" prop="partType" :rules="rules.partType">
-          <el-select v-model="modalData.partType" style="width: 160px">
-            <el-option label="Manufactured" value="Manufactured"></el-option>
-            <el-option label="Manufactured recipe" value="Manufactured recipe"></el-option>
-            <el-option label="Purchase raw" value="Purchase raw"></el-option>
-            <el-option label="Purchased" value="Purchased"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="是否在用" prop="active" :rules="rules.active">
-          <el-select v-model="modalData.active" style="width: 60px">
-            <el-option label="是" value="Y"></el-option>
-            <el-option label="否" value="N"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="净重" prop="weightNet" :rules="rules.weightNet">
-          <el-input class="numInput" v-model="modalData.weightNet" @input="handleInput(modalData.weightNet,1)" type="number" style="width: 170px"></el-input>
-        </el-form-item>
-        <el-form-item label="净重单位" prop="uomForWeightNet" :rules="rules.uomForWeightNet">
-          <dict-data-select v-if="modalFlag" v-model="modalData.uomForWeightNet" style="width: 170px" dict-type="part_uom_for_weight_net"></dict-data-select>
-        </el-form-item>
-        <el-form-item label="体积" prop="volumeNet" :rules="rules.volumeNet">
-          <el-input class="numInput" v-model="modalData.volumeNet" @input="handleInput(modalData.volumeNet,2)" type="number" style="width: 170px"></el-input>
-        </el-form-item>
-        <el-form-item label="体积单位" prop="uomForVolumeNet" :rules="rules.uomForVolumeNet">
-          <dict-data-select v-if="modalFlag" v-model="modalData.uomForVolumeNet" style="width: 170px" dict-type="part_uom_for_volume_net"></dict-data-select>
-        </el-form-item>
-        <el-form-item label="批号跟踪" prop="lotTrackingCode" :rules="rules.lotTrackingCode">
-          <el-select v-model="modalData.lotTrackingCode" style="width: 185px">
-            <el-option label="Lot Tracking" value="Lot Tracking"></el-option>
-            <el-option label="Not Lot Tracking" value="Not Lot Tracking"></el-option>
-            <el-option label="Order Base" value="Order Base"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item prop="codeDesc" :rules="rules.codeDesc">
-          <span slot="label" @click="getBaseList(20)"><a herf="#">属性模板</a></span>
-          <el-input v-model="modalData.codeNo" style="width: 120px"></el-input>
-          <el-input v-model="modalData.codeDesc" disabled style="width: 330px"></el-input>
-        </el-form-item>
-        <el-form-item prop="umName" :rules="rules.umName">
-          <span slot="label" @click="getBaseList(107)"><a herf="#">计量单位</a></span>
-          <el-input v-model="modalData.umId" style="width: 120px"></el-input>
-          <el-input v-model="modalData.umName" disabled style="width: 330px"></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item prop="familyName" :rules="rules.familyName">
-          <span slot="label" @click="getBaseList(108)"><a herf="#">物料分类</a></span>
-          <el-input v-model="modalData.familyId" style="width: 120px"></el-input>
-          <el-input v-model="modalData.familyName" disabled style="width: 330px"></el-input>
-        </el-form-item>
-        <el-form-item prop="groupName" :rules="rules.groupName">
-          <span slot="label" @click="getBaseList(109)"><a herf="#">物料分组</a></span>
-          <el-input v-model="modalData.groupId" style="width: 120px"></el-input>
-          <el-input v-model="modalData.groupName" disabled style="width: 330px"></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item>
-          <span slot="label" @click="getBaseList(110)"><a herf="#">商品组1</a></span>
-          <el-input v-model="modalData.productGroupId1" style="width: 120px"></el-input>
-          <el-input v-model="modalData.productGroupName1" disabled style="width: 330px"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <span slot="label" @click="getBaseList(111)"><a herf="#">商品组2</a></span>
-          <el-input v-model="modalData.productGroupId2" style="width: 120px"></el-input>
-          <el-input v-model="modalData.productGroupName2" disabled style="width: 330px"></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item prop="productGroupId3" :rules="rules.productGroupId3">
-          <span slot="label" @click="getBaseList(112)"><a herf="#">会计组</a></span>
-          <el-input v-model="modalData.productGroupId3" style="width: 120px"></el-input>
-          <el-input v-model="modalData.productGroupName3" disabled style="width: 330px"></el-input>
-        </el-form-item>
-        <el-form-item prop="productGroupId4" :rules="rules.productGroupId4">
-          <span slot="label" @click="getBaseList(113)"><a herf="#">计划员</a></span>
-          <el-input v-model="modalData.productGroupId4" style="width: 120px"></el-input>
-          <el-input v-model="modalData.productGroupName4" disabled style="width: 330px"></el-input>
-        </el-form-item>
-      </el-form>
+        <el-tabs style="width: 100%;height: 465px" type="border-card">
+          <el-tab-pane label="General">
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
+              <el-form-item label="物料类别 / Part Type" prop="partType" :rules="rules.partType">
+                <el-select v-model="modalData.partType" style="width: 461px">
+                  <el-option label="Manufactured" value="Manufactured"></el-option>
+                  <el-option label="Manufactured recipe" value="Manufactured recipe"></el-option>
+                  <el-option label="Purchase raw" value="Purchase raw"></el-option>
+                  <el-option label="Purchased" value="Purchased"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item>
+                <span slot="label" @click="getBaseList(123)"><a herf="#">安全编码 / Safety Code</a></span>
+                <el-input v-model="modalData.hazardCode" style="width: 128px"></el-input>
+                <el-input v-model="modalData.hazardDesc" disabled style="width: 330px"></el-input>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item prop="productGroupId4" :rules="rules.productGroupId4">
+                <span slot="label" @click="getBaseList(113)"><a herf="#">计划员 / Planner</a></span>
+                <el-input v-model="modalData.productGroupId4" style="width: 128px"></el-input>
+                <el-input v-model="modalData.productGroupName4" disabled style="width: 330px"></el-input>
+              </el-form-item>
+              <el-form-item prop="productGroupId3" :rules="rules.productGroupId3">
+                <span slot="label" @click="getBaseList(112)"><a herf="#">会计组 / Accounting Group</a></span>
+                <el-input v-model="modalData.productGroupId3" style="width: 128px"></el-input>
+                <el-input v-model="modalData.productGroupName3" disabled style="width: 330px"></el-input>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item prop="umName" :rules="rules.umName">
+                <span slot="label" @click="getBaseList(107)"><a herf="#">计量单位 / Inventory UoM</a></span>
+                <el-input v-model="modalData.umId" style="width: 128px"></el-input>
+                <el-input v-model="modalData.umName" disabled style="width: 330px"></el-input>
+              </el-form-item>
+              <el-form-item prop="groupName" :rules="rules.groupName">
+                <span slot="label" @click="getBaseList(109)"><a herf="#">物料分组 / Product Code</a></span>
+                <el-input v-model="modalData.groupId" style="width: 128px"></el-input>
+                <el-input v-model="modalData.groupName" disabled style="width: 330px"></el-input>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item>
+                <span slot="label" @click="getBaseList(110)"><a herf="#">商品组1 / Comm Group 1</a></span>
+                <el-input v-model="modalData.productGroupId1" style="width: 128px"></el-input>
+                <el-input v-model="modalData.productGroupName1" disabled style="width: 330px"></el-input>
+              </el-form-item>
+              <el-form-item prop="familyName" :rules="rules.familyName">
+                <span slot="label" @click="getBaseList(108)"><a herf="#">物料分类 / Product Family</a></span>
+                <el-input v-model="modalData.familyId" style="width: 128px"></el-input>
+                <el-input v-model="modalData.familyName" disabled style="width: 330px"></el-input>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item>
+                <span slot="label" @click="getBaseList(111)"><a herf="#">商品组2 / Comm Group 2</a></span>
+                <el-input v-model="modalData.productGroupId2" style="width: 128px"></el-input>
+                <el-input v-model="modalData.productGroupName2" disabled style="width: 330px"></el-input>
+              </el-form-item>
+              <el-form-item label="型号名称 / Type Designation">
+                <el-input v-model="modalData.typeDesignation" clearable style="width: 461px"></el-input>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item>
+                <span slot="label" @click="getBaseList(124)"><a herf="#">资产类别 / Asset Class</a></span>
+                <el-input v-model="modalData.assetClass" style="width: 128px"></el-input>
+                <el-input v-model="modalData.assetClassDesc" disabled style="width: 330px"></el-input>
+              </el-form-item>
+              <el-form-item label="尺寸/质量 / Dimension/Quality">
+                <el-input v-model="modalData.dimQuality" clearable style="width: 461px"></el-input>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item>
+                <span slot="label" @click="getBaseList(125)"><a herf="#">物料状态 / Part Status</a></span>
+                <el-input v-model="modalData.partStatus" style="width: 128px"></el-input>
+                <el-input v-model="modalData.partStatusDesc" disabled style="width: 330px"></el-input>
+              </el-form-item>
+              <el-form-item label="净重" prop="weightNet" :rules="rules.weightNet">
+                <el-input class="inlineNumber numInput" v-model="modalData.weightNet" @input="handleInput(modalData.weightNet,1)" type="number" style="width: 223px"></el-input>
+              </el-form-item>
+              <el-form-item label="净重单位" prop="uomForWeightNet" :rules="rules.uomForWeightNet">
+                <dict-data-select v-if="modalFlag" v-model="modalData.uomForWeightNet" style="width: 224px" :use-default-value="false" dict-type="part_uom_for_weight_net"></dict-data-select>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item>
+                <span slot="label" @click="getBaseList(126)"><a herf="#">ABC类别 / ABC Class</a></span>
+                <el-input v-model="modalData.abcClass" style="width: 128px"></el-input>
+                <el-input v-model="modalData.abcClassDesc" disabled style="width: 330px"></el-input>
+              </el-form-item>
+              <el-form-item label="体积" prop="volumeNet" :rules="rules.volumeNet">
+                <el-input class="inlineNumber numInput" v-model="modalData.volumeNet" @input="handleInput(modalData.volumeNet,2)" type="number" style="width: 223px"></el-input>
+              </el-form-item>
+              <el-form-item label="体积单位" prop="uomForVolumeNet" :rules="rules.uomForVolumeNet">
+                <dict-data-select v-if="modalFlag" v-model="modalData.uomForVolumeNet" style="width: 224px" dict-type="part_uom_for_volume_net"></dict-data-select>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item prop="codeDesc" :rules="rules.codeDesc">
+                <span slot="label" @click="getBaseList(20)"><a herf="#">属性模板</a></span>
+                <el-input v-model="modalData.codeNo" style="width: 128px"></el-input>
+                <el-input v-model="modalData.codeDesc" disabled style="width: 330px"></el-input>
+              </el-form-item>
+              <el-form-item label="频率等级 / Frequency Class">
+                <el-input v-model="modalData.frequencyClass" clearable style="width: 223px"></el-input>
+              </el-form-item>
+              <el-form-item label="生命周期阶段 / Lifecycle Stage">
+                <el-input v-model="modalData.lifecycleStage" clearable style="width: 224px"></el-input>
+              </el-form-item>
+            </el-form>
+          </el-tab-pane>
+
+          <el-tab-pane label="Acquisition">
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
+              <el-form-item label="制造提前期 / Manufacturing Lead Time">
+                <el-input :disabled="!(modalData.partType === 'Manufactured' || modalData.partType === 'Manufactured recipe')" class="inlineNumber numInput" v-model="modalData.manufacturingLeadTime" @change="changeExpectedLeadTime" type="number" style="width: 128px"></el-input>
+                <el-input clearable style="width: 330px"></el-input>
+              </el-form-item>
+              <el-form-item>
+                <span slot="label" @click="getBaseList(127)"><a herf="#">原产地 / Country of Origin</a></span>
+                <el-input v-model="modalData.isoCountry" style="width: 128px"></el-input>
+                <el-input v-model="modalData.isoCountryDesc" disabled style="width: 330px"></el-input>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item label="预期交货期 / Expected Lead Time">
+                <el-input class="inlineNumber numInput" v-model="modalData.expectedLeadTime" type="number" style="width: 128px"></el-input>
+                <el-input clearable style="width: 330px"></el-input>
+              </el-form-item>
+              <el-form-item>
+                <span slot="label" @click="getBaseList(128)"><a herf="#">地区编码 / Region Code</a></span>
+                <el-input v-model="modalData.regionOfOrigin" style="width: 128px"></el-input>
+                <el-input v-model="modalData.regionOfOriginDesc" disabled style="width: 330px"></el-input>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item label="周数 / Weeks">
+                <el-input class="inlineNumber numInput" v-model="modalData.durabilityWeek" readonly type="number" style="width: 461px"></el-input>
+              </el-form-item>
+              <el-form-item>
+                <span slot="label" @click="getBaseList(129)"><a herf="#">海关统计编号 / Customs Star No</a></span>
+                <el-input v-model="modalData.customsStarNo" style="width: 128px"></el-input>
+                <el-input v-model="modalData.customsStarDesc" disabled style="width: 330px"></el-input>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item label="天数 / Days">
+                <el-input class="inlineNumber numInput" v-model="modalData.durabilityDay" @change="changeDurabilityWeek" type="number" style="width: 461px"></el-input>
+              </el-form-item>
+              <el-form-item label="内部统计转换系数 / Intrastat Conv Factor">
+                <el-input class="inlineNumber numInput" v-model="modalData.intrastatConvFactor" type="number" style="width: 128px"></el-input>
+                <el-input v-model="modalData.umDesc" disabled style="width: 330px"></el-input>
+              </el-form-item>
+            </el-form>
+          </el-tab-pane>
+
+          <el-tab-pane label="Costs">
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
+              <el-form-item label="配置ID / Configuration ID">
+                <el-select v-model="modalData.configurationID" style="width: 461px">
+                  <el-option label="*" value="*"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item label="预计材料成本 / Estimated Material Cost">
+                <el-input class="inlineNumber numInput" v-model="modalData.estimatedMaterialCost" type="number" style="width: 461px"></el-input>
+              </el-form-item>
+            </el-form>
+          </el-tab-pane>
+
+          <el-tab-pane label="Misc Part Info">
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
+              <el-form-item label="库存计价方法 / Inventory Valuation Method">
+                <el-select v-model="modalData.inventoryValuationMethod" style="width: 461px">
+                  <el-option label="Weighted Average" value="Weighted Average"></el-option>
+                  <el-option label="Standard Cost" value="Standard Cost"></el-option>
+                  <el-option label="First In First Out" value="First In First Out"></el-option>
+                  <el-option label="Last In First Out" value="Last In First Out"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item>
+                <span slot="label" @click="getBaseList(131)"><a herf="#">物料成本组 / Part Cost Group</a></span>
+                <el-input v-model="modalData.partCostGroupID" style="width: 128px"></el-input>
+                <el-input v-model="modalData.partCostGroupDesc" disabled style="width: 330px"></el-input>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item label="库存零件成本水平 / Inventory Part Cost Level">
+                <el-select v-model="modalData.inventoryPartCostLevel" style="width: 461px">
+                  <el-option label="Cost Per Part" value="Cost Per Part"></el-option>
+                  <el-option label="Cost Per Configuration" value="Cost Per Configuration"></el-option>
+                  <el-option label="Cost Per Condition" value="Cost Per Condition"></el-option>
+                  <el-option label="Cost Per Lot Batch" value="Cost Per Lot Batch"></el-option>
+                  <el-option label="Cost Per Serial" value="Cost Per Serial"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item label="供应商发票考虑因素 / Supplier Invoice Consideration">
+                <el-select v-model="modalData.invoiceConsideration" style="width: 461px">
+                  <el-option label="Ignore Invoice Price" value="Ignore Invoice Price"></el-option>
+                  <el-option label="Periodic Weighted Average" value="Periodic Weighted Average"></el-option>
+                  <el-option label="Transaction Based" value="Transaction Based"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item label="零成本 / Zero Cost">
+                <el-select v-model="modalData.zeroCostFlag" style="width: 461px">
+                  <el-option label="Zero Cost Allowed" value="Zero Cost Allowed"></el-option>
+                  <el-option label="Zero Cost Forbidden" value="Zero Cost Forbidden"></el-option>
+                  <el-option label="Zero Cost Only" value="Zero Cost Only"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </el-tab-pane>
+
+          <el-tab-pane label="Planning Data">
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item>
+                <span slot="label" @click="getBaseList(132)"><a herf="#">规划方法 / Planning Method</a></span>
+                <el-input v-model="modalData.planningMethod" style="width: 170px"></el-input>
+              </el-form-item>
+              <el-form-item label=" ">
+                <el-input v-model="modalData.planningMethodDesc" disabled style="width: 495px"></el-input>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item label="安全库存 / Safety Stock">
+                <el-input class="inlineNumber numInput" v-model="modalData.safetyStock" type="number" style="width: 170px"></el-input>
+              </el-form-item>
+              <el-form-item label="最小批量 / Min Lot Size">
+                <el-input class="inlineNumber numInput" v-model="modalData.minOrderQty" type="number" style="width: 155px"></el-input>
+              </el-form-item>
+              <el-form-item label="最大批量 / Max Lot Size">
+                <el-input class="inlineNumber numInput" v-model="modalData.maxOrderQty" type="number" style="width: 155px"></el-input>
+              </el-form-item>
+              <el-form-item label="多个批量 / Multiple Lot Size">
+                <el-input class="inlineNumber numInput" v-model="modalData.mulOrderQty" type="number" style="width: 155px"></el-input>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item label="安全提前期 / Safety Lead Time">
+                <el-input class="inlineNumber numInput" v-model="modalData.safetyLeadTime" type="number" style="width: 170px"></el-input>
+              </el-form-item>
+              <el-form-item label="报废率(%) / Scrap Factor(%)">
+                <el-input class="inlineNumber numInput" v-model="modalData.shrinkageFac" type="number" style="width: 155px"></el-input>
+              </el-form-item>
+              <el-form-item label="标准批量 / Std Lot Size">
+                <el-input class="inlineNumber numInput" v-model="modalData.stdOrderQty" type="number" style="width: 155px"></el-input>
+              </el-form-item>
+            </el-form>
+          </el-tab-pane>
+
+          <el-tab-pane label="Manufacturing">
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
+              <el-form-item label="累计提前期 / Cum Lead Time">
+                <el-input class="inlineNumber numInput" v-model="modalData.cumLeadTime" type="number" style="width: 300px"></el-input>
+              </el-form-item>
+              <el-form-item label="储备/发行自 / Reserve/Issue from">
+                <el-select v-model="modalData.backFlushPart" style="width: 300px">
+                  <el-option label="All Locations" value="All Locations"></el-option>
+                  <el-option label="Only Floor Stock" value="Only Floor Stock"></el-option>
+                  <el-option label="Only Specified Location" value="Only Specified Location"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item style="margin-top: 23px">
+                <el-checkbox v-model="modalData.byProdAsSupplyInMrpDb" true-label="Y">将副产品用作供应 / Use By-Product as Supply in</el-checkbox>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item label="无保护提前期 / Unprotected Lead Time">
+                <el-input class="inlineNumber numInput" v-model="modalData.unprotectedLeadTime" type="number" style="width: 300px"></el-input>
+              </el-form-item>
+              <el-form-item label="储备/发行方式 / Reserve/Issue Method">
+                <el-select v-model="modalData.issueType" style="width: 300px">
+                  <el-option label="Reserve" value="Reserve"></el-option>
+                  <el-option label="Backflush" value="Backflush"></el-option>
+                  <el-option label="Reserve And Backflush" value="Reserve And Backflush"></el-option>
+                  <el-option label="Manual" value="Manual"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item style="margin-top: 23px">
+                <el-checkbox v-model="modalData.mrpControlFlagDb" true-label="Y">MRP控制 / MRP Control</el-checkbox>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item label="按日固定提前期 / Fixed Lead Time by Day">
+                <el-input class="inlineNumber numInput" v-model="modalData.fixedLeadTimeDay" type="number" style="width: 300px"></el-input>
+              </el-form-item>
+              <el-form-item label="过度报告 / Over Reporting">
+                <el-select v-model="modalData.overReporting" style="width: 300px">
+                  <el-option label="Allowed" value="Allowed"></el-option>
+                  <el-option label="Allowed with Warning" value="Allowed with Warning"></el-option>
+                  <el-option label="Not Allowed" value="Not Allowed"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item style="margin-top: 23px">
+                <el-checkbox v-model="modalData.useTheoreticalDensityDb" true-label="Y">使用理论 / Use Theoretical</el-checkbox>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item label="按天列出的可变提前期 / Variable Lead Time by Day">
+                <el-input class="inlineNumber numInput" v-model="modalData.variableLeadTimeDay" type="number" style="width: 300px"></el-input>
+              </el-form-item>
+              <el-form-item label="报告公差过大 / Over Report Tolerance">
+                <el-input class="inlineNumber numInput" v-model="modalData.overReportTolerance" type="number" style="width: 300px"></el-input>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item label="按小时计算的固定交货时间 / Fixed Lead Time by Hour">
+                <el-input class="inlineNumber numInput" v-model="modalData.fixedLeadTimeHour" type="number" style="width: 300px"></el-input>
+              </el-form-item>
+              <el-form-item label="密度 / Density">
+                <el-input class="inlineNumber numInput" v-model="modalData.density" type="number" style="width: 300px"></el-input>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+              <el-form-item label="按小时计算的可变提前期 / Variable Lead Time by Hour">
+                <el-input class="inlineNumber numInput" v-model="modalData.variableLeadTimeHour" type="number" style="width: 300px"></el-input>
+              </el-form-item>
+            </el-form>
+          </el-tab-pane>
+
+          <el-tab-pane label="Revisions">
+
+          </el-tab-pane>
+        </el-tabs>
+
+<!--        <el-form-item label="规格型号">-->
+<!--          <el-input v-model="modalData.spec" clearable style="width: 205px"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="物料类别" prop="partType" :rules="rules.partType">-->
+<!--          <el-select v-model="modalData.partType" style="width: 160px">-->
+<!--            <el-option label="Manufactured" value="Manufactured"></el-option>-->
+<!--            <el-option label="Manufactured recipe" value="Manufactured recipe"></el-option>-->
+<!--            <el-option label="Purchase raw" value="Purchase raw"></el-option>-->
+<!--            <el-option label="Purchased" value="Purchased"></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="是否在用" prop="active" :rules="rules.active">-->
+<!--          <el-select v-model="modalData.active" style="width: 60px">-->
+<!--            <el-option label="是" value="Y"></el-option>-->
+<!--            <el-option label="否" value="N"></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--      </el-form>-->
 <!--      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">-->
-<!--        <el-form-item prop="manufacturerName" :rules="rules.manufacturerName">-->
-<!--          <span slot="label" @click="getBaseList(114)"><a herf="#">制造商</a></span>-->
-<!--          <el-input v-model="modalData.manufacturerName" style="width: 221px"></el-input>-->
+<!--        <el-form-item label="净重" prop="weightNet" :rules="rules.weightNet">-->
+<!--          <el-input class="inlineNumber numInput" v-model="modalData.weightNet" @input="handleInput(modalData.weightNet,1)" type="number" style="width: 170px"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="净重单位" prop="uomForWeightNet" :rules="rules.uomForWeightNet">-->
+<!--          <dict-data-select v-if="modalFlag" v-model="modalData.uomForWeightNet" style="width: 170px" :use-default-value="false" dict-type="part_uom_for_weight_net"></dict-data-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="体积" prop="volumeNet" :rules="rules.volumeNet">-->
+<!--          <el-input class="inlineNumber numInput" v-model="modalData.volumeNet" @input="handleInput(modalData.volumeNet,2)" type="number" style="width: 170px"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="体积单位" prop="uomForVolumeNet" :rules="rules.uomForVolumeNet">-->
+<!--          <dict-data-select v-if="modalFlag" v-model="modalData.uomForVolumeNet" style="width: 170px" dict-type="part_uom_for_volume_net"></dict-data-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="批号跟踪" prop="lotTrackingCode" :rules="rules.lotTrackingCode">-->
+<!--          <el-select v-model="modalData.lotTrackingCode" style="width: 185px">-->
+<!--            <el-option label="Lot Tracking" value="Lot Tracking"></el-option>-->
+<!--            <el-option label="Not Lot Tracking" value="Not Lot Tracking"></el-option>-->
+<!--            <el-option label="Order Base" value="Order Base"></el-option>-->
+<!--          </el-select>-->
 <!--        </el-form-item>-->
 <!--      </el-form>-->
 <!--      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">-->
-
-<!--&lt;!&ndash;        <el-form-item prop="agentName" :rules="rules.agentName">&ndash;&gt;-->
-<!--&lt;!&ndash;          <span slot="label" @click="getAgentList()"><a>代理商</a></span>&ndash;&gt;-->
-<!--&lt;!&ndash;          <el-input v-model="modalData.agentName" style="width: 221px"></el-input>&ndash;&gt;-->
-<!--&lt;!&ndash;        </el-form-item>&ndash;&gt;-->
+<!--        <el-form-item prop="codeDesc" :rules="rules.codeDesc">-->
+<!--          <span slot="label" @click="getBaseList(20)"><a herf="#">属性模板</a></span>-->
+<!--          <el-input v-model="modalData.codeNo" style="width: 120px"></el-input>-->
+<!--          <el-input v-model="modalData.codeDesc" disabled style="width: 330px"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item prop="umName" :rules="rules.umName">-->
+<!--          <span slot="label" @click="getBaseList(107)"><a herf="#">计量单位</a></span>-->
+<!--          <el-input v-model="modalData.umId" style="width: 120px"></el-input>-->
+<!--          <el-input v-model="modalData.umName" disabled style="width: 330px"></el-input>-->
+<!--        </el-form-item>-->
 <!--      </el-form>-->
-      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="备注">
-          <el-input type="textarea" v-model="modalData.remark" :rows="3" resize='none' show-word-limit style="width: 921px;height: 60px"></el-input>
-        </el-form-item>
+<!--      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">-->
+<!--        <el-form-item prop="familyName" :rules="rules.familyName">-->
+<!--          <span slot="label" @click="getBaseList(108)"><a herf="#">物料分类</a></span>-->
+<!--          <el-input v-model="modalData.familyId" style="width: 120px"></el-input>-->
+<!--          <el-input v-model="modalData.familyName" disabled style="width: 330px"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item prop="groupName" :rules="rules.groupName">-->
+<!--          <span slot="label" @click="getBaseList(109)"><a herf="#">物料分组</a></span>-->
+<!--          <el-input v-model="modalData.groupId" style="width: 120px"></el-input>-->
+<!--          <el-input v-model="modalData.groupName" disabled style="width: 330px"></el-input>-->
+<!--        </el-form-item>-->
+<!--      </el-form>-->
+<!--      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">-->
+<!--        <el-form-item>-->
+<!--          <span slot="label" @click="getBaseList(110)"><a herf="#">商品组1</a></span>-->
+<!--          <el-input v-model="modalData.productGroupId1" style="width: 120px"></el-input>-->
+<!--          <el-input v-model="modalData.productGroupName1" disabled style="width: 330px"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item>-->
+<!--          <span slot="label" @click="getBaseList(111)"><a herf="#">商品组2</a></span>-->
+<!--          <el-input v-model="modalData.productGroupId2" style="width: 120px"></el-input>-->
+<!--          <el-input v-model="modalData.productGroupName2" disabled style="width: 330px"></el-input>-->
+<!--        </el-form-item>-->
+<!--      </el-form>-->
+<!--      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">-->
+<!--        <el-form-item prop="productGroupId3" :rules="rules.productGroupId3">-->
+<!--          <span slot="label" @click="getBaseList(112)"><a herf="#">会计组</a></span>-->
+<!--          <el-input v-model="modalData.productGroupId3" style="width: 120px"></el-input>-->
+<!--          <el-input v-model="modalData.productGroupName3" disabled style="width: 330px"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item prop="productGroupId4" :rules="rules.productGroupId4">-->
+<!--          <span slot="label" @click="getBaseList(113)"><a herf="#">计划员</a></span>-->
+<!--          <el-input v-model="modalData.productGroupId4" style="width: 120px"></el-input>-->
+<!--          <el-input v-model="modalData.productGroupName4" disabled style="width: 330px"></el-input>-->
+<!--        </el-form-item>-->
+<!--      </el-form>-->
+<!--      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">-->
+<!--        <el-form-item label="备注">-->
+<!--          <el-input type="textarea" v-model="modalData.remark" :rows="3" resize='none' show-word-limit style="width: 921px;height: 60px"></el-input>-->
+<!--        </el-form-item>-->
       </el-form>
-      <el-footer style="height:35px;margin-top: 55px;text-align:center">
+      <el-footer style="height:35px;margin-top: 20px;text-align:center">
         <el-button type="primary" @click="saveData()">保存</el-button>
         <el-button type="primary" @click="modalFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
 
     <!-- 页签 -->
-    <el-tabs v-model="activeTable" style="margin-top: 0px; width: 100%; min-height: 294px" type="border-card" @tab-click="tabClick" class="customer-tab">
+    <el-tabs v-model="activeTable" style="width: 100%" :style="{height: secondHeight + 'px'}" type="border-card" @tab-click="tabClick" class="customer-tab">
       <!-- 物料属性页签 -->
       <el-tab-pane label="物料属性" name="part_item">
-        <el-form label-position="top" style="margin-top: 5px; margin-left: 0px;">
-          <el-form :inline="true" label-position="top" style="margin-top: 5px">
-            <el-button type="primary" @click="updateItemValue">编辑</el-button>
-          </el-form>
+        <el-form label-position="top" style="margin-top: 2px; margin-left: 2px;">
+          <el-button type="primary" @click="addOrDelItem">新增/删除</el-button>
+          <el-button type="primary" @click="updateItemValue">编辑</el-button>
         </el-form>
         <el-table
           :data="partItemList"
-          :height="secondHeight"
+          :height="secondHeight - 60"
           border
           v-loading="dataListLoading"
           style="width: 100%;">
@@ -271,21 +589,19 @@
 <!--            fixed="right"-->
 <!--            label="操作">-->
 <!--            <template slot-scope="scope">-->
-<!--              <a type="text" size="small" @click="updateItemModal(scope.row)">编辑</a>-->
+<!--              <a type="text" size="small" @click="deleteItemModal(scope.row)">删除</a>-->
 <!--            </template>-->
 <!--          </el-table-column>-->
         </el-table>
       </el-tab-pane>
       <!-- 代理商页签 -->
       <el-tab-pane label="代理商" name="part_agent">
-        <el-form label-position="top" style="margin-top: 5px; margin-left: 0px;">
-          <el-form :inline="true" label-position="top" style="margin-top: 5px">
-            <el-button type="primary" @click="savePartAgent()">新增</el-button>
-          </el-form>
+        <el-form label-position="top" style="margin-top: 2px; margin-left: 2px;">
+          <el-button type="primary" @click="savePartAgent()">新增</el-button>
         </el-form>
         <el-table
           :data="partAgentList"
-          :height="secondHeight"
+          :height="secondHeight - 60"
           border
           style="width: 100%;">
           <el-table-column
@@ -317,14 +633,12 @@
       </el-tab-pane>
       <!-- 制造商页签 -->
       <el-tab-pane label="制造商" name="part_manufacturer">
-        <el-form label-position="top" style="margin-top: 5px; margin-left: 0px;">
-          <el-form :inline="true" label-position="top" style="margin-top: 5px">
-            <el-button type="primary" @click="savePartManufacturer()">新增</el-button>
-          </el-form>
+        <el-form label-position="top" style="margin-top: 2px; margin-left: 2px;">
+          <el-button type="primary" @click="savePartManufacturer()">新增</el-button>
         </el-form>
         <el-table
           :data="partManufacturerList"
-          :height="secondHeight"
+          :height="secondHeight - 60"
           border
           style="width: 100%;">
           <el-table-column
@@ -354,16 +668,51 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
+      <!-- 默认库位页签 -->
+      <el-tab-pane label="默认库位" name="default_locations">
+        <el-form label-position="top" style="margin-top: 2px; margin-left: 2px;">
+          <el-button type="primary" @click="saveDefaultLocation()">新增</el-button>
+        </el-form>
+        <el-table
+          :data="defaultLocationList"
+          :height="secondHeight - 60"
+          border
+          style="width: 100%;">
+          <el-table-column
+            v-for="(item,index) in columnLocationList" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed==''?false:item.fixed"
+            :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            width="150"
+            fixed="right"
+            label="操作">
+            <template slot-scope="scope">
+              <a type="text" size="small" @click="deleteLocation2(scope.row)">删除</a>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
       <!-- 文档页签 -->
       <el-tab-pane label="文档" name="part_file">
-        <el-form label-position="top" style="margin-top: 5px; margin-left: 0px;">
-          <el-form :inline="true" label-position="top" style="margin-top: 5px">
-            <el-button type="primary" @click="uploadFile()">上传文件</el-button>
-          </el-form>
+        <el-form label-position="top" style="margin-top: 2px; margin-left: 2px;">
+          <el-button type="primary" @click="uploadFile()">上传文件</el-button>
         </el-form>
         <el-table
           :data="fileContentList"
-          :height="secondHeight"
+          :height="secondHeight - 60"
           border
           v-loading="dataListLoading"
           style="width: 100%; ">
@@ -456,34 +805,102 @@
       </span>
     </el-dialog>
 
-    <!-- 物料属性值编辑模态框 -->
-    <el-dialog title="属性项目" :close-on-click-modal="false" v-drag :visible.sync="itemModalFlag" width="310px">
-      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="属性编码:">
-          <el-input v-model="itemData.propertiesItemNo" disabled style="width: 120px"></el-input>
-        </el-form-item>
-        <el-form-item label="属性名称:">
-          <el-input v-model="itemData.itemDesc" disabled style="width: 120px"></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="文本值:">
-          <el-input v-if="!itemChooseFlag" v-model="itemData.textValue" :disabled="itemTextDisableFlag" type="text" style="width: 120px"></el-input>
-          <el-select v-if="itemChooseFlag" v-model="itemData.textValue" :disabled="itemTextDisableFlag" style="width: 120px" placeholder="请选择">
-            <el-option v-for="item in availableValueList" :key="index" :label="item.availableValue" :value="item.availableValue"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="数字值:">
-          <el-input v-if="!itemChooseFlag" v-model="itemData.numValue" :disabled="itemNumberDisableFlag" type="number" style="width: 120px"></el-input>
-          <el-select v-if="itemChooseFlag" v-model="itemData.numValue" :disabled="itemNumberDisableFlag" style="width: 120px" placeholder="请选择">
-            <el-option v-for="item in availableValueList" :key="index" :label="item.availableValue" :value="item.availableValue"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="itemSaveData()">保存</el-button>
-        <el-button type="primary" @click="itemModalFlag=false">关闭</el-button>
-      </span>
+    <!-- 物料属性-> 快速新增 -->
+    <el-dialog title="新增" :close-on-click-modal="false" v-drag :visible.sync="fastAddFlag" width="1000px">
+      <div style="font-size: 12px">
+        <el-form :inline="true" label-position="top" :model="itemData">
+          <el-form-item :label="'属性编码'">
+            <el-input v-model="itemData.propertiesItemNo" clearable style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'属性名称'">
+            <el-input v-model="itemData.itemDesc" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item :label="' '">
+            <el-button type="primary" @click="queryPartItem()">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-container style="margin-top: 0px;">
+        <el-main style="width: 350px;padding: 1px">
+          <span style="font-size: 12px" >可选属性：</span>
+          <el-table
+            height="400px"
+            :data="itemList1"
+            border
+            ref="itemTable1"
+            @row-click="itemClickRow1"
+            @selection-change="selectionItem1"
+            highlight-current-row
+            style="width: 100%">
+            <el-table-column
+              type="selection"
+              header-align="center"
+              align="center"
+              :selectable="selectFlag"
+              width="50">
+            </el-table-column>
+            <el-table-column
+              prop="itNo"
+              header-align="center"
+              align="center"
+              min-width="80"
+              label="属性编码">
+            </el-table-column>
+            <el-table-column
+              prop="itemDesc"
+              header-align="center"
+              align="center"
+              min-width="200"
+              label="属性名称">
+            </el-table-column>
+          </el-table>
+        </el-main>
+        <el-main style="width: 10px;padding: 1px">
+          <div style="margin-top: 200px;margin-left: 18px">
+            <el-button type="primary" @click="addItem()">添加>></el-button>
+          </div>
+          <div style="margin-top: 15px;margin-left: 18px">
+            <el-button type="primary" @click="deleteItem()">删除<<</el-button>
+          </div>
+        </el-main>
+        <el-main style="width: 350px;padding: 1px">
+          <span style="font-size: 12px" >已有属性：</span>
+          <el-table
+            height="400px"
+            :data="itemList2"
+            border
+            ref="itemTable2"
+            @row-click="itemClickRow2"
+            @selection-change="selectionItem2"
+            highlight-current-row
+            style="width: 100%">
+            <el-table-column
+              type="selection"
+              header-align="center"
+              align="center"
+              :selectable="selectFlag"
+              width="50">
+            </el-table-column>
+            <el-table-column
+              prop="itNo"
+              header-align="center"
+              align="center"
+              min-width="80"
+              label="属性编码">
+            </el-table-column>
+            <el-table-column
+              prop="itemDesc"
+              header-align="center"
+              align="center"
+              min-width="200"
+              label="属性名称">
+            </el-table-column>
+          </el-table>
+        </el-main>
+      </el-container>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="fastAddFlag = false">关闭</el-button>
+      </el-footer>
     </el-dialog>
 
     <!-- 代理商-> 快速新增 -->
@@ -682,6 +1099,104 @@
       </el-footer>
     </el-dialog>
 
+    <!-- 默认库位-> 快速新增 -->
+    <el-dialog title="新增" @close="refreshDetailList" :close-on-click-modal="false" v-drag :visible.sync="locationModelFlag" width="900px">
+      <div style="font-size: 12px">
+        <el-form :inline="true" label-position="top" :model="locationData">
+          <el-form-item :label="'库位编码'">
+            <el-input v-model="locationData.locationId" clearable style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'库位名称'">
+            <el-input v-model="locationData.locationName" clearable style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item :label="' '">
+            <el-button type="primary" @click="getLocationList()">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-container style="margin-top: 0px;">
+        <el-main style="width: 350px; padding: 1px">
+          <span style="font-size: 12px" >可选库位:</span>
+          <el-table
+            height="400px"
+            :data="locationList1"
+            border
+            ref="locationTable1"
+            @row-click="locationClickRow1"
+            @selection-change="selectionLocation1"
+            highlight-current-row
+            style="width: 100%">
+            <el-table-column
+              type="selection"
+              header-align="center"
+              align="center"
+              :selectable="selectFlag"
+              width="50">
+            </el-table-column>
+            <el-table-column
+              prop="locationId"
+              header-align="center"
+              align="center"
+              min-width="80"
+              label="库位编码">
+            </el-table-column>
+            <el-table-column
+              prop="locationName"
+              header-align="center"
+              align="center"
+              min-width="120"
+              label="库位名称">
+            </el-table-column>
+          </el-table>
+        </el-main>
+        <el-main style="width: 111px;padding: -1px">
+          <div style="margin-top: 182px;margin-left: 18px">
+            <el-button type="primary" @click="addLocation()">添加>></el-button>
+          </div>
+          <div style="margin-top: 15px;margin-left: 18px">
+            <el-button type="primary" @click="deleteLocation()">删除<<</el-button>
+          </div>
+        </el-main>
+        <el-main style="width: 350px;padding: 1px">
+          <span style="font-size: 12px" >已有库位:</span>
+          <el-table
+            height="400px"
+            :data="locationList2"
+            border
+            ref="locationTable2"
+            @row-click="locationClickRow2"
+            @selection-change="selectionLocation2"
+            highlight-current-row
+            style="width: 100%">
+            <el-table-column
+              type="selection"
+              header-align="center"
+              align="center"
+              :selectable="selectFlag"
+              width="50">
+            </el-table-column>
+            <el-table-column
+              prop="locationId"
+              header-align="center"
+              align="center"
+              min-width="80"
+              label="库位编码">
+            </el-table-column>
+            <el-table-column
+              prop="locationName"
+              header-align="center"
+              align="center"
+              min-width="120"
+              label="库位名称">
+            </el-table-column>
+          </el-table>
+        </el-main>
+      </el-container>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="locationModelFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
     <!-- chooseList模态框 -->
     <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
 
@@ -703,14 +1218,27 @@
     getAgentListBy, // 根据条件查询可选代理商
     addPartAgent, // 新增物料代理商
     deletePartAgent, // 删除物料代理商
-    deleteAgent, // 删除物料制造商(单删)
+    deleteAgent, // 删除物料代理商(单删)
     getManufacturerList, // 获取制造商列表
     getPartManufacturer, // 获取物料制造商
     getManufacturerListBy, // 根据条件查询可选制造商
     addPartManufacturer, // 新增物料制造商
     deletePartManufacturer, // 删除物料制造商
     deleteManufacturer, // 删除物料制造商(单删)
+
+    getLocationList, // 获取库位列表
+    getDefaultLocation, // 获取物料库位
+    getLocationListBy, // 根据条件查询可选库位
+    addDefaultLocation, // 新增物料库位
+    deleteDefaultLocation, // 删除物料库位
+    deleteLocation, // 删除物料库位(单删)
+
     commitItemValue, // 修改物料属性值
+    deleteItem, // 删除模板属性,
+    getItemLists, // 获取模板属性
+    addPartItem, // 新增物料属性
+    deletePartItem, // 删除物料属性
+    queryPartItem,
   } from '@/api/part/partInformation.js'
   import {
     getFileContentList, // 获取物料单附件列表
@@ -731,14 +1259,12 @@
         deep: true,
         handler: function (newV, oldV) {
           this.searchData.partNo = this.searchData.partNo.toUpperCase()
-          this.searchData.erpPartNo = this.searchData.erpPartNo.toUpperCase()
         }
       },
       modalData: {
         deep: true,
         handler: function (newV, oldV) {
           this.modalData.partNo = this.modalData.partNo.toUpperCase()
-          this.modalData.erpPartNo = this.modalData.erpPartNo.toUpperCase()
         }
       }
     },
@@ -818,16 +1344,73 @@
           updateDate: '',
           updateBy: '',
           agentId: '',
-          agentName: ''
+          agentName: '',
+          typeDesignation: '',
+          hazardCode: '',
+          hazardDesc: '',
+          assetClass: '',
+          assetClassDesc: '',
+          dimQuality: '',
+          abcClass: '',
+          abcClassDesc: '',
+          frequencyClass: '',
+          lifecycleStage: '',
+          isoCountry: '',
+          isoCountryDesc: '',
+          manufacturingLeadTime: '',
+          expectedLeadTime: '',
+          regionOfOrigin: '',
+          regionOfOriginDesc: '',
+          durabilityWeek: '',
+          customsStarNo: '',
+          customsStarDesc: '',
+          durabilityDay: '',
+          intrastatConvFactor: '',
+          umDesc: '',
+          status: '',
+          partStatus: '',
+          partStatusDesc: '',
+          configurationID: '',
+          estimatedMaterialCost: '',
+          inventoryValuationMethod: '',
+          partCostGroupID: '',
+          partCostGroupDesc: '',
+          inventoryPartCostLevel: '',
+          invoiceConsideration: '',
+          zeroCostFlag: '',
+          planningMethod: '',
+          planningMethodDesc: '',
+          safetyStock: '',
+          minOrderQty: '',
+          maxOrderQty: '',
+          mulOrderQty: '',
+          safetyLeadTime: '',
+          shrinkageFac: '',
+          stdOrderQty: '',
+          cumLeadTime: '',
+          backFlushPart: '',
+          byProdAsSupplyInMrpDb: '',
+          unprotectedLeadTime: '',
+          issueType: '',
+          mrpControlFlagDb: '',
+          fixedLeadTimeDay: '',
+          overReporting: '',
+          useTheoreticalDensityDb: '',
+          variableLeadTimeDay: '',
+          overReportTolerance: '',
+          fixedLeadTimeHour: '',
+          density: '',
+          variableLeadTimeHour: ''
         },
-        itemData:{
-          site: '',
+        itemData: {
+          site: this.$store.state.user.site,
           partNo: '',
           propertiesItemNo: '',
+          codeNo: '',
           itemDesc: '',
           textValue: '',
           numValue: '',
-          recordType: 'B'
+          recordType: 'IP'
         },
         agentData: {
           site: this.$store.state.user.site,
@@ -839,12 +1422,18 @@
           manufacturerId: '',
           manufacturerName: '',
         },
+        locationData: {
+          site: this.$store.state.user.site,
+          locationId: '',
+          locationName: '',
+        },
         // ======== 数据列表 ========
         dataList: [],
         partItemList: [],
         updatePartItemList: [],
         partAgentList: [],
         partManufacturerList: [],
+        defaultLocationList: [],
         fileContentList: [],
         availableValueList:[],
         agentList: [],
@@ -859,6 +1448,16 @@
         manufacturerSelections2: [],
         manufacturerList1: [],
         manufacturerList2: [],
+        locationList: [],
+        locationSelections: [],
+        locationSelections1: [],
+        locationSelections2: [],
+        locationList1: [],
+        locationList2: [],
+        itemSelections1: [],
+        itemSelections2: [],
+        itemList1:[],
+        itemList2:[],
         // ======== 列表表头 ========
         columnList: [
           {
@@ -869,7 +1468,7 @@
             tableName: '物料信息表',
             columnProp: 'partNo',
             headerAlign: 'center',
-            align: 'left',
+            align: 'center',
             columnLabel: '物料编码',
             columnHidden: false,
             columnImage: false,
@@ -879,24 +1478,6 @@
             fixed: '',
             columnWidth: 120
           },
-          // {
-          //   userId: this.$store.state.user.name,
-          //   functionId: 104001,
-          //   serialNumber: '104001Table1ERPPartNo',
-          //   tableId: '104001Table1',
-          //   tableName: '物料信息表',
-          //   columnProp: 'erpPartNo',
-          //   headerAlign: 'center',
-          //   align: 'left',
-          //   columnLabel: 'ERP物料编码',
-          //   columnHidden: false,
-          //   columnImage: false,
-          //   columnSortable: false,
-          //   sortLv: 0,
-          //   status: true,
-          //   fixed: '',
-          //   columnWidth: 120
-          // },
           {
             userId: this.$store.state.user.name,
             functionId: 104001,
@@ -941,7 +1522,7 @@
             tableName: '物料信息表',
             columnProp: 'umName',
             headerAlign: 'center',
-            align: 'left',
+            align: 'center',
             columnLabel: '计量单位',
             columnHidden: false,
             columnImage: false,
@@ -977,7 +1558,7 @@
             tableName: '物料信息表',
             columnProp: 'uomForWeightNet',
             headerAlign: 'center',
-            align: 'left',
+            align: 'center',
             columnLabel: '净重单位',
             columnHidden: false,
             columnImage: false,
@@ -1013,7 +1594,7 @@
             tableName: '物料信息表',
             columnProp: 'uomForVolumeNet',
             headerAlign: 'center',
-            align: 'left',
+            align: 'center',
             columnLabel: '体积单位',
             columnHidden: false,
             columnImage: false,
@@ -1049,7 +1630,7 @@
             tableName: '物料信息表',
             columnProp: 'partType',
             headerAlign: 'center',
-            align: 'left',
+            align: 'center',
             columnLabel: '物料类别',
             columnHidden: false,
             columnImage: false,
@@ -1067,7 +1648,7 @@
             tableName: '物料信息表',
             columnProp: 'familyName',
             headerAlign: 'center',
-            align: 'left',
+            align: 'center',
             columnLabel: '物料分类',
             columnHidden: false,
             columnImage: false,
@@ -1085,7 +1666,7 @@
             tableName: '物料信息表',
             columnProp: 'groupName',
             headerAlign: 'center',
-            align: 'left',
+            align: 'center',
             columnLabel: '物料分组',
             columnHidden: false,
             columnImage: false,
@@ -1103,7 +1684,7 @@
             tableName: '物料信息表',
             columnProp: 'productGroupName1',
             headerAlign: 'center',
-            align: 'left',
+            align: 'center',
             columnLabel: '商品组1',
             columnHidden: false,
             columnImage: false,
@@ -1121,7 +1702,7 @@
             tableName: '物料信息表',
             columnProp: 'productGroupName2',
             headerAlign: 'center',
-            align: 'left',
+            align: 'center',
             columnLabel: '商品组2',
             columnHidden: false,
             columnImage: false,
@@ -1139,7 +1720,7 @@
             tableName: '物料信息表',
             columnProp: 'productGroupName3',
             headerAlign: 'center',
-            align: 'left',
+            align: 'center',
             columnLabel: '会计组',
             columnHidden: false,
             columnImage: false,
@@ -1157,7 +1738,7 @@
             tableName: '物料信息表',
             columnProp: 'productGroupName4',
             headerAlign: 'center',
-            align: 'left',
+            align: 'center',
             columnLabel: '计划员',
             columnHidden: false,
             columnImage: false,
@@ -1175,7 +1756,7 @@
             tableName: '物料信息表',
             columnProp: 'codeDesc',
             headerAlign: 'center',
-            align: 'left',
+            align: 'center',
             columnLabel: '属性模板',
             columnHidden: false,
             columnImage: false,
@@ -1469,7 +2050,128 @@
             columnProp: 'agentName',
             headerAlign: "center",
             align: "center",
-            columnLabel: '代理商名称',
+            columnLabel: '代理商名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table3Active',
+            tableId: '104001Table3',
+            tableName: '物料代理商表',
+            columnProp: 'active',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '是否在用',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table3CreateDate',
+            tableId: '104001Table3',
+            tableName: '物料代理商表',
+            columnProp: 'createDate',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '创建时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table3CreateBy',
+            tableId: '104001Table3',
+            tableName: '物料代理商表',
+            columnProp: 'createBy',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '创建人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table3UpdateDate',
+            tableId: '104001Table3',
+            tableName: '物料代理商表',
+            columnProp: 'updateDate',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '更新时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table3UpdateBy',
+            tableId: '104001Table3',
+            tableName: '物料代理商表',
+            columnProp: 'updateBy',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '更新人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          }
+        ],
+        columnManufacturerList:  [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table5ManufacturerId',
+            tableId: "104001Table5",
+            tableName: "物料制造商表",
+            columnProp: 'manufacturerId',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '制造商编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table5ManufacturerName',
+            tableId: "104001Table5",
+            tableName: "物料制造商表",
+            columnProp: 'manufacturerName',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '制造商名称',
             columnHidden: false,
             columnImage: false,
             columnSortable: true,
@@ -1480,9 +2182,9 @@
           {
             userId: this.$store.state.user.name,
             functionId: 104001,
-            serialNumber: '104001Table3Active',
-            tableId: '104001Table3',
-            tableName: '物料代理商表',
+            serialNumber: '104001Table5Active',
+            tableId: '104001Table5',
+            tableName: '物料制造商表',
             columnProp: 'active',
             headerAlign: 'center',
             align: 'center',
@@ -1497,9 +2199,9 @@
           {
             userId: this.$store.state.user.name,
             functionId: 104001,
-            serialNumber: '104001Table3CreateDate',
-            tableId: '104001Table3',
-            tableName: '物料代理商表',
+            serialNumber: '104001Table5CreateDate',
+            tableId: '104001Table5',
+            tableName: '物料制造商表',
             columnProp: 'createDate',
             headerAlign: 'center',
             align: 'center',
@@ -1514,9 +2216,9 @@
           {
             userId: this.$store.state.user.name,
             functionId: 104001,
-            serialNumber: '104001Table3CreateBy',
-            tableId: '104001Table3',
-            tableName: '物料代理商表',
+            serialNumber: '104001Table5CreateBy',
+            tableId: '104001Table5',
+            tableName: '物料制造商表',
             columnProp: 'createBy',
             headerAlign: 'center',
             align: 'center',
@@ -1531,9 +2233,9 @@
           {
             userId: this.$store.state.user.name,
             functionId: 104001,
-            serialNumber: '104001Table3UpdateDate',
-            tableId: '104001Table3',
-            tableName: '物料代理商表',
+            serialNumber: '104001Table5UpdateDate',
+            tableId: '104001Table5',
+            tableName: '物料制造商表',
             columnProp: 'updateDate',
             headerAlign: 'center',
             align: 'center',
@@ -1548,9 +2250,9 @@
           {
             userId: this.$store.state.user.name,
             functionId: 104001,
-            serialNumber: '104001Table3UpdateBy',
-            tableId: '104001Table3',
-            tableName: '物料代理商表',
+            serialNumber: '104001Table5UpdateBy',
+            tableId: '104001Table5',
+            tableName: '物料制造商表',
             columnProp: 'updateBy',
             headerAlign: 'center',
             align: 'center',
@@ -1563,17 +2265,17 @@
             fixed: '',
           }
         ],
-        columnManufacturerList:  [
+        columnLocationList:  [
           {
             userId: this.$store.state.user.name,
             functionId: 104001,
-            serialNumber: '104001Table5ManufacturerId',
-            tableId: "104001Table5",
-            tableName: "物料制造商表",
-            columnProp: 'manufacturerId',
+            serialNumber: '104001Table7LocationId',
+            tableId: "104001Table7",
+            tableName: "物料库位表",
+            columnProp: 'locationId',
             headerAlign: "center",
             align: "center",
-            columnLabel: '制造商编码',
+            columnLabel: '库位编码',
             columnHidden: false,
             columnImage: false,
             columnSortable: true,
@@ -1584,13 +2286,13 @@
           {
             userId: this.$store.state.user.name,
             functionId: 104001,
-            serialNumber: '104001Table5ManufacturerName',
-            tableId: "104001Table5",
-            tableName: "物料制造商表",
-            columnProp: 'manufacturerName',
+            serialNumber: '104001Table7LocationName',
+            tableId: "104001Table7",
+            tableName: "物料库位表",
+            columnProp: 'locationName',
             headerAlign: "center",
             align: "center",
-            columnLabel: '制造商名称',
+            columnLabel: '库位名称',
             columnHidden: false,
             columnImage: false,
             columnSortable: true,
@@ -1601,9 +2303,26 @@
           {
             userId: this.$store.state.user.name,
             functionId: 104001,
-            serialNumber: '104001Table5Active',
-            tableId: '104001Table5',
-            tableName: '物料制造商表',
+            serialNumber: '104001Table7warehouseId',
+            tableId: "104001Table7",
+            tableName: "物料库位表",
+            columnProp: 'warehouseId',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '仓库编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001,
+            serialNumber: '104001Table7Active',
+            tableId: '104001Table7',
+            tableName: '物料库位表',
             columnProp: 'active',
             headerAlign: 'center',
             align: 'center',
@@ -1618,9 +2337,9 @@
           {
             userId: this.$store.state.user.name,
             functionId: 104001,
-            serialNumber: '104001Table5CreateDate',
-            tableId: '104001Table5',
-            tableName: '物料制造商表',
+            serialNumber: '104001Table7CreateDate',
+            tableId: '104001Table7',
+            tableName: '物料库位表',
             columnProp: 'createDate',
             headerAlign: 'center',
             align: 'center',
@@ -1635,9 +2354,9 @@
           {
             userId: this.$store.state.user.name,
             functionId: 104001,
-            serialNumber: '104001Table5CreateBy',
-            tableId: '104001Table5',
-            tableName: '物料制造商表',
+            serialNumber: '104001Table7CreateBy',
+            tableId: '104001Table7',
+            tableName: '物料库位表',
             columnProp: 'createBy',
             headerAlign: 'center',
             align: 'center',
@@ -1652,9 +2371,9 @@
           {
             userId: this.$store.state.user.name,
             functionId: 104001,
-            serialNumber: '104001Table5UpdateDate',
-            tableId: '104001Table5',
-            tableName: '物料制造商表',
+            serialNumber: '104001Table7UpdateDate',
+            tableId: '104001Table7',
+            tableName: '物料库位表',
             columnProp: 'updateDate',
             headerAlign: 'center',
             align: 'center',
@@ -1669,9 +2388,9 @@
           {
             userId: this.$store.state.user.name,
             functionId: 104001,
-            serialNumber: '104001Table5UpdateBy',
-            tableId: '104001Table5',
-            tableName: '物料制造商表',
+            serialNumber: '104001Table7UpdateBy',
+            tableId: '104001Table7',
+            tableName: '物料库位表',
             columnProp: 'updateBy',
             headerAlign: 'center',
             align: 'center',
@@ -1916,7 +2635,9 @@
         itemModalFlag: false,
         agentModelFlag: false,
         manufacturerModelFlag: false,
-        updateItemModelFlag: false
+        updateItemModelFlag: false,
+        fastAddFlag: false,
+        locationModelFlag: false
       }
     },
 
@@ -1924,7 +2645,7 @@
       this.$nextTick(() => {
         this.height = window.innerHeight / 2 - 30
         /*第二个表格高度的动态调整*/
-        this.secondHeight = window.innerHeight / 2  - 206
+        this.secondHeight = window.innerHeight - this.height - 180
       })
     },
 
@@ -1934,6 +2655,16 @@
 
     methods: {
 
+      // 制造提前期内容改变事件
+      changeExpectedLeadTime () {
+        this.modalData.expectedLeadTime = this.modalData.manufacturingLeadTime
+      },
+
+      // 天数内容改变事件
+      changeDurabilityWeek () {
+        this.modalData.durabilityWeek = this.modalData.durabilityDay / 7
+      },
+
       focusNextInput (index, type) {
         let aaa = ''
         if (this.updatePartItemList.length - 1 === index) {
@@ -1946,13 +2677,15 @@
         })
       },
 
-      // 编辑物料属性
+      /**
+       * 编辑物料属性
+       */
       updateItemValue () {
         let tempData = {
           site: this.$store.state.user.site,
           partNo: this.partCurrentRow.partNo,
           codeNo: this.partCurrentRow.codeNo,
-          recordType: 'B'
+          recordType: 'IP'
         }
         getPartItem(tempData).then(({data}) => {
           if (data && data.code === 0) {
@@ -1964,6 +2697,114 @@
         })
       },
 
+      /**
+       * 新增/删除物料属性
+       */
+      addOrDelItem () {
+        this.itemSelections1 = null
+        this.itemSelections2 = null
+        this.itemData.propertiesItemNo = ''
+        this.itemData.itemDesc = ''
+        let tempData = {
+          site: this.partCurrentRow.site,
+          partNo: this.partCurrentRow.partNo,
+          codeNo: this.partCurrentRow.codeNo,
+          recordType: 'IP'
+        }
+        getItemLists(tempData).then(({data}) => {
+          this.itemList1 = data.row1
+          this.itemList2 = data.row2
+        })
+        this.fastAddFlag = true
+      },
+      // 可选属性
+      itemClickRow1 (row) {
+        this.$refs.itemTable1.toggleRowSelection(row)
+      },
+      // 已有属性
+      itemClickRow2 (row) {
+        this.$refs.itemTable2.toggleRowSelection(row)
+      },
+      selectionItem1 (val) {
+        this.itemSelections1 = val
+      },
+      selectionItem2 (val) {
+        this.itemSelections2 = val
+      },
+      // 物料项目新增
+      addItem () {
+        if (this.itemSelections1 == null || this.itemSelections1.length === 0) {
+          this.$message.warning('请选择可选属性！')
+          return
+        }
+        let inData = {
+          site: this.$store.state.user.site,
+          partNo: this.partCurrentRow.partNo,
+          codeNo: this.partCurrentRow.codeNo,
+          codeDesc: this.partCurrentRow.codeDesc,
+          recordType: 'IP',
+          itemList: this.itemSelections1
+        }
+        addPartItem(inData).then(({data}) => {
+          if (data && data.code === 0) {
+            getItemLists(inData).then(({data}) => {
+              this.itemList1 = data.row1
+              this.itemList2 = data.row2
+            })
+            this.getPartItem()
+            this.itemSelections1 = []
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      // 物料项目删除
+      deleteItem () {
+        if (this.itemSelections2 == null || this.itemSelections2.length === 0) {
+          this.$alert("请选择已有属性！", '提示', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        let inData = {
+          site: this.$store.state.user.site,
+          partNo: this.partCurrentRow.partNo,
+          codeNo: this.partCurrentRow.codeNo,
+          codeDesc: this.partCurrentRow.codeDesc,
+          recordType: 'IP',
+          itemList: this.itemSelections2
+        }
+        deletePartItem(inData).then(({data}) => {
+          if (data && data.code === 0) {
+            getItemLists(inData).then(({data}) => {
+              this.itemList1 = data.row1
+              this.itemList2 = data.row2
+            })
+            this.getPartItem()
+            this.itemSelections2 = []
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      // 查询物料项目
+      queryPartItem () {
+        this.itemData.partNo = this.partCurrentRow.partNo
+        this.itemData.codeNo = this.partCurrentRow.codeNo
+        this.itemData.partNo = this.partCurrentRow.partNo
+        queryPartItem(this.itemData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.itemList1 = data.rows
+          } else {
+            this.itemList1 = []
+          }
+        })
+      },
+
       // 确认修改物料属性
       commitItemValue () {
         let tempData = {
@@ -1991,9 +2832,9 @@
       handleInput (value, type) {
         // 大于等于0，且只能输入4位小数
         let val = value.replace(/^\D*([0-9]\d*\.?\d{0,4})?.*$/,'$1')
-        if (val === null || val === undefined || val === '') {
-          val = 0
-        }
+        // if (val === null || val === undefined || val === '') {
+        //   val = 0
+        // }
         if (type === 1) {
           this.modalData.weightNet = val
         } else if (type === 2) {
@@ -2026,7 +2867,7 @@
        * @returns {boolean}
        */
       selectFlag () {
-        return true;
+        return true
       },
       /**
        * 列表表格选择替换
@@ -2062,6 +2903,8 @@
           this.getFileContentData()
         } else if (this.activeTable === 'part_manufacturer') {
           this.getPartManufacturer()
+        } else if (this.activeTable === 'default_locations') {
+          this.getDefaultLocation()
         }
       },
 
@@ -2074,7 +2917,7 @@
           site: this.$store.state.user.site,
           partNo: this.partCurrentRow.partNo,
           codeNo: this.partCurrentRow.codeNo,
-          recordType: 'B'
+          recordType: 'IP'
         }
         getPartItem(tempData).then(({data}) => {
           if (data && data.code === 0) {
@@ -2118,6 +2961,22 @@
           }
         })
       },
+      /**
+       * 查询物料库位
+       */
+      getDefaultLocation () {
+        let tempData = {
+          site: this.$store.state.user.site,
+          partNo: this.partCurrentRow.partNo,
+        }
+        getDefaultLocation(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.defaultLocationList = data.rows
+          } else {
+            this.defaultLocationList = []
+          }
+        })
+      },
       // ======== 列表数据刷新方法 ========
       /**
        * 获取数据列表
@@ -2133,7 +2992,7 @@
             this.totalPage = data.page.totalCount
             this.$refs.selectDiv.setLengthAll( this.dataList.length)
             // 判断是否全部存在数据
-            if(this.totalPage > 0){
+            if (this.totalPage > 0) {
               // 设置选中行
               this.$refs.partTable.setCurrentRow(this.dataList[0])
               // 加载当前的页签的table
@@ -2189,7 +3048,63 @@
           manufacturerName: '',
           agentId: '',
           agentName: '',
-          createBy: this.$store.state.user.name
+          createBy: this.$store.state.user.name,
+          typeDesignation: '',
+          hazardCode: '',
+          hazardDesc: '',
+          assetClass: '',
+          assetClassDesc: '',
+          dimQuality: '',
+          abcClass: '',
+          abcClassDesc: '',
+          frequencyClass: '',
+          lifecycleStage: '',
+          isoCountry: '',
+          isoCountryDesc: '',
+          manufacturingLeadTime: '',
+          expectedLeadTime: '',
+          regionOfOrigin: '',
+          regionOfOriginDesc: '',
+          durabilityWeek: '',
+          customsStarNo: '',
+          customsStarDesc: '',
+          durabilityDay: '',
+          intrastatConvFactor: '',
+          umDesc: '',
+          status: '',
+          partStatus: '',
+          partStatusDesc: '',
+          configurationID: '*',
+          estimatedMaterialCost: '',
+          inventoryValuationMethod: '',
+          partCostGroupID: '',
+          partCostGroupDesc: '',
+          inventoryPartCostLevel: '',
+          invoiceConsideration: '',
+          zeroCostFlag: '',
+          planningMethod: '',
+          planningMethodDesc: '',
+          safetyStock: '',
+          minOrderQty: '',
+          maxOrderQty: '',
+          mulOrderQty: '',
+          safetyLeadTime: '',
+          shrinkageFac: '',
+          stdOrderQty: '',
+          cumLeadTime: '',
+          backFlushPart: '',
+          byProdAsSupplyInMrpDb: '',
+          unprotectedLeadTime: '',
+          issueType: '',
+          mrpControlFlagDb: '',
+          fixedLeadTimeDay: '',
+          overReporting: '',
+          useTheoreticalDensityDb: '',
+          variableLeadTimeDay: '',
+          overReportTolerance: '',
+          fixedLeadTimeHour: '',
+          density: '',
+          variableLeadTimeHour: ''
         }
         this.modalDisableFlag = false
         this.modalFlag = true
@@ -2238,7 +3153,63 @@
           manufacturerName: row.manufacturerName,
           agentId: row.agentId,
           agentName: row.agentName,
-          updateBy: this.$store.state.user.name
+          updateBy: this.$store.state.user.name,
+          typeDesignation: row.typeDesignation,
+          hazardCode: row.hazardCode,
+          hazardDesc: row.hazardDesc,
+          assetClass: row.assetClass,
+          assetClassDesc: row.assetClassDesc,
+          dimQuality: row.dimQuality,
+          abcClass: row.abcClass,
+          abcClassDesc: row.abcClassDesc,
+          frequencyClass: row.frequencyClass,
+          lifecycleStage: row.lifecycleStage,
+          isoCountry: row.isoCountry,
+          isoCountryDesc: row.isoCountryDesc,
+          manufacturingLeadTime: row.manufacturingLeadTime,
+          expectedLeadTime: row.expectedLeadTime,
+          regionOfOrigin: row.regionOfOrigin,
+          regionOfOriginDesc: row.regionOfOriginDesc,
+          durabilityWeek: '',
+          customsStarNo: row.customsStarNo,
+          customsStarDesc: row.customsStarDesc,
+          durabilityDay: row.durabilityDay,
+          intrastatConvFactor: row.intrastatConvFactor,
+          umDesc: row.umDesc,
+          status: row.status,
+          partStatus: row.partStatus,
+          partStatusDesc: row.partStatusDesc,
+          configurationID: row.configurationID,
+          estimatedMaterialCost: row.estimatedMaterialCost,
+          inventoryValuationMethod: row.inventoryValuationMethod,
+          partCostGroupID: row.partCostGroupID,
+          partCostGroupDesc: row.partCostGroupDesc,
+          inventoryPartCostLevel: row.inventoryPartCostLevel,
+          invoiceConsideration: row.invoiceConsideration,
+          zeroCostFlag: row.zeroCostFlag,
+          planningMethod: row.planningMethod,
+          planningMethodDesc: row.planningMethodDesc,
+          safetyStock: row.safetyStock,
+          minOrderQty: row.minOrderQty,
+          maxOrderQty: row.maxOrderQty,
+          mulOrderQty: row.mulOrderQty,
+          safetyLeadTime: row.safetyLeadTime,
+          shrinkageFac: row.shrinkageFac,
+          stdOrderQty: row.stdOrderQty,
+          cumLeadTime: row.cumLeadTime,
+          backFlushPart: row.backFlushPart,
+          byProdAsSupplyInMrpDb: row.byProdAsSupplyInMrpDb,
+          unprotectedLeadTime: row.unprotectedLeadTime,
+          issueType: row.issueType,
+          mrpControlFlagDb: row.mrpControlFlagDb,
+          fixedLeadTimeDay: row.fixedLeadTimeDay,
+          overReporting: row.overReporting,
+          useTheoreticalDensityDb: row.useTheoreticalDensityDb,
+          variableLeadTimeDay: row.variableLeadTimeDay,
+          overReportTolerance: row.overReportTolerance,
+          fixedLeadTimeHour: row.fixedLeadTimeHour,
+          density: row.density,
+          variableLeadTimeHour: row.variableLeadTimeHour
         }
         this.modalDisableFlag = true
         this.modalFlag = true
@@ -2325,11 +3296,11 @@
       },
       // 可选代理商
       agentClickRow1 (row) {
-        this.$refs.agentTable1.toggleRowSelection(row);
+        this.$refs.agentTable1.toggleRowSelection(row)
       },
       // 已有代理商
       agentClickRow2 (row) {
-        this.$refs.agentTable2.toggleRowSelection(row);
+        this.$refs.agentTable2.toggleRowSelection(row)
       },
       selectionAgent1 (val) {
         this.agentSelections1 = val
@@ -2339,7 +3310,7 @@
       },
       // 添加代理商
       addAgent () {
-        if(this.agentSelections1 == null || this.agentSelections1.length === 0){
+        if (this.agentSelections1 == null || this.agentSelections1.length === 0) {
           this.$message.warning('请选择可选代理商！')
           return
         }
@@ -2438,6 +3409,21 @@
           }
         })
       },
+      /**
+       * 选择默认库位
+       */
+      getLocationList () {
+        // 查询所有库位
+        getLocationListBy(this.locationData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.locationList1 = data.rows
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
       /**
        * 制造商多选
        * @param row
@@ -2493,11 +3479,11 @@
       },
       // 可选制造商
       manufacturerClickRow1 (row) {
-        this.$refs.manufacturerTable1.toggleRowSelection(row);
+        this.$refs.manufacturerTable1.toggleRowSelection(row)
       },
       // 已有制造商
       manufacturerClickRow2 (row) {
-        this.$refs.manufacturerTable2.toggleRowSelection(row);
+        this.$refs.manufacturerTable2.toggleRowSelection(row)
       },
       selectionManufacturer1 (val) {
         this.manufacturerSelections1 = val
@@ -2507,7 +3493,7 @@
       },
       // 添加制造商
       addManufacturer () {
-        if(this.manufacturerSelections1 == null || this.manufacturerSelections1.length === 0){
+        if (this.manufacturerSelections1 == null || this.manufacturerSelections1.length === 0) {
           this.$message.warning('请选择可选制造商！')
           return
         }
@@ -2532,7 +3518,7 @@
       },
       // 删除物料制造商
       deleteManufacturer () {
-        if(this.manufacturerSelections2 == null || this.manufacturerSelections2.length === 0){
+        if (this.manufacturerSelections2 == null || this.manufacturerSelections2.length === 0) {
           this.$message.warning('请选择已有制造商！')
           return
         }
@@ -2580,8 +3566,115 @@
         }).catch(() => {
         })
       },
+
+
+      saveDefaultLocation () {
+        this.locationSelections1 = null
+        this.locationSelections2 = null
+        getLocationList(this.partCurrentRow).then(({data}) => {
+          this.locationList1 = data.row1
+          this.locationList2 = data.row2
+        })
+        this.locationData = {
+          site: this.$store.state.user.site,
+          locationId: '',
+          locationName: '',
+        }
+        this.locationModelFlag = true
+      },
+      // 可选库位
+      locationClickRow1 (row) {
+        this.$refs.locationTable1.toggleRowSelection(row)
+      },
+      // 已有库位
+      locationClickRow2 (row) {
+        this.$refs.locationTable2.toggleRowSelection(row)
+      },
+      selectionLocation1 (val) {
+        this.locationSelections1 = val
+      },
+      selectionLocation2 (val) {
+        this.locationSelections2 = val
+      },
+      // 添加库位
+      addLocation () {
+        if (this.locationSelections1 == null || this.locationSelections1.length === 0) {
+          this.$message.warning('请选择可选库位！')
+          return
+        }
+        let inData = {
+          site: this.$store.state.user.site,
+          partNo: this.partCurrentRow.partNo,
+          locationList: this.locationSelections1
+        }
+        addDefaultLocation(inData).then(({data}) => {
+          if (data && data.code === 0) {
+            getLocationList(this.partCurrentRow).then(({data}) => {
+              this.locationList1 = data.row1
+              this.locationList2 = data.row2
+            })
+            this.locationSelections1 = []
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      // 删除库位
+      deleteLocation () {
+        if (this.locationSelections2 == null || this.locationSelections2.length === 0) {
+          this.$message.warning('请选择已有库位！')
+          return
+        }
+        let inData = {
+          site: this.$store.state.user.site,
+          partNo: this.partCurrentRow.partNo,
+          locationList: this.locationSelections2
+        }
+        deleteDefaultLocation(inData).then(({data}) => {
+          if (data && data.code === 0) {
+            getLocationList(this.partCurrentRow).then(({data}) => {
+              this.locationList1 = data.row1
+              this.locationList2 = data.row2
+            })
+            this.locationSelections2 = []
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      // 单删
+      deleteLocation2 (row) {
+        this.$confirm(`是否删除该库位?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteLocation(row).then(({data}) => {
+            if (data && data.code === 0) {
+              this.getDefaultLocation()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
+
+
       // 关闭后刷新列表
-      refreshDetailList(){
+      refreshDetailList () {
         this.getPartAgent()
         this.getPartManufacturer()
       },
@@ -2691,7 +3784,7 @@
        * 物料信息删除
        */
       delModal () {
-        if(this.partSelections.length === 0){
+        if (this.partSelections.length === 0) {
           this.$message.warning('请勾选要删除的物料信息！')
           return
         }
@@ -2742,65 +3835,37 @@
       },
 
       // ======== 属性页签相关方法 ========
-      /**
-       * 编辑属性值模态框
-       */
-      updateItemModal (row) {
-        this.itemData = {
-          site: row.site,
-          partNo: row.partNo,
-          propertiesItemNo: row.propertiesItemNo,
-          itemDesc: row.itemDesc,
-          textValue: row.textValue,
-          numValue: row.numValue,
-          recordType: 'B'
-        }
-        this.availableValueList = row.availableValueList
-        if (row.valueChooseFlag === 'Y') {
-          this.itemChooseFlag = true
-        } else {
-          this.itemChooseFlag = false
-        }
-        this.itemTextDisableFlag = true
-        this.itemNumberDisableFlag = true
-        if (row.valueTypeDb !== 'T') {
-          this.itemNumberDisableFlag = false
-        } else {
-          this.itemTextDisableFlag = false
-        }
-        this.itemModalDisableFlag = true
-        this.itemModalFlag = true
-      },
-      /**
-       * 编辑属性值方法
-       * @returns {boolean}
-       */
-      itemSaveData () {
-        if(this.itemData.partNo === '' || this.itemData.partNo == null){
-          this.$message.warning('未选择物料！')
-          return false
-        }
-        if(this.itemData.propertiesItemNo === ''|| this.itemData.propertiesItemNo == null){
-          this.$message.warning('未选择属性！')
-          return false
-        }
-        savePartItemValue(this.itemData).then(({data}) => {
-          if (data && data.code === 0) {
-            this.itemModalFlag = false
-            this.getPartItem()
-            this.$message({
-              message: '操作成功',
-              type: 'success',
-              duration: 1500,
-              onClose: () => {}
-            })
-          } else {
-            this.$alert(data.msg, '错误', {
-              confirmButtonText: '确定'
-            })
-          }
-        })
-      },
+
+      // /**
+      //  * 编辑属性值方法
+      //  * @returns {boolean}
+      //  */
+      // itemSaveData () {
+      //   if(this.itemData.partNo === '' || this.itemData.partNo == null){
+      //     this.$message.warning('未选择物料！')
+      //     return false
+      //   }
+      //   if(this.itemData.propertiesItemNo === ''|| this.itemData.propertiesItemNo == null){
+      //     this.$message.warning('未选择属性！')
+      //     return false
+      //   }
+      //   savePartItemValue(this.itemData).then(({data}) => {
+      //     if (data && data.code === 0) {
+      //       this.itemModalFlag = false
+      //       this.getPartItem()
+      //       this.$message({
+      //         message: '操作成功',
+      //         type: 'success',
+      //         duration: 1500,
+      //         onClose: () => {}
+      //       })
+      //     } else {
+      //       this.$alert(data.msg, '错误', {
+      //         confirmButtonText: '确定'
+      //       })
+      //     }
+      //   })
+      // },
 
       // ======== 附件的相关方法 ========
       /**
@@ -2913,6 +3978,24 @@
             strVal = this.modalData.manufacturerId
           } else if (val === 20) {
             strVal = this.modalData.codeNo
+          } else if (val === 123) {
+            strVal = this.modalData.hazardCode
+          } else if (val === 124) {
+            strVal = this.modalData.assetClass
+          } else if (val === 125) {
+            strVal = this.modalData.partStatus
+          } else if (val === 126) {
+            strVal = this.modalData.abcClass
+          } else if (val === 127) {
+            strVal = this.modalData.isoCountry
+          } else if (val === 128) {
+            strVal = this.modalData.regionOfOrigin
+          } else if (val === 129) {
+            strVal = this.modalData.customsStarNo
+          } else if (val === 131) {
+            strVal = this.modalData.partCostGroupID
+          } else if (val === 132) {
+            strVal = this.modalData.planningMethod
           }
           this.$refs.baseList.init(val, strVal)
         })
@@ -2947,17 +4030,49 @@
           this.modalData.manufacturerId = val.manufacturer_id
           this.modalData.manufacturerName = val.manufacturer_name
         } else if (this.tagNo === 20) {
-          if (val.Code_no != this.tempCodeNo) {
-            this.$confirm(`更换属性模板将替换下方物料属性数据，请确认?`, '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              this.modalData.codeNo = val.Code_no
-              this.$set(this.modalData, 'codeDesc', val.Code_desc)
-            }).catch(() => {
-            })
+          if (this.modalData.flag === '2') {
+            if (val.Code_no != this.tempCodeNo) {
+              this.$confirm(`更换属性模板将替换下方物料属性数据，请确认?`, '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                this.modalData.codeNo = val.Code_no
+                this.$set(this.modalData, 'codeDesc', val.Code_desc)
+              }).catch(() => {
+              })
+            }
+          } else {
+            this.modalData.codeNo = val.Code_no
+            this.$set(this.modalData, 'codeDesc', val.Code_desc)
           }
+        } else if (this.tagNo === 123) {
+          this.modalData.hazardCode = val.hazard_code
+          this.modalData.hazardDesc = val.hazard_desc
+        } else if (this.tagNo === 124) {
+          this.modalData.assetClass = val.asset_class
+          this.modalData.assetClassDesc = val.asset_class_desc
+        } else if (this.tagNo === 125) {
+          this.modalData.partStatus = val.part_status
+          this.modalData.partStatusDesc = val.part_status_desc
+        } else if (this.tagNo === 126) {
+          this.modalData.abcClass = val.abc_class
+          this.modalData.abcClassDesc = val.abc_class_desc
+        } else if (this.tagNo === 127) {
+          this.modalData.isoCountry = val.iso_country
+          this.modalData.isoCountryDesc = val.iso_country_desc
+        } else if (this.tagNo === 128) {
+          this.modalData.regionOfOrigin = val.region_of_origin
+          this.modalData.regionOfOriginDesc = val.region_of_origin_desc
+        } else if (this.tagNo === 129) {
+          this.modalData.customsStarNo = val.customs_star_no
+          this.modalData.customsStarDesc = val.customs_star_desc
+        } else if (this.tagNo === 131) {
+          this.modalData.partCostGroupID = val.part_cost_group_id
+          this.modalData.partCostGroupDesc = val.part_cost_group_desc
+        } else if (this.tagNo === 132) {
+          this.modalData.planningMethod = val.planning_method
+          this.modalData.planningMethodDesc = val.planning_method_desc
         }
       },
 
@@ -3006,5 +4121,14 @@
 .numInput /deep/ .el-input__inner{
   text-align: right;
 }
+/deep/  .inlineNumber input::-webkit-outer-spin-button,
+/deep/  .inlineNumber input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+
+}
+/deep/  .inlineNumber input[type="number"]{
+  -moz-appearance: textfield;
+  padding-right: 5px !important;
+}
 </style>
 
diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue
index 5ce07f8..37ef3fe 100644
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@@ -140,7 +140,7 @@
           <el-input type="textarea" v-model="modalData.noteText" :rows="3" resize='none' show-word-limit style="width: 1082px;height: 20px"></el-input>
         </el-form-item>
       </el-form>
-      <el-tabs v-model="detailTable" style="margin-top: 50px; width: 100%; min-height: 120px" type="border-card" @tab-click="tabDetailClick" class="detail-tab">
+      <el-tabs v-model="detailTable" style="margin-top: 50px; width: 100%" type="border-card" @tab-click="tabDetailClick" class="detail-tab">
         <!-- Routing明细信息页签 -->
         <el-tab-pane label="Routings" name="routing_detail">
           <el-form label-position="top" style="margin-top: -10px">
@@ -167,11 +167,6 @@
               <el-input v-model="detailData.alternativeDescription" readonly style="width: 221px"></el-input>
             </el-form-item>
             <el-form-item :label="'状态'">
-<!--              <el-select v-model="detailData.status" disabled style="width: 221px">-->
-<!--                <el-option label="暂定" value="Tentative"></el-option>-->
-<!--                <el-option label="创建" value="Buildable"></el-option>-->
-<!--                <el-option label="销毁" value="Obsolete"></el-option>-->
-<!--              </el-select>-->
               <el-input v-model="detailData.status" readonly style="width: 221px"></el-input>
             </el-form-item>
           </el-form>
@@ -181,8 +176,52 @@
             </el-form-item>
           </el-form>
         </el-tab-pane>
+        <!-- Routing工具页签 -->
+        <el-tab-pane label="Routing Tools" name="routing_tool">
+          <el-form label-position="top" style="margin-top: -10px">
+            <el-form-item>
+              <el-button type="primary" @click="saveRoutingTool()" style="margin-left: 7px">新增</el-button>
+              <el-button type="primary" @click="deleteRoutingTool()">删除</el-button>
+            </el-form-item>
+          </el-form>
+          <el-table
+            :data="routingToolList"
+            height="500px"
+            border
+            ref="toolTable"
+            @row-click="toolClickRow"
+            @selection-change="toolSelectionChange"
+            style="width:100%">
+            <el-table-column type="selection" align="center" width="50"></el-table-column>
+            <el-table-column
+              v-for="(item,index) in columnRoutingToolList" :key="index"
+              :sortable="item.columnSortable"
+              :prop="item.columnProp"
+              :header-align="item.headerAlign"
+              :show-overflow-tooltip="item.showOverflowTooltip"
+              :align="item.align"
+              :fixed="item.fixed == ''?false:item.fixed"
+              :min-width="item.columnWidth"
+              :label="item.columnLabel">
+              <template slot-scope="scope">
+                <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+                <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              fixed="right"
+              header-align="center"
+              align="center"
+              width="100"
+              label="操作">
+              <template slot-scope="scope">
+                <a type="text" size="small" @click="updateToolModal(scope.row)">编辑</a>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
       </el-tabs>
-      <el-tabs v-model="subDetailTable" style="width: 100%; min-height: 330px" type="border-card" @tab-click="tabSubDetailClick" class="sub_detail-tab">
+      <el-tabs v-show="detailTable === 'routing_detail'" v-model="subDetailTable" style="width: 100%; min-height: 330px" type="border-card" @tab-click="tabSubDetailClick" class="sub_detail-tab">
         <!-- Routing子明细信息页签 -->
         <el-tab-pane label="Operations" name="routing_sub_detail">
           <el-form label-position="top" style="margin-top: 5px">
@@ -309,8 +348,8 @@
     <!-- 子明细工序模态框 -->
     <el-dialog title="工序清单" :close-on-click-modal="false" v-drag :visible.sync="componentPartModelFlag" width="520px">
       <el-form :inline="true" label-position="top" :model="operationData">
-        <el-form-item :label="'工序号'">
-          <el-input v-model="operationData.operationId" clearable style="width: 120px"></el-input>
+        <el-form-item :label="'工序编码'">
+          <el-input v-model="operationData.operationNo" clearable style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item :label="'工序名称'">
           <el-input v-model="operationData.operationName" clearable style="width: 120px"></el-input>
@@ -369,15 +408,15 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="componentData" style="margin-left: 5px">
         <el-form-item :label="'机器运行速度'">
-          <el-input class="numInput" v-model="componentData.machRunFactor" @input="handleInput(componentData.machRunFactor,1)" type="number" style="width: 221px"></el-input>
+          <el-input class="inlineNumber numInput" v-model="componentData.machRunFactor" @input="handleInput(componentData.machRunFactor,1)" type="number" style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item :label="'人工生产速度'">
-          <el-input class="numInput" v-model="componentData.laborSetupTime" @input="handleInput(componentData.laborSetupTime,5)" type="number" style="width: 221px"></el-input>
+          <el-input class="inlineNumber numInput" v-model="componentData.laborSetupTime" @input="handleInput(componentData.laborSetupTime,5)" type="number" style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="componentData" style="margin-left: 5px">
         <el-form-item :label="'调机时长'">
-          <el-input class="numInput" v-model="componentData.machSetupTime" @input="handleInput(componentData.machSetupTime,2)" type="number" style="width: 221px"></el-input>
+          <el-input class="inlineNumber numInput" v-model="componentData.machSetupTime" @input="handleInput(componentData.machSetupTime,2)" type="number" style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item :label="'时长单位'">
           <el-select v-model="componentData.runTimeCode" clearable style="width: 221px">
@@ -389,18 +428,18 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="componentData" style="margin-left: 5px">
         <el-form-item :label="'调机过程中人数'">
-          <el-input class="numInput" v-model="componentData.setupCrewSize" @input="handleInput(componentData.setupCrewSize,3)" type="number" style="width: 221px"></el-input>
+          <el-input class="inlineNumber numInput" v-model="componentData.setupCrewSize" @input="handleInput(componentData.setupCrewSize,3)" type="number" style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item :label="'生产过程中人数'">
-            <el-input class="numInput" v-model="componentData.crewSize" @input="handleInput(componentData.crewSize,4)" type="number" style="width: 221px"></el-input>
+            <el-input class="inlineNumber numInput" v-model="componentData.crewSize" @input="handleInput(componentData.crewSize,4)" type="number" style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="componentData" style="margin-left: 5px">
         <el-form-item :label="'机器效率%'">
-          <el-input class="numInput" v-model="componentData.efficiencyFactor" @input="handleInputB(componentData.efficiencyFactor,1)" type="number" style="width: 221px"></el-input>
+          <el-input class="inlineNumber numInput" v-model="componentData.efficiencyFactor" @input="handleInputB(componentData.efficiencyFactor,1)" type="number" style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item :label="'人工效率%'">
-          <el-input class="numInput" v-model="componentData.laborRunFactor" @input="handleInputB(componentData.laborRunFactor,2)" type="number" style="width: 221px"></el-input>
+          <el-input class="inlineNumber numInput" v-model="componentData.laborRunFactor" @input="handleInputB(componentData.laborRunFactor,2)" type="number" style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="componentData" style="margin-left: 5px">
@@ -432,6 +471,52 @@
       </el-footer>
     </el-dialog>
 
+    <!-- routingTool 新增模态框 -->
+    <el-dialog title="工艺工具" :close-on-click-modal="false" v-drag :visible.sync="saveRoutingToolModal" width="500px">
+      <el-form :inline="true" label-position="top" :model="routingToolData" style="margin-left: 5px">
+        <el-form-item :label="'替代'">
+          <el-select v-model="routingToolData.alternativeNo" placeholder="请选择" :disabled="saveRoutingToolDisableModal" style="width: 330px">
+            <el-option
+              v-for = "i in alternativeList"
+              :key = "i.alternativeNo"
+              :label = "i.alternativeDescription"
+              :value = "i.alternativeNo">
+              <span style="float: left;width: 100px">{{ i.alternativeNo }}</span>
+              <span style="float: right; color: #8492a6;white-space:nowrap;overflow:hidden;text-overflow:ellipsis; font-size: 11px;width: 60px">{{ i.alternativeDescription }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="'工具数量'">
+          <el-input class="inlineNumber numInput" v-model="routingToolData.toolQty" type="number" style="width: 120px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="routingToolData" style="margin-left: 5px">
+        <el-form-item>
+          <span v-if="saveRoutingToolDisableModal === false" slot="label" @click="queryOperationList()"><a>工序</a></span>
+          <span v-if="saveRoutingToolDisableModal === true" slot="label">工序</span>
+          <el-input v-model="routingToolData.operationNo" :disabled="saveRoutingToolDisableModal" style="width: 120px"></el-input>
+          <el-input v-model="routingToolData.operationName" disabled style="width: 340px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="routingToolData" style="margin-left: 5px">
+        <el-form-item>
+          <span v-if="saveRoutingToolDisableModal === false" slot="label" @click="getBaseList(122)"><a>工具</a></span>
+          <span v-if="saveRoutingToolDisableModal === true" slot="label">工具</span>
+          <el-input v-model="routingToolData.toolId" :disabled="saveRoutingToolDisableModal" style="width: 120px"></el-input>
+          <el-input v-model="routingToolData.toolDescription" disabled style="width: 340px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="routingToolData" style="margin-left: 5px">
+        <el-form-item :label="'备注'">
+          <el-input v-model="routingToolData.remark" style="width: 462px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:35px;margin-top:25px;text-align:center">
+        <el-button type="primary" @click="routingToolSave()">保存</el-button>
+        <el-button type="primary" @click="saveRoutingToolModal = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
     <!-- chooseList模态框 -->
     <ChooseList ref="baseList" @getBaseData="getBaseData"></ChooseList>
   </div>
@@ -439,24 +524,30 @@
 
 <script>
 import {
-  routingManagementSearch, // routing列表查询
-  routingManagementSave, // routing新增
-  routingManagementEdit, // routing编辑
-  routingManagementDelete, // routing删除
-  queryRoutingHeader, // 查询routing主信息
-  saveRoutingHeader, // 新增routing主信息
-  queryRoutingDetail, // 查routing明细
-  routingDetailSave, // routing明细新增
-  routingDetailUpdate, // routing明细编辑
+  routingManagementSearch, // routing 列表查询
+  routingManagementSave, // routing 新增
+  routingManagementEdit, // routing 编辑
+  routingManagementDelete, // routing 删除
+  queryRoutingHeader, // 查询 routing 主信息
+  saveRoutingHeader, // 新增 routing 主信息
+  queryRoutingDetail, // 查 routing 明细
+  routingDetailSave, // routing 明细新增
+  routingDetailUpdate, // routing 明细编辑
   updateAlternativeStatus, // 修改明细状态
-  routingDetailDelete, // routing明细删除
+  routingDetailDelete, // routing 明细删除
   queryPartList, // 查询物料清单
-  queryRoutingComponent, // 查询routing子明细
-  saveRoutingComponent, // 新增routing子明细
-  updateRoutingComponent, // 修改routing子明细
-  deleteRoutingComponent, // 删除routing子明细
+  queryRoutingComponent, // 查询 routing 子明细
+  saveRoutingComponent, // 新增 routing 子明细
+  updateRoutingComponent, // 修改 routing 子明细
+  deleteRoutingComponent, // 删除 routing 子明细
   queryOperationList, // 查询工序列表
-  getRottingRevision, // 获取物料的routing版本号
+  getRottingRevision, // 获取物料的 routing 版本号
+  searchRoutingTools, // 获取 routingTools
+  routingToolSave, // 新增 routingTool
+  queryOperationListByAlternative, // 根据替代查询工序列表
+  queryAlternativeListByPartNo, // 根据物料查询替代
+  routingToolEdit, // 编辑 routingTool
+  deleteRoutingTool // 删除 routingTool
 } from '@/api/part/routingManagement.js'
 import ChooseList from '@/views/modules/common/Chooselist'
 
@@ -595,7 +686,11 @@ export default {
       },
       operationData: {
         site: this.$store.state.user.site,
-        operationId: '',
+        partNo: '',
+        routingRevision: '',
+        routingType: '',
+        alternativeNo: '',
+        operationNo: '',
         operationName: '',
       },
       saveDetailData: {
@@ -622,6 +717,24 @@ export default {
         updateDate: '',
         updateBy: ''
       },
+      routingToolData: {
+        flag: '',
+        site: this.$store.state.user.site,
+        partNo: '',
+        partDesc: '',
+        routingRevision: '',
+        routingType: '',
+        alternativeNo: '',
+        alternativeDescription: '',
+        operationNo: '',
+        operationName: '',
+        toolId: '',
+        toolDescription: '',
+        toolQty: '',
+        remark: '',
+        createBy: '',
+        updateBy: ''
+      },
       // ======== 数据列表 ========
       dataList: [],
       partList: [],
@@ -630,6 +743,9 @@ export default {
       subDetailList: [],
       detailDataList: [],
       checkedDetail: [],
+      checkedTool: [],
+      routingToolList: [],
+      alternativeList: [],
       // ======== 列表表头 ========
       columnList: [
         {
@@ -829,10 +945,10 @@ export default {
       ],
       componentOperationColumnList: [
         {
-          columnProp: 'operationId',
+          columnProp: 'operationNo',
           headerAlign: "center",
           align: "center",
-          columnLabel: '工序号',
+          columnLabel: '工序编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1143,6 +1259,152 @@ export default {
           columnWidth: 150
         },
       ],
+      columnRoutingToolList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104003,
+          serialNumber: '104003Table3AlternativeNo',
+          tableId: '104003Table3',
+          tableName: 'Routing工具表',
+          columnProp: 'alternativeNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '替代编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104003,
+          serialNumber: '104003Table3AlternativeDescription',
+          tableId: '104003Table3',
+          tableName: 'Routing工具表',
+          columnProp: 'alternativeDescription',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '替代名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104003,
+          serialNumber: '104003Table3OperationNo',
+          tableId: '104003Table3',
+          tableName: 'Routing工具表',
+          columnProp: 'operationNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '工序编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104003,
+          serialNumber: '104003Table3OperationName',
+          tableId: '104003Table3',
+          tableName: 'Routing工具表',
+          columnProp: 'operationName',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '工序名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104003,
+          serialNumber: '104003Table3ToolId',
+          tableId: '104003Table3',
+          tableName: 'Routing工具表',
+          columnProp: 'toolId',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '工具编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104003,
+          serialNumber: '104003Table3ToolDescription',
+          tableId: '104003Table3',
+          tableName: 'Routing工具表',
+          columnProp: 'toolDescription',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '工具名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104003,
+          serialNumber: '104003Table3ToolQty',
+          tableId: '104003Table3',
+          tableName: 'Routing工具表',
+          columnProp: 'toolQty',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '工具数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 60
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104003,
+          serialNumber: '104003Table3Remark',
+          tableId: '104003Table3',
+          tableName: 'Routing工具表',
+          columnProp: 'remark',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '备注',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150
+        },
+      ],
       // ======== 必填规则 ========
       rules: {
         partNo: [
@@ -1237,7 +1499,9 @@ export default {
       saveDetailModalFlag: false,
       saveDetailModalDisable: false,
       componentSaveModal: false,
-      componentDisableFlag: false
+      componentDisableFlag: false,
+      saveRoutingToolModal: false,
+      saveRoutingToolDisableModal: false
     }
   },
 
@@ -1304,6 +1568,8 @@ export default {
     refreshDetailTable () {
       if (this.detailTable === 'routing_detail') {
 
+      } else if (this.detailTable === 'routing_tool') {
+        this.searchRoutingTools()
       }
     },
     /**
@@ -1349,6 +1615,18 @@ export default {
       this.routingSelections = val
       this.$refs.selectDiv.setLengthselected(this.routingSelections.length)
     },
+    /**
+     * 查询 routingTools
+     */
+    searchRoutingTools () {
+      searchRoutingTools(this.modalData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.routingToolList = data.rows
+        } else {
+          this.routingToolList = []
+        }
+      })
+    },
 
     // ======== 新增/编辑模态框 ========
     /**
@@ -1623,7 +1901,56 @@ export default {
       this.componentDisableFlag = true
       this.componentSaveModal = true
     },
-
+    /**
+     * routingTool 新增模态框
+     */
+    saveRoutingTool () {
+      this.routingToolData = {
+        flag: '1',
+        site: this.$store.state.user.site,
+        partNo: this.modalData.partNo,
+        partDesc: this.modalData.partDesc,
+        routingRevision: this.modalData.routingRevision,
+        routingType: this.modalData.routingType,
+        alternativeNo: '',
+        alternativeDescription: '',
+        operationNo: '',
+        operationName: '',
+        toolId: '',
+        toolDescription: '',
+        toolQty: '',
+        remark: '',
+        createBy: this.$store.state.user.name
+      }
+      this.queryAlternativeList()
+      this.saveRoutingToolModal = true
+      this.saveRoutingToolDisableModal = false
+    },
+    /**
+     * routingTool 编辑模态框
+     */
+    updateToolModal (row) {
+      this.routingToolData = {
+        flag: '2',
+        site: row.site,
+        partNo: row.partNo,
+        partDesc: row.partDesc,
+        routingRevision: row.routingRevision,
+        routingType: row.routingType,
+        alternativeNo: row.alternativeNo,
+        alternativeDescription: row.alternativeDescription,
+        operationNo: row.operationNo,
+        operationName: row.operationName,
+        toolId: row.toolId,
+        toolDescription: row.toolDescription,
+        toolQty: row.toolQty,
+        remark: row.remark,
+        updateBy: this.$store.state.user.name
+      }
+      this.queryAlternativeList()
+      this.saveRoutingToolModal = true
+      this.saveRoutingToolDisableModal = true
+    },
 
     // ======== 新增/编辑/删除方法 ========
     /**
@@ -1723,38 +2050,6 @@ export default {
      * 新增编辑模态框关闭
      */
     closeModal () {
-      // let tempArr = []
-      // tempArr.push(this.modalData)
-      // if (this.modalData.flag === '1') {
-      //   this.$confirm(`是否不保存且删除该条Routing记录?`, '提示', {
-      //     confirmButtonText: '确定',
-      //     cancelButtonText: '取消',
-      //     type: 'warning'
-      //   }).then(() => {
-      //     let tempData = {
-      //       informationList: tempArr
-      //     }
-      //     routingManagementDelete(tempData).then(({data}) => {
-      //       if (data && data.code === 0) {
-      //         this.getDataList()
-      //         this.modalFlag = false
-      //         this.$message({
-      //           message: '操作成功',
-      //           type: 'success',
-      //           duration: 1500,
-      //           onClose: () => {}
-      //         })
-      //       } else {
-      //         this.$alert(data.msg, '错误', {
-      //           confirmButtonText: '确定'
-      //         })
-      //       }
-      //     })
-      //   }).catch(() => {
-      //   })
-      // } else {
-      //   this.modalFlag = false
-      // }
       this.getDataList()
       this.modalFlag = false
     },
@@ -1762,38 +2057,6 @@ export default {
      * 新增编辑模态框关闭
      */
     closeModalX (done) {
-      // let tempArr = []
-      // tempArr.push(this.modalData)
-      // if (this.modalData.flag === '1') {
-      //   this.$confirm(`是否不保存且删除该条Routing记录?`, '提示', {
-      //     confirmButtonText: '确定',
-      //     cancelButtonText: '取消',
-      //     type: 'warning'
-      //   }).then(() => {
-      //     let tempData = {
-      //       informationList: tempArr
-      //     }
-      //     routingManagementDelete(tempData).then(({data}) => {
-      //       if (data && data.code === 0) {
-      //         this.getDataList()
-      //         done()
-      //         this.$message({
-      //           message: '操作成功',
-      //           type: 'success',
-      //           duration: 1500,
-      //           onClose: () => {}
-      //         })
-      //       } else {
-      //         this.$alert(data.msg, '错误', {
-      //           confirmButtonText: '确定'
-      //         })
-      //       }
-      //     })
-      //   }).catch(() => {
-      //   })
-      // } else {
-      //   done()
-      // }
       this.getDataList()
       done()
     },
@@ -1868,8 +2131,9 @@ export default {
         this.partModelFlag = false
       })
     },
-
-    // 工艺类型改变
+    /**
+     * 工艺类型改变
+     */
     routingTypeChange () {
       // 获取物料的routing版本号
       getRottingRevision(this.modalData).then(({data}) => {
@@ -1882,18 +2146,30 @@ export default {
         }
       })
     },
-
+    /**
+     * 选中工序
+     * @param row
+     */
     getComponentRowData (row) {
-      this.componentData.operationId = row.operationId
-      this.componentData.operationName = row.operationName
+      this.routingToolData.operationNo = row.operationNo
+      this.routingToolData.operationName = row.operationName
       this.componentPartModelFlag = false
     },
     /**
      * 工序列表
      */
     queryOperationList () {
+      if (this.routingToolData.alternativeNo === '' || this.routingToolData.alternativeNo == null) {
+        this.$message.warning('请先选择替代！')
+        return
+      }
+      this.operationData.site = this.routingToolData.site
+      this.operationData.partNo = this.routingToolData.partNo
+      this.operationData.routingRevision = this.routingToolData.routingRevision
+      this.operationData.routingType = this.routingToolData.routingType
+      this.operationData.alternativeNo = this.routingToolData.alternativeNo
       // 查询所有工序
-      queryOperationList(this.operationData).then(({data}) => {
+      queryOperationListByAlternative(this.operationData).then(({data}) => {
         if (data && data.code === 0) {
           this.operationList = data.rows
           this.componentPartModelFlag = true
@@ -1904,13 +2180,28 @@ export default {
         }
       })
     },
+    /**
+     * 替代列表
+     */
+    queryAlternativeList () {
+      // 查询所有替代
+      queryAlternativeListByPartNo(this.modalData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.alternativeList = data.rows
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        }
+      })
+    },
     /**
      * 表格的新增
      * @param row
      * @param rowIndex
      */
     rowClassName({ row, rowIndex }) {
-      row.xh = rowIndex + 1;
+      row.xh = rowIndex + 1
     },
     /**
      * 单选框选中数据
@@ -1919,6 +2210,9 @@ export default {
     componentSelectionChange(selection) {
       this.checkedDetail = selection
     },
+    toolSelectionChange (selection) {
+      this.checkedTool = selection
+    },
     /**
      * 删除子物料
      */
@@ -1962,23 +2256,12 @@ export default {
      * 子物料
      * @param row
      */
-    // componentPartClickRow (row) {
-    //   this.$refs.componentPartTable.toggleRowSelection(row)
-    // },
     componentClickRow (row) {
       this.$refs.componentTable.toggleRowSelection(row)
     },
-    // /**
-    //  * 多选子物料
-    //  * @param val
-    //  */
-    // selectionComponentPart (val) {
-    //   this.componentPartSelections = val
-    // },
-    // getRowKeys(row) {
-    //   // 唯一值，一般都为id
-    //   return row.partNo
-    // },
+    toolClickRow (row) {
+      this.$refs.toolTable.toggleRowSelection(row)
+    },
     /**
      * 新增子明细方法
      */
@@ -2293,6 +2576,97 @@ export default {
         }
       })
     },
+    /**
+     * 新增 routingTool
+     */
+    routingToolSave () {
+      if (this.routingToolData.alternativeNo === '' || this.routingToolData.alternativeNo == null) {
+        this.$message.warning('请选择替代！')
+        return
+      }
+      if (this.routingToolData.operationNo === '' || this.routingToolData.operationNo == null) {
+        this.$message.warning('请选择工序！')
+        return
+      }
+      if (this.routingToolData.toolId === '' || this.routingToolData.toolId == null) {
+        this.$message.warning('请选择工具！')
+        return
+      }
+      if (this.routingToolData.toolQty === '' || this.routingToolData.toolQty == null) {
+        this.$message.warning('请输入工具数量！')
+        return
+      }
+      if (this.routingToolData.flag === '1') {
+        routingToolSave(this.routingToolData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.searchRoutingTools()
+            this.saveRoutingToolModal = false
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      } else {
+        routingToolEdit(this.routingToolData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.searchRoutingTools()
+            this.saveRoutingToolModal = false
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      }
+    },
+    /**
+     * 删除 routingTool
+     */
+    deleteRoutingTool () {
+      if (this.checkedTool.length === 0) {
+        this.$message.warning('请选择要删除的工具！')
+        return
+      } else {
+        this.$confirm("请是否确认删除该工具?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          let tempData = {
+            informationList: this.checkedTool
+          }
+          deleteRoutingTool(tempData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.searchRoutingTools()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      }
+    },
 
     // ======= 正则校验 =======
     handleInput (value, type) {
@@ -2356,6 +2730,9 @@ export default {
         if (val === 119) {
           strVal = this.componentData.workCenterNo
         }
+        if (val === 122) {
+          strVal = this.routingToolData.toolId
+        }
         this.$refs.baseList.init(val, strVal)
       })
     },
@@ -2377,6 +2754,10 @@ export default {
         this.componentData.workCenterNo = val.work_center_no
         this.componentData.workCenterDesc = val.work_center_desc
       }
+      if (this.tagNo === 122) {
+        this.routingToolData.toolId = val.tool_id
+        this.routingToolData.toolDescription = val.tool_description
+      }
     },
 
     // ======== 导出相关方法 ========
@@ -2391,10 +2772,11 @@ export default {
       })
       return this.resultList
     },
-    startDownload () {
-    },
-    finishDownload () {
-    },
+
+    startDownload () {},
+
+    finishDownload () {},
+
     fields () {
       let json = '{'
       this.columnList.forEach((item, index) => {
@@ -2433,6 +2815,15 @@ export default {
 .numInput /deep/ .el-input__inner{
   text-align: right;
 }
+/deep/  .inlineNumber input::-webkit-outer-spin-button,
+/deep/  .inlineNumber input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+
+}
+/deep/  .inlineNumber input[type="number"]{
+  -moz-appearance: textfield;
+  padding-right: 5px !important;
+}
 </style>
 
 
diff --git a/src/views/modules/part/routingOperationWorkGuidelines.vue b/src/views/modules/part/routingOperationWorkGuidelines.vue
new file mode 100644
index 0000000..1e91b3b
--- /dev/null
+++ b/src/views/modules/part/routingOperationWorkGuidelines.vue
@@ -0,0 +1,1350 @@
+<template>
+  <div class="mod-config">
+    <!-- 查询条件 -->
+    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item :label="'物料编码'">
+        <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'物料名称'">
+        <el-input v-model="searchData.partDesc" clearable style="width: 200px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'工艺类型'">
+        <el-select v-model="searchData.routingType" clearable style="width: 120px">
+          <el-option label="Manufacturing" value="Manufacturing"></el-option>
+          <el-option label="Repair" value="Repair"></el-option>
+          <el-option label="Prototype" value="Prototype"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="'Routing版本号'">
+        <el-input class="inlineNumber numInput" v-model="searchData.routingRevision" type="number" style="width: 100px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'替代编码'">
+        <el-input v-model="searchData.alternativeNo" style="width: 100px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'替代名称'">
+        <el-input v-model="searchData.alternativeDescription" style="width: 150px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'工序编码'">
+        <el-input v-model="searchData.operationNo" style="width: 100px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'工序名称'">
+        <el-input v-model="searchData.operationName" style="width: 150px"></el-input>
+      </el-form-item>
+      <el-form-item :label="' '">
+        <el-button :loading="queryLoading" @click="getDataList()">查询</el-button>
+        <download-excel
+          :fields="fields()"
+          :data="exportData"
+          type="xls"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{ "导出" }}
+        </download-excel>
+      </el-form-item>
+    </el-form>
+
+    <!-- bom列表 -->
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      ref="routingAlternativeTable"
+      @row-click="alternativeClickRow"
+      @current-change="changeCurrentRow"
+      style="width: 100%">
+      <el-table-column
+        v-for="(item,index) in columnList" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed === ''?false:item.fixed"
+        :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页插件 -->
+    <el-pagination style="margin-top: 0px"
+                   @size-change="sizeChangeHandle"
+                   @current-change="currentChangeHandle"
+                   :current-page="pageIndex"
+                   :page-sizes="[20, 50, 100, 200, 500]"
+                   :page-size="pageSize"
+                   :total="totalPage"
+                   layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+    <!-- 页签 -->
+    <el-tabs v-model="activeTable" style="width: 100%" :style="{height: secondHeight + 'px'}" type="border-card" @tab-click="tabClick" class="customer-tab">
+      <!-- Graphical Structure页签 -->
+      <el-tab-pane label="Work Guidelines" name="WorkGuidelines">
+        <el-form label-position="top" style="margin-top: 0px">
+<!--          <el-form-item>-->
+            <el-button type="primary" @click="saveWorkGuidelineModal()" style="margin-left: 2px">新增</el-button>
+            <el-button type="primary" @click="deleteModal()">删除</el-button>
+<!--          </el-form-item>-->
+        </el-form>
+        <el-table
+          :height="secondHeight-68"
+          :data="workGuidelineList"
+          border
+          @selection-change="selectionWorkGuideline"
+          style="width: 100%">
+          <el-table-column
+            type="selection"
+            header-align="center"
+            align="center"
+            :selectable="selectFlag"
+            width="50">
+          </el-table-column>
+          <el-table-column
+            v-for="(item,index) in workGuidelineColumnList" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed==''?false:item.fixed"
+            :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            header-align="center"
+            align="center"
+            width="100"
+            label="操作">
+            <template slot-scope="scope">
+              <a type="text" size="small" @click="updateWorkGuidelineModal(scope.row)">编辑</a>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+
+    <!-- workGuideline 新增模态框 -->
+    <el-dialog title="替代" :close-on-click-modal="false" v-drag :visible.sync="workGuidelineModal" width="664px">
+      <el-form :inline="true" label-position="top" :model="workGuidelineData" :rules="guidelineRules" style="margin-left: 5px">
+        <el-form-item :label="'序号'" prop="guidelineSeq" :rules="guidelineRules.guidelineSeq">
+          <el-input class="inlineNumber numInput" v-model="workGuidelineData.guidelineSeq" type="number" style="width: 60px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'工艺指导名称'" prop="guidelineDesc" :rules="guidelineRules.guidelineDesc">
+          <el-input v-model="workGuidelineData.guidelineDesc" style="width: 126px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'工艺指导描述'">
+          <el-input v-model="workGuidelineData.guidelineText" style="width: 413px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="workGuidelineData" :rules="guidelineRules" style="margin-left: 5px">
+        <el-form-item :label="'工艺指导类型'" prop="guidelineType" :rules="guidelineRules.guidelineType">
+          <el-select v-model="workGuidelineData.guidelineType" style="width: 200px">
+            <el-option label="Subtask" value="Subtask"></el-option>
+            <el-option label="Instruction" value="Instruction"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="'签字'" prop="signOffRequired" :rules="guidelineRules.signOffRequired">
+          <el-select v-model="workGuidelineData.signOffRequired" style="width: 200px">
+            <el-option label="Required to Close Operation" value="Required to Close Operation"></el-option>
+            <el-option label="Not Required" value="Not Required"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="'检验签字'" prop="inspectionSignOffRequired" :rules="guidelineRules.inspectionSignOffRequired">
+          <el-select v-model="workGuidelineData.inspectionSignOffRequired" style="width: 200px">
+            <el-option label="Required to Shop Order" value="Required to Shop Order"></el-option>
+            <el-option label="Required to Close Operation" value="Required to Close Operation"></el-option>
+            <el-option label="Not Required" value="Not Required"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:35px;margin-top:25px;text-align:center">
+        <el-button type="primary" @click="workGuidelineCommit()">保存</el-button>
+        <el-button type="primary" @click="workGuidelineModal = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- chooseList模态框 -->
+    <ChooseList ref="baseList" @getBaseData="getBaseData"></ChooseList>
+  </div>
+</template>
+
+<script>
+import {
+  routingSearchAlternative, // routing 替代列表查询
+  getRoutingWorkGuideline, // 获取 workGuideline
+  getGuidelineSeq, // 获取 guidelineSeq
+  workGuidelineSave, // 新增 workGuideline
+  workGuidelineEdit, // 编辑 workGuideline
+  deleteWorkGuideline, // 删除 workGuideline
+} from '@/api/part/routingOperationWorkGuidelines.js'
+import ChooseList from '@/views/modules/common/Chooselist'
+
+export default {
+  // 组件
+  components: {
+    ChooseList
+  },
+  // 监听
+  watch: {
+    searchData: {
+      deep: true,
+      handler: function (newV, oldV) {
+        this.searchData.partNo = this.searchData.partNo.toUpperCase()
+      }
+    }
+  },
+  // 对象
+  data () {
+    return {
+      // 导出
+      exportData: [],
+      exportName: 'bom查询' + this.dayjs().format('YYYYMMDDHHmmss'),
+      exportHeader: ['bom查询'],
+      exportFooter: [],
+      resultList: [],
+      // ======== 行高 ========
+      height: 200,
+      secondHeight: 200,
+      leftWidth: 300,
+      rightWidth: '',
+      // ======== 分页 ========
+      pageIndex: 1,
+      pageSize: 50,
+      totalPage: 0,
+      // 条件查询
+      searchData: {
+        site: this.$store.state.user.site,
+        partNo: '',
+        partDesc: '',
+        routingType: '',
+        routingRevision: '',
+        alternativeNo: '',
+        alternativeDescription: '',
+        operationNo: '',
+        operationName: '',
+        page: 1,
+        limit: 10
+      },
+      // loading
+      queryLoading: false,
+      // 初始页签
+      activeTable: 'WorkGuidelines',
+      // ======== 数据对象 ========
+      alternativeData: {
+        site: '',
+        partNo: '',
+        partDesc: '',
+        bomType: '',
+        engChgLevel: '',
+        alternativeNo: '',
+        alternativeDescription: '',
+        minLotQty: '',
+        noteText: '',
+        status: '',
+      },
+      workGuidelineData: {
+        flag: '',
+        id: '',
+        site: this.$store.state.user.site,
+        partNo: '',
+        partDesc: '',
+        routingRevision: '',
+        routingType: '',
+        alternativeNo: '',
+        alternativeDescription: '',
+        operationNo: '',
+        operationName: '',
+        guidelineSeq: '',
+        guidelineDesc: '',
+        guidelineText: '',
+        guidelineType: '',
+        signOffRequired: '',
+        inspectionSignOffRequired: '',
+        createBy: '',
+        updateBy: ''
+      },
+      // ======== 选中的当前行数据 ========
+      alternativeCurrentRow: {},
+      // ======== 数据列表 ========
+      dataList: [],
+      workGuidelineList: [],
+      // ======== 列表表头 ========
+      columnList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1PartNo',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'partNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '物料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1PartDesc',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'partDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '物料名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 200
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1RoutingType',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'routingType',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '工艺类型',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1RoutingRevision',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'routingRevision',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: 'Routing版本号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1AlternativeNo',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'alternativeNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '替代编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1AlternativeDescription',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'alternativeDescription',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '替代名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 200
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1OperationNo',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'operationNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '工序编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1OperationName',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'operationName',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '工序名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1MachineNo',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'machineNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '机台',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1WorkCenterNo',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'workCenterNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '加工中心',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1MachRunFactor',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'machRunFactor',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '机器运行速度',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1LaborSetupTime',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'laborSetupTime',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '人工生产速度',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1MachSetupTime',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'machSetupTime',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '调机时长',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1RunTimeCode',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'runTimeCode',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '时长单位',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1SetupCrewSize',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'setupCrewSize',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '调机过程中人数',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1CrewSize',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'crewSize',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '生产过程中人数',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1EfficiencyFactor',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'efficiencyFactor',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '机器效率',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1LaborRunFactor',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'laborRunFactor',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '人工效率',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1LaborClassNo',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'laborClassNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '人员等级',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1SetupLaborClassNo',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'setupLaborClassNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '调机时的人员等级',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1OutsideOpItem',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'outsideOpItem',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '外协时的采购料号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1CreateDate',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'createDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '创建时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 130
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1CreateBy',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'createBy',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '创建人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1UpdateDate',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'updateDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '更新时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 130
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table1UpdateBy',
+          tableId: '104010Table1',
+          tableName: 'Routing表',
+          columnProp: 'updateBy',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '更新人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        }
+      ],
+      workGuidelineColumnList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table2GuidelineSeq',
+          tableId: '104010Table2',
+          tableName: 'workGuideline表',
+          columnProp: 'guidelineSeq',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '序号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 60
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table2GuidelineDesc',
+          tableId: '104010Table2',
+          tableName: 'workGuideline表',
+          columnProp: 'guidelineDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '工艺指导名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table2GuidelineText',
+          tableId: '104010Table2',
+          tableName: 'workGuideline表',
+          columnProp: 'guidelineText',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '工艺指导描述',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 200
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table2GuidelineType',
+          tableId: '104010Table2',
+          tableName: 'workGuideline表',
+          columnProp: 'guidelineType',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '工艺指导类型',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table2SignOffRequired',
+          tableId: '104010Table2',
+          tableName: 'workGuideline表',
+          columnProp: 'signOffRequired',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '签字',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table2InspectionSignOffRequired',
+          tableId: '104010Table2',
+          tableName: 'workGuideline表',
+          columnProp: 'inspectionSignOffRequired',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '检验签字',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table2CreateDate',
+          tableId: '104010Table2',
+          tableName: 'BOM信息表',
+          columnProp: 'createDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '创建时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 130
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table2CreateBy',
+          tableId: '104010Table2',
+          tableName: 'BOM信息表',
+          columnProp: 'createBy',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '创建人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table2UpdateDate',
+          tableId: '104010Table2',
+          tableName: 'BOM信息表',
+          columnProp: 'updateDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '更新时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 130
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104010,
+          serialNumber: '104010Table2UpdateBy',
+          tableId: '104010Table2',
+          tableName: 'BOM信息表',
+          columnProp: 'updateBy',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '更新人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        }
+      ],
+      // ======== 必填规则 ========
+      guidelineRules: {
+        guidelineSeq: [
+          {
+            required: true,
+            message: ' ',
+            trigger: 'change'
+          }
+        ],
+        guidelineDesc: [
+          {
+            required: true,
+            message: ' ',
+            trigger: 'change'
+          }
+        ],
+        guidelineType: [
+          {
+            required: true,
+            message: ' ',
+            trigger: 'change'
+          }
+        ],
+        signOffRequired: [
+          {
+            required: true,
+            message: ' ',
+            trigger: 'change'
+          }
+        ],
+        inspectionSignOffRequired: [
+          {
+            required: true,
+            message: ' ',
+            trigger: 'change'
+          }
+        ]
+      },
+      // ======== 复选数据集 ========
+      workGuidelineSelections: [],
+      // ======== 模态框开关控制 ========
+      workGuidelineModal: false,
+      workGuidelineDisableModal: false
+    }
+  },
+
+  mounted () {
+    this.$nextTick(() => {
+      this.height = window.innerHeight / 2 - 240
+      /*第二个表格高度的动态调整*/
+      this.secondHeight = window.innerHeight - this.height - 175
+      this.rightWidth = window.innerWidth - this.leftWidth - 275
+    })
+  },
+
+  created () {
+    this.getDataList()
+  },
+  // js
+  methods: {
+    // ======== 分页相关方法 ========
+    /**
+     * 每页数
+     * @param val
+     */
+    sizeChangeHandle (val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
+    },
+
+    /**
+     * 当前页
+     * @param val
+     */
+    currentChangeHandle (val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+
+    // ======== 列表数据操作方法 ========
+    /**
+     * 获取数据列表
+     */
+    getDataList () {
+      this.searchData.limit = this.pageSize
+      this.searchData.page = this.pageIndex
+      this.queryLoading = true
+      routingSearchAlternative(this.searchData).then(({data}) => {
+        if (data.code === 0) {
+          this.dataList = data.page.list
+          this.pageIndex = data.page.currPage
+          this.pageSize = data.page.pageSize
+          this.totalPage = data.page.totalCount
+          // 判断是否全部存在数据
+          if(this.totalPage > 0){
+            // 设置选中行
+            this.$refs.routingAlternativeTable.setCurrentRow(this.dataList[0])
+            // 加载当前的页签的table
+            this.refreshCurrentTabTable()
+            this.alternativeClickRow(this.dataList[0])
+          }
+        }
+        this.queryLoading = false
+      })
+    },
+
+    /**
+     * 获取 workGuideline
+     */
+    getRoutingWorkGuideline () {
+      getRoutingWorkGuideline(this.alternativeCurrentRow).then(({data}) => {
+        if (data && data.code === 0) {
+          this.workGuidelineList = data.rows
+        } else {
+          this.workGuidelineList = []
+        }
+      })
+    },
+
+    /**
+     * 单机选中信息
+     * @param row
+     */
+    alternativeClickRow (row) {
+      this.$refs.routingAlternativeTable.toggleRowSelection(row)
+      this.alternativeCurrentRow = JSON.parse(JSON.stringify(row))
+    },
+
+    /**
+     * 复选列表信息
+     * @param val
+     */
+    selectionWorkGuideline (val) {
+      this.workGuidelineSelections = val
+    },
+
+    // ======== 新增/编辑模态框 ========
+    /**
+     * workGuideline 新增模态框
+     */
+    saveWorkGuidelineModal () {
+      this.workGuidelineData = {
+        flag: '1',
+        id: '',
+        site: this.$store.state.user.site,
+        partNo: this.alternativeCurrentRow.partNo,
+        partDesc: this.alternativeCurrentRow.partDesc,
+        routingRevision: this.alternativeCurrentRow.routingRevision,
+        routingType: this.alternativeCurrentRow.routingType,
+        alternativeNo: this.alternativeCurrentRow.alternativeNo,
+        alternativeDescription: this.alternativeCurrentRow.alternativeDescription,
+        operationNo: this.alternativeCurrentRow.operationNo,
+        operationName: this.alternativeCurrentRow.operationName,
+        guidelineSeq: '',
+        guidelineDesc: '',
+        guidelineText: '',
+        guidelineType: '',
+        signOffRequired: '',
+        inspectionSignOffRequired: '',
+        createBy: this.$store.state.user.name,
+        updateBy: ''
+      }
+      // 查询seq
+      getGuidelineSeq(this.alternativeCurrentRow).then(({data}) => {
+        if (data && data.code === 0) {
+          this.workGuidelineData.guidelineSeq = data.guidelineSeq
+        }
+      })
+      // 开启模态框
+      this.workGuidelineModal = true
+      this.workGuidelineDisableModal = false
+    },
+
+    /**
+     * workGuideline 编辑模态框
+     */
+    updateWorkGuidelineModal (row) {
+      this.workGuidelineData = {
+        flag: '2',
+        id: row.id,
+        site: row.site,
+        partNo: row.partNo,
+        partDesc: row.partDesc,
+        routingRevision: row.routingRevision,
+        routingType: row.routingType,
+        alternativeNo: row.alternativeNo,
+        alternativeDescription: row.alternativeDescription,
+        operationNo: row.operationNo,
+        operationName: row.operationName,
+        guidelineSeq: row.guidelineSeq,
+        guidelineDesc: row.guidelineDesc,
+        guidelineText: row.guidelineText,
+        guidelineType: row.guidelineType,
+        signOffRequired: row.signOffRequired,
+        inspectionSignOffRequired: row.inspectionSignOffRequired,
+        createBy: '',
+        updateBy: this.$store.state.user.name
+      }
+      // 开启模态框
+      this.workGuidelineModal = true
+      this.workGuidelineDisableModal = true
+    },
+
+    // ======== 新增/编辑/删除方法 ========
+    /**
+     * workGuideline 新增方法
+     */
+    workGuidelineCommit () {
+      if (this.workGuidelineData.guidelineSeq === '' || this.workGuidelineData.guidelineSeq == null) {
+        this.$message.warning('请输入序号！')
+        return
+      }
+      if (this.workGuidelineData.guidelineDesc === '' || this.workGuidelineData.guidelineDesc == null) {
+        this.$message.warning('请输入工艺指导名称！')
+        return
+      }
+      if (this.workGuidelineData.guidelineType === '' || this.workGuidelineData.guidelineType == null) {
+        this.$message.warning('请选择工艺指导类型！')
+        return
+      }
+      if (this.workGuidelineData.signOffRequired === '' || this.workGuidelineData.signOffRequired == null) {
+        this.$message.warning('请选择签字！')
+        return
+      }
+      if (this.workGuidelineData.inspectionSignOffRequired === '' || this.workGuidelineData.inspectionSignOffRequired == null) {
+        this.$message.warning('请选择检验签字！')
+        return
+      }
+      if (this.workGuidelineData.flag === '1') {
+        workGuidelineSave(this.workGuidelineData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.getRoutingWorkGuideline()
+            this.workGuidelineModal = false
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      } else {
+        workGuidelineEdit(this.workGuidelineData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.getRoutingWorkGuideline()
+            this.workGuidelineModal = false
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      }
+    },
+
+    /**
+     * 删除 workGuideline
+     */
+    deleteModal () {
+      if(this.workGuidelineSelections.length === 0){
+        this.$message.warning('请勾选要删除的工艺指导！')
+        return
+      }
+      this.$confirm(`是否删除这 `+ this.workGuidelineSelections.length +` 条工艺指导?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let tempData = {
+          informationList: this.workGuidelineSelections
+        }
+        deleteWorkGuideline(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.getDataList()
+            this.workGuidelineSelections = []
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      }).catch(() => {
+      })
+    },
+
+    // ======== 页签切换相关方法 ========
+    /**
+     * 列表表格选择替换
+     * @param tab
+     * @param event
+     */
+    tabClick (tab, event) {
+      // 刷新列表数据
+      this.refreshCurrentTabTable()
+    },
+
+    /**
+     * 当前值发生变化的时候修改
+     * @param row
+     * @param oldRow
+     */
+    changeCurrentRow (row, oldRow) {
+      // 判断是否是获取焦点的事件
+      if (row) {
+        this.alternativeCurrentRow = JSON.parse(JSON.stringify(row))
+        //刷新当前页表
+        this.refreshCurrentTabTable()
+      }
+    },
+
+    /**
+     * 刷新页签的table数据
+     */
+    refreshCurrentTabTable () {
+      if (this.activeTable === 'WorkGuidelines') {
+        // 获取workGuideline
+        this.getRoutingWorkGuideline()
+      }
+    },
+
+
+    // ======== chooseList相关方法 ========
+    /**
+     * 获取基础数据列表S
+     * @param val
+     * @param type
+     */
+    getBaseList (val, type) {
+      this.tagNo = val
+      this.$nextTick(() => {
+        let strVal = ''
+        if (val === 117) {
+          strVal = this.componentData.issueToLoc
+        }
+        this.$refs.baseList.init(val, strVal)
+      })
+    },
+    /**
+     * 列表方法的回调
+     * @param val
+     */
+    getBaseData (val) {
+      if (this.tagNo === 117) {
+        this.componentData.issueToLoc = val.location_id
+        this.componentData.issueToLocName = val.location_name
+      }
+    },
+
+    // ======== 导出相关方法 ========
+    /**
+     * 导出excel
+     */
+    async createExportData () {
+      this.searchData.limit = -1
+      this.searchData.page = 1
+      await routingSearchAlternative(this.searchData).then(({data}) => {
+        this.resultList = data.page.list
+      })
+      return this.resultList
+    },
+    startDownload () {},
+    finishDownload () {},
+    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
+    },
+    /**
+     * 未知
+     * @returns {boolean}
+     */
+    selectFlag () {
+      return true
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.numInput /deep/ .el-input__inner{
+  text-align: right;
+}
+/deep/  .inlineNumber input::-webkit-outer-spin-button,
+/deep/  .inlineNumber input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+
+}
+/deep/  .inlineNumber input[type="number"]{
+  -moz-appearance: textfield;
+  padding-right: 5px !important;
+}
+/deep/ .el-tabs--border-card>.el-tabs__content{
+  padding: 5px;
+}
+</style>
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/part/routingWorkGuidelines.vue b/src/views/modules/part/routingWorkGuidelines.vue
new file mode 100644
index 0000000..033a642
--- /dev/null
+++ b/src/views/modules/part/routingWorkGuidelines.vue
@@ -0,0 +1,617 @@
+<template>
+  <div class="mod-config">
+    <!-- 查询条件 -->
+    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item :label="'物料编码'">
+        <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'物料名称'">
+        <el-input v-model="searchData.partDesc" clearable style="width: 200px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'工艺类型'">
+        <el-select v-model="searchData.routingType" clearable style="width: 120px">
+          <el-option label="Manufacturing" value="Manufacturing"></el-option>
+          <el-option label="Repair" value="Repair"></el-option>
+          <el-option label="Prototype" value="Prototype"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="'Routing版本号'">
+        <el-input class="inlineNumber numInput" v-model="searchData.routingRevision" type="number" style="width: 100px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'替代编码'">
+        <el-input v-model="searchData.alternativeNo" style="width: 100px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'替代名称'">
+        <el-input v-model="searchData.alternativeDescription" style="width: 150px"></el-input>
+      </el-form-item>
+      <el-form-item :label="' '">
+        <el-button :loading="queryLoading" @click="getDataList()">查询</el-button>
+        <download-excel
+          :fields="fields()"
+          :data="exportData"
+          type="xls"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{ "导出" }}
+        </download-excel>
+      </el-form-item>
+    </el-form>
+
+    <!-- bom列表 -->
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      style="width: 100%">
+      <el-table-column
+        v-for="(item,index) in columnList" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed === ''?false:item.fixed"
+        :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页插件 -->
+    <el-pagination style="margin-top: 0px"
+                   @size-change="sizeChangeHandle"
+                   @current-change="currentChangeHandle"
+                   :current-page="pageIndex"
+                   :page-sizes="[20, 50, 100, 200, 500]"
+                   :page-size="pageSize"
+                   :total="totalPage"
+                   layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+    <!-- chooseList模态框 -->
+    <ChooseList ref="baseList" @getBaseData="getBaseData"></ChooseList>
+  </div>
+</template>
+
+<script>
+import {
+  workGuidelinesSearch, // workGuidelines 列表查询
+} from '@/api/part/routingOperationWorkGuidelines.js'
+import ChooseList from '@/views/modules/common/Chooselist'
+
+export default {
+  // 组件
+  components: {
+    ChooseList
+  },
+  // 监听
+  watch: {
+    searchData: {
+      deep: true,
+      handler: function (newV, oldV) {
+        this.searchData.partNo = this.searchData.partNo.toUpperCase()
+      }
+    }
+  },
+  // 对象
+  data () {
+    return {
+      // 导出
+      exportData: [],
+      exportName: 'bom查询' + this.dayjs().format('YYYYMMDDHHmmss'),
+      exportHeader: ['bom查询'],
+      exportFooter: [],
+      resultList: [],
+      // ======== 行高 ========
+      height: 200,
+      // ======== 分页 ========
+      pageIndex: 1,
+      pageSize: 50,
+      totalPage: 0,
+      // 条件查询
+      searchData: {
+        site: this.$store.state.user.site,
+        partNo: '',
+        partDesc: '',
+        routingType: '',
+        routingRevision: '',
+        alternativeNo: '',
+        alternativeDescription: '',
+        page: 1,
+        limit: 10
+      },
+      // loading
+      queryLoading: false,
+      // 初始页签
+
+      // ======== 数据对象 ========
+
+      // ======== 选中的当前行数据 ========
+
+      // ======== 数据列表 ========
+      dataList: [],
+      // ======== 列表表头 ========
+      columnList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104011,
+          serialNumber: '104011Table1PartNo',
+          tableId: '104011Table1',
+          tableName: 'Routing表',
+          columnProp: 'partNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '物料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104011,
+          serialNumber: '104011Table1PartDesc',
+          tableId: '104011Table1',
+          tableName: 'Routing表',
+          columnProp: 'partDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '物料名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 200
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104011,
+          serialNumber: '104011Table1RoutingType',
+          tableId: '104011Table1',
+          tableName: 'Routing表',
+          columnProp: 'routingType',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '工艺类型',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104011,
+          serialNumber: '104011Table1RoutingRevision',
+          tableId: '104011Table1',
+          tableName: 'Routing表',
+          columnProp: 'routingRevision',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: 'Routing版本号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104011,
+          serialNumber: '104011Table1AlternativeNo',
+          tableId: '104011Table1',
+          tableName: 'Routing表',
+          columnProp: 'alternativeNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '替代编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104011,
+          serialNumber: '104011Table1AlternativeDescription',
+          tableId: '104011Table1',
+          tableName: 'Routing表',
+          columnProp: 'alternativeDescription',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '替代名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 200
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104011,
+          serialNumber: '104011Table1OperationNo',
+          tableId: '104011Table1',
+          tableName: 'Routing表',
+          columnProp: 'operationNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '工序编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104011,
+          serialNumber: '104011Table1OperationName',
+          tableId: '104011Table1',
+          tableName: 'Routing表',
+          columnProp: 'operationName',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '工序名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104011,
+          serialNumber: '104011Table1GuidelineSeq',
+          tableId: '104011Table1',
+          tableName: 'workGuideline表',
+          columnProp: 'guidelineSeq',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '序号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 60
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104011,
+          serialNumber: '104011Table1GuidelineDesc',
+          tableId: '104011Table1',
+          tableName: 'workGuideline表',
+          columnProp: 'guidelineDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '工艺指导名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104011,
+          serialNumber: '104011Table1GuidelineText',
+          tableId: '104011Table1',
+          tableName: 'workGuideline表',
+          columnProp: 'guidelineText',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '工艺指导描述',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 200
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104011,
+          serialNumber: '104011Table1GuidelineType',
+          tableId: '104011Table1',
+          tableName: 'workGuideline表',
+          columnProp: 'guidelineType',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '工艺指导类型',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104011,
+          serialNumber: '104011Table1SignOffRequired',
+          tableId: '104011Table1',
+          tableName: 'workGuideline表',
+          columnProp: 'signOffRequired',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '签字',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104011,
+          serialNumber: '104011Table1InspectionSignOffRequired',
+          tableId: '104011Table1',
+          tableName: 'workGuideline表',
+          columnProp: 'inspectionSignOffRequired',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '检验签字',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104011,
+          serialNumber: '104011Table1CreateDate',
+          tableId: '104011Table1',
+          tableName: 'BOM信息表',
+          columnProp: 'createDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '创建时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 130
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104011,
+          serialNumber: '104011Table1CreateBy',
+          tableId: '104011Table1',
+          tableName: 'BOM信息表',
+          columnProp: 'createBy',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '创建人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104011,
+          serialNumber: '104011Table1UpdateDate',
+          tableId: '104011Table1',
+          tableName: 'BOM信息表',
+          columnProp: 'updateDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '更新时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 130
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104011,
+          serialNumber: '104011Table1UpdateBy',
+          tableId: '104011Table1',
+          tableName: 'BOM信息表',
+          columnProp: 'updateBy',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '更新人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        }
+      ],
+      // ======== 必填规则 ========
+
+      // ======== 复选数据集 ========
+
+      // ======== 模态框开关控制 ========
+
+    }
+  },
+
+  mounted () {
+    this.$nextTick(() => {
+      this.height = window.innerHeight - 180
+    })
+  },
+
+  created () {
+    this.getDataList()
+  },
+
+  // js
+  methods: {
+    // ======== 分页相关方法 ========
+    /**
+     * 每页数
+     * @param val
+     */
+    sizeChangeHandle (val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
+    },
+
+    /**
+     * 当前页
+     * @param val
+     */
+    currentChangeHandle (val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+
+    // ======== 列表数据操作方法 ========
+    /**
+     * 获取数据列表
+     */
+    getDataList () {
+      this.searchData.limit = this.pageSize
+      this.searchData.page = this.pageIndex
+      this.queryLoading = true
+      workGuidelinesSearch(this.searchData).then(({data}) => {
+        if (data.code === 0) {
+          this.dataList = data.page.list
+          this.pageIndex = data.page.currPage
+          this.pageSize = data.page.pageSize
+          this.totalPage = data.page.totalCount
+        }
+        this.queryLoading = false
+      })
+    },
+
+    // ======== chooseList相关方法 ========
+    /**
+     * 获取基础数据列表S
+     * @param val
+     * @param type
+     */
+    getBaseList (val, type) {
+      this.tagNo = val
+      this.$nextTick(() => {
+        let strVal = ''
+        if (val === 117) {
+          strVal = this.componentData.issueToLoc
+        }
+        this.$refs.baseList.init(val, strVal)
+      })
+    },
+    /**
+     * 列表方法的回调
+     * @param val
+     */
+    getBaseData (val) {
+      if (this.tagNo === 117) {
+        this.componentData.issueToLoc = val.location_id
+        this.componentData.issueToLocName = val.location_name
+      }
+    },
+
+    // ======== 导出相关方法 ========
+    /**
+     * 导出excel
+     */
+    async createExportData () {
+      this.searchData.limit = -1
+      this.searchData.page = 1
+      await workGuidelinesSearch(this.searchData).then(({data}) => {
+        this.resultList = data.page.list
+      })
+      return this.resultList
+    },
+    startDownload () {},
+    finishDownload () {},
+    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
+    },
+    /**
+     * 未知
+     * @returns {boolean}
+     */
+    selectFlag () {
+      return true
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.numInput /deep/ .el-input__inner{
+  text-align: right;
+}
+/deep/  .inlineNumber input::-webkit-outer-spin-button,
+/deep/  .inlineNumber input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+
+}
+/deep/  .inlineNumber input[type="number"]{
+  -moz-appearance: textfield;
+  padding-right: 5px !important;
+}
+</style>
+
+
+
+
+
+
+
+
+
+