diff --git a/src/api/base/site.js b/src/api/base/site.js
index 154a31f..39b36cc 100644
--- a/src/api/base/site.js
+++ b/src/api/base/site.js
@@ -100,3 +100,8 @@ export const saveCompanyInformation = data => createAPI(`/base/saveCompanyInform
 
 // 删除停机原因
 export const deleteCompanyInformation = data => createAPI(`/base/deleteCompanyInformation`,'post',data)
+//------------维护工艺路线----------------
+//维护工艺路线
+export const searchRoutingWithPartNo= data => createAPI(`/base/searchRoutingWithPartNo`,'post',data)
+//工艺路线明细
+export const searchRoutingDetailData= data => createAPI(`/base/searchRoutingDetailData`,'post',data)
diff --git a/src/views/modules/base/maintainProductRouting.vue b/src/views/modules/base/maintainProductRouting.vue
index 735c31c..ab3ac8a 100644
--- a/src/views/modules/base/maintainProductRouting.vue
+++ b/src/views/modules/base/maintainProductRouting.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
-      <el-form-item :label="'物料编码：'">
+      <el-form-item >
+        <span slot="label" style="" @click="getSearchModal()"><a herf="#">物料编码：</a></span>
         <el-input v-model="mainData.partNo" readonly   style="width: 130px"></el-input>
       </el-form-item>
       <el-form-item :label="'物料名称/规格型号：'">
@@ -38,10 +39,50 @@
         <el-checkbox style="margin-left: 80px" disabled v-model="mainData.repairFlag">修复版本</el-checkbox>
       </el-form-item>
     </el-form>
-
+    <el-tabs v-model="activeName" >
+      <el-tab-pane :label="'明细'" name="first">
+        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+          <el-button @click="jumpWorkCenter()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'加工中心'}}</el-button>
+          <el-button @click="getPartDetail()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'可用机台'}}</el-button>
+        </el-form>
+        <el-table
+          :height="height"
+          :data="dataList2"
+          border
+          @row-click="clickData"
+          highlight-current-row
+          v-loading="dataListLoading"
+          style="width: 100%;">
+          <el-table-column
+            v-for="(item,index) in columnList2" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed"
+            :width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                 style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane :label="'工具清单'" name="second">
+      </el-tab-pane>
+    </el-tabs>
     <el-dialog title="数据表" :close-on-click-modal="false" v-drag :visible.sync="modelFlag" width="680px" >
+      <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+        <el-form-item :label="'物料编码：'">
+          <el-input v-model="searchPartNo" style="width: 130px"></el-input>
+          <el-button @click="searchRoutingWithPartNo()" type="primary">查询</el-button>
+        </el-form-item>
+      </el-form>
       <el-table
-        height="400"
+        height="300"
         :data="dataList"
         border
         @row-dblclick="tableHanddle"
@@ -55,7 +96,7 @@
           :show-overflow-tooltip="item.showOverflowTooltip"
           :align="item.align"
           :fixed="item.fixed"
-          :width="item.columnWidth"
+          :min-width="item.columnWidth"
           :label="item.columnLabel">
           <template slot-scope="scope">
             <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
@@ -65,7 +106,7 @@
         </el-table-column>
       </el-table>
       <el-footer  style="height:40px;margin-top: 20px;text-align:center">
-        <el-button type="primary" @click="modelFlag2 = false">关闭</el-button>
+        <el-button type="primary" @click="modelFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
   </div>
@@ -73,13 +114,16 @@
 
 <script>
   import {
-
-  }from "@/api/base.js"
+    searchRoutingWithPartNo,
+    searchRoutingDetailData,
+  }from "@/api/base/site.js"
     export default {
       name: "maintainProductRouting",
       data () {
         return {
           dataListLoading: false,
+          searchPartNo:'',
+          height:200,
           mainData:{
             partNo:'',
             spec:'',
@@ -94,8 +138,10 @@
             defaultflag:'',
             repairFlag:'',
           },
+          activeName:'first',
           modelFlag:false,
           dataList:[],
+          dataList2:[],
           columnList:[
             {
               userId: this.$store.state.user.name,
@@ -113,7 +159,7 @@
               sortLv: 0,
               status: true,
               fixed: false,
-              columnWidth: 120
+              columnWidth: 100
             },
             {
               userId: this.$store.state.user.name,
@@ -136,10 +182,10 @@
             {
               userId: this.$store.state.user.name,
               functionId: 6040,
-              serialNumber: '6040TablePartNo',
+              serialNumber: '6040TableRoutingType',
               tableId: "6040Table",
               tableName: "维护工艺路线数据表",
-              columnProp: "partNo",
+              columnProp: "routingType",
               headerAlign: "center",
               align: "left",
               columnLabel: "工艺路线类型",
@@ -149,90 +195,344 @@
               sortLv: 0,
               status: true,
               fixed: false,
-              columnWidth: 120
+              columnWidth: 80
             },
             {
               userId: this.$store.state.user.name,
               functionId: 6040,
-              serialNumber: '6040TablePartNo',
+              serialNumber: '6040TableRevNo',
               tableId: "6040Table",
               tableName: "维护工艺路线数据表",
-              columnProp: "partNo",
+              columnProp: "revNo",
               headerAlign: "center",
               align: "left",
-              columnLabel: "产品编码",
+              columnLabel: "版本号",
               columnHidden: false,
               columnImage: false,
               columnSortable: false,
               sortLv: 0,
               status: true,
               fixed: false,
-              columnWidth: 120
+              columnWidth: 60
             },
             {
               userId: this.$store.state.user.name,
               functionId: 6040,
-              serialNumber: '6040TablePartNo',
+              serialNumber: '6040TablePhaseInDate',
               tableId: "6040Table",
               tableName: "维护工艺路线数据表",
-              columnProp: "partNo",
+              columnProp: "phaseInDate",
               headerAlign: "center",
               align: "left",
-              columnLabel: "产品编码",
+              columnLabel: "启用日期",
               columnHidden: false,
               columnImage: false,
               columnSortable: false,
               sortLv: 0,
               status: true,
               fixed: false,
-              columnWidth: 120
+              columnWidth: 80
             },
             {
               userId: this.$store.state.user.name,
               functionId: 6040,
-              serialNumber: '6040TablePartNo',
+              serialNumber: '6040TablePhaseOutDate',
               tableId: "6040Table",
               tableName: "维护工艺路线数据表",
-              columnProp: "partNo",
+              columnProp: "phaseOutDate",
               headerAlign: "center",
               align: "left",
-              columnLabel: "产品编码",
+              columnLabel: "停用日期",
               columnHidden: false,
               columnImage: false,
               columnSortable: false,
               sortLv: 0,
               status: true,
               fixed: false,
-              columnWidth: 120
+              columnWidth: 80
             },
             {
               userId: this.$store.state.user.name,
               functionId: 6040,
-              serialNumber: '6040TablePartNo',
+              serialNumber: '6040TableStatus',
               tableId: "6040Table",
               tableName: "维护工艺路线数据表",
-              columnProp: "partNo",
+              columnProp: "status",
               headerAlign: "center",
               align: "left",
-              columnLabel: "产品编码",
+              columnLabel: "状态",
               columnHidden: false,
               columnImage: false,
               columnSortable: false,
               sortLv: 0,
               status: true,
               fixed: false,
-              columnWidth: 120
+              columnWidth: 40
             },
             {
               userId: this.$store.state.user.name,
               functionId: 6040,
-              serialNumber: '6040TablePartNo',
+              serialNumber: '6040TableSite',
               tableId: "6040Table",
               tableName: "维护工艺路线数据表",
-              columnProp: "partNo",
+              columnProp: "site",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "工厂编码",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 60
+            },
+          ],
+          columnList2:[
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table2ItemNo',
+              tableId: "6040Table2",
+              tableName: "维护工艺路线工序表",
+              columnProp: "itemNo",
+              headerAlign: "center",
+              align: "right",
+              columnLabel: "工序号",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 60
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table2OperationDesc',
+              tableId: "6040Table2",
+              tableName: "维护工艺路线工序表",
+              columnProp: "operationDesc",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "工序名称",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 300
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table2WorkCenterNo',
+              tableId: "6040Table2",
+              tableName: "维护工艺路线工序表",
+              columnProp: "workCenterNo",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "加工中心编码",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 100
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table2WorkCenterDesc',
+              tableId: "6040Table2",
+              tableName: "维护工艺路线工序表",
+              columnProp: "workCenterDesc",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "加工中心名称",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 100
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table2MachSetupTime',
+              tableId: "6040Table2",
+              tableName: "维护工艺路线工序表",
+              columnProp: "machSetupTime",
+              headerAlign: "center",
+              align: "right",
+              columnLabel: "准备时间(小时)",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 100
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table2MachRunFactor',
+              tableId: "6040Table2",
+              tableName: "维护工艺路线工序表",
+              columnProp: "machRunFactor",
+              headerAlign: "center",
+              align: "right",
+              columnLabel: "单位产出量",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 100
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table2FactorUnit',
+              tableId: "6040Table2",
+              tableName: "维护工艺路线工序表",
+              columnProp: "factorUnit",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "产出单位",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 100
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table2Efficiency',
+              tableId: "6040Table2",
+              tableName: "维护工艺路线工序表",
+              columnProp: "efficiency",
+              headerAlign: "center",
+              align: "right",
+              columnLabel: "效率(%)",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 80
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table2Remark',
+              tableId: "6040Table2",
+              tableName: "维护工艺路线工序表",
+              columnProp: "remark",
               headerAlign: "center",
               align: "left",
-              columnLabel: "产品编码",
+              columnLabel: "备注",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 160
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table2JJGZUnitPrice',
+              tableId: "6040Table2",
+              tableName: "维护工艺路线工序表",
+              columnProp: "jjgzUnitPrice",
+              headerAlign: "center",
+              align: "right",
+              columnLabel: "每件计价",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 100
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table2JJGZUnitFactor',
+              tableId: "6040Table2",
+              tableName: "维护工艺路线工序表",
+              columnProp: "jjgzUnitFactor",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "计价单位",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 100
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table2Crewsize',
+              tableId: "6040Table2",
+              tableName: "维护工艺路线工序表",
+              columnProp: "crewsize",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "操作工人数",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 100
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table2WorkCenterType',
+              tableId: "6040Table2",
+              tableName: "维护工艺路线工序表",
+              columnProp: "workCenterType",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "加工中心类型",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 100
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table2WXPartNo',
+              tableId: "6040Table2",
+              tableName: "维护工艺路线工序表",
+              columnProp: "wxPartNo",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "费用结算料号",
               columnHidden: false,
               columnImage: false,
               columnSortable: false,
@@ -241,19 +541,95 @@
               fixed: false,
               columnWidth: 120
             },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table2WXSpec',
+              tableId: "6040Table2",
+              tableName: "维护工艺路线工序表",
+              columnProp: "wxSpec",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "费用结算物料名称/规格",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 250
+            },
+
 
           ],
         }
       },
       mounted() {
-        this.$nextTick(()=>{
-          this.height = window.innerHeight - 150;
+        this.$nextTick(() => {
+          this.height = window.innerHeight - 310;
         })
       },
       methods: {
-        tableHanddle(row){
+        tableHanddle(row) {
+          let data={
+            partNo:row.partNo,
+            site:row.site,
+            revNo:row.revNo,
+          }
+          searchRoutingWithPartNo(data).then(({data}) => {
+            if(data.rows.length>0){
+              if(data.rows[0].repairFlag=='Y'){
+                data.rows[0].repairFlag=true;
+              }else {
+                data.rows[0].repairFlag=false;
+              }
+              if(data.rows[0].defaultflag=='Y'){
+                data.rows[0].defaultflag=true;
+              }else {
+                data.rows[0].defaultflag=false;
+              }
+              this.mainData = data.rows[0]
+              let data1={
+                site: data.rows[0].site,
+                partNo:data.rows[0].partNo,
+                revNo:data.rows[0].revNo,
+              }
+              searchRoutingDetailData(data1).then(({data}) => {
+                this.dataList2=data.rows;
+              })
+            }
+
+          })
+          this.modelFlag = false;
 
         },
+        getSearchModal() {
+          this.searchPartNo = '';
+          this.searchRoutingWithPartNo();
+          this.modelFlag = true;
+        },
+        searchRoutingWithPartNo() {
+          let data={
+            partNo:this.searchPartNo
+          }
+          searchRoutingWithPartNo(data).then(({data}) => {
+            this.dataList = data.rows
+          })
+        },
+        clickData(row){
+          this.currentRow = JSON.parse(JSON.stringify(row));
+        },
+        jumpWorkCenter(){
+          if(this.currentRow==null){
+            this.$alert("请选择工艺路线工序！", '错误', {
+              confirmButtonText: '确定'
+            })
+            return false;
+          }
+          let inData={user:this.$store.state.user.name,site:this.currentRow.site,workCenterNo:this.currentRow.workCenterNo};
+          localStorage.setItem('workCenterNo', JSON.stringify(inData))
+          this.$router.replace('base-workCenter')
+        },
       },
       created() {