diff --git a/src/api/chooselist/chooselist.js b/src/api/chooselist/chooselist.js
index 1640320..b11aaa0 100644
--- a/src/api/chooselist/chooselist.js
+++ b/src/api/chooselist/chooselist.js
@@ -2,6 +2,7 @@ import { createAPI } from "@/utils/httpRequest.js";
 
 
 export const getChooselist = data => createAPI(`/chooselist/getChooselist/${data.tagNo}`,'get',data)
+export const getChooselist1 = data => createAPI(`/chooselist/getChooselist`,'post',data)
 
 
 export const getChooselistData = data => createAPI(`/chooselist/getChooselistData`,'post',data)
diff --git a/src/api/part/partInformation.js b/src/api/part/partInformation.js
index 383b332..b37c7dc 100644
--- a/src/api/part/partInformation.js
+++ b/src/api/part/partInformation.js
@@ -143,6 +143,8 @@ export const deleteLocation = data => createAPI(`/part/partInformation/deleteLoc
  * 修改物料属性值
  */
 export const commitItemValue = data => createAPI(`/part/partInformation/commitItemValue`,'post',data)
+export const commitItemsValue = data => createAPI(`/part/partInformation/commitItemsValue`,'post',data)
+export const batchUpdateItem = data => createAPI(`/part/partInformation/batchUpdateItem`,'post',data)
 
 /**
  * 删除模板属性
@@ -158,11 +160,13 @@ export const getItemLists = data => createAPI(`/part/partInformation/getItemList
  * 新增物料属性
  */
 export const addPartItem = data => createAPI(`/part/partInformation/addPartItem`,'post',data)
+export const addPartsItem = data => createAPI(`/part/partInformation/addPartsItem`,'post',data)
 
 /**
  * 删除物料属性
  */
 export const deletePartItem = data => createAPI(`/part/partInformation/deletePartItem`,'post',data)
+export const deletePartsItem = data => createAPI(`/part/partInformation/deletePartsItem`,'post',data)
 
 /**
  * 查询未选择的物料属性
@@ -201,3 +205,9 @@ export const handleQueryPartByPage = (data) => createAPI(`/part/partInformation/
 
 export const getPreviousPartNo = data => createAPI(`/part/partInformation/getPreviousPartNo`,'post',data)
 
+export const partInfoByMainPart = data => createAPI(`/part/partInformation/partInfoByMainPart`,'post',data)
+
+export const batchUpdateCodeNo = data => createAPI(`/part/partInformation/batchUpdateCodeNo`,'post',data)
+
+export const batchSavePartInfo = data => createAPI(`/part/partInformation/batchSavePartInfo`,'post',data)
+
diff --git a/src/api/part/quicklyCreateBom.js b/src/api/part/quicklyCreateBom.js
index 2623816..ff0d111 100644
--- a/src/api/part/quicklyCreateBom.js
+++ b/src/api/part/quicklyCreateBom.js
@@ -13,3 +13,6 @@ export const batchBuildInfo = data => createAPI(`/part/quicklyBom/batchBuildInfo
 export const resetNodePartInfo = data => createAPI(`/part/quicklyBom/resetNodePartInfo`,'post',data)
 export const getPartInfoByNo = data => createAPI(`/part/quicklyBom/getPartInfoByNo`,'post',data)
 export const saveMainPartInfo = data => createAPI(`/part/quicklyBom/saveMainPartInfo`,'post',data)
+export const templateAdd = data => createAPI(`/part/quicklyBom/templateAdd`,'post',data)
+export const getTemplateList = data => createAPI(`/part/quicklyBom/getTemplateList`,'post',data)
+export const chooseTemplate = data => createAPI(`/part/quicklyBom/chooseTemplate`,'post',data)
diff --git a/src/utils/directives.js b/src/utils/directives.js
index 9d62237..ccf2180 100644
--- a/src/utils/directives.js
+++ b/src/utils/directives.js
@@ -1,3 +1,85 @@
+// import Vue from 'vue';
+//
+// // v-dialogDrag: 弹窗拖拽属性
+// Vue.directive('drag', {
+//   bind(el, binding, vnode, oldVnode) {
+//     const dialogHeaderEl = el.querySelector('.el-dialog__header');
+//     const dragDom = el.querySelector('.el-dialog');
+//
+//     dialogHeaderEl.style.cssText += ';cursor:move;'
+//     dragDom.style.cssText += ';top:0px;'
+//
+//     // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
+//     const sty = (() => {
+//       if (window.document.currentStyle) {
+//         return (dom, attr) => dom.currentStyle[attr];
+//       } else {
+//         return (dom, attr) => getComputedStyle(dom, false)[attr];
+//       }
+//     })()
+//
+//     dialogHeaderEl.onmousedown = (e) => {
+//       // 鼠标按下，计算当前元素距离可视区的距离
+//       const disX = e.clientX - dialogHeaderEl.offsetLeft;
+//       const disY = e.clientY - dialogHeaderEl.offsetTop;
+//
+//       const screenWidth = document.body.clientWidth; // body当前宽度
+//       const screenHeight = document.documentElement.clientHeight; // 可见区域高度(应为body高度，可某些环境下无法获取)
+//
+//       const dragDomWidth = dragDom.offsetWidth; // 对话框宽度
+//       const dragDomheight = dragDom.offsetHeight; // 对话框高度
+//
+//       const minDragDomLeft = dragDom.offsetLeft;
+//       const maxDragDomLeft = screenWidth - dragDom.offsetLeft - dragDomWidth;
+//
+//       const minDragDomTop = dragDom.offsetTop;
+//       const maxDragDomTop = screenHeight - dragDom.offsetTop - dragDomheight;
+//
+//
+//       // 获取到的值带px 正则匹配替换
+//       let styL = sty(dragDom, 'left');
+//       let styT = sty(dragDom, 'top');
+//
+//       // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
+//       if (styL.includes('%')) {
+//         styL = +document.body.clientWidth * (+styL.replace(/\%/g, '') / 100);
+//         styT = +document.body.clientHeight * (+styT.replace(/\%/g, '') / 100);
+//       } else {
+//         styL = +styL.replace(/\px/g, '');
+//         styT = +styT.replace(/\px/g, '');
+//       };
+//
+//       document.onmousemove = function (e) {
+//         // 通过事件委托，计算移动的距离
+//         let left = e.clientX - disX;
+//         let top = e.clientY - disY;
+//
+//         // 边界处理
+//         if (-(left) > minDragDomLeft) {
+//           left = -(minDragDomLeft);
+//         } else if (left > maxDragDomLeft) {
+//           left = maxDragDomLeft;
+//         }
+//
+//         if (-(top) > minDragDomTop) {
+//           top = -(minDragDomTop);
+//         } else if (top > maxDragDomTop) {
+//           top = maxDragDomTop;
+//         }
+//
+//         // 移动当前元素
+//         dragDom.style.cssText += `;left:${left + styL}px;top:${top + styT}px;`;
+//       };
+//
+//       document.onmouseup = function (e) {
+//         document.onmousemove = null;
+//         document.onmouseup = null;
+//       };
+//     }
+//   }
+// })
+
+
 import Vue from 'vue';
 
 // v-dialogDrag: 弹窗拖拽属性
@@ -19,6 +101,8 @@ Vue.directive('drag', {
     })()
 
     dialogHeaderEl.onmousedown = (e) => {
+      // 获取鼠标按下时的坐标
+      e.preventDefault();
       // 鼠标按下，计算当前元素距离可视区的距离
       const disX = e.clientX - dialogHeaderEl.offsetLeft;
       const disY = e.clientY - dialogHeaderEl.offsetTop;
@@ -50,25 +134,56 @@ Vue.directive('drag', {
       };
 
       document.onmousemove = function (e) {
+        // 移动时禁止默认事件
+        e.preventDefault();
         // 通过事件委托，计算移动的距离
         let left = e.clientX - disX;
         let top = e.clientY - disY;
 
         // 边界处理
-        if (-(left) > minDragDomLeft) {
-          left = -(minDragDomLeft);
-        } else if (left > maxDragDomLeft) {
-          left = maxDragDomLeft;
+        /*        if (-(left) > minDragDomLeft) {
+                  left = -(minDragDomLeft);
+                } else if (left > maxDragDomLeft) {
+                  left = maxDragDomLeft;
+                }
+
+                if (-(top) > minDragDomTop) {
+                  top = -(minDragDomTop);
+                } else if (top > maxDragDomTop) {
+                  top = maxDragDomTop;
+                }*/
+        // 设置最大和最小可拖动范围
+        const viewportWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
+        const viewportHeight = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
+
+        let minLeft = 0;
+        let maxLeft = viewportWidth - dragDom.offsetWidth;
+
+        let minTop = 0;
+        let maxTop = viewportHeight - dragDom.offsetHeight;
+
+        if (dragDom.offsetHeight > viewportHeight) {
+          // 只有当内容过高时才放宽顶部限制
+          minTop = Math.max(
+            -(dragDom.offsetHeight - 100), // 至少保留 100px 高度可见
+            -(dragDom.offsetHeight - viewportHeight)
+          );
+          maxTop = 0;
         }
 
-        if (-(top) > minDragDomTop) {
-          top = -(minDragDomTop);
-        } else if (top > maxDragDomTop) {
-          top = maxDragDomTop;
-        }
+// 应用边界限制
+//         left = Math.max(minLeft, Math.min(left, maxLeft));
+        top = Math.max(minTop, Math.min(top, maxTop));
+
+        // 应用新的边界限制
+        // left = Math.max(minLeft, Math.min(left, maxLeft));
+        top = Math.max(minTop, Math.min(top, maxTop));
 
         // 移动当前元素
-        dragDom.style.cssText += `;left:${left + styL}px;top:${top + styT}px;`;
+        // dragDom.style.cssText += `;left:${left + styL}px;top:${top + styT}px;`;
+        dragDom.style.transform = `translate(${left + styL}px, ${top + styT}px)`;
+        // 让拖动更平滑
+        // dragDom.style.cssText += ';top:0px;position:relative;transition: transform 0.2s ease;';
       };
 
       document.onmouseup = function (e) {
@@ -78,3 +193,4 @@ Vue.directive('drag', {
     }
   }
 })
+
diff --git a/src/views/modules/part/part_create.vue b/src/views/modules/part/part_create.vue
index d908e00..eca20b8 100644
--- a/src/views/modules/part/part_create.vue
+++ b/src/views/modules/part/part_create.vue
@@ -1,22 +1,22 @@
 <template>
   <div>
     <!-- 物料新增/编辑模态框 -->
-    <el-dialog :title="modalData.title" top="18vh" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="1000px">
+    <el-dialog :title="modalData.title" top="18vh" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="1100px">
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
         <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
           <el-form-item label="物料编码" prop="partNo">
             <el-input v-model="modalData.partNo" disabled style="width: 128px"></el-input>
           </el-form-item>
           <el-form-item label="物料描述" prop="partDesc" style="margin-left: -10px">
-            <el-input v-model="modalData.partDesc" clearable style="width: 346px"></el-input>
+            <el-input v-model="modalData.partDesc" clearable style="width: 396px"></el-input>
           </el-form-item>
           <el-form-item label="物料描述（英文）">
-            <el-input v-model="modalData.partDesceEn" style="width: 477px"></el-input>
+            <el-input v-model="modalData.partDesceEn" style="width: 527px"></el-input>
           </el-form-item>
         </el-form>
         <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
           <el-form-item prop="spec" label="规格">
-            <el-input v-model="modalData.spec" style="width: 477px"></el-input>
+            <el-input v-model="modalData.spec" style="width: 527px"></el-input>
           </el-form-item>
           <el-form-item label="BU" prop="bu">
             <el-select v-model="modalData.bu" placeholder="请选择" @change="getPreviousPartNo" :disabled="modalDisableFlag" style="width: 90px">
@@ -41,6 +41,17 @@
               <el-option label="原材料" value="Purchased (raw)"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="模板(新增)">
+            <span style="cursor: pointer" slot="label" @click="handleTemplateAdd"><a herf="#">模板(新增)</a></span>
+            <el-select v-model="modalData.tempNo" @change="chooseTemplate" style="width: 105px">
+              <el-option
+                v-for="option in templateList"
+                :key="option.templateNo"
+                :label="option.templateName"
+                :value="option.templateNo">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item v-if="modalData.flag === '1'" style="margin-top: 23px">
             <el-checkbox v-model="modalData.tblBaseFlag" true-label="Y">复制属性({{previousPartNo}})</el-checkbox>
           </el-form-item>
@@ -52,64 +63,75 @@
               <el-form-item prop="umId2">
                 <span style="cursor: pointer" slot="label" @click="getBaseList(510)"><a herf="#">计量单位</a></span>
                 <el-input v-model="modalData.umId2" @blur="umIdBlur(510)" style="width: 128px"></el-input>
-                <el-input v-model="modalData.umName" disabled style="width: 330px"></el-input>
+                <el-input v-model="modalData.umName" disabled style="width: 380px"></el-input>
               </el-form-item>
               <el-form-item v-if="modalData.partType2 === 'Purchased (raw)'" prop="familyID">
                 <span style="cursor: pointer" slot="label" @click="getBaseList(214)"><a herf="#">物料分类</a></span>
                 <el-input v-model="modalData.familyID" @blur="partFamilyBlur(214)" style="width: 128px"></el-input>
-                <el-input v-model="modalData.familyName" disabled style="width: 330px"></el-input>
+                <el-input v-model="modalData.familyName" disabled style="width: 380px"></el-input>
               </el-form-item>
               <el-form-item v-else>
                 <span style="cursor: pointer" slot="label" @click="getBaseList(214)"><a herf="#">物料分类</a></span>
                 <el-input v-model="modalData.familyID" @blur="partFamilyBlur(214)" style="width: 128px"></el-input>
-                <el-input v-model="modalData.familyName" disabled style="width: 330px"></el-input>
+                <el-input v-model="modalData.familyName" disabled style="width: 380px"></el-input>
               </el-form-item>
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
               <el-form-item v-if="modalData.partType2 === 'Purchased (raw)'">
                 <span style="cursor: pointer" slot="label" @click="getBaseList(211)"><a herf="#">商品组1</a></span>
                 <el-input v-model="modalData.productGroupId1" @blur="productGroupId1Blur(211)" style="width: 128px"></el-input>
-                <el-input v-model="modalData.productGroupName1" disabled style="width: 330px"></el-input>
+                <el-input v-model="modalData.productGroupName1" disabled style="width: 380px"></el-input>
               </el-form-item>
               <el-form-item v-else prop="productGroupId1">
                 <span style="cursor: pointer" slot="label" @click="getBaseList(211)"><a herf="#">商品组1</a></span>
                 <el-input v-model="modalData.productGroupId1" @blur="productGroupId1Blur(211)" style="width: 128px"></el-input>
-                <el-input v-model="modalData.productGroupName1" disabled style="width: 330px"></el-input>
+                <el-input v-model="modalData.productGroupName1" disabled style="width: 380px"></el-input>
               </el-form-item>
               <el-form-item v-if="modalData.partType2 === 'Purchased (raw)'">
                 <span style="cursor: pointer" slot="label" @click="getBaseList(212)"><a herf="#">商品组2</a></span>
                 <el-input v-model="modalData.productGroupId2" @blur="productGroupId2Blur(212)" style="width: 128px"></el-input>
-                <el-input v-model="modalData.productGroupName2" disabled style="width: 330px"></el-input>
+                <el-input v-model="modalData.productGroupName2" disabled style="width: 380px"></el-input>
               </el-form-item>
               <el-form-item v-else prop="productGroupId2">
                 <span style="cursor: pointer" slot="label" @click="getBaseList(212)"><a herf="#">商品组2</a></span>
                 <el-input v-model="modalData.productGroupId2" @blur="productGroupId2Blur(212)" style="width: 128px"></el-input>
-                <el-input v-model="modalData.productGroupName2" disabled style="width: 330px"></el-input>
+                <el-input v-model="modalData.productGroupName2" disabled style="width: 380px"></el-input>
               </el-form-item>
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
               <el-form-item>
                 <span style="cursor: pointer" slot="label" @click="getBaseList(213)"><a herf="#">商品组3</a></span>
                 <el-input v-model="modalData.productGroupId3" @blur="productGroupId3Blur(213)" style="width: 128px"></el-input>
-                <el-input v-model="modalData.productGroupName3" disabled style="width: 330px"></el-input>
+                <el-input v-model="modalData.productGroupName3" disabled style="width: 380px"></el-input>
               </el-form-item>
               <el-form-item prop="codeNo">
                 <span style="cursor: pointer" v-if="!modalDisableFlag" slot="label" @click="getBaseList(219)"><a herf="#">属性模板</a></span>
                 <span v-else slot="label">属性模板</span>
                 <el-input v-model="modalData.codeNo" :disabled="modalDisableFlag" @blur="modelBlur(219)" style="width: 128px"></el-input>
-                <el-input v-model="modalData.codeDesc" disabled style="width: 330px"></el-input>
-              </el-form-item>
-            </el-form>
-            <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
-              <el-form-item>
-                <span style="cursor: pointer" slot="label" @click="getBaseList(518)"><a herf="#">BOM模板</a></span>
-                <el-input v-model="modalData.templateNo" @blur="bomTemplateBlur(518)" style="width: 128px"></el-input>
-                <el-input v-model="modalData.templateName" disabled style="width: 330px"></el-input>
+                <el-input v-model="modalData.codeDesc" disabled style="width: 380px"></el-input>
               </el-form-item>
             </el-form>
+            <div v-show="modalData.partType2==='Manufactured'" >
+              <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
+                <el-form-item prop="templateNo">
+                  <span style="cursor: pointer" slot="label" @click="getBaseList(518)"><a herf="#">BOM模板</a></span>
+                  <el-input v-model="modalData.templateNo" @blur="bomTemplateBlur(518)" style="width: 128px"></el-input>
+                  <el-input v-model="modalData.templateName" disabled style="width: 380px"></el-input>
+                </el-form-item>
+              </el-form>
+            </div>
+            <div v-show="modalData.partType2!=='Manufactured'">
+              <el-form :inline="true" label-position="top" :model="modalData" style="margin-top: -5px;">
+                <el-form-item>
+                  <span style="cursor: pointer" slot="label" @click="getBaseList(518)"><a herf="#">BOM模板</a></span>
+                  <el-input v-model="modalData.templateNo" @blur="bomTemplateBlur(518)" style="width: 128px"></el-input>
+                  <el-input v-model="modalData.templateName" disabled style="width: 380px"></el-input>
+                </el-form-item>
+              </el-form>
+            </div>
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
               <el-form-item label="备注" style="height: 135px">
-                <el-input type="textarea" v-model="modalData.remark" :rows="5" resize='none' show-word-limit style="width: 939px"></el-input>
+                <el-input type="textarea" v-model="modalData.remark" :rows="5" resize='none' show-word-limit style="width: 1039px"></el-input>
               </el-form-item>
             </el-form>
           </el-tab-pane>
@@ -744,6 +766,67 @@
       </el-footer>
     </el-dialog>
 
+    <el-dialog :title="'模板新增'" top="18vh" :close-on-click-modal="false" v-drag :visible.sync="templateAddFlag" width="850px">
+      <el-form :inline="true" :rules="tempRules" label-position="top" :model="tempData" style="margin-top: -5px;">
+        <el-form-item label="BU" prop="bu">
+          <el-select v-model="tempData.bu" placeholder="请选择" @change="getPreviousPartNo" style="width: 127px">
+            <el-option
+              v-for = "i in userBuList"
+              :key = "i.buNo"
+              :label = "i.buDesc"
+              :value = "i.buNo">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="模板编码" prop="templateNo">
+          <el-input v-model="tempData.templateNo" clearable style="width: 240px"></el-input>
+        </el-form-item>
+        <el-form-item label="模板名称" prop="templateName">
+          <el-input v-model="tempData.templateName" clearable style="width: 380px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" :rules="tempRules" label-position="top" :model="tempData" style="margin-top: -5px;">
+        <el-form-item prop="umId">
+          <span style="cursor: pointer" slot="label" @click="getBaseList(510)"><a herf="#">计量单位</a></span>
+          <el-input v-model="tempData.umName" disabled style="width: 380px"></el-input>
+        </el-form-item>
+        <el-form-item prop="familyId">
+          <span style="cursor: pointer" slot="label" @click="getBaseList(214)"><a herf="#">物料分类</a></span>
+          <el-input v-model="tempData.familyName" disabled style="width: 380px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" :rules="tempRules" label-position="top" :model="tempData" style="margin-top: -5px;">
+        <el-form-item prop="productGroupId1">
+          <span style="cursor: pointer" slot="label" @click="getBaseList(211)"><a herf="#">商品组1</a></span>
+          <el-input v-model="tempData.productGroupName1" disabled style="width: 380px"></el-input>
+        </el-form-item>
+        <el-form-item prop="productGroupId2">
+          <span style="cursor: pointer" slot="label" @click="getBaseList(212)"><a herf="#">商品组2</a></span>
+          <el-input v-model="tempData.productGroupName2" disabled style="width: 380px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" :rules="tempRules" label-position="top" :model="tempData" style="margin-top: -5px;">
+        <el-form-item prop="productGroupId3">
+          <span style="cursor: pointer" slot="label" @click="getBaseList(213)"><a herf="#">商品组3</a></span>
+          <el-input v-model="tempData.productGroupName3" disabled style="width: 380px"></el-input>
+        </el-form-item>
+        <el-form-item prop="codeNo">
+          <span style="cursor: pointer" slot="label" @click="getBaseList(219)"><a herf="#">属性模板</a></span>
+          <el-input v-model="tempData.codeDesc" disabled style="width: 380px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" :rules="tempRules" label-position="top" :model="tempData" style="margin-top: -5px;">
+        <el-form-item prop="bomTemplateNo">
+          <span style="cursor: pointer" slot="label" @click="getBaseList(518)"><a herf="#">BOM模板</a></span>
+          <el-input v-model="tempData.bomTemplateName" disabled style="width: 380px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="templateAdd">保存</el-button>
+        <el-button type="primary" @click="templateAddFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
     <!-- chooseList模态框 -->
     <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
 
@@ -799,6 +882,8 @@ import Chooselist from '@/views/modules/common/Chooselist_eam'
 import partUploadFile from "./part_upload_file"
 import {updateInquiryDetailStatusAndPart} from "../../../api/inquiry/inquiryDetail";
 import {EventBus} from "../../../main";
+import {getChooselist1} from "../../../api/chooselist/chooselist";
+import {chooseTemplate, getTemplateList, templateAdd} from "../../../api/part/quicklyCreateBom";
 export default {
   name: 'partCreate',
   components: {
@@ -812,6 +897,45 @@ export default {
         this.modalData.partNo = this.modalData.partNo.toUpperCase()
       }
     },
+    'modalData.bu': {
+      deep: true,
+      handler: function (newV, oldV) {
+        this.getTemplateList()
+      }
+    },
+    templateAddFlag: {
+      deep: true,
+      handler: function (newV, oldV) {
+        if (newV===false) {
+          this.tempData = {
+            site: this.$store.state.user.site,
+            bu: '',
+            templateNo: '',
+            templateName: '',
+            umId: '',
+            umName: '',
+            familyId: '',
+            familyName: '',
+            productGroupId1: '',
+            productGroupName1: '',
+            productGroupId2: '',
+            productGroupName2: '',
+            productGroupId3: '',
+            productGroupName3: '',
+            codeNo: '',
+            codeDesc: '',
+            bomTemplateNo: '',
+            bomTemplateName: '',
+          }
+        }
+      }
+    },
+    'tempData.bu': {
+      deep: true,
+      handler: function (newV, oldV) {
+        this.tempData.buNo = newV.split('_')[1]
+      }
+    }
   },
   props: {
     initData:{
@@ -850,10 +974,11 @@ export default {
         flag: '',
         title: '',
         site: '',
-        buNo: '',
+        buNo: this.initData.buNo,
         bu: '',
         partNo: '',
         partDesc: '',
+        tempNo: '',
         umId2: '',
         umName: '',
         spec: '',
@@ -881,6 +1006,28 @@ export default {
         partBomStatus: '',
         updateBy: ''
       },
+      // 定义tempData
+      tempData: {
+        site: this.$store.state.user.site,
+        bu: '',
+        buNo: '',
+        templateNo: '',
+        templateName: '',
+        umId: '',
+        umName: '',
+        familyId: '',
+        familyName: '',
+        productGroupId1: '',
+        productGroupName1: '',
+        productGroupId2: '',
+        productGroupName2: '',
+        productGroupId3: '',
+        productGroupName3: '',
+        codeNo: '',
+        codeDesc: '',
+        bomTemplateNo: '',
+        bomTemplateName: '',
+      },
       itemData: {
         site: this.$store.state.user.site,
         partNo: '',
@@ -958,6 +1105,7 @@ export default {
       routingAlternativeList: [],
       copyAttributeList: [],
       fileList: [],
+      templateList: [],
       // ======== 列表表头 ========
       columnList: [
         {
@@ -1947,6 +2095,85 @@ export default {
             trigger: ['blur','change']
           }
         ],
+        templateNo: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ]
+      },
+      tempRules: {
+        bu: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
+        templateNo: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
+        templateName: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
+        umId: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
+        familyId: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
+        productGroupId1: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
+        productGroupId2: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
+        productGroupId3: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
+        codeNo: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
+        bomTemplateNo: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ]
       },
       // ======== 复选数据集 ========
       partSelections: [],
@@ -1976,7 +2203,8 @@ export default {
       uploadDialog: false,
       menuId: this.$route.meta.menuId,
       previousPartNo: '',
-      saveLoading: false
+      saveLoading: false,
+      templateAddFlag: false,
     }
   },
 
@@ -2359,6 +2587,7 @@ export default {
       commitItemValue(tempData).then(({data}) => {
         if (data && data.code === 0) {
           this.getPartItem()
+          this.$emit('update-part-item')
           this.attributeDialog = true
           this.$message({
             message: '操作成功',
@@ -3160,72 +3389,207 @@ export default {
       this.$nextTick(() => {
         let strVal = ''
         let conSql = ''
-        if (this.modalData.bu === null || this.modalData.bu === '') {
-          this.$message.warning("请选择BU!")
-          return
+        if (!this.templateAddFlag){
+          if (this.modalData.bu === null || this.modalData.bu === '') {
+            this.$message.warning("请选择BU!")
+            return
+          } else {
+            conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
+          }
+          if (val === 510) {
+            strVal = this.modalData.umId2
+            conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'"
+          } else if (val === 211) {
+            strVal = this.modalData.productGroupId1
+          } else if (val === 212) {
+            strVal = this.modalData.productGroupId2
+          } else if (val === 213) {
+            strVal = this.modalData.productGroupId3
+          } else if (val === 214) {
+            strVal = this.modalData.familyID
+          } else if (val === 219) {
+            strVal = this.modalData.codeNo
+          } else if (val === 518) {
+            strVal = this.modalData.templateNo
+            conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'"
+          }
         } else {
-          conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
-        }
-        if (val === 510) {
-          strVal = this.modalData.umId2
-          conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'"
-        } else if (val === 211) {
-          strVal = this.modalData.productGroupId1
-        } else if (val === 212) {
-          strVal = this.modalData.productGroupId2
-        } else if (val === 213) {
-          strVal = this.modalData.productGroupId3
-        } else if (val === 214) {
-          strVal = this.modalData.familyID
-        } else if (val === 219) {
-          strVal = this.modalData.codeNo
-        } else if (val === 518) {
-          strVal = this.modalData.templateNo
-          conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'"
+          if (this.tempData.bu === null || this.tempData.bu === '') {
+            this.$message.warning("请选择BU!")
+            return
+          } else {
+            conSql = " and site = '" + this.tempData.bu.split('_')[0] + "'" + " and bu_no = '" + this.tempData.bu.split('_')[1] + "'"
+          }
+          if (val === 510) {
+            strVal = this.tempData.umId
+            conSql = " and site = '" + this.tempData.bu.split('_')[0] + "'"
+          } else if (val === 211) {
+            strVal = this.tempData.productGroupId1
+          } else if (val === 212) {
+            strVal = this.tempData.productGroupId2
+          } else if (val === 213) {
+            strVal = this.tempData.productGroupId3
+          } else if (val === 214) {
+            strVal = this.tempData.familyID
+          } else if (val === 219) {
+            strVal = this.tempData.codeNo
+          } else if (val === 518) {
+            strVal = this.tempData.bomTemplateNo
+            conSql = " and site = '" + this.tempData.bu.split('_')[0] + "'"
+          }
         }
         this.$refs.baseList.init(val, strVal, conSql)
       })
     },
     // 列表方法的回调
     getBaseData (val) {
-      if (this.tagNo === 510) {
-        this.modalData.umId2 = val.UMID
-        this.modalData.umName = val.UMName
-      } else if (this.tagNo === 211) {
-        this.modalData.productGroupId1 = val.product_group_id
-        this.modalData.productGroupName1 = val.product_group_name
-      } else if (this.tagNo === 212) {
-        this.modalData.productGroupId2 = val.product_group_id
-        this.modalData.productGroupName2 = val.product_group_name
-      } else if (this.tagNo === 213) {
-        this.modalData.productGroupId3 = val.product_group_id
-        this.modalData.productGroupName3 = val.product_group_name
-      } else if (this.tagNo === 214) {
-        this.modalData.familyID = val.family_id
-        this.modalData.familyName = val.family_name
-      } else if (this.tagNo === 219) {
-        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(() => {
-            })
+      if(!this.templateAddFlag){
+        if (this.tagNo === 510) {
+          this.modalData.umId2 = val.UMID
+          this.modalData.umName = val.UMName
+        } else if (this.tagNo === 211) {
+          this.modalData.productGroupId1 = val.product_group_id
+          this.modalData.productGroupName1 = val.product_group_name
+        } else if (this.tagNo === 212) {
+          this.modalData.productGroupId2 = val.product_group_id
+          this.modalData.productGroupName2 = val.product_group_name
+        } else if (this.tagNo === 213) {
+          this.modalData.productGroupId3 = val.product_group_id
+          this.modalData.productGroupName3 = val.product_group_name
+        } else if (this.tagNo === 214) {
+          this.modalData.familyID = val.family_id
+          this.modalData.familyName = val.family_name
+        } else if (this.tagNo === 219) {
+          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 {
-          this.modalData.codeNo = val.code_no
-          this.$set(this.modalData, 'codeDesc', val.code_desc)
+        } else if (this.tagNo === 518) {
+          this.modalData.templateNo = val.template_no
+          this.modalData.templateName = val.template_name
+        }
+      } else {
+        if (this.tagNo === 510) {
+          this.tempData.umId = val.UMID
+          this.tempData.umName = val.UMName
+        } else if (this.tagNo === 211) {
+          this.tempData.productGroupId1 = val.product_group_id
+          this.tempData.productGroupName1 = val.product_group_name
+        } else if (this.tagNo === 212) {
+          this.tempData.productGroupId2 = val.product_group_id
+          this.tempData.productGroupName2 = val.product_group_name
+        } else if (this.tagNo === 213) {
+          this.tempData.productGroupId3 = val.product_group_id
+          this.tempData.productGroupName3 = val.product_group_name
+        } else if (this.tagNo === 214) {
+          this.tempData.familyId = val.family_id
+          this.tempData.familyName = val.family_name
+        } else if (this.tagNo === 219) {
+          this.tempData.codeNo = val.code_no
+          this.$set(this.tempData, 'codeDesc', val.code_desc)
+        } else if (this.tagNo === 518) {
+          this.tempData.bomTemplateNo = val.template_no
+          this.$set(this.tempData, 'bomTemplateName', val.template_name)
         }
-      } else if (this.tagNo === 518) {
-        this.modalData.templateNo = val.template_no
-        this.modalData.templateName = val.template_name
       }
     },
 
+    templateAdd() {
+      if (this.tempData.bu === null || this.tempData.bu === ''){
+        this.$message.warning("请选择BU!")
+        return
+      }
+      if (this.tempData.templateNo === null || this.tempData.templateNo === ''){
+        this.$message.warning("请填写模板编码!")
+        return
+      }
+      if (this.tempData.templateName === null || this.tempData.templateName === ''){
+        this.$message.warning("请填写模板名称!")
+        return
+      }
+      if (this.tempData.umId === null || this.tempData.umId === ''){
+        this.$message.warning("请选择计量单位!")
+        return
+      }
+      if (this.tempData.familyId === null || this.tempData.familyId === ''){
+        this.$message.warning("请选择物料分类!")
+        return
+      }
+      if (this.tempData.productGroupId1 === null || this.tempData.productGroupId1 === ''){
+        this.$message.warning("请选择商品组1!")
+        return
+      }
+      if (this.tempData.productGroupId2 === null || this.tempData.productGroupId2 === ''){
+        this.$message.warning("请选择商品组2!")
+        return
+      }
+      if (this.tempData.productGroupId3 === null || this.tempData.productGroupId3 === ''){
+        this.$message.warning("请选择商品组3!")
+        return
+      }
+      if (this.tempData.codeNo === null || this.tempData.codeNo === ''){
+        this.$message.warning("请选择属性模板!")
+        return
+      }
+      if (this.tempData.bomTemplateNo === null || this.tempData.bomTemplateNo === ''){
+        this.$message.warning("请选择BOM模板!")
+        return
+      }
+      templateAdd(this.tempData).then(({data}) => {
+        if (data&&data.code===0){
+          this.getTemplateList()
+          this.templateAddFlag = false
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1500,
+            onClose: () => {}
+          })
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        }
+      })
+    },
+
+    getTemplateList() {
+      this.modalData.buNo = this.modalData.bu.split('_')[1]
+      getTemplateList(this.modalData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.templateList = data.rows
+        }
+      })
+    },
+
+    chooseTemplate(){
+      chooseTemplate(this.modalData).then(({data}) => {
+        if (data&&data.code===0) {
+          Object.keys(data.data).forEach(key => {
+            if (key !== 'tempNo') {
+              this.modalData[key] = data.data[key];
+            }
+          });
+          this.modalData.umId2 = data.data.umId
+          this.modalData.familyID = data.data.familyId
+          this.modalData.templateNo = data.data.bomTemplateNo
+          this.modalData.templateName = data.data.bomTemplateName
+        }
+      })
+    },
+
     saveQuicklyCreate(){
       let inData = {
         id: this.initData.id,
@@ -3244,6 +3608,10 @@ export default {
           })
         }
       })
+    },
+
+    handleTemplateAdd() {
+      this.templateAddFlag = true
     }
   }
 }
diff --git a/src/views/modules/part/quicklyCreateBom.vue b/src/views/modules/part/quicklyCreateBom.vue
index b144987..dde8ca8 100644
--- a/src/views/modules/part/quicklyCreateBom.vue
+++ b/src/views/modules/part/quicklyCreateBom.vue
@@ -19,9 +19,9 @@
       <el-form-item label=" ">
         <el-button type="info" @click="updateInquiryDetailStatus()">完成</el-button>
       </el-form-item>
-<!--      <el-form-item label=" ">
+      <el-form-item label=" ">
         <el-button type="primary" @click="handleBatchUpdatePart">物料属性批量维护</el-button>
-      </el-form-item>-->
+      </el-form-item>
     </el-form>
     <el-table
       :height="70"
@@ -219,36 +219,58 @@
     </el-dialog>
 
 <!--  物料属性批量维护模态框-->
-    <el-dialog title="物料属性批量维护" :close-on-click-modal="false" v-drag :visible.sync="batchUpdateFlag" width="900px">
-      <div class="rq">
-        <el-button type="primary" @click="batchUpdateEdit">编辑</el-button>
-        <el-button type="primary" @click="batchUpdateSave">保存</el-button>
+    <el-dialog title="物料属性批量维护" :close-on-click-modal="false" v-drag
+               :visible.sync="batchUpdateFlag"
+               width="90vw"
+               :before-close="handleBatchUpdateDialogClose"
+               close-on-click-modal="false">
+      <div class="rq" slot-scope="scope">
+        <div style="display:flex">
+          <el-button style="margin-right: 10px; height: 20px" type="primary" @click="copyInfo">复制属性</el-button>
+          <el-button style="margin-right: 10px; height: 20px" type="primary" @click="handleEditInfo">{{attributeFlag?'编辑' : '保存'}}</el-button>
+          <el-form label-position="top" style="margin-top: -20px; margin-left: 65vw">
+            <el-form-item label="属性模板">
+              <el-select v-model="searchData.codeNo" placeholder="请选择属性模板" @change="handleCodeNoChange" style="width: 235px">
+                <el-option
+                  v-for="option in codeList"
+                  :key="option.fieldname1"
+                  :label="option.caption1"
+                  :value="option.fieldname1">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </div>
         <el-table
+          v-show="attributeFlag"
+          @row-click="partClickRow"
+          :row-style="rowStyle"
           :height="300"
           :data="partList1"
-          @row-dblclick="getRowData"
           border
           style="width: 100%;">
           <el-table-column
             header-align="center"
             align="center"
             width="150"
-            fixed="right"
+            fixed="left"
             label="操作">
-            <div class="operation-view" style="display: inline-block; padding: 0px 5px; margin-left: 5px; color: #777777;">
-              <el-popover
-                placement="right"
-                width="80"
-                trigger="click">
-                <a style="cursor: pointer" @click="queryPartList2(scope.row)">已有料号</a>
-                <el-divider></el-divider>
-                <a style="cursor: pointer" @click="addPartModal(scope.row)">新增料号</a>
-                <i style="color:#1c92e0" slot="reference" class="small-operation-btn el-icon-more"/>
-              </el-popover>
-            </div>
+            <template slot-scope="scope">
+              <div class="operation-view" style="display: inline-block; padding: 0px 5px; margin-left: 5px; color: #777777;">
+                <el-popover
+                  placement="right"
+                  width="80"
+                  trigger="click">
+                  <a style="cursor: pointer" @click="queryPartList2(scope.row)">已有料号</a>
+                  <el-divider></el-divider>
+                  <a style="cursor: pointer" @click="addPartModal(scope.row)">新增料号</a>
+                  <i style="color:#1c92e0" slot="reference" class="small-operation-btn el-icon-more"/>
+                </el-popover>
+              </div>
+            </template>
           </el-table-column>
           <el-table-column
-            v-for="(item,index) in partColumnList" :key="index"
+            v-for="(item,index) in partColumnList1" :key="index"
             :sortable="item.columnSortable"
             :prop="item.columnProp"
             :header-align="item.headerAlign"
@@ -258,29 +280,488 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-show="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-show="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-table
+          v-show="!attributeFlag"
+          :height="300"
+          :data="partList1"
+          border
+          style="width: 100%;">
+          <el-table-column
+            header-align="center"
+            align="center"
+            width="150"
+            fixed="left"
+            label="操作">
+            <template slot-scope="scope">
+              <div class="operation-view" style="display: inline-block; padding: 0px 5px; margin-left: 5px; color: #777777;">
+                <el-popover
+                  placement="right"
+                  width="80"
+                  trigger="click">
+                  <a style="cursor: pointer" @click="queryPartList2(scope.row)">已有料号</a>
+                  <el-divider></el-divider>
+                  <a style="cursor: pointer" @click="addPartModal(scope.row)">新增料号</a>
+                  <i style="color:#1c92e0" slot="reference" class="small-operation-btn el-icon-more"/>
+                </el-popover>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-for="(item,index) in partColumnList1" :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-show="!item.columnHidden">
+                <span v-show="item.columnProp==='buNo'||item.columnProp==='partNo'||item.columnProp==='partDesc'||item.columnProp==='nodeName'">{{scope.row[item.columnProp]}}</span>
+                <span v-show="item.columnProp==='umName'">
+                  <el-select
+                    v-model="scope.row.umId2" clearable>
+                    <el-option
+                      v-for="option in scope.row.umList"
+                      :key="option.fieldname1"
+                      :label="option.caption1"
+                      :value="option.fieldname1">
+                    </el-option>
+                  </el-select>
+                </span>
+                <span v-show="item.columnProp==='familyName'">
+                  <el-select
+                    v-model="scope.row.familyID" clearable>
+                    <el-option
+                      v-for="option in scope.row.partFamilyList"
+                      :key="option.fieldname1"
+                      :label="option.caption1"
+                      :value="option.fieldname1">
+                    </el-option>
+                  </el-select>
+                </span>
+                <span v-show="item.columnProp==='productGroupName1'">
+                  <el-select
+                    v-model="scope.row.productGroupId1" clearable>
+                    <el-option
+                      v-for="option in scope.row.partProductGroupList1"
+                      :key="option.fieldname1"
+                      :label="option.caption1"
+                      :value="option.fieldname1">
+                    </el-option>
+                  </el-select>
+                </span>
+                <span v-show="item.columnProp==='productGroupName2'">
+                  <el-select
+                    v-model="scope.row.productGroupId2" clearable>
+                    <el-option
+                      v-for="option in scope.row.partProductGroupList2"
+                      :key="option.fieldname1"
+                      :label="option.caption1"
+                      :value="option.fieldname1">
+                    </el-option>
+                  </el-select>
+                </span>
+                <span v-show="item.columnProp==='productGroupName3'">
+                  <el-select
+                    v-model="scope.row.productGroupId3" clearable>
+                    <el-option
+                      v-for="option in scope.row.partProductGroupList3"
+                      :key="option.fieldname1"
+                      :label="option.caption1"
+                      :value="option.fieldname1">
+                    </el-option>
+                  </el-select>
+                </span>
+                <span v-show="item.columnProp==='templateName'">
+                  <el-select
+                    v-model="scope.row.templateNo" clearable>
+                    <el-option
+                      v-for="option in scope.row.templateList"
+                      :key="option.fieldname1"
+                      :label="option.caption1"
+                      :value="option.fieldname1">
+                    </el-option>
+                  </el-select>
+                </span>
+                <span v-show="item.columnProp==='remark'">
+                  <el-input
+                    type="textarea"
+                    :autosize="{ minRows: 1}"
+                    v-model="scope.row.remark">
+                  </el-input>
+                </span>
+
+              </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
-          @size-change="sizeChangeHandle2"
-          @current-change="currentChangeHandle2"
-          :current-page="pageIndex2"
-          :page-sizes="[20, 50, 100, 200, 500]"
-          :page-size="pageSize2"
-          :total="totalPage2"
-          layout="total, sizes, prev, pager, next, jumper">
-        </el-pagination>
+
+        <el-tabs v-model="inventoryPartTable" style="width: 100%;height: 340px;" :before-leave="tabLeave" @tab-click="tabClick" type="border-card">
+          <el-tab-pane label="新增物料属性" style="margin-top: -10px" name="part_item">
+            <el-form label-position="top" style="margin-left: 2px;">
+              <el-button type="primary" @click="addOrDelItem1">新增</el-button>
+              <el-button type="primary" :loading="loading" @click="clickSave1">{{ attributeFlag1?'编辑':'保存' }}</el-button>
+            </el-form>
+            <div class="rq " v-show="attributeFlag1">
+              <el-table
+                :data="partItemList1"
+                height="233px"
+                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">
+                    <div v-if="item.columnProp !== 'textValue' && item.columnProp !== 'numValue'">
+                      <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>
+                    </div>
+                    <div v-else>
+                      <template v-if="item.columnProp==='textValue' && scope.row.valueTypeDb==='T'">
+                        {{ scope.row['textValue'] }}
+                      </template>
+                      <template v-else-if="item.columnProp==='textValue' && scope.row.valueTypeDb==='N'">
+                        {{ scope.row['numValue'] }}
+                      </template>
+                    </div>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+            <div class="rq " v-show="!attributeFlag1">
+              <el-table
+                :data="partItemList1"
+                height="233px"
+                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">
+                    <div v-if="item.columnProp !== 'textValue' && item.columnProp !== 'numValue'">
+                      <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>
+                    </div>
+                    <div v-else>
+                      <div v-if="scope.row.valueChooseFlag !== 'Y'">
+                        <el-input-number v-model="scope.row.numValue" style="padding: 0;width: 100%" v-if="scope.row.valueTypeDb === 'N'" :controls="false"></el-input-number>
+                        <el-input v-model="scope.row.textValue" v-else></el-input>
+                      </div>
+                      <div v-else>
+                        <el-select style="width: 100%;" clearable v-if="scope.row.valueTypeDb === 'T'" v-model="scope.row.textValue">
+                          <el-option :value="i.availableValue" :label="i.availableValue" v-for="(i,key) in scope.row.availableValueList" :key="key"></el-option>
+                        </el-select>
+                        <el-select style="width: 100%;" clearable v-else v-model="scope.row.numValue">
+                          <el-option :value="i.availableValue" :label="i.availableValue" v-for="(i,key) in scope.row.availableValueList" :key="key"></el-option>
+                        </el-select>
+                      </div>
+                    </div>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="已有物料属性" style="margin-top: -10px" name="part_item1">
+            <el-form label-position="top" style="margin-left: 2px;">
+              <el-button type="primary" @click="addOrDelItem">新增</el-button>
+              <el-button type="primary" :loading="loading" @click="clickSave">{{ attributeFlag1?'编辑':'保存' }}</el-button>
+            </el-form>
+            <div class="rq " v-show="attributeFlag1">
+              <el-table
+                :data="partItemList"
+                height="233px"
+                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">
+                    <div v-if="item.columnProp !== 'textValue' && item.columnProp !== 'numValue'">
+                      <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>
+                    </div>
+                    <div v-else>
+                      <template v-if="item.columnProp==='textValue' && scope.row.valueTypeDb==='T'">
+                        {{ scope.row['textValue'] }}
+                      </template>
+                      <template v-else-if="item.columnProp==='textValue' && scope.row.valueTypeDb==='N'">
+                        {{ scope.row['numValue'] }}
+                      </template>
+                    </div>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+            <div class="rq " v-show="!attributeFlag1">
+              <el-table
+                :data="partItemList"
+                height="233px"
+                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">
+                    <div v-if="item.columnProp !== 'textValue' && item.columnProp !== 'numValue'">
+                      <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>
+                    </div>
+                    <div v-else>
+                      <div v-if="scope.row.valueChooseFlag !== 'Y'">
+                        <el-input-number v-model="scope.row.numValue" style="padding: 0;width: 100%" v-if="scope.row.valueTypeDb === 'N'" :controls="false"></el-input-number>
+                        <el-input v-model="scope.row.textValue" v-else></el-input>
+                      </div>
+                      <div v-else>
+                        <el-select style="width: 100%;" v-if="scope.row.valueTypeDb === 'T'" v-model="scope.row.textValue">
+                          <el-option :value="i.availableValue" :label="i.availableValue" v-for="(i,key) in scope.row.availableValueList" :key="key"></el-option>
+                        </el-select>
+                        <el-select style="width: 100%;" v-else v-model="scope.row.numValue">
+                          <el-option :value="i.availableValue" :label="i.availableValue" v-for="(i,key) in scope.row.availableValueList" :key="key"></el-option>
+                        </el-select>
+                      </div>
+                    </div>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-tab-pane>
+
+        </el-tabs>
+        <el-footer style="height:40px;margin-top: 20px;text-align:center">
+          <el-button type="primary" @click="handleBatchUpdateDialogClose">关闭</el-button>
+        </el-footer>
       </div>
+    </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="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"
+              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" :loading="addItemLoading" @click="addItem()">添加>></el-button>
+          </div>
+          <div style="margin-top: 15px;margin-left: 18px">
+            <el-button type="primary" :loading="deleteItemLoading" @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"
+              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>
+
+    <el-dialog title="新增" :close-on-click-modal="false" v-drag :visible.sync="fastAddFlag1" 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"
+              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" :loading="addItemLoading" @click="addItem1()">添加>></el-button>
+          </div>
+          <div style="margin-top: 15px;margin-left: 18px">
+            <el-button type="primary" :loading="deleteItemLoading" @click="deleteItem1()">删除<<</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"
+              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="batchUpdateFlag=false">关闭</el-button>
+        <el-button type="primary" @click="fastAddFlag1 = false">关闭</el-button>
       </el-footer>
     </el-dialog>
 
     <!-- 新增物料 -->
-    <part-create :init-data="searchData" ref="PartCreate" @refreshPageTables="getBomInfo" @refreshPageTables2="getInfoByBomTemplate" v-drag></part-create>
+    <part-create :init-data="searchData" ref="PartCreate" @update-part-item="getPartItem" @refreshPageTables="getBomInfo" @refreshPageTables2="getInfoByBomTemplate" v-drag></part-create>
 
     <!-- chooseList模态框 -->
     <ChooseList ref="baseList" @getBaseData="getBaseData"></ChooseList>
@@ -307,7 +788,16 @@ import RoutingCreate from "./routing_create.vue";
 import PartCreate from "./part_create.vue";
 import {updateInquiryDetailStatusAndPart} from "../../../api/inquiry/inquiryDetail";
 import {EventBus} from "../../../main";
-import {getPartItem} from "../../../api/part/partInformation";
+import {
+  addPartItem,
+  batchUpdateItem,
+  commitItemValue, deletePartItem,
+  getPartItem,
+  partInfoByMainPart,
+  queryPartItem,
+  getItemLists, batchSavePartInfo, addPartsItem, batchUpdateCodeNo, deletePartsItem, commitItemsValue
+} from "../../../api/part/partInformation";
+import {getChooselist1} from "../../../api/chooselist/chooselist";
 export default {
   components: {
     PartCreate,
@@ -322,6 +812,25 @@ export default {
         this.nodeData.nodeId = this.nodeData.nodeId.toUpperCase()
       }
     },
+    'partCurrentRow': {
+      deep: true,
+      handler: function (newV, oldV) {
+        if (this.inventoryPartTable==='part_item1'&&this.attributeFlag1){
+          this.getPartItem1()
+        }
+      }
+    },
+    batchUpdateFlag: {
+      handler: function (newV, oldV) {
+        if (newV===false) {
+          this.attributeFlag = true
+          this.attributeFlag1 = true
+          this.inventoryPartTable = 'part_item'
+        } else {
+          this.previousCodeNo = this.searchData.codeNo
+        }
+      }
+    },
     'nodeData.pId': {
       deep: true,
       handler: function (newV, oldV) {
@@ -354,9 +863,21 @@ export default {
   data () {
     return {
       activeTable: 'bom_info',
+      inventoryPartTable: 'part_item',
+      // selectableFields: [],
+      partItemList: [],
+      partItemList1: [],
+      copyAttributeList: [],
       treeData: [],
       treeData1: [],
       childrenNodeList: [],
+      umList: [],
+      partFamilyList: [],
+      partProductGroupList1: [],
+      partProductGroupList2: [],
+      partProductGroupList3: [],
+      templateList: [],
+      // ignoreFields: ['site', 'buNo', 'partNo', 'codeNo', 'nodeName', 'partDesc', 'propertiesValueList'],
       defaultProps: {
         children: "nodeList",
         label: "nodeName",
@@ -375,8 +896,17 @@ export default {
       pageIndex2: 1,
       pageSize2: 20,
       totalPage2: 0,
+      pageIndex3: 1,
+      pageSize3: 20,
+      totalPage3: 0,
       partList: [],
       partList1: [],
+      codeList: [],
+      itemSelections1: [],
+      itemSelections2: [],
+      itemList1: [],
+      itemList2: [],
+      previousCodeNo: '',
       searchData: {
         site: '',
         buNo: '',
@@ -384,6 +914,16 @@ export default {
         partDesc: '',
         codeNo: '',
       },
+      itemData: {
+        site: this.$store.state.user.site,
+        partNo: '',
+        propertiesItemNo: '',
+        codeNo: '',
+        itemDesc: '',
+        textValue: '',
+        numValue: '',
+        recordType: ''
+      },
       nodeData: {
         flag: '',
         site: this.$store.state.user.site,
@@ -401,6 +941,7 @@ export default {
         site: '',
         partNo: '',
         partDesc: '',
+        nodeFlag: false,
         page: 1,
         limit: 10
       },
@@ -434,19 +975,10 @@ export default {
           }
         ]
       },
-      dataList: [
-        {
-          // Family: '',
-          // Orientation: '',
-          // Lanes: '',
-          // WebWidth: '',
-          // PrintingLanes: null,
-          // BodingPitch: null,
-          // BondingLanes: null,
-          // ConvertingUp: null,
-        }
-      ],
+      dataList: [{}],
       currentNode: {},
+      partCurrentRow: {},
+      partCurrentRowIndex: -1,
       columnList: [
         {
           userId: this.$store.state.user.name,
@@ -561,7 +1093,167 @@ export default {
           columnWidth: 80
         }
       ],
+      partColumnList1: [
+        {
+          columnProp: 'buNo',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: 'BU',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          columnProp: 'partNo',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '料号',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          columnProp: 'partDesc',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '物料描述',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 320
+        },
+        {
+          columnProp: 'codeDesc',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '属性模板',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 150
+        },
+        {
+          columnProp: 'nodeName',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '节点',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          columnProp: 'umName',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '计量单位',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          columnProp: 'familyName',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '物料分类',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          columnProp: 'productGroupName1',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '商品组1',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 250
+        },
+        {
+          columnProp: 'productGroupName2',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '商品组2',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 250
+        },
+        {
+          columnProp: 'productGroupName3',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '商品组3',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 250
+        },
+        // {
+        //   columnProp: 'nodeName',
+        //   headerAlign: "center",
+        //   align: "center",
+        //   columnLabel: '属性模板',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100
+        // },
+        {
+          columnProp: 'templateName',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: 'BOM模板',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          columnProp: 'remark',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '备注',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 200
+        },
+      ],
       partColumnList: [
+        {
+          columnProp: 'buNo',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: 'BU',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
         {
           columnProp: 'partNo',
           headerAlign: "center",
@@ -631,6 +1323,76 @@ export default {
           columnWidth: 100
         },
       ],
+      columnItemList:[
+      {
+        userId: this.$store.state.user.name,
+        functionId: 601001,
+        serialNumber: '601001Table2PropertiesItemID',
+        tableId: "601001Table2",
+        tableName: "物料属性表",
+        columnProp: 'propertiesItemNo',
+        headerAlign: "center",
+        align: "center",
+        columnLabel: '属性编码',
+        columnHidden: false,
+        columnImage: false,
+        status: true,
+        fixed: '',
+        columnWidth: 300,
+        // columnWidth: 340,
+      },
+      {
+        userId: this.$store.state.user.name,
+        functionId: 601001,
+        serialNumber: '601001Table2PropertiesItemDesc',
+        tableId: "601001Table2",
+        tableName: "物料属性表",
+        columnProp: 'itemDesc',
+        headerAlign: "center",
+        align: "center",
+        columnLabel: '属性名称',
+        columnHidden: false,
+        columnImage: false,
+        status: true,
+        fixed: '',
+        columnWidth: 300,
+        // columnWidth: 340,
+      },
+      {
+        userId: this.$store.state.user.name,
+        functionId: 601001,
+        serialNumber: '601001Table2ValueType',
+        tableId: "601001Table2",
+        tableName: "物料属性表",
+        columnProp: 'valueType',
+        headerAlign: "center",
+        align: "center",
+        columnLabel: '属性类型',
+        columnHidden: false,
+        columnImage: false,
+        status: true,
+        fixed: '',
+        columnWidth: 360,
+        // columnWidth: 408,
+      },
+      {
+        userId: this.$store.state.user.name,
+        functionId: 601001,
+        serialNumber: '601001Table2ValueChooseFlag',
+        tableId: "601001Table2",
+        tableName: "物料属性表",
+        columnProp: 'textValue',
+        headerAlign: "center",
+        align: "center",
+        columnLabel: '属性值',
+        columnHidden: false,
+        columnImage: false,
+        status: true,
+        fixed: '',
+        columnWidth: 300,
+        // columnWidth: 340,
+      },
+    ],
       // 控制
       nodeModalFlag: false,
       nodeModalDisableFlag: false,
@@ -641,7 +1403,14 @@ export default {
       routingLoading: false,
       treeVisible: false,
       addNodeFlag: true,
-      batchUpdateFlag: false
+      batchUpdateFlag: false,
+      attributeFlag: true,
+      attributeFlag1: true,
+      fastAddFlag: false,
+      fastAddFlag1: false,
+      loading: false,
+      addItemLoading: false,
+      deleteItemLoading: false
     }
   },
   created () {
@@ -919,6 +1688,7 @@ export default {
         site: '',
         partNo: '',
         partDesc: '',
+        nodeFlag: true,
         page: 1,
         limit: 10
       }
@@ -974,11 +1744,20 @@ export default {
 
     // 双击选中物料
     getRowData (row) {
+      if (this.partData.nodeFlag&&row.buNo!==this.searchData.buNo) {
+        this.$message.warning('请确保节点物料的BU与主物料BU一致！')
+        return
+      }
       if (this.partData.flag === '1') {
         this.getInfoByBomTemplate(row)
       } else {
         this.toPartModule(row)
       }
+      setTimeout(() => {
+        if (this.batchUpdateFlag){
+          this.handleBatchUpdatePart()
+        }
+      }, 0)
     },
 
     // 获取物料的Bom模板详情
@@ -997,6 +1776,7 @@ export default {
       let tempData = {
         site: row.site,
         buNo: row.buNo,
+        codeNo: this.searchData.codeNo,
         mainPart: this.searchData.partNo,
         partNo: row.partNo,
         bomType: 'Manufacturing',
@@ -1266,23 +2046,6 @@ export default {
       getPartItem(tempData).then(({data}) => {
         if (data && data.code === 0 && data.rows.length > 0) {
           for (let i = 0; i < data.rows.length; i++) {
-            /*if (data.rows[i].itemDesc === 'Family1'){
-              this.dataList[0].Family = data.rows[i].textValue
-            } else if (data.rows[i].itemDesc === 'Family2'){
-              this.dataList[0].Orientation = data.rows[i].textValue
-            } else if (data.rows[i].itemDesc === 'Lanes0 web'){
-              this.dataList[0].Lanes = data.rows[i].textValue
-            } else if (data.rows[i].itemDesc === 'Lamination width'){
-              this.dataList[0].WebWidth = data.rows[i].textValue
-            } else if (data.rows[i].itemDesc === 'Printing lanes'){
-              this.dataList[0].PrintingLanes = data.rows[i].numValue
-            } else if (data.rows[i].itemDesc === 'Bonding Pitch'){
-              this.dataList[0].BodingPitch = data.rows[i].numValue
-            } else if (data.rows[i].itemDesc === '绑定列数'){
-              this.dataList[0].BondingLanes = data.rows[i].numValue
-            } else if (data.rows[i].itemDesc === 'CL60k-UP'){
-              this.dataList[0].ConvertingUp = data.rows[i].textValue
-            }*/
             if (data.rows[i].itemDesc === 'Family1'){
               this.$set(this.dataList[0], 'Family', data.rows[i].textValue);
             } else if (data.rows[i].itemDesc === 'Family2'){
@@ -1296,7 +2059,7 @@ export default {
             } else if (data.rows[i].itemDesc === 'Bonding Pitch'){
               this.$set(this.dataList[0], 'BodingPitch', data.rows[i].numValue);
             } else if (data.rows[i].itemDesc === '绑定列数'){
-              this.$set(this.dataList[0], 'BondingLanes', data.rows[i].numValue);
+              this.$set(this.dataList[0], 'BondingColumns', data.rows[i].numValue);
             } else if (data.rows[i].itemDesc === 'CL60k-UP'){
               this.$set(this.dataList[0], 'ConvertingUp', data.rows[i].textValue);
             }
@@ -1307,18 +2070,600 @@ export default {
       })
     },
 
+    getPartItem1 () {
+      let tempData = {
+        site: this.partCurrentRow.site,
+        buNo: this.partCurrentRow.buNo,
+        partNo: this.partCurrentRow.partNo,
+        codeNo: this.partCurrentRow.codeNo,
+        recordType: 'IP'
+      }
+      getPartItem(tempData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.partItemList = data.rows
+        } else {
+          this.partItemList = []
+        }
+      })
+    },
+
+    getPartItem2 () {
+      let tempData = {
+        site: this.partList1[0].site,
+        buNo: this.partList1[0].buNo,
+        partNo: this.partList1[0].partNo,
+        codeNo: this.partList1[0].codeNo,
+        recordType: 'IP'
+      }
+      getPartItem(tempData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.partItemList1 = data.rows
+        } else {
+          this.partItemList1 = []
+        }
+      })
+    },
     handleBatchUpdatePart(){
+      if(this.treeData.length===0){
+        this.$message.warning('请先维护主物料的BOM模板!')
+        return
+      }
+      let tempData = {
+        site: this.$store.state.user.site,
+        buNo: this.searchData.buNo,
+        partNo: this.searchData.partNo,
+        codeNo: this.searchData.codeNo
+      }
+      partInfoByMainPart(tempData).then(({data}) => {
+        if (data && data.code === 0){
+          this.$set(this, 'partList1', data.rows)
+          this.searchData.codeNo = this.partList1[0].codeNo
+          this.partCurrentRow = JSON.parse(JSON.stringify(this.partList1[0]))
+          let tempList = []
+          tempList.push(
+            ["Select code_no as fieldname1, code_desc as caption1 from plm_properties_model_header where function_type = 'IP' and active = 'Y' and (code_no like '%%' OR code_desc like '%%' )  and site in (select site from eam_access_site where username = '"+this.$store.state.user.name+"')  and (site + '-' + bu_no) in (select (a.site + '-' + a.bu_no) from AccessBu as a left join eam_access_site as b on a.site = b.site and a.username = b.username where a.username = '"+this.$store.state.user.name+"') and site = '"+this.$store.state.user.site+"' and bu_no = '"+this.searchData.buNo+"'"]
+          )
+          getChooselist1(tempList).then(({data}) => {
+            this.$set(this, 'codeList', data.list[0][0])
+          })
+          this.getPartItem2()
+          this.$forceUpdate()
+          this.batchUpdateFlag = true
+        }else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        }
+      })
+    },
 
-      this.batchUpdateFlag = true
+    addOrDelItem () {
+      if (!this.attributeFlag1) {
+        this.$message.warning('请保存更改！')
+        return
+      }
+      this.itemSelections1 = null
+      this.itemSelections2 = null
+      this.itemData.propertiesItemNo = ''
+      this.itemData.itemDesc = ''
+      let tempData = {
+        site: this.partCurrentRow.site,
+        buNo: this.partCurrentRow.buNo,
+        partNo: this.partCurrentRow.partNo,
+        codeNo: this.partCurrentRow.codeNo||this.searchData.codeNo,
+        recordType: 'IP'
+      }
+      getItemLists(tempData).then(({data}) => {
+        this.itemList1 = data.row1
+        this.itemList2 = data.row2
+      })
+      this.fastAddFlag = true
     },
 
-    batchUpdateEdit(){
+    addOrDelItem1 () {
+      if (!this.attributeFlag1) {
+        this.$message.warning('请保存更改！')
+        return
+      }
+      this.itemSelections1 = null
+      this.itemSelections2 = null
+      this.itemData.propertiesItemNo = ''
+      this.itemData.itemDesc = ''
+      let tempData = {
+        site: this.partList1[0].site,
+        buNo: this.partList1[0].buNo,
+        partNo: this.partList1[0].partNo,
+        codeNo: this.partList1[0].codeNo,
+        recordType: 'IP'
+      }
+      getItemLists(tempData).then(({data}) => {
+        this.itemList1 = data.row1
+        this.itemList2 = data.row2
+      })
+      this.fastAddFlag1 = true
+    },
 
+    clickSave1 () {
+      if (!this.attributeFlag1) { // 保存
+        this.updateItemValue1()
+        this.attributeFlag1 = true
+      } else { // 编辑
+        this.copyAttributeList = JSON.parse(JSON.stringify(this.partItemList1))
+        this.attributeFlag1 = false
+      }
+    },
+    clickSave () {
+      if (!this.attributeFlag1) { // 保存
+        this.updateItemValue()
+        this.attributeFlag1 = true
+      } else { // 编辑
+        this.copyAttributeList = JSON.parse(JSON.stringify(this.partItemList))
+        this.attributeFlag1 = false
+      }
     },
 
-    batchUpdateSave(){
+    // 列表表格选择替换
+    tabClick (tab, event) {
+      this.refreshCurrentTabTable1()
+    },
+    tabLeave (activeName, oldActiveName) {
+      if (!this.attributeFlag1) {
+        this.$message.warning('请先保存当前编辑的内容！')
+        return false
+      }
+      return true
+    },
 
-    }
+    // 刷新页签的table数据
+    refreshCurrentTabTable1 () {
+      if (this.inventoryPartTable === 'part_item') {
+        this.getPartItem2()
+      } else if (this.inventoryPartTable === 'part_item1') {
+        this.getPartItem1()
+      }
+    },
+
+    // 查询物料属性
+    queryPartItem () {
+      this.itemData.codeNo = this.modalData.codeNo
+      this.itemData.partNo = this.modalData.partNo
+      queryPartItem(this.itemData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.itemList1 = data.rows
+        } else {
+          this.itemList1 = []
+        }
+      })
+    },
+
+    // 可选属性
+    itemClickRow1 (row) {
+      this.$refs.itemTable1.toggleRowSelection(row)
+    },
+
+    // 复选属性
+    selectionItem1 (val) {
+      this.itemSelections1 = val
+    },
+
+    // 已有属性
+    itemClickRow2 (row) {
+      this.$refs.itemTable2.toggleRowSelection(row)
+    },
+
+    // 复选属性
+    selectionItem2 (val) {
+      this.itemSelections2 = val
+    },
+
+    updateItemValue1 () {
+      this.loading = true
+      let list = []
+      for (let i = 0; i <this.partList1.length; i++) {
+        let items = JSON.parse(JSON.stringify(this.partItemList1))
+        for (let j = 0; j < this.partItemList1.length; j++) {
+          items[j].site = this.partList1[i].site
+          items[j].buNo = this.partList1[i].buNo
+          items[j].partNo = this.partList1[i].partNo
+          items[j].codeNo = this.partList1[i].codeNo
+          items[j].recordType = 'IP'
+        }
+        list.push({
+          itemList: items
+        })
+      }
+      commitItemsValue(list).then(({data}) => {
+        if (data && data.code === 0) {
+          this.getPartItem2()
+          this.loading = false
+          this.attributeFlag1 = true
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1500,
+            onClose: () => {}
+          })
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        }
+      }).catch((error) => {
+        this.$set(this, 'loading', false)
+        this.$message.error(error)
+      })
+    },
+    updateItemValue () {
+      this.loading = true
+      let tempData = {
+        itemList: JSON.parse(JSON.stringify(this.partItemList))
+      }
+      commitItemValue(tempData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.getPartItem1()
+          this.loading = false
+          this.attributeFlag1 = true
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1500,
+            onClose: () => {}
+          })
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        }
+      }).catch((error) => {
+        this.$set(this, 'loading', false)
+        this.$message.error(error)
+      })
+    },
+
+    // 物料项目新增
+    addItem () {
+      if (this.itemSelections1 == null || this.itemSelections1.length === 0) {
+        this.$message.warning('请选择可选属性！')
+        return
+      }
+      let inData = {
+        site: this.partCurrentRow.site,
+        buNo: this.partCurrentRow.buNo,
+        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.getPartItem1()
+          this.itemSelections1 = []
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        }
+      })
+    },
+
+    addItem1 () {
+      if (this.itemSelections1 == null || this.itemSelections1.length === 0) {
+        this.$message.warning('请选择可选属性！')
+        return
+      }
+      let flag = true
+      let codeFlag = true
+      for (let i = 0; i < this.partList1.length; i++) {
+        if (!(this.partList1[i].partNo&&this.partList1[i].partNo!=='')){
+          flag = false
+          break
+        }
+        if (!(this.partList1[i].codeNo&&this.partList1[i].codeNo!=='')){
+          codeFlag = false
+          break
+        }
+      }
+      if (!flag){
+        this.$confirm("当前存在未绑定料号的节点", '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          flag = true
+        })
+      }
+      if (!flag) {
+        return
+      }
+      if (!codeFlag){
+        this.$confirm("请先维护全部节点的属性模版", '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          codeFlag = true
+        })
+      }
+      if (!codeFlag) {
+        return
+      }
+      this.addItemLoading = true
+      let inDataList = []
+      for (let i = 0; i < this.partList1.length; i++){
+        inDataList.push({
+          site: this.partList1[i].site,
+          buNo: this.partList1[i].buNo,
+          partNo: this.partList1[i].partNo,
+          codeNo: this.partList1[i].codeNo,
+          codeDesc: this.partList1[i].codeDesc,
+          recordType: 'IP',
+          itemList: this.itemSelections1
+        })
+      }
+      addPartsItem(inDataList).then(({data}) => {
+        if (data && data.code === 0) {
+          getItemLists(inDataList[0]).then(({data}) => {
+            this.itemList1 = data.row1
+            this.itemList2 = data.row2
+            this.addItemLoading = false
+            this.getPartItem2()
+          })
+          this.itemSelections1 = []
+        } else {
+          this.addItemLoading = false
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        }
+      }).catch((error) => {
+        this.addItemLoading = false
+        this.$message.error(error)
+      })
+    },
+
+    // 物料项目删除
+    deleteItem () {
+      if (this.itemSelections2 == null || this.itemSelections2.length === 0) {
+        this.$alert("请选择已有属性！", '提示', {
+          confirmButtonText: '确定'
+        })
+        return false
+      }
+      let inData = {
+        site: this.partCurrentRow.site,
+        buNo: this.partCurrentRow.buNo,
+        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.getPartItem1()
+          this.itemSelections2 = []
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        }
+      })
+    },
+
+    // 物料项目删除
+    deleteItem1 () {
+      if (this.itemSelections2 == null || this.itemSelections2.length === 0) {
+        this.$alert("请选择已有属性！", '提示', {
+          confirmButtonText: '确定'
+        })
+        return false
+      }
+      let inDataList = []
+      for (let i = 0; i < this.partList1.length; i++){
+        let items = JSON.parse(JSON.stringify(this.itemSelections2))
+        for (let j = 0; j < this.itemSelections2.length; j++) {
+          items[j].site = this.partList1[i].site
+          items[j].buNo = this.partList1[i].buNo
+          items[j].partNo = this.partList1[i].partNo
+          items[j].codeNo = this.partList1[i].codeNo
+          items[j].recordType = 'IP'
+        }
+        inDataList.push({
+          itemList: items
+        })
+      }
+      deletePartsItem(inDataList).then(({data}) => {
+        if (data && data.code === 0) {
+          this.$set(this.partList1[0], 'recordType', 'IP')
+          getItemLists(this.partList1[0]).then(({data}) => {
+            this.itemList1 = data.row1
+            this.itemList2 = data.row2
+          })
+          this.getPartItem2()
+          this.itemSelections2 = []
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        }
+      })
+    },
+
+    rowStyle({row}){
+      if(row.nodeName===this.partCurrentRow.nodeName)
+        return { 'background-color': '#E8F7F6', cursor: 'pointer' };
+    },
+
+    partClickRow(row) {
+      this.partCurrentRow = JSON.parse(JSON.stringify(row))
+      this.partCurrentRowIndex = this.partList1.indexOf(row)
+    },
+
+    copyInfo(){
+      const index = this.partCurrentRowIndex
+      if(index > -1 && index < this.partList1.length - 1){
+        const nextRow = this.partList1[index + 1]
+        const excludeFields = ['buNo', 'nodeId', 'nodeName', 'site', 'partDesc', 'partNo'];
+        for (const key in this.partCurrentRow) {
+          if (!excludeFields.includes(key)) {
+            this.$set(nextRow, key, this.partCurrentRow[key]);
+          }
+        }
+        this.partList1[index + 1] = nextRow
+
+        batchSavePartInfo(this.partList1).then(({data}) => {
+          if (data && data.code === 0){
+            this.handleBatchUpdatePart()
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+            this.attributeFlag = true
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+            this.handleBatchUpdatePart()
+          }
+        })
+
+      } else if (index === this.partList1.length) {
+        this.$message.warning("当前选择的是最后一行数据，无法复制!")
+      } else {
+        this.$message.warning("请先选择要复制的数据!")
+      }
+    },
+
+    handleEditInfo(){
+      if (this.attributeFlag===true){
+        this.getPropertiesList()
+        this.attributeFlag = false
+      } else {
+        for (let i = 0; i < this.partList1.length; i++) {
+          if (this.partList1[i].buNo===null||this.partList1[i].buNo===''){
+            this.$message.warning("请先选择物料再保存!")
+            return
+          }
+        }
+        batchSavePartInfo(this.partList1).then(({data}) => {
+          if (data && data.code === 0){
+            this.handleBatchUpdatePart()
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+            this.attributeFlag = true
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      }
+    },
+
+    handleBatchUpdateDialogClose(){
+      if (!this.attributeFlag||!this.attributeFlag1){
+        this.$confirm(`编辑尚未保存，是否关闭?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.batchUpdateFlag = false
+        })
+      } else {
+        this.batchUpdateFlag = false
+      }
+    },
+
+    getPropertiesList(){
+      const propLists = []
+      for (let i = 0; i <= this.partList1.length; i++) {
+        if (i === this.partList1.length){
+          propLists[i] = [
+            "Select UMID fieldname1, UMName caption1 from UM where site in (select site from eam_access_site where username = '"+this.$store.state.user.name+"')  and site = '"+this.$store.state.user.site+"'",
+            "Select template_no fieldname1, template_name caption1 from plm_bom_template where site in (select site from eam_access_site where username = '"+this.$store.state.user.name+"')  and site = '"+this.$store.state.user.site+"'",
+          ]
+        } else {
+          propLists[i] = [
+            "select family_id fieldname1, family_name caption1 from part_family where active = 'Y' and site in (select site from eam_access_site where username = '"+this.$store.state.user.name+"')  and (site + '-' + bu_no) in (select (a.site + '-' + a.bu_no) from AccessBu as a left join eam_access_site as b on a.site = b.site and a.username = b.username where a.username = '"+this.$store.state.user.name+"') and site = '"+this.$store.state.user.site+"' and bu_no = '"+this.partList1[i].buNo+"'",
+            "select product_group_id fieldname1,product_group_name caption1 from part_product_group where active = 'Y' and type = '1' and site in (select site from eam_access_site where username = '"+this.$store.state.user.name+"')  and (site + '-' + bu_no) in (select (a.site + '-' + a.bu_no) from AccessBu as a left join eam_access_site as b on a.site = b.site and a.username = b.username where a.username = '"+this.$store.state.user.name+"') and site = '"+this.$store.state.user.site+"' and bu_no = '"+this.partList1[i].buNo+"'",
+            "select product_group_id fieldname1,product_group_name caption1 from part_product_group where active = 'Y' and type = '2' and site in (select site from eam_access_site where username = '"+this.$store.state.user.name+"')  and (site + '-' + bu_no) in (select (a.site + '-' + a.bu_no) from AccessBu as a left join eam_access_site as b on a.site = b.site and a.username = b.username where a.username = '"+this.$store.state.user.name+"') and site = '"+this.$store.state.user.site+"' and bu_no = '"+this.partList1[i].buNo+"'",
+            "select product_group_id fieldname1,product_group_name caption1 from part_product_group where active = 'Y' and type = '3' and site in (select site from eam_access_site where username = '"+this.$store.state.user.name+"')  and (site + '-' + bu_no) in (select (a.site + '-' + a.bu_no) from AccessBu as a left join eam_access_site as b on a.site = b.site and a.username = b.username where a.username = '"+this.$store.state.user.name+"') and site = '"+this.$store.state.user.site+"' and bu_no = '"+this.partList1[i].buNo+"'",
+          ]
+        }
+      }
+      getChooselist1(propLists).then((data) => {
+        if (data.data && data.data.code === 0){
+          for (let i = 0; i < this.partList1.length; i++) {
+            this.$set(this.partList1[i], 'umList', data.data.list[this.partList1.length][0]);
+            this.$set(this.partList1[i], 'partFamilyList', data.data.list[i][0]);
+            this.$set(this.partList1[i], 'partProductGroupList1', data.data.list[i][1]);
+            this.$set(this.partList1[i], 'partProductGroupList2', data.data.list[i][2]);
+            this.$set(this.partList1[i], 'partProductGroupList3', data.data.list[i][3]);
+            this.$set(this.partList1[i], 'templateList', data.data.list[this.partList1.length][1]);
+          }
+        }
+      })
+    },
+
+    handleCodeNoChange(value) {
+      const previousValue = this.previousCodeNo;
+      let flag = true
+      for (let i = 0; i < this.partList1.length; i++) {
+        if (!this.partList1[i].partNo||this.partList1[i].partNo===''){
+          flag =  false
+        }
+      }
+      if (flag) {
+        let partList = []
+        for (let i = 0; i < this.partList1.length; i++) {
+          let temp = {
+            site: this.$store.state.user.site,
+            partNo: this.partList1[i].partNo,
+            codeNo: value
+          }
+          partList.push(temp)
+        }
+        batchUpdateCodeNo(partList).then(({data}) => {
+          if (data&&data.code === 0){
+            this.handleBatchUpdatePart()
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+          } else {
+            this.$set(this.searchData, 'codeNo', previousValue)
+            this.$message({
+              message: data.msg,
+              type: 'error',
+              duration: 1500,
+              onClose: () => {}
+            })
+          }
+        })
+      } else {
+        this.$nextTick(() => {
+          this.$set(this.searchData, 'codeNo', previousValue)
+          this.$message.warning('请先选择所有节点的对应物料!');
+        });
+      }
+    },
 
   }
 }
diff --git a/src/views/modules/part/routing_create.vue b/src/views/modules/part/routing_create.vue
index 7061aae..0baf8f5 100644
--- a/src/views/modules/part/routing_create.vue
+++ b/src/views/modules/part/routing_create.vue
@@ -400,6 +400,16 @@ export default {
   components: {
     ChooseList
   },
+  watch: {
+    'subDetailList': {
+      deep: true,
+      handler: function (newV, oldV) {
+        newV.forEach(item => {
+          item.formula = this.getFormula(item.operationName)
+        })
+      }
+    }
+  },
   name: 'routingCreate',
   data() {
     return {
@@ -906,18 +916,18 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100
+          columnWidth: 120
         },
         {
           userId: this.$store.state.user.name,
           functionId: 601003,
-          serialNumber: '104003Table2RunTimeCodeDesc',
+          serialNumber: '104003Table2MachCycleTime',
           tableId: '104003Table2',
           tableName: 'Routing工序表',
-          columnProp: 'runTimeCodeDesc',
+          columnProp: 'machCycleTime',
           headerAlign: 'center',
-          align: 'center',
-          columnLabel: '产出单位',
+          align: 'right',
+          columnLabel: '机器处理时间',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -929,13 +939,31 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 601003,
-          serialNumber: '104003Table2MachSetupTime',
+          serialNumber: '104003Table2OperationName',
           tableId: '104003Table2',
           tableName: 'Routing工序表',
-          columnProp: 'machSetupTime',
+          columnProp: 'formula',
           headerAlign: 'center',
-          align: 'right',
-          columnLabel: '机器调机时间',
+          align: 'left',
+          columnLabel: '计算公式',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 260
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 601003,
+          serialNumber: '104003Table2OperationName',
+          tableId: '104003Table2',
+          tableName: 'Routing工序表',
+          columnProp: 'crewSize',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '人数',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -947,13 +975,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 601003,
-          serialNumber: '104003Table2SetupCrewSize',
+          serialNumber: '104003Table2OperationName',
           tableId: '104003Table2',
           tableName: 'Routing工序表',
-          columnProp: 'setupCrewSize',
+          columnProp: 'refSpeed',
           headerAlign: 'center',
-          align: 'right',
-          columnLabel: '调机过程人数',
+          align: 'center',
+          columnLabel: '速度',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -965,13 +993,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 601003,
-          serialNumber: '104003Table2SetupLaborClassDesc',
+          serialNumber: '104003Table2OperationName',
           tableId: '104003Table2',
           tableName: 'Routing工序表',
-          columnProp: 'setupLaborClassDesc',
+          columnProp: 'refTime',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '调机时人员等级',
+          columnLabel: '时间',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -983,13 +1011,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 601003,
-          serialNumber: '104003Table2MachCycleTime',
+          serialNumber: '104003Table2OperationName',
           tableId: '104003Table2',
           tableName: 'Routing工序表',
-          columnProp: 'machCycleTime',
+          columnProp: 'refEfficiency',
           headerAlign: 'center',
-          align: 'right',
-          columnLabel: '机器处理时间',
+          align: 'center',
+          columnLabel: '效率',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -998,16 +1026,52 @@ export default {
           fixed: '',
           columnWidth: 100
         },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 601003,
+        //   serialNumber: '104003Table2RunTimeCodeDesc',
+        //   tableId: '104003Table2',
+        //   tableName: 'Routing工序表',
+        //   columnProp: 'runTimeCodeDesc',
+        //   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: 601003,
+        //   serialNumber: '104003Table2MachSetupTime',
+        //   tableId: '104003Table2',
+        //   tableName: 'Routing工序表',
+        //   columnProp: 'machSetupTime',
+        //   headerAlign: 'center',
+        //   align: 'right',
+        //   columnLabel: '机器调机时间',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100
+        // },
         {
           userId: this.$store.state.user.name,
           functionId: 601003,
-          serialNumber: '104003Table2MachRunFactor',
+          serialNumber: '104003Table2SetupCrewSize',
           tableId: '104003Table2',
           tableName: 'Routing工序表',
-          columnProp: 'machRunFactor',
+          columnProp: 'setupCrewSize',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '机器单位产出',
+          columnLabel: '调机过程人数',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1016,16 +1080,34 @@ export default {
           fixed: '',
           columnWidth: 100
         },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 601003,
+        //   serialNumber: '104003Table2SetupLaborClassDesc',
+        //   tableId: '104003Table2',
+        //   tableName: 'Routing工序表',
+        //   columnProp: 'setupLaborClassDesc',
+        //   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: 601003,
-          serialNumber: '104003Table2CrewSize',
+          serialNumber: '104003Table2MachRunFactor',
           tableId: '104003Table2',
           tableName: 'Routing工序表',
-          columnProp: 'crewSize',
+          columnProp: 'machRunFactor',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '生产过程人数',
+          columnLabel: '机器单位产出',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1037,13 +1119,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 601003,
-          serialNumber: '104003Table2LaborClassNo',
+          serialNumber: '104003Table2CrewSize',
           tableId: '104003Table2',
           tableName: 'Routing工序表',
-          columnProp: 'laborClassDesc',
+          columnProp: 'crewSize',
           headerAlign: 'center',
-          align: 'center',
-          columnLabel: '人员等级',
+          align: 'right',
+          columnLabel: '生产过程人数',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1055,13 +1137,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 601003,
-          serialNumber: '104003Table2LaborSetupTime',
+          serialNumber: '104003Table2LaborClassNo',
           tableId: '104003Table2',
           tableName: 'Routing工序表',
-          columnProp: 'laborSetupTime',
+          columnProp: 'laborClassDesc',
           headerAlign: 'center',
-          align: 'right',
-          columnLabel: '人工调机时间',
+          align: 'center',
+          columnLabel: '人员等级',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1070,6 +1152,24 @@ export default {
           fixed: '',
           columnWidth: 100
         },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 601003,
+        //   serialNumber: '104003Table2LaborSetupTime',
+        //   tableId: '104003Table2',
+        //   tableName: 'Routing工序表',
+        //   columnProp: 'laborSetupTime',
+        //   headerAlign: 'center',
+        //   align: 'right',
+        //   columnLabel: '人工调机时间',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100
+        // },
         {
           userId: this.$store.state.user.name,
           functionId: 601003,
@@ -1142,60 +1242,60 @@ export default {
           fixed: '',
           columnWidth: 100
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 601003,
-          serialNumber: '104003Table2WorkCenterDesc',
-          tableId: '104003Table2',
-          tableName: 'Routing工序表',
-          columnProp: 'workCenterDesc',
-          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: 601003,
-          serialNumber: '601003Table2WorkCenterType',
-          tableId: '601003Table2',
-          tableName: 'Routing工序表',
-          columnProp: 'workCenterType',
-          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: 601003,
-          serialNumber: '104003Table2OutsideOpItem',
-          tableId: '104003Table2',
-          tableName: 'Routing工序表',
-          columnProp: 'outsideOpItem',
-          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: 601003,
+        //   serialNumber: '104003Table2WorkCenterDesc',
+        //   tableId: '104003Table2',
+        //   tableName: 'Routing工序表',
+        //   columnProp: 'workCenterDesc',
+        //   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: 601003,
+        //   serialNumber: '601003Table2WorkCenterType',
+        //   tableId: '601003Table2',
+        //   tableName: 'Routing工序表',
+        //   columnProp: 'workCenterType',
+        //   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: 601003,
+        //   serialNumber: '104003Table2OutsideOpItem',
+        //   tableId: '104003Table2',
+        //   tableName: 'Routing工序表',
+        //   columnProp: 'outsideOpItem',
+        //   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: 601003,
@@ -2567,6 +2667,31 @@ export default {
       this.componentData.laborClassDesc = ''
     },
 
+    getFormula(value) {
+      switch (value) {
+        case '一复': case '熟化': case 'RFID前道检品':
+          return '人数/（速度x时间x效率）'
+        case '印刷': case 'RFID-蚀刻': case 'RFID-分切':
+          return '人数/（速度x时间x效率）/Printing lanes'
+        case '绑定': case 'RFID编码': case 'RFID编码打印':
+          return '人数/(UPH(每小时产量)*效率)*1KCT'
+        case 'RFID多条检测':
+          return '人数/(速度x时间xCDx效率）*1KCT'
+        case 'RFID复合模切检测':
+          return '人数/(速度x时间x效率x(CDx复合列数))*1KCT'
+        case 'RFID后道检品':
+          return '人数/UPH（每小时产量）*100%*1KCT'
+        case 'RFID自动贴标':
+          return '人数/(速度x时间x效率x(CDx贴标列数))*1KCT'
+        case 'Voyantic在线检测':
+          return '人数/(速度x时间x效率x(CDx检测列数))*1KCT'
+        case 'RFID包装':
+          return '人数/(日产量/8小时/17人均摊)*1KCT'
+        default:
+          return ''
+      }
+    }
+
   }
 }
 </script>