更新

2020-04-17 18:09:43 +08:00
parent 1f2325301a f22e6935d1
commit 1dffa2a8c3
13 changed files with 397 additions and 155 deletions
--- a/src/api/Assembly/QualityInspectionInformationInquiry.js
+++ b/src/api/Assembly/QualityInspectionInformationInquiry.js
@@ -109,6 +109,21 @@ export function searchprocedure(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({
@@ -150,6 +165,20 @@ export function confirmEdit(...param) {
    }
  })
 }
+
+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({
--- a/src/api/Inventory/CreatePickingList.js
+++ b/src/api/Inventory/CreatePickingList.js
@@ -89,7 +89,7 @@ export function searchList(pageCurrent, pageSize, listPeople_check, listPeople,
  })
 }
 // 创建领料单
-export function createList(num, remark, isElectrical) {
+export function createList(num, remark, isElectrical, macnum, groupnum) {
  return request({
    url: '',
    method: 'post',
@@ -98,7 +98,7 @@ export function createList(num, remark, isElectrical) {
      ModularID: router.currentRoute.path,
      type: '2',
      name: '车间装配管理_领料单_增加数据',
-      param: '领料人流水号=' + num + '&领料单备注=' + remark + '&是否电气=' + isElectrical
+      param: '领料人流水号=' + num + '&领料单备注=' + remark + '&是否电气=' + isElectrical + '&机床流水号=' + macnum + '&组件流水号=' + groupnum
    }
  })
 }
--- a/src/api/ManufacturingCenter/ProductionPlanQuery.js
+++ b/src/api/ManufacturingCenter/ProductionPlanQuery.js
@@ -30,3 +30,16 @@ export function searchtable() {
    }
  })
 }
+export function repulse(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: '车间生产管理工艺_生产计划_打回零件',
+      param: `工艺计划流水号=${num}`
+    }
+  })
+}
--- a/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js
+++ b/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js
@@ -46,3 +46,15 @@ export function searchTablesheet(check, supplierNameValue, check1, partNumber, c
    }
  })
 }
+export function HandleNumber() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: '备料管理_外购备料_处理已完成未修改数据'
+    }
+  })
+}
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -59,7 +59,7 @@
            :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=20; pageCurrent= 1;selecttable()">查询</el-button>
+        <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 type="warning" size="small" icon="el-icon-download" plain style="margin-left:10px" @click="exportExcel()">导出</el-button>
        </el-tooltip>
@@ -124,20 +124,20 @@
            {{ scope.row.姓名 }}
          </template>
        </el-table-column>
-        <el-table-column label="质检数量" align="center" width="120px">
+        <el-table-column label="检测数量" align="center" width="120px">
          <template slot-scope="scope">
            <template v-if="scope.row.edit">
-              <el-input-number v-model="scope.row.数量" :min="0" :step="1" style="width: 90%" size="mini"/>
+              <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" width="120px">
+        <el-table-column label="检测结果" align="center" width="120px">
          <template slot-scope="scope">
            <template v-if="scope.row.edit">
-              <el-select v-model="scope.row.是否合格" placeholder="请选择" filterable size="small" style="width: 100%">
+              <el-select v-model="scope.row.是否合格" placeholder="请选择" filterable size="mini" style="width: 100%">
                <el-option
                  v-for="item in qualityInspection"
                  :key="item.value"
@@ -153,10 +153,10 @@
        <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" :step="1" style="width: 90%" size="mini"/>
+              <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.不合格数量 =0 }}
+              {{ scope.row.不合格数量 = '' }}
            </template>
            <template v-else>
              {{ scope.row.不合格数量 }}
@@ -166,7 +166,7 @@
        <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="small" style="width: 100%">
+              <el-select v-model="scope.row.不合格原因" placeholder="请选择" filterable size="mini" style="width: 100%">
                <el-option
                  v-for="item in reasonsForNonconformity"
                  :key="item.value"
@@ -185,7 +185,7 @@
        <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="small" style="width: 100%">
+              <el-select v-model="scope.row.处理结果" placeholder="请选择" filterable size="mini" style="width: 100%">
                <el-option
                  v-for="item in disqualificationTreatment"
                  :key="item.value"
@@ -226,7 +226,7 @@
            {{ scope.row.编辑时间 ? scope.row.编辑时间.split(' ')[0] : scope.row.编辑时间 }}
          </template>
        </el-table-column>
-        <el-table-column label="形位" fixed="right" align="center" width="70">
+        <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">
@@ -251,7 +251,7 @@
            </el-popover>
          </template>
        </el-table-column>
-        <el-table-column label="尺寸" fixed="right" align="center" width="70">
+        <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">
@@ -276,7 +276,7 @@
            </el-popover>
          </template>
        </el-table-column>
-        <el-table-column label="外观" fixed="right" align="center" width="70">
+        <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">
@@ -301,7 +301,7 @@
            </el-popover>
          </template>
        </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" min-width="150">
+        <el-table-column label="查看图片" align="center" width="100px">
          <template slot-scope="scope">
            <el-button
              v-if="!scope.row.edit"
@@ -310,16 +310,20 @@
              plain
              icon="el-icon-search"
              @click="viewPicture(scope.row)">查看图片</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" align="center" min-width="100">
+          <template slot-scope="scope">
            <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
              <div style="display: inline-block;margin-right: 10px">
-                <el-button v-if="!scope.row.edit" type="text" size="mini" icon="el-icon-edit" @click="scope.row.edit=!scope.row.edit"/>
+                <el-button v-if="!scope.row.edit" :disabled="scope.row.考核状态 >= 7" type="text" size="mini" icon="el-icon-edit" @click="scope.row.edit=!scope.row.edit"/>
                <el-button v-if="scope.row.edit" type="text" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
                <el-button v-if="scope.row.edit" type="text" plain size="small" @click="cancel(scope.row)">取消</el-button>
              </div>
            </el-tooltip>
            <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
              <div style="display: inline-block">
-                <el-button v-if="!scope.row.edit" type="text" size="mini" icon="el-icon-delete" @click="deleterow(scope.row)"/>
+                <el-button v-if="!scope.row.edit" :disabled="scope.row.考核状态 >= 7" type="text" size="mini" icon="el-icon-delete" @click="deleterow(scope.row)"/>
              </div>
            </el-tooltip>
          </template>
@@ -632,7 +636,7 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="检测数" prop="检测数">
-              <el-input-number v-model="form2.检测数" :min="0" :step="1" placeholder="检测数" style="width:150px" size="small" clearable/>
+              <el-input-number v-model="form2.检测数" :min="0" :max="proceductnummax" :step="1" placeholder="检测数" style="width:150px" size="small" clearable/>
            </el-form-item>
          </el-col>
        </el-row>
@@ -681,7 +685,7 @@
 </template>

 <script>
-import { initProject, searchgroup, selecttable, QualityType, searchPic, searchTableDetail, searchData, searchData1, processingStatus, initPerson, Prohibit, initDisqualificationTreatment, initReasonsForNonconformity, searchparts, searchprocedure, searchoperators, submitTable, confirmEdit } from '@/api/Assembly/QualityInspectionInformationInquiry'
+import { initProject, searchgroup, selecttable, QualityType, searchPic, searchTableDetail, searchData, searchData1, processingStatus, initPerson, Prohibit, initDisqualificationTreatment, initReasonsForNonconformity, searchparts, searchprocedure, searchoperators, submitTable, confirmEdit, searchproceductnum, deleterow } from '@/api/Assembly/QualityInspectionInformationInquiry'
 import { readFile } from '@/utils/request'
 import { mapGetters } from 'vuex'
 // import { mapGetters } from 'vuex'
@@ -750,9 +754,10 @@ export default {
      AddTableData_disable: false,
      loading: false,
      total: 0, // 总条数
-      pageSize: 20, // 每页显示条数
+      pageSize: 10, // 每页显示条数
      pageCurrent: 1, // 后台获取页
-      dialogmethod: false // false新增  true 编辑
+      dialogmethod: false, // false新增  true 编辑
+      proceductnummax: 0
      // total1: 0, // 总条数
      // pageSize1: 10, // 每页显示条数
      // pageCurrent1: 1, // 后台获取页
@@ -791,22 +796,34 @@ export default {
    },
    // 表内编辑确定
    confirmEdit(row) {
-      console.log(row, 676767)
-
      confirmEdit(row.质检流水号, row.质检类型代码, row.零部件流水号, row.是否合格, row.数量, row.不合格数量, row.不合格原因, row.处理结果, row.备注, 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('编辑失败')
        }
      })
-      this.selecttable()
      row.edit = false
    },
+    // 删除质检
    deleterow(row) {
      // this.plan = row.计划流水号
+      console.log(row, 4545)
+      this.$confirm('是否删除该质检记录?', '提示', {
+        confirmButtonText: '确定',
+        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 => {
@@ -1013,6 +1030,9 @@ export default {
    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({
--- a/src/views/Inventory/CreatePickingList/index.vue
+++ b/src/views/Inventory/CreatePickingList/index.vue
@@ -406,9 +406,32 @@
              :value="item.value"/>
          </el-select>
        </el-form-item>
-        <el-form-item label="领料单备注" prop="领料单备注" label-width="100px">
-          <el-input v-model="form1.领料单备注" size="small" placeholder="备注" style="width: 200px"/>
+        <el-form-item label="机床图号" prop="机床图号" label-width="100px">
+          <el-select v-model="form1.机床图号" filterable placeholder="选择机床图号" size="small" clearable @change="machineChange1()">
+            <el-option
+              v-for="item in machineNumber"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+              <div style="float: left">{{ item.label }}</div>
+              <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+            </el-option>
+          </el-select>
        </el-form-item>
+        <el-form-item label="组号" prop="组号" label-width="100px">
+          <el-select v-model="form1.组号" filterable placeholder="选择组号" size="small" clearable @change="sss()">
+            <el-option
+              v-for="item in groupNumber"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
+        <!--<el-form-item label="领料单备注" prop="领料单备注" label-width="100px">-->
+        <!--&lt;!&ndash;<el-input v-model="form1.领料单备注" size="small" placeholder="备注" style="width: 200px"/>&ndash;&gt;-->
+        <!--<span> {{ form1.领料单备注 }}</span>-->
+        <!--</el-form-item>-->
+
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button @click="dialogFormVisible1=false">取消</el-button>
@@ -482,7 +505,9 @@ export default {
      materialModel: '', // 物料型号
      form1: {
        领料人流水号: '',
-        领料单备注: ''
+        领料单备注: '',
+        机床图号: '',
+        组号: ''
      },
      rules1: {
        领料人流水号: [{ required: true, message: '请选择制单人' }]
@@ -512,6 +537,45 @@ export default {
    // this.startTime = [get90DAY(). getNowDAY()]
  },
  methods: {
+    sss() {
+      let obj_mac = {}
+      obj_mac = this.machineNumber.find((item) => {
+        return item.value === this.form1.机床图号
+      })
+      let obj_num = {}
+      obj_num = this.groupNumber.find((item2) => {
+        return item2.value === this.form1.组号
+      })
+      console.log(obj_mac.label, obj_num.label)
+      this.form1.领料单备注 = obj_mac.label + '-' + obj_num.label.replace(/\s*/g, '')
+    },
+    // // 加载机床号
+    // initProject() {
+    //   initMachineProject().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].机床流水号
+    //       })
+    //     }
+    //   })
+    // },
+    // 组号
+    machineChange1() {
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      searchgroup(this.form1.机床图号).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.groupNumber.push({
+            label: response.data[i].组号,
+            value: response.data[i].组件流水号
+            // value: response.data[i].组号
+
+          })
+        }
+      })
+    },
    // 审批通过
    approvalPass(row) {
      this.$confirm('是否审批通过?', '提示', {
@@ -773,13 +837,14 @@ export default {
      this.form1.领料单备注 = ''
      this.createList_disable = false
      this.dialogFormVisible1 = true
+      this.groupNumber = []
    },
    // 提交创建领料单
    submitCreateList() {
      this.createList_disable = true
      let isElectrical
      Number(this.token) === 37 || Number(this.token) === 36 || Number(this.token) === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长 37电气副部长
-      createList(this.form1.领料人流水号, this.form1.领料单备注, isElectrical).then(response => {
+      createList(this.form1.领料人流水号, this.form1.领料单备注, isElectrical, this.form1.机床图号, this.form1.组号).then(response => {
        if (response.data[0].result === '1') {
          this.$message.success('创建成功')
          this.dialogFormVisible1 = false
--- a/src/views/Inventory/PickingListApproval/index.vue
+++ b/src/views/Inventory/PickingListApproval/index.vue
@@ -172,7 +172,7 @@ export default {
        type: 'warning'
      }).then(() => {
        if (this.pickListTable2.length === 0) {
-          this.$message.error('空领料单，不能审批！')
+          this.$message.error('不能审批空领料单')
          return
        }
        const param = {
--- a/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
@@ -23,7 +23,6 @@
              start-placeholder="开始日期"
              end-placeholder="结束日期"/>
            <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="total=0;pageSize = 20;pageCurrent = 1;searchTable()">查询</el-button>
-            <!--<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="total=0;pageSize = 20;pageCurrent = 1;loginsession()">session</el-button>-->
            <el-tooltip :open-delay="1200" effect="dark" content="只查询加急的零件" placement="top">
              <el-checkbox v-model="all" size="small">加急</el-checkbox>
            </el-tooltip>
@@ -33,7 +32,7 @@
      </div>
    </div>
    <el-card>
-      <el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" height="570" style="width: 1090px; margin: 3px 0" size="mini" border highlight-current-row element-loading-text="拼命加载中">
+      <el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" height="570" style="width: 1180px; margin: 3px 0" size="mini" border highlight-current-row element-loading-text="拼命加载中">
        <el-table-column label="机床图号" prop="机床图号" align="center" width="140px" show-overflow-tooltip>
          <template slot-scope="scope">
            {{ scope.row.机床图号 }}
@@ -85,6 +84,11 @@
            {{ scope.row.姓名 }}
          </template>
        </el-table-column>
+        <el-table-column label="操作" align="center" width="90px" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="repulse(scope.row)">打回</el-button>
+          </template>
+        </el-table-column>
      </el-table>
      <div class="block">
        <el-pagination
@@ -102,7 +106,7 @@
 </template>

 <script>
-import { searchMachine, searchtable } from '@/api/ManufacturingCenter/ProductionPlanQuery'
+import { searchMachine, searchtable, repulse } from '@/api/ManufacturingCenter/ProductionPlanQuery'
 export default {
  data() {
    return {
@@ -124,17 +128,6 @@ export default {
    this.projectChange()
  },
  methods: {
-    loginsession() {
-      this.$axios({
-        methods: 'post',
-        url: 'http://192.168.1.192:8045/submit/SessionID.ashx?userName=1222',
-        data: {
-          userName: '0000'
-        }
-      }).then(res => {
-        console.log(res, 9999)
-      })
-    },
    projectChange() {
      this.machineName = []
      this.machineNameValue = ''
@@ -200,6 +193,38 @@ export default {
        this.$message.warning('请输入筛选条件')
      }
    },
+    repulse(row) {
+      if (row.考核状态 >= 6) {
+        this.$confirm('该零件已在加工中，请去零件报废页处理该零件', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          console.log(1)
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消打回'
+          })
+        })
+      } else {
+        this.$confirm('确定打回该零件?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          repulse(row.工艺计划流水号).then(response => {
+            this.searchTable()
+            this.$message.success('打回成功')
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消打回'
+          })
+        })
+      }
+    },
    tableRowClassName({ row }) {
      if (row.是否加急 === '1') {
        return 'UrgentItem'
--- a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
@@ -21,7 +21,7 @@
        <!-- <h3 style="display: inline-block;margin: 0 0 0 20px">客户名称:</h3> -->
        <el-input v-model="CustomerNameValue" placeholder="客户名称" size="small" clearable style="width:200px"/>
        <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
-        <el-button size="small" style="margin: 0px 0px 3px 680px" type="success" icon="el-icon-edit-outline" plain @click="editPro()">保存</el-button>
+        <el-button size="small" style="margin: 0px 0px 3px 680px" type="success" icon="el-icon-edit-outline" plain @click="limit1()">保存</el-button>
      </el-row>
      <el-row v-if="false">
        <h3 style="display: inline-block;margin: 0">签订日期:</h3>
@@ -36,7 +36,7 @@
      <el-col style="width: 1325px;">
        <el-card>
          <!--<h2 style="display: inline-block;margin: 0 0 10px 0">总计划:</h2>-->
-          <el-table v-loading="loading" :data="tableData" height="355" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
+          <el-table v-loading="loading" :data="tableData" height="315" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
            <el-table-column label="项目编号" align="center" width="170px" fixed="left">
              <template slot-scope="scope">
                <template v-if="scope.row.edit">
@@ -97,11 +97,16 @@
                {{ scope.row.项目计划制定人 }}
              </template>
            </el-table-column>
+            <el-table-column label="修改时间" align="center" width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.修改时间 }}
+              </template>
+            </el-table-column>
            <el-table-column v-if="false" label="操作" width="150px" align="center">
              <template slot-scope="scope">
                <el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit(scope.row)">确定</el-button>
                <el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-                <el-button v-if="scope.row.edit" type="primary" size="small" @click="scope.row.edit=!scope.row.edit">取消</el-button>
+                <el-button v-if="scope.row.edit" type="primary" size="small" @click="cennel(scope.row)">取消</el-button>
              </template>
            </el-table-column>
          </el-table>
@@ -212,17 +217,17 @@
                </el-form-item>
              </el-col>
            </el-row>
-            <el-row>
-              <el-col style="width: 20px">
-                <!--<el-radio v-model="radio" label="9">{{ empty }}</el-radio>-->
-              </el-col>
-              <el-col style="width: 180px;margin-left: 20px">
-                <el-form-item label="更新时间" prop="更新时间">
-                  <el-input v-model="更新时间" placeholder="更新时间" clearable size="small" style="width: 180px"/>
-                  <!--<el-date-picker v-model="更新时间" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="更新时间" class="time"/>-->
-                </el-form-item>
-              </el-col>
-            </el-row>
+            <!--<el-row>-->
+            <!--<el-col style="width: 20px">-->
+            <!--&lt;!&ndash;<el-radio v-model="radio" label="9">{{ empty }}</el-radio>&ndash;&gt;-->
+            <!--</el-col>-->
+            <!--<el-col style="width: 180px;margin-left: 20px">-->
+            <!--<el-form-item label="更新时间" prop="更新时间">-->
+            <!--<el-input v-model="更新时间" placeholder="更新时间" clearable size="small" style="width: 180px"/>-->
+            <!--&lt;!&ndash;<el-date-picker v-model="更新时间" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="更新时间" class="time"/>&ndash;&gt;-->
+            <!--</el-form-item>-->
+            <!--</el-col>-->
+            <!--</el-row>-->
          </el-form>
        </el-card>
      </el-col>
@@ -336,7 +341,7 @@
            <template slot-scope="scope">
              <el-button v-if="scope.row.edit" type="text" size="small" @click="confirmEdit2(scope.row)">确定</el-button>
              <el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-              <el-button v-if="scope.row.edit" type="text" size="small" @click="scope.row.edit=!scope.row.edit">取消</el-button>
+              <el-button v-if="scope.row.edit" type="text" size="small" @click="cennel(scope.row)">取消</el-button>
              <el-button v-else type="text" size="small" icon="el-icon-delete" @click="Delete(scope.row)">删除</el-button>
            </template>
          </el-table-column>
@@ -512,6 +517,7 @@ export default {
              审图实际完成时间: response.data.rows[i].审图实际完成时间,
              完成顺序: response.data.rows[i].完成顺序,
              更新: response.data.rows[i].更新,
+              修改时间: response.data.rows[i].修改时间,
              项目流水号: response.data.rows[i].项目流水号,
              机床流水号: response.data.rows[i].机床流水号,
              项目生成: response.data.rows[i].项目生成,
@@ -544,32 +550,70 @@ export default {
        }
      })
    },
-    // 表格1保存
-    editPro() {
+    // 表1 保存判断
+    limit1() {
      if (this.项目流水号) {
-        this.审图开始 ? this.审图开始 : this.审图开始 = null
-        this.审图结束 ? this.审图结束 : this.审图结束 = null
-        this.发图完成 ? this.发图完成 : this.发图完成 = null
-        this.采购完成 ? this.采购完成 : this.采购完成 = null
-        this.备料完成 ? this.备料完成 : this.备料完成 = null
-        this.制造完成 ? this.制造完成 : this.制造完成 = null
-        this.装配完成 ? this.装配完成 : this.装配完成 = null
-        editTable(this.项目流水号, this.机床流水号, this.项目编号, this.设计者, this.审图开始, this.审图结束, '', this.发图完成, this.采购完成, this.备料完成, this.制造完成, this.装配完成, '', this.更新时间, this.id).then(response => {
-          if (response.data[0].result === '1') {
-            this.tableData.map(v => {
-              if (v.项目流水号 === this.项目流水号) {
-                v.项目编号 = this.项目编号
-              }
-            })
-            this.$message.success('保存成功')
+        if (!this.设计者) {
+          this.$message.error('请输入设计者')
+        } else if (!this.项目编号) {
+          this.$message.error('请输入项目编号')
+        } else if (!this.审图开始) {
+          this.$message.error('请选择审图开始时间')
+        } else if (!this.审图结束) {
+          this.$message.error('请选择审图结束时间')
+        } else if (!this.发图完成) {
+          this.$message.error('请选择发图完成始时间')
+        } else if (!this.采购完成) {
+          this.$message.error('请选择采购完成时间')
+        } else if (!this.备料完成) {
+          this.$message.error('请选择备料完成时间')
+        } else if (!this.制造完成) {
+          this.$message.error('请选择制造完成时间')
+        } else if (!this.装配完成) {
+          this.$message.error('请选择装配完成时间')
+        } else {
+          if (this.审图结束 < this.审图开始) {
+            this.$message.error('审图结束时间应大于审图开始时间')
+          } else if (this.发图完成 < this.审图结束) {
+            this.$message.error('发图完成时间应大于审图结束时间')
+          } else if (this.采购完成 < this.发图完成) {
+            this.$message.error('采购完成时间应大于发图完成时间')
+          } else if (this.备料完成 < this.发图完成) {
+            this.$message.error('备料完成时间应大于发图完成时间')
+          } else if (this.制造完成 < this.发图完成) {
+            this.$message.error('制造完成时间应大于发图完成时间')
+          } else if (this.装配完成 < this.制造完成) {
+            this.$message.error('装配完成时间应大于制造完成时间')
          } else {
-            this.$message.error('信息修改失败')
+            this.editPro()
          }
-        })
+        }
      } else {
        this.$message.error('请先选择项目')
      }
    },
+    // 表格1保存
+    editPro() {
+      this.审图开始 ? this.审图开始 : this.审图开始 = null
+      this.审图结束 ? this.审图结束 : this.审图结束 = null
+      this.发图完成 ? this.发图完成 : this.发图完成 = null
+      this.采购完成 ? this.采购完成 : this.采购完成 = null
+      this.备料完成 ? this.备料完成 : this.备料完成 = null
+      this.制造完成 ? this.制造完成 : this.制造完成 = null
+      this.装配完成 ? this.装配完成 : this.装配完成 = null
+      editTable(this.项目流水号, this.机床流水号, this.项目编号, this.设计者, this.审图开始, this.审图结束, '', this.发图完成, this.采购完成, this.备料完成, this.制造完成, this.装配完成, '', this.更新时间, this.id).then(response => {
+        if (response.data[0].result === '1') {
+          this.tableData.map(v => {
+            if (v.项目流水号 === this.项目流水号) {
+              v.项目编号 = this.项目编号
+            }
+          })
+          this.$message.success('保存成功')
+        } else {
+          this.$message.error('信息修改失败')
+        }
+      })
+    },
    // 查询表格2数据
    openDialog() {
      this.loading2 = true
@@ -595,7 +639,6 @@ export default {
        }
      })
      searchTable2(this.机床流水号, this.radio).then(response => {
-        console.log('')
        if (response.data.length === 0) {
          this.loading2 = false
        } else {
@@ -628,7 +671,16 @@ export default {
              计划完成时间: response.data[i].计划完成时间,
              货期: response.data[i].货期,
              实际完成时间: response.data[i].实际完成时间,
-              备注: response.data[i].备注
+              备注: response.data[i].备注,
+              组号_原: response.data[i].组号,
+              任务名称_原: response.data[i].任务名称,
+              负责人_原: response.data[i].负责人,
+              接收任务时间_原: response.data[i].接收任务时间,
+              任务开始时间_原: response.data[i].任务开始时间,
+              计划完成时间_原: response.data[i].计划完成时间,
+              货期_原: response.data[i].货期,
+              实际完成时间_原: response.data[i].实际完成时间,
+              备注_原: response.data[i].备注
            })
          }
        }
@@ -690,7 +742,16 @@ export default {
              计划完成时间: response.data[i].计划完成时间,
              货期: response.data[i].货期,
              实际完成时间: response.data[i].实际完成时间,
-              备注: response.data[i].备注
+              备注: response.data[i].备注,
+              组号_原: response.data[i].组号,
+              任务名称_原: response.data[i].任务名称,
+              负责人_原: response.data[i].负责人,
+              接收任务时间_原: response.data[i].接收任务时间,
+              任务开始时间_原: response.data[i].任务开始时间,
+              计划完成时间_原: response.data[i].计划完成时间,
+              货期_原: response.data[i].货期,
+              实际完成时间_原: response.data[i].实际完成时间,
+              备注_原: response.data[i].备注
            })
          }
        }
@@ -700,19 +761,38 @@ export default {
    },
    // 表格2保存
    confirmEdit2(row) {
-      editTable2(row.组件计划流水号, row.组件流水号, row.任务名称, row.负责人, row.接收任务时间, row.任务开始时间, row.计划完成时间, row.货期, row.实际完成时间, row.备注).then(response => {
-        if (response.data[0].result === '1') {
-          row.edit = false
-          this.$notify({
-            title: '成功',
-            message: '信息修改成功',
-            type: 'success'
-          })
-          this.searchTable2()
-        } else {
-          this.$message.error('信息修改失败')
-        }
-      })
+      if (row.任务开始时间 < row.接收任务时间) {
+        this.$message.error('任务开始时间应大于接收任务时间')
+      } else if (row.计划完成时间 < row.任务开始时间) {
+        this.$message.error('计划完成时间应大于任务开始时间')
+      } else {
+        editTable2(row.组件计划流水号, row.组件流水号, row.任务名称, row.负责人, row.接收任务时间, row.任务开始时间, row.计划完成时间, row.货期, row.实际完成时间, row.备注).then(response => {
+          if (response.data[0].result === '1') {
+            row.edit = false
+            this.$notify({
+              title: '成功',
+              message: '信息修改成功',
+              type: 'success'
+            })
+            this.searchTable2()
+          } else {
+            this.$message.error('信息修改失败')
+          }
+        })
+      }
+    },
+    // 表格2取消
+    cennel(row) {
+      row.组号 = row.组号_原
+      row.任务名称 = row.任务名称_原
+      row.负责人 = row.负责人_原
+      row.接收任务时间 = row.接收任务时间_原
+      row.任务开始时间 = row.任务开始时间_原
+      row.计划完成时间 = row.计划完成时间_原
+      row.货期 = row.货期_原
+      row.实际完成时间 = row.实际完成时间_原
+      row.备注 = row.备注_原
+      row.edit = !row.edit
    },
    // 表格2删除
    Delete(row) {
--- a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
@@ -11,7 +11,7 @@
            :label="item.label"
            :value="item.value"/>
        </el-select>
-        <el-button icon="el-icon-search" type="primary" size="small" plain @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
+        <el-button icon="el-icon-search" type="primary" size="small" plain @click="getTableData()">查询</el-button>
        <el-button type="success" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" plain @click="exportExcel">导出</el-button>
      </div>
    </el-card>
@@ -121,12 +121,18 @@ export default {
      }, {
        value: 1,
        label: '已到'
+      }, {
+        value: 2,
+        label: '未提交'
+      }, {
+        value: 3,
+        label: '未外协'
      }],
      tableData: [],
      procedure: [],
      procedureTime: [],
      pageCurrent: 1,
-      pageSize: 500,
+      pageSize: 50,
      tableData1: []
    }
  },
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -380,12 +380,14 @@ export default {
      this.Number = row.外协加工任务单流水号
      this.ManufactorNumber = row.外协厂家流水号
      getParts(row.外协加工任务单流水号).then(response => {
+        console.log(response.data)
        if (response.data.length !== 0) {
          for (let i = 0; i < response.data.length; i++) {
            this.List3.push({
              外协加工任务单明细流水号: response.data[i].外协加工任务单明细流水号,
              加工价格_成交: response.data[i].加工价格_成交.toFixed(2),
              到货日期: response.data[i].到货日期,
+              单据状态: response.data[i].单据状态,
              零件图号: response.data[i].零件图号,
              零件名称: response.data[i].零件名称,
              批次数量: response.data[i].批次数量,
@@ -557,6 +559,7 @@ export default {
                  加工价格_成交: response.data[i].加工价格_成交.toFixed(2),
                  机加工开始时间: response.data[i].机加工开始时间 ? response.data[i].机加工开始时间.split(' ')[0] : '',
                  到货日期: response.data[i].到货日期,
+                  单据状态: response.data[i].单据状态,
                  零件图号: response.data[i].零件图号,
                  零件名称: response.data[i].零件名称,
                  批次数量: response.data[i].批次数量,
@@ -595,6 +598,7 @@ export default {
                  加工价格_成交: response.data[i].加工价格_成交.toFixed(2),
                  机加工开始时间: response.data[i].机加工开始时间 ? response.data[i].机加工开始时间.split(' ')[0] : '',
                  到货日期: response.data[i].到货日期,
+                  单据状态: response.data[i].单据状态,
                  零件图号: response.data[i].零件图号,
                  零件名称: response.data[i].零件名称,
                  批次数量: response.data[i].批次数量,
@@ -675,6 +679,7 @@ export default {
                    加工价格_成交: response.data[i].加工价格_成交.toFixed(2),
                    机加工开始时间: response.data[i].机加工开始时间 ? response.data[i].机加工开始时间.split(' ')[0] : '',
                    到货日期: response.data[i].到货日期,
+                    单据状态: response.data[i].单据状态,
                    零件图号: response.data[i].零件图号,
                    零件名称: response.data[i].零件名称,
                    批次数量: response.data[i].批次数量,
--- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
@@ -62,6 +62,11 @@
              {{ scope.row.到货日期 }}
            </template>
          </el-table-column>
+          <el-table-column label="到货日期" align="center" >
+            <template slot-scope="scope">
+              {{ scope.row.到货时间 }}
+            </template>
+          </el-table-column>
        </el-table>
      </el-card>
    </el-col>
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
@@ -37,66 +37,47 @@
    <el-card style="width: 100%">
      <el-table v-loading="loading" :data="tableData" highlight-current-row border stripe size="mini" style="width: 100%" height="750" @sort-change="sortChange">
        <el-table-column label="序号" align="center" type="index" width="50"/>
-        <!--<el-table-column label="进程" align="center" prop="进程" sortable="custom" width="80px">-->
-        <!--<template slot-scope="scope">-->
-        <!--<span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到</span>-->
-        <!--<span v-if="Number(scope.row.是否到货)===1" type="primary" size="mini">已到</span>-->
-        <!--<span v-if="Number(scope.row.是否到货)===2" type="success" size="mini">已结</span>-->
-        <!--</template>-->
-        <!--</el-table-column>-->
        <el-table-column label="进程" align="center" prop="进程" sortable="custom" width="80px">
-          <template slot-scope="scope">{{ scope.row.备料状态 }}</template>
+          <template slot-scope="scope">
+            {{ scope.row.备料状态 }}
+          </template>
        </el-table-column>
-        <el-table-column
-          label="供应商"
-          align="center"
-          min-width="210px"
-          width="300"
-          prop="供应商名称"
-          sortable="custom"
-          show-overflow-tooltip>
-          <template slot-scope="scope">{{ scope.row.供应商名称 }}</template>
+        <el-table-column label="供应商" align="center" min-width="210px" width="300" prop="供应商名称" sortable="custom" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.备料状态==='自家' ? '自家' : scope.row.供应商名称 }}
+          </template>
        </el-table-column>
-        <el-table-column
-          label="物料编码"
-          align="center"
-          width="180px">
-          <template slot-scope="scope">{{ scope.row.物料编码 ? scope.row.物料编码 : scope.row.零件图号 }}</template>
+        <el-table-column label="物料编码" align="center" width="180px">
+          <template slot-scope="scope">
+            {{ scope.row.物料编码 ? scope.row.物料编码 : scope.row.零件图号 }}
+          </template>
        </el-table-column>
-        <el-table-column
-          label="物料名称"
-          align="center"
-          prop="零件名称"
-          sortable="custom"
-          width="120px">
-          <template slot-scope="scope">{{ scope.row.零件名称 }}</template>
+        <el-table-column label="物料名称" align="center" prop="零件名称" sortable="custom" width="120px">
+          <template slot-scope="scope">
+            {{ scope.row.零件名称 }}
+          </template>
        </el-table-column>
-        <el-table-column
-          label="材料"
-          width="90"
-          prop="材料"
-          sortable="custom"
-          align="center">
-          <template slot-scope="scope">{{ scope.row.材料 }}</template>
+        <el-table-column label="材料" width="90" prop="材料" sortable="custom" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.材料 }}
+          </template>
        </el-table-column>
-        <el-table-column
-          label="计划件数"
-          align="center"
-          width="100">
-          <template slot-scope="scope">{{ scope.row.批次数量 }}</template>
+        <el-table-column label="计划件数" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.批次数量 }}
+          </template>
        </el-table-column>
        <el-table-column label="备料件数" align="center" width="100">
          <template slot-scope="scope">
            {{ scope.row.采购数量 }}
          </template>
        </el-table-column>
-        <el-table-column
-          label="到货件数"
-          align="center"
-          width="100">
-          <template slot-scope="scope">{{ scope.row.到货数量 }}</template>
+        <el-table-column label="到货件数" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.到货数量 }}
+          </template>
        </el-table-column>
-        <el-table-column label="备料人" align="center" width="80">
+        <el-table-column label="备料人" align="center" width="100">
          <template slot-scope="scope">
            {{ scope.row.采购员 }}
          </template>
@@ -106,17 +87,15 @@
            {{ scope.row.下单日期 ? scope.row.下单日期.split(' ')[0] : '' }}
          </template>
        </el-table-column>
-        <el-table-column
-          label="到货时间"
-          align="center"
-          width="100">
-          <template slot-scope="scope">{{ scope.row.日期 ? scope.row.日期.split(' ')[0] : '' }}</template>
+        <el-table-column label="到货时间" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.日期 ? scope.row.日期.split(' ')[0] : '' }}
+          </template>
        </el-table-column>
-        <el-table-column
-          label="结算时间"
-          align="center"
-          width="100">
-          <template slot-scope="scope">{{ scope.row.开票时间 ? scope.row.开票时间.split(' ')[0] : '' }}</template>
+        <el-table-column label="结算时间" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.开票时间 ? scope.row.开票时间.split(' ')[0] : '' }}
+          </template>
        </el-table-column>
      </el-table>
      <div class="block" style="margin-top: 10px;">
@@ -134,7 +113,7 @@
 </template>

 <script>
-import { searchSupplier, searchTable } from '@/api/WorkshopProcurement/OutsourcingMaterialsSearch'
+import { searchSupplier, searchTable, HandleNumber } from '@/api/WorkshopProcurement/OutsourcingMaterialsSearch'
 export default {
  name: 'Index',
  data() {
@@ -202,9 +181,12 @@ export default {
  },
  created() {
    this.fetchData()
-    // this.getTableData()
+    this.HandleNumber()
  },
  methods: {
+    HandleNumber() {
+      HandleNumber()
+    },
    formatJson(column, tableData) {
      return tableData.map(v => column.map(j => {
        return v[j]