diff --git a/src/views/modules/customer/customerInformationManagement.vue b/src/views/modules/customer/customerInformationManagement.vue
index c4cfa3a..0362687 100644
--- a/src/views/modules/customer/customerInformationManagement.vue
+++ b/src/views/modules/customer/customerInformationManagement.vue
@@ -278,8 +278,7 @@
     <el-dialog :title="addressModalData.title" :close-on-click-modal="false" v-drag :visible.sync="addressModalFlag" width="500px">
       <el-form :inline="true" label-position="top" :model="addressModalData" :rules="addressRules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="地址类型" prop="addressType" :rules="addressRules.addressType">
-          <dict-data-select v-if="addressModalFlag" v-model="addressModalData.addressType" :disabled="addressDetailModalFlag" style="width: 170px" dict-type="plm_customer_address_address_type">
-          </dict-data-select>
+          <dict-data-select v-if="addressModalFlag" v-model="addressModalData.addressType" :disabled="addressDetailModalFlag" style="width: 170px" dict-type="plm_customer_address_address_type"></dict-data-select>
         </el-form-item>
         <el-form-item label="公司名称">
           <el-input v-model="addressModalData.companyName" :readonly="addressDetailModalFlag" style="width: 273px"></el-input>
@@ -292,7 +291,11 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="addressModalData" :rules="addressRules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="默认地址" prop="defaultAddress" :rules="addressRules.defaultAddress">
-          <el-input v-model="addressModalData.defaultAddress" :disabled="addressDetailModalFlag" style="width: 314px"></el-input>
+<!--          <el-input v-model="addressModalData.defaultAddress" :disabled="addressDetailModalFlag" style="width: 314px"></el-input>-->
+          <el-select v-model="addressModalData.defaultAddress" :disabled="addressDetailModalFlag" style="width: 314px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="状态" prop="addressStatus" :rules="addressRules.addressStatus">
           <el-select v-model="addressModalData.addressStatus" :disabled="addressDetailModalFlag" style="width: 130px">
@@ -2128,13 +2131,16 @@
           addressId: '',
           addressName: '',
           companyName: this.customerCurrentRow.customerDesc,
-          defaultAddress: '',
+          defaultAddress: 'N',
           addressStatus: '启用',
           addressType: '',
           remark: '',
           createDate: '',
           createBy: this.$store.state.user.name,
         }
+        if (this.addressList.length === 0) {
+          this.addressModalData.defaultAddress = 'Y'
+        }
         this.addressDetailModalFlag = false
         this.addressModalFlag = true
       },
@@ -2669,9 +2675,9 @@
           this.$message.warning('请选择客户类型！')
           return
         }
-        if(this.modalData.flag === '1'){
-          this.modalData.primaryContact = 'Y'
-          this.modalData.contactStatus = '启用'
+        if (this.modalData.flag === '1') {
+          // this.modalData.primaryContact = 'Y'
+          // this.modalData.contactStatus = '启用'
           customerInformationSave(this.modalData).then(({data}) => {
             if (data && data.code === 0) {
               this.getDataList()
@@ -2689,7 +2695,7 @@
               })
             }
           })
-        }else {
+        } else {
           customerInformationEdit(this.modalData).then(({data}) => {
             if (data && data.code === 0) {
               this.getDataList()
diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue
index 493763e..4a73b55 100644
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
@@ -3404,18 +3404,10 @@ export default {
         this.$message.warning('请填写调机量！')
         return
       }
-      if (this.componentData.componentScrap === 0) {
-        this.$message.warning('调机量不能为0！')
-        return
-      }
       if (this.componentData.shrinkageFactor === '' || this.componentData.shrinkageFactor == null) {
         this.$message.warning('请填写损耗率！')
         return
       }
-      if (this.componentData.shrinkageFactor === 0) {
-        this.$message.warning('损耗率不能为0！')
-        return
-      }
       if (this.componentData.issueType === '' || this.componentData.issueType == null) {
         this.$message.warning('请选择生产属性！')
         return
diff --git a/src/views/modules/part/bomSearch3.vue b/src/views/modules/part/bomSearch3.vue
index a94388c..1fb6d2d 100644
--- a/src/views/modules/part/bomSearch3.vue
+++ b/src/views/modules/part/bomSearch3.vue
@@ -561,7 +561,7 @@ export default {
           serialNumber: '104009Table2PrintUnitName',
           tableId: '104009Table2',
           tableName: 'BOMComponent表',
-          columnProp: 'printUnitName',
+          columnProp: 'printUnit',
           headerAlign: 'center',
           align: 'center',
           columnLabel: '单位',
diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue
index a731a3d..c5cf8c4 100644
--- a/src/views/modules/part/partInformation.vue
+++ b/src/views/modules/part/partInformation.vue
@@ -163,7 +163,7 @@
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
               <el-form-item prop="umName" :rules="rules.umName">
-                <span style="cursor: pointer" slot="label" @click="getBaseList(1007)"><a herf="#">库存计量单位 / Inventory UoM</a></span>
+                <span style="cursor: pointer" slot="label" @click="getBaseList(1007)"><a herf="#">计量单位 / Inventory UoM</a></span>
                 <el-input v-model="modalData.umId" @blur="umIdBlur" style="width: 128px"></el-input>
                 <el-input v-model="modalData.umName" disabled style="width: 330px"></el-input>
               </el-form-item>
@@ -1766,10 +1766,10 @@
             serialNumber: '104001Table1UmId',
             tableId: '104001Table1',
             tableName: '物料信息表',
-            columnProp: 'umName',
+            columnProp: 'umId',
             headerAlign: 'center',
             align: 'center',
-            columnLabel: '库存计量单位',
+            columnLabel: '计量单位',
             columnHidden: false,
             columnImage: false,
             status: true,
@@ -4466,7 +4466,7 @@
           return
         }
         if (this.modalData.umId === '' || this.modalData.umId == null) {
-          this.$message.warning('请选择库存计量单位！')
+          this.$message.warning('请选择计量单位！')
           return
         }
         if (this.modalData.codeNo === '' || this.modalData.codeNo == null) {
@@ -4670,7 +4670,7 @@
         }
       },
 
-      // 库存计量单位输入校验
+      // 计量单位输入校验
       umIdBlur () {
         if (this.modalData.umId != null && this.modalData.umId !== '') {
           getChooselistData({"sqlcode": "select um_id, um_name from um where active = 'Y' and um_id = '" + this.modalData.umId + "'"}).then(({data}) => {
diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue
index 70479f6..fbc7d29 100644
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@@ -72,7 +72,7 @@
         label="操作">
         <template slot-scope="scope">
           <el-link style="cursor: pointer" @click="updateModal(scope.row)">编辑</el-link>
-          <el-link style="cursor: pointer" @click="checkOutToBom(scope.row.partNo)">切换Bom</el-link>
+          <el-link style="cursor: pointer" @click="checkOutToBom(scope.row.partNo)">切换BOM</el-link>
         </template>
       </el-table-column>
     </el-table>
@@ -427,7 +427,7 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px">
         <el-form-item :label="'机器单位产出'" prop="machRunFactor" :rules="componentRules.machRunFactor">
-          <el-input class="inlineNumber numInput" v-model="componentData.machRunFactor" @input="handleInput(componentData.machRunFactor,1)" type="number" style="width: 221px"></el-input>
+          <el-input class="inlineNumber numInput" v-model="componentData.machRunFactor" @input="handleInput(componentData.machRunFactor,1)" @change="changeMachRunFactor" type="number" style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item :label="'人工单位产出'" prop="laborRunFactor" :rules="componentRules.laborRunFactor">
           <el-input class="inlineNumber numInput" v-model="componentData.laborRunFactor" @input="handleInput(componentData.laborRunFactor,5)" type="number" style="width: 221px"></el-input>
@@ -475,20 +475,17 @@
     <el-dialog title="工艺工具" :close-on-click-modal="false" v-drag :visible.sync="saveRoutingToolModal" width="500px">
       <el-form :inline="true" label-position="top" :model="routingToolData" :rules="RoutingToolRules" style="margin-left: 5px">
         <el-form-item :label="'替代'" prop="alternativeNo" :rules="RoutingToolRules.alternativeNo">
-          <el-select v-model="routingToolData.alternativeNo" placeholder="请选择" :disabled="saveRoutingToolDisableModal" style="width: 330px">
+          <el-select v-model="routingToolData.alternativeNo" placeholder="请选择" :disabled="saveRoutingToolDisableModal" style="width: 464px">
             <el-option
               v-for = "i in alternativeList"
               :key = "i.alternativeNo"
               :label = "i.alternativeDescription"
               :value = "i.alternativeNo">
               <span style="float: left;width: 100px">{{ i.alternativeNo }}</span>
-              <span style="float: right; color: #8492a6;white-space:nowrap;overflow:hidden;text-overflow:ellipsis; font-size: 11px;width: 60px">{{ i.alternativeDescription }}</span>
+              <span style="float: right; color: #8492a6;white-space:nowrap;overflow:hidden;text-overflow:ellipsis; font-size: 11px;width: 150px">{{ i.alternativeDescription }}</span>
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="'工具数量'" prop="toolQty" :rules="RoutingToolRules.toolQty">
-          <el-input class="inlineNumber numInput" v-model="routingToolData.toolQty" type="number" style="width: 120px"></el-input>
-        </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="routingToolData" :rules="RoutingToolRules" style="margin-left: 5px">
         <el-form-item prop="operationNo" :rules="RoutingToolRules.operationNo">
@@ -507,8 +504,11 @@
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="routingToolData" style="margin-left: 5px">
+        <el-form-item :label="'工具数量'" prop="toolQty" :rules="RoutingToolRules.toolQty">
+          <el-input class="inlineNumber numInput" v-model="routingToolData.toolQty" type="number" style="width: 120px"></el-input>
+        </el-form-item>
         <el-form-item :label="'备注'">
-          <el-input v-model="routingToolData.remark" style="width: 462px"></el-input>
+          <el-input v-model="routingToolData.remark" style="width: 340px;margin-left: -10px"></el-input>
         </el-form-item>
       </el-form>
       <el-footer style="height:35px;margin-top:25px;text-align:center">
@@ -2448,6 +2448,7 @@ export default {
         createBy: this.$store.state.user.name,
         officialFlag: 'N'
       }
+      this.detailTable = 'routing_detail'
       this.detailDataList = []
       this.subDetailList = []
       this.headerSaveFlag = true
@@ -2482,6 +2483,7 @@ export default {
           this.detailDataList = data.rows.detailList
           this.subDetailList = data.rows.componentList
           this.detailData = data.rows.detailData
+          this.detailTable = 'routing_detail'
           this.modalDisableFlag = true
           this.modalFlag = true
         } else {
@@ -2625,8 +2627,8 @@ export default {
         efficiencyFactor: 100,
         machRunFactor: '',
         machSetupTime: '',
-        runTimeCode: '',
-        laborRunFactor: 100,
+        runTimeCode: 'A',
+        laborRunFactor: '',
         laborSetupTime: '',
         crewSize: 1,
         setupCrewSize: 1,
@@ -3990,6 +3992,11 @@ export default {
       this.componentData.laborSetupTime = this.componentData.machSetupTime
     },
 
+    // 机器单位产出改变
+    changeMachRunFactor () {
+      this.componentData.laborRunFactor = this.componentData.machRunFactor
+    },
+
     // ======== 导出相关方法 ========
     /**
      * 导出excel
diff --git a/src/views/modules/project/projectInfo/com_project_info_part.vue b/src/views/modules/project/projectInfo/com_project_info_part.vue
index 5823f1d..9675395 100644
--- a/src/views/modules/project/projectInfo/com_project_info_part.vue
+++ b/src/views/modules/project/projectInfo/com_project_info_part.vue
@@ -119,7 +119,7 @@
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
               <el-form-item prop="umName" :rules="rules.umName">
-                <span style="cursor: pointer" slot="label" @click="getBaseList(1007)"><a herf="#">库存计量单位 / Inventory UoM</a></span>
+                <span style="cursor: pointer" slot="label" @click="getBaseList(1007)"><a herf="#">计量单位 / Inventory UoM</a></span>
                 <el-input v-model="modalData.umId" style="width: 128px"></el-input>
                 <el-input v-model="modalData.umName" disabled style="width: 330px"></el-input>
               </el-form-item>
@@ -837,23 +837,7 @@
             columnProp: "partTypeDesc",
             headerAlign: "center",
             align: "left",
-            columnLabel: "物料分类",
-            columnHidden: false,
-            columnImage: false,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 101002001,
-            serialNumber: '101002001Table4CodeNo',
-            tableId: "101002001Table4",
-            tableName: "项目物料",
-            columnProp: "codeNo",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "属性模板",
+            columnLabel: "产品大类",
             columnHidden: false,
             columnImage: false,
             status: true,
@@ -869,7 +853,7 @@
             columnProp: "codeDesc",
             headerAlign: "center",
             align: "left",
-            columnLabel: "属性模板名称",
+            columnLabel: "属性模板",
             columnHidden: false,
             columnImage: false,
             status: true,
@@ -1951,7 +1935,7 @@
           return
         }
         if (this.modalData.umId === '' || this.modalData.umId == null) {
-          this.$message.warning('请选择库存计量单位！')
+          this.$message.warning('请选择计量单位！')
           return
         }
         if (this.modalData.codeNo === '' || this.modalData.codeNo == null) {
diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue
index 4db3164..e55c5a1 100644
--- a/src/views/modules/project/projectInfo/projectInfo.vue
+++ b/src/views/modules/project/projectInfo/projectInfo.vue
@@ -464,7 +464,7 @@
           </el-table>
         </el-main>
         <el-main style="width: 10px;padding: 1px">
-          <div style="margin-top: 200px;margin-left: 18px">
+          <div style="margin-top: 150px;margin-left: 18px">
             <el-button type="primary" @click="addContact">添加>></el-button>
           </div>
           <div style="margin-top: 15px;margin-left: 18px">
diff --git a/src/views/modules/project/projectPart/searchProjectPart.vue b/src/views/modules/project/projectPart/searchProjectPart.vue
index d03b3f5..73d7555 100644
--- a/src/views/modules/project/projectPart/searchProjectPart.vue
+++ b/src/views/modules/project/projectPart/searchProjectPart.vue
@@ -228,23 +228,6 @@
               status: true,
               fixed: '',
               columnWidth: 100
-            },{
-              userId: this.$store.state.user.name,
-              functionId: 101002002,
-              serialNumber: '101002002Table1PartType',
-              tableId: "101002002Table1",
-              tableName: "项目物料",
-              columnProp: "partType",
-              headerAlign: "center",
-              align: "center",
-              columnLabel: "物料分类",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: '',
-              columnWidth: 60
             },{
               userId: this.$store.state.user.name,
               functionId: 101002002,
@@ -271,7 +254,7 @@
               columnProp: "partTypeDesc",
               headerAlign: "center",
               align: "left",
-              columnLabel: "物料分类名称",
+              columnLabel: "产品大类",
               columnHidden: false,
               columnImage: false,
               columnSortable: false,
@@ -296,23 +279,6 @@
               status: true,
               fixed: '',
               columnWidth: 120
-            },{
-              userId: this.$store.state.user.name,
-              functionId: 101002002,
-              serialNumber: '101002002Table1CodeNo',
-              tableId: "101002002Table1",
-              tableName: "项目物料",
-              columnProp: "codeNo",
-              headerAlign: "center",
-              align: "center",
-              columnLabel: "属性模板",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: '',
-              columnWidth: 80
             },{
               userId: this.$store.state.user.name,
               functionId: 101002002,
@@ -322,7 +288,7 @@
               columnProp: "codeDesc",
               headerAlign: "center",
               align: "left",
-              columnLabel: "属性模板名称",
+              columnLabel: "属性模板",
               columnHidden: false,
               columnImage: false,
               columnSortable: false,