更新

src/api/ManufacturingCenter/DiscardedPartsInquiry.js

@@ -1,25 +1,24 @@
 import request from '@/utils/request'
 
-// 初始化项目名称
+// // 初始化项目名称
-export function initProject() {
+// export function initProject() {
-  return request({
+//   return request({
-    url: '',
+//     url: '',
-    method: 'post',
+//     method: 'post',
-    data: {
+//     data: {
-      type: '1',
+//       type: '1',
-      name: 'PDM_项目名称_查询数据_按时间排序'
+//       name: 'PDM_项目名称_查询数据_按时间排序'
-    }
+//     }
-  })
+//   })
-}
+// }
 // 用项目查机床
-export function searchMachine(num) {
+export function searchMachine() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: 'PDM_机床名称_查询数据2',
+      name: 'PDM_项目名称_查询数据'
-      param: '项目流水号=' + num
     }
   })
 }
@@ -58,14 +57,14 @@ export function searchTable1(num) {
     }
   })
 }
-export function searchTable2(check, entryNameValue, check1, machineNameValue, pageCurrent1, pageSize1) {
+export function searchTable2(check1, machineNameValue, pageCurrent1, pageSize1) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理工艺_传递后_零件报废补投_查询数据_按机床查询',
-      param: '项目流水号_check=' + check + '&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '&机床流水号=' + machineNameValue,
+      param: '机床流水号_check=' + check1 + '&机床流水号=' + machineNameValue,
       pagination: pageCurrent1 + '&' + pageSize1
     }
   })

src/api/ManufacturingCenter/GroupMatching.js

@@ -1,80 +1,57 @@
 import request from '@/utils/request'
 
-export function initProject() {
+export function searchmachine() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_基本件成组配套_查询项目名称'
+      name: '机床名称流水号_查询数据'
     }
   })
 }
-export function searchmachine(num, check, pageCurrent, pageSize) {
+export function searchgroup(num) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: 'PDM_机床名称_查询数据_分页',
+      name: 'PDM_组件名称_查询数据_新',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + num + '=int&机床类型代码_check=0=int&机床类型代码=1=int&机床流水号_check=0=int&PageCurrent=' + pageCurrent + '=int&PageSize=' + pageSize + '=int&PageCount=1=int=output&ItemCount=1=int=output'
+      param: '机床流水号=' + num + '=int'
     }
   })
 }
-export function searchgroup(num, pageCurrent, pageSize) {
+export function searchTable(check1, machine, check2, groupNum, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: 'PDM_组件名称_查询数据_分页',
+      name: '车间生产管理工艺_基本件成组配套_查询数据_新',
-      param: '机床流水号=' + num + '=int&PageCurrent=' + pageCurrent + '=int&PageSize=' + pageSize + '=int&PageCount=1=int=output&ItemCount=1=int=output'
+      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int',
-    }
-  })
-}
-export function searchTable(check, entryNameValue, check1, machine, check2, groupNum, pageCurrent, pageSize) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '车间生产管理工艺_基本件成组配套_查询数据',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int',
       pagination: pageCurrent + '&' + pageSize
     }
   })
 }
-export function searchTable22(check, entryNameValue, check1, machine, check2, groupNum, check3, year, check4, month, check5, time) {
+export function searchTable22(check1, machine, check2, groupNum, check3, year, check4, month, check5, time) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_基本件成组配套_查询数据',
+      name: '车间生产管理工艺_基本件成组配套_查询数据_新',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&年_check=' + check3 + '=int&年=' + year + '=string&月_check=' + check4 + '=int&月=' + month + '=int&入库时间_check=' + check5 + '=int&入库时间=' + time + '=string'
+      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&年_check=' + check3 + '=int&年=' + year + '=string&月_check=' + check4 + '=int&月=' + month + '=int&入库时间_check=' + check5 + '=int&入库时间=' + time + '=string'
     }
   })
 }
-export function searchPurchaseTable(check, entryNameValue, check1, machine, check2, groupNum, check3, year, check4, month, check5, time, pageCurrent, pageSize) {
+export function searchTable1(check1, machine, check2, groupNum, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_外购件成组配套_查询数据',
+      name: '库存管理_车间采购出库_零件查询_新',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&年_check=' + check3 + '=int&年=' + year + '=string&月_check=' + check4 + '=int&月=' + month + '=int&入库时间_check=' + check5 + '=int&入库时间=' + time + '=string',
+      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int',
-      pagination: pageCurrent + '&' + pageSize
-    }
-  })
-}
-export function searchTable1(check, entryNameValue, check1, machine, check2, groupNum, pageCurrent, pageSize) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '库存管理_车间采购出库_零件查询',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int',
       pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -110,9 +87,9 @@ export function searchTable02(...params) {
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商',
+      name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商_成组配套',
-      param: `项目流水号_check=${params[0]}&项目流水号=${params[1]}&机床流水号_check=${params[2]}&机床流水号=${params[3]}&组件流水号_check=${params[4]}&组件流水号=${params[5]}`,
+      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}`,
-      Pagination: params[6] + '&' + params[7]
+      Pagination: params[4] + '&' + params[5]
     }
   })
 }

src/api/ManufacturingCenter/SparePartsForScrap.js

@@ -1,23 +1,22 @@
 import request from '@/utils/request'
-export function ProjectNameSelect(stateID) {
+// export function ProjectNameSelect(stateID) {
+//   return request({
+//     url: '',
+//     method: 'post',
+//     data: {
+//       type: '1',
+//       name: '车间生产管理工艺_传递后_项目名称_查询数据',
+//       param: '考核状态=' + stateID + '=int'
+//     }
+//   })
+// }
+export function MachineDrawingSelect() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_项目名称_查询数据',
+      name: 'PDM_项目名称_查询数据'
-      param: '考核状态=' + stateID + '=int'
-    }
-  })
-}
-export function MachineDrawingSelect(ProjectCode) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床',
-      param: '项目流水号=' + ProjectCode + '=int'
     }
   })
 }
@@ -32,14 +31,14 @@ export function TeamSelect(MachineCode) {
     }
   })
 }
-export function TableDataSelect(ProjectCode_check, ProjectCode, MachineCode_check, MachineCode, TeamCode_check, TeamCode, ComponentPartsBasicCattleTaxNumber_check, ComponentPartsBasicCattleTaxNumber, CutCode_check, CutCode, CutCodeBefore_check, CutCodeBefore, Assess_check, Assess, PartDrawing_check, PartDrawing, currentPage1, pageSize1) {
+export function TableDataSelect(MachineCode_check, MachineCode, TeamCode_check, TeamCode, ComponentPartsBasicCattleTaxNumber_check, ComponentPartsBasicCattleTaxNumber, CutCode_check, CutCode, CutCodeBefore_check, CutCodeBefore, Assess_check, Assess, PartDrawing_check, PartDrawing, currentPage1, pageSize1) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理工艺_传递后_零件报废补投_查询数据',
-      param: '项目流水号_check=' + ProjectCode_check + '=int&项目流水号=' + ProjectCode + '=string&机床流水号_check=' + MachineCode_check + '=int&机床流水号=' + MachineCode + '=string&组件流水号_check=' + TeamCode_check + '=int&组件流水号=' + TeamCode + '=string&组件零件基本件流水号_check=' + ComponentPartsBasicCattleTaxNumber_check + '=int&组件零件基本件流水号=' + ComponentPartsBasicCattleTaxNumber + '=string&工艺计划流水号_check=' + CutCode_check + '=int&工艺计划流水号=' + CutCode + '=string&工艺计划流水号_补投前_check=' + CutCodeBefore_check + '=int&工艺计划流水号_补投前=' + CutCodeBefore + '=string&考核状态_check=' + Assess_check + '=int&考核状态=' + Assess + '=string&零件图号_check=' + PartDrawing_check + '=int&零件图号=' + PartDrawing + '=string',
+      param: '机床流水号_check=' + MachineCode_check + '=int&机床流水号=' + MachineCode + '=string&组件流水号_check=' + TeamCode_check + '=int&组件流水号=' + TeamCode + '=string&组件零件基本件流水号_check=' + ComponentPartsBasicCattleTaxNumber_check + '=int&组件零件基本件流水号=' + ComponentPartsBasicCattleTaxNumber + '=string&工艺计划流水号_check=' + CutCode_check + '=int&工艺计划流水号=' + CutCode + '=string&工艺计划流水号_补投前_check=' + CutCodeBefore_check + '=int&工艺计划流水号_补投前=' + CutCodeBefore + '=string&考核状态_check=' + Assess_check + '=int&考核状态=' + Assess + '=string&零件图号_check=' + PartDrawing_check + '=int&零件图号=' + PartDrawing + '=string',
       Pagination: currentPage1 + '&' + pageSize1
     }
   })

src/api/ManufacturingCenter/StatusQuery.js

@@ -1,15 +1,15 @@
 import request from '@/utils/request'
 
-export function initProject() {
+// export function initProject() {
-  return request({
+//   return request({
-    url: '',
+//     url: '',
-    method: 'post',
+//     method: 'post',
-    data: {
+//     data: {
-      type: '1',
+//       type: '1',
-      name: 'PDM_项目名称_查询数据_按时间排序'
+//       name: 'PDM_项目名称_查询数据_按时间排序'
-    }
+//     }
-  })
+//   })
-}
+// }
 export function intPartState() {
   return request({
     url: '',
@@ -20,14 +20,13 @@ export function intPartState() {
     }
   })
 }
-export function searchmachine(num, check) {
+export function searchmachine() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: 'PDM_机床名称_查询数据',
+      name: 'PDM_项目名称_查询数据'
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + num + '&机床类型代码_check=0=int&机床类型代码=1=int&机床流水号_check=0'
     }
   })
 }
@@ -42,14 +41,14 @@ export function searchgroup(num, pageCurrent, pageSize) {
     }
   })
 }
-export function searchTable(check, entryNameValue, check1, machine, check2, groupNum, check3, partNumber, check4, partStateValue, check5, partTypeValue, pageCurrent, pageSize) {
+export function searchTable(check1, machine, check2, groupNum, check3, partNumber, check4, partStateValue, check5, partTypeValue, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新_MESWORK',
+      name: '车间生产管理工艺_零件工艺计划_查询数据_状态_最新_MESWORK',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int',
+      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int',
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/PurchasingCenter/PurchasingEfficiencyAnalysis.js

@@ -23,3 +23,39 @@ export function getData1(num) {
     }
   })
 }
+
+export function getData2(date1, date2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_合同审核审批效率_查询数据_折线图',
+      param: '开始时间=' + date1 + '&结束时间=' + date2
+    }
+  })
+}
+
+export function getData3(date1, date2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理_合同审批效率_查询数据_折线图',
+      param: '开始时间=' + date1 + '&结束时间=' + date2
+    }
+  })
+}
+
+export function getData4(date1, date2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_请款审批付款效率_查询数据_折线图',
+      param: '开始时间=' + date1 + '&结束时间=' + date2
+    }
+  })
+}

src/api/TechnologyCenter/QueryParts.js

@@ -1,24 +1,23 @@
 import request from '@/utils/request'
 
-export function projectSelect() {
+// export function projectSelect() {
-  return request({
+//   return request({
-    url: '',
+//     url: '',
-    method: 'post',
+//     method: 'post',
-    data: {
+//     data: {
-      type: '1',
+//       type: '1',
-      name: 'PDM_项目名称_查询数据_按时间排序'
+//       name: 'PDM_项目名称_查询数据_按时间排序'
-    }
+//     }
-  })
+//   })
-}
+// }
 
-export function machineSelect(projectValue) {
+export function machineSelect() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: 'PDM_机床名称_查询数据2',
+      name: 'PDM_项目名称_查询数据'
-      param: `项目流水号=${projectValue}`
     }
   })
 }
@@ -35,14 +34,14 @@ export function groupSelect(machineValue) {
   })
 }
 
-export function basicPartsData(project_check, project, machine_check, machine, group_check, group, pageSize, pageCurrent) {
+export function basicPartsData(machine_check, machine, group_check, group, pageSize, pageCurrent) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: 'PDM_零件明细表_基本件_查询数据_综合gj',
-      param: `项目流水号_check=${project_check}&项目流水号=${project}&机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}`,
+      param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue

@@ -2,24 +2,24 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <span>项目名称:</span>
+        <!--<span>项目名称:</span>-->
-        <el-select
+        <!--<el-select-->
-          v-model="entryNameValue"
+        <!--v-model="entryNameValue"-->
-          :remote-method="remoteMethod"
+        <!--:remote-method="remoteMethod"-->
-          placeholder="项目名称"
+        <!--placeholder="项目名称"-->
-          style="margin-right: 10px; width: 150px"
+        <!--style="margin-right: 10px; width: 150px"-->
-          size="small"
+        <!--size="small"-->
-          clearable
+        <!--clearable-->
-          filterable
+        <!--filterable-->
-          remote
+        <!--remote-->
-          @change="projectChange"
+        <!--@change="projectChange"-->
-          @focus="projectInit">
+        <!--@focus="projectInit">-->
-          <el-option
+        <!--<el-option-->
-            v-for="item in entryName"
+        <!--v-for="item in entryName"-->
-            :key="item.value"
+        <!--:key="item.value"-->
-            :label="item.label"
+        <!--:label="item.label"-->
-            :value="item.value"/>
+        <!--:value="item.value"/>-->
-        </el-select>
+        <!--</el-select>-->
         <span>机床图号:</span>
         <el-select v-model="machineNameValue" placeholder="机床号" style="margin-right: 10px; width: 150px" size="small" clearable @change="machineChange">
           <el-option
@@ -208,7 +208,7 @@
 </template>
 
 <script>
-import { initProject, searchMachine, searchGroupNum, searchTable, searchTable1, searchTable2 } from '@/api/ManufacturingCenter/DiscardedPartsInquiry'
+import { searchMachine, searchGroupNum, searchTable, searchTable1, searchTable2 } from '@/api/ManufacturingCenter/DiscardedPartsInquiry'
 export default {
   data() {
     return {
@@ -242,52 +242,15 @@ export default {
     }
   },
   created() {
-    this.projectInit()
+    this.projectChange()
-  },
-  mounted() {
-    this.getList()
   },
   methods: {
-    getList() {
-      this.list = []
-      initProject().then(response => { // 初始化项目名称
-        for (let i = 0; i < response.data.length; i++) {
-          this.list.push({
-            label: response.data[i].项目名称,
-            value: response.data[i].项目流水号
-          })
-        }
-      })
-    },
-    remoteMethod(query) {
-      if (query !== '') {
-        setTimeout(() => {
-          this.entryName = this.list.filter(item => {
-            return item.label.toLowerCase()
-              .indexOf(query.toLowerCase()) > -1
-          })
-        }, 1000)
-      } else {
-        this.entryName = []
-      }
-    },
-    projectInit() { // 初始化项目
-      this.entryName = []
-      initProject().then(response => { // 初始化项目名称
-        for (let i = 0; i < response.data.length; i++) {
-          this.entryName.push({
-            label: response.data[i].项目名称,
-            value: response.data[i].项目流水号
-          })
-        }
-      })
-    },
     projectChange() {
       this.machineName = []
       this.machineNameValue = ''
       this.GroupNum = []
       this.GroupNumValue = ''
-      searchMachine(this.entryNameValue).then(response => {
+      searchMachine().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.machineName.push({
             label: response.data[i].机床图号,
@@ -309,27 +272,18 @@ export default {
       })
     },
     searchData1() {
-      if (this.entryNameValue !== '' && this.entryNameValue !== null) {
+      this.listLoading2 = true
-        this.listLoading2 = true
+      if (this.machineNameValue !== '' && this.machineNameValue !== null) {
-        if (this.entryNameValue !== '' && this.entryNameValue !== null) {
+        this.check1 = 1
-          this.check = 1
-        } else {
-          this.check = 0
-        }
-        if (this.machineNameValue !== '' && this.machineNameValue !== null) {
-          this.check1 = 1
-        } else {
-          this.check1 = 0
-        }
-        searchTable2(this.check, this.entryNameValue, this.check1, this.machineNameValue, this.pageCurrent1, this.pageSize1).then(response => {
-          console.log(response)
-          this.tableData2 = response.data.rows
-          this.total1 = response.data.total
-          this.listLoading2 = false
-        })
       } else {
-        this.$message.warning('请选择项目')
+        this.check1 = 0
       }
+      searchTable2(this.check1, this.machineNameValue, this.pageCurrent1, this.pageSize1).then(response => {
+        console.log(response)
+        this.tableData2 = response.data.rows
+        this.total1 = response.data.total
+        this.listLoading2 = false
+      })
     },
     handleSizeChange1(val) {
       this.pageSize1 = val

src/views/ManufacturingCenter/GroupMatching/index.vue

@@ -1,25 +1,26 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>项目名称:</span>
+      <el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 185px;" placeholder="机床号" @change="searchGroupList">
-      <el-select
-        v-model="entryNameValue"
-        placeholder="项目名称"
-        style="width:200px"
-        size="small"
-        clearable
-        filterable
-        @change="empty">
         <el-option
-          v-for="item in entryName"
+          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>
+      <el-select v-model="Group" size="small" clearable placeholder="组号" style="margin:0px 10px;width: 100px;" @change="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">
+        <el-option
+          v-for="item in Groups"
+          :key="item.value"
+          :label="item.label"
+          :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-input v-model="machineToolNumber" placeholder="请双击选择" size="small" clearable style="width:200px" @change="empty1" @dblclick.native="SearchMachine"/>
-      <span>组号:</span>
-      <el-input v-model="groupNumber" placeholder="请双击选择" size="small" clearable style="width:200px" @dblclick.native="searchGroupList"/>
       <el-button type="success" icon="el-icon-search" size="small" style="margin-top: 15px;margin-left: 10px" @click="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">查询</el-button>
     </el-card>
     <el-card>
@@ -317,117 +318,6 @@
           @current-change="handleCurrentChange5"/>
       </div>
     </el-card>
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="选择机床" center style="min-height: 300px">
-      <el-table
-        :data="tableData6"
-        style="width:100%;max-height: 300px;display: inline-block"
-        height="300"
-        highlight-current-row
-        border
-        @row-click="selectMachine">
-        <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-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">
-            <el-tag v-if="scope.row.装配状态===null || scope.row.装配状态===0" type="success" size="small">未装配</el-tag>
-            <el-tag v-else-if="scope.row.装配状态===1" type="danger" size="small" >装配中</el-tag>
-            <el-tag v-else type="info" size="small" >装配完成</el-tag>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent1"
-          :page-sizes="[10, 20, 30, 40, 50]"
-          :page-size="pageSize1"
-          :total="total1"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange1"
-          @current-change="handleCurrentChange1"/>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitName">提交</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="选择组号" center style="min-height: 300px">
-      <el-table
-        :data="tableData7"
-        style="width:100%;max-height: 300px;display: inline-block"
-        height="300"
-        highlight-current-row
-        border
-        @row-click="selectGroup">
-        <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-column align="center" label="装配状态">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.组件是否完成===null || scope.row.组件是否完成===0" type="success" size="small">未装配</el-tag>
-            <el-tag v-else-if="scope.row.组件是否完成===1" type="danger" size="small" >装配中</el-tag>
-            <el-tag v-else type="info" size="small" >装配完成</el-tag>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent2"
-          :page-sizes="[10, 20, 30, 40, 50]"
-          :page-size="pageSize2"
-          :total="total2"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange3"
-          @current-change="handleCurrentChange3"/>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitGroup">提交</el-button>
-      </div>
-    </el-dialog>
 
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" :title="titleaa" center style="min-height: 300px">
       <el-table
@@ -477,12 +367,16 @@
 </template>
 
 <script>
-import { initProject, searchTable, searchmachine, searchgroup, searchPurchaseTable, searchTable1, processingStatus, searchTable22, searchTable01, searchTable02 } from '@/api/ManufacturingCenter/GroupMatching'
+import { searchTable, searchmachine, searchgroup, searchTable1, processingStatus, searchTable22, searchTable01, searchTable02 } from '@/api/ManufacturingCenter/GroupMatching'
 export default {
   data() {
     return {
       titleaa: '',
       零件图号: '',
+      Machines: [],
+      Machine: '',
+      Groups: [],
+      Group: '',
       entryNameValue: null, // 项目流水号
       entryName: [], // 项目数组
       machineToolNumber: '', // 机床图号
@@ -519,8 +413,6 @@ export default {
       tableData01: [],
       tableData02: [],
       state: null,
-      listLoading1: false,
-      listLoading2: false,
       total00: 0,
       total01: 0,
       total02: 0,
@@ -586,78 +478,39 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.SearchMachine()
   },
   methods: {
     searchData() {
       this.totalNum = 0
       this.loading = true
-      this.listLoading1 = true
+      this.Machine ? this.check1 = 1 : this.check1 = 0
-      this.listLoading2 = true
+      this.Group ? this.check2 = 1 : this.check2 = 0
-      if (this.entryNameValue !== null && this.entryNameValue !== '') {
+      searchTable(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
-        if (this.entryNameValue !== null && this.entryNameValue !== '') {
+        for (let i = 0; i < response.data.rows.length; i++) {
-          this.check = 1
+          if (response.data.rows[i].入库时间 !== '') {
-        } else {
+            response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
-          this.check = 0
-        }
-        if (this.machineToolNumber !== '') {
-          this.check1 = 1
-        } else {
-          this.check1 = 0
-        }
-        if (this.groupNumber !== '') {
-          this.check2 = 1
-        } else {
-          this.check2 = 0
-        }
-        searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.pageCurrent, this.pageSize).then(response => {
-          for (let i = 0; i < response.data.rows.length; i++) {
-            if (response.data.rows[i].入库时间 !== '') {
-              response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
-            }
-            if (response.data.rows[i].计划完成时间 !== '') {
-              response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
-            }
           }
-          this.tableData = response.data.rows
+          if (response.data.rows[i].计划完成时间 !== '') {
-          this.total = parseInt(response.data.total)
+            response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
-          this.loading = false
-        })
-        searchTable22(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            console.log(response.data[i].入库时间, 123)
-            if (response.data[i].入库时间 !== null) {
-              this.totalNum += 1
-            }
           }
-        })
+        }
-        searchPurchaseTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
+        this.tableData = response.data.rows
-          for (let i = 0; i < response.data.rows.length; i++) {
+        this.total = parseInt(response.data.total)
-            if (response.data.rows[i].到货时间 !== '' || response.data.rows[i].到货时间 !== null) {
-              response.data.rows[i].到货时间 = response.data.rows[i].到货时间.split(' ', 2)[0]
-            }
-          }
-          this.tableDataPurchase = response.data.rows
-          this.total4 = parseInt(response.data.total)
-        })
-        searchTable1(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.pageCurrent, this.pageSize).then(response => {
-          this.tableData1 = response.data.rows
-          this.total5 = parseInt(response.data.total)
-        })
-      } else {
         this.loading = false
-        this.$message.warning('请先选择项目')
+      })
-      }
+      searchTable22(this.check1, this.Machine, this.check2, this.Group, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
-    },
-    getList() { // 初始化项目名称
-      initProject().then(response => {
         for (let i = 0; i < response.data.length; i++) {
-          this.entryName.push({
+          console.log(response.data[i].入库时间, 123)
-            label: response.data[i].项目名称,
+          if (response.data[i].入库时间 !== null) {
-            value: response.data[i].项目流水号
+            this.totalNum += 1
-          })
+          }
         }
       })
+      searchTable1(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
+        this.tableData1 = response.data.rows
+        this.total5 = parseInt(response.data.total)
+      })
     },
     processingStatus(row) {
       this.dialogFormVisible4 = true
@@ -671,62 +524,32 @@ export default {
         this.tableData5 = response.data
       })
     },
-    empty() {
-      this.machineToolNumber = ''
-      this.groupNumber = ''
-    },
     SearchMachine() { // 查询机床
-      if (this.entryNameValue !== null && this.entryNameValue !== '') {
+      searchmachine().then(response => {
-        this.dialogFormVisible2 = true
+        for (let i = 0; i < response.data.length; i++) {
-        this.check6 = 1
+          this.Machines.push({
-        searchmachine(this.entryNameValue, this.check6, this.pageCurrent1, this.pageSize1).then(response => {
+            label: response.data[i].机床图号,
-          for (let i = 0; i < response.data.result; i++) {
+            value: response.data[i].机床流水号,
-            if (response.data.result[i].机床开始时间 !== '') {
+            value2: response.data[i].装配状态
-              response.data.result[i].机床开始时间 = response.data.result[i].机床开始时间.substr(0, 10)
+          })
-            }
+        }
-            if (response.data.result[i].机床结束时间 !== '') {
+      })
-              response.data.result[i].机床结束时间 = response.data.result[i].机床结束时间.substr(0, 10)
-            }
-          }
-          this.tableData6 = response.data.result
-          this.total1 = parseInt(response.data.output[0].ItemCount)
-        })
-      } else {
-        this.$message.warning('请先选择项目')
-      }
-    },
-    selectMachine(row) { // 选择机床号
-      this.machine = row.机床流水号
-      this.machineNumber = row.机床图号
-    },
-    submitName() { // 提交机床号
-      this.machineToolNumber = this.machineNumber
-      this.dialogFormVisible2 = false
-    },
-    empty1() {
-      this.groupNumber = ''
     },
     searchGroupList() { // 查询组号
-      if (this.machineToolNumber !== '') {
+      this.Group = ''
-        this.dialogFormVisible3 = true
+      this.Groups = []
-        searchgroup(this.machine, this.pageCurrent2, this.pageSize2).then(response => {
+      searchgroup(this.Machine).then(response => {
-          this.tableData7 = response.data.result
+        for (let i = 0; i < response.data.length; i++) {
-          this.total2 = parseInt(response.data.output[0].ItemCount)
+          this.Groups.push({
-        })
+            label: response.data[i].组号,
-      } else {
+            value: response.data[i].组件流水号,
-        this.$message.warning('请先选择机床')
+            value2: response.data[i].装配状态
-      }
+          })
-    },
+        }
-    selectGroup(row) { // 选择组号
+      })
-      this.groupNumber1 = row.组号
-      this.groupNum = row.组件流水号
-    },
-    submitGroup() { // 提交组号
-      this.groupNumber = this.groupNumber1
-      this.dialogFormVisible3 = false
     },
     searchTable() {
-      if (this.machine === '' || this.machine === null) {
+      if (this.Machine === '' || this.Machine === null) {
         this.$message.warning('请先选择机床组号')
       } else {
         if (this.PartType === '标准件') {
@@ -740,28 +563,27 @@ export default {
     },
     searchTable0() { // 查询标准件
       let check1, check2
-      this.machine ? check1 = 1 : check1 = 0
+      this.Machine ? check1 = 1 : check1 = 0
-      this.groupNum ? check2 = 1 : check2 = 0
+      this.Group ? check2 = 1 : check2 = 0
-      searchTable01(check1, this.machine, check2, this.groupNum, this.pageCurrent00, this.pageSize00, 1).then(response => {
+      searchTable01(check1, this.Machine, check2, this.Group, this.pageCurrent00, this.pageSize00, 1).then(response => {
         this.tableData00 = response.data.rows
         this.total00 = response.data.total
       })
     },
     searchTable1() { // 查询外购件
       let check1, check2
-      this.machine ? check1 = 1 : check1 = 0
+      this.Machine ? check1 = 1 : check1 = 0
-      this.groupNum ? check2 = 1 : check2 = 0
+      this.Group ? check2 = 1 : check2 = 0
-      searchTable01(check1, this.machine, check2, this.groupNum, this.pageCurrent01, this.pageSize01, 2).then(response => {
+      searchTable01(check1, this.Machine, check2, this.Group, this.pageCurrent01, this.pageSize01, 2).then(response => {
         this.tableData01 = response.data.rows
         this.total01 = response.data.total
       })
     },
     searchTable2() { // 查询基本件
-      let check1, check2, check3
+      let check1, check2
-      this.machine ? check1 = 1 : check1 = 0
+      this.Machine ? check1 = 1 : check1 = 0
-      this.groupNum ? check2 = 1 : check2 = 0
+      this.Group ? check2 = 1 : check2 = 0
-      this.entryNameValue ? check3 = 1 : check3 = 0
+      searchTable02(check1, this.Machine, check2, this.Group, this.pageCurrent02, this.pageSize02).then(response => {
-      searchTable02(check3, this.entryNameValue, check1, this.machine, check2, this.groupNum, this.pageCurrent02, this.pageSize02).then(response => {
         this.tableData02 = response.data.rows
         this.total02 = response.data.total
       })
@@ -769,303 +591,60 @@ export default {
     handleSizeChange(val) {
       this.pageCurrent = 1
       this.pageSize = val
-      console.log(val)
+      this.loading = true
-      if (this.entryNameValue !== null && this.entryNameValue !== '') {
+      this.Machine ? this.check1 = 1 : this.check1 = 0
-        if (this.entryNameValue !== null && this.entryNameValue !== '') {
+      this.Group ? this.check2 = 1 : this.check2 = 0
-          this.check = 1
+      searchTable(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
-        } else {
+        for (let i = 0; i < response.data.rows.length; i++) {
-          this.check = 0
+          if (response.data.rows[i].入库时间 !== '') {
-        }
+            response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
-        if (this.machineToolNumber !== '') {
-          this.check1 = 1
-        } else {
-          this.check1 = 0
-        }
-        if (this.groupNumber !== '') {
-          this.check2 = 1
-        } else {
-          this.check2 = 0
-        }
-        if (this.year !== null && this.year !== '') {
-          this.check3 = 1
-        } else {
-          this.check3 = 0
-        }
-        if (this.month !== null && this.month !== '') {
-          this.check4 = 1
-        } else {
-          this.check4 = 0
-        }
-        if (this.time !== '' && this.time !== null) {
-          this.check5 = 1
-        } else {
-          this.check5 = 0
-        }
-        searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.pageCurrent, this.pageSize).then(response => {
-          console.log(response)
-          for (let i = 0; i < response.data.rows.length; i++) {
-            if (response.data.rows[i].入库时间 !== '') {
-              response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
-            }
-            if (response.data.rows[i].计划完成时间 !== '') {
-              response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
-            }
           }
-          this.tableData = response.data.rows
+          if (response.data.rows[i].计划完成时间 !== '') {
-          this.total = parseInt(response.data.total)
+            response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
-          this.loading = false
+          }
-        })
+        }
-      } else {
+        this.tableData = response.data.rows
+        this.total = parseInt(response.data.total)
         this.loading = false
-        this.$message.warning('请先选择项目')
+      })
-      }
     },
     handleCurrentChange(val) {
       this.pageCurrent = val
-      if (this.entryNameValue !== null && this.entryNameValue !== '') {
+      this.loading = true
-        if (this.entryNameValue !== null && this.entryNameValue !== '') {
+      this.Machine ? this.check1 = 1 : this.check1 = 0
-          this.check = 1
+      this.Group ? this.check2 = 1 : this.check2 = 0
-        } else {
+      searchTable(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
-          this.check = 0
+        for (let i = 0; i < response.data.rows.length; i++) {
-        }
+          if (response.data.rows[i].入库时间 !== '') {
-        if (this.machineToolNumber !== '') {
+            response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
-          this.check1 = 1
-        } else {
-          this.check1 = 0
-        }
-        if (this.groupNumber !== '') {
-          this.check2 = 1
-        } else {
-          this.check2 = 0
-        }
-        if (this.year !== null && this.year !== '') {
-          this.check3 = 1
-        } else {
-          this.check3 = 0
-        }
-        if (this.month !== null && this.month !== '') {
-          this.check4 = 1
-        } else {
-          this.check4 = 0
-        }
-        if (this.time !== '' && this.time !== null) {
-          this.check5 = 1
-        } else {
-          this.check5 = 0
-        }
-        searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.pageCurrent, this.pageSize).then(response => {
-          for (let i = 0; i < response.data.rows.length; i++) {
-            if (response.data.rows[i].入库时间 !== '') {
-              response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
-            }
-            if (response.data.rows[i].计划完成时间 !== '') {
-              response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
-            }
           }
-          this.tableData = response.data.rows
+          if (response.data.rows[i].计划完成时间 !== '') {
-          this.total = parseInt(response.data.total)
+            response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
-          this.loading = false
+          }
-        })
+        }
-      } else {
+        this.tableData = response.data.rows
+        this.total = parseInt(response.data.total)
         this.loading = false
-        this.$message.warning('请先选择项目')
+      })
-      }
-    },
-    handleSizeChange1(val) {
-      this.pageCurrent1 = 1
-      this.pageSize1 = val
-      this.SearchMachine()
-    },
-    handleCurrentChange1(val) {
-      this.pageCurrent1 = val
-      this.SearchMachine()
-    },
-    handleSizeChange3(val) {
-      this.pageCurrent2 = 1
-      this.pageSize2 = val
-      this.searchGroupList()
-    },
-    handleCurrentChange3(val) {
-      this.pageCurrent2 = val
-      this.searchGroupList()
-    },
-    handleSizeChange4(val) {
-      this.pageCurrent4 = 1
-      this.pageSize4 = val
-      if (this.entryNameValue !== null && this.entryNameValue !== '') {
-        if (this.entryNameValue !== null && this.entryNameValue !== '') {
-          this.check = 1
-        } else {
-          this.check = 0
-        }
-        if (this.machineToolNumber !== '') {
-          this.check1 = 1
-        } else {
-          this.check1 = 0
-        }
-        if (this.groupNumber !== '') {
-          this.check2 = 1
-        } else {
-          this.check2 = 0
-        }
-        if (this.year !== null && this.year !== '') {
-          this.check3 = 1
-        } else {
-          this.check3 = 0
-        }
-        if (this.month !== null && this.month !== '') {
-          this.check4 = 1
-        } else {
-          this.check4 = 0
-        }
-        if (this.time !== '' && this.time !== null) {
-          this.check5 = 1
-        } else {
-          this.check5 = 0
-        }
-        searchPurchaseTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent4, this.pageSize4).then(response => {
-          console.log(response)
-          this.tableDataPurchase = response.data.rows
-          this.listLoading1 = false
-          this.total4 = parseInt(response.data.total)
-        })
-      } else {
-        this.loading = false
-        this.$message.warning('请先选择项目')
-      }
-    },
-    handleCurrentChange4(val) {
-      this.pageCurrent4 = val
-      if (this.entryNameValue !== null && this.entryNameValue !== '') {
-        if (this.entryNameValue !== null && this.entryNameValue !== '') {
-          this.check = 1
-        } else {
-          this.check = 0
-        }
-        if (this.machineToolNumber !== '') {
-          this.check1 = 1
-        } else {
-          this.check1 = 0
-        }
-        if (this.groupNumber !== '') {
-          this.check2 = 1
-        } else {
-          this.check2 = 0
-        }
-        if (this.year !== null && this.year !== '') {
-          this.check3 = 1
-        } else {
-          this.check3 = 0
-        }
-        if (this.month !== null && this.month !== '') {
-          this.check4 = 1
-        } else {
-          this.check4 = 0
-        }
-        if (this.time !== '' && this.time !== null) {
-          this.check5 = 1
-        } else {
-          this.check5 = 0
-        }
-        searchPurchaseTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent4, this.pageSize4).then(response => {
-          console.log(response)
-          this.tableDataPurchase = response.data.rows
-          this.listLoading1 = false
-          this.total4 = parseInt(response.data.total)
-        })
-      } else {
-        this.loading = false
-        this.$message.warning('请先选择项目')
-      }
     },
     handleSizeChange5(val) {
       this.pageCurrent5 = 1
       this.pageSize5 = val
-      if (this.entryNameValue !== null && this.entryNameValue !== '') {
+      this.Machine ? this.check1 = 1 : this.check1 = 0
-        if (this.entryNameValue !== null && this.entryNameValue !== '') {
+      this.Group ? this.check2 = 1 : this.check2 = 0
-          this.check = 1
+      searchTable1(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
-        } else {
+        this.tableData1 = response.data.rows
-          this.check = 0
+        this.total5 = parseInt(response.data.total)
-        }
+      })
-        if (this.machineToolNumber !== '') {
-          this.check1 = 1
-        } else {
-          this.check1 = 0
-        }
-        if (this.groupNumber !== '') {
-          this.check2 = 1
-        } else {
-          this.check2 = 0
-        }
-        if (this.year !== null && this.year !== '') {
-          this.check3 = 1
-        } else {
-          this.check3 = 0
-        }
-        if (this.month !== null && this.month !== '') {
-          this.check4 = 1
-        } else {
-          this.check4 = 0
-        }
-        if (this.time !== '' && this.time !== null) {
-          this.check5 = 1
-        } else {
-          this.check5 = 0
-        }
-        searchTable1(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent5, this.pageSize5).then(response => {
-          console.log(response)
-          this.tableData1 = response.data.rows
-          this.listLoading2 = false
-          this.total5 = parseInt(response.data.total)
-        })
-      } else {
-        this.loading = false
-        this.$message.warning('请先选择项目')
-      }
     },
     handleCurrentChange5(val) {
       this.pageCurrent5 = val
-      if (this.entryNameValue !== null && this.entryNameValue !== '') {
+      this.Machine ? this.check1 = 1 : this.check1 = 0
-        if (this.entryNameValue !== null && this.entryNameValue !== '') {
+      this.Group ? this.check2 = 1 : this.check2 = 0
-          this.check = 1
+      searchTable1(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
-        } else {
+        this.tableData1 = response.data.rows
-          this.check = 0
+        this.total5 = parseInt(response.data.total)
-        }
+      })
-        if (this.machineToolNumber !== '') {
-          this.check1 = 1
-        } else {
-          this.check1 = 0
-        }
-        if (this.groupNumber !== '') {
-          this.check2 = 1
-        } else {
-          this.check2 = 0
-        }
-        if (this.year !== null && this.year !== '') {
-          this.check3 = 1
-        } else {
-          this.check3 = 0
-        }
-        if (this.month !== null && this.month !== '') {
-          this.check4 = 1
-        } else {
-          this.check4 = 0
-        }
-        if (this.time !== '' && this.time !== null) {
-          this.check5 = 1
-        } else {
-          this.check5 = 0
-        }
-        searchTable1(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent5, this.pageSize5).then(response => {
-          console.log(response)
-          this.tableData1 = response.data.rows
-          this.listLoading2 = false
-          this.total5 = parseInt(response.data.total)
-        })
-      } else {
-        this.loading = false
-        this.$message.warning('请先选择项目')
-      }
     },
     handleSizeChange00(val) {
       this.pageCurrent00 = 1

src/views/ManufacturingCenter/InventoryQuery/index.vue

@@ -6,20 +6,6 @@
           <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable style="margin-bottom: 10px; width: 180px;"/>
           <!--          <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
           <!--          <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
-          <el-select v-model="inventoryNameValue" placeholder="仓库" style="margin-bottom: 10px; width: 120px;" size="small" clearable @change="getLocate">
-            <el-option
-              v-for="item in inventoryName"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-          <el-select v-model="locateNameValue" placeholder="货位名称" style="margin-top: 10px; width: 120px;" size="small" clearable>
-            <el-option
-              v-for="item in locateName"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
           <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=30;searchMaterial()">查询</el-button>
           <!--          <el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>-->
         </el-row>
@@ -180,10 +166,6 @@ export default {
       materialName: '',
       materialSpec: '',
       materialModel: '',
-      inventoryNameValue: '',
-      inventoryName: [],
-      locateNameValue: '',
-      locateName: [],
       tableData1: [],
       pageCurrent: 1,
       pageSize: 30,
@@ -227,43 +209,19 @@ export default {
         }
       })
     },
-    // 根据仓库查货位
-    getLocate() {
-      this.locateName = []
-      this.locateNameValue = ''
-      const param = {
-        url: '',
-        method: 'post',
-        data: {
-          type: '1',
-          name: '库存管理_货位主文件_查询数据',
-          param: `仓库流水号=${this.inventoryNameValue}`
-        }
-      }
-      request(param).then(res => {
-        for (let i = 0; i < res.data.length; i++) {
-          this.locateName.push({
-            label: res.data[i].货位名称,
-            value: res.data[i].货位流水号
-          })
-        }
-      })
-    },
     // 根据条件查物料货位数量
     searchMaterial() {
-      let check1, check2, check3, check4, check5
+      let check1, check2, check3
       this.materialName ? check1 = 1 : check1 = 0
       this.materialSpec ? check2 = 1 : check2 = 0
       this.materialModel ? check3 = 1 : check3 = 0
-      this.inventoryNameValue ? check4 = 1 : check4 = 0
-      this.locateNameValue ? check5 = 1 : check5 = 0
       const param = {
         url: '',
         method: 'post',
         data: {
           type: '1',
           name: `库存管理_库存盘点_物料货位数量_查询数据`,
-          param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}&仓库流水号_check=${check4}&仓库流水号=${this.inventoryNameValue}&货位流水号_check=${check5}&货位流水号=${this.locateNameValue}`,
+          param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}`,
           Pagination: this.pageCurrent + '&' + this.pageSize
         }
       }

src/views/ManufacturingCenter/ParseQuery/index.vue

@@ -988,7 +988,7 @@
                 </el-table-column>
                 <el-table-column align="center" label="组件名称">
                   <template slot-scope="scope">
-                    {{ scope.row.任务名称 ? scope.row.任务名称 : '--' }}
+                    {{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="组别进度">
@@ -3400,8 +3400,8 @@ export default {
           data: {
             type: '3',
             name: `select CONVERT(nvarchar(50),round(CONVERT(float,sum(case when [机加工实际完成时间] is not null then [投产总数量] else 0 end ))/CONVERT(float,sum([投产总数量]))*100,2) ) as 进度
-             from 综合查询_车间加工
+             from 综合查询_车间加工_新
-             where 机床流水号 = ${this.machineValue1} and 计划类型 = 4`
+             where 机床流水号 = ${this.machineValue1}`
           }
         })
       })

src/views/ManufacturingCenter/ProcessingStatusNew/index.vue

@@ -80,11 +80,16 @@
             border
             height="630"
             @current-change="getCurrentRow">
-            <el-table-column type="index" label="序号" width="80">
+            <el-table-column type="index" align="center" label="序号" width="80">
               <template slot-scope="scope">
                 <el-radio :label="scope.row.序号" v-model="radio"/>
               </template>
             </el-table-column>
+            <el-table-column align="center" label="跟单号" width="100">
+              <template slot-scope="scope">
+                {{ scope.row.跟单号 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="零件图号" show-overflow-tooltip width="130">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
@@ -342,6 +347,7 @@ export default {
             this.tableData.push({
               工艺计划流水号: response.data.rows[i].工艺计划流水号,
               序号: response.data.rows[i].序号,
+              跟单号: response.data.rows[i].跟单号,
               零件图号: response.data.rows[i].零件图号,
               零件名称: response.data.rows[i].零件名称,
               加工数: response.data.rows[i].完成数量, // MES里采集  现在没有

src/views/ManufacturingCenter/SparePartsForScrap/index.vue

@@ -3,13 +3,13 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <el-select v-model="ProjectNameValue" placeholder="请选择项目名称" style="width:150px;margin-bottom: 3px" clearable size="small" @change="fetchMachineDrawingData" @clear="MachineDrawingValue = '';MachineDrawing = [];Team = [];TeamValue = ''">
+        <!--<el-select v-model="ProjectNameValue" placeholder="请选择项目名称" style="width:150px;margin-bottom: 3px" clearable size="small" @change="fetchMachineDrawingData" @clear="MachineDrawingValue = '';MachineDrawing = [];Team = [];TeamValue = ''">-->
-          <el-option
+        <!--<el-option-->
-            v-for="item in ProjectName"
+        <!--v-for="item in ProjectName"-->
-            :key="item.value"
+        <!--:key="item.value"-->
-            :label="item.label"
+        <!--:label="item.label"-->
-            :value="item.value"/>
+        <!--:value="item.value"/>-->
-        </el-select>
+        <!--</el-select>-->
         <el-select v-model="MachineDrawingValue" placeholder="请选择机床图号" style="width:150px;margin: 0px 10px" clearable size="small" @change="fetchTeamDrawingData" @clear="Team = [];TeamValue = ''">
           <el-option
             v-for="item in MachineDrawing"
@@ -318,7 +318,7 @@
 </template>
 
 <script>
-import { ProjectNameSelect, MachineDrawingSelect, TeamSelect, TableDataSelect, editTime, editStop, TableDta2Select, editA, editchar } from '@/api/ManufacturingCenter/SparePartsForScrap'
+import { MachineDrawingSelect, TeamSelect, TableDataSelect, editTime, editStop, TableDta2Select, editA, editchar } from '@/api/ManufacturingCenter/SparePartsForScrap'
 export default {
   data() {
     return {
@@ -327,8 +327,6 @@ export default {
       disabledB: false,
       tableData4: [],
       judge: '',
-      ProjectNameValue: '', // 项目名称
-      ProjectName: [], // 项目名称下拉框
       MachineDrawingValue: '', // 机床号
       MachineDrawing: [], // 机床图号下拉框
       TeamValue: '', // 组号
@@ -380,19 +378,19 @@ export default {
     }
   },
   created() {
-    this.fetchProjectNameData()
+    this.fetchMachineDrawingData()
     this.fetchTableData()
   },
   methods: {
     // 项目名称查询
-    fetchProjectNameData() {
+    // fetchProjectNameData() {
-      this.getSelect(ProjectNameSelect, ['项目名称', '项目流水号'], 'ProjectName', this.Assess)
+    //   this.getSelect(ProjectNameSelect, ['项目名称', '项目流水号'], 'ProjectName', this.Assess)
-    },
+    // },
     // 机床图号查询
     fetchMachineDrawingData() {
       this.Team = []
       this.TeamValue = ''
-      this.getSelect(MachineDrawingSelect, ['机床图号', '机床流水号'], 'MachineDrawing', this.ProjectNameValue)
+      this.getSelect(MachineDrawingSelect, ['机床图号', '机床流水号'], 'MachineDrawing')
     },
     // 组号查询
     fetchTeamDrawingData() {
@@ -400,12 +398,11 @@ export default {
     },
     fetchTableData() {
       this.loading = true
-      this.ProjectNameValue ? this.ProjectCode_check = 1 : this.ProjectCode_check = 0
       this.MachineDrawingValue ? this.MachineCode_check = 1 : this.MachineCode_check = 0
       this.TeamValue ? this.TeamCode_check = 1 : this.TeamCode_check = 0
       this.PartDrawing ? this.PartDrawing_check = 1 : this.PartDrawing_check = 0
       this.tableData2 = []
-      this.getTable(TableDataSelect, [this.ProjectCode_check, this.ProjectNameValue, this.MachineCode_check, this.MachineDrawingValue, this.TeamCode_check, this.TeamValue, this.ComponentPartsBasicCattleTaxNumber_check, this.ComponentPartsBasicCattleTaxNumber, this.CutCode_check, this.CutCode, this.CutCodeBefore_check, this.CutCodeBefore, this.Assess_check, this.Assess, this.PartDrawing_check, this.PartDrawing, this.currentPage1, this.pageSize1], ['tableData', 'total1', 'loading'])
+      this.getTable(TableDataSelect, [this.MachineCode_check, this.MachineDrawingValue, this.TeamCode_check, this.TeamValue, this.ComponentPartsBasicCattleTaxNumber_check, this.ComponentPartsBasicCattleTaxNumber, this.CutCode_check, this.CutCode, this.CutCodeBefore_check, this.CutCodeBefore, this.Assess_check, this.Assess, this.PartDrawing_check, this.PartDrawing, this.currentPage1, this.pageSize1], ['tableData', 'total1', 'loading'])
     },
     fetchTableData2(row) {
       if (row) {

src/views/ManufacturingCenter/StatusQuery/index.vue

@@ -2,13 +2,6 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <el-select v-model="entryNameValue" placeholder="项目名称" style="width:150px;margin: 10px 10px 0px 10px" size="small" clearable filterable @change="SearchMachine">
-          <el-option
-            v-for="item in entryName"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
         <el-select v-model="machineToolValue" placeholder="机床号" size="small" clearable style="width: 150px;margin: 10px 10px 0px 10px" @change="searchGroupList">
           <el-option
             v-for="item in machineTool"
@@ -97,7 +90,7 @@
 </template>
 
 <script>
-import { initProject, intPartState, searchTable, searchmachine, searchgroup } from '@/api/ManufacturingCenter/StatusQuery'
+import { intPartState, searchTable, searchmachine, searchgroup } from '@/api/ManufacturingCenter/StatusQuery'
 export default {
   data() {
     return {
@@ -146,32 +139,15 @@ export default {
           })
         }
       })
-      initProject().then(response => {
+      searchmachine().then(response => {
         for (let i = 0; i < response.data.length; i++) {
-          this.entryName.push({
+          this.machineTool.push({
-            label: response.data[i].项目名称,
+            label: response.data[i].机床图号,
-            value: response.data[i].项目流水号
+            value: response.data[i].机床流水号
           })
         }
       })
     },
-    // 查询机床
-    SearchMachine() {
-      this.machineToolValue = ''
-      this.machineTool = []
-      this.groupNumberValue = ''
-      this.groupNumber = []
-      if (this.entryNameValue) {
-        searchmachine(this.entryNameValue, 1).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.machineTool.push({
-              label: response.data[i].机床图号,
-              value: response.data[i].机床流水号
-            })
-          }
-        })
-      }
-    },
     // 查询组号
     searchGroupList() {
       this.groupNumberValue = ''
@@ -188,15 +164,14 @@ export default {
       }
     },
     searchData() {
-      var check, check1, check2, check3, check4, check5
+      var check1, check2, check3, check4, check5
-      if (this.entryNameValue) { check = 1 } else { check = 0 }
       if (this.machineToolValue) { check1 = 1 } else { check1 = 0 }
       if (this.groupNumberValue) { check2 = 1 } else { check2 = 0 }
       if (this.partNumber) { check3 = 1 } else { check3 = 0 }
       if (this.partStateValue) { check4 = 1 } else { check4 = 0 }
       if (this.partTypeValue) { check5 = 1 } else { check5 = 0 }
       this.loading0 = true
-      searchTable(check, this.entryNameValue, check1, this.machineToolValue, check2, this.groupNumberValue, check3, this.partNumber, check4, this.partStateValue, check5, this.partTypeValue, this.pageCurrent, this.pageSize).then(response => {
+      searchTable(check1, this.machineToolValue, check2, this.groupNumberValue, check3, this.partNumber, check4, this.partStateValue, check5, this.partTypeValue, this.pageCurrent, this.pageSize).then(response => {
         for (let i = 0; i < response.data.rows.length; i++) {
           response.data.rows[i].考核状态 = parseInt(response.data.rows[i].考核状态) - 2
           if (response.data.rows[i].传递时间 !== undefined || response.data.rows[i].hasOwnProperty('传递时间')) {

src/views/PurchasingCenter/CreatePurchaseContract/index.vue

@@ -152,7 +152,7 @@
       <div v-show="false">{{ content }}</div>
       <!--富文本编辑器-->
       <div v-show="!preview" id="tinymce" style="height:850px;">
-        <tinymce ref="tinymce" :height="700" v-model="contentNew" style="width:800px;margin: 0 auto;pointer-events: none"/>
+        <tinymce ref="tinymce" :height="700" v-model="contentNew" style="width:800px;margin: 0 auto;"/>
       </div>
       <!--网页预览-->
       <div v-show="preview" class="editor-content" style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="content"/>

src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue

@@ -22,6 +22,7 @@
       <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="getTableData()">查询</el-button>
     </el-card>
     <el-card>
+      <h3>采购效率</h3>
       <div id="myChart" style="width: 1000px; height: 570px; margin: auto"/>
     </el-card>
     <el-card style="width: 650px">
@@ -64,21 +65,111 @@
         </el-table-column>
       </el-table>
     </el-card>
+    <el-card v-loading="loading2" style="height: 450px">
+      <span>供应商分布图</span>
+      <el-button size="small" type="success" icon="el-icon-search" @click="search2()">查询</el-button>
+      <div id="myChart2" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
+    </el-card>
+    <el-card>
+      <span style="margin-left: 10px">时间段:</span>
+      <el-date-picker
+        v-model="date3"
+        style="width:160px;margin:10px;"
+        size="small"
+        type="date"
+        value-format="yyyy-MM-dd"
+        format="yyyy-MM-dd"
+        placeholder="选择日期"/>
+      <span>~</span>
+      <el-date-picker
+        v-model="date4"
+        style="width:160px;margin:10px;"
+        size="small"
+        type="date"
+        value-format="yyyy-MM-dd"
+        format="yyyy-MM-dd"
+        placeholder="选择日期"/>
+      <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="getTableData2()">查询</el-button>
+    </el-card>
+    <el-card>
+      <h3>采购合同审核审批效率</h3>
+      <div id="myChart3" style="width: 1000px; height: 570px; margin: auto"/>
+    </el-card>
+    <el-card>
+      <span style="margin-left: 10px">时间段:</span>
+      <el-date-picker
+        v-model="date5"
+        style="width:160px;margin:10px;"
+        size="small"
+        type="date"
+        value-format="yyyy-MM-dd"
+        format="yyyy-MM-dd"
+        placeholder="选择日期"/>
+      <span>~</span>
+      <el-date-picker
+        v-model="date6"
+        style="width:160px;margin:10px;"
+        size="small"
+        type="date"
+        value-format="yyyy-MM-dd"
+        format="yyyy-MM-dd"
+        placeholder="选择日期"/>
+      <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="getTableData3()">查询</el-button>
+    </el-card>
+    <el-card>
+      <h3>制造采购合同审批效率</h3>
+      <div id="myChart4" style="width: 1000px; height: 570px; margin: auto"/>
+    </el-card>
+    <el-card>
+      <span style="margin-left: 10px">时间段:</span>
+      <el-date-picker
+        v-model="date7"
+        style="width:160px;margin:10px;"
+        size="small"
+        type="date"
+        value-format="yyyy-MM-dd"
+        format="yyyy-MM-dd"
+        placeholder="选择日期"/>
+      <span>~</span>
+      <el-date-picker
+        v-model="date8"
+        style="width:160px;margin:10px;"
+        size="small"
+        type="date"
+        value-format="yyyy-MM-dd"
+        format="yyyy-MM-dd"
+        placeholder="选择日期"/>
+      <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="getTableData4()">查询</el-button>
+    </el-card>
+    <el-card>
+      <h3>采购合同审批付款效率</h3>
+      <div id="myChart5" style="width: 1000px; height: 570px; margin: auto"/>
+    </el-card>
   </div>
 </template>
 
 <script>
-import { getData, getData1 } from '@/api/PurchasingCenter/PurchasingEfficiencyAnalysis'
+import { getData, getData1, getData2, getData3, getData4 } from '@/api/PurchasingCenter/PurchasingEfficiencyAnalysis'
 export default {
   data() {
     return {
       tableData: [],
+      tableData1: [],
+      tableData2: [],
+      tableData3: [],
       date1: '',
-      date2: ''
+      date2: '',
+      date3: '',
+      date4: '',
+      date5: '',
+      date6: '',
+      date7: '',
+      date8: '',
+      loading2: false
     }
   },
   methods: {
-    async getTableData() {
+    getTableData() {
       this.tableData = []
       getData(this.date1, this.date2).then(response => {
         for (let i = 0; i < response.data.length; i++) {
@@ -160,7 +251,279 @@ export default {
           }
         ]
       })
+    },
+    getTableData2() {
+      getData2(this.date3, this.date4).then(response => {
+        this.tableData1 = response.data
+      }).then(() => {
+        this.drawLine1()
+      })
+    },
+    drawLine1() {
+      const myChart = this.$echarts.init(document.getElementById('myChart3'))
+      const xData = []
+      const lineData = []
+      const lineData1 = []
+      for (let i = 0; i < this.tableData1.length; i++) {
+        xData.push(this.tableData1[i].采购合同编号)
+        lineData.push(this.tableData1[i].审核用时)
+        lineData1.push(this.tableData1[i].审批用时)
+      }
+      myChart.clear()
+      myChart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        legend: {
+          data: ['审核用时', '审批用时']
+        },
+        xAxis: [
+          {
+            type: 'category',
+            name: '合同编号',
+            data: xData,
+            axisPointer: {
+              type: 'shadow'
+            },
+            axisLabel: {
+              interval: 0,
+              rotate: 40
+            }
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+            name: '用时(H)'
+          }
+        ],
+        series: [
+          {
+            name: '审核用时',
+            type: 'line',
+            label: {
+              normal: {
+                show: true,
+                position: 'top'
+              }
+            },
+            data: lineData
+          },
+          {
+            name: '审批用时',
+            type: 'line',
+            label: {
+              normal: {
+                show: true,
+                position: 'top'
+              }
+            },
+            data: lineData1
+          }
+        ]
+      })
+    },
+    getTableData3() {
+      getData3(this.date5, this.date6).then(response => {
+        this.tableData2 = response.data
+      }).then(() => {
+        this.drawLine2()
+      })
+    },
+    drawLine2() {
+      const myChart = this.$echarts.init(document.getElementById('myChart4'))
+      const xData = []
+      const lineData = []
+      for (let i = 0; i < this.tableData2.length; i++) {
+        xData.push(this.tableData2[i].采购合同编号)
+        lineData.push(this.tableData2[i].审批用时)
+      }
+      myChart.clear()
+      myChart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        legend: {
+          data: ['审批用时']
+        },
+        xAxis: [
+          {
+            type: 'category',
+            name: '合同编号',
+            data: xData,
+            axisPointer: {
+              type: 'shadow'
+            },
+            axisLabel: {
+              interval: 0,
+              rotate: 40
+            }
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+            name: '用时(H)'
+          }
+        ],
+        series: [
+          {
+            name: '审核用时',
+            type: 'line',
+            label: {
+              normal: {
+                show: true,
+                position: 'top'
+              }
+            },
+            data: lineData
+          }
+        ]
+      })
+    },
+    getTableData4() {
+      getData4(this.date7, this.date8).then(response => {
+        this.tableData3 = response.data
+      }).then(() => {
+        this.drawLine3()
+      })
+    },
+    drawLine3() {
+      const myChart = this.$echarts.init(document.getElementById('myChart5'))
+      const xData = []
+      const lineData = []
+      const lineData1 = []
+      for (let i = 0; i < this.tableData3.length; i++) {
+        xData.push(this.tableData3[i].采购合同编号)
+        lineData.push(this.tableData3[i].付款用时)
+        lineData1.push(this.tableData3[i].审批用时)
+      }
+      myChart.clear()
+      myChart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        legend: {
+          data: ['付款用时', '审批用时']
+        },
+        xAxis: [
+          {
+            type: 'category',
+            name: '合同编号',
+            data: xData,
+            axisPointer: {
+              type: 'shadow'
+            },
+            axisLabel: {
+              interval: 0,
+              rotate: 40
+            }
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+            name: '用时(H)'
+          }
+        ],
+        series: [
+          {
+            name: '付款用时',
+            type: 'line',
+            label: {
+              normal: {
+                show: true,
+                position: 'top'
+              }
+            },
+            data: lineData
+          },
+          {
+            name: '审批用时',
+            type: 'line',
+            label: {
+              normal: {
+                show: true,
+                position: 'top'
+              }
+            },
+            data: lineData1
+          }
+        ]
+      })
     }
+    // // 客户分布图
+    // search2() {
+    //   this.loading2 = true
+    //   var myChart2 = this.$echarts.init(document.getElementById('myChart2'))
+    //   myChart2.clear()
+    //   getData2().then(response => {
+    //     this.loading2 = false
+    //     this.drawLine2(response.data)
+    //   })
+    // },
+    // drawLine2(data) {
+    //   var dataX = []
+    //   var lineData = []
+    //   for (let i = 0; i < data.length; i++) {
+    //     dataX.push({
+    //       value: parseInt(data[i].客户数量),
+    //       name: data[i].省份
+    //     })
+    //     lineData.push(data[i].省份)
+    //   }
+    //   var myChart2 = this.$echarts.init(document.getElementById('myChart2'))
+    //   myChart2.clear()
+    //   myChart2.setOption({
+    //     title: {
+    //       text: '供应商分布图',
+    //       x: 'center'
+    //     },
+    //     tooltip: {
+    //       trigger: 'item',
+    //       formatter: '{a} <br/>{b} : {c} ({d}%)'
+    //     },
+    //     legend: {
+    //       orient: 'vertical',
+    //       left: 'left',
+    //       data: lineData
+    //     },
+    //     series: [
+    //       {
+    //         name: '省份',
+    //         type: 'pie',
+    //         radius: '55%',
+    //         center: ['50%', '60%'],
+    //         data: dataX,
+    //         itemStyle: {
+    //           emphasis: {
+    //             shadowBlur: 10,
+    //             shadowOffsetX: 0,
+    //             shadowColor: 'rgba(0, 0, 0, 0.5)'
+    //           }
+    //         }
+    //       }
+    //     ]
+    //   })
+    // }
   }
 }
 </script>

src/views/TechnologyCenter/QueryParts/index.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>项目名称</span>
+      <!--<span>项目名称</span>-->
-      <el-select v-model="projectValue" placeholder="请选择项目名称" filterable size="small">
+      <!--<el-select v-model="projectValue" placeholder="请选择项目名称" filterable size="small">-->
-        <el-option
+      <!--<el-option-->
-          v-for="item in project"
+      <!--v-for="item in project"-->
-          :key="item.value"
+      <!--:key="item.value"-->
-          :label="item.label"
+      <!--:label="item.label"-->
-          :value="item.value"/>
+      <!--:value="item.value"/>-->
-      </el-select>
+      <!--</el-select>-->
       <span>机床图号</span>
       <el-select v-model="machineValue" placeholder="请选择机床图号" filterable size="small">
         <el-option
@@ -266,15 +266,13 @@
 </template>
 
 <script>
-import { projectSelect, machineSelect, groupSelect, basicPartsData, deleteBasicParts, purchasePartsData, deletePurchaseData, getFileData } from '@/api/TechnologyCenter/QueryParts'
+import { machineSelect, groupSelect, basicPartsData, deleteBasicParts, purchasePartsData, deletePurchaseData, getFileData } from '@/api/TechnologyCenter/QueryParts'
 import { mapGetters } from 'vuex'
 import { ServerIP } from '@/utils/request'
 export default {
   name: 'Index',
   data() {
     return {
-      projectValue: '',
-      project: [],
       machineValue: '',
       machine: [],
       groupValue: '',
@@ -306,21 +304,6 @@ export default {
     }
   },
   watch: {
-    project(val) {
-      console.log(val)
-      if (val.length > 0) {
-        this.projectValue = val[0].value
-      }
-    },
-    projectValue(val) {
-      this.machineValue = ''
-      this.machine = []
-      this.groupValue = ''
-      this.group = []
-      if (val) {
-        this.getMachineSelect(val)
-      }
-    },
     machine(val) {
       if (val.length > 0) {
         this.machineValue = val[0].value
@@ -369,10 +352,7 @@ export default {
       })
     },
     fetchData() {
-      this.getSelect(projectSelect, ['项目名称', '项目流水号'], 'project')
+      this.getSelect(machineSelect, ['机床图号', '机床流水号'], 'machine')
-    },
-    getMachineSelect(val) {
-      this.getSelect(machineSelect, ['机床图号', '机床流水号'], 'machine', val)
     },
     getGroupSelect(val) {
       this.getSelect(groupSelect, ['组号', '组件流水号'], 'group', val)
@@ -380,11 +360,10 @@ export default {
     getTableData() {
       this.getFileData(this.machineValue)
       console.log(this.hadFile, 88899)
-      const project_check = this.projectValue ? 1 : 0
       const machine_check = this.machineValue ? 1 : 0
       const group_check = this.groupValue ? 1 : 0
       this.loading = true
-      basicPartsData(project_check, this.projectValue, machine_check, this.machineValue, group_check, this.groupValue, this.pageSize, this.pageCurrent).then(response => {
+      basicPartsData(machine_check, this.machineValue, group_check, this.groupValue, this.pageSize, this.pageCurrent).then(response => {
         this.loading = false
         const res = response.data
         this.total = res.total