From 6517d56da5578d37018ca3b7e25cb7135eccc2d9 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 14 Jan 2022 11:17:58 +0800
Subject: [PATCH 1/4] 20220111

---
 .../purchasingManagement/beginMaterialSlittedSet.vue      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
index e8a48bd..d12b57c 100644
--- a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
+++ b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
@@ -802,7 +802,12 @@
         this.sum2 += newDate.allRollQty;
       },
       saveCRoll() {
-
+        if(this.dataForm.checked==true){
+          this.$alert('打印机连接失败！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
         let inData = {
           site: this.dataForm.site,
           partNo: this.dataForm.partNo
@@ -812,7 +817,6 @@
             this.dataForm.partDescription=data.rows[0].partDescription;
             //this.dataForm = JSON.parse(JSON.stringify(this.dataForm));
             let inData2={
-
               site : this.dataForm.site,
               supplierID : this.dataForm.supplierID
             }

From d6c4eec39169e506e403da5ebe4a43c0d44514b1 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 14 Jan 2022 18:23:05 +0800
Subject: [PATCH 2/4] 20220111

---
 src/api/base/site.js                          |   5 +
 .../modules/base/maintainProductRouting.vue   | 442 ++++++++++++++++--
 2 files changed, 414 insertions(+), 33 deletions(-)

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() {
 

From 03ff469d64bc5b5899e9bfe80d4333a614d3a203 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Sat, 15 Jan 2022 18:06:34 +0800
Subject: [PATCH 3/4] 20220111

---
 src/api/base/site.js                          |   2 +
 src/views/modules/base/companyInformation.vue |   2 +-
 .../modules/base/maintainProductRouting.vue   | 179 ++++++++++++++++++
 3 files changed, 182 insertions(+), 1 deletion(-)

diff --git a/src/api/base/site.js b/src/api/base/site.js
index 39b36cc..0429fe1 100644
--- a/src/api/base/site.js
+++ b/src/api/base/site.js
@@ -105,3 +105,5 @@ export const deleteCompanyInformation = data => createAPI(`/base/deleteCompanyIn
 export const searchRoutingWithPartNo= data => createAPI(`/base/searchRoutingWithPartNo`,'post',data)
 //工艺路线明细
 export const searchRoutingDetailData= data => createAPI(`/base/searchRoutingDetailData`,'post',data)
+//保存工艺路线
+export const saveRoutingDetailData= data => createAPI(`/base/saveRoutingDetailData`,'post',data)
diff --git a/src/views/modules/base/companyInformation.vue b/src/views/modules/base/companyInformation.vue
index dc1e498..3ef4392 100644
--- a/src/views/modules/base/companyInformation.vue
+++ b/src/views/modules/base/companyInformation.vue
@@ -347,7 +347,6 @@
         })
       },
       saveData(){
-        saveCompanyInformation(this.modelData).then(({data}) => {
           if(this.modelData.companyID==''||this.modelData.companyID==null){
             this.$alert("请输入会计单位编号！",'错误',{
               confirmButtonText:'确定'
@@ -381,6 +380,7 @@
             })
             return false;
           }
+        saveCompanyInformation(this.modelData).then(({data}) => {
           if (data && data.code == 200) {
             this.modelFlag = false
             this.getData();
diff --git a/src/views/modules/base/maintainProductRouting.vue b/src/views/modules/base/maintainProductRouting.vue
index ab3ac8a..d37bda3 100644
--- a/src/views/modules/base/maintainProductRouting.vue
+++ b/src/views/modules/base/maintainProductRouting.vue
@@ -42,6 +42,9 @@
     <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="addRoutingDetail()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'新增'}}</el-button>
+          <el-button @click="editRoutingDetail()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'修改'}}</el-button>
+          <el-button @click="deleteRoutingDetail()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'删除'}}</el-button>
           <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>
@@ -109,6 +112,59 @@
         <el-button type="primary" @click="modelFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
+    <el-dialog title="维护工艺路线明细" :close-on-click-modal="false" v-drag :visible.sync="detailmodelFlag" width="620px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
+        <el-form-item :label="'工序号：'">
+          <el-input v-model="detailData.itemNo" :disabled="detailmodelInputFlag"  style="width: 130px;text-align: right" type="number"></el-input>
+        </el-form-item>
+        <el-form-item :label="'工序名称：'">
+          <el-input v-model="detailData.operationDesc" style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'加工中心编码：'">
+          <el-input v-model="detailData.workCenterNo" style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'准备时间：'">
+          <el-input v-model="detailData.machSetupTime" style="width: 130px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
+        <el-form-item :label="'单位产出量：'">
+          <el-input v-model="detailData.machRunFactor" type="number" style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'产出单位：'">
+          <el-select filterable v-model="detailData.factorUnit" style="width: 130px">
+            <el-option label="" value=""></el-option>
+            <el-option label="单位/小时" value="单位/小时"></el-option>
+            <el-option label="小时" value="小时"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="'计价单价：'">
+          <el-input v-model="detailData.jjgzUnitPrice" type="number" style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'单位：'">
+          <el-select filterable v-model="detailData.jjgzUnitFactor" style="width: 130px">
+            <el-option label="" value=""></el-option>
+            <el-option label="小时" value="小时"></el-option>
+            <el-option label="件" value="件"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
+        <el-form-item :label="'效率：'">
+          <el-input v-model="detailData.efficiency" type="number" style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'操作工人数：'">
+          <el-input v-model="detailData.crewsize" type="number" style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'备注：'">
+          <el-input v-model="detailData.remark" style="width: 130px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer  style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveRoutingDetailData()">保存</el-button>
+        <el-button type="primary" @click="detailmodelFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
   </div>
 </template>
 
@@ -116,6 +172,7 @@
   import {
     searchRoutingWithPartNo,
     searchRoutingDetailData,
+    saveRoutingDetailData,
   }from "@/api/base/site.js"
     export default {
       name: "maintainProductRouting",
@@ -140,6 +197,8 @@
           },
           activeName:'first',
           modelFlag:false,
+          detailmodelFlag:false,
+          detailmodelInputFlag:false,
           dataList:[],
           dataList2:[],
           columnList:[
@@ -562,6 +621,24 @@
 
 
           ],
+          detailData:{
+            itemNo:'',
+            operationDesc:'',
+            workCenterNo:'',
+            machSetupTime:'',
+            machRunFactor:'',
+            factorUnit:'',
+            jjgzUnitPrice:'',
+            jjgzUnitFactor:'',
+            efficiency:'',
+            crewsize:'',
+            remark:'',
+            site:'',
+            partNo:'',
+            revNo:'',
+            add:'',
+            user:'',
+          }
         }
       },
       mounted() {
@@ -570,6 +647,80 @@
         })
       },
       methods: {
+        addRoutingDetail(){
+          if(this.mainData.partNo==null||this.mainData.partNo==''){
+            this.$alert("请选择物料号！", '错误', {
+              confirmButtonText: '确定'
+            })
+              return false;
+          }
+          let size=this.dataList2.length;
+          this. detailData={
+            itemNo:this.dataList2[Number(size-1)].itemNo+10,
+            operationDesc:'',
+            workCenterNo:'',
+            machSetupTime:'',
+            machRunFactor:0,
+            factorUnit:'',
+            jjgzUnitPrice:'',
+            jjgzUnitFactor:'',
+            efficiency:'',
+            crewsize:'',
+            remark:'',
+            add:0,
+            partNo:this.mainData.partNo,
+            revNo:this.mainData.revNo,
+            site:this.mainData.site,
+            user:this.$store.state.user.name,
+          }
+          this.detailmodelInputFlag=false;
+          this.detailmodelFlag=true;
+
+        },
+         saveRoutingDetailData(){
+          if(this.detailData.itemNo==''||this.detailData.itemNo==null){
+            this.$alert("请输入工序号！",'错误',{
+              confirmButtonText:'确定'
+            })
+            return false;
+          }
+          if(this.detailData.operationDesc==''||this.detailData.operationDesc==null){
+            this.$alert("请输入工序名称！",'错误',{
+              confirmButtonText:'确定'
+            })
+            return false;
+          }
+          if(this.detailData.workCenterNo==''||this.detailData.workCenterNo==null){
+            this.$alert("请输入加工中心编码！",'错误',{
+              confirmButtonText:'确定'
+            })
+            return false;
+          }
+          saveRoutingDetailData(this.detailData).then(({data}) => {
+            if (data && data.code == 200) {
+              this.detailmodelFlag = false
+              let data1={
+                site: this.mainData.site,
+                partNo:this.mainData.partNo,
+                revNo:this.mainData.revNo,
+              }
+              searchRoutingDetailData(data1).then(({data}) => {
+                this.dataList2=data.rows;
+              })
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        },
         tableHanddle(row) {
           let data={
             partNo:row.partNo,
@@ -608,6 +759,34 @@
           this.searchRoutingWithPartNo();
           this.modelFlag = true;
         },
+        editRoutingDetail(){
+          if(this.currentRow==null){
+            this.$alert("请选择工艺路线工序！", '错误', {
+              confirmButtonText: '确定'
+            })
+            return false;
+          }
+          this. detailData={
+            itemNo:this.currentRow.itemNo,
+            operationDesc:this.currentRow.operationDesc,
+            workCenterNo:this.currentRow.workCenterNo,
+            machSetupTime:this.currentRow.machSetupTime,
+            machRunFactor:this.currentRow.machRunFactor,
+            factorUnit:this.currentRow.factorUnit,
+            jjgzUnitPrice:this.currentRow.jjgzUnitPrice,
+            jjgzUnitFactor:this.currentRow.jjgzUnitFactor,
+            efficiency:this.currentRow.efficiency,
+            crewsize:this.currentRow.crewsize,
+            remark:this.currentRow.remark,
+            add:1,
+            partNo:this.mainData.partNo,
+            revNo:this.mainData.revNo,
+            site:this.mainData.site,
+            user:this.$store.state.user.name,
+          }
+          this.detailmodelInputFlag=true;
+          this.detailmodelFlag=true;
+        },
         searchRoutingWithPartNo() {
           let data={
             partNo:this.searchPartNo

From 1987fb3ed3adca418ee810662277dec1d7fe8ba0 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 17 Jan 2022 18:19:10 +0800
Subject: [PATCH 4/4] 20220111

---
 src/api/base/site.js                          |  12 +
 .../modules/base/maintainProductRouting.vue   | 706 +++++++++++++++++-
 2 files changed, 710 insertions(+), 8 deletions(-)

diff --git a/src/api/base/site.js b/src/api/base/site.js
index 0429fe1..974d0ab 100644
--- a/src/api/base/site.js
+++ b/src/api/base/site.js
@@ -107,3 +107,15 @@ export const searchRoutingWithPartNo= data => createAPI(`/base/searchRoutingWith
 export const searchRoutingDetailData= data => createAPI(`/base/searchRoutingDetailData`,'post',data)
 //保存工艺路线
 export const saveRoutingDetailData= data => createAPI(`/base/saveRoutingDetailData`,'post',data)
+//删除工艺路线
+export const deleteRoutingDetail= data => createAPI(`/base/deleteRoutingDetail`,'post',data)
+//工艺路线工具查询
+export const searchRoutingToolData= data => createAPI(`/base/searchRoutingToolData`,'post',data)
+//工艺路线可用机台
+export const searchAllResource= data => createAPI(`/base/searchAllResource`,'post',data)
+//工艺路线已选机台
+export const searchUsedResource= data => createAPI(`/base/searchUsedResource`,'post',data)
+//添加机台
+export const addRoutingResource= data => createAPI(`/base/addRoutingResource`,'post',data)
+//删除机台
+export const deleteRoutingResource= data => createAPI(`/base/deleteRoutingResource`,'post',data)
diff --git a/src/views/modules/base/maintainProductRouting.vue b/src/views/modules/base/maintainProductRouting.vue
index d37bda3..5bae528 100644
--- a/src/views/modules/base/maintainProductRouting.vue
+++ b/src/views/modules/base/maintainProductRouting.vue
@@ -46,7 +46,7 @@
           <el-button @click="editRoutingDetail()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'修改'}}</el-button>
           <el-button @click="deleteRoutingDetail()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'删除'}}</el-button>
           <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-button @click="getResourceModel()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'可用机台'}}</el-button>
         </el-form>
         <el-table
           :height="height"
@@ -75,6 +75,36 @@
         </el-table>
       </el-tab-pane>
       <el-tab-pane :label="'工具清单'" name="second">
+        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+          <el-button @click="addRoutingTool()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'新增'}}</el-button>
+          <el-button @click="editRoutingTool()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'修改'}}</el-button>
+          <el-button @click="deleteRoutingTool()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'删除'}}</el-button>
+        </el-form>
+        <el-table
+          :height="height"
+          :data="dataList3"
+          border
+          @row-click="clickData2"
+          highlight-current-row
+          v-loading="dataListLoading"
+          style="width: 100%;">
+          <el-table-column
+            v-for="(item,index) in columnList3" :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-tabs>
     <el-dialog title="数据表" :close-on-click-modal="false" v-drag :visible.sync="modelFlag" width="680px" >
@@ -120,7 +150,8 @@
         <el-form-item :label="'工序名称：'">
           <el-input v-model="detailData.operationDesc" style="width: 130px"></el-input>
         </el-form-item>
-        <el-form-item :label="'加工中心编码：'">
+        <el-form-item >
+          <span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码：</a></span>
           <el-input v-model="detailData.workCenterNo" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'准备时间：'">
@@ -165,6 +196,111 @@
         <el-button type="primary" @click="detailmodelFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
+    <el-dialog title="维护工艺路线工具" :close-on-click-modal="false" v-drag :visible.sync="ToolmodelFlag" width="500px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
+        <el-form-item :label="'工序号：'">
+          <el-input v-model="toolData.itemNo" :disabled="detailmodelInputFlag"  style="width: 130px;text-align: right" type="number"></el-input>
+        </el-form-item>
+        <el-form-item :label="'工序名称：'">
+          <el-input v-model="toolData.itemNo" :disabled="detailmodelInputFlag"  style="width: 130px;text-align: right" type="number"></el-input>
+        </el-form-item>
+        <el-form-item :label="'工具编号：'">
+          <el-input v-model="toolData.itemNo" :disabled="detailmodelInputFlag"  style="width: 130px;text-align: right" type="number"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
+        <el-form-item :label="'工具名称：'">
+          <el-input v-model="toolData.itemNo" :disabled="detailmodelInputFlag"  style="width: 130px;text-align: right" type="number"></el-input>
+        </el-form-item>
+        <el-form-item :label="'规格型号：'">
+          <el-input v-model="toolData.itemNo" :disabled="detailmodelInputFlag"  style="width: 270px;text-align: right" type="number"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
+        <el-form-item :label="'工具数量：'">
+          <el-input v-model="toolData.itemNo" :disabled="detailmodelInputFlag"  style="width: 130px;text-align: right" type="number"></el-input>
+        </el-form-item>
+        <el-form-item :label="'备注：'">
+          <el-input v-model="toolData.itemNo" :disabled="detailmodelInputFlag"  style="width: 270px;text-align: right" type="number"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer  style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveToolData()">保存</el-button>
+        <el-button type="primary" @click="ToolmodelFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+    <el-dialog title="可用机台" :close-on-click-modal="false" v-drag :visible.sync="routingModelFlag" width="800px">
+      <el-container>
+        <el-main style="width: 300px">
+          <span  style="" >可选机台：</span>
+          <el-table
+          height="300px"
+          :data="resourceList1"
+          border
+          @row-click="clickData3"
+          highlight-current-row
+          v-loading="dataListLoading"
+          style="width: 100%">
+          <el-table-column
+            v-for="(item,index) in columnList4" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed"
+            :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                 style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+        </el-table>
+        </el-main>
+        <el-main style="width: 100px">
+          <div style="margin-top: 100px">
+            <el-button type="primary" @click="addResource()">添加机台>></el-button>
+          </div>
+          <div style="margin-top: 20px">
+            <el-button type="primary" @click="deleteResource()">删除机台<<</el-button>
+          </div>
+        </el-main>
+        <el-main style="width: 300px">
+          <span  style="" >已选机台：</span>
+          <el-table
+          height="300px"
+          :data="resourceList2"
+          border
+          @row-click="clickData4"
+          highlight-current-row
+          v-loading="dataListLoading"
+          style="width: 100%">
+          <el-table-column
+            v-for="(item,index) in columnList5" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed"
+            :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                 style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+        </el-table>
+        </el-main>
+      </el-container>
+<!--      <el-footer  style="height:40px;margin-top: 20px;text-align:center">-->
+<!--        <el-button type="primary" @click="routingModelFlag = false">关闭</el-button>-->
+<!--      </el-footer>-->
+    </el-dialog>
+    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
   </div>
 </template>
 
@@ -173,11 +309,28 @@
     searchRoutingWithPartNo,
     searchRoutingDetailData,
     saveRoutingDetailData,
+    deleteRoutingDetail,
+    searchRoutingToolData,
+    searchUsedResource,
+    searchAllResource,
+    addRoutingResource,
+    deleteRoutingResource,
   }from "@/api/base/site.js"
+  import Chooselist from '@/views/modules/common/Chooselist'
     export default {
       name: "maintainProductRouting",
+      components: {
+        Chooselist
+      },
       data () {
         return {
+          resourceList1:[],
+          resourceList2:[],
+          currentRow4:null,
+          currentRow3:null,
+          currentRow2:null,
+          currentRow:null,
+          tagNo:'',
           dataListLoading: false,
           searchPartNo:'',
           height:200,
@@ -197,10 +350,24 @@
           },
           activeName:'first',
           modelFlag:false,
+          ToolmodelFlag:false,
           detailmodelFlag:false,
           detailmodelInputFlag:false,
           dataList:[],
           dataList2:[],
+          dataList3:[],
+          toolData:{
+            site:'',
+            partNo:'',
+            revNo:'',
+            itemNo:'',
+            site:'',
+            site:'',
+            site:'',
+            site:'',
+            site:'',
+            site:'',
+          },
           columnList:[
             {
               userId: this.$store.state.user.name,
@@ -621,6 +788,337 @@
 
 
           ],
+          columnList3:[
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table3RevNo',
+              tableId: "6040Table3",
+              tableName: "维护工艺路线工具表",
+              columnProp: "revNo",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "版本号",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 80
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table3ItemNo',
+              tableId: "6040Table3",
+              tableName: "维护工艺路线工具表",
+              columnProp: "itemNo",
+              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: '6040Table3ToolID',
+              tableId: "6040Table3",
+              tableName: "维护工艺路线工具表",
+              columnProp: "toolID",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "工具编号",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 150
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table3ToolDescription',
+              tableId: "6040Table3",
+              tableName: "维护工艺路线工具表",
+              columnProp: "toolDescription",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "工具名称",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 200
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table3Spec',
+              tableId: "6040Table3",
+              tableName: "维护工艺路线工具表",
+              columnProp: "spec",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "规格型号",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 150
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table3ToolQty',
+              tableId: "6040Table3",
+              tableName: "维护工艺路线工具表",
+              columnProp: "toolQty",
+              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: '6040Table3Active',
+              tableId: "6040Table3",
+              tableName: "维护工艺路线工具表",
+              columnProp: "active",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "在用",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 60
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table3FamilyID',
+              tableId: "6040Table3",
+              tableName: "维护工艺路线工具表",
+              columnProp: "familyID",
+              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: '6040Table3FamilyName',
+              tableId: "6040Table3",
+              tableName: "维护工艺路线工具表",
+              columnProp: "familyName",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "工具分类名称",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 150
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table3Remark',
+              tableId: "6040Table3",
+              tableName: "维护工艺路线工具表",
+              columnProp: "remark",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "备注",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 200
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table3CreateDate',
+              tableId: "6040Table3",
+              tableName: "维护工艺路线工具表",
+              columnProp: "createDate",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "录入日期",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 160
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table3CreatedBy',
+              tableId: "6040Table3",
+              tableName: "维护工艺路线工具表",
+              columnProp: "createdBy",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "录入人",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 100
+            },
+          ],
+          columnList4:[
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table4ResourceID',
+              tableId: "6040Table4",
+              tableName: "维护工艺路线可用机台表",
+              columnProp: "resourceID",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "机台编码",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 70
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table4ResourceDesc',
+              tableId: "6040Table4",
+              tableName: "维护工艺路线可用机台表",
+              columnProp: "resourceDesc",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "机台名称",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 160
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table4Active',
+              tableId: "6040Table4",
+              tableName: "维护工艺路线可用机台表",
+              columnProp: "active",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "在用",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 50
+            },
+          ],
+          columnList5:[
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table5ResourceID',
+              tableId: "6040Table5",
+              tableName: "维护工艺路线已选机台表",
+              columnProp: "resourceID",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "机台编码",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 70
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table5ResourceDesc',
+              tableId: "6040Table5",
+              tableName: "维护工艺路线已选机台表",
+              columnProp: "resourceDesc",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "机台名称",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 160
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040Table5Active',
+              tableId: "6040Table5",
+              tableName: "维护工艺路线已选机台表",
+              columnProp: "active",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "在用",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 50
+            },
+          ],
+          routingModelFlag:false,
           detailData:{
             itemNo:'',
             operationDesc:'',
@@ -647,6 +1145,28 @@
         })
       },
       methods: {
+        getBaseData(val){
+          if (this.tagNo === 24){
+            this.detailData.workCenterNo = val.WorkCenterNo
+          }
+          if (this.tagNo === 91){
+            this.modelData3.calendarID = val.CalendarID
+          }
+        },
+        // 获取基础数据列表
+        getBaseList(val){
+          this.tagNo = val
+          this.$nextTick(() => {
+            let strVal = "";
+            if (val === 24){
+              strVal = this.detailData.workCenterNo
+            }
+            if (val === 91){
+              strVal = this.modelData3.calendarID
+            }
+            this.$refs.baseList.init(val,strVal)
+          })
+        },
         addRoutingDetail(){
           if(this.mainData.partNo==null||this.mainData.partNo==''){
             this.$alert("请选择物料号！", '错误', {
@@ -655,17 +1175,17 @@
               return false;
           }
           let size=this.dataList2.length;
-          this. detailData={
+          this.detailData={
             itemNo:this.dataList2[Number(size-1)].itemNo+10,
             operationDesc:'',
             workCenterNo:'',
-            machSetupTime:'',
+            machSetupTime:0,
             machRunFactor:0,
-            factorUnit:'',
-            jjgzUnitPrice:'',
+            factorUnit:null,
+            jjgzUnitPrice:0,
             jjgzUnitFactor:'',
-            efficiency:'',
-            crewsize:'',
+            efficiency:0,
+            crewsize:0,
             remark:'',
             add:0,
             partNo:this.mainData.partNo,
@@ -690,13 +1210,38 @@
             })
             return false;
           }
+           if(this.detailData.machSetupTime===''||this.detailData.machSetupTime==null){
+             this.$alert("请输入准备时间！",'错误',{
+               confirmButtonText:'确定'
+             })
+             return false;
+           }
           if(this.detailData.workCenterNo==''||this.detailData.workCenterNo==null){
             this.$alert("请输入加工中心编码！",'错误',{
               confirmButtonText:'确定'
             })
             return false;
           }
+           if(this.detailData.jjgzUnitPrice===''||this.detailData.jjgzUnitPrice==null){
+             this.$alert("请输入计价单价！",'错误',{
+               confirmButtonText:'确定'
+             })
+             return false;
+           }
+           if(this.detailData.crewsize===''||this.detailData.crewsize==null){
+             this.$alert("请输入操作员人数！",'错误',{
+               confirmButtonText:'确定'
+             })
+             return false;
+           }
+           if(this.detailData.efficiency===''||this.detailData.efficiency==null){
+             this.$alert("请输入效率！",'错误',{
+               confirmButtonText:'确定'
+             })
+             return false;
+           }
           saveRoutingDetailData(this.detailData).then(({data}) => {
+            this.currentRow=null;
             if (data && data.code == 200) {
               this.detailmodelFlag = false
               let data1={
@@ -721,6 +1266,45 @@
             }
           })
         },
+        deleteRoutingDetail(){
+          if(this.currentRow==null){
+            this.$alert("请选择工艺路线工序！", '错误', {
+              confirmButtonText: '确定'
+            })
+            return false;
+          }
+          this.$confirm(`是否删除此工艺路线工序?`, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+
+          }).then(() => {
+            deleteRoutingDetail(this.currentRow).then(({data}) => {
+              this.currentRow=null;
+              if (data && data.code == 200) {
+                let data1={
+                  site: this.mainData.site,
+                  partNo:this.mainData.partNo,
+                  revNo:this.mainData.revNo,
+                }
+                searchRoutingDetailData(data1).then(({data}) => {
+                  this.dataList2=data.rows;
+                })
+                this.$message({
+                  message: '删除成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {
+                  }
+                })
+              } else {
+                this.$alert(data.msg, '错误', {
+                  confirmButtonText: '确定'
+                })
+              }
+            })
+          })
+        },
         tableHanddle(row) {
           let data={
             partNo:row.partNo,
@@ -748,12 +1332,40 @@
               searchRoutingDetailData(data1).then(({data}) => {
                 this.dataList2=data.rows;
               })
+              searchRoutingToolData(data1).then(({data}) => {
+                this.dataList3=data.rows;
+              })
             }
 
           })
           this.modelFlag = false;
 
         },
+        getResourceModel(){
+          if(this.currentRow==null){
+            this.$alert("请选择工艺路线工序！", '错误', {
+              confirmButtonText: '确定'
+            })
+            return false;
+          }
+          let data1={
+            site:this.mainData.site,
+            workCenterNo:this.currentRow.workCenterNo,
+          }
+          searchAllResource(data1).then(({data}) => {
+            this.resourceList1 = data.rows
+          })
+          let data2={
+            site:this.mainData.site,
+            partNo:this.mainData.partNo,
+            revNo:this.currentRow.revNo,
+            itemNo:this.currentRow.itemNo
+          }
+          searchUsedResource(data2).then(({data}) => {
+            this.resourceList2 = data.rows
+          })
+          this.routingModelFlag=true;
+        },
         getSearchModal() {
           this.searchPartNo = '';
           this.searchRoutingWithPartNo();
@@ -798,6 +1410,84 @@
         clickData(row){
           this.currentRow = JSON.parse(JSON.stringify(row));
         },
+        clickData2(row){
+          this.currentRow2 = JSON.parse(JSON.stringify(row));
+        },
+        clickData3(row){
+          this.currentRow3 = JSON.parse(JSON.stringify(row));
+        },
+        clickData4(row){
+          this.currentRow4 = JSON.parse(JSON.stringify(row));
+        },
+        addResource(){
+          if(this.currentRow3==null){
+            this.$alert("请选择可选机台！", '错误', {
+              confirmButtonText: '确定'
+            })
+            return false;
+          }
+          let inData={
+            site: this.mainData.site,
+            partNo:this.mainData.partNo,
+            revNo:this.mainData.revNo,
+            itemNo:this.currentRow.itemNo,
+            resourceID:this.currentRow3.resourceID
+          }
+          addRoutingResource(inData).then(({data}) => {
+
+            if (data && data.code == 200) {
+              let data2={
+                site:this.mainData.site,
+                partNo:this.mainData.partNo,
+                revNo:this.currentRow.revNo,
+                itemNo:this.currentRow.itemNo
+              }
+              searchUsedResource(data2).then(({data}) => {
+                this.resourceList2 = data.rows
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        },
+        addRoutingTool(){
+
+        },
+        deleteResource(){
+          if(this.currentRow4==null){
+            this.$alert("请选择已选机台！", '错误', {
+              confirmButtonText: '确定'
+            })
+            return false;
+          }
+          let inData={
+            site: this.mainData.site,
+            partNo:this.mainData.partNo,
+            revNo:this.mainData.revNo,
+            itemNo:this.currentRow.itemNo,
+            resourceID:this.currentRow4.resourceID
+          }
+          deleteRoutingResource(inData).then(({data}) => {
+            if (data && data.code == 200) {
+              this.currentRow4=null;
+              let data2={
+                site:this.mainData.site,
+                partNo:this.mainData.partNo,
+                revNo:this.currentRow.revNo,
+                itemNo:this.currentRow.itemNo
+              }
+              searchUsedResource(data2).then(({data}) => {
+                this.resourceList2 = data.rows
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        },
         jumpWorkCenter(){
           if(this.currentRow==null){
             this.$alert("请选择工艺路线工序！", '错误', {