URL

2019-02-19 09:11:40 +08:00
parent 83516538ca b4dd09e66f
commit ef77a77441
25 changed files with 1029 additions and 294 deletions
--- a/src/api/Inventory/OfflinePartOut.js
+++ b/src/api/Inventory/OfflinePartOut.js
@@ -36,13 +36,14 @@ export function searchTeam(machineNumber) {
  })
 }
 // 初始化物料
-export function searchPart() {
+export function searchPart(data1) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
-      name: '库存管理_离线外购件_出库查询'
+      name: '库存管理_离线外购件_出库查询',
+      param: '离线合同编号=' + data1
    }
  })
 }
--- a/src/api/ManufacturingCenter/ProcessPlanning.js
+++ b/src/api/ManufacturingCenter/ProcessPlanning.js
@@ -1,5 +1,41 @@
 import request from '@/utils/request'

+// 典艺查询<高精原有数据>
+export function searchProcess11(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_原零件工艺查询_MESWORK',
+      param: '零件图号=' + num
+    }
+  })
+}
+// 典艺查询<高精原有数据>
+export function numChange(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_原零件工艺明细查询_MESWORK',
+      param: '典艺流水号=' + num
+    }
+  })
+}
+// 保存主表工艺
+export function selectRequest(num0, num1, num2, num3, request0) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_修改数据_根据工序流水号和工艺计划流水号',
+      param: '工序流水号=' + num0 + '&工艺计划流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0
+    }
+  })
+}
 // 初始化 工艺员A
 export function initCraftmen() {
  return request({
@@ -322,18 +358,7 @@ export function saveApprove(num0, num1, request0, spec, num2, outhelp, num3, num
    }
  })
 }
-// 选择工艺要求
-export function selectRequest(num0, num1, num2, num3, request0) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间生产管理工艺_零件工序_修改数据_根据工序流水号和工艺计划流水号',
-      param: '工序流水号=' + num0 + '&工艺计划流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0
-    }
-  })
-}
+
 // 粘贴
 export function pasteTable(oldNum, newNum) {
  return request({
--- a/src/api/ManufacturingCenter/ProcessingStatusEdit.js
+++ b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
@@ -17,7 +17,7 @@ export function getMachines() {
    method: 'post',
    data: {
      type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
+      name: '车间生产管理工艺_传递后_机床名称_加工进度修改模块查询',
      param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
    }
  })
--- a/src/api/Outsourcing/InterBudgetaryBudgets.js
+++ b/src/api/Outsourcing/InterBudgetaryBudgets.js
@@ -10,14 +10,13 @@ export function machine() {
    }
  })
 }
-export function getToolNum(num) {
+export function getToolNum() {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床',
-      param: '项目流水号=' + num
+      name: '车间生产管理工艺_零件工艺计划_序间外协预算机床查询'
    }
  })
 }
--- a/src/api/Outsourcing/OutsourcingPaymentPlanManagement2.js
+++ b/src/api/Outsourcing/OutsourcingPaymentPlanManagement2.js
@@ -0,0 +1,125 @@
+import request from '@/utils/request'
+
+// 初始化 外协厂商
+export function initOutHelp() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_基础表_外协厂家_查询数据'
+    }
+  })
+}
+// 查询表格数据
+export function searchtable(check, num, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工艺计划_序间外协付款查询',
+      param: '外协厂家流水号_check=' + check + '&外协厂家流水号=' + num,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 查询发票信息
+export function getParts(Number, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_外协发票管理_查询数据',
+      param: '外协厂家流水号=' + Number + '=int',
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 增加
+export function edittype(num1, num2, num3, num4, num5, num6, num7, num8) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_外协发票管理_增加数据',
+      param: '外协厂家流水号=' + num1 + '&发票号=' + num2 + '&开户行=' + num3 + '&开票时间=' + num4 + '&开票金额=' + num5 + '&接收人=' + num6 + '&接收时间=' + num7 + '&备注=' + num8
+    }
+  })
+}
+// 编辑
+export function handlechange(num, num2, num3, num4, num5, num6, num7, num8) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_外协发票管理_编辑数据',
+      param: 'id=' + num + '&发票号=' + num2 + '&开户行=' + num3 + '&开票时间=' + num4 + '&开票金额=' + num5 + '&接收人=' + num6 + '&接收时间=' + num7 + '&备注=' + num8
+    }
+  })
+}
+// 删除
+export function handledelete(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_外协发票管理_删除数据',
+      param: 'id=' + num
+    }
+  })
+}
+
+// 查询付款数据
+export function getParts3(num, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工艺计划_序间外协付款明细查询',
+      param: '外协厂家流水号=' + num,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 外协付款增加
+export function outPay(num1, num2, num3, num4) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_外协付款计划_增加数据',
+      param: '外协厂家流水号=' + num1 + '&付款金额=' + num2 + '&付款日期=' + num3 + '&备注=' + num4
+    }
+  })
+}
+// 外协付款编辑
+export function edit(num1, num2, num3) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_外协付款计划_修改数据',
+      param: '外协付款流水号=' + num1 + '&付款金额=' + num2 + '&备注=' + num3
+    }
+  })
+}
+// 外协付款删除
+export function handledelete3(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_外协付款计划_删除数据',
+      param: '外协付款流水号=' + num1
+    }
+  })
+}
--- a/src/api/Outsourcing/OutsourcingTaskExecution.js
+++ b/src/api/Outsourcing/OutsourcingTaskExecution.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'

-// 初始化获取已生成的外协加工任务单初始化获取已生成的外协加工任务单
+// 初始化获取已生成的外协加工任务单
 export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize) {
  return request({
    url: '',
@@ -97,26 +97,26 @@ export function addTable(contractNumber, personNum, manufacturers, time, freight
  })
 }
 // 外协加工任务单修改
-export function editData(Number, manufacturers, freight, documentStatus, sign, Explain) {
+export function editData(Number, manufacturers, freight, Explain) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '2',
      name: '车间生产管理_外协加工任务单_修改数据',
-      param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=' + freight + '=int&单据状态=' + documentStatus + '=int&入库标志=' + sign + '=int&扣款说明=' + Explain
+      param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=' + freight + '=int&单据状态=2&入库标志=1&扣款说明=' + Explain
    }
  })
 }
 // 成交
-export function editData1(Number, manufacturers, freight, documentStatus, sign, Explain) {
+export function editData1(Number, manufacturers, freight, Explain) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '2',
      name: '车间生产管理_外协加工任务单_修改数据',
-      param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=' + freight + '=int&单据状态=' + documentStatus + '=int&入库标志=' + sign + '=int&扣款说明=' + Explain + '&扣款_质量=0&扣款_计划=0&扣款_其他=0'
+      param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=' + freight + '=int&单据状态=2&入库标志=1&扣款说明=' + Explain + '&扣款_质量=0&扣款_计划=0&扣款_其他=0'
    }
  })
 }
--- a/src/api/Outsourcing/PreorderAssociation.js
+++ b/src/api/Outsourcing/PreorderAssociation.js
@@ -10,14 +10,13 @@ export function machine() {
    }
  })
 }
-export function getToolNum(num) {
+export function getToolNum() {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床',
-      param: '项目流水号=' + num
+      name: '车间生产管理工艺_零件工艺计划_序间外协机床查询'
    }
  })
 }
--- a/src/icons/svg/OutsourcingPaymentPlanManagement2.svg
+++ b/src/icons/svg/OutsourcingPaymentPlanManagement2.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543302138984" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1877" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M762.503311 141.113925c-14.285355-9.653871-33.714869-5.90243-43.363623 8.393157-9.658987 14.295588-5.907547 33.709753 8.388041 43.367717 106.359376 71.861678 169.863712 191.280488 169.863712 319.443449 0 212.412784-172.811858 385.220548-385.220548 385.220548S126.956484 724.732056 126.956484 512.318248c0-128.168078 63.49922-247.586888 169.858596-319.443449 14.295588-9.658987 18.057261-29.073152 8.398274-43.363623-9.648754-14.295588-29.073152-18.052145-43.363623-8.398274C138.267087 224.602408 64.488757 363.373984 64.488757 512.318248c0 246.854201 200.827935 447.687252 447.682136 447.687252S959.859167 759.173472 959.859167 512.318248C959.859167 363.373984 886.075721 224.607524 762.503311 141.113925z" p-id="1878"></path><path d="M400.698055 64.636113c-17.248849 0-31.233352 13.984503-31.233352 31.233352l0 30.470989c0 17.248849 13.985526 31.233352 31.233352 31.233352 17.248849 0 31.233352-13.985526 31.233352-31.233352L431.931407 95.869465C431.931407 78.621639 417.946904 64.636113 400.698055 64.636113z" p-id="1879"></path><path d="M623.649869 64.636113c-17.248849 0-31.233352 13.984503-31.233352 31.233352l0 30.470989c0 17.248849 13.985526 31.233352 31.233352 31.233352 17.248849 0 31.233352-13.985526 31.233352-31.233352L654.883221 95.869465C654.883221 78.621639 640.897695 64.636113 623.649869 64.636113z" p-id="1880"></path><path d="M425.695379 227.656977c11.209296 18.047028 41.974997 48.588625 86.157265 48.588625 43.958164 0 75.100442-30.3134 86.573751-48.223305 9.302877-14.528901 5.068436-33.846876-9.455349-43.149752-14.544251-9.29776-33.846876-5.063319-43.149752 9.455349-0.121773 0.198521-13.379729 19.449981-33.968649 19.449981-20.008706 0-32.443923-18.127869-33.276894-19.373233-9.165754-14.427594-28.285207-18.799158-42.829458-9.760295C421.089477 193.749726 416.59 213.006302 425.695379 227.656977z" p-id="1881"></path><path d="M356.00311 591.05859c-17.248849 0-31.233352 13.984503-31.233352 31.233352s13.984503 31.233352 31.233352 31.233352L480.93754 653.525294l0 98.250698c0 17.248849 13.984503 31.238468 31.233352 31.238468 17.248849 0 31.233352-13.989619 31.233352-31.238468l0-98.250698 124.93443 0c17.248849 0 31.238468-13.984503 31.238468-31.233352s-13.989619-31.233352-31.238468-31.233352L543.405267 591.05859l0-83.289961 124.93443 0c17.248849 0 31.238468-13.985526 31.238468-31.233352 0-17.248849-13.989619-31.233352-31.238468-31.233352l-80.761372 0 68.041676-68.038606c12.20088-12.20088 12.20088-31.976272 0.005117-44.171012-12.195763-12.20088-31.976272-12.195763-44.171012-0.005117l-99.280144 99.276051-99.280144-99.276051c-12.190647-12.190647-31.971156-12.195763-44.171012 0.005117-12.195763 12.195763-12.195763 31.971156 0.005117 44.171012l68.041676 68.038606-80.766488 0c-17.248849 0-31.233352 13.984503-31.233352 31.233352 0 17.248849 13.984503 31.233352 31.233352 31.233352L480.93754 507.768629l0 83.289961L356.00311 591.05859z" p-id="1882"></path></svg>
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -18,8 +18,8 @@ const service = axios.create({
  // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
  // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
  // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  // baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+  // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
  // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
  // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
  timeout: 1500000 // 请求超时时间
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -37,14 +37,7 @@
        <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchBasciPartinfo()">基本件查询</el-button><br>
      </el-card>
        <el-card v-show="basicshow">
-          <el-table
-            v-loading="listLoading"
-            :data="tableDataBasic"
-            size="mini"
-            border
-            style="width: 100%;"
-            height="200"
-            @row-click="searchBasicPartRecord">
+          <el-table v-loading="listLoading" :data="tableDataBasic" size="mini" border style="width: 100%;" height="200" @row-click="searchBasicPartRecord">
            <el-table-column
              label="序号"
              align="center"
@@ -321,21 +314,6 @@
          </el-table>
        </el-card>
      </el-tab-pane>
-      <!--编辑零件数量对话框-->
-      <el-dialog :visible.sync="dialogFormVisible" title="盘点修改" center width="380px">
-        <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" class="demo-ruleForm">
-          <el-form-item label="零件数量" prop="Number" label-width="100px" size="small">
-            <el-input v-model="form2.Number" size="small" placeholder="零件数量" style="width: 200px"/>
-          </el-form-item>
-          <el-form-item label="修改原因" prop="AlterReason" label-width="100px">
-            <el-input v-model="form2.AlterReason" size="small" placeholder="修改原因" style="width: 200px"/>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="callOff2('form2')">取消</el-button>
-          <el-button type="primary" @click="submitChannge()">确 定</el-button>
-        </div>
-      </el-dialog>
      <el-tab-pane label="采购" name="second">
        <el-card v-show="purchaseshow">
          <el-radio-group
@@ -1150,6 +1128,21 @@
        </el-card>
      </el-tab-pane>
    </el-tabs>
+    <!--编辑零件数量对话框-->
+    <el-dialog :visible.sync="dialogFormVisible" title="盘点修改" center width="380px">
+      <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" class="demo-ruleForm">
+        <el-form-item label="零件数量" prop="Number" label-width="100px" size="small">
+          <el-input v-model="form2.Number" size="small" placeholder="零件数量" style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="修改原因" prop="AlterReason" label-width="100px">
+          <el-input v-model="form2.AlterReason" size="small" placeholder="修改原因" style="width: 200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="callOff2('form2')">取消</el-button>
+        <el-button type="primary" @click="submitChannge()">确 定</el-button>
+      </div>
+    </el-dialog>
  </div>
 </template>

@@ -1570,12 +1563,12 @@ export default {
        } else {
          this.$message.error('添加失败')
        }
-        this.form = {}
+        this.form.safeNumber = ''
      })
    },
    // 重置表单
    callOff(formName) {
-      this.form = {}
+      this.form.safeNumber = ''
      this.dialogFormVisible2 = false
      this.$refs[formName].resetFields()
    },
@@ -1734,7 +1727,8 @@ export default {
      })
    },
    AlterNumber(row) {
-      this.form2 = []
+      this.form2.AlterReason = ''
+      this.form2.Number = ''
      this.project = row.项目流水号
      this.machinenumber = row.机床流水号
      this.partnumber = row.组件流水号
@@ -1753,7 +1747,8 @@ export default {
      this.material = row.材料
    },
    AlterBasicNumber(row) {
-      this.form2 = []
+      this.form2.AlterReason = ''
+      this.form2.Number = ''
      this.project = row.项目流水号
      this.machinenumber = row.机床流水号
      this.partnumber = row.组件流水号
@@ -1764,12 +1759,12 @@ export default {
      this.receive = row.收件信息id
      this.materiallocate = row.物料与货位对照流水号
      this.materialType = row.零件类型
-      this.dialogFormVisible = true
      this.name = row.零件名称
      this.mode = row.物料规格
      this.picture = row.零件图号
      this.type = row.物料型号
      this.material = row.材料
+      this.dialogFormVisible = true
    },
    submitChannge() {
      CheckAlter(this.receive, this.project, this.machinenumber, this.partnumber, this.oldnumber, this.form2.AlterReason, this.form2.Number, this.id, this.locate, this.contractdetail, this.craftnumber, this.materialType, this.materiallocate, this.name, this.mode, this.picture, this.type, this.material).then(response => {
@@ -1784,7 +1779,8 @@ export default {
    },
    callOff2() {
      this.dialogFormVisible = false
-      this.form2 = {}
+      this.form2.AlterReason = ''
+      this.form2.Number = ''
    }
  }
 }
--- a/src/views/Inventory/OfflinePartOut/index.vue
+++ b/src/views/Inventory/OfflinePartOut/index.vue
@@ -1,5 +1,10 @@
 <template>
  <div class="app-container">
+    <el-card>
+      <span style="margin: 5px">离线合同编号</span>
+      <el-input v-model="offlineContract" clearable size="small" style="width:200px" />
+      <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchPurchasePartinfo()">查询</el-button>
+    </el-card>
    <el-card>
      <el-table
        v-loading="listLoading"
@@ -186,7 +191,8 @@ export default {
      tableDataOut: [],
      listLoading: '',
      listLoading1: '',
-      partnumber: ''
+      partnumber: '',
+      offlineContract: null // 离线合同编号
    }
  },
  computed: {
@@ -236,7 +242,7 @@ export default {
    searchPurchasePartinfo() {
      this.listLoading = true
      this.tableDataBasic = []
-      searchPart().then(response => {
+      searchPart(this.offlineContract).then(response => {
        this.tableDataBasic = response.data
        this.listLoading = false
      })
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -185,12 +185,15 @@ export default {
      } else {
        this.a = 0
        for (let i = 0; i < this.tableData2.length; i++) {
-          edit(this.tableData2[i].工艺计划流水号)
-          this.a = this.a + 1
-        }
+          edit(this.tableData2[i].工艺计划流水号).then(response => {
+            this.a += parseInt(response.data[0].result)
            if (this.a === this.tableData2.length) {
+              this.pageSize = 10
+              this.pageCurrent = 1
              this.searchTable()
            }
+          })
+        }
      }
    },
    downLoad(tableid) {
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -24,7 +24,7 @@
            </el-select>
          </el-form-item>
          <el-form-item label="分组">
-            <el-select v-model="NumValue" filterable size="small" style="margin-bottom:10px" placeholder="分组">
+            <el-select v-model="NumValue" filterable size="small" style="margin-bottom:10px" placeholder="分组" @change="total = 0;pageSize = 10;pageList = 1;getTable()">
              <el-option
                v-for="item in Num"
                :key="item.value"
@@ -528,10 +528,10 @@ export default {
        this.$message.error('请选择机床组号')
      } else {
        this.listLoading = true
-        this.tableData = []
        this.tableData1 = []
        getTable(this.NumValue, this.pageList, this.pageSize).then(response => {
          this.total = parseInt(response.data.total)
+          this.tableData = []
          for (let i = 0; i < response.data.rows.length; i++) {
            this.tableData.push({
              零件图号: response.data.rows[i].零件图号,
--- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
+++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
@@ -87,7 +87,7 @@
        </el-table-column>
        <el-table-column property="name" label="调序权限" align="center">
          <template slot-scope="scope">
-            <el-tag v-if="scope.row.调序权限===1" type="success" size="small">已开放</el-tag>
+            <el-tag v-if="scope.row.调序权限==='1'" type="success" size="small">已开放</el-tag>
            <el-tag v-else type="info" size="small">未开放</el-tag>
          </template>
        </el-table-column>
--- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
@@ -41,13 +41,10 @@
          :label="item.label"
          :value="item.value"/>
      </el-select>
-      <el-button type="success" icon="el-icon-search" style="margin: 10px;" size="small" @click="searchDetail">查询
-      </el-button>
+      <el-button type="success" icon="el-icon-search" style="margin: 10px;" size="small" @click="searchDetail">查询</el-button>
      <el-checkbox v-model="checked" :disabled="isShow2" size="small" style="margin:10px">是否核准</el-checkbox>
-      <el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整
-      </el-button>
-      <el-button v-show="false" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式
-      </el-button>
+      <el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整</el-button>
+      <el-button v-show="false" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式</el-button>
      <div v-show="isShow">
        <span>种类:</span>
        <el-input v-model="typeValue" placeholder="种类" size="small" readonly style="width:100px"/>
@@ -82,8 +79,8 @@
            <span>长度:</span>
            <el-input-number v-model="height2" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
            <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation1()">计算重量</el-button>
-            ∮ ° # □ ∥ ± × Ⅰ Ⅱ Ⅲ ⊥ ％ ■ ∠ mm ◎ ○ δ μm ／ ◇ ()
-            <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="insertThestring()">计算重量</el-button>
+            <!--∮ ° # □ ∥ ± × Ⅰ Ⅱ Ⅲ ⊥ ％ ■ ∠ mm ◎ ○ δ μm ／ ◇ ()-->
+            <!--<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="insertThestring()">计算重量</el-button>-->
          </el-col>

          <el-col v-show="materielValue==='2'||materielValue==='9'||materielValue==='10'||materielValue==='11'" :span="20">
@@ -144,16 +141,11 @@
        <el-button style="margin:10px" type="primary" size="small" @click="calTol()">计算公差</el-button>
        <el-button-group v-if="isShow1" style="margin: 10px">
          <el-button v-if="isShow1" type="info" size="small" icon="el-icon-document" @click="pasteTable">粘贴</el-button>
-          <el-button v-if="false" :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="DYbtn">典艺
-          </el-button>
-          <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="WYbtn">完艺
-          </el-button>
-          <el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" @click="deleteTable">删除
-          </el-button>
-          <el-button v-if="isShow1" type="primary" size="small" icon="el-icon-tickets" @click="copyAndSave">复制并保存
-          </el-button>
-          <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-tickets" @click="saveApprove">保存
-          </el-button>
+          <el-button v-if="true" :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="DYbtn">原有</el-button>
+          <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="WYbtn">完艺</el-button>
+          <el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" @click="deleteTable">删除</el-button>
+          <el-button v-if="isShow1" type="primary" size="small" icon="el-icon-tickets" @click="copyAndSave">复制并保存</el-button>
+          <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-tickets" @click="saveApprove">保存</el-button>
        </el-button-group>
      </el-row>
      <el-table
@@ -306,72 +298,29 @@
      </el-form>
    </el-dialog>

-    <el-dialog :visible.sync="dialogFormVisible" title="典型工艺选择" center width="800px">
+    <el-dialog :visible.sync="dialogFormVisible" title="工艺选择" center width="800px">
      <el-form ref="form" :model="form" label-position="left" label-width="125px" class="demo-ruleForm">
        <el-row>
-          <el-col :span="10">
-            <el-form-item label="典型工艺零件分类">
-              <el-select
-                v-model="typicalClassValue"
-                placeholder="分类"
-                size="small"
-                style="width:150px"
-                @change="classChange()">
-                <el-option
-                  v-for="item in typicalClass"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
+          <el-col :span="24">
+            <el-form-item label="零件图号">
+              <el-input v-model="partNameValue1" size="small" placeholder="输入零件图号" style="width: 150px" clearable/>
+              <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 20px" @click="searchProcess()">查询</el-button>
            </el-form-item>
          </el-col>
-          <el-col :span="10">
-            <el-form-item label="零件名称">
-              <el-select
-                id="name"
-                v-model="partNameValue1"
-                placeholder="零件名称"
-                size="small"
-                style="width:150px"
-                @change="nameChange()">
-                <el-option
-                  v-for="item in partName1"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-button type="success" size="small" icon="el-icon-search" @click="searchProcess()">查询</el-button>
-          </el-col>
        </el-row>
        <el-row>
-          <el-col :span="10">
-            <el-form-item label="典型工艺号">
-              <el-select
-                id="num"
-                v-model="processNumValue"
-                placeholder="工艺号"
-                style="width:150px"
-                size="small"
-                @change="numChange()">
+          <el-col :span="24">
+            <el-form-item label="零件图号">
+              <el-select id="num" v-model="processNumValue" placeholder="零件图号" style="width:150px" size="small" @change="numChange()">
                <el-option
                  v-for="item in partName1"
                  :key="item.value"
-                  :label="item.num"
+                  :label="item.label"
                  :value="item.value"/>
              </el-select>
+              <el-button size="small" style="margin-left: 20px" @click="processCopy()">工艺拷贝</el-button>
            </el-form-item>
          </el-col>
-          <el-col :span="10">
-            <el-form-item label="备注">
-              <el-input v-model="remark" size="small" readonly style="width: 150px;"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-button size="small" @click="processCopy()">工艺拷贝</el-button>
-          </el-col>
        </el-row>
        <el-table
          :data="tableData2"
@@ -381,7 +330,7 @@
          size="mini">
          <el-table-column align="center" label="工艺序号" width="80">
            <template slot-scope="scope">
-              {{ scope.row.工艺序号 }}
+              {{ scope.row.工序顺序 }}
            </template>
          </el-table-column>
          <el-table-column align="center" label="工艺名称" width="180">
@@ -472,12 +421,7 @@
            <el-button size="small" @click="processCopy1()">工艺拷贝</el-button>
          </el-col>
        </el-row>
-        <el-table
-          :data="tableData4"
-          style="width: 97%;max-height: 250px;margin-top: 15px"
-          size="mini"
-          border
-          height="250px">
+        <el-table :data="tableData4" style="width: 97%;max-height: 250px;margin-top: 15px" size="mini" border height="250px">
          <el-table-column align="center" label="工艺序号" width="80">
            <template slot-scope="scope">
              {{ scope.row.工序顺序 }}
@@ -552,6 +496,8 @@
 <script>
 import '@/icon/iconfont.css'
 import {
+  numChange,
+  searchProcess11,
  WeightCopy,
  initCraftmen,
  getPartnames1,
@@ -562,8 +508,6 @@ import {
  searchMaterial,
  typicalProcess,
  initTolerance,
-  FcK,
-  searchProcess,
  searchWYgongyi,
  gongyiCopy,
  initPerson,
@@ -869,7 +813,6 @@ export default {
    insertThestring(NewCode) {
      this.lastFocusText = event.srcElement
      this.lastFocusText.focus()
-      console.log(this.lastFocusText)
      var sel = document.selection.createRange()
      sel.text = NewCode
      return
@@ -1099,83 +1042,42 @@ export default {
      this.remark1 = ''
      this.tuhaoValue = ''
    },
-    classChange() { // 当分类改变时，获取零件名称和典型工艺流水号
-      this.partNameValue1 = ''
+    // 典艺工艺查询
+    searchProcess() {
      this.processNumValue = ''
-      for (let i = 0; i < this.typicalClass.length; i++) {
-        if (this.typicalClassValue === this.typicalClass[i].value) {
-          this.serialNumValue1 = this.serialNum1[i].value
-          FcK(this.serialNumValue1).then(response => {
      this.partName1 = []
-            this.processNum = []
-            this.remark = response.data[0].备注
-            for (let j = 0; j < response.data.length; j++) {
-              this.partName1.push({
-                label: response.data[j].典型工艺名称,
-                num: response.data[j].典型工艺号,
-                value: response.data[j].典型工艺流水号
-              })
-            }
-          })
-        }
-      }
-    },
-    nameChange() { // 当零件名称改变时，典型工艺号改变
-      for (let i = 0; i < this.partName1.length; i++) {
-        if (this.partNameValue1 === this.partName1[i].value) {
-          this.processNumValue = this.partName1[i].num
-          this.serialNumValue2 = this.partNameValue1
-        }
-      }
-    },
-    numChange() { // 当典型工艺号改变时，零件名称改变
-      for (let i = 0; i < this.partName1.length; i++) {
-        if (this.processNumValue === this.partName1[i].value) {
-          this.partNameValue1 = this.partName1[i].value
-          this.serialNumValue2 = this.partNameValue1
-        }
-      }
-    },
-    searchProcess() { // 典艺工艺查询
-      if (this.typicalClassValue === '') {
-        this.serialNumValue1check = false
-      } else {
-        this.serialNumValue1check = true
-      }
-
-      if (this.partNameValue1 === '') {
-        this.partNameValue1check = false
-      } else {
-        this.partNameValue1check = true
-      }
-
-      if (this.processNumValue === '') {
-        this.processNumValuecheck = false
-      } else {
-        this.processNumValuecheck = true
-      }
      this.tableData2 = []
-      searchProcess(this.serialNumValue1check, this.serialNumValue1, this.partNameValue1check, this.serialNumValue2, this.processNumValuecheck, this.serialNumValue2).then(response => {
+      searchProcess11(this.partNameValue1).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.partName1.push({
+            label: response.data[i].零件图号,
+            value: response.data[i].典艺流水号
+          })
+        }
+      })
+    },
+    // 典艺选择查表格
+    numChange() {
+      numChange(this.processNumValue).then(response => {
        this.tableData2 = response.data
      })
    },
-    processCopy() { // 典艺工艺拷贝
+    // 典艺工艺拷贝
+    processCopy() {
      if (this.partNumValue === '') {
        this.$message.error('请在主界面选择一个零件作为被拷贝对象')
        this.dialogFormVisible = false
-      } else if (this.partNameValue1 === '') {
-        this.$message.error('请选择零件名称')
+      } else if (this.processNumValue === '') {
+        this.$message.error('请选择零件图号')
      } else {
        for (let i = 0; i < this.tableData2.length; i++) {
          this.tableData[i].工艺名称 = this.tableData2[i].工艺名称
          this.tableData[i].工艺难度等级 = this.tableData2[i].工艺难度等级
          this.tableData[i].工艺要求 = this.tableData2[i].工艺要求
-          selectRequest(this.tableData[i].工序流水号, this.tableData[i].工艺计划流水号, this.tableData2[i].工艺编号, this.tableData2[i].工艺序号, this.tableData2[i].工艺要求).then(response => {
-          })
-          hardEdit(this.tableData[i].工序流水号, this.tableData2[i].工艺难度等级).then(response => {
-          })
-          this.dialogFormVisible = false
+          selectRequest(this.tableData[i].工序流水号, this.tableData[i].工艺计划流水号, this.tableData2[i].工艺编号, this.tableData2[i].工序顺序, this.tableData2[i].工艺要求)
+          hardEdit(this.tableData[i].工序流水号, this.tableData2[i].工艺难度等级)
        }
+        this.dialogFormVisible = false
      }
    },
    searchProcess1() { // 完艺工艺查询
@@ -1216,12 +1118,13 @@ export default {
      if (this.partNumValue === '') {
        this.$message.error('请在主界面选择一个零件作为被拷贝对象')
      } else {
-        gongyiCopy(this.num, this.partNumValue).then(() => { // 工艺计划流水号_完成工艺, 工艺计划流水号_被拷工艺
+        gongyiCopy(this.num, this.partNumValue).then(res => { // 工艺计划流水号_完成工艺, 工艺计划流水号_被拷工艺
          this.searchDetail()
        })
      }
    },
-    numChange1() { // 当完成工艺号改变时，零件名称改变，并获取工艺要求
+    // 当完成工艺号改变时，零件名称改变，并获取工艺要求
+    numChange1() {
      this.remark1 = ''
      this.tableData4 = null
      for (let i = 0; i < this.tuhao.length; i++) {
@@ -1310,8 +1213,7 @@ export default {
      this.str = this.str + this.processRequestValue
      this.tableData[this.index].工艺要求 = this.str
      this.dialogFormVisible2 = false
-      selectRequest(this.tableData[this.index].工序流水号, this.tableData[this.index].工艺计划流水号, this.tableData[this.index].工艺编号, this.tableData[this.index].工序顺序, this.tableData[this.index].工艺要求).then(response => {
-      })
+      selectRequest(this.tableData[this.index].工序流水号, this.tableData[this.index].工艺计划流水号, this.tableData[this.index].工艺编号, this.tableData[this.index].工序顺序, this.tableData[this.index].工艺要求)
    },
    calTol() { // 计算公差
      this.tolerance = ''
--- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
@@ -460,8 +460,17 @@ export default {
                if (response.data[k].工艺计划流水号 === this.liushuihao) {
                  this.process[i][k] = response.data[k].工艺名称简称
                  this.planDate[i][k] = response.data[k].计划日期_短
-                  this.worker[i][k] = response.data[k].员工姓名
                  this.realDate[i][k] = response.data[k].完成日期_短
+                  if (response.data[k].工艺编号 === 29) {
+                    response.data[k].员工姓名 = '备料'
+                  }
+                  if (response.data[k].工序间是否外协 === 2) {
+                    response.data[k].员工姓名 = '外协'
+                  }
+                  if (response.data[k].员工姓名 === '超级管理员') {
+                    response.data[k].员工姓名 = '无'
+                  }
+                  this.worker[i][k] = response.data[k].员工姓名
                  if (response.data[k].工序状态 === 5) { // 灰色是已经完成 未入库
                    this.colorCode[i][k] = 'grey'
                  } else {
--- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
@@ -319,8 +319,7 @@
            style="width: 150px;float: left"
            height="400"
            accordion
-            @node-click="handleNodeClick"
-          />
+            @node-click="handleNodeClick"/>
        </div>
        <el-table :data="List1" highlight-current-row height="400" style="width: 400px;float: left;margin-left: 30px" @row-click="handleCurrentChange2">
          <el-table-column label="考勤编号" align="center" >
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -1202,7 +1202,6 @@ export default {
        if (this.零件图号.length !== 0) {
          for (let i = 0; i < this.零件图号.length; i++) {
            selection2(this.工艺计划流水号[i]).then(response => {
-              console.log(response.data, 2)
              for (let k = 0; k < response.data.length; k++) {
                this.process[i][k] = response.data[k].工艺名称简称
                this.planDate[i][k] = response.data[k].计划日期_短
--- a/src/views/ManufacturingCenter/QuotaFormulation/index.vue
+++ b/src/views/ManufacturingCenter/QuotaFormulation/index.vue
@@ -15,7 +15,7 @@
            :value="item.value"/>
        </el-select>
        <span style="margin: 10px">零件号:</span>
-        <el-select v-model="partNumValue" size="small" filterable placeholder="零件号" style="margin: 10px">
+        <el-select v-model="partNumValue" size="small" filterable placeholder="零件号" style="margin: 10px" @change="typeChange()">
          <el-option
            v-for="item in partNum"
            :key="item.value"
@@ -26,60 +26,41 @@
        <span v-if="radio === 1" style="color: #53A3F7;font-size: 14px"> 未编制的数量{{ partNum.length }}</span>
        <span v-if="radio === 2" style="color: #53A3F7;font-size: 14px"> {{ shuliang }}</span>
      </div>
-
      <div>
        <span>种类:</span>
-        <el-input
-          v-model="typeValue"
-          size="small"
-          placeholder="种类"
-          readonly
-          style="margin: 10px;width:180px"/>
+        <el-input v-model="typeValue" size="small" placeholder="种类" readonly style="margin: 10px;width:180px"/>
        <span>零件名称:</span>
-        <el-input
-          v-model="partName"
-          size="small"
-          placeholder="零件名称"
-          readonly
-          style="margin: 10px;width:180px"/>
+        <el-input v-model="partName" size="small" placeholder="零件名称" readonly style="margin: 10px;width:180px"/>
        <span>投产总数量:</span>
-        <el-input
-          v-model="batchNum"
-          size="small"
-          placeholder="投产总数量"
-          readonly
-          style="margin: 10px;width:180px"/>
+        <el-input v-model="batchNum" size="small" placeholder="投产总数量" readonly style="margin: 10px;width:180px"/>
        <span>材质:</span>
-        <el-input
-          v-model="material"
-          size="small"
-          placeholder="材质"
-          readonly
-          style="margin: 10px;width:180px"/>
+        <el-input v-model="material" size="small" placeholder="材质" readonly style="margin: 10px;width:180px"/>
+        <el-button v-if="radio === 2" type="primary" icon="el-icon-cjn-09" size="small" @click="ADD">保存</el-button>
+        <el-button v-if="radio === 1" type="primary" icon="el-icon-cjn-09" size="small" @click="ADD1">保存</el-button>
      </div>
    </el-card>
    <el-card>
      <div>
-        <el-table v-loading="listLoading" :data="tableData" border style="width: 100%;" height="550px">
+        <el-table v-loading="listLoading" :data="tableData" border style="width: 100%;" height="550px" size="small">
          <el-table-column type="index" label="序号" width="50" align="center"/>
          <el-table-column prop="name" label="工艺名称" width="180" align="center">
            <template slot-scope="scope">
-              <el-input v-model="tableData[scope.$index].name" style="width:150px" placeholder="工艺名称" readonly/>
+              <el-input v-model="tableData[scope.$index].name" style="width:150px" size="small" placeholder="工艺名称" readonly/>
            </template>
          </el-table-column>
          <el-table-column prop="request" label="工艺要求" align="center">
            <template slot-scope="scope">
-              <el-input v-model="tableData[scope.$index].request" :rows="1" placeholder="工艺要求" type="textarea" readonly/>
+              <el-input v-model="tableData[scope.$index].request" :rows="1" size="small" placeholder="工艺要求" type="textarea" readonly/>
            </template>
          </el-table-column>
          <el-table-column prop="singleton" label="单件" width="180" align="center">
            <template slot-scope="scope">
-              <el-input v-model="tableData[scope.$index].singleton" :readonly="tableData[scope.$index].name===''" style="width:150px" placeholder="单件"/>
+              <el-input v-model="tableData[scope.$index].singleton" :readonly="tableData[scope.$index].name===''" style="width:150px" size="small" placeholder="单件"/>
            </template>
          </el-table-column>
          <el-table-column prop="Settlement" label="准结" width="180" align="center">
            <template slot-scope="scope">
-              <el-input v-model="tableData[scope.$index].Settlement" :readonly="tableData[scope.$index].name===''" style="width:150px" placeholder="准结"/>
+              <el-input v-model="tableData[scope.$index].Settlement" :readonly="tableData[scope.$index].name===''" style="width:150px" size="small" placeholder="准结"/>
            </template>
          </el-table-column>
          <el-table-column v-if="isShow" prop="budget" label="外协预算" width="180" align="center">
@@ -88,9 +69,6 @@
            </template>
          </el-table-column>
        </el-table>
-        <el-button v-if="radio === 2" type="primary" icon="el-icon-cjn-09" size="small" style="float:right;margin: 10px" @click="ADD">保存</el-button>
-        <el-button v-if="radio === 1" type="primary" icon="el-icon-cjn-09" size="small" style="float:right;margin: 10px" @click="ADD1">保存</el-button>
-
      </div>
    </el-card>
  </div>
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
@@ -8,7 +8,7 @@
    </el-card>

    <el-card>
-      <el-table :data="List" border size="small">
+      <el-table :data="List" border size="small" height="500px">
        <el-table-column label="设备名称" align="center" >
          <template slot-scope="scope">
            {{ scope.row.设备名称 }}
@@ -111,7 +111,7 @@
          </el-col>
          <el-col :span = "12">
            <el-form-item label="设备加工工艺" prop="设备加工工艺" >
-              <el-select v-model="form.设备加工工艺" placeholder="设备加工工艺" size="small" style="width:200px" clearable >
+              <el-select v-model="form.设备加工工艺" placeholder="设备加工工艺" filterable size="small" style="width:200px" clearable >
                <el-option
                  v-for="item in processingName"
                  :key="item.value"
@@ -311,7 +311,6 @@ export default {
            type: 'success'
          })
          this.dialogFormVisible = false
-          this.title = ''
          this.fetchData()
        } else {
          this.$message.error('信息添加失败')
@@ -390,3 +389,8 @@ export default {
  }
 }
 </script>
+<style scoped>
+  .el-card{
+    margin-bottom: 15px;
+  }
+</style>
--- a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
+++ b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
@@ -3,26 +3,36 @@

    <el-card>
      <el-row>
-        <el-radio-group v-model="radio" style="margin: 10px;" @change="radioChange">
+        <el-radio-group v-show="false" v-model="radio" style="margin: 10px;" @change="radioChange">
          <el-radio :label="1">未编制</el-radio>
          <el-radio :label="2">已编制</el-radio>
        </el-radio-group>
-        <span>项目名称:</span>
-        <el-select v-model="entryNameValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="项目名称" @change="typeChange()">
-          <el-option
-            v-for="item in entryName"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
+        <!--<span>项目名称:</span>-->
+        <!--<el-select v-model="entryNameValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="项目名称" @change="typeChange()">-->
+        <!--<el-option-->
+        <!--v-for="item in entryName"-->
+        <!--:key="item.value"-->
+        <!--:label="item.label"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
        <span>机床名称:</span>
-        <el-select v-model="toolNumValue" clearable filterable size="small" placeholder="机床号" style="margin-bottom:10px" @change="typeChange1()">
+        <el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="typeChange1()">
          <el-option
            v-for="item in toolNum"
            :key="item.value"
            :label="item.label"
-            :value="item.value"/>
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
+          </el-option>
        </el-select>
+        <!--<el-select v-model="toolNumValue" clearable filterable size="small" placeholder="机床号" style="margin-bottom:10px" @change="typeChange1()">-->
+        <!--<el-option-->
+        <!--v-for="item in toolNum"-->
+        <!--:key="item.value"-->
+        <!--:label="item.label"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
        <span>分组:</span>
        <el-select v-model="NumValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="机床组号">
          <el-option
@@ -115,7 +125,7 @@
    </el-card>

    <el-card>
-      <el-table v-loading="loading0" :data="tableData" :summary-method="getSummaries" border style="width: 100%;max-height: 390px;" height="340px" stripe show-summary>
+      <el-table v-loading="loading0" :data="tableData" :summary-method="getSummaries" border style="width: 100%;max-height: 390px;" height="340px" size="small" stripe show-summary>
        <el-table-column label="序号" width="80" align="center" type="index"/>
        <el-table-column label="工艺名称" width="200" align="center">
          <template slot-scope="scope">
@@ -124,7 +134,7 @@
        </el-table-column>
        <el-table-column label="工艺要求" align="center">
          <template slot-scope="scope">
-            <el-input v-model="tableData[scope.$index].工艺要求" size="mini" readonly type="textarea"/>
+            <el-input v-model="tableData[scope.$index].工艺要求" :autosize="{ minRows: 1, maxRows: 1}" size="mini" readonly type="textarea"/>
          </template>
        </el-table-column>
        <el-table-column label="单件" width="110" align="center">
@@ -204,7 +214,7 @@ export default {
    }
  },
  created() {
-    this.fetchData()
+    this.typeChange()
    this.searchPartNum()
  },
  methods: {
@@ -231,11 +241,12 @@ export default {
      this.toolNum = []
      this.NumValue = ''
      this.Num = []
-      getToolNum(this.entryNameValue).then(response => {
+      getToolNum().then(response => {
        for (let i = 0; i < response.data.length; i++) {
          this.toolNum.push({
            label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
+            value: response.data[i].机床流水号,
+            value2: response.data[i].项目名称
          })
        }
      })
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement2/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement2/index.vue
@@ -0,0 +1,668 @@
+<template>
+  <div class="app-container">
+
+    <el-card>
+      <span>外协厂家:</span>
+      <el-select v-model="ManufacturerNameValue" placeholder="选择外协厂家" filterable clearable size="small" style="width:190px;margin:10px;">
+        <el-option
+          v-for="item in ManufacturerName"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=10;total=null;pageCurrent2=1;pageSize2=10;total2=null;searchTable()">查询</el-button>
+    </el-card>
+
+    <el-card>
+      <el-table v-loading="loading" :data="tableData" height="400" style="width: 100%;" border highlight-current-row element-loading-text="拼命加载中" @row-click="getParts3">
+        <el-table-column
+          label=" "
+          type="index"
+          align="center"
+          width="50"/>
+        <el-table-column label="外协厂家" align="center" width="280px">
+          <template slot-scope="scope">
+            {{ scope.row.外协厂家名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="待付总额(元)" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.待付金额 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="300px" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              class="el-icon-check"
+              @click="editType1(scope.row, 'form');param = 0">到票</el-button>
+            <el-button
+              size="mini"
+              type="success"
+              class="el-icon-check"
+              @click="payment(scope.row, 'form2');param2 = 0">付款</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+    <el-tabs type="border-card">
+      <el-tab-pane label="付款明细">
+        <el-table v-loading="loading3" :data="tableData3" height="370" style="width: 100%;" border element-loading-text="拼命加载中">
+          <el-table-column label="付款金额" align="center" width="230px">
+            <template slot-scope="scope">
+              {{ scope.row.付款金额 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.备注 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="付款日期" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.付款日期 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="200px" fixed="right">
+            <template slot-scope="scope">
+              <el-button size="mini" type="primary" class="el-icon-edit" @click="handleChange3(scope.row, 'form2')">编辑</el-button>
+              <el-button size="mini" type="danger" class="el-icon-delete" @click="handleDelete3(scope.$index, scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block">
+          <el-pagination
+            v-if="!loading3"
+            :current-page="pageCurrent3"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="pageSize3"
+            :total="total3"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange3"
+            @current-change="handleCurrentChange3"/>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="到票明细">
+        <el-table v-loading="loading2" :data="tableData2" :summary-method="getSummaries" height="370" show-summary style="width: 100%;" border element-loading-text="拼命加载中">
+          <el-table-column label="发票号" align="center" width="230px">
+            <template slot-scope="scope">
+              {{ scope.row.发票号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="接收人" align="center" width="180px">
+            <template slot-scope="scope">
+              {{ scope.row.接收人 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="开户行" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.开户行 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="开票金额" align="center" width="150px" prop="开票金额">
+            <template slot-scope="scope">
+              {{ scope.row.开票金额 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="开票日期" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.开票时间 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="接收日期" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.接收时间 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.备注 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="200px" fixed="right">
+            <template slot-scope="scope">
+              <el-button size="mini" type="primary" class="el-icon-edit" @click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
+              <el-button size="mini" type="danger" class="el-icon-delete" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block">
+          <el-pagination
+            v-if="!loading2"
+            :current-page="pageCurrent2"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="pageSize2"
+            :total="total2"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange2"
+            @current-change="handleCurrentChange2"/>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+
+    <el-dialog :title="title1" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="700px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px" class="demo-ruleForm">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="发票号" prop="发票号">
+              <el-input v-model="form.发票号" placeholder="发票号" style="width:200px" clearable size="small"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开票金额" prop="开票金额">
+              <el-input v-model="form.开票金额" placeholder="开票金额" style="width:200px" clearable size="small"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="开票时间" prop="开票时间">
+              <el-date-picker
+                v-model="form.开票时间"
+                style="width:200px"
+                size="small"
+                type="date"
+                value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd"
+                clearable
+                placeholder="开票时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开户行" prop="开户行">
+              <el-input v-model="form.开户行" placeholder="开户行" style="width:200px" clearable size="small" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="接收人" prop="接收人">
+              <el-input v-model="form.接收人" placeholder="接收人" style="width:200px" clearable size="small"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="接收时间" prop="接收时间">
+              <el-date-picker
+                v-model="form.接收时间"
+                style="width:200px"
+                size="small"
+                type="date"
+                value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd"
+                clearable
+                placeholder="接收时间"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="备注">
+              <el-input v-model="form.备注" :rows="2" placeholder="备注" type="textarea" style="width:527px" clearable size="small"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="callOff('form')">取消</el-button>
+        <el-button type="primary" @click="submit('form')" >确定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogFormVisible2" title="付款" center style="min-height: 300px" width="500px">
+      <el-form ref="form2" :model="form2" :rules="rules" label-position="left" label-width="90px" class="demo-ruleForm">
+        <el-form-item label="付款金额" prop="付款金额" style="margin-left: 80px">
+          <el-input v-model="form2.付款金额" placeholder="付款金额" size="small" style="width:200px"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="备注" style="margin-left: 80px">
+          <el-input :autosize="{ minRows: 2, maxRows: 4}" v-model="form2.备注" type="textarea" placeholder="备注" size="small" style="width:200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="callOff2('form2')">取消</el-button>
+        <el-button type="primary" @click="submit2('form2')">确定</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { initOutHelp, searchtable, getParts, edittype, handlechange, handledelete, getParts3, outPay, edit, handledelete3 } from '@/api/Outsourcing/OutsourcingPaymentPlanManagement2'
+export default {
+  data() {
+    return {
+      factury: '',
+      fukuanshijian: '',
+      title1: '',
+      dialogFormVisible: false,
+      renwudan: '',
+      count1: 0,
+      count2: 0,
+      count3: 0,
+      count4: 0,
+      form: {
+        发票号: '',
+        开户行: '',
+        开票时间: '',
+        开票金额: '',
+        接收人: '',
+        接收时间: '',
+        备注: ''
+      },
+      实际付款时间: '',
+      loading: false,
+      loading2: false,
+      loading3: false,
+      zhongjianbianliang1: '',
+      zhongjianbianliang2: '',
+      dialogFormVisible2: false,
+      form2: {
+        付款金额: '',
+        备注: ''
+      },
+      rules: {
+        发票号: [{ required: true, message: '请输入发票号', trigger: 'blur' }],
+        开票金额: [{ required: true, message: '请输入开票金额', trigger: 'blur' }],
+        扣款说明: [{ required: true, message: '请输入扣款说明', trigger: 'blur' }],
+        付款金额: [{ required: true, message: '请输入扣款说明', trigger: 'blur' }]
+      },
+      date1: '',
+      date2: '',
+      date3: '',
+      date4: '',
+      FormNumber: '',
+      ManufacturerNameValue: '',
+      ManufacturerName: [], // 厂家名称
+      FormNumber_check: false,
+      ManufacturerNameValue_check: false,
+      date1_check: false,
+      date3_check: false,
+      tableData: [], // 表格数据
+      total: null, // 总条数
+      pageSize: 10, // 每页显示条数
+      pageCurrent: 1, // 后台获取页
+      tableData2: [], // 表格数据
+      total2: null, // 总条数
+      pageSize2: 10, // 每页显示条数
+      pageCurrent2: 1, // 后台获取页
+      tableData3: [], // 表格数据
+      total3: null, // 总条数
+      pageSize3: 10, // 每页显示条数
+      pageCurrent3: 1 // 后台获取页
+    }
+  },
+  created() {
+    this.fetchData()
+    this.searchTable()
+  },
+  methods: {
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总金额'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        if (!values.every(value => isNaN(value))) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ' 元'
+        } else {
+          sums[index] = ''
+        }
+      })
+      return sums
+    },
+    // 初始化外协厂家
+    fetchData() {
+      this.ManufacturerName = []
+      initOutHelp().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.ManufacturerName.push({
+            label: response.data[i].外协厂家名称,
+            value: response.data[i].外协厂家流水号
+          })
+        }
+      })
+    },
+    // 查询表格数据
+    searchTable() {
+      this.loading = true
+      if (this.ManufacturerNameValue === '' || this.ManufacturerNameValue === null) {
+        this.ManufacturerNameValue_check = 0
+      } else {
+        this.ManufacturerNameValue_check = 1
+      }
+      this.tableData = []
+      this.tableData2 = []
+      this.tableData3 = []
+      searchtable(this.ManufacturerNameValue_check, this.ManufacturerNameValue, this.pageCurrent, this.pageSize).then(response => {
+        this.tableData = response.data.rows
+        this.total = response.data.total
+      }).then(() => {
+        this.loading = false
+      })
+    },
+    getParts3(row) {
+      this.loading3 = true
+      this.tableData3 = []
+      this.zhongjianbianliang1 = row.外协厂家流水号
+      getParts3(row.外协厂家流水号, this.pageCurrent3, this.pageSize3).then(response => {
+        for (let i = 0; i < response.data.rows.length; i++) {
+          response.data.rows[i].付款日期 = response.data.rows[i].付款日期.split(' ')[0]
+        }
+        this.tableData3 = response.data.rows
+        this.total3 = response.data.total
+      }).then(() => {
+        this.loading3 = false
+      })
+      this.loading2 = true
+      this.tableData2 = []
+      this.zhongjianbianliang2 = row.外协厂家流水号
+      getParts(this.zhongjianbianliang2, this.pageCurrent2, this.pageSize2).then(response => {
+        for (let i = 0; i < response.data.rows.length; i++) {
+          response.data.rows[i].开票时间 = response.data.rows[i].开票时间.substring(0, response.data.rows[i].开票时间.indexOf(' '))
+          response.data.rows[i].接收时间 = response.data.rows[i].接收时间.substring(0, response.data.rows[i].接收时间.indexOf(' '))
+        }
+        this.tableData2 = response.data.rows
+        this.total2 = response.data.total
+      }).then(() => {
+        this.loading2 = false
+      })
+    },
+    getParts4() {
+      this.loading3 = true
+      this.tableData3 = []
+      getParts3(this.zhongjianbianliang1, this.pageCurrent3, this.pageSize3).then(response => {
+        for (let i = 0; i < response.data.rows.length; i++) {
+          response.data.rows[i].付款日期 = response.data.rows[i].付款日期.split(' ')[0]
+        }
+        this.tableData3 = response.data.rows
+        this.total3 = response.data.total
+      }).then(() => {
+        this.loading3 = false
+      })
+    },
+    // 新增付款打开
+    payment(row, formName) {
+      this.param2 = 0
+      this.count3 = this.count3 + 1
+      if (this.count3 !== 1) {
+        this.$refs[formName].resetFields()
+      }
+      this.factury = row.外协厂家流水号
+      var time = new Date()
+      var month = time.getMonth() + 1
+      var day = time.getDate()
+      if (month >= 1 && month <= 9) {
+        month = '0' + month
+      }
+      if (day >= 1 && day <= 9) {
+        day = '0' + day
+      }
+      this.payDate = time.getFullYear() + '/' + month + '/' + day
+      this.form2.付款金额 = ''
+      this.form2.备注 = ''
+      this.dialogFormVisible2 = true
+    },
+    // 新增付款确定
+    outPay() {
+      outPay(this.factury, this.form2.付款金额, this.payDate, this.form2.备注).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('信息增加成功')
+          this.searchTable()
+          this.getParts4()
+        } else {
+          this.$message.error('信息增加失败')
+        }
+      })
+    },
+    // 编辑付款打开
+    handleChange3(row, formName) {
+      this.param2 = 1
+      this.count4 = this.count4 + 1
+      if (this.count4 !== 1) {
+        this.$refs[formName].resetFields()
+      }
+      this.factury = row.外协付款流水号
+      this.form2.付款金额 = row.付款金额
+      this.form2.备注 = row.备注
+      this.dialogFormVisible2 = true
+    },
+    // 编辑付款确定
+    edit() {
+      edit(this.factury, this.form2.付款金额, this.form2.备注).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('信息修改成功')
+          this.searchTable()
+          this.getParts4()
+        } else {
+          this.$message.error('信息修改失败')
+        }
+      })
+      this.dialogFormVisible = false
+    },
+    // 删除
+    handleDelete3(index, row) {
+      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        handledelete3(row.外协付款流水号).then(response => {
+          if (this.tableData3 && this.tableData3.length === 1 && this.pageCurrent3 > 1) {
+            this.pageCurrent3--
+          }
+          if (response.data[0].result === '1') {
+            this.$message.success('信息删除成功')
+            this.searchTable()
+            this.getParts4()
+          } else {
+            this.$message.error('信息删除失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    submit2(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.param2 === 0) {
+            this.outPay()
+            this.dialogFormVisible2 = false
+          } else {
+            this.edit()
+            this.dialogFormVisible2 = false
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    callOff2(formName) {
+      this.dialogFormVisible2 = false
+      this.$refs[formName].resetFields()
+    },
+    // 获取表格2数据
+    getParts2() {
+      this.loading2 = true
+      this.tableData2 = []
+      getParts(this.zhongjianbianliang2, this.pageCurrent2, this.pageSize2).then(response => {
+        for (let i = 0; i < response.data.rows.length; i++) {
+          response.data.rows[i].开票时间 = response.data.rows[i].开票时间.substring(0, response.data.rows[i].开票时间.indexOf(' '))
+          response.data.rows[i].接收时间 = response.data.rows[i].接收时间.substring(0, response.data.rows[i].接收时间.indexOf(' '))
+        }
+        this.tableData2 = response.data.rows
+        this.total2 = response.data.total
+      }).then(() => {
+        this.loading2 = false
+      })
+    },
+    // 增加发票
+    editType1(row, formName) {
+      this.count1 = this.count1 + 1
+      if (this.count1 !== 1) {
+        this.$refs[formName].resetFields()
+      }
+      this.title1 = '增加'
+      this.renwudan = row.外协厂家流水号
+      this.form.发票号 = ''
+      this.form.开户行 = ''
+      this.form.开票时间 = ''
+      this.form.开票金额 = ''
+      this.form.接收人 = ''
+      this.form.接收时间 = ''
+      this.form.备注 = ''
+      this.dialogFormVisible = true
+    },
+    // 增加确定
+    editType() {
+      edittype(this.renwudan, this.form.发票号, this.form.开户行, this.form.开票时间, this.form.开票金额, this.form.接收人, this.form.接收时间, this.form.备注).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.error('信息增加成功')
+          this.getParts2()
+        } else {
+          this.$message.error('信息增加失败')
+        }
+      })
+      this.dialogFormVisible = false
+    },
+    // 编辑发票
+    handleChange1(index, row, formName) {
+      this.count2 = this.count2 + 1
+      if (this.count2 !== 1) {
+        this.$refs[formName].resetFields()
+      }
+      this.form.发票号 = row.发票号
+      this.form.开户行 = row.开户行
+      this.form.开票时间 = row.开票时间
+      this.form.开票金额 = row.开票金额
+      this.form.接收人 = row.接收人
+      this.form.接收时间 = row.接收时间
+      this.form.备注 = row.备注
+      this.dialogFormVisible = true
+      this.title1 = '编辑'
+      this.CoManufacturerFlowNumber1 = row.id
+    },
+    // 编辑确定
+    handleChange() {
+      handlechange(this.CoManufacturerFlowNumber1, this.form.发票号, this.form.开户行, this.form.开票时间, this.form.开票金额, this.form.接收人, this.form.接收时间, this.form.备注).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('信息编辑成功')
+          this.getParts2()
+        } else {
+          this.$message.error('信息修改失败')
+        }
+      })
+      this.dialogFormVisible = false
+    },
+    // 提交添加或者修改
+    submit(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.param === 0) {
+            this.editType()
+          } else {
+            this.handleChange()
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    // 重置表单
+    callOff(formName) {
+      this.dialogFormVisible = false
+      this.$refs[formName].resetFields()
+    },
+    // 删除
+    handleDelete(index, row) {
+      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        handledelete(row.id).then(response => {
+          if (this.tableData2 && this.tableData2.length === 1 && this.pageCurrent2 > 1) {
+            this.pageCurrent2--
+          }
+          if (response.data[0].result === '1') {
+            this.$message.success('信息删除成功')
+            this.getParts2()
+          } else {
+            this.$message.error('信息删除失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchTable()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchTable()
+    },
+    handleSizeChange2(val) {
+      this.pageCurrent2 = 1
+      this.pageSize2 = val
+      this.getParts2()
+    },
+    handleCurrentChange2(val) {
+      this.pageCurrent2 = val
+      this.tableData2 = []
+      this.getParts2()
+    },
+    handleSizeChange3(val) {
+      this.pageCurrent3 = 1
+      this.pageSize3 = val
+      this.getParts3()
+    },
+    handleCurrentChange3(val) {
+      this.pageCurrent3 = val
+      this.getParts3()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .el-card{
+    margin-bottom: 10px;
+  }
+  .el-table .fukuan {
+    background: #AEF199;
+  }
+</style>
+
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -404,7 +404,7 @@

    <el-dialog :visible.sync="dialogFormVisible1" title="外协厂家" center width="500px" height="600px">
      <div align="center">
-        <el-input v-model="input" size="small" style="width:200px"/>
+        <el-input v-model="input" size="small" clearable style="width:200px"/>
        <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="searchData()">查询</el-button>
      </div>
      <el-table :data="List2" max-height="370" highlight-current-row @row-click="handleCurrentChange3">
@@ -1207,14 +1207,12 @@ export default {
    },
    // 成交
    Deal() {
-      this.documentStatus = 2
-      this.sign = 1
      this.$confirm('成交后单据不可修改, 确定成交吗?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
-        editData1(this.Number, this.ManufactorNumber, this.freight, this.documentStatus, this.sign, this.Explain).then(response => {
+        editData1(this.Number, this.ManufactorNumber, this.freight, this.Explain).then(response => {
          if (response.data[0].result === '1') {
            this.$message.success('提交成功')
            this.fetchData()
@@ -1265,7 +1263,7 @@ export default {
    },
    // 提交编辑
    submitEdit() {
-      editData(this.Number, this.ManufactorNumber1, this.form.运费, this.documentStatus, 1, this.Explain).then(response => {
+      editData(this.Number, this.ManufactorNumber1, this.form.运费, this.Explain).then(response => {
        if (response.data[0].result === '1') {
          this.$message.success('编辑成功')
          this.dialogFormVisible = false
@@ -1436,7 +1434,8 @@ export default {
    handleSelectionChange(val) {
      this.processNum = val
    },
-    getSpareParts() { // 选入零件
+    // 选入零件
+    getSpareParts() {
      if (this.Number !== null) {
        this.result = 0
        for (let i = 0; i < this.processNum.length; i++) {
--- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
@@ -315,7 +315,6 @@ export default {
          for (let i = 0; i < this.gongxulsh.length; i++) {
            handlechange(this.gongxulsh[i].工序流水号, '0000')
            if (i === this.gongxulsh.length - 1) {
-              console.log(1)
              shouhuo(row.外协加工任务单流水号).then(response => {
                if (response.data[0].result === '1') {
                  this.fetchData()
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -2,22 +2,32 @@
  <div>
    <el-card>
      <el-row>
-        <span>项目名称:</span>
-        <el-select v-model="entryNameValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="项目名称" @change="typeChange()">
-          <el-option
-            v-for="item in entryName"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
+        <!--<span>项目名称:</span>-->
+        <!--<el-select v-model="entryNameValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="项目名称" @change="typeChange()">-->
+        <!--<el-option-->
+        <!--v-for="item in entryName"-->
+        <!--:key="item.value"-->
+        <!--:label="item.label"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
        <span>机床名称:</span>
-        <el-select v-model="toolNumValue" clearable filterable size="small" placeholder="机床号" style="margin-bottom:10px" @change="typeChange1()">
+        <el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="typeChange1()">
          <el-option
            v-for="item in toolNum"
            :key="item.value"
            :label="item.label"
-            :value="item.value"/>
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
+          </el-option>
        </el-select>
+        <!--<el-select v-model="toolNumValue" clearable filterable size="small" placeholder="机床号" style="margin-bottom:10px" @change="typeChange1()">-->
+        <!--<el-option-->
+        <!--v-for="item in toolNum"-->
+        <!--:key="item.value"-->
+        <!--:label="item.label"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
        <span>分组:</span>
        <el-select v-model="NumValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="机床组号">
          <el-option
@@ -79,7 +89,7 @@
    </el-card>

    <el-card>
-      <el-table v-loading="loading2" :data="tableData2" height="350" style="width: 100%;" border element-loading-text="拼命加载中">
+      <el-table v-loading="loading2" :data="tableData2" height="350" style="width: 100%;" border element-loading-text="拼命加载中" size="small">
        <el-table-column
          label=" "
          type="index"
@@ -88,14 +98,14 @@
        <el-table-column label="加工状态" width="100" align="center">
          <template slot-scope="scope">
            <el-tag v-if="parseInt(scope.row.工序状态)===3" type="success" size="small">未加工</el-tag>
-            <el-tag v-if="parseInt(scope.row.工序状态)===4" size="small">已完成</el-tag>
+            <el-tag v-if="parseInt(scope.row.工序状态)===4&&parseInt(scope.row.工艺编号)!==29" size="small">已完成</el-tag>
            <el-tag v-if="parseInt(scope.row.工艺编号)===29" size="small">备料</el-tag>
            <el-tag v-if="parseInt(scope.row.工序状态)===5" size="small">停产</el-tag>
          </template>
        </el-table-column>
        <el-table-column label="序间外协" width="100" align="center">
          <template slot-scope="scope">
-            <el-checkbox :disabled="parseInt(scope.row.工序状态)!==3" v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)">选择</el-checkbox>
+            <el-checkbox :disabled="parseInt(scope.row.工序状态)!==3||parseInt(scope.row.工艺编号)===29" v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)">选择</el-checkbox>
          </template>
        </el-table-column>
        <el-table-column label="是否外协" width="100" align="center">
@@ -166,7 +176,7 @@ export default {
    }
  },
  created() {
-    this.fetchData()
+    this.typeChange()
    this.searchTable()
  },
  methods: {
@@ -187,11 +197,12 @@ export default {
      this.toolNum = []
      this.NumValue = ''
      this.Num = []
-      getToolNum(this.entryNameValue).then(response => {
+      getToolNum().then(response => {
        for (let i = 0; i < response.data.length; i++) {
          this.toolNum.push({
            label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
+            value: response.data[i].机床流水号,
+            value2: response.data[i].项目名称
          })
        }
      })
@@ -244,6 +255,7 @@ export default {
      this.checkBox = []
      this.tableData2 = []
      searchTable2(row.工艺计划流水号).then(response => {
+        console.log(response.data)
        this.num1 = row.工艺计划流水号
        if (response.data.length === 0) {
          this.loading0 = false
				`@@ -0,0 +1 @@`
				<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543302138984" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1877" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M762.503311 141.113925c-14.285355-9.653871-33.714869-5.90243-43.363623 8.393157-9.658987 14.295588-5.907547 33.709753 8.388041 43.367717 106.359376 71.861678 169.863712 191.280488 169.863712 319.443449 0 212.412784-172.811858 385.220548-385.220548 385.220548S126.956484 724.732056 126.956484 512.318248c0-128.168078 63.49922-247.586888 169.858596-319.443449 14.295588-9.658987 18.057261-29.073152 8.398274-43.363623-9.648754-14.295588-29.073152-18.052145-43.363623-8.398274C138.267087 224.602408 64.488757 363.373984 64.488757 512.318248c0 246.854201 200.827935 447.687252 447.682136 447.687252S959.859167 759.173472 959.859167 512.318248C959.859167 363.373984 886.075721 224.607524 762.503311 141.113925z" p-id="1878"></path><path d="M400.698055 64.636113c-17.248849 0-31.233352 13.984503-31.233352 31.233352l0 30.470989c0 17.248849 13.985526 31.233352 31.233352 31.233352 17.248849 0 31.233352-13.985526 31.233352-31.233352L431.931407 95.869465C431.931407 78.621639 417.946904 64.636113 400.698055 64.636113z" p-id="1879"></path><path d="M623.649869 64.636113c-17.248849 0-31.233352 13.984503-31.233352 31.233352l0 30.470989c0 17.248849 13.985526 31.233352 31.233352 31.233352 17.248849 0 31.233352-13.985526 31.233352-31.233352L654.883221 95.869465C654.883221 78.621639 640.897695 64.636113 623.649869 64.636113z" p-id="1880"></path><path d="M425.695379 227.656977c11.209296 18.047028 41.974997 48.588625 86.157265 48.588625 43.958164 0 75.100442-30.3134 86.573751-48.223305 9.302877-14.528901 5.068436-33.846876-9.455349-43.149752-14.544251-9.29776-33.846876-5.063319-43.149752 9.455349-0.121773 0.198521-13.379729 19.449981-33.968649 19.449981-20.008706 0-32.443923-18.127869-33.276894-19.373233-9.165754-14.427594-28.285207-18.799158-42.829458-9.760295C421.089477 193.749726 416.59 213.006302 425.695379 227.656977z" p-id="1881"></path><path d="M356.00311 591.05859c-17.248849 0-31.233352 13.984503-31.233352 31.233352s13.984503 31.233352 31.233352 31.233352L480.93754 653.525294l0 98.250698c0 17.248849 13.984503 31.238468 31.233352 31.238468 17.248849 0 31.233352-13.989619 31.233352-31.238468l0-98.250698 124.93443 0c17.248849 0 31.238468-13.984503 31.238468-31.233352s-13.989619-31.233352-31.238468-31.233352L543.405267 591.05859l0-83.289961 124.93443 0c17.248849 0 31.238468-13.985526 31.238468-31.233352 0-17.248849-13.989619-31.233352-31.238468-31.233352l-80.761372 0 68.041676-68.038606c12.20088-12.20088 12.20088-31.976272 0.005117-44.171012-12.195763-12.20088-31.976272-12.195763-44.171012-0.005117l-99.280144 99.276051-99.280144-99.276051c-12.190647-12.190647-31.971156-12.195763-44.171012 0.005117-12.195763 12.195763-12.195763 31.971156 0.005117 44.171012l68.041676 68.038606-80.766488 0c-17.248849 0-31.233352 13.984503-31.233352 31.233352 0 17.248849 13.984503 31.233352 31.233352 31.233352L480.93754 507.768629l0 83.289961L356.00311 591.05859z" p-id="1882"></path></svg>