Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

src/api/Assembly/AssemblyInformationInput.js

@@ -11,18 +11,6 @@ export function initProject() {
     }
   })
 }
-// 机床查询
-export function searchMachine(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '车间装配管理_机床_查询数据',
-      param: '项目流水号=' + num
-    }
-  })
-}
 // 查询组件工艺
 export function searchDetail(num) {
   return request({

src/api/Assembly/AssemblyPlan.js

@@ -11,27 +11,15 @@ export function initProject() {
     }
   })
 }
-// 机床查询
-export function searchmachine(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '车间装配管理_计划下达_机床_查询数据',
-      param: '项目流水号=' + num
-    }
-  })
-}
 // 主表查询
-export function searchTable(check, projectValue, check1, machineNumberValue, check2, time, time1, pageCurrent, pageSize) {
+export function searchTable(check1, machineNumberValue, check2, time, time1, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间装配管理_计划信息_查询数据',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + projectValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machineNumberValue + '&计划完成日期_check=' + check2 + '=int&开始时间=' + time + '&结束时间=' + time1,
+      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machineNumberValue + '&计划完成日期_check=' + check2 + '=int&开始时间=' + time + '&结束时间=' + time1,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/Assembly/AssemblyProcessAssignment.js

@@ -11,18 +11,6 @@ export function initProject() {
     }
   })
 }
-// 机床查询
-export function searchmachine(num, check) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: 'PDM_机床名称_查询数据',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + num
-    }
-  })
-}
 export function initPerson() {
   return request({
     url: '',
@@ -35,14 +23,14 @@ export function initPerson() {
   })
 }
 // 主表查询
-export function searchTable(check, projectValue, check1, machineNumberValue, pageCurrent, pageSize) {
+export function searchTable(check1, machineNumberValue, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间装配管理_工艺任务_查询数据',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + projectValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machineNumberValue,
+      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machineNumberValue,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/Assembly/PrintingAssemblyProcessCard.js

@@ -11,18 +11,6 @@ export function initProject() {
     }
   })
 }
-// 机床查询
-export function searchMachine(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '车间装配管理_机床_查询数据',
-      param: '项目流水号=' + num
-    }
-  })
-}
 // 查询组件工艺
 export function searchDetail(num) {
   return request({
@@ -48,14 +36,14 @@ export function searchProcess(num) {
   })
 }
 // 主表查询
-export function searchTable(check, projectValue, check1, machineNumberValue, pageCurrent, pageSize) {
+export function searchTable(check1, machineNumberValue, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间装配管理_项目打印_查询数据',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + projectValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machineNumberValue,
+      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machineNumberValue,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/ManufacturingCenter/InitialProduction.js

@@ -13,14 +13,14 @@ export function getEntryNameValue() {
   })
 }
 // 机床名称
-export function getToolNum(num) {
+export function getToolNum() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据',
-      param: '项目流水号=' + num + '=int&是否传递=1=int'
+      name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
+      param: '是否传递=1'
     }
   })
 }

src/api/ManufacturingCenter/MachiningSequenceAdjustment.js

@@ -1,13 +1,48 @@
 import request from '@/utils/request'
-// 初始化 项目名称
-export function searchtable() {
+// 初始化 工位
+export function getMachine() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_项目名称_查询数据',
-      param: '考核状态=5=int'
+      name: '车间生产管理工艺_加工顺序调整_查询工位'
+    }
+  })
+}
+export function searchtable(num, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'MES_机加工MES_记录零件待加工显示',
+      param: 'MES终端编号=' + num,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 调序
+export function Order(num1, num2, num3) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: 'MES_机加工MES_待加工区列表_排序',
+      param: 'MES终端编号=' + num1 + '&排序ID=' + num2 + '&排序类型=' + num3
+    }
+  })
+}
+// 调序权限
+export function JurisdictionControl(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_加工顺序调整_更改权限',
+      param: 'MES终端号=' + num1 + '&变更类型=' + num2
     }
   })
 }

src/api/ManufacturingCenter/PartAssignment.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 初始化项目
+// 初始化机床项目
 export function initProject() {
   return request({
     url: '',
@@ -11,18 +11,6 @@ export function initProject() {
     }
   })
 }
-// 机床查询
-export function searchmachine(num, check) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: 'PDM_机床名称_查询数据',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + num
-    }
-  })
-}
 // 组件查询
 export function searchgroup(num) {
   return request({
@@ -35,14 +23,14 @@ export function searchgroup(num) {
     }
   })
 }
-export function searchTable(projectValue, check1, machineNumberValue, check2, groupNumberValue, check3) {
+export function searchTable(machineNumberValue, check2, groupNumberValue, check3) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间管理_基本件采购_查询数据',
-      param: '项目流水号_check=' + check1 + '&项目流水号=' + projectValue + '&机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue + '&组件流水号_check=' + check3 + '&组件流水号=' + groupNumberValue
+      param: '机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue + '&组件流水号_check=' + check3 + '&组件流水号=' + groupNumberValue
     }
   })
 }
@@ -79,25 +67,25 @@ export function searchTable1(PurchaseOrder, check4) {
     }
   })
 }
-export function addData(num, num1, num2, id, time) {
+export function addData(num1, num2, id, time) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间管理_基本件采购_请购单_增加数据',
-      param: '请购单编号=' + num + '&请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&请购时间=' + time
+      param: '请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&请购时间=' + time
     }
   })
 }
-export function editData(RequisitionList, num, num1, time) {
+export function editData(RequisitionList, num1, time) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间管理_基本件采购_请购单_编辑数据',
-      param: '请购单流水号=' + RequisitionList + '&请购单编号=' + num + '&请购车间=' + num1 + '&请购时间=' + time
+      param: '请购单流水号=' + RequisitionList + '&请购车间=' + num1 + '&请购时间=' + time
     }
   })
 }
@@ -145,14 +133,14 @@ export function purchaseRequisition(RequisitionList, projectName, projectFloatVa
     }
   })
 }
-export function purchaseRequisition1(RequisitionList, projectName, projectFloatValue, MachineToolNumber, machineFloatValue, groupName, groupFloatValue, StandardPartsAndOutsourcing, MaterialName, MaterialSpecification, MaterialModel, NumberOfParts, PartType, time, MaterialNum, ReMarks) {
+export function purchaseRequisition1(RequisitionList, projectName, projectFloatValue, MachineToolNumber, machineFloatValue, groupName, groupFloatValue, StandardPartsAndOutsourcing, MaterialName, MaterialCode, MaterialSpecification, MaterialModel, NumberOfParts, PartType, time, MaterialNum, ReMarks) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间管理_基本件采购_请购单明细_请购',
-      param: '请购单流水号=' + RequisitionList + '&项目名称=' + projectName + '&项目流水号=' + projectFloatValue + '&机床图号=' + MachineToolNumber + '&机床流水号=' + machineFloatValue + '&组号=' + groupName + '&组件流水号=' + groupFloatValue + '&标准件和外购件流水号=' + StandardPartsAndOutsourcing + '&物料名称=' + MaterialName + '&物料规格=' + MaterialSpecification + '&物料型号=' + MaterialModel + '&零件数量=' + NumberOfParts + '&零件类型=' + PartType + '&物料计划到货时间=' + time + '&物料流水号=' + MaterialNum + '&备注=' + ReMarks
+      param: '请购单流水号=' + RequisitionList + '&项目名称=' + projectName + '&项目流水号=' + projectFloatValue + '&机床图号=' + MachineToolNumber + '&机床流水号=' + machineFloatValue + '&组号=' + groupName + '&组件流水号=' + groupFloatValue + '&标准件和外购件流水号=' + StandardPartsAndOutsourcing + '&物料名称=' + MaterialName + '&物料代码=' + MaterialCode + '&物料规格=' + MaterialSpecification + '&物料型号=' + MaterialModel + '&零件数量=' + NumberOfParts + '&零件类型=' + PartType + '&物料计划到货时间=' + time + '&物料流水号=' + MaterialNum + '&备注=' + ReMarks
     }
   })
 }
@@ -275,3 +263,25 @@ export function Delete1(num) {
     }
   })
 }
+export function editStock(num, num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '零件分配_标准件和外购件_使用库存',
+      param: '标准件和外购件流水号=' + num + '&数量=' + num1 + '&零件数量=' + num2
+    }
+  })
+}
+export function editNum(num, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间管理_标准件和外购件_更改数量',
+      param: '请购单明细流水号=' + num + '&数量=' + num1
+    }
+  })
+}

src/api/ManufacturingCenter/ProcessPlanning.js

@@ -382,3 +382,15 @@ export function searchRecord(num) {
     }
   })
 }
+// 重量拷贝
+export function WeightCopy(num, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_重量拷贝_工艺计划流水号',
+      param: '工艺计划流水号=' + num + '&重量信息=' + num2
+    }
+  })
+}

src/api/ManufacturingCenter/ProcessTaskAssignment.js

@@ -24,14 +24,14 @@ export function getProject0() {
   })
 }
 // 获取机床图号（全部）
-export function getGraphNum(num) {
+export function getGraphNum() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据',
-      param: '项目流水号=' + num + '&是否传递=2&考核状态=3&工艺任务分配状态=1&定额任务分配状态=1&单件是否外协=0'
+      name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
+      param: '是否传递=2&考核状态=3&工艺任务分配状态=1&定额任务分配状态=1&单件是否外协=0'
     }
   })
 }

src/api/ManufacturingCenter/ProcessingStatus.js

@@ -11,15 +11,15 @@ export function getNames() {
     }
   })
 }
-
-export function getMachines(gongyi) {
+// 机床名称
+export function getMachines() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床',
-      param: '项目流水号=' + gongyi + '=int'
+      name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
+      param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
     }
   })
 }

src/api/ManufacturingCenter/ProcessingStatusEdit.js

@@ -11,14 +11,14 @@ export function getNames() {
   })
 }
 
-export function getMachines(gongyi) {
+export function getMachines() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床',
-      param: '项目流水号=' + gongyi + '=int'
+      name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
+      param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
     }
   })
 }

src/api/ManufacturingCenter/ProductionCapacityBalance.js

@@ -11,15 +11,15 @@ export function getEntryNameValue() {
     }
   })
 }
-// 项目名称
-export function getToolNum(num) {
+// 机床名称
+export function getToolNum() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据',
-      param: '项目流水号=' + num + '=int&是否传递=2=int&考核状态=5=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
+      name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
+      param: '是否传递=2=int&考核状态=5=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
     }
   })
 }

src/api/MarketingCenter/ComprehensiveInquiryMS.js

@@ -31,14 +31,14 @@ export function SelectMarketingManager(code) {
     }
   })
 }
-export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8) {
+export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '合同信息管理_合同信息_查询',
-      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date',
+      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string',
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/Outsourcing/OutFactoryMaintenance.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询按钮功能实现
+// 查询
 export function searchtable(pageCurrent, pageSize, num1, ManufacturerNumber, num2, ManufacturerName, num10, ManufacturerAbbreviation, num3, address, num4, roleName, num5, phNumber, num6, Fax, num7, Remarks, num8, category, num11, attention, num9, EquipmentCondition) {
   return request({
     url: '',
@@ -13,7 +13,7 @@ export function searchtable(pageCurrent, pageSize, num1, ManufacturerNumber, num
     }
   })
 }
-// 增加按钮功能
+// 增加
 export function edittype(ManufacturerNumber, ManufacturerName, ManufacturerAbbreviation, address, roleName, phNumber, Fax, Remarks, category, attention, EquipmentCondition) {
   return request({
     url: '',
@@ -25,7 +25,7 @@ export function edittype(ManufacturerNumber, ManufacturerName, ManufacturerAbbre
     }
   })
 }
-// 编辑按钮功能
+// 编辑
 export function handlechange(CoManufacturerFlowNumber, ManufacturerNumber, ManufacturerName, ManufacturerAbbreviation, address, roleName, phNumber, Fax, Remarks, category, attention, EquipmentCondition) {
   return request({
     url: '',
@@ -37,7 +37,7 @@ export function handlechange(CoManufacturerFlowNumber, ManufacturerNumber, Manuf
     }
   })
 }
-// 删除按钮功能
+// 删除
 export function handledelete(CoManufacturerFlowNumber) {
   return request({
     url: '',

src/api/TechnologyCenter/ImportParts.js

@@ -325,3 +325,14 @@ export function transferWG(groupNum, materialNum, totalNum, remarks, mark, desig
     }
   })
 }
+export function searchMaterial1(num, name, Specifications) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_零件明细表_标准件和外购件_物料对比',
+      param: `图号或者型号=${num}&名称=${name}&规格=${Specifications}`
+    }
+  })
+}

src/api/WorkshopProcurement/CreatingProcurementContracts.js

@@ -79,14 +79,14 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c
   })
 }
 // 生成采购合同
-export function doneContract(num1, RequisitionNumber, name1, time1, time2, num2, text, freight, num3, partsNum, priceGroup, taxGroup, currency, num4, id, AdvanceCharge) {
+export function doneContract(num1, RequisitionNumber, name1, time1, time2, num2, text, freight, num3, partsNum, priceGroup, taxGroup, currency, num4, id, singleQuota, readyQuota, AdvanceCharge) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间管理_基本件采购_请购单和请购单明细_增加数据',
-      param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&税率组=${taxGroup}&币种流水号组=${currency}&预付款=${AdvanceCharge}`
+      param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&税率组=${taxGroup}&币种流水号组=${currency}&单件定额工时组=${singleQuota}&准结定额工时组=${readyQuota}&预付款=${AdvanceCharge}`
     }
   })
 }

src/api/WorkshopProcurement/ProjectTotalSearch.js

@@ -12,18 +12,6 @@ export function initProject() {
   })
 }
 // 初始化项目金额统计表
-export function searchProjectTotal(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '采购管理_项目总价_明细_查询数据',
-      param: `项目流水号=${num}`
-    }
-  })
-}
-// 初始化项目金额统计表
 export function searchProjectTotal1(num) {
   return request({
     url: '',

src/views/Assembly/AssemblyInformationInput/index.vue

@@ -2,21 +2,16 @@
   <div class="app-container">
     <el-card style="margin-bottom: 20px">
       <el-row>
-        <span>项目名称:</span>
-        <el-select v-model="projectValue" filterable clearable size="small" placeholder="项目名称" @change="searchMachine">
-          <el-option
-            v-for="item in project"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
         <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" placeholder="机床编号" size="small" filterable clearable>
+        <el-select v-model="machineNumberValue" filterable clearable placeholder="机床编号" size="small">
           <el-option
             v-for="item in machineNumber"
             :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.name }}</div>
+          </el-option>
         </el-select>
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="searchDetail()">查询</el-button>
       </el-row>
@@ -144,13 +139,11 @@
 </template>
 
 <script>
-import { initProject, searchMachine, searchDetail, searchProcess, update, getTree, fn, getTable8 } from '@/api/Assembly/AssemblyInformationInput'
+import { initProject, searchDetail, searchProcess, update, getTree, fn, getTable8 } from '@/api/Assembly/AssemblyInformationInput'
 
 export default {
   data() {
     return {
-      projectValue: '',
-      project: [],
       machineNumberValue: '',
       machineNumber: [],
       floatNum: '',
@@ -177,23 +170,19 @@ export default {
   },
   methods: {
     fetchData() {
-      this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
-      getTree().then(response => { // 获取人员信息树
-        const data = response.data
-        this.data2 = fn(data, 0)
-      })
-    },
-    searchMachine() { // 根据条件查机床编号
-      this.machineNumberValue = ''
-      this.machineNumber = []
-      searchMachine(this.projectValue).then(response => {
+      initProject().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.machineNumber.push({
             label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })
+      getTree().then(response => { // 获取人员信息树
+        const data = response.data
+        this.data2 = fn(data, 0)
+      })
     },
     async searchDetail() { // 主表查询
       this.dataAll = []

src/views/Assembly/AssemblyPlan/index.vue

@@ -1,21 +1,16 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>项目名称:</span>
-      <el-select v-model="projectValue" filterable clearable size="small" placeholder="项目名称" @change="projectChange">
-        <el-option
-          v-for="item in project"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
       <span>机床编号:</span>
-      <el-select v-model="machineNumberValue" placeholder="机床编号" size="small" clearable>
+      <el-select v-model="machineNumberValue" filterable clearable placeholder="机床编号" size="small">
         <el-option
           v-for="item in machineNumber"
           :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.name }}</div>
+        </el-option>
       </el-select>
       <span>计划完成日期:</span>
       <el-date-picker
@@ -86,7 +81,7 @@
 </template>
 
 <script>
-import { initProject, searchmachine, searchTable, goDown } from '@/api/Assembly/AssemblyPlan'
+import { initProject, searchTable, goDown } from '@/api/Assembly/AssemblyPlan'
 export default {
   data() {
     return {
@@ -119,16 +114,12 @@ export default {
   },
   methods: {
     fetchData() {
-      this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
-    },
-    projectChange() {
-      this.machineNumberValue = ''
-      this.machineNumber = []
-      searchmachine(this.projectValue).then(response => {
+      initProject().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.machineNumber.push({
             label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })
@@ -140,9 +131,8 @@ export default {
         this.check2 = 0
         this.startEndDate = ''
       } else { this.check2 = 1 }
-      this.projectValue ? this.check = 1 : this.check = 0
       this.machineNumberValue ? this.check1 = 1 : this.check1 = 0
-      searchTable(this.check, this.projectValue, this.check1, this.machineNumberValue, this.check2, this.startEndDate[0], this.startEndDate[1], this.pageCurrent, this.pageSize).then(response => {
+      searchTable(this.check1, this.machineNumberValue, this.check2, this.startEndDate[0], this.startEndDate[1], this.pageCurrent, this.pageSize).then(response => {
         for (let i = 0; i < response.data.rows.length; i++) {
           console.log(response.data.rows[i].发货节点)
           if (response.data.rows[i].发货节点 !== '') {

src/views/Assembly/AssemblyProcessAssignment/index.vue

@@ -2,21 +2,16 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <span>项目名称:</span>
-        <el-select v-model="projectValue" filterable clearable size="small" placeholder="项目名称" @change="projectChange">
-          <el-option
-            v-for="item in project"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
         <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" placeholder="机床编号" size="small" clearable>
+        <el-select v-model="machineNumberValue" filterable clearable placeholder="机床编号" size="small">
           <el-option
             v-for="item in machineNumber"
             :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.name }}</div>
+          </el-option>
         </el-select>
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total=0;pageCurrent=1;pageSize=10;searchTable()">查询</el-button>
         <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="Preservation()">保存</el-button>
@@ -118,12 +113,10 @@
 </template>
 
 <script>
-import { initProject, searchmachine, initPerson, searchTable, Preservation } from '@/api/Assembly/AssemblyProcessAssignment'
+import { initProject, initPerson, searchTable, Preservation } from '@/api/Assembly/AssemblyProcessAssignment'
 export default {
   data() {
     return {
-      projectValue: '',
-      project: [],
       machineNumberValue: '',
       machineNumber: [],
       tableData: [],
@@ -149,30 +142,21 @@ export default {
   },
   methods: {
     fetchData() {
-      this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
+      initProject().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machineNumber.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
+          })
+        }
+      })
     },
     initPerson() { // 初始化工艺员
       initPerson().then(response => {
         this.tableData2 = response.data
       })
     },
-    projectChange() {
-      this.machineNumberValue = ''
-      this.machineNumber = []
-      if (this.projectValue !== '') {
-        this.check2 = 1
-        searchmachine(this.projectValue, this.check2).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.machineNumber.push({
-              label: response.data[i].机床图号,
-              value: response.data[i].机床流水号
-            })
-          }
-        })
-      } else {
-        this.check2 = 0
-      }
-    },
     selectPerson(index) { // 点击查询按钮
       this.index = index
       this.dialogFormVisible = true
@@ -186,9 +170,8 @@ export default {
     searchTable() {
       this.tableData = []
       this.loading = true
-      this.projectValue ? this.check = 1 : this.check = 0
       this.machineNumberValue ? this.check1 = 1 : this.check1 = 0
-      searchTable(this.check, this.projectValue, this.check1, this.machineNumberValue, this.pageCurrent, this.pageSize).then(response => {
+      searchTable(this.check1, this.machineNumberValue, this.pageCurrent, this.pageSize).then(response => {
         for (let i = 0; i < response.data.rows.length; i++) {
           this.tableData.push({
             工艺计划流水号: response.data.rows[i].工艺计划流水号,
@@ -209,12 +192,6 @@ export default {
     handleSelectionChange(val) {
       this.multipleSelection = val
       console.log(this.multipleSelection)
-      // this.ProcessSerialNumber = []
-      // this.PersonnelNumber = []
-      // for (let i = 0; i < val.length; i++) {
-      //   this.ProcessSerialNumber[i] = val[i].工艺计划流水号
-      //   this.PersonnelNumber[i] = val[i].人员编号
-      // }
     },
     Preservation() {
       if (this.multipleSelection.length !== 0) {

src/views/Assembly/InstallationAndMonitoring/index.vue

@@ -2,24 +2,17 @@
   <div class="app-container">
     <el-card style="margin-bottom: 20px">
       <el-row>
-        <span>项目名称:</span>
-        <el-select v-model="projectValue" filterable clearable size="small" placeholder="项目名称" @change="searchMachine">
-          <el-option
-            v-for="item in project"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
         <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" placeholder="机床编号" size="small" clearable>
+        <el-select v-model="machineNumberValue" filterable clearable placeholder="机床编号" size="small">
           <el-option
             v-for="item in machineNumber"
             :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.name }}</div>
+          </el-option>
         </el-select>
-        <span>客户名称:</span>
-        <el-input v-model="CustomerName" size="small" placeholder="客户名称" readonly style="width: 200px"/>
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="searchTable()">查询</el-button>
       </el-row>
     </el-card>
@@ -188,14 +181,11 @@
 </template>
 
 <script>
-import { initProject, searchMachine, searchTable, searchTable1, addData, editData, deleteData, addData1, editData1, deleteData1 } from '@/api/Assembly/InstallationAndMonitoring'
+import { initProject, searchTable, searchTable1, addData, editData, deleteData, addData1, editData1, deleteData1 } from '@/api/Assembly/InstallationAndMonitoring'
 
 export default {
   data() {
     return {
-      projectValue: '',
-      project: [],
-      CustomerName: '',
       machineNumberValue: '',
       machineNumber: [],
       loading: false,
@@ -245,19 +235,12 @@ export default {
   },
   methods: {
     fetchData() {
-      this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
-    },
-    searchMachine() { // 根据条件查机床编号
-      this.machineNumberValue = ''
-      this.machineNumber = []
-      searchMachine(this.projectValue).then(response => {
-        if (response.data.length !== 0) {
-          this.CustomerName = response.data[0].客户名称
-        }
+      initProject().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.machineNumber.push({
             label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })

src/views/Assembly/PrintingAssemblyProcessCard/index.vue

@@ -1,21 +1,16 @@
 <template>
   <div class="app-container">
     <el-card style="margin-bottom: 20px">
-      <span>项目名称:</span>
-      <el-select v-model="projectValue" filterable clearable size="small" placeholder="项目名称" @change="searchMachine">
-        <el-option
-          v-for="item in project"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
       <span>机床编号:</span>
       <el-select v-model="machineNumberValue" filterable clearable placeholder="机床编号" size="small">
         <el-option
           v-for="item in machineNumber"
           :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.name }}</div>
+        </el-option>
       </el-select>
       <el-button type="success" icon="el-icon-search" style="margin: 10px;" size="small" @click="searchTable">查询</el-button>
       <el-button type="primary" icon="el-icon-download" size="small" @click="exportTable()">导出</el-button>
@@ -115,7 +110,7 @@
 </template>
 
 <script>
-import { initProject, searchMachine, searchDetail, searchProcess, searchTable } from '@/api/Assembly/PrintingAssemblyProcessCard'
+import { initProject, searchDetail, searchProcess, searchTable } from '@/api/Assembly/PrintingAssemblyProcessCard'
 import $ from 'jquery'
 import QRCode from 'qrcode'
 
@@ -137,8 +132,6 @@ export default {
       check: 0,
       check1: 0,
       loading: false,
-      projectValue: '',
-      project: [],
       machineNumberValue: '',
       machineNumber: [],
       MachineNum: '',
@@ -154,25 +147,20 @@ export default {
   },
   methods: {
     fetchData() {
-      this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
-    },
-    searchMachine() { // 根据条件查机床编号
-      this.machineNumberValue = ''
-      this.machineNumber = []
-      searchMachine(this.projectValue).then(response => {
+      initProject().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.machineNumber.push({
             label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })
     },
     searchTable() { // 主表查询
       this.loading = true
-      this.projectValue ? this.check = 1 : this.check = 0
       this.machineNumberValue ? this.check1 = 1 : this.check1 = 0
-      searchTable(this.check, this.projectValue, this.check1, this.machineNumberValue, this.pageCurrent, this.pageSize).then(response => {
+      searchTable(this.check1, this.machineNumberValue, this.pageCurrent, this.pageSize).then(response => {
         this.tableData = response.data.rows
         this.total = response.data.total
         this.loading = false

src/views/ManufacturingCenter/CreatePreparationBill/index.vue

@@ -33,6 +33,21 @@
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
+        <el-table-column label="数量" align="center" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.批次数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="材料" align="center" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.材料 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="规格" align="center" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.原材料规格 }}
+          </template>
+        </el-table-column>
         <el-table-column label="备料" align="center">
           <template slot-scope="scope">
             {{ scope.row.工艺要求 }}
@@ -55,22 +70,31 @@
     <div v-show="false" id="BL">
       <table border cellspacing="0px" style="table-layout: fixed; width: 600px;">
         <colgroup>
-          <col style="width: 100px">
-          <col style="width: 150px">
+          <col style="width: 120px">
+          <col style="width: 180px">
+          <col style="width: 110px">
+          <col style="width: 110px">
+          <col style="width: 110px">
           <col style="width: 450px">
         </colgroup>
         <tr>
-          <th height="60px">GAOJING</th>
-          <th colspan="2" height="60px"><span style="font-weight:bold">备料单</span></th>
+          <th colspan="2" height="60px">GAOJING</th>
+          <th colspan="4" height="60px"><span style="font-weight:bold">备料单</span></th>
         </tr>
         <tr>
           <td align="center">零件名称</td>
           <td align="center">零件图号</td>
+          <td align="center">材料</td>
+          <td align="center">原材料规格</td>
+          <td align="center">批次数量</td>
           <td align="center">备料</td>
         </tr>
         <tr v-for="(list, index) in tableData2" :key="index">
           <td align="center">{{ list.零件名称 }}</td>
           <td align="center">{{ list.零件图号 }}</td>
+          <td align="center">{{ list.材料 }}</td>
+          <td align="center">{{ list.原材料规格 }}</td>
+          <td align="center">{{ list.批次数量 }}</td>
           <td>{{ list.工艺要求 }}</td>
         </tr>
       </table>
@@ -141,7 +165,10 @@ export default {
               零件名称: this.Data[i].零件名称,
               零件图号: this.Data[i].零件图号,
               备料打印: this.Data[i].备料打印,
-              工艺要求: response.data[0].工艺要求
+              工艺要求: response.data[0].工艺要求,
+              材料: this.Data[i].材料,
+              原材料规格: this.Data[i].原材料规格,
+              批次数量: this.Data[i].批次数量
             })
           })
           this.loading = false

src/views/ManufacturingCenter/InitialProduction/index.vue

@@ -11,26 +11,20 @@
               <el-radio :label="1">整改件投产</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="项目名称" style="margin-top:28px">
-            <el-select v-model="entryNameValue" 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>
-          </el-form-item>
-          <el-form-item label="机床号">
-            <el-select v-model="toolNumValue" filterable size="small" placeholder="机床号" style="margin-bottom:10px" @change="typeChange1()">
+          <el-form-item label="机床号" style="margin-top:28px">
+            <el-select v-model="toolNumValue" filterable size="small" style="margin-bottom:10px" 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-form-item>
-          <el-form-item label="机床组号">
-            <el-select v-model="NumValue" filterable size="small" style="margin-bottom:10px" placeholder="机床组号">
+          <el-form-item label="分组">
+            <el-select v-model="NumValue" filterable size="small" style="margin-bottom:10px" placeholder="分组">
               <el-option
                 v-for="item in Num"
                 :key="item.value"
@@ -434,7 +428,7 @@ export default {
     ])
   },
   created() {
-    this.fetchData()
+    this.typeChange()
     this.getCurrentTime()
     this.getNowTime()
   },
@@ -505,15 +499,14 @@ export default {
       })
     },
     typeChange() {
-      this.toolNumValue = ''
-      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].项目名称
           })
         }
       })

src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue

@@ -2,7 +2,18 @@
   <div class="app-container">
 
     <el-card>
-      <el-button type="success" class="el-icon-search" size="small">查询</el-button>
+      <span>工位号:</span>
+      <el-select v-model="MachineValue" size="small" filterable placeholder="工位号" style="width: 180px;">
+        <el-option
+          v-for="item in Machine"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="searchTable();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
+      <el-badge :value="num" :max="99" class="item">
+        <el-button size="small" type="text" @click="dialogFormVisible=true;Jurisdiction()">调序权限</el-button>
+      </el-badge>
     </el-card>
 
     <el-card>
@@ -12,58 +23,45 @@
           align="center"
           type="index"
           width="50"/>
-        <el-table-column label="外协厂家名称" align="center" width="280px">
+        <el-table-column label="零件名称" align="center" width="310px">
           <template slot-scope="scope">
-            {{ scope.row.外协厂家名称 }}
+            {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="外协厂家简称" align="center" width="110px">
+        <el-table-column label="零件图号" align="center" width="330px">
           <template slot-scope="scope">
-            {{ scope.row.外协厂家简称 }}
+            {{ scope.row.零件图号_短 }}
           </template>
         </el-table-column>
-        <el-table-column label="地址" align="center" width="280px">
+        <el-table-column label="待加工工序" align="center">
           <template slot-scope="scope">
-            {{ scope.row.地址 }}
+            {{ scope.row.工艺名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="联系人" align="center" width="120px">
+        <el-table-column label="操作" width="300" align="center" fixed="right">
           <template slot-scope="scope">
-            {{ scope.row.联系人 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="电话" align="center" width="140px">
-          <template slot-scope="scope">
-            {{ scope.row.电话 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="传真" align="center" width="120px">
-          <template slot-scope="scope">
-            {{ scope.row.传真 }}
-          </template>
-        </el-table-column>
-        <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="150px">
-          <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>
+            <div>
+              <el-button
+                size="mini"
+                icon="el-icon-arrow-up"
+                type="primary"
+                @click="upOne(scope.row)"/>
+              <el-button
+                size="mini"
+                icon="el-icon-arrow-down"
+                type="primary"
+                @click="downOne(scope.row)"/>
+              <el-button
+                size="mini"
+                icon="el-icon-upload2"
+                type="primary"
+                @click="TOP(scope.row)"/>
+              <el-button
+                size="mini"
+                icon="el-icon-download"
+                type="primary"
+                @click="Down(scope.row)"/>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -80,14 +78,50 @@
       </div>
     </el-card>
 
+    <el-dialog :visible.sync="dialogFormVisible" width="60%">
+      <el-table :data="gridData" height="500" size="mini" border>
+        <el-table-column property="date" label="工位号" width="300" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.MES终端号 }}
+          </template>
+        </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-else type="info" size="small">未开放</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column property="date" label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button
+              v-if="scope.row.调序权限===0"
+              size="mini"
+              type="success"
+              @click="JurisdictionControl1(scope.row)">开启</el-button>
+            <el-button
+              v-if="scope.row.调序权限===1"
+              size="mini"
+              type="danger"
+              @click="JurisdictionControl2(scope.row)">关闭</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import {} from '@/api/ManufacturingCenter/MachiningSequenceAdjustment'
+import { getMachine, searchtable, Order, JurisdictionControl } from '@/api/ManufacturingCenter/MachiningSequenceAdjustment'
 export default {
   data() {
     return {
+      num: 0,
+      count: 0,
+      dialogFormVisible: false,
+      gridData: [],
+      Machine: [],
+      MachineValue: '',
       loading0: false,
       tableData: [], // 表格数据
       pageSize: 10,
@@ -96,8 +130,80 @@ export default {
     }
   },
   created() {
+    this.Jurisdiction()
+    this.fetchData()
   },
   methods: {
+    // 初始化获取工位
+    fetchData() {
+      this.MachineValue = ''
+      this.Machine = []
+      getMachine().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Machine.push({
+            label: response.data[i].MES终端号,
+            value: response.data[i].MES终端号
+          })
+        }
+      })
+    },
+    searchTable() {
+      if (this.MachineValue !== '' && this.MachineValue !== null) {
+        this.loading0 = true
+        searchtable(this.MachineValue, this.pageCurrent, this.pageSize).then(response => {
+          this.tableData = response.data.rows
+          this.total = response.data.total
+        }).then(() => {
+          this.loading0 = false
+        })
+      } else {
+        this.$message.error('请选择工位')
+      }
+    },
+    Jurisdiction() {
+      this.count = 0
+      getMachine().then(response => {
+        this.gridData = response.data
+        for (let i = 0; i < response.data.length; i++) {
+          if (response.data[i].调序权限 === 1) { this.count = this.count + 1 }
+        }
+        this.num = this.count
+      })
+    },
+    JurisdictionControl1(row) {
+      JurisdictionControl(row.MES终端号, 1).then(response => {
+        this.Jurisdiction()
+      })
+    },
+    JurisdictionControl2(row) {
+      JurisdictionControl(row.MES终端号, 2).then(response => {
+        this.Jurisdiction()
+      })
+    },
+    // 上移
+    upOne(row) {
+      Order(this.MachineValue, row.工序流水号, '上移').then(response => {
+        this.searchTable()
+      })
+    },
+    // 下移
+    downOne(row) {
+      Order(this.MachineValue, row.工序流水号, '下移').then(response => {
+        this.searchTable()
+      })
+    },
+    // 置顶
+    TOP(row) {
+      Order(this.MachineValue, row.工序流水号, '置顶').then(response => {
+        this.searchTable()
+      })
+    },
+    // 置底
+    Down(row) {
+      Order(this.MachineValue, row.工序流水号, '置底').then(response => {
+        this.searchTable()
+      })
+    },
     // 分页
     handleSizeChange(val) {
       this.pageCurrent = 1
@@ -119,4 +225,9 @@ export default {
   .el-input{
     width: 210px;
   }
+  .item {
+    float: right;
+    margin-top: 10px;
+    margin-right: 40px;
+  }
 </style>

src/views/ManufacturingCenter/OwnTimeStatistics/index.vue

@@ -90,6 +90,8 @@ export default {
       }
       if (this.date1 === '' || this.date1 === null || this.date2 === '' || this.date2 === null) {
         this.check2 = 0
+        this.date1 = ''
+        this.date2 = ''
       } else {
         this.check2 = 1
       }

src/views/ManufacturingCenter/PartAssignment/index.vue

@@ -2,21 +2,16 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <span>项目名称：</span>
-        <el-select v-model="projectValue" filterable clearable size="small" placeholder="项目名称" @change="projectChange">
-          <el-option
-            v-for="item in project"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
         <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" placeholder="机床编号" size="small" clearable @change="machineChange">
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange">
           <el-option
             v-for="item in machineNumber"
             :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.name }}</div>
+          </el-option>
         </el-select>
         <span>组号:</span>
         <el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable>
@@ -63,17 +58,6 @@
           </template>
         </el-table-column>
       </el-table>
-      <!--<div class="block" style="margin-top: 10px;">-->
-      <!--<el-pagination-->
-      <!--@size-change="handleSizeChange"-->
-      <!--@current-change="handleCurrentChange"-->
-      <!--:current-page="pageCurrent"-->
-      <!--:page-sizes="[10, 20, 30, 40, 50]"-->
-      <!--:page-size="pageSize"-->
-      <!--layout="total, sizes, prev, pager, next, jumper"-->
-      <!--:total="total">-->
-      <!--</el-pagination>-->
-      <!--</div>-->
     </el-card>
     <el-card>
       <el-tabs type="border-card" @tab-click="selectPart">
@@ -90,6 +74,11 @@
                 {{ 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.材料 }}
@@ -105,11 +94,31 @@
                 {{ 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="120px" fixed="right">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">使用</el-button>
+              </template>
+            </el-table-column>
           </el-table>
         </el-tab-pane>
         <el-tab-pane label="外购件">
           <el-table :data="tableData2" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
             <el-table-column align="center" width="50" type="selection"/>
+            <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.物料名称 }}
@@ -135,11 +144,31 @@
                 {{ 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="120px" fixed="right">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit2(scope.row)">使用</el-button>
+              </template>
+            </el-table-column>
           </el-table>
         </el-tab-pane>
         <el-tab-pane label="标准件">
           <el-table :data="tableData3" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
             <el-table-column align="center" width="50" type="selection"/>
+            <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.物料名称 }}
@@ -165,6 +194,21 @@
                 {{ 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="120px" fixed="right">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit2(scope.row)">使用</el-button>
+              </template>
+            </el-table-column>
           </el-table>
         </el-tab-pane>
       </el-tabs>
@@ -176,7 +220,7 @@
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
         placeholder="选择日期"/>
-      <el-button type="success" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="purchaseRequisition()">车间请购</el-button>
+      <el-button type="success" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="purchaseRequisition()">制造部采购</el-button>
       <el-button type="primary" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="PurchasingDepartment()">采购部门采购</el-button>
       <el-button type="warning" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="Production()">车间生产</el-button>
     </el-card>
@@ -272,6 +316,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
+            <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit1(scope.row)">编辑</el-button>
             <el-button type="danger" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)">移出</el-button>
           </template>
         </el-table-column>
@@ -279,6 +324,11 @@
     </el-card>
     <el-card>
       <el-table :data="tableData5" border size="mini" style="width: 100%" height="300px">
+        <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.物料名称 }}
@@ -331,6 +381,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
+            <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit1(scope.row)">编辑</el-button>
             <el-button type="danger" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)">移出</el-button>
           </template>
         </el-table-column>
@@ -338,12 +389,6 @@
     </el-card>
     <el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="400px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
-        <el-form-item label="请购单编号" prop="请购单编号">
-          <el-input
-            v-model="form.请购单编号"
-            size="small"
-            style="width:200px"/>
-        </el-form-item>
 
         <el-form-item label="请购车间" prop="请购车间">
           <el-input
@@ -376,6 +421,31 @@
         <el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="dialogFormVisible3" title="更改数量" center style="min-height: 300px" width="400px">
+      <el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" class="demo-ruleForm">
+        <el-form-item label="数量" prop="数量">
+          <el-input
+            v-model="form3.数量"
+            size="small"
+            style="width:200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel('form3')">取消</el-button>
+        <el-button type="primary" @click="submitEdit1('form3')">确定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :visible.sync="dialogFormVisible4" title="使用库存" center style="min-height: 300px" width="400px">
+      <el-form ref="form4" :model="form4" :rules="rules4" label-position="left" label-width="110px" class="demo-ruleForm">
+        <el-form-item label="数量" prop="数量">
+          <el-input-number v-model="form4.数量" :min="0" :max="100" size="small" style="width:200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel('form4')">取消</el-button>
+        <el-button type="primary" @click="submitEdit2('form4')">确定</el-button>
+      </div>
+    </el-dialog>
     <el-dialog
       :visible.sync="dialogFormVisible1"
       title="基本件打回信息"
@@ -516,15 +586,13 @@
 </template>
 
 <script>
-import { initProject, searchmachine, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, submit, submit1, Delete, Delete1 } from '@/api/ManufacturingCenter/PartAssignment'
+import { initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, submit, submit1, Delete, Delete1, editStock, editNum } from '@/api/ManufacturingCenter/PartAssignment'
 import { mapGetters } from 'vuex'
 export default {
   inject: ['reload'],
   data() {
     return {
-      projectValue: '',
       projectFloatValue: '',
-      project: [],
       machineNumberValue: '',
       machineFloatValue: '',
       machineNumber: [],
@@ -532,6 +600,9 @@ export default {
       groupNumberValue: '',
       groupFloatValue: '',
       groupNumber: [],
+      StandardAndOutsourcing: '',
+      PartNum: '',
+      DetailedNum: '',
       PurchaseOrder: '',
       PartType: '基本件',
       tableData: [],
@@ -555,9 +626,22 @@ export default {
         请购车间: [{ required: true, message: '请输入请购车间', trigger: 'blur' }],
         请购时间: [{ required: true, message: '请选择请购时间', trigger: 'change' }]
       },
+      form3: {
+        数量: ''
+      },
+      rules3: {
+        数量: [{ required: true, message: '请输入数量', trigger: 'blur' }]
+      },
+      form4: {
+        数量: ''
+      },
+      rules4: {
+        数量: [{ required: true, message: '请输入数量', trigger: 'blur' }]
+      },
       BasicPartsNumber: [],
       StandardPartsAndOutsourcing: [],
       MaterialNum: [],
+      MaterialCode: [],
       MaterialName: [],
       PartToolNumber: [],
       MaterialSpecification: [],
@@ -578,7 +662,9 @@ export default {
       tableData9: [],
       tableData10: [],
       dialogFormVisible1: false,
-      dialogFormVisible2: false
+      dialogFormVisible2: false,
+      dialogFormVisible3: false,
+      dialogFormVisible4: false
     }
   },
   computed: {
@@ -594,7 +680,15 @@ export default {
   },
   methods: {
     fetchData() {
-      this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
+      initProject().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machineNumber.push({
+            label: response.data[i].机床图号,
+            name: response.data[i].项目名称,
+            value: response.data[i].机床流水号
+          })
+        }
+      })
       PartCallbackInformation().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           if (response.data[i].退回时间 !== '') {
@@ -738,25 +832,6 @@ export default {
         return 'adopt'
       }
     },
-    projectChange() {
-      this.machineNumberValue = ''
-      this.machineNumber = []
-      this.groupNumberValue = ''
-      this.groupNumber = []
-      if (this.projectValue !== '') {
-        this.check = 1
-        searchmachine(this.projectValue, this.check).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.machineNumber.push({
-              label: response.data[i].机床图号,
-              value: response.data[i].机床流水号
-            })
-          }
-        })
-      } else {
-        this.check = 0
-      }
-    },
     machineChange() {
       this.groupNumberValue = ''
       this.groupNumber = []
@@ -771,16 +846,13 @@ export default {
     },
     searchTable() {
       this.loading = true
-      if (this.projectValue !== '') {
-        this.check1 = 1
-      } else { this.check1 = 0 }
       if (this.machineNumberValue !== '') {
         this.check2 = 1
       } else { this.check2 = 0 }
       if (this.groupNumberValue !== '') {
         this.check3 = 1
       } else { this.check3 = 0 }
-      searchTable(this.projectValue, this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3).then(response => {
+      searchTable(this.machineNumberValue, this.check2, this.groupNumberValue, this.check3).then(response => {
         this.tableData = response.data
         this.tableData1 = []
         this.tableData2 = []
@@ -850,7 +922,7 @@ export default {
     submitAdd(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          addData(this.form.请购单编号, this.form.请购车间, this.name, this.id, this.form.请购时间).then(response => {
+          addData(this.form.请购车间, this.name, this.id, this.form.请购时间).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('增加成功')
               this.dialogFormVisible = false
@@ -871,15 +943,13 @@ export default {
       this.title = '编辑'
       this.dialogFormVisible = true
       this.RequisitionList = row.请购单流水号
-      this.form.请购单编号 = row.请购单编号
       this.form.请购车间 = row.请购车间
       this.form.请购时间 = row.请购时间
     },
     submitEdit(formName) { // 提交单据编辑
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          console.log(this.form.请购时间)
-          editData(this.RequisitionList, this.form.请购单编号, this.form.请购车间, this.form.请购时间).then(response => {
+          editData(this.RequisitionList, this.form.请购车间, this.form.请购时间).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('编辑成功')
               this.dialogFormVisible = false
@@ -918,6 +988,81 @@ export default {
       this.dialogFormVisible = false
       this.$refs[formName].resetFields()
     },
+    handleEdit1(row) { // 弹出单据编辑
+      if (this.$refs['form3'] !== undefined) {
+        this.$refs['form3'].resetFields()
+      }
+      this.dialogFormVisible3 = true
+      this.DetailedNum = row.请购单明细流水号
+      this.form3.数量 = row.零件数量
+    },
+    submitEdit1(formName) { // 提交单据编辑
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          editNum(this.DetailedNum, this.form3.数量).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('编辑成功')
+              this.dialogFormVisible3 = false
+              searchDetailed(this.RequisitionList).then(response => {
+                for (let i = 0; i < response.data.length; i++) {
+                  if (response.data[i].物料计划到货时间 !== '') {
+                    response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+                  }
+                }
+                this.tableData5 = response.data
+              })
+              searchDetailed1(this.RequisitionList).then(response => {
+                for (let i = 0; i < response.data.length; i++) {
+                  if (response.data[i].物料计划到货时间 !== '') {
+                    response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+                  }
+                }
+                this.tableData6 = response.data
+              })
+            } else { this.$message.error('编辑失败') }
+          })
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    handleEdit2(row) { // 弹出单据编辑
+      if (this.$refs['form4'] !== undefined) {
+        this.$refs['form4'].resetFields()
+      }
+      this.dialogFormVisible4 = true
+      this.StandardAndOutsourcing = row.标准件和外购件流水号
+      this.PartNum = row.零件数量
+    },
+    submitEdit2(formName) { // 提交使用库存数量
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          editStock(this.RequisitionList, this.form4.数量, this.PartNum).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('编辑成功')
+              this.dialogFormVisible4 = false
+              if (this.PartType === '基本件') {
+                searchPart(this.groupFloatValue).then(response => {
+                  this.tableData1 = response.data
+                })
+              } else if (this.PartType === '外购件') {
+                searchPart1(this.groupFloatValue, 2).then(response => {
+                  this.tableData2 = response.data
+                })
+              } else if (this.PartType === '标准件') {
+                searchPart1(this.groupFloatValue, 1).then(response => {
+                  this.tableData3 = response.data
+                })
+              }
+            } else { this.$message.error('编辑失败') }
+          })
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
     searchDetailed(row) {
       this.RequisitionList = row.请购单流水号
       searchDetailed(row.请购单流水号).then(response => {
@@ -952,11 +1097,12 @@ export default {
           this.MaterialName[i] = val[i].零件名称
           this.PartToolNumber[i] = val[i].零件图号
           this.Material[i] = val[i].材料
-          this.NumberOfParts[i] = val[i].零件数量
+          this.NumberOfParts[i] = val[i].需求数量
           this.ReMarks[i] = val[i].零件备注
         }
       } else if (this.PartType === '外购件') {
         this.MaterialNum = []
+        this.MaterialCode = []
         this.StandardPartsAndOutsourcing = []
         this.MaterialName = []
         this.MaterialSpecification = []
@@ -965,14 +1111,16 @@ export default {
         for (let i = 0; i < val.length; i++) {
           this.StandardPartsAndOutsourcing[i] = val[i].标准件和外购件流水号
           this.MaterialNum[i] = val[i].物料流水号
+          this.MaterialCode[i] = val[i].物料代码
           this.MaterialName[i] = val[i].物料名称
           this.MaterialSpecification[i] = val[i].物料规格
           this.MaterialModel[i] = val[i].物料型号
-          this.NumberOfParts[i] = val[i].零件数量
+          this.NumberOfParts[i] = val[i].需求数量
           this.ReMarks[i] = val[i].备注
         }
       } else if (this.PartType === '标准件') {
         this.MaterialNum = []
+        this.MaterialCode = []
         this.StandardPartsAndOutsourcing = []
         this.MaterialName = []
         this.MaterialSpecification = []
@@ -981,10 +1129,11 @@ export default {
         for (let i = 0; i < val.length; i++) {
           this.StandardPartsAndOutsourcing[i] = val[i].标准件和外购件流水号
           this.MaterialNum[i] = val[i].物料流水号
+          this.MaterialCode[i] = val[i].物料代码
           this.MaterialName[i] = val[i].物料名称
           this.MaterialSpecification[i] = val[i].物料规格
           this.MaterialModel[i] = val[i].物料型号
-          this.NumberOfParts[i] = val[i].零件数量
+          this.NumberOfParts[i] = val[i].需求数量
           this.ReMarks[i] = val[i].备注
         }
       }
@@ -1019,7 +1168,7 @@ export default {
               }
             } else if (this.PartType === '外购件') {
               for (let i = 0; i < this.StandardPartsAndOutsourcing.length; i++) {
-                purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 2, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
+                purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialCode[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 2, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
                   this.result += parseInt(response.data[0].result)
                   if (this.result === this.StandardPartsAndOutsourcing.length) {
                     this.$message.success('请购成功')
@@ -1039,7 +1188,7 @@ export default {
               }
             } else if (this.PartType === '标准件') {
               for (let i = 0; i < this.StandardPartsAndOutsourcing.length; i++) {
-                purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 1, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
+                purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialCode[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 1, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
                   this.result += parseInt(response.data[0].result)
                   if (this.result === this.StandardPartsAndOutsourcing.length) {
                     this.$message.success('请购成功')

src/views/ManufacturingCenter/ProcessPlanning/index.vue

@@ -34,7 +34,7 @@
         placeholder="零件号"
         size="small"
         @clear="clearDetail"
-        @change="searchParts">
+        @change="searchParts();searchDetail()">
         <el-option
           v-for="item in partNum"
           :key="item.value"
@@ -59,10 +59,40 @@
           <el-button slot="append" icon="el-icon-cjn-09" @click="saveMaterial"/>
         </el-input>
         <span>规格:</span>
-        <el-input v-show="false" v-model="spec" :readonly="isShow2" style="width:100px" size="small" placeholder="规格"/>
+        <el-input v-model="spec" :readonly="isShow2" style="width:100px" size="small" placeholder="规格"/>
         <span>投产总数量:</span>
         <el-input v-model="batchNum" readonly size="small" style="width:80px;margin-top:10px;"/>
       </div>
+      <div>
+        <el-row>
+          <el-col :span="4">
+            <span>物料类型:</span>
+            <el-select v-model="materielValue" size="small" style="margin-top: 20px;width:100px" placeholder="物料类型" @change="clear()">
+              <el-option
+                v-for="item in materiel"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </el-col>
+          <el-col v-show="materielValue==='1'" :span="20">
+            <span>长:</span>
+            <el-input-number v-model="Length" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
+            <span>宽:</span>
+            <el-input-number v-model="Width" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
+            <span>高:</span>
+            <el-input-number v-model="height1" 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>
+          </el-col>
+          <el-col v-show="materielValue==='2'" :span="20">
+            <span>直径:</span>
+            <el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
+            <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="Calculation2()">计算重量</el-button>
+          </el-col>
+        </el-row>
+      </div>
     </el-card>
 
     <el-card>
@@ -490,6 +520,7 @@
 <script>
 import '@/icon/iconfont.css'
 import {
+  WeightCopy,
   initCraftmen,
   getPartnames1,
   getPartnames2,
@@ -524,6 +555,7 @@ import {
   searchRecord
 } from '@/api/ManufacturingCenter/ProcessPlanning'
 import elInput from 'element-ui/packages/input'
+import { mapGetters } from 'vuex'
 
 export default {
   components: {
@@ -531,6 +563,22 @@ export default {
   },
   data() {
     return {
+      Result1: '',
+      Result2: '',
+      Result3: '',
+      Length: '',
+      Width: '',
+      height1: '',
+      diameter: '',
+      height2: '',
+      materiel: [{
+        value: '1',
+        label: '方'
+      }, {
+        value: '2',
+        label: '柱'
+      }],
+      materielValue: '1',
       total: 0,
       pageCurrent: 1,
       pageSize: 10,
@@ -620,12 +668,51 @@ export default {
       material2: ''
     }
   },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'name',
+      'id'
+    ])
+  },
   created() {
     this.fetchData()
     this.initPerson()
     this.getList()
   },
   methods: {
+    clear() {
+      this.Length = ''
+      this.Width = ''
+      this.height1 = ''
+      this.diameter = ''
+      this.height2 = ''
+    },
+    // 长宽高计算
+    Calculation1() {
+      if (this.partNumValue === '' || this.partNumValue === null) {
+        this.$message.error('请先选择一个零件')
+      } else {
+        this.Result1 = '长:' + this.Length + '  宽:' + this.Width + '  高:' + this.height1 + '  重量:' + parseInt(this.Length) * parseInt(this.Width) * parseFloat(this.height1)
+        WeightCopy(this.partNumValue, this.Result1).then(response => {
+          this.searchDetail()
+        })
+      }
+    },
+    // 直径高计算
+    Calculation2() {
+      if (this.partNumValue === '' || this.partNumValue === null) {
+        this.$message.error('请先选择一个零件')
+      } else {
+        this.Result2 = Math.pow(parseInt(this.diameter) / 2, 2) * parseFloat(this.height2) * Math.PI
+        this.Result2 = this.Result2.toFixed(2)
+        this.Result3 = '直径:' + this.diameter + '  高:' + this.height2 + '  重量:' + this.Result2
+        WeightCopy(this.partNumValue, this.Result3).then(response => {
+          this.searchDetail()
+        })
+      }
+    },
     clearDetail() {
       this.checked = false
       this.partNumValue = ''
@@ -785,10 +872,9 @@ export default {
         this.isShow = true
       }
     },
-    searchDetail() { // 查主表和上面显示的信息
-      if (this.partNumValue === '' || this.partNumValue === null) {
-        this.$message.error('请选择零件作为查询对象')
-      } else {
+    // 查主表和上面显示的信息
+    searchDetail() {
+      if (this.partNumValue !== '' && this.partNumValue !== null) {
         this.loading0 = true
         detailInfo(this.partNumValue).then(response => {
           if (response.data.length !== 0) {
@@ -963,7 +1049,8 @@ export default {
         }
       })
     },
-    processCopy1() { // 完艺工艺拷贝
+    // 完艺工艺拷贝
+    processCopy1() {
       this.dialogFormVisible1 = false
       if (this.partNumValue === '') {
         this.$message.error('请在主界面选择一个零件作为被拷贝对象')
@@ -1055,10 +1142,11 @@ export default {
         }
       }
     },
-    confirmSelect() { // 确定选择主表的工艺名称及要求
+    // 确定选择主表的工艺名称及要求
+    confirmSelect() {
       this.tableData[this.index].工艺编号 = this.processN1
       this.tableData[this.index].工艺名称 = this.processNameValue
-      this.str = this.str + ' ' + this.processRequestValue
+      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 => {

src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue

@@ -5,34 +5,19 @@
         <el-radio :label="1">当天</el-radio>
         <el-radio :label="2">全部</el-radio>
       </el-radio-group>
-      <span>项目名称:</span>
-      <el-select
-        v-loading="loading"
-        v-model="projectNameValue"
-        element-loading-text="拼命加载中"
-        element-loading-spinner="el-icon-loading"
-        filterable
-        clearable
-        size="small"
-        placeholder="请选择项目名称"
-        style="width: 200px;margin-right:10px"
-        @change="getGraphNum()">
-        <el-option
-          v-for="item in projectName"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
       <span>机床图号:</span>
-      <el-select v-model="graphNumValue" filterable clearable size="small" placeholder="机床图号" style="width: 200px;margin-right:10px" @change="getGroupNum()">
+      <el-select v-model="graphNumValue" filterable size="small" style="margin-bottom:10px;width: 220px" placeholder="机床图号" @change="getGroupNum()">
         <el-option
           v-for="item in graphNum"
           :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>
       <span>组号:</span>
-      <el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 200px" @change="total=0;PageCurrent=1;PageSize=10;getTable()">
+      <el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 220px" @change="total=0;PageCurrent=1;PageSize=10;getTable()">
         <el-option
           v-for="item in GroupNum"
           :key="item.value"
@@ -168,7 +153,7 @@ export default {
     }
   },
   created() {
-    this.fetchData()
+    this.getGraphNum()
     this.initPerson()
   },
   methods: {
@@ -221,16 +206,15 @@ export default {
     getGraphNum() { // 获取下拉图号
       this.tableData = []
       this.total = 0
-      this.graphNum = []
-      this.graphNumValue = ''
       this.GroupNumValue = ''
       this.GroupNum = []
       if (this.radio === 2) { // 全部
-        getGraphNum(this.projectNameValue).then(response => {
+        getGraphNum().then(response => {
           for (let i = 0; i < response.data.length; i++) {
             this.graphNum.push({
               label: response.data[i].机床图号,
-              value: response.data[i].机床流水号
+              value: response.data[i].机床流水号,
+              value2: response.data[i].项目名称
             })
           }
         })
@@ -276,6 +260,11 @@ export default {
       if (this.radio === 2) { // 全部
         getTable0(this.PageCurrent, this.PageSize, this.GroupNumValue).then(response => {
           this.total = response.data.total
+          for (let i = 0; i < response.data.rows.length; i++) {
+            response.data.rows[i].工艺计划开始时间 = response.data.rows[i].工艺计划开始时间.split(' ')[0]
+            response.data.rows[i].工艺计划结束时间 = response.data.rows[i].工艺计划结束时间.split(' ')[0]
+            response.data.rows[i].操作时间 = response.data.rows[i].操作时间.split(' ')[0]
+          }
           for (let i = 0; i < response.data.rows.length; i++) {
             this.tableData.push({
               零件号: response.data.rows[i].零件图号,

src/views/ManufacturingCenter/ProcessingStatus/index.vue

@@ -2,42 +2,30 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <span>项目名称:</span>
-        <el-select v-model="project" size="small" filterable clearable placeholder="项目名称" style="width: 180px;" @change="getMachine">
-          <el-option
-            v-for="item in projects"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
         <span>机床号:</span>
-        <el-select v-model="Machine" size="small" clearable placeholder="机床号" style="width: 180px;" @change="getGroup">
+        <el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()">
           <el-option
             v-for="item in Machines"
             :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>
         <span>组号:</span>
-        <el-select v-model="Group" size="small" clearable placeholder="组号" style="width: 180px;">
+        <el-select v-model="Group" size="small" clearable placeholder="组号" style="margin-top:10px;width: 180px;">
           <el-option
             v-for="item in Groups"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-      </el-row>
-      <el-row>
-        <el-select v-show="false" v-model="part" size="small" placeholder="是否外协">
-          <el-option
-            v-for="item in parts"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
         <span>零件图号:</span>
         <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 180px;"/>
         <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
+      </el-row>
+      <el-row style="margin-top:10px;">
         <span>进度颜色：</span>
         <span style="background-color: red">拖期</span>
         <span style="background-color: yellow">即将拖期</span>
@@ -372,7 +360,7 @@ export default {
     }
   },
   created() {
-    this.fetchData()
+    this.getMachine()
     this.getTableData()
   },
   methods: {
@@ -394,16 +382,15 @@ export default {
       this.Machines = []
       this.Group = ''
       this.Groups = []
-      if (this.project !== '') {
-        getMachines(this.project).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.Machines.push({
-              label: response.data[i].机床图号,
-              value: response.data[i].机床流水号
-            })
-          }
-        })
-      }
+      getMachines().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Machines.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            value2: response.data[i].项目名称
+          })
+        }
+      })
     },
     getGroup() {
       this.Group = ''
@@ -420,11 +407,7 @@ export default {
     // 按条件查询
     getTableData() {
       this.listLoading1 = true
-      if (this.project === '') {
-        this.checkbox_project = false
-      } else {
-        this.checkbox_project = true
-      }
+      this.checkbox_project = false
       if (this.Machine === '') {
         this.checkbox_Machine = false
       } else {
@@ -456,7 +439,7 @@ export default {
       this.colorCode = [[]]
       this.realDate = [[]]
       this.length = 0
-      getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.part, this.pageCurrent, this.pageSize).then(response => {
+      getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, 1, this.pageCurrent, this.pageSize).then(response => {
         this.length = parseInt(response.data.total)
         for (let i = 0; i < response.data.rows.length; i++) { // 声明二维数组
           this.零件图号.push(response.data.rows[i].零件图号)
@@ -471,7 +454,7 @@ export default {
         }
         if (this.零件图号.length !== 0) {
           for (let i = 0; i < this.零件图号.length; i++) {
-            getTable2(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.零件图号[i], this.part).then(response => {
+            getTable2(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.零件图号[i], 1).then(response => {
               this.liushuihao = response.data[0].工艺计划流水号
               for (let k = 0; k < response.data.length; k++) {
                 if (response.data[k].工艺计划流水号 === this.liushuihao) {

src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue

@@ -3,21 +3,16 @@
 
     <el-card>
       <el-row>
-        <span>项目名称:</span>
-        <el-select v-model="project" size="small" filterable clearable placeholder="项目名称" @change="getMachine">
-          <el-option
-            v-for="item in projects"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
         <span>机床号:</span>
-        <el-select v-model="Machine" size="small" clearable placeholder="机床号" @change="getGroup">
+        <el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()">
           <el-option
             v-for="item in Machines"
             :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>
         <span>组号:</span>
         <el-select v-model="Group" size="small" clearable placeholder="组号">
@@ -435,7 +430,7 @@ export default {
     }
   },
   created() {
-    this.fetchData()
+    this.getMachine()
     this.fetchData3()
     this.getTableData()
   },
@@ -483,16 +478,15 @@ export default {
       this.Machines = []
       this.Group = ''
       this.Groups = []
-      if (this.project !== '') {
-        getMachines(this.project).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.Machines.push({
-              label: response.data[i].机床图号,
-              value: response.data[i].机床流水号
-            })
-          }
-        })
-      }
+      getMachines().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Machines.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            value2: response.data[i].项目名称
+          })
+        }
+      })
     },
     getGroup() {
       this.Group = ''

src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue

@@ -4,26 +4,20 @@
     <el-card>
       <div style="margin-top: -10px;">
         <el-row>
-          <span>项目名称:</span>
-          <el-select v-model="entryNameValue" size="small" filterable clearable 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" size="small" filterable clearable placeholder="机床号" @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>
 
-          <span>机床组号:</span>
-          <el-select v-model="NumValue" size="small" filterable clearable placeholder="机床组号">
+          <span>分组:</span>
+          <el-select v-model="NumValue" size="small" style="margin-top:10px;width: 220px" filterable clearable placeholder="机床组号">
             <el-option
               v-for="item in Num"
               :key="item.value"
@@ -727,7 +721,7 @@ export default {
     ])
   },
   created() {
-    this.fetchData()
+    this.typeChange()
     this.Selection1()
     this.getTable()
   },
@@ -990,7 +984,8 @@ export default {
         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].项目名称
           })
         }
       })

src/views/ManufacturingCenter/QuotaFormulation/index.vue

@@ -98,6 +98,7 @@
 
 <script>
 import { getPerson, mainTable, getPartnames1, getPartnames2, detailInfo, mainTable1, TableAddLi, TableAddLi1 } from '@/api/ManufacturingCenter/QuotaFormulation'
+import { mapGetters } from 'vuex'
 
 export default {
   data() {
@@ -171,6 +172,14 @@ export default {
       timeout: null
     }
   },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'name',
+      'id'
+    ])
+  },
   created() {
     this.fetchData()
   },

src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue

@@ -9,6 +9,8 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
+      <span style="margin-left: 10px">机床型号：</span>
+      <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
       <span style="margin-left: 10px">销售经理：</span>
       <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
       <span style="margin-left: 10px">开始日期：</span>
@@ -660,6 +662,8 @@ export default {
       MarketingManagerValue: '',
       peopleid_check: '',
       startTime: '',
+      machine: '',
+      machine_check: '',
       startTime_check: null,
       endTime: '',
       endTime_check: null,
@@ -722,8 +726,9 @@ export default {
       if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 }
       if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
       if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
+      if (this.machine === '' || this.machine === null) { this.machine_check = 0 } else { this.machine_check = 1 }
       this.listLoading = true
-      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime], ['tableData1', 'total', 'listLoading'])
+      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine], ['tableData1', 'total', 'listLoading'])
       this.tableDataInvoiceRecord = []
       this.tableDataContractCapitalManagement = []
       this.tableDataSafetyMargin = []

src/views/Outsourcing/OutFactoryMaintenance/index.vue

@@ -37,38 +37,28 @@
             {{ scope.row.联系人 }}
           </template>
         </el-table-column>
-        <el-table-column label="电话" align="center" width="140px">
+        <el-table-column label="电话" align="center" width="200px">
           <template slot-scope="scope">
             {{ scope.row.电话 }}
           </template>
         </el-table-column>
-        <el-table-column label="传真" align="center" width="120px">
-          <template slot-scope="scope">
-            {{ scope.row.传真 }}
-          </template>
-        </el-table-column>
-        <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="150px">
+        <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">
+        <el-table-column label="操作" align="center" width="150px" 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>
+              <!--<el-button-->
+              <!--size="mini"-->
+              <!--type="danger"-->
+              <!--class="el-icon-delete"-->
+              <!--@click="handleDelete(scope.$index, scope.row)">删除</el-button>-->
           </template>
         </el-table-column>
       </el-table>

src/views/Outsourcing/OutsourcingTaskExecution/index.vue

@@ -1599,6 +1599,17 @@ export default {
     height: 30px;
     text-align:center;
   }
+  .el-table .chengjiao {
+    background: #AEF199;
+  }
+  .el-input__inner {
+    height: 30px;
+  }
+</style>
+<style>
+  .el-table .chajia {
+    background: #EBF953;
+  }
   #tableHead td{
     border:1px solid black;
   }
@@ -1615,13 +1626,4 @@ export default {
     width: 7%;
     text-align: left;
   }
-  .el-table .chajia {
-    background: #EBF953;
-  }
-  .el-table .chengjiao {
-    background: #AEF199;
-  }
-  .el-input__inner {
-    height: 30px;
-  }
 </style>

src/views/Outsourcing/PreorderAssociation/index.vue

@@ -89,6 +89,7 @@
           <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.工艺编号)===29" size="small">备料</el-tag>
             <el-tag v-if="parseInt(scope.row.工序状态)===5" size="small">停产</el-tag>
           </template>
         </el-table-column>

src/views/Outsourcing/UnqualifiedTreatment/index.vue

@@ -128,8 +128,6 @@
 
     </el-dialog>
 
-    <dialog :visible="true"/>
-
   </div>
 </template>
 

src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue

@@ -28,6 +28,11 @@
         :row-class-name="tableRowClassName"
         size="mini"
         border>
+        <el-table-column
+          label="序号"
+          align="center"
+          type="index"
+          width="50"/>
         <el-table-column align="center" label="图号" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.图号或者型号 }}
@@ -87,6 +92,11 @@
             </el-radio-group>
           </template>
         </el-table-column>
+        <el-table-column align="center" label="旧图号" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.前图号或者型号 }}
+          </template>
+        </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="200">
           <template slot-scope="scope">
             <el-button

src/views/TechnologyCenter/ImportParts/index.vue

@@ -236,9 +236,13 @@ export default {
           if (res[0].result === '0') {
             this.$notify.error(`${drawingNum}导入失败`)
           }
+          if (res[0].result === '2') {
+            this.$notify.error(`${drawingNum}导入重复`)
+          }
         } else {
           const response = await importPurcharse(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, groupNum, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
           const res = response.data
+          console.log(res)
           if (res[0].result === '0') {
             this.$notify.error(`${drawingNum}导入失败`)
           }

src/views/TechnologyCenter/ImportParts/specificationData.vue

@@ -28,7 +28,13 @@
         :data="tableData"
         :row-class-name="tableRowClassName"
         size="mini"
-        border>
+        border
+        @row-click="searchMaterial1">
+        <el-table-column
+          label="序号"
+          align="center"
+          type="index"
+          width="50"/>
         <el-table-column align="center" label="物料状态" min-width="100">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.物料流水号===null" type="warning" size="small">不存在</el-tag>
@@ -45,7 +51,7 @@
             {{ scope.row.名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="材料" width="200">
+        <el-table-column align="center" label="材料" width="150">
           <template slot-scope="scope">
             {{ scope.row.材料或者规格 }}
           </template>
@@ -111,6 +117,42 @@
           @current-change="handleCurrentChange"/>
       </div>
     </el-card>
+    <el-card>
+      <el-table
+        :data="tableData10"
+        :cell-class-name="cell"
+        style="width: 100%"
+        height="440"
+        size="mini"
+        highlight-current-row
+        border>
+        <el-table-column
+          label="序号"
+          align="center"
+          type="index"
+          width="50"/>
+        <el-table-column align="center" label="物料名称">
+          <template slot-scope="scope">
+            {{ scope.row.物料名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="物料规格">
+          <template slot-scope="scope">
+            {{ scope.row.物料规格 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="物料型号">
+          <template slot-scope="scope">
+            {{ scope.row.物料型号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="供货商">
+          <template slot-scope="scope">
+            {{ scope.row.供货商 }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
 
     <el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
@@ -268,7 +310,7 @@
 
 <script>
 import { sleep } from '../../../utils/tool'
-import { unSpecificationQuery, unSpecificationQueryWB, specificationQueryWB, specificationQuery, deleteBasicParts, deleteBWParts, getMaterial, getMaterialWB, searchMaterialWB, updateRow, updateRowWB, transferMX, transferWG, allDelete } from '../../../api/TechnologyCenter/ImportParts'
+import { unSpecificationQuery, unSpecificationQueryWB, specificationQueryWB, specificationQuery, deleteBasicParts, deleteBWParts, getMaterial, getMaterialWB, searchMaterialWB, updateRow, updateRowWB, transferMX, transferWG, allDelete, searchMaterial1 } from '../../../api/TechnologyCenter/ImportParts'
 export default {
   name: 'SpecificationData',
   props: {
@@ -292,6 +334,7 @@ export default {
       machineValue: '',
       tableData: [],
       tableDataAll: [],
+      tableData10: [],
       listLoading: false,
       unSpecification: [],
       pageCurrent: 1,
@@ -367,6 +410,35 @@ export default {
     this.getSelect(getMaterial, ['材料', '材料流水号'], 'materials')
   },
   methods: {
+    cell({ row, column, rowIndex, columnIndex }) {
+      if (row.对比类型 === 1 && columnIndex === 2) {
+        return 'rgb196'
+      }
+      if (row.对比类型 === 2 && columnIndex === 1) {
+        return 'rgb196'
+      }
+      if (row.对比类型 === 2 && columnIndex === 2) {
+        return 'rgb196'
+      }
+      if (row.对比类型 === 3 && columnIndex === 1) {
+        return 'rgb196'
+      }
+      if (row.对比类型 === 4 && columnIndex === 3) {
+        return 'rgb196'
+      }
+      if (row.对比类型 === 5 && columnIndex === 1) {
+        return 'rgb196'
+      }
+      if (row.对比类型 === 5 && columnIndex === 3) {
+        return 'rgb196'
+      }
+      if (row.对比类型 === 6 && columnIndex === 2) {
+        return 'rgb196'
+      }
+      if (row.对比类型 === 6 && columnIndex === 3) {
+        return 'rgb196'
+      }
+    },
     async fetchData() {
       this.pageCurrent = 1
       try {
@@ -447,7 +519,7 @@ export default {
       this.editForm(row, 'form', [this.title = '编辑零件信息', this.dialogFormVisible = true])
       if (this.type === 2) {
         this.form.物料名称 = row.材料或者规格
-        this.form.物料物流号 = row.物料流水号
+        this.form.物料流水号 = row.物料流水号
       }
     },
     submitEdit() {
@@ -479,6 +551,13 @@ export default {
         })
       }
     },
+    searchMaterial1(row) {
+      console.log(row)
+      searchMaterial1(row.图号或者型号, row.名称, row.规格).then(response => {
+        this.tableData10 = response.data
+        console.log(response.data)
+      })
+    },
     materialShow() {
       this.inputMaterial = ''
       this.getMaterialWB()
@@ -577,6 +656,9 @@ export default {
   .el-table .warning-row {
     background: oldlace;
   }
+  .rgb196{
+    background: palevioletred;
+  }
 </style>
 
 <style scoped>

src/views/TechnologyCenter/QueryParts/index.vue

@@ -39,6 +39,11 @@
         size="mini"
         style="width: 100%;max-height: 520px"
         height="520">
+        <el-table-column
+          label="序号"
+          align="center"
+          type="index"
+          width="50"/>
         <el-table-column
           label="机床图号"
           align="center"
@@ -83,6 +88,16 @@
           align="center">
           <template slot-scope="scope">{{ scope.row.零件类型名称 }}</template>
         </el-table-column>
+        <el-table-column align="center" label="旧零件图号" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.旧零件图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="整改类型" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.整改类型 }}
+          </template>
+        </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="100">
           <template slot-scope="scope">
             <el-button
@@ -114,6 +129,10 @@
         height="600"
         highlight-current-row
         border>
+        <el-table-column
+          label="序号"
+          type="index"
+          width="50"/>
         <el-table-column align="center" label="物料名称">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
@@ -277,8 +296,17 @@ export default {
         basicPartsData(project_check, this.projectValue, machine_check, this.machineValue, group_check, this.groupValue, this.pageSize, this.pageCurrent).then(response => {
           this.loading = false
           const res = response.data
-          this.tableData = res.rows
           this.total = res.total
+          this.tableData = res.rows.map(item => {
+            if (item.整改类型 === '1') {
+              item.整改类型 = '新增'
+            } else if (item.整改类型 === '2') {
+              item.整改类型 = '替换'
+            } else if (item.整改类型 === '3') {
+              item.整改类型 = '补充加工'
+            }
+            return item
+          })
         })
       } else {
         const type = this.groupName.indexOf('WG') > -1 ? 2 : 1

src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue

@@ -27,13 +27,6 @@
           <el-col :span="6">
             <el-form-item label="预付款">
               <el-input v-model="AdvanceCharge" size="small" placeholder="预付款"/>
-              <!--<el-select v-model="payMethodValue" placeholder="预付款" size="small" @change="payMethodChange">-->
-              <!--<el-option-->
-              <!--v-for="item in payMethod"-->
-              <!--:key="item.value"-->
-              <!--:label="item.label"-->
-              <!--:value="item.value"/>-->
-              <!--</el-select>-->
             </el-form-item>
           </el-col>
         </el-row>
@@ -53,8 +46,6 @@
             <el-form-item label="规定到货时间">
               <el-date-picker
                 v-model="stipulateArrivalTime"
-                :picker-options="endDateOpt"
-                :disabled="Boolean(!contractNumValue)"
                 size="small"
                 type="date"
                 format="yyyy-MM-dd"
@@ -78,6 +69,16 @@
 
     <el-card>
       <el-table :data="tableData4" border style="width: 100%;max-height: 400px;" height="300px" size="mini">
+        <el-table-column label="单件定额工时" align="center" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.单件定额工时 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="准结定额工时" align="center" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.准结定额工时 }}
+          </template>
+        </el-table-column>
         <el-table-column label="单价" align="center" width="150">
           <template slot-scope="scope">
             <el-input v-model="scope.row.单价" size="mini" style="width:70px"/>
@@ -127,16 +128,21 @@
         </el-table-column>
       </el-table>
       <el-table :data="tableData3" border style="width: 100%;max-height: 400px;" height="300px" size="mini">
+        <el-table-column label="单件定额工时" align="center" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.单件定额工时 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="准结定额工时" align="center" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.准结定额工时 }}
+          </template>
+        </el-table-column>
         <el-table-column label="单价" align="center" width="150">
           <template slot-scope="scope">
             <el-input v-model="scope.row.单价" size="mini" style="width:70px"/>
           </template>
         </el-table-column>
-        <!--<el-table-column label="发货天数" align="center" width="150">-->
-        <!--<template slot-scope="scope">-->
-        <!--<el-input v-model="deliveryDay[scope.$index]" size="mini" style="width:70px"/>-->
-        <!--</template>-->
-        <!--</el-table-column>-->
         <el-table-column label="物料名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
@@ -179,23 +185,6 @@
             <el-input v-model="scope.row.备注" size="small" style="width: 120px" @change="update(scope.row)"/>
           </template>
         </el-table-column>
-      <!--<el-table-column label="计算方式" align="center" width="110">-->
-      <!--<template slot-scope="scope">-->
-      <!--<el-select v-model="calculateWayValue[scope.$index]" style="width:75px" size="mini">-->
-      <!--<el-option-->
-      <!--v-for="item in calculateWay"-->
-      <!--:key="item.value"-->
-      <!--:label="item.label"-->
-      <!--:value="item.value">-->
-      <!--</el-option>-->
-      <!--</el-select>-->
-      <!--</template>-->
-      <!--</el-table-column>-->
-      <!--<el-table-column label="重量" align="center" width="100">-->
-      <!--<template slot-scope="scope">-->
-      <!--<el-input size="mini" v-model="weight[scope.$index]" style="width:70px"></el-input>-->
-      <!--</template>-->
-      <!--</el-table-column>-->
       </el-table>
       <el-button
         type="primary"
@@ -216,8 +205,6 @@
         icon=""
         style="margin-left: 4.5%"
         @click="doneContract">生成采购合同</el-button>
-    <!--<el-button type="primary" size="small" icon="" style="float:right;margin: 0 10px 15px 0"-->
-        <!--@click="doneContract">生成采购合同</el-button>-->
     </el-card>
 
     <el-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px">
@@ -335,21 +322,13 @@
 </template>
 
 <script>
-import { searchSupplier, update, doneContract, initPurchaseOrder, searchData, searchData1, searchData2, searchContractDemo } from '@/api/WorkshopProcurement/CreatingProcurementContracts'
+import { searchSupplier, update, doneContract, initPurchaseOrder, searchData1, searchData2, searchContractDemo } from '@/api/WorkshopProcurement/CreatingProcurementContracts'
 import { mapGetters } from 'vuex'
 export default {
   inject: ['reload'],
   data() {
     return {
       submitDisable: true, // 不点击表格中的行不让确定
-      minDate: null,
-      endDateOpt: { // 禁用大于规定到货日期和小于当前日期
-        disabledDate: (time) => {
-          if (this.minDate) {
-            return time.getTime() > this.minDate || time.getTime() < new Date()
-          }
-        }
-      },
       AdvanceCharge: '',
       loading: false,
       dialogVisible1: false,
@@ -444,7 +423,9 @@ export default {
       group7: '',
       group8: '',
       group9: '',
-      group10: ''
+      group10: '',
+      group11: '',
+      group12: ''
     }
   },
   computed: {
@@ -460,14 +441,6 @@ export default {
   },
   methods: {
     searchData() {
-      const numGroup = [] // 空数组，放物料的计划到货时间
-      searchData(this.contractNumValue).then(response => {
-        console.log(response.data, 111)
-        for (let i = 0; i < response.data.length; i++) {
-          numGroup.push(Date.parse(response.data[i].物料计划到货时间))
-        }
-        this.minDate = new Date(Math.min(...numGroup))
-      })
       searchData1(this.contractNumValue).then(response => {
         console.log(response.data, 222)
         for (let j = 0; j < response.data.length; j++) {
@@ -607,12 +580,12 @@ export default {
         this.group1 = ''
         this.group2 = ''
         this.group3 = ''
-        // this.group5 = ''
-        // this.group6 = ''
         this.group7 = ''
         this.group8 = ''
         this.group9 = ''
         this.group10 = ''
+        this.group11 = ''
+        this.group12 = ''
         for (let i = 0; i < this.tableData3.length; i++) {
           this.group1 += this.tableData3[i].物料流水号 + ','
           this.group2 += this.tableData3[i].零件数量 + ','
@@ -620,6 +593,8 @@ export default {
           this.group7 += this.taxRate + ','
           this.group8 += this.currencyValue + ','
           this.group9 += this.tableData3[i].请购单明细流水号 + ','
+          this.group11 += this.tableData3[i].单件定额工时 + ','
+          this.group12 += this.tableData3[i].准结定额工时 + ','
         }
         for (let i = 0; i < this.tableData4.length; i++) {
           this.group1 += this.tableData4[i].物料流水号 + ','
@@ -628,56 +603,18 @@ export default {
           this.group7 += this.taxRate + ','
           this.group8 += this.currencyValue + ','
           this.group9 += this.tableData4[i].请购单明细流水号 + ','
+          this.group11 += this.tableData4[i].单件定额工时 + ','
+          this.group12 += this.tableData4[i].准结定额工时 + ','
         }
         for (let i = 0; i < this.contractNum.length; i++) {
           if (this.contractNum[i].value === this.contractNumValue) {
             this.RequisitionNumber = this.contractNum[i].label
           }
         }
-        // for (let i = 0; i < this.payMethod.length; i++) {
-        //   if (this.payMethod[i].value === this.payMethodValue) {
-        //     this.payMethodName = this.payMethod[i].label
-        //   }
-        // }
-        // const payTimeNum = this.payMethodName.split(':')
-        // if (payTimeNum.length > 1) {
-        //   for (let i = 0; i < payTimeNum.length; i++) {
-        //     switch (i) {
-        //       case 0:
-        //         this.group6 += this.payTime1Value + ','
-        //         break
-        //       case 1:
-        //         this.group6 += this.payTime2Value + ','
-        //         break
-        //       case 2:
-        //         this.group6 += this.payTime3Value + ','
-        //         break
-        //       case 3:
-        //         this.group6 += this.payTime4Value + ','
-        //         break
-        //       case 4:
-        //         this.group6 += this.payTime5Value + ','
-        //         break
-        //       case 5:
-        //         this.group6 += this.payTime6Value + ','
-        //         break
-        //     }
-        //     this.group5 += payTimeNum[i] + ',' // 付款比例 付款方式 付款计划
-        //   }
-        // } else {
-        //   this.group5 = '10,' // 付款比例 付款方式 付款计划
-        //   this.group6 = this.payTime1Value + ',' // 付款时间
-        // }
         this.group1 = this.group1.substr(0, this.group1.length - 1)
         this.group2 = this.group2.substr(0, this.group2.length - 1)
         this.group3 = this.group3.substr(0, this.group3.length - 1)
-        // this.group5 = this.group5.substr(0, this.group5.length - 1)
-        // this.group6 = this.group6.substr(0, this.group6.length - 1)
-        // this.group7 = this.group7.substr(0, this.group7.length - 1)
-        // this.group8 = this.group8.substr(0, this.group8.length - 1)
-        // this.group9 = this.group9.substr(0, this.group9.length - 1)
-        // this.group10 = this.group10.substr(0, this.group10.length - 1)
-        doneContract(this.contractNumValue, this.RequisitionNumber, this.contractName, this.planArrivalTime, this.stipulateArrivalTime, this.supplierValue, this.textArea, this.freight, this.group1, this.group2, this.group3, this.group7, this.group8, this.group9, this.id, this.AdvanceCharge).then(response => {
+        doneContract(this.contractNumValue, this.RequisitionNumber, this.contractName, this.planArrivalTime, this.stipulateArrivalTime, this.supplierValue, this.textArea, this.freight, this.group1, this.group2, this.group3, this.group7, this.group8, this.group9, this.id, this.group11, this.group12, this.AdvanceCharge).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('生成合同成功')
             this.reload()

src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue

@@ -22,20 +22,6 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span>项目名称:</span>
-      <el-select
-        v-model="projectNameValue"
-        placeholder="项目名称"
-        size="small"
-        style="width:100px"
-        clearable
-        @change="searchMachine()">
-        <el-option
-          v-for="item in projectName"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
       <span>机床编号:</span>
       <el-select
         v-model="machineValue"
@@ -48,7 +34,10 @@
           v-for="item in Machine"
           :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.name }}</div>
+        </el-option>
       </el-select>
       <span>组号:</span>
       <el-select
@@ -230,23 +219,7 @@
     <el-dialog :visible.sync="dialogFormVisible1" title="已完工艺选择" center width="800px">
       <el-form ref="form1" :model="form1" label-position="left" label-width="140px" class="demo-ruleForm">
         <el-row>
-          <el-col :span="10">
-            <el-form-item label="项目名称">
-              <el-select
-                v-model="projectNameValue1"
-                placeholder="项目名称"
-                size="small"
-                style="width:150px"
-                @change="searchMachine1()">
-                <el-option
-                  v-for="item in projectName1"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
+          <el-col :span="12">
             <el-form-item label="机床名称">
               <el-select
                 v-model="machineValue1"
@@ -258,16 +231,14 @@
                   v-for="item in Machine1"
                   :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.name }}</div>
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-button size="small" type="success" icon="el-icon-search" @click="searchDetail1()">查询</el-button>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
+          <el-col :span="12">
             <el-form-item label="组号">
               <el-select
                 v-model="groupNumberValue1"
@@ -283,7 +254,9 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
+        </el-row>
+        <el-row>
+          <el-col :span="12">
             <el-form-item label="图号/名称">
               <el-input
                 v-model="partNum1"
@@ -294,7 +267,8 @@
                 @dblclick.native="searchParts1"/>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="12">
+            <el-button size="small" type="success" icon="el-icon-search" @click="searchDetail1()">查询</el-button>
             <el-button size="small" @click="processCopy1()">工艺拷贝</el-button>
           </el-col>
         </el-row>
@@ -524,7 +498,6 @@ import '@/icon/iconfont.css'
 import {
   initCraftmen,
   getProject,
-  getMachine,
   getGroup,
   getPartnames1,
   getProcedure,
@@ -553,16 +526,12 @@ export default {
   },
   data() {
     return {
-      projectNameValue: '',
-      projectName: [],
       machineValue: '',
       Machine: [],
       groupNumberValue: '',
       groupNumber: [],
       groupNum: '',
       groupType: '',
-      projectNameValue1: '',
-      projectName1: [],
       machineValue1: '',
       Machine1: [],
       groupNumberValue1: '',
@@ -644,11 +613,12 @@ export default {
           })
         }
       })
-      getProject(0).then(response => { // 初始化项目
+      getProject(0).then(response => { // 初始化机床项目
         for (let i = 0; i < response.data.length; i++) {
-          this.projectName.push({
-            label: response.data[i].项目名称,
-            value: response.data[i].项目流水号
+          this.Machine.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })
@@ -675,18 +645,15 @@ export default {
         this.isShow2 = false
       }
       this.checked = false
-      this.projectNameValue = ''
-      this.projectName = []
-      getProject(this.radio).then(response => { // 初始化项目
+      getProject(this.radio).then(response => { // 初始化机床项目
         for (let i = 0; i < response.data.length; i++) {
-          this.projectName.push({
-            label: response.data[i].项目名称,
-            value: response.data[i].项目流水号
+          this.Machine.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })
-      this.machineValue = ''
-      this.Machine = []
       this.groupNumberValue = ''
       this.groupNumber = []
       this.partNum = ''
@@ -724,21 +691,6 @@ export default {
         })
       }
     },
-    searchMachine() {
-      this.clear()
-      this.machineValue = ''
-      this.Machine = []
-      this.groupNumberValue = ''
-      this.groupNumber = []
-      getMachine(this.radio, this.projectNameValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.Machine.push({
-            label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
-          })
-        }
-      })
-    },
     searchGroup() {
       this.clear()
       this.groupNumberValue = ''
@@ -824,20 +776,6 @@ export default {
         }
       })
     },
-    searchMachine1() {
-      this.machineValue1 = ''
-      this.Machine1 = []
-      this.groupNumberValue1 = ''
-      this.groupNumber1 = []
-      getMachine(1, this.projectNameValue1).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.Machine1.push({
-            label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
-          })
-        }
-      })
-    },
     searchGroup1() {
       this.groupNumberValue1 = ''
       this.groupNumber1 = []
@@ -993,18 +931,17 @@ export default {
     WYbtn() { // 完艺按钮
       this.tableData4 = []
       this.dialogFormVisible1 = true
-      this.projectNameValue1 = ''
-      this.projectName1 = []
       this.machineValue1 = ''
       this.Machine1 = []
       this.groupNumberValue1 = ''
       this.groupNumber1 = []
       this.partNum1 = ''
-      getProject(1).then(response => { // 初始化项目
+      getProject(1).then(response => { // 初始化机床项目
         for (let i = 0; i < response.data.length; i++) {
-          this.projectName1.push({
-            label: response.data[i].项目名称,
-            value: response.data[i].项目流水号
+          this.Machine1.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })

src/views/WorkshopProcurement/OutsourcingQuotaSetting/index.vue

@@ -14,20 +14,6 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span>项目名称:</span>
-        <el-select
-          v-model="projectNameValue"
-          placeholder="项目名称"
-          size="small"
-          style="width:100px"
-          clearable
-          @change="searchMachine()">
-          <el-option
-            v-for="item in projectName"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
         <span>机床编号:</span>
         <el-select
           v-model="machineValue"
@@ -40,7 +26,10 @@
             v-for="item in Machine"
             :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.name }}</div>
+          </el-option>
         </el-select>
         <span>组号:</span>
         <el-select
@@ -208,7 +197,7 @@
 </template>
 
 <script>
-import { getPerson, getPartnames1, getProject, getMachine, getGroup, update, getProcedure, returnEdit, saveApprove } from '@/api/WorkshopProcurement/OutsourcingQuotaSetting'
+import { getPerson, getPartnames1, getProject, getGroup, update, getProcedure, returnEdit, saveApprove } from '@/api/WorkshopProcurement/OutsourcingQuotaSetting'
 
 export default {
   data() {
@@ -257,11 +246,12 @@ export default {
           })
         }
       })
-      getProject(0).then(response => { // 初始化项目
+      getProject(0).then(response => { // 初始化机床项目
         for (let i = 0; i < response.data.length; i++) {
-          this.projectName.push({
-            label: response.data[i].项目名称,
-            value: response.data[i].项目流水号
+          this.Machine.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })
@@ -281,13 +271,12 @@ export default {
         this.isShow2 = false
       }
       this.checked = false
-      this.projectNameValue = ''
-      this.projectName = []
-      getProject(this.radio).then(response => { // 初始化项目
+      getProject(this.radio).then(response => { // 初始化机床项目
         for (let i = 0; i < response.data.length; i++) {
-          this.projectName.push({
-            label: response.data[i].项目名称,
-            value: response.data[i].项目流水号
+          this.Machine.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })
@@ -348,21 +337,6 @@ export default {
         })
       }
     },
-    searchMachine() {
-      this.clear()
-      this.machineValue = ''
-      this.Machine = []
-      this.groupNumberValue = ''
-      this.groupNumber = []
-      getMachine(this.radio, this.projectNameValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.Machine.push({
-            label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
-          })
-        }
-      })
-    },
     searchGroup() {
       this.clear()
       this.groupNumberValue = ''

src/views/WorkshopProcurement/ProcurementContractApproval/index.vue

@@ -89,7 +89,7 @@
     </el-card>
 
     <el-card>
-      <div style="width:900px;margin-left: 350px">
+      <div style="width:1000px;margin-left: 300px">
         <el-card>
           <table id="1" cellspacing="0px" align="center" border width="100%" style="">
             <tr style="height: 40px">
@@ -98,7 +98,7 @@
             </tr>
             <tr style="height: 40px">
               <td colspan="1" align="center">需方</td>
-              <td colspan="1" align="center">江苏高精机电装备有限公司</td>
+              <td colspan="1" align="center" width="37%">江苏高精机电装备有限公司</td>
               <td colspan="1" align="center">合同编号</td>
               <td colspan="1" align="center">{{ contract }}</td>
             </tr>
@@ -120,6 +120,8 @@
                 <td colspan="1" align="center">交货期</td>
                 <td colspan="1" align="center">备注</td>
                 <td colspan="1" align="center">数量</td>
+                <td colspan="1" align="center" width="12%">单件定额工时</td>
+                <td colspan="1" align="center" width="12%">准结定额工时</td>
                 <td colspan="1" align="center">单价</td>
                 <td colspan="1" align="center">总价</td>
               </tr>
@@ -135,17 +137,19 @@
                 <td colspan="1" align="center">交货期</td>
                 <td colspan="1" align="center">备注</td>
                 <td colspan="1" align="center">数量</td>
+                <td colspan="1" align="center" width="12%">单件定额工时</td>
+                <td colspan="1" align="center" width="12%">准结定额工时</td>
                 <td colspan="1" align="center">单价</td>
                 <td colspan="1" align="center">总价</td>
               </tr>
             </tbody>
             <tfoot>
               <tr style="height: 40px">
-                <td colspan="8">总价:  (人民币){{ RMB }}(未税) </td>
+                <td colspan="10">总价:  (人民币){{ RMB }}(未税) </td>
                 <td colspan="1" align="center">{{ TotalAmount }}</td>
               </tr>
               <tr style="height: 40px">
-                <td colspan="8">总价:  (人民币){{ RMB1 }}(含{{ taxRate }}增值税) </td>
+                <td colspan="10">总价:  (人民币){{ RMB1 }}(含{{ taxRate }}增值税) </td>
                 <td colspan="1" align="center">{{ TotalAmount1 }}</td>
               </tr>
             </tfoot>
@@ -458,7 +462,7 @@ export default {
         for (let i = 0; i < this.returns.length; i++) {
           tr[i] = document.createElement('tr')
           tr[i].setAttribute('class', 'tableData')
-          tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
+          tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
               '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
           document.getElementById('tableHead').after(tr[i])
         }
@@ -469,8 +473,10 @@ export default {
           document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].物料计划到货时间.split(' ')[0]
           document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].备注
           document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].数量
-          document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].单价
-          document.getElementsByClassName('tableData')[j].children[7].innerHTML = response.data[j].金额
+          document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].单件定额工时
+          document.getElementsByClassName('tableData')[j].children[7].innerHTML = response.data[j].准结定额工时
+          document.getElementsByClassName('tableData')[j].children[8].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData')[j].children[9].innerHTML = response.data[j].金额
         }
       })
       searchTable3(this.contractValue).then(response => {
@@ -486,7 +492,7 @@ export default {
         for (let i = 0; i < this.returns1.length; i++) {
           tr[i] = document.createElement('tr')
           tr[i].setAttribute('class', 'tableData1')
-          tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
+          tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
             '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
           document.getElementById('tableHead1').after(tr[i])
         }
@@ -497,8 +503,10 @@ export default {
           document.getElementsByClassName('tableData1')[j].children[3].innerHTML = response.data[j].物料计划到货时间.split(' ')[0]
           document.getElementsByClassName('tableData1')[j].children[4].innerHTML = response.data[j].备注
           document.getElementsByClassName('tableData1')[j].children[5].innerHTML = response.data[j].数量
-          document.getElementsByClassName('tableData1')[j].children[6].innerHTML = response.data[j].单价
-          document.getElementsByClassName('tableData1')[j].children[7].innerHTML = response.data[j].金额
+          document.getElementsByClassName('tableData1')[j].children[6].innerHTML = response.data[j].单件定额工时
+          document.getElementsByClassName('tableData1')[j].children[7].innerHTML = response.data[j].准结定额工时
+          document.getElementsByClassName('tableData1')[j].children[8].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData1')[j].children[9].innerHTML = response.data[j].金额
         }
       })
     }