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

src/api/Inventory/SelfMadePartsWarehouseOut.js

@@ -45,7 +45,7 @@ export function searchgroup(num, pageCurrent, pageSize) {
   })
 }
 // 获取表单
-export function searchdata(entryNameValue_check, entryNameValue, machineToolValue_check, machineToolValue, groupNumberValue_check, groupNumberValue, partNumber_check, partNumber, pageCurrent, pageSize) {
+export function searchdata(entryNameValue_check, entryNameValue, machineToolValue_check, machineToolValue, groupNumberValue_check, groupNumberValue, partNumber_check, partNumber, time_check, time1, time2, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
@@ -54,7 +54,7 @@ export function searchdata(entryNameValue_check, entryNameValue, machineToolValu
       ModularID: router.currentRoute.path,
       type: '1',
       name: '自制件出库_查询数据',
-      param: '项目流水号_check=' + entryNameValue_check + '&项目流水号=' + entryNameValue + '&机床流水号_check=' + machineToolValue_check + '&机床流水号=' + machineToolValue + '&组件流水号_check=' + groupNumberValue_check + '&组件流水号=' + groupNumberValue + '&零件图号_check=' + partNumber_check + '&零件图号=' + partNumber,
+      param: '项目流水号_check=' + entryNameValue_check + '&项目流水号=' + entryNameValue + '&机床流水号_check=' + machineToolValue_check + '&机床流水号=' + machineToolValue + '&组件流水号_check=' + groupNumberValue_check + '&组件流水号=' + groupNumberValue + '&零件图号_check=' + partNumber_check + '&零件图号=' + partNumber + '&入库时间_check=' + time_check + '&入库时间开始=' + time1 + '&入库时间结束=' + time2,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/Outsourcing/OutsourcingQCSearch.js

@@ -2,8 +2,8 @@ import request from '@/utils/request'
 import state from '@/store'
 import router from '@/router'
 
-// 查询外协到货单列表
+// 初始化机床项目
-export function searchTable1(...params) {
+export function initProject() {
   return request({
     url: '',
     method: 'post',
@@ -11,13 +11,12 @@ export function searchTable1(...params) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '车间生产管理_外协到货单_查询数据',
+      name: 'PDM_项目名称_查询数据'
-      param: `外协到货单号_check=${params[0]}&外协到货单号=${params[1]}&外协厂家_check=${params[2]}&外协厂家=${params[3]}`
     }
   })
 }
-// 查询外协到货单明细
+// 初始化质检类型
-export function searchTable2(...params) {
+export function QualityType() {
   return request({
     url: '',
     method: 'post',
@@ -25,8 +24,201 @@ export function searchTable2(...params) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '车间生产管理_外协到货单明细_查询数据',
+      name: '质检管理_质检类型_查询数据'
-      param: `外协到货单流水号=${params[0]}`
+    }
+  })
+}
+// 初始化不合格原因
+export function initReasonsForNonconformity() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '质检管理_不合格原因_查询数据'
+    }
+  })
+}
+// 初始化不合格处理
+export function initDisqualificationTreatment() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '质检管理_不合格处理_查询数据'
+    }
+  })
+}
+// 初始化质检人员
+export function initPerson() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '质检管理_质量情况_查询数据_质检人员'
+    }
+  })
+}
+// 组件查询
+export function searchgroup(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: 'PDM_组件名称_查询数据',
+      param: '机床流水号=' + num
+    }
+  })
+}
+// 零件查询
+export function searchparts(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '质检管理_零件信息_查询数据',
+      param: '组件流水号=' + num
+    }
+  })
+}
+// 工序查询
+export function searchprocedure(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '质检管理_工序信息_查询数据',
+      param: '工艺计划流水号=' + num
+    }
+  })
+}
+// 投产数量查询
+export function searchproceductnum(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '质检管理_投产数量_查询数据',
+      param: '工艺计划流水号=' + num
+    }
+  })
+}
+
+// 操作工查询
+export function searchoperators(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间生产管理_工序质检_查询人员数据_电脑端',
+      param: '工序流水号=' + num
+    }
+  })
+}
+// 新增序间检验
+export function submitTable(...param) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: '车间生产管理_质检管理_新增',
+      param: `零部件流水号=${param[0]}&质检类型代码=${param[1]}&数量=${param[2]}&是否合格=${param[3]}&人员编号=${param[4]}&不合格数量=${param[5]}&不合格原因=${param[6]}&不合格处理=${param[7]}&备注=${param[8]}&操作工=${param[9]}&编辑人员编号=${param[10]}`
+    }
+  })
+}
+export function confirmEdit(...param) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: '车间生产管理_质检管理_编辑处理',
+      param: `质检流水号=${param[0]}&质检类型代码=${param[1]}&零部件流水号=${param[2]}&是否合格=${param[3]}&数量=${param[4]}&不合格数量=${param[5]}&不合格原因=${param[6]}&不合格处理=${param[7]}&备注=${param[8]}&编辑人员编号=${param[9]}`
+    }
+  })
+}
+
+export function deleterow(...param) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: '车间生产管理_质检管理_删除处理',
+      param: `质检流水号=${param[0]}&质检类型代码=${param[1]}&零部件流水号=${param[2]}&数量=${param[3]}`
+    }
+  })
+}
+// 质检管理_质量情况_查询数据
+export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '质检管理_工序外协件_查询数据',
+      param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 +
+        '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6 + '&质检情况_check=' + check7 + '&质检情况=' + value7 + '&人员编号_check=' + check8 + '&人员编号=' + value8 + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
+    }
+  })
+}
+// 质检管理_质量情况_查询数据
+export function selecttable22(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '质检管理_质量情况_查询数据',
+      param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 +
+      '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6 + '&质检情况_check=' + check7 + '&质检情况=' + value7 + '&人员编号_check=' + check8 + '&人员编号=' + value8
+    }
+  })
+}
+export function searchPic(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '质检管理_图片_查询数据',
+      param: '质检流水号=' + num
     }
   })
 }
@@ -39,8 +231,58 @@ export function searchTableDetail(...params) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '质检管理_外协质检数据_查询数据',
+      name: '质检管理_质检数据_查询数据',
-      param: `检测类型=${params[0]}&外协到货单明细流水号=${params[1]}`
+      param: `检测类型=${params[0]}&质检流水号=${params[1]}`
+    }
+  })
+}
+export function searchData() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间生产管理工艺_加工顺序调整_查询正在加工零件工序_NEW'
+    }
+  })
+}
+export function searchData1() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: 'MES_机加工MES_记录零件待加工显示_NEW'
+    }
+  })
+}
+export function processingStatus(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间生产管理_成组配套加工进度_查询数据',
+      param: '工艺计划流水号=' + num
+    }
+  })
+}
+export function Prohibit(num, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: '质检管理_质检情况_禁用',
+      param: '质检流水号=' + num + '&质检类型代码=' + num1
     }
   })
 }

src/views/Assembly/AssemblyPlan/index.vue

@@ -126,7 +126,6 @@ export default {
     },
     searchTable() {
       this.loading = true
-      console.log(this.startEndDate)
       if (this.startEndDate === '' || this.startEndDate === null || this.startEndDate[0] === '' || this.startEndDate[1] === '') {
         this.check2 = 0
         this.startEndDate = ''

src/views/Assembly/QualityInspectionInformationInquiry/index.vue

@@ -27,7 +27,6 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <!--<span class="demonstration">时间区间:</span>-->
         <el-date-picker
           v-model="startTime"
           value-format="yyyy-MM-dd"
@@ -43,7 +42,6 @@
           style="width: 160px"
           type="date"
           placeholder="选择结束日期"/>
-        <!--<span>质检情况:</span>-->
         <el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" size="small" style="width: 100px;margin-left: 10px" clearable>
           <el-option
             v-for="item in qualityInspection"
@@ -51,7 +49,6 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <!--<span>质检人员:</span>-->
         <el-select v-model="personNum" filterable placeholder="质检人员" size="small" style="width: 130px;margin-left: 10px" clearable>
           <el-option
             v-for="item in person"
@@ -376,7 +373,7 @@
         </el-table-column>
         <el-table-column label="零件数量" align="center">
           <template slot-scope="scope">
-            {{ scope.row.批次数量 }}
+            {{ scope.row.投产数 }}
           </template>
         </el-table-column>
         <el-table-column label="工序名称" prop="工艺名称" align="center">
@@ -446,7 +443,7 @@
         </el-table-column>
         <el-table-column label="零件数量" align="center" width="70px">
           <template slot-scope="scope">
-            {{ scope.row.批次数量 }}
+            {{ scope.row.投产数 }}
           </template>
         </el-table-column>
         <el-table-column label="工序名称" prop="工艺名称" align="center">
@@ -770,8 +767,6 @@ export default {
       'id' // 人员编号
     ])
   },
-  created() {
-  },
   mounted() {
     this.initProject()
     this.QualityType()
@@ -782,7 +777,6 @@ export default {
     // 表内编辑取消
     cancel(row) {
       row.edit = !row.edit
-      console.log(row, 8888)
       row.备注 = row.备注_原
       row.不合格数量 = row.不合格数量_原
       row.是否合格 = row.是否合格_原
@@ -792,7 +786,6 @@ export default {
     },
     // 表内编辑确定
     confirmEdit(row) {
-      console.log(this.$store.state.user.id, 787878)
       confirmEdit(row.质检流水号, row.质检类型代码, row.零部件流水号, row.是否合格, row.数量, row.不合格数量, row.不合格原因, row.处理结果, row.备注, this.$store.state.user.id).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('编辑成功')
@@ -805,8 +798,6 @@ export default {
     },
     // 删除质检
     deleterow(row) {
-      // this.plan = row.计划流水号
-      console.log(row, 4545)
       this.$confirm('是否删除该质检记录?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -949,31 +940,6 @@ export default {
       var Data = this.CreateData('2001', '报表_质检管理_质量情况_查询数据', param)
       this.exportExcel_NPOI(Data)
     },
-    // exportExcel1() {
-    //   if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check1 = 1 } else { this.check1 = 0 }
-    //   if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
-    //   if (this.SpareParts !== '' && this.SpareParts !== null) { this.check3 = 1 } else { this.check3 = 0 }
-    //   if (this.QualityTypeValue !== '' && this.QualityTypeValue !== null) { this.check4 = 1 } else { this.check4 = 0 }
-    //   if (this.startTime !== '' && this.startTime !== null) { this.check5 = 1 } else { this.check5 = 0 }
-    //   if (this.endTime !== '' && this.endTime !== null) { this.check6 = 1 } else { this.check6 = 0 }
-    //   if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check7 = 1 } else { this.check7 = 0 }
-    //   if (this.personNum !== '' && this.personNum !== null) { this.check8 = 1 } else { this.check8 = 0 }
-    //   selecttable22(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.check7, this.qualityInspectionValue, this.check8, this.personNum).then(response => {
-    //     import('@/vendor/Export2Excel').then(excel => {
-    //       const tHeader = ['是否禁用', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工序名称', '质检类型', '检验数量', '不合格数量', '不合格原因', '处理结果', '质检时间', '备注']
-    //       const filterVal = ['禁用情况', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工艺名称', '质检类型', '数量', '不合格数量', '不合格原因文本', '不合格处理文本', '操作时间', '备注']
-    //       const list = response.data
-    //       const data = this.formatJson(filterVal, list)
-    //       excel.export_json_to_excel({
-    //         header: tHeader,
-    //         data,
-    //         filename: '质检情况表',
-    //         autoWidth: true,
-    //         bookType: 'xlsx'
-    //       })
-    //     })
-    //   })
-    // },
     fetchData() {
       searchData().then(response => {
         this.tableData10 = response.data
@@ -982,7 +948,6 @@ export default {
     },
     fetchData1() {
       searchData1().then(response => {
-        console.log(response)
         this.tableData20 = response.data
         this.total2 = response.data.total
       })
@@ -1070,7 +1035,6 @@ export default {
       searchTableDetail(type, num).then(response => {
         this.gridData = response.data
       })
-      console.log(type)
     },
     selecttable() {
       this.loading = true
@@ -1094,7 +1058,6 @@ export default {
           this.$set(v, '不合格原因文本_原', v.不合格原因文本)
           this.$set(v, '不合格处理文本_原', v.不合格处理文本)
         })
-        console.log(this.tableData1, 8979)
         this.loading = false
         this.total = parseInt(response.data.output[0].ItemCount)
       })
@@ -1103,10 +1066,8 @@ export default {
       this.dialogFormVisible = true
       this.urls = []
       searchPic(row.质检流水号).then(response => {
-        // this.URL = readFile + response.data[0].文件标识 + '.' + response.data[0].文件后缀
         for (let i = 0; i < response.data.length; i++) {
           if (response.data[i].文件内容 !== null) {
-            // this.urls.push(readFile + response.data[i].文件标识 + '.' + response.data[i].文件后缀)
             this.urls.push('data:image/png;base64,' + response.data[i].文件内容)
           }
         }
@@ -1130,24 +1091,6 @@ export default {
       this.pageCurrent = val
       this.selecttable()
     }
-    // handleSizeChange1(val) {
-    //   this.pageCurrent1 = 1
-    //   this.pageSize1 = val
-    //   this.fetchData()
-    // },
-    // handleCurrentChange1(val) {
-    //   this.pageCurrent1 = val
-    //   this.fetchData()
-    // },
-    // handleSizeChange2(val) {
-    //   this.pageCurrent2 = 1
-    //   this.pageSize2 = val
-    //   this.fetchData1()
-    // },
-    // handleCurrentChange2(val) {
-    //   this.pageCurrent2 = val
-    //   this.fetchData1()
-    // }
   }
 }
 

src/views/Inventory/SelfMadePartsWarehouseOut/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="机床号" filterable size="small" clearable style="width: 150px;margin: 10px 10px 0px 10px" @change="searchGroupList">
           <el-option
             v-for="item in machineTool"
@@ -24,12 +17,21 @@
             :value="item.value"/>
         </el-select>
         <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width: 180px;margin-left: 0px"/>
+        <el-date-picker
+          v-model="InventoryTime"
+          style="width:250px"
+          size="small"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          start-placeholder="入库开始"
+          end-placeholder="入库结束"/>
         <el-button type="primary" icon="el-icon-search" size="small" plain style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
         <el-button type="warning" size="small" style="margin: 15px 0 0 10px" plain @click="wareHousing">出库</el-button>
       </el-row>
     </el-card>
     <el-card>
-      <el-table :data="tableData" style="width: 1020px" height="580" stripe size="mini" border @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :data="tableData" style="width: 1020px" height="580" stripe size="mini" border @selection-change="handleSelectionChange">
         <el-table-column
           type="selection"
           width="45"/>
@@ -54,6 +56,11 @@
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="入库时间" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.入库时间 }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="库存数量" width="90px">
           <template slot-scope="scope">
             {{ scope.row.出库数量1 }}
@@ -69,16 +76,6 @@
             <el-input-number v-model="scope.row.出库数量" :max="scope.row.出库数量1" :min="0" size="mini" style="width: 100%"/>
           </template>
         </el-table-column>
-        <!--        <el-table-column align="center" label="入库数量" width="80px">-->
-        <!--          <template slot-scope="scope">-->
-        <!--            {{ scope.row.入库数量 }}-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
-        <!--        <el-table-column align="center" label="状态" width="80px">-->
-        <!--          <template slot-scope="scope">-->
-        <!--            <el-tag v-if="scope.row.考核状态 === '8'">入库</el-tag>-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
       </el-table>
       <span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
       <div class="block" style="margin-top: 10px;">
@@ -95,7 +92,6 @@
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="出库信息" center width="380px">
       <el-form ref="form" :model="form" :rules="rules" label-position="right">
         <el-form-item label="部门" prop="部门" label-width="100px" size="small">
-          <!--          <el-input v-model="form.department" size="small" placeholder="请输入人员编号" style="width: 200px"/>-->
           <el-select v-model="form.department" placeholder="请选择部门" size="small" clearable style="width: 200px;" @change="selectLeaders">
             <el-option
               v-for="item in departments"
@@ -126,12 +122,12 @@
 </template>
 
 <script>
-// import { url } from '@/utils/request'
-// import axios from 'axios'
 import { initProject, searchmachine, searchgroup, searchdata, warehousing, selectdepartment, selectleaders } from '@/api/Inventory/SelfMadePartsWarehouseOut'
 export default {
   data() {
     return {
+      loading: false,
+      InventoryTime: '',
       wareHousing_disable: false,
       entryNameValue: '', // 项目名称
       entryName: [],
@@ -170,12 +166,18 @@ export default {
   },
   methods: {
     searchData() {
+      this.loading = true
       this.tableData = []
       const entryNameValue_check = this.entryNameValue === '' || this.entryNameValue === null ? 0 : 1
       const machineToolValue_check = this.machineToolValue === '' || this.machineToolValue === null ? 0 : 1
       const groupNumberValue_check = this.groupNumberValue === '' ? 0 : 1
       const partNumber_check = this.partNumber === '' || this.partNumber === null ? 0 : 1
-      searchdata(entryNameValue_check, this.entryNameValue, machineToolValue_check, this.machineToolValue, groupNumberValue_check, this.groupNumberValue, partNumber_check, this.partNumber, this.pageCurrent, this.pageSize).then(response => {
+      var InventoryTime_check
+      if (this.InventoryTime === '' || this.InventoryTime === null || this.InventoryTime[0] === '' || this.InventoryTime[1] === '') {
+        InventoryTime_check = 0
+        this.InventoryTime = ''
+      } else { InventoryTime_check = 1 }
+      searchdata(entryNameValue_check, this.entryNameValue, machineToolValue_check, this.machineToolValue, groupNumberValue_check, this.groupNumberValue, partNumber_check, this.partNumber, InventoryTime_check, this.InventoryTime[0], this.InventoryTime[1], this.pageCurrent, this.pageSize).then(response => {
         this.totalnumber = response.data.rows.length
         if (response.data.rows.length !== 0) {
           for (let i = 0; i < response.data.rows.length; i++) {
@@ -185,6 +187,7 @@ export default {
               零件图号: response.data.rows[i].零件图号,
               零件名称: response.data.rows[i].零件名称,
               已出库数量: Number(response.data.rows[i].出库数量),
+              入库时间: response.data.rows[i].入库时间,
               入库数量: Number(response.data.rows[i].入库数量),
               工艺计划流水号: response.data.rows[i].工艺计划流水号,
               出库数量: Number(response.data.rows[i].入库数量) - Number(response.data.rows[i].出库数量),
@@ -192,6 +195,7 @@ export default {
             })
           }
         }
+        this.loading = false
         this.total = response.data.total
       })
     },
@@ -272,10 +276,6 @@ export default {
       this.shuzu = []
       this.shuzu = val
       this.gouxuan = val.length
-      // val.map(v => {
-      //   this.multipleSelection.push(v.工艺计划流水号)
-      //   this.outgoingQuantity.push(v.出库数量)
-      // })
     },
     CHUKU() {
       this.keyichuku = 1

src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue

@@ -30,13 +30,12 @@
             </el-table-column>
             <el-table-column align="center" label="操作者" width="70" show-overflow-tooltip="">
               <template slot-scope="scope">
-                <!--{{ scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名 }}-->
                 {{ scope.row.工序间是否外协 === 2 ? '外协' : (scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名) }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="数量" show-overflow-tooltip min-width="50">
               <template slot-scope="scope">
-                {{ scope.row.投产数量 }}
+                {{ scope.row.投产数 }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="质检数" show-overflow-tooltip min-width="65">
@@ -126,10 +125,88 @@ export default {
       departmentData: [] // 树状数据
     }
   },
-  created() {
+  watch: {
+    '$route': {
+      handler(route) {
+        if (this.$route.query.机床流水号) {
+          console.log(this.$route.query.机床流水号)
+          this.getTreeData2(this.$route.query.机床流水号)
+        } else {
+          // var that = this
+          if (!this.MachineValue) {
             this.getMachine()
+          }
+        }
+      },
+      immediate: true
+    }
+  },
+  created() {
+    // this.getMachine()
   },
   methods: {
+    getTreeData2(num) {
+      this.MachineValue = ''
+      this.Machine = []
+      getMachines().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Machine.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            value2: response.data[i].机床名称
+          })
+        }
+      }).then(() => {
+        this.MachineValue = num
+        getMachinesStatue(num).then(res => {
+          if (res.data[0].是否发货 === 0) {
+            this.MachineColor = 'rgb(126,172,237)'
+          } else {
+            this.MachineColor = 'green'
+          }
+        })
+        this.tableData1 = []
+        this.tableData2 = []
+        for (let i = 0; i < this.Machine.length; i++) {
+          if (this.MachineValue === this.Machine[i].value) {
+            this.机床图号 = this.Machine[i].label
+            this.机床名称 = this.Machine[i].value2
+          }
+        }
+        this.option = []
+        getGroups(num).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.option.push({
+              isLeaf: false,
+              label: response.data[i].组号 + '\xa0\xa0\xa0' + (response.data[i].组件名称 ? response.data[i].组件名称 : ''),
+              value: response.data[i].组件流水号,
+              组件完成状态: response.data[i].组件完成状态,
+              father: true,
+              children: []
+            })
+          }
+        }).then(() => {
+          this.option.map(firstLevel => {
+            // 根据分组查零件
+            selectParts(1, firstLevel.value, 0, 0).then(response => {
+              firstLevel.children = []
+              for (let j = 0; j < response.data.length; j++) {
+                firstLevel.children.push({
+                  label: (response.data[j].零件图号 ? response.data[j].零件图号 : '无零件图号') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].规格 ? response.data[j].规格 : '') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].投产总数量 ? response.data[j].投产总数量 : '') + '..........' + (response.data[j].零件名称 ? response.data[j].零件名称 : '无零件名称') + (response.data[j].零件类型 === 1 ? '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0自制：' + response.data[j].考核状态名称 : (response.data[j].零件类型 === 2 ? '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0制造采购' : '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0外购：' + response.data[j].采购状态)),
+                  value: response.data[j].工艺计划流水号,
+                  考核状态: response.data[j].考核状态,
+                  采购状态: response.data[j].采购状态,
+                  零件类型: response.data[j].零件类型,
+                  father: false
+                })
+              }
+            })
+          })
+        }).then(() => {
+          this.departmentData = this.option
+        })
+      })
+    },
     getMachine() {
       this.MachineValue = ''
       this.Machine = []

src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue

@@ -45,6 +45,16 @@
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="投产数" width="70px">
+          <template slot-scope="scope">
+            {{ scope.row.投产数 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="加工数" width="70px">
+          <template slot-scope="scope">
+            {{ scope.row.加工数 }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="报废数" width="70px">
           <template slot-scope="scope">
             {{ scope.row.报废数量 }}
@@ -90,6 +100,11 @@
             {{ scope.row.报废工时 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="补投数" width="70px">
+          <template slot-scope="scope">
+            {{ scope.row.补投数量 }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="补投时间" width="85px">
           <template slot-scope="scope">
             {{ scope.row.补投时间 ? scope.row.补投时间.split(' ')[0] : '' }}

src/views/ManufacturingCenter/Enter0therData/index.vue

@@ -32,7 +32,7 @@
           type="month"
           size="small"
           value-format="yyyy-MM"
-          style="margin-left: 280px; width: 140px"
+          style="margin-left: 465px; width: 140px"
           placeholder="选择月"/>
         <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-top: 10px;margin-bottom: 10px" @click="fetchDate">查询</el-button>
       </el-row>
@@ -48,22 +48,22 @@
           {{ scope.row.操作工姓名 }}
         </template>
       </el-table-column>
-      <el-table-column label="零件图号及名称" align="center" width="150">
+      <el-table-column label="零件图号及名称" align="center" width="180">
         <template slot-scope="scope">
           {{ scope.row.零件图号 }}
         </template>
       </el-table-column>
-      <el-table-column label="工序名称" align="center" width="100">
+      <el-table-column label="工序名称" align="center" width="120">
         <template slot-scope="scope">
           {{ scope.row.工序 }}
         </template>
       </el-table-column>
-      <el-table-column label="数量" align="center" width="70">
+      <el-table-column label="数量" align="center" width="90">
         <template slot-scope="scope">
           {{ scope.row.数量 }}
         </template>
       </el-table-column>
-      <el-table-column label="单件工时" align="center" width="100">
+      <el-table-column label="单件工时" align="center" width="110">
         <template slot-scope="scope">
           {{ scope.row.单件工时 }}
         </template>
@@ -73,7 +73,7 @@
           {{ scope.row.录入人姓名 }}
         </template>
       </el-table-column>
-      <el-table-column label="录入时间" align="center" width="100">
+      <el-table-column label="录入时间" align="center" width="110">
         <template slot-scope="scope">
           {{ scope.row.操作时间 ? scope.row.操作时间.split(' ')[0] : '' }}
         </template>

src/views/ManufacturingCenter/GroupMatching/index.vue

@@ -27,7 +27,6 @@
     <el-card>
       <el-tabs v-model="PartType2" type="border-card" style="margin-top: 10px">
         <el-tab-pane label="车间生产" name="车间生产">
-          <!--<h3 style="text-align: center;">车间生产</h3>-->
           <el-table v-loading="loading" :data="tableData" :summary-method="getSummaries" style="width: 100%;margin-top: 6px" highlight-current-row height="600" size="mini" show-summary border stripe>
             <el-table-column align="center" label="零件图号">
               <template slot-scope="scope">
@@ -41,7 +40,7 @@
             </el-table-column>
             <el-table-column align="center" label="投产数量">
               <template slot-scope="scope">
-                {{ scope.row.投产数量 }}
+                {{ scope.row.投产数 }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="入库数量">
@@ -87,7 +86,6 @@
           </div>
         </el-tab-pane>
         <el-tab-pane label="采购部采购" name="采购部采购">
-          <!--<h3 style="text-align: center;">采购部采购</h3>-->
           <el-tabs v-model="PartType" type="border-card" style="margin-top: 10px" @tab-click="searchTable()">
             <el-tab-pane label="标准件" name="标准件">
               <el-table :data="tableData00" size="mini" height="530px" border stripe>
@@ -328,7 +326,6 @@
           </el-tabs>
         </el-tab-pane>
         <el-tab-pane label="制造部采购" name="制造部采购">
-          <!--<h3 style="text-align: center;">制造部采购</h3>-->
           <el-table :data="tableData1" border style="width: 100%;margin-top: 6px;" height="600">
             <el-table-column label="进程" align="center" min-width="80">
               <template slot-scope="scope">
@@ -548,7 +545,12 @@ export default {
   },
   methods: {
     turnTo() {
-      this.$router.push({ path: '/ManufacturingCenter/CompletionOfWorkshopComponents' })
+      this.$router.push({
+        path: '/ManufacturingCenter/CompletionOfWorkshopComponents',
+        query: {
+          机床流水号: this.Machine
+        }
+      })
     },
     searchData() {
       this.totalNum = 0
@@ -572,14 +574,6 @@ export default {
         this.total = parseInt(response.data.output[0].ItemCount)
         this.loading = false
       })
-      // 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 => {
-      //   console.log(response.data, 123243)
-      //   for (let i = 0; i < response.data.length; i++) {
-      //     if (response.data[i].入库时间 !== null) {
-      //       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)

src/views/ManufacturingCenter/MaterialArrival/index.vue

@@ -100,11 +100,6 @@
                   {{ scope.row.操作者 }}
                 </template>
               </el-table-column>
-              <el-table-column align="center" label="排产日期" min-width="110">
-                <template slot-scope="scope">
-                  {{ scope.row.排产日期 }}
-                </template>
-              </el-table-column>
               <el-table-column align="center" label="完成日期" min-width="110">
                 <template slot-scope="scope">
                   {{ scope.row.完成日期 }}

src/views/ManufacturingCenter/PartAssignment/index.vue

@@ -21,8 +21,6 @@
         </el-select>
         <el-checkbox v-model="checked" @change="searchTable">禁用件</el-checkbox>
         <span style="margin-left: 20px;font-size: 14px;">任务下达时间:&nbsp;&nbsp;{{ DeliveryTime }}</span>
-        <!--        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>-->
-        <!--        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchPart()">查询1</el-button>-->
         <el-badge :value="value1" :max="99" class="item">
           <el-button size="small" type="text" @click="PartCallbackInformation1;dialogFormVisible2 = true">外购件和标准件打回信息</el-button>
         </el-badge>
@@ -371,13 +369,7 @@
         <el-button type="primary" @click="submitEdit2('form4')">确定</el-button>
       </div>
     </el-dialog>
-    <el-dialog
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="基本件打回信息" center width="60%" style="min-height: 400px">
-      v-el-drag-dialog
-      :visible.sync="dialogFormVisible1"
-      title="基本件打回信息"
-      center
-      width="60%"
-      style="min-height: 400px">
       <el-input v-model="partNumber" size="small" placeholder="零件图号及名称" style="width: 200px" clearable @change="PartCallbackInformation"/>
       <el-date-picker
         v-model="dateRange"
@@ -390,20 +382,8 @@
         start-placeholder="开始日期"
         end-placeholder="结束日期"
         @change="PartCallbackInformation"/>
-      <el-button
+      <el-button size="small" type="success" plain @click="submit()">采购部采购</el-button>
-        size="small"
+      <el-table :data="tableData9" size="mini" style="width: 100%;max-height: 300px" height="400" highlight-current-row border @selection-change="handleSelectionChange10">
-        type="success"
-        plain
-        @click="submit()">采购部采购</el-button>
-      <!--      :row-class-name="tableRowClassName"-->
-      <el-table
-        :data="tableData9"
-        size="mini"
-        style="width: 100%;max-height: 300px"
-        height="400"
-        highlight-current-row
-        border
-        @selection-change="handleSelectionChange10">
         <el-table-column align="center" type="selection" width="42px"/>
         <el-table-column align="center" label="零件图号">
           <template slot-scope="scope">
@@ -445,29 +425,9 @@
             {{ scope.row.退回时间 }}
           </template>
         </el-table-column>
-        <!--<el-table-column property="date" label="操作" width="200" align="center">-->
-        <!--<template slot-scope="scope">-->
-        <!--&lt;!&ndash;<el-button&ndash;&gt;-->
-        <!--&lt;!&ndash;size="mini"&ndash;&gt;-->
-        <!--&lt;!&ndash;type="success"&ndash;&gt;-->
-        <!--&lt;!&ndash;plain&ndash;&gt;-->
-        <!--&lt;!&ndash;@click="submit(scope.row)">确认</el-button>&ndash;&gt;-->
-        <!--&lt;!&ndash;<el-button&ndash;&gt;-->
-        <!--&lt;!&ndash;size="mini"&ndash;&gt;-->
-        <!--&lt;!&ndash;type="danger"&ndash;&gt;-->
-        <!--&lt;!&ndash;plain&ndash;&gt;-->
-        <!--&lt;!&ndash;@click="Delete(scope.row)">删除</el-button>&ndash;&gt;-->
-        <!--</template>-->
-        <!--</el-table-column>-->
       </el-table>
     </el-dialog>
-    <el-dialog
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="外购件和标准件打回信息" center width="60%" style="min-height: 400px">
-      v-el-drag-dialog
-      :visible.sync="dialogFormVisible2"
-      title="外购件和标准件打回信息"
-      center
-      width="60%"
-      style="min-height: 400px">
       <el-input v-model="partNumber1" size="small" placeholder="零件图号及名称" style="width: 200px" clearable @change="PartCallbackInformation1"/>
       <el-date-picker
         v-model="dateRange1"
@@ -480,12 +440,7 @@
         start-placeholder="开始日期"
         end-placeholder="结束日期"
         @change="PartCallbackInformation1"/>
-      <el-button
+      <el-button size="small" type="success" plain @click="submit1()">采购部采购</el-button>
-        size="small"
-        type="success"
-        plain
-        @click="submit1()">采购部采购</el-button>
-      <!--      :row-class-name="tableRowClassName"-->
       <el-table
         :data="tableData10"
         size="mini"
@@ -535,20 +490,6 @@
             {{ scope.row.退回时间 }}
           </template>
         </el-table-column>
-        <!--<el-table-column property="date" label="操作" width="200" align="center">-->
-        <!--<template slot-scope="scope">-->
-        <!--<el-button-->
-        <!--size="mini"-->
-        <!--type="success"-->
-        <!--plain-->
-        <!--@click="submit1(scope.row)">确认</el-button>-->
-        <!--<el-button-->
-        <!--size="mini"-->
-        <!--type="danger"-->
-        <!--plain-->
-        <!--@click="Delete1(scope.row)">删除</el-button>-->
-        <!--</template>-->
-        <!--</el-table-column>-->
       </el-table>
     </el-dialog>
   </div>
@@ -795,8 +736,8 @@ export default {
         }
         purchaseRequisition2Back(this.project, this.machine, this.group, this.BasicPartsNumber, this.NumberOfParts, this.time).then(response => {
           if (response.data[0].result !== '0') {
-            console.log(response.data[0].result)
             this.$message.success('请购成功')
+            this.value = 0
             PartCallbackInformation().then(response => {
               for (let i = 0; i < response.data.length; i++) {
                 if (response.data[i].退回时间 !== '') {
@@ -844,6 +785,7 @@ export default {
         PurchasingDepartmentBack(this.group, this.StandardPartsAndOutsourcing, this.MaterialNum, this.NumberOfParts, this.project, this.machine).then(response => {
           if (response.data[0].result !== '0') {
             this.$message.success('请购成功')
+            this.value1 = 0
             PartCallbackInformation1().then(response => {
               for (let i = 0; i < response.data.length; i++) {
                 if (response.data[i].退回时间 !== '') {

src/views/ManufacturingCenter/ProcessingStatusNew/index.vue

@@ -77,12 +77,12 @@
       <el-col style="width: 49%">
         <el-card>
           <el-table v-loading="loading" ref="singleTable" :data="tableData" :row-class-name="tableRowClassName" class="table" highlight-current-row border height="630" @row-click="getCurrentRow">
-            <el-table-column align="center" label="跟单号" show-overflow-tooltip width="160">
+            <el-table-column align="center" label="跟单号" show-overflow-tooltip width="140" fixed="left">
               <template slot-scope="scope">
                 {{ scope.row.跟单号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="零件图号" show-overflow-tooltip width="200">
+            <el-table-column align="center" label="零件图号" show-overflow-tooltip width="150" fixed="left">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>
@@ -94,7 +94,7 @@
             </el-table-column>
             <el-table-column align="center" label="投产数" width="70">
               <template slot-scope="scope">
-                {{ scope.row.投产数量 }}
+                {{ scope.row.总投产数 }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="质检数" width="70">
@@ -117,11 +117,6 @@
                 {{ scope.row.机加工实际完成时间 }}
               </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="机床图号" width="100">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
@@ -414,7 +409,6 @@ export default {
       gettabledata1(row).then(response => {
         if (response.data.length !== 0) {
           for (let i = 0; i < response.data.length; i++) {
-            console.log(response.data[i])
             this.tableData1.push({
               工艺名称: response.data[i].工艺名称,
               工序顺序: response.data[i].工序顺序,
@@ -556,6 +550,8 @@ export default {
         }
         this.Group = response.data[0].组件流水号
       })
+      this.pageCurrent = 1
+      this.pageSize = 100
       this.getTableData()
     },
     // 按条件查询

src/views/ManufacturingCenter/ProductionPlanQuery/index.vue

@@ -39,7 +39,6 @@
           </template>
         </el-table-column>
         <el-table-column label="零件图号" prop="零件图号" align="center" width="173px" show-overflow-tooltip>
-          <!--<el-table-column label="零件图号" prop="零件图号" align="center" width="180" show-overflow-tooltip>-->
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
@@ -71,7 +70,7 @@
         </el-table-column>
         <el-table-column label="批次投产数" align="center" width="100">
           <template slot-scope="scope">
-            {{ scope.row.批次数量 }}
+            {{ scope.row.投产数 }}
           </template>
         </el-table-column>
         <el-table-column label="投产时间" align="center" width="100" show-overflow-tooltip>
@@ -143,6 +142,10 @@ export default {
       })
     },
     machineChange() {
+      this.total = 0
+      this.pageSize = 20
+      this.pageCurrent = 1
+      this.tableData = []
       this.searchTable()
     },
     exportTable() {

src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue

@@ -86,7 +86,7 @@
         </el-table-column>
         <el-table-column label="加工数" align="center">
           <template slot-scope="scope">
-            {{ scope.row.投产数量 }}
+            {{ scope.row.投产数 }}
           </template>
         </el-table-column>
         <el-table-column label="质检数量" align="center">
@@ -276,7 +276,6 @@ export default {
         this.outTime ? check7 = 1 : (check7 = 0, this.outTime = '')
         this.ProcessingResultValue ? check10 = 1 : check10 = 0
         searchtable(check, this.machineNameValue, check1, this.partName, check7, this.outTime[0], this.outTime[1], check10, this.ProcessingResultValue, this.pageCurrent, this.pageSize).then(response => {
-          console.log(response.data, 123)
           this.tableData = response.data.result
           this.totalnumber = this.tableData.length
           this.loading = false

src/views/ManufacturingCenter/StatusQuery/index.vue

@@ -52,7 +52,7 @@
         </el-table-column>
         <el-table-column align="center" label="数量" width="50px">
           <template slot-scope="scope">
-            {{ scope.row.批次数量 }}
+            {{ scope.row.投产数 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="质检数" width="65px">

src/views/Outsourcing/OutsourcingQCSearch/index.vue

@@ -1,115 +1,218 @@
 <template>
   <div class="app-container">
     <el-card>
-      <el-input v-model="orderNumber" clearable style="width: 210px;margin:0px 10px" placeholder="输入外协到货单或外协厂家" size="small"/>
+      <el-row>
-      <!--      <span style="margin-left: 10px">外协厂家:</span>-->
+        <el-select v-model="machineNumberValue" filterable placeholder="机床图号" size="small" style="margin-left: 10px;width: 180px;margin-top: 5px" clearable @change="machineChange()">
-      <!--      <el-input v-model="outsourcingSupplier" clearable style="width: 200px;margin:0px 10px" placeholder="请输入外协厂家" size="small"/>-->
+          <el-option
-      <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+            v-for="item in machineNumber"
-      <el-table v-loading="" :data="tableData1" border stripe style="width: 100%;max-height: 600px;" height="400px" size="mini" @row-click="searchTable2">
+            :key="item.value"
-        <el-table-column label="序号" align="center" width="55" type="index"/>
+            :label="item.label"
-        <el-table-column label="外协到货单号" prop="外协到货单编号" align="center" min-width="100">
+            :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-select v-model="groupNumberValue" filterable placeholder="组号" size="small" style="margin-left: 10px;width:100px" clearable>
+          <el-option
+            v-for="item in groupNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <el-input v-model="SpareParts" filterable placeholder="零件图号或零件名称" style="width: 150px;margin-left: 10px" size="small" clearable/>
+        <!--<span class="demonstration">时间区间:</span>-->
+        <el-date-picker
+          v-model="startTime"
+          value-format="yyyy-MM-dd"
+          size="small"
+          style="width: 160px;margin-left: 10px"
+          type="date"
+          placeholder="选择开始日期"/>
+        <span class="demonstration">~</span>
+        <el-date-picker
+          v-model="endTime"
+          value-format="yyyy-MM-dd"
+          size="small"
+          style="width: 160px"
+          type="date"
+          placeholder="选择结束日期"/>
+        <!--<span>质检情况:</span>-->
+        <el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" size="small" style="width: 100px;margin-left: 10px" clearable>
+          <el-option
+            v-for="item in qualityInspection"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <el-button type="primary" size="small" icon="el-icon-search" style="margin-left: 15px;margin-top: 5px" plain @click="pageSize=10; pageCurrent= 1;selecttable()">查询</el-button>
+        <el-tooltip :open-delay="1000" effect="dark" content="导出查询数据" placement="top">
+          <el-button v-positive="'loading'" type="warning" size="small" icon="el-icon-download" plain style="margin-left:10px" @click="exportExcel()">导出</el-button>
+        </el-tooltip>
+      </el-row>
+    </el-card>
+    <el-card>
+      <el-table v-loading="loading" :data="tableData1" element-loading-text="质检数据较多，请耐心等候..." border size="mini" highlight-current-row style="width: 100%" stripe height="600px">
+        <el-table-column label="机床图号" align="center" width="90px" fixed>
           <template slot-scope="scope">
-            {{ scope.row.外协到货单编号 }}
+            {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="外协厂家" prop="外协厂家名称" align="center" min-width="100">
+        <el-table-column label="机床名称" align="center" min-width="180px" show-overflow-tooltip fixed>
           <template slot-scope="scope">
-            {{ scope.row.外协厂家名称 }}
+            {{ scope.row.机床名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="创建日期" align="center" min-width="100">
+        <el-table-column label="组号" align="center" width="60px" fixed>
           <template slot-scope="scope">
-            {{ scope.row.操作日期.split(' ')[0] }}
+            {{ scope.row.组号 }}
           </template>
         </el-table-column>
-      </el-table>
+        <el-table-column label="零件图号" align="center" min-width="130px" show-overflow-tooltip fixed>
-      <!--      <div class="block" style="margin: 10px 0;">-->
-      <!--        <el-pagination-->
-      <!--          :current-page="pageCurrent1"-->
-      <!--          :page-sizes="[10, 20, 30, 40]"-->
-      <!--          :page-size="pageSize1"-->
-      <!--          :total="total1"-->
-      <!--          style="display:inline-block;width:50%"-->
-      <!--          layout="total, sizes, prev, pager, next, jumper"-->
-      <!--          @size-change="handleSizeChange1"-->
-      <!--          @current-change="handleCurrentChange1"/>-->
-      <!--      </div>-->
-      <el-table v-loading="" :data="tableData2" :summary-method="getSummaries" show-summary border stripe style="width: 100%;min-height: 400px" height="420px" size="mini">
-        <el-table-column label="序号" align="center" width="50px" type="index"/>
-        <el-table-column label="零件名称" align="center" min-width="70px">
-          <template slot-scope="scope">
-            {{ scope.row.零件名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件图号" align="center" min-width="120px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件数" align="center" width="70px">
+        <el-table-column label="零件名称" align="center" fixed>
           <template slot-scope="scope">
-            {{ scope.row.批次数量 }}
+            {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="质检人员" align="center" width="70px">
+        <el-table-column label="加工数" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.零件数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="规格或材料" align="center" width="120px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.规格或材料 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="工序名称" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.工艺名称 }}
+          </template>
+        </el-table-column>
+        <!--        <el-table-column label="质检类型" align="center">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.质检类型 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column label="质检人员" align="center">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="检验数" align="center" width="70px">
+        <el-table-column label="检测数量" align="center" width="120px">
           <template slot-scope="scope">
-            {{ scope.row.数量 || 0 }}
+            <template v-if="scope.row.edit">
+              <el-input-number v-model="scope.row.数量" :min="0" :max="scope.row.零件数量" :step="1" style="width: 90%" size="mini"/>
+            </template>
+            <template v-else>
+              {{ scope.row.数量 }}
+            </template>
           </template>
         </el-table-column>
-        <el-table-column label="不合格数" align="center" min-width="140px">
+        <el-table-column label="检测结果" align="center" width="120px">
           <template slot-scope="scope">
-            {{ scope.row.不合格数量 || 0 }}
+            <template v-if="scope.row.edit">
+              <el-select v-model="scope.row.是否合格" placeholder="请选择" filterable size="mini" style="width: 100%">
+                <el-option
+                  v-for="item in qualityInspection"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </template>
+            <template v-else>
+              {{ scope.row.是否合格 ===1 ? '合格' : '不合格' }}
+            </template>
           </template>
         </el-table-column>
-        <el-table-column label="不合格原因" align="center" width="90px">
+        <el-table-column label="不合格数" align="center" width="120px">
           <template slot-scope="scope">
+            <template v-if="scope.row.edit && scope.row.是否合格 === 2">
+              <el-input-number v-model="scope.row.不合格数量" :min="0" :max="scope.row.数量" :step="1" style="width: 90%" size="mini"/>
+            </template>
+            <template v-else-if="scope.row.是否合格 === 1">
+              {{ scope.row.不合格数量 = '' }}
+            </template>
+            <template v-else>
+              {{ scope.row.不合格数量 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="不合格原因" align="center" width="140px">
+          <template slot-scope="scope">
+            <template v-if="scope.row.edit && scope.row.是否合格 === 2">
+              <el-select v-model="scope.row.不合格原因" placeholder="请选择" filterable size="mini" style="width: 100%">
+                <el-option
+                  v-for="item in reasonsForNonconformity"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </template>
+            <template v-else-if="scope.row.是否合格 === 1">
+              {{ scope.row.不合格原因 = null }}
+            </template>
+            <template v-else>
               {{ scope.row.不合格原因文本 }}
             </template>
+          </template>
         </el-table-column>
-        <el-table-column label="处理结果" align="center" width="70px">
+        <el-table-column label="处理结果" align="center" width="140px" show-overflow-tooltip>
           <template slot-scope="scope">
+            <template v-if="scope.row.edit && scope.row.是否合格 === 2">
+              <el-select v-model="scope.row.处理结果" placeholder="请选择" filterable size="mini" style="width: 100%">
+                <el-option
+                  v-for="item in disqualificationTreatment"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </template>
+            <template v-else-if="scope.row.是否合格 === 1">
+              {{ scope.row.处理结果 = null }}
+            </template>
+            <template v-else>
               {{ scope.row.不合格处理文本 }}
             </template>
-        </el-table-column>
-        <el-table-column label="检验时间" align="center" min-width="135px">
-          <template slot-scope="scope">
-            {{ scope.row.操作时间.split(' ')[0] || '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="形位" align="center" width="90px">
+        <el-table-column label="操作工" align="center" width="90px" show-overflow-tooltip>
+          <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="140px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <template v-if="scope.row.edit">
+              <el-input v-model="scope.row.备注" size="mini" style="width: 100%"/>
+            </template>
+            <template v-else>
+              {{ scope.row.备注 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="编辑人" align="center" width="90px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.编辑人 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="编辑时间" align="center" width="90px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.编辑时间 ? scope.row.编辑时间.split(' ')[0] : scope.row.编辑时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="形位" align="center" width="70">
           <template slot-scope="scope">
             <el-popover placement="right" width="500" trigger="click">
-              <el-table :data="gridData" highlight-current-row stripe size="mini">
+              <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
-                <el-table-column width="50px" align="center" type="index" label="序号"/>
-                <el-table-column min-width="150px" align="center" label="类别">
-                  <template slot-scope="scope">
-                    {{ scope.row.类别 }}
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="100px" align="center" label="数值">
-                  <template slot-scope="scope">
-                    {{ scope.row.数值 }}
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="100" align="center" label="零件数量">
-                  <template slot-scope="scope">
-                    {{ scope.row.零件数量 }}
-                  </template>
-                </el-table-column>
-              </el-table>
-              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(1, scope.row.外协到货单明细流水号)">形位</el-button>
-            </el-popover>
-          </template>
-        </el-table-column>
-        <el-table-column label="尺寸" align="center" width="90px">
-          <template slot-scope="scope">
-            <el-popover placement="right" width="500" trigger="click">
-              <el-table :data="gridData" highlight-current-row stripe size="mini">
                 <el-table-column width="50" align="center" type="index" label="序号"/>
                 <el-table-column min-width="150" align="center" label="类别">
                   <template slot-scope="scope">
@@ -127,14 +230,14 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(2, scope.row.外协到货单明细流水号)">尺寸</el-button>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(1, scope.row.质检流水号)">形位</el-button>
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column label="外观" align="center" width="90px">
+        <el-table-column label="尺寸" align="center" width="70">
           <template slot-scope="scope">
             <el-popover placement="right" width="500" trigger="click">
-              <el-table :data="gridData" highlight-current-row stripe size="mini">
+              <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
                 <el-table-column width="50" align="center" type="index" label="序号"/>
                 <el-table-column min-width="150" align="center" label="类别">
                   <template slot-scope="scope">
@@ -152,128 +255,535 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(3, scope.row.外协到货单明细流水号)">外观</el-button>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(2, scope.row.质检流水号)">尺寸</el-button>
             </el-popover>
           </template>
         </el-table-column>
+        <el-table-column label="外观" align="center" width="70">
+          <template slot-scope="scope">
+            <el-popover placement="right" width="500" trigger="click">
+              <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
+                <el-table-column width="50" align="center" type="index" label="序号"/>
+                <el-table-column min-width="150" align="center" label="类别">
+                  <template slot-scope="scope">
+                    {{ scope.row.类别 }}
+                  </template>
+                </el-table-column>
+                <el-table-column min-width="100" align="center" label="数值">
+                  <template slot-scope="scope">
+                    {{ scope.row.数值 }}
+                  </template>
+                </el-table-column>
+                <el-table-column min-width="100" align="center" label="零件数量">
+                  <template slot-scope="scope">
+                    {{ scope.row.零件数量 }}
+                  </template>
+                </el-table-column>
               </el-table>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(3, scope.row.质检流水号)">外观</el-button>
+            </el-popover>
+          </template>
+        </el-table-column>
+        <el-table-column label="查看图片" align="center" width="100px">
+          <template slot-scope="scope">
+            <el-button
+              v-if="!scope.row.edit"
+              size="mini"
+              type="text"
+              plain
+              icon="el-icon-search"
+              @click="viewPicture(scope.row)">查看图片</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[10, 20, 30, 40, 100]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
     </el-card>
   </div>
 </template>
 
 <script>
-import { searchTable1, searchTable2, searchTableDetail } from '@/api/Outsourcing/OutsourcingQCSearch'
+import { initProject, searchgroup, selecttable, QualityType, searchPic, searchTableDetail, searchData, searchData1, processingStatus, initPerson, Prohibit, initDisqualificationTreatment, initReasonsForNonconformity, searchparts, searchprocedure, searchoperators, submitTable, confirmEdit, searchproceductnum, deleterow } from '@/api/Outsourcing/OutsourcingQCSearch'
+import { mapGetters } from 'vuex'
 export default {
-  name: 'OutsourcingQCSearch',
   data() {
     return {
-      orderNumber: '',
+      machineNumberValue: '',
-      outsourcingSupplier: '',
+      machineNumber: [],
-      tableData1: [],
+      startTime: '',
-      // pageCurrent1: 1,
+      endTime: '',
-      // pageSize1: 10,
+      form2: {
-      // total1: 0,
+        机床图号: '',
-      tableData2: [],
+        组号: '',
-      pageCurrent2: 1,
+        零件图号: '',
-      pageSize2: 10,
+        工序: '',
-      total2: 0,
+        质检类型: 10,
-      gridData: []
+        质检情况: 1,
+        检测数: '',
+        不合格数量: '',
+        不合格原因: '',
+        不合格处理: '',
+        备注: '',
+        操作工: ''
+      },
+      rules2: {
+        操作工: [{ required: true, message: '请选择操作工' }],
+        工序: [{ required: true, message: '请选择工序' }],
+        质检情况: [{ required: true, message: '请选择质检情况' }]
+      },
+      urls: [],
+      URL: '',
+      number: '',
+      reasonsForNonconformity: [],
+      disqualificationTreatment: [],
+      operators: [],
+      groupNumberValue: '',
+      groupNumber: [],
+      groupNumber1: [],
+      partNum: [],
+      procedureNum: [],
+      gridData: [],
+      QualityTypeNumber: [],
+      QualityTypeValue: '',
+      qualityInspectionValue: '',
+      qualityInspection: [
+        {
+          value: 1,
+          label: '合格'
+        }, {
+          value: 2,
+          label: '不合格'
         }
+      ],
+      tableData1: [],
+      tableData10: [],
+      tableData20: [],
+      tableData5: [],
+      SpareParts: '',
+      SparePartsNumber: '',
+      SparePartsName: '',
+      personNum: '',
+      person: [],
+      dialogFormVisible: false,
+      dialogFormVisible4: false,
+      dialogFormVisible10: false,
+      AddTableData_disable: false,
+      loading: false,
+      total: 0, // 总条数
+      pageSize: 10, // 每页显示条数
+      pageCurrent: 1, // 后台获取页
+      dialogmethod: false, // false新增  true 编辑
+      proceductnummax: 0
+      // total1: 0, // 总条数
+      // pageSize1: 10, // 每页显示条数
+      // pageCurrent1: 1, // 后台获取页
+      // total2: 0, // 总条数
+      // pageSize2: 10, // 每页显示条数
+      // pageCurrent2: 1 // 后台获取页
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'name',
+      'id' // 人员编号
+    ])
+  },
+  created() {
   },
   mounted() {
-    this.searchTable1()
+    this.initProject()
+    this.QualityType()
+    this.fetchData()
+    this.fetchData1()
   },
   methods: {
-    // 合计
+    // 表内编辑取消
-    getSummaries(param) {
+    cancel(row) {
-      const { columns, data } = param
+      row.edit = !row.edit
-      const sums = []
+      console.log(row, 8888)
-      columns.forEach((column, index) => {
+      row.备注 = row.备注_原
-        if (index === 0) {
+      row.不合格数量 = row.不合格数量_原
-          sums[index] = '总价'
+      row.是否合格 = row.是否合格_原
-        } else if (index === 3) {
+      row.数量 = row.数量_原
-          const values = data.map(item => Number(item['批次数量']) || 0)
+      row.不合格原因文本 = row.不合格原因文本_原
-          if (!values.every(value => isNaN(value))) {
+      row.不合格处理文本 = row.不合格处理文本_原
-            sums[index] = values.reduce((prev, curr) => {
+    },
-              const value = Number(curr)
+    // 表内编辑确定
-              if (!isNaN(value)) {
+    confirmEdit(row) {
-                return Number((prev + curr).toFixed(2))
+      console.log(this.$store.state.user.id, 787878)
+      confirmEdit(row.质检流水号, row.质检类型代码, row.零部件流水号, row.是否合格, row.数量, row.不合格数量, row.不合格原因, row.处理结果, row.备注, this.$store.state.user.id).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('编辑成功')
+          this.selecttable()
         } else {
-                return Number((prev).toFixed(2))
+          this.$message.error('编辑失败')
-              }
-            }, 0)
-            sums[index] += ''
-          } else {
-            sums[index] = 'N/A'
-          }
-        } else if (index === 4) {
-          const values = data.map(item => Number(item['数量']) || 0)
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return Number((prev + curr).toFixed(2))
-              } else {
-                return Number((prev).toFixed(2))
-              }
-            }, 0)
-            sums[index] += ''
-          } else {
-            sums[index] = 'N/A'
-          }
-        } else if (index === 5) {
-          const values = data.map(item => Number(item['不合格数量']) || 0)
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return Number((prev + curr).toFixed(2))
-              } else {
-                return Number((prev).toFixed(2))
-              }
-            }, 0)
-            sums[index] += ''
-          } else {
-            sums[index] = 'N/A'
-          }
-        } else if (index === 6) {
-          sums[index] = '检验比例：' + ((sums[4] / sums[3]) * 100).toFixed(2) + '%'
         }
       })
-      return sums
+      row.edit = false
     },
-    // 查询到货单列表
+    // 删除质检
-    searchTable1() {
+    deleterow(row) {
-      let check1, check2
+      // this.plan = row.计划流水号
-      this.orderNumber ? check1 = 1 : check1 = 0
+      console.log(row, 4545)
-      this.outsourcingSupplier ? check2 = 1 : check2 = 0
+      this.$confirm('是否删除该质检记录?', '提示', {
-      searchTable1(check1, this.orderNumber, check2, this.outsourcingSupplier).then(response => {
+        confirmButtonText: '确定',
-        this.tableData1 = response.data
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleterow(row.质检流水号, row.质检类型代码, row.零部件流水号, row.数量).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            this.selecttable()
+          } else {
+            this.$message.error('编辑失败')
+          }
+        })
+      })
+    },
+    initProject() {
+      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].机床流水号
+          })
+        }
+      })
+    },
+    QualityType() {
+      QualityType().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.QualityTypeNumber.push({
+            label: response.data[i].质检类型,
+            value: response.data[i].质检类型代码
+          })
+        }
+      })
+      initPerson().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.person.push({
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
+      })
+      initDisqualificationTreatment().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.disqualificationTreatment.push({
+            label: response.data[i].不合格处理文本,
+            value: response.data[i].不合格处理
+          })
+        }
+      })
+      initReasonsForNonconformity().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.reasonsForNonconformity.push({
+            label: response.data[i].不合格原因文本,
+            value: response.data[i].不合格原因
+          })
+        }
+      })
+    },
+    approvalPass(row) {
+      this.$confirm('是否禁用?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        Prohibit(row.质检流水号, row.质检类型代码).then(res => {
+          if (res.data[0].result === '1') {
+            this.$message.success('操作成功')
+            this.selecttable()
+          } else {
+            this.$message.error('操作失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        })
+      })
+    },
+    // 删除
+    handleEdit(row) {
+      if (this.$refs['form2'] !== undefined) {
+        this.$refs['form2'].resetFields()
+      }
+      console.log(row, 8989)
+      this.partNum = []
+      this.groupNumber = []
+      this.procedureNum = []
+      this.operators = []
+      this.AddTableData_disable = false
+      this.dialogmethod = true // 编辑置为true
+      this.dialogFormVisible10 = true
+    },
+    // 新增
+    AddTableData() {
+      if (this.$refs['form2'] !== undefined) {
+        this.$refs['form2'].resetFields()
+      }
+      this.partNum = []
+      this.groupNumber = []
+      this.procedureNum = []
+      this.operators = []
+      this.AddTableData_disable = false
+      this.dialogmethod = false // 新增置为false
+      this.dialogFormVisible10 = true
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => {
+        return v[j]
+      }))
+    },
+    exportExcel() {
+      if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check1 = 1 } else { this.check1 = 0 }
+      if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
+      if (this.SpareParts !== '' && this.SpareParts !== null) { this.check3 = 1 } else { this.check3 = 0 }
+      if (this.QualityTypeValue !== '' && this.QualityTypeValue !== null) { this.check4 = 1 } else { this.check4 = 0 }
+      if (this.startTime !== '' && this.startTime !== null) { this.check5 = 1 } else { this.check5 = 0 }
+      if (this.endTime !== '' && this.endTime !== null) { this.check6 = 1 } else { this.check6 = 0 }
+      if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check7 = 1 } else { this.check7 = 0 }
+      if (this.personNum !== '' && this.personNum !== null) { this.check8 = 1 } else { this.check8 = 0 }
+      var param = []
+      param[0] = ['机床流水号_check', this.check1]
+      param[1] = ['机床流水号', this.machineNumberValue]
+      param[2] = ['组件流水号_check', this.check2]
+      param[3] = ['组件流水号', this.groupNumberValue]
+      param[4] = ['零件名称_check', this.check3]
+      param[5] = ['零件名称', this.SpareParts]
+      param[6] = ['质检类型代码_check', this.check4]
+      param[7] = ['质检类型代码', this.QualityTypeValue]
+      param[8] = ['开始时间_check', this.check5]
+      param[9] = ['开始时间', this.startTime]
+      param[10] = ['结束时间_check', this.check6]
+      param[11] = ['结束时间', this.endTime]
+      param[12] = ['质检情况_check', this.check7]
+      param[13] = ['质检情况', this.qualityInspectionValue]
+      param[14] = ['人员编号_check', this.check8]
+      param[15] = ['人员编号', this.personNum]
+      var Data = this.CreateData('2001', '报表_质检管理_工序外协件_查询数据', param)
+      this.exportExcel_NPOI(Data)
+    },
+    // exportExcel1() {
+    //   if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check1 = 1 } else { this.check1 = 0 }
+    //   if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
+    //   if (this.SpareParts !== '' && this.SpareParts !== null) { this.check3 = 1 } else { this.check3 = 0 }
+    //   if (this.QualityTypeValue !== '' && this.QualityTypeValue !== null) { this.check4 = 1 } else { this.check4 = 0 }
+    //   if (this.startTime !== '' && this.startTime !== null) { this.check5 = 1 } else { this.check5 = 0 }
+    //   if (this.endTime !== '' && this.endTime !== null) { this.check6 = 1 } else { this.check6 = 0 }
+    //   if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check7 = 1 } else { this.check7 = 0 }
+    //   if (this.personNum !== '' && this.personNum !== null) { this.check8 = 1 } else { this.check8 = 0 }
+    //   selecttable22(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.check7, this.qualityInspectionValue, this.check8, this.personNum).then(response => {
+    //     import('@/vendor/Export2Excel').then(excel => {
+    //       const tHeader = ['是否禁用', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工序名称', '质检类型', '检验数量', '不合格数量', '不合格原因', '处理结果', '质检时间', '备注']
+    //       const filterVal = ['禁用情况', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工艺名称', '质检类型', '数量', '不合格数量', '不合格原因文本', '不合格处理文本', '操作时间', '备注']
+    //       const list = response.data
+    //       const data = this.formatJson(filterVal, list)
+    //       excel.export_json_to_excel({
+    //         header: tHeader,
+    //         data,
+    //         filename: '质检情况表',
+    //         autoWidth: true,
+    //         bookType: 'xlsx'
+    //       })
+    //     })
+    //   })
+    // },
+    fetchData() {
+      searchData().then(response => {
+        this.tableData10 = response.data
         this.total1 = response.data.total
       })
     },
-    // handleSizeChange1(val) {
+    fetchData1() {
-    //   this.pageSize1 = val
+      searchData1().then(response => {
-    //   this.pageCurrent1 = 1
+        console.log(response)
-    //   this.searchTable1()
+        this.tableData20 = response.data
-    // },
+        this.total2 = response.data.total
-    // handleCurrentChange1(val) {
+      })
-    //   this.pageCurrent1 = val
+    },
-    //   this.searchTable1()
+    machineChange() {
-    // },
+      this.groupNumberValue = ''
-    searchTable2(row) {
+      this.groupNumber = []
-      searchTable2(row.外协到货单流水号).then(response => {
+      searchgroup(this.machineNumberValue).then(response => {
-        this.tableData2 = response.data
+        for (let i = 0; i < response.data.length; i++) {
+          this.groupNumber.push({
+            label: response.data[i].组号,
+            value: response.data[i].组件流水号
+          })
+        }
+      })
+    },
+    machineChange1() {
+      this.form2.组号 = ''
+      this.groupNumber1 = []
+      searchgroup(this.form2.机床图号).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.groupNumber1.push({
+            label: response.data[i].组号,
+            value: response.data[i].组件流水号
+          })
+        }
+      })
+    },
+    groupChange() {
+      this.form2.零件图号 = ''
+      this.partNum = []
+      searchparts(this.form2.组号).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.partNum.push({
+            label: response.data[i].零件图号,
+            value: response.data[i].工艺计划流水号
+          })
+        }
+      })
+    },
+    partChange() {
+      this.form2.工序 = ''
+      this.procedureNum = []
+      searchproceductnum(this.form2.零件图号).then(response => {
+        this.proceductnummax = response.data[0].批次数量
+      })
+      searchprocedure(this.form2.零件图号).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.procedureNum.push({
+            label: response.data[i].工艺名称,
+            value: response.data[i].工序流水号
+          })
+        }
+      })
+    },
+    procedureChange() {
+      searchoperators(this.form2.工序).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.operators.push({
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
+      })
+    },
+    submitTable() {
+      this.$refs['form2'].validate((valid) => {
+        if (valid) {
+          this.AddTableData_disable = true
+          submitTable(this.form2.工序, this.form2.质检类型, this.form2.检测数, this.form2.质检情况, this.id, this.form2.不合格数量, this.form2.不合格原因, this.form2.不合格处理, this.form2.备注, this.form2.操作工, this.$store.state.user.id).then(response => {
+            if (response.data[0].result === '1') {
+              this.dialogFormVisible10 = false
+              this.$message.success('新增成功')
+              this.selecttable()
+            } else {
+              this.$message.error('新增失败')
+            }
+          })
+        } else {
+          return false
+        }
       })
     },
     searchTableDetail(type, num) {
       searchTableDetail(type, num).then(response => {
         this.gridData = response.data
       })
+      console.log(type)
+    },
+    selecttable() {
+      this.loading = true
+      this.tableData1 = []
+      if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check1 = 1 } else { this.check1 = 0 }
+      if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
+      if (this.SpareParts !== '' && this.SpareParts !== null) { this.check3 = 1 } else { this.check3 = 0 }
+      if (this.QualityTypeValue !== '' && this.QualityTypeValue !== null) { this.check4 = 1 } else { this.check4 = 0 }
+      if (this.startTime !== '' && this.startTime !== null) { this.check5 = 1 } else { this.check5 = 0 }
+      if (this.endTime !== '' && this.endTime !== null) { this.check6 = 1 } else { this.check6 = 0 }
+      if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check7 = 1 } else { this.check7 = 0 }
+      if (this.personNum !== '' && this.personNum !== null) { this.check8 = 1 } else { this.check8 = 0 }
+      selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.check7, this.qualityInspectionValue, this.check8, this.personNum, this.pageCurrent, this.pageSize).then(response => {
+        this.tableData1 = response.data.result
+        this.tableData1.map(v => {
+          this.$set(v, 'edit', false)
+          this.$set(v, '备注_原', v.备注)
+          this.$set(v, '不合格数量_原', v.不合格数量)
+          this.$set(v, '是否合格_原', v.是否合格)
+          this.$set(v, '数量_原', v.数量)
+          this.$set(v, '不合格原因文本_原', v.不合格原因文本)
+          this.$set(v, '不合格处理文本_原', v.不合格处理文本)
+        })
+        console.log(this.tableData1, 8979)
+        this.loading = false
+        this.total = parseInt(response.data.output[0].ItemCount)
+      })
+    },
+    viewPicture(row) {
+      this.dialogFormVisible = true
+      this.urls = []
+      searchPic(row.质检流水号).then(response => {
+        // this.URL = readFile + response.data[0].文件标识 + '.' + response.data[0].文件后缀
+        for (let i = 0; i < response.data.length; i++) {
+          if (response.data[i].文件内容 !== null) {
+            // this.urls.push(readFile + response.data[i].文件标识 + '.' + response.data[i].文件后缀)
+            this.urls.push('data:image/png;base64,' + response.data[i].文件内容)
           }
         }
+      })
+    },
+    viewProcedures(row) {
+      this.dialogFormVisible4 = true
+      this.SparePartsNumber = row.零件图号
+      this.SparePartsName = row.零件名称
+      processingStatus(row.工艺计划流水号).then(response => {
+        this.tableData5 = response.data
+      })
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.selecttable()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.selecttable()
+    }
+    // handleSizeChange1(val) {
+    //   this.pageCurrent1 = 1
+    //   this.pageSize1 = val
+    //   this.fetchData()
+    // },
+    // handleCurrentChange1(val) {
+    //   this.pageCurrent1 = val
+    //   this.fetchData()
+    // },
+    // handleSizeChange2(val) {
+    //   this.pageCurrent2 = 1
+    //   this.pageSize2 = val
+    //   this.fetchData1()
+    // },
+    // handleCurrentChange2(val) {
+    //   this.pageCurrent2 = val
+    //   this.fetchData1()
+    // }
+  }
 }
+
 </script>
 
 <style scoped>
+h3{
+  margin: 5px !important;
+}
 </style>

src/views/WorkshopProcurement/FundApproval2/index.vue

@@ -62,10 +62,10 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="text" size="mini" icon="el-icon-search" style="margin-right: 10px" plain @click="searchTable01(scope.row)">查看详情</el-button>
+              <el-button slot="reference" type="text" size="mini" icon="el-icon-search" style="margin-right: 10px;padding: 10px" plain @click="searchTable01(scope.row)">查看详情</el-button>
             </el-popover>
-            <el-button type="text" size="mini" icon="el-icon-check" plain @click="yesApproval(scope.row)">通过</el-button>
+            <el-button type="text" size="mini" icon="el-icon-check" style="margin-right: 10px;padding:10px" plain @click="yesApproval(scope.row)">通过</el-button>
-            <el-button type="text" size="mini" icon="el-icon-close" plain @click="noApproval(scope.row)">不通过</el-button>
+            <el-button type="text" size="mini" icon="el-icon-close" style="margin-right: 10px;padding: 10px;color:black" plain @click="noApproval(scope.row)">不通过</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="app-container">
     <el-card>
-      <!--      <span>发票号:</span>-->
       <el-input v-model="invoiceNum" placeholder="到票号\供应商" size="small" clearable/>
       <el-button type="primary" size="small" plain icon="el-icon-search" style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
       <el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="createOrder()">到票</el-button>
@@ -10,38 +9,6 @@
     <el-card>
       <h4 style="margin: 5px">到票结算申请单</h4>
       <el-table id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;" height="260px" size="mini" @row-click="searchTable2">
-        <!--        <el-table-column label="详情" type="expand">-->
-        <!--          <template slot-scope="scope">-->
-        <!--            <el-form label-position="left" inline class="demo-table-expand">-->
-        <!--              <el-row>-->
-        <!--                <el-col :span="6">-->
-        <!--                  <viewer>-->
-        <!--                    <img :src="scope.row.scanSrc" alt="发票扫描件" height="120px">-->
-        <!--                  </viewer>-->
-        <!--                </el-col>-->
-        <!--                <el-col :span="6">-->
-        <!--                  <el-form-item label="已付款项">-->
-        <!--                    <span>{{ scope.row.已付款项 }}</span>-->
-        <!--                  </el-form-item><br>-->
-        <!--                  <el-form-item label="尚欠金额">-->
-        <!--                    <span>{{ scope.row.尚欠金额 }}</span>-->
-        <!--                  </el-form-item><br>-->
-        <!--                  <el-form-item label="备注">-->
-        <!--                    <span>{{ scope.row.备注 }}</span>-->
-        <!--                  </el-form-item><br>-->
-        <!--                </el-col>-->
-        <!--                <el-col :span="6">-->
-        <!--                  <el-form-item label="是否费用类发票">-->
-        <!--                    <span>{{ scope.row.是否费用类 }}</span>-->
-        <!--                  </el-form-item><br>-->
-        <!--                  <el-form-item label="税额">-->
-        <!--                    <span>{{ scope.row.税额 }}</span>-->
-        <!--                  </el-form-item>-->
-        <!--                </el-col>-->
-        <!--              </el-row>-->
-        <!--            </el-form>-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
         <el-table-column label="供应商" prop="供应商名称" align="center" width="170" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -137,17 +104,6 @@
             @current-change="handleCurrentChange1"/>
         </div>
       </div>
-      <!--<div class="block" style="margin-top: 10px;">-->
-      <!--<el-pagination-->
-      <!--:current-page="pageCurrent1"-->
-      <!--:page-sizes="[10, 20, 30, 40]"-->
-      <!--:page-size="pageSize1"-->
-      <!--:total="total1"-->
-      <!--style="display:inline-block;width:50%"-->
-      <!--layout="total, sizes, prev, pager, next, jumper"-->
-      <!--@size-change="handleSizeChange1"-->
-      <!--@current-change="handleCurrentChange1"/>-->
-      <!--</div>-->
     </el-card>
 
     <el-card>
@@ -176,11 +132,6 @@
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <!--        <el-table-column label="供应商" align="center" min-width="150" show-overflow-tooltip>-->
-        <!--          <template slot-scope="scope">-->
-        <!--            {{ scope.row.供应商名称 }}-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
         <el-table-column label="合同编号" align="center" width="120">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 || scope.row.离线合同编号 }}
@@ -299,7 +250,7 @@
         <el-radio label="采购合同" border/>
         <el-radio label="离线合同" border/>
       </el-radio-group>
-      <el-table :data="tableData01" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini" @row-click="searchTable02">
+      <el-table :data="tableData01" border highlight-current-row style="width: 100%;max-height: 200px;" height="250px" size="mini" @row-click="searchTable02">
         <el-table-column label="供应商" align="center" min-width="200">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -584,6 +535,7 @@ export default {
           if (response.data[0].result === '1') {
             this.$message.success('删除成功')
             this.searchTable1()
+            this.tableData2 = []
           } else { this.$message.error('删除失败') }
         })
       }).catch(() => {
@@ -659,7 +611,6 @@ export default {
       this.supplierValue = row.供应商流水号
       Number(row.是否提交申请) === 1 ? this.disabled = true : this.disabled = false
       searchTable2(row.发票结算申请单流水号).then(response => {
-        console.log(response, 123)
         this.tableData2 = response.data
       })
     },
@@ -694,7 +645,6 @@ export default {
     searchTable02(row) {
       this.tableData02 = []
       this.tableData03 = []
-      console.log(row, 222)
       if (this.contractType === '采购合同') {
         if (row.模板类型 === 4) {
           this.type = row.模板类型
@@ -703,17 +653,14 @@ export default {
               this.$set(data, '本次到票数量', 0)
               data.本次到票数量 = data.已到货数量 - data.到票数量
               this.tableData03.push(data)
-              console.log(this.tableData03, 111)
             })
           })
         } else {
           searchPurchaseDetail(row.采购合同流水号).then(response => {
-            console.log(response, 88)
             response.data.map(data => {
               this.$set(data, '本次到票数量', 0)
               data.本次到票数量 = data.已到货数量 - data.到票数量
               this.tableData02.push(data)
-              console.log(this.tableData02, 111)
             })
           })
         }
@@ -725,12 +672,10 @@ export default {
             this.tableData02.push(data)
           })
         })
-        console.log(this.tableData03, 112)
       }
     },
     handleSelectionChange(val) {
       this.group = val
-      console.log(this.group, 'group')
     },
     submitAdd2() { // 追加入库单
       if (this.group.length === 0) {

src/views/WorkshopProcurement/ProjectTotalSearch/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card style="width: 800px">
+    <el-card style="width: 850px">
-      <!--<span>项目名称:</span>-->
       <el-select v-model="projectValue" placeholder="项目名称" size="small" style="width: 180px" filterable clearable>
         <el-option
           v-for="item in project"
@@ -155,4 +154,3 @@ export default {
     width:300px
   }
 </style>
-