Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0

src/api/Inventory/CreatePickingList.js

@@ -84,7 +84,7 @@ export function dropList(num) {
     }
   })
 }
-// 选入领料单
+// 查询领料单明细
 export function searchListDetail(...params) {
   return request({
     url: '',

src/api/Inventory/MaterialOut.js

@@ -0,0 +1,39 @@
+import request from '@/utils/request'
+
+// 领料单查询
+export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间装配管理_领料单_查询数据',
+      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 查询领料单明细
+export function searchListDetail(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间装配管理_领料单明细_查询数据',
+      param: `领料单流水号=${params[0]}`
+    }
+  })
+}
+// 查看领料单明细相关的物料货位数量
+export function searchStockNumber(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '库存管理_物料出库_标准件和外购件_查询数据',
+      param: `物料流水号=${params[0]}`
+    }
+  })
+}

src/api/ManufacturingCenter/InitialProduction.js

@@ -61,6 +61,18 @@ export function production(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q,
     }
   })
 }
+// 合并投产
+export function production2(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_合并投产',
+      param: '组件零件基本件流水号=' + num + '=int&投产类型流水号=' + a + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int'
+    }
+  })
+}
 // 获取表2的值
 export function getTable1(num, pageList, pageSize) {
   return request({

src/icons/svg/CreatePickingList.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1553579626916" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2009" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M65.344 944.64l893.312 0 0 72.064-893.312 0 0-72.064Z" p-id="2010"></path><path d="M838.016 40 185.984 40c-70.656 0-128 57.344-128 128l0 531.968c0 70.656 57.344 128 128 128l652.032 0c70.656 0 128-57.344 128-128L966.016 168C966.016 97.344 908.672 40 838.016 40zM832 486.656l-60.032 0 0 193.344L254.976 680 256 486.656 192 486.656 192 416l325.312-275.968L832 428.032 832 486.656z" p-id="2011"></path><path d="M512 266.304 316.032 436.288 316.032 620.352 446.72 620.352 446.72 494.976 577.344 494.976 577.344 620.352 707.968 620.352 707.968 436.288Z" p-id="2012"></path></svg>

src/icons/svg/MaterialOut.svg

@@ -0,0 +1 @@
+<svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"><defs><style/></defs><path d="M365.694 365.688h292.551v46.223h-292.55zm-73.137 219.413h438.826v46.223H292.557z"/><path d="M870.198 1023.927c-28.085 0-54.049-14.481-67.726-37.74a47.54 47.54 0 0 0-82.499 0 78.477 78.477 0 0 1-67.798 37.74h-31.157c-28.085 0-54.122-14.481-67.799-37.74a47.54 47.54 0 0 0-82.499 0 78.55 78.55 0 0 1-67.725 37.74h-31.157c-28.085 0-54.049-14.481-67.799-37.74a47.54 47.54 0 0 0-82.426 0 78.55 78.55 0 0 1-67.798 37.74 81.329 81.329 0 0 1-80.671-81.914V243.987C73.144 109.414 180.876 0 313.182 0h397.576c132.379 0 240.038 109.414 240.038 243.987v698.099c0 45.126-36.13 81.84-80.598 81.84zM761.223 910.783c35.106 0 66.774 18.284 84.84 48.929a27.792 27.792 0 0 0 24.135 12.653 30.06 30.06 0 0 0 29.84-30.28V243.988c0-106.05-84.913-192.352-189.28-192.352H313.182c-104.368-.073-189.28 86.23-189.28 192.279v698.099c0 16.675 13.384 30.279 29.84 30.279a27.792 27.792 0 0 0 24.208-12.726c18.065-30.572 49.734-48.856 84.84-48.856 35.033 0 66.701 18.284 84.693 48.929a27.792 27.792 0 0 0 24.282 12.653h31.157a27.792 27.792 0 0 0 24.281-12.726c17.992-30.572 49.734-48.856 84.767-48.856 35.106 0 66.774 18.284 84.84 48.929a27.792 27.792 0 0 0 24.135 12.653h31.23a27.792 27.792 0 0 0 24.281-12.653c17.992-30.718 49.734-49.002 84.767-49.002z"/></svg>

src/utils/request.js

@@ -20,7 +20,7 @@ export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` //
 export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图   发布时改成0.231
 
 const service = axios.create({
-  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 

src/views/Inventory/CreatePickingList/index.vue

@@ -577,7 +577,7 @@ export default {
         selectIntoList(basePartGroup, null, this.pickingListNum).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('操作成功')
-            this.multipleSelection = []
+            this.searchTable()
             this.clickList()
           } else { this.$message.error('操作失败') }
         })
@@ -585,7 +585,7 @@ export default {
         selectIntoList(null, purchasePartGroup, this.pickingListNum).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('操作成功')
-            this.multipleSelection = []
+            this.searchTable()
             this.clickList()
           } else { this.$message.error('操作失败') }
         })

src/views/Inventory/MaterialOut/index.vue

@@ -0,0 +1,235 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <div slot="header">
+        <span style="margin: 5px">领料单编号:</span>
+        <el-input v-model="pickingListNumber" clearable size="small" style="width:200px" />
+        <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
+      </div>
+      <h4 style="margin-top:0">领料单</h4>
+      <el-table :data="pickListTable1" highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="clickList">
+        <el-table-column label="序号" align="center" type="index" width="50"/>
+        <el-table-column label="领料单编号" align="center" min-width="200">
+          <template slot-scope="scope">
+            {{ scope.row.领料单编号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" min-width="200" >
+          <template slot-scope="scope">
+            {{ scope.row.操作日期.split(' ')[0] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="领料人" align="center" min-width="130">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="领料单备注" align="center" min-width="130">
+          <template slot-scope="scope">
+            {{ scope.row.领料单备注 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="领回确认" align="center" min-width="80">
+          <template slot-scope="scope">
+            <el-tag v-if="Number(scope.row.是否启用)===1" type="warning">未确认</el-tag>
+            <el-tag v-else type="success">已确认</el-tag>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="float:right;margin: 10px 0;">
+        <el-pagination
+          :current-page="pageCurrent3"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pageSize3"
+          :total="total3"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange3"
+          @current-change="handleCurrentChange3"/>
+      </div>
+      <h4>领料单明细：{{ pickingListNumberShow }}</h4>
+      <el-table :data="pickListTable2" highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="clickListDetail">
+        <el-table-column label="序号" align="center" type="index" width="50"/>
+        <el-table-column label="名称" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="图号或型号" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.图号或型号 || '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="规格" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.规格 || '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="机床图号" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="组号" align="center" min-width="70">
+          <template slot-scope="scope">
+            {{ scope.row.组号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="总数量" align="center" min-width="70">
+          <template slot-scope="scope">
+            {{ scope.row.总数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="备件数量" align="center" min-width="70">
+          <template slot-scope="scope">
+            {{ scope.row.备件数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="已领数量" align="center" min-width="70">
+          <template slot-scope="scope">
+            {{ scope.row.备件数量 }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+
+    <el-card>
+      <h4 style="margin-top:0">物料货位数量信息</h4>
+      <el-table :data="StockNumberTable" border style="width: 100%;" size="mini" height="300">
+        <el-table-column label="序号" align="center" type="index" width="50"/>
+        <el-table-column label="名称" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.物料名称 || scope.row.零件名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="图号或型号" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.物料型号 || scope.row.零件图号 || '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="规格" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.物料规格 || scope.row.规格 || '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="仓库名称" align="center" min-width="70">
+          <template slot-scope="scope">
+            {{ scope.row.仓库名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="货位名称" align="center" min-width="70">
+          <template slot-scope="scope">
+            {{ scope.row.货位名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="货位存量" align="center" min-width="70">
+          <template slot-scope="scope">
+            {{ scope.row.货位存量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="机床图号" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 || '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="组号" align="center" min-width="70">
+          <template slot-scope="scope">
+            {{ scope.row.组号 || '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="200px">
+          <template slot-scope="scope" align="center">
+            <el-button size="mini" type="primary" @click="outStore(scope.row)">出库</el-button>
+            <el-button size="mini" type="warning" @click="errorRecord(scope.row)">异常记录</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { searchList, searchListDetail, searchStockNumber } from '@/api/Inventory/MaterialOut'
+export default {
+  name: 'MaterialOut',
+  data() {
+    return {
+      pickingListNumber: '',
+      pickingListNumberShow: '',
+      pickListTable1: [],
+      pageCurrent3: 1,
+      pageSize3: 20,
+      total3: 0,
+      pickListTable2: [],
+      StockNumberTable: []
+    }
+  },
+  mounted() {
+    this.searchList()
+  },
+  methods: {
+    // 查询领料单列表
+    searchList() {
+      let check
+      this.pickingListNumber ? check = 1 : check = 0
+      searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber).then(response => {
+        this.pickListTable1 = response.data.rows
+        this.total3 = response.data.total
+      })
+    },
+    handleSizeChange3(val) {
+      this.pageSize3 = val
+      this.pageCurrent3 = 1
+      this.searchList()
+    },
+    handleCurrentChange3(val) {
+      this.pageCurrent3 = val
+      this.searchList()
+    },
+    // 查看领料单明细
+    clickList(row) {
+      row ? this.pickingListNum = row.领料单流水号 : this.pickingListNum
+      row ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow
+      searchListDetail(this.pickingListNum).then(res => {
+        this.pickListTable2 = res.data
+      })
+    },
+    // 查看领料单明细相关的物料货位数量
+    clickListDetail(row) {
+      console.log(row)
+      if (row.物料流水号) {
+        searchStockNumber(row.物料流水号).then(res => {
+          this.StockNumberTable = res.data
+        })
+      } else if (row.基本件流水号) {
+        console.log(row.基本件流水号)
+      }
+    },
+    // 出库
+    outStore(row) {
+      console.log(row)
+    },
+    // 异常记录
+    errorRecord(row) {
+      console.log(row)
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .el-card{
+    margin-bottom: 15px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  span{
+    margin: 10px 0 10px 10px;
+  }
+  .el-tag{
+    margin: 0
+  }
+</style>

src/views/ManufacturingCenter/InitialProduction/index.vue

@@ -164,6 +164,7 @@
           <el-table-column label="操作" width="200px" fixed="right" align="center">
             <template slot-scope="scope">
               <el-button
+                :disabled="checked_hebing"
                 size="mini"
                 type="primary"
                 @click="handleEdit(scope.$index, scope.row, 'form')">分批投产</el-button>
@@ -185,8 +186,8 @@
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"/>
           <!--<el-checkbox v-model="checked_baitu" style="margin-top:0px">是否白图</el-checkbox>-->
-          <!--<el-checkbox v-model="checked_gaonandu">是否高难度</el-checkbox>-->
-          <el-button :loading="listLoading3" type="primary" size="small" style="float:right;margin-top:10px" @click="production">投产</el-button>
+          <el-button :loading="listLoading3" type="primary" size="small" style="float:right;" @click="production">投产</el-button>
+          <el-checkbox v-model="checked_hebing" style="float:right;margin-top:10px;margin-right:10px">合并生产</el-checkbox>
         </div>
       </div>
     </el-card>
@@ -331,12 +332,13 @@
 </template>
 
 <script>
-import { getEntryNameValue, getToolNum, getNum, getTable, production, getTable1, revisionBatch, editList, dele } from '@/api/ManufacturingCenter/InitialProduction'
+import { getEntryNameValue, getToolNum, getNum, getTable, production, getTable1, revisionBatch, editList, dele, production2 } from '@/api/ManufacturingCenter/InitialProduction'
 import { mapGetters } from 'vuex'
 
 export default {
   data() {
     return {
+      checked_hebing: true,
       maxmax: '',
       clearTable: 0,
       readonly: true,
@@ -801,52 +803,102 @@ export default {
           if (this.multipleSelection.length === 0) {
             this.$message.error('请至少选择一个零件')
           } else {
-            this.listLoading3 = true
-            for (let i = 0; i < this.multipleSelection.length; i++) {
-              if (this.multipleSelection[i].checked_waixie === false) {
-                this.multipleSelection[i].checked_waixie = 1
-              } else {
-                this.multipleSelection[i].checked_waixie = 2
-              }
-              if (this.multipleSelection[i].checked_zhaoji === false) {
-                this.multipleSelection[i].checked_zhaoji = 0
-              } else {
-                this.multipleSelection[i].checked_zhaoji = 1
-              }
-              if (this.multipleSelection[i].checked_dailiao === true) {
-                this.multipleSelection[i].checked_dailiao = 2
-              } else {
-                this.multipleSelection[i].checked_dailiao = 1
-              }
-              if (this.checked_gaonandu === false) {
-                this.checked_gaonandu = 0
-              } else {
-                this.checked_gaonandu = 1
-              }
-              if (this.checked_baitu === false) {
-                this.checked_baitu = 0
-              } else {
-                this.checked_baitu = 1
-              }
-              production(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu).then(response => {
-                this.result += parseInt(response.data[0].result)
-                if (this.result === this.multipleSelection.length) {
-                  this.$message.success('投产成功')
-                  this.total = 0
-                  this.pageList = 1
-                  this.getTable()
-                  this.checked_baitu = false
-                  this.checked_gaonandu = false
-                  this.tableData1 = []
-                  this.listLoading3 = false
-                } else if (response.data[0].result === '0') {
-                  this.listLoading3 = false
-                  this.$message.error('投产失败')
+            if (this.checked_hebing === true) {
+              this.listLoading3 = true
+              for (let i = 0; i < this.multipleSelection.length; i++) {
+                if (this.multipleSelection[i].checked_waixie === false) {
+                  this.multipleSelection[i].checked_waixie = 1
+                } else {
+                  this.multipleSelection[i].checked_waixie = 2
                 }
-              })
-              this.shijiancuo1 = 0
-              this.shijiancuo = 0
-              this.jieguo = 0
+                if (this.multipleSelection[i].checked_zhaoji === false) {
+                  this.multipleSelection[i].checked_zhaoji = 0
+                } else {
+                  this.multipleSelection[i].checked_zhaoji = 1
+                }
+                if (this.multipleSelection[i].checked_dailiao === true) {
+                  this.multipleSelection[i].checked_dailiao = 2
+                } else {
+                  this.multipleSelection[i].checked_dailiao = 1
+                }
+                if (this.checked_gaonandu === false) {
+                  this.checked_gaonandu = 0
+                } else {
+                  this.checked_gaonandu = 1
+                }
+                if (this.checked_baitu === false) {
+                  this.checked_baitu = 0
+                } else {
+                  this.checked_baitu = 1
+                }
+                production2(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu).then(response => {
+                  this.result += parseInt(response.data[0].result)
+                  if (this.result === this.multipleSelection.length) {
+                    this.$message.success('投产成功')
+                    this.total = 0
+                    this.pageList = 1
+                    this.getTable()
+                    this.checked_baitu = false
+                    this.checked_gaonandu = false
+                    this.tableData1 = []
+                    this.listLoading3 = false
+                  } else if (response.data[0].result === '0') {
+                    this.listLoading3 = false
+                    this.$message.error('投产失败')
+                  }
+                })
+                this.shijiancuo1 = 0
+                this.shijiancuo = 0
+                this.jieguo = 0
+              }
+            } else {
+              this.listLoading3 = true
+              for (let i = 0; i < this.multipleSelection.length; i++) {
+                if (this.multipleSelection[i].checked_waixie === false) {
+                  this.multipleSelection[i].checked_waixie = 1
+                } else {
+                  this.multipleSelection[i].checked_waixie = 2
+                }
+                if (this.multipleSelection[i].checked_zhaoji === false) {
+                  this.multipleSelection[i].checked_zhaoji = 0
+                } else {
+                  this.multipleSelection[i].checked_zhaoji = 1
+                }
+                if (this.multipleSelection[i].checked_dailiao === true) {
+                  this.multipleSelection[i].checked_dailiao = 2
+                } else {
+                  this.multipleSelection[i].checked_dailiao = 1
+                }
+                if (this.checked_gaonandu === false) {
+                  this.checked_gaonandu = 0
+                } else {
+                  this.checked_gaonandu = 1
+                }
+                if (this.checked_baitu === false) {
+                  this.checked_baitu = 0
+                } else {
+                  this.checked_baitu = 1
+                }
+                production(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu).then(response => {
+                  this.result += parseInt(response.data[0].result)
+                  if (this.result === this.multipleSelection.length) {
+                    this.$message.success('投产成功')
+                    this.total = 0
+                    this.pageList = 1
+                    this.getTable()
+                    this.checked_baitu = false
+                    this.checked_gaonandu = false
+                    this.tableData1 = []
+                    this.listLoading3 = false
+                  } else if (response.data[0].result === '0') {
+                    this.listLoading3 = false
+                    this.$message.error('投产失败')
+                  }
+                })
+                this.shijiancuo1 = 0
+                this.shijiancuo = 0
+                this.jieguo = 0
+              }
             }
           }
         }

src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue

@@ -93,75 +93,77 @@
           @current-change="handleCurrentChange"/>
       </div>
     </el-card>
-    <el-card v-if="tableData2.length">
+    <el-card>
       <div slot="header">
         <el-button v-show="true" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整</el-button>
       </div>
-      <table class="tg">
-        <tr>
-          <td class="tg-x61c" colspan="4" rowspan="2">江苏高精</td>
-          <td class="tg-c3ow" colspan="2" rowspan="2">零件条码</td>
-          <td class="tg-c3ow" colspan="3">零件图号</td>
-          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件图号 : '' }}</td>
-          <td class="tg-c3ow">数量</td>
-        </tr>
-        <tr>
-          <td class="tg-c3ow" colspan="3">零件名称</td>
-          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件名称 : '' }}</td>
-          <td class="tg-c3ow" rowspan="3">{{ tableData2[0] ? tableData2[0].投产数量 : '' }}</td>
-        </tr>
-        <tr>
-          <td class="tg-c3ow" colspan="2">项目名称</td>
-          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].项目名称 : '' }}</td>
-          <td class="tg-c3ow" colspan="2" rowspan="2">{{ tableData2[0] ? 'P' + tableData2[0].工艺计划流水号 : '' }}</td>
-          <td class="tg-c3ow" colspan="3">机床</td>
-          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机床图号 : '' }}</td>
-        </tr>
-        <tr>
-          <td class="tg-c3ow">材质</td>
-          <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].材料 : '' }}</td>
-          <td class="tg-c3ow">规格</td>
-          <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].原材料规格 : '' }}</td>
-          <td class="tg-c3ow" colspan="3">组号</td>
-          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].组号 : '' }}</td>
-        </tr>
-        <tr>
-          <td class="tg-c3ow">序次</td>
-          <td class="tg-c3ow">工艺名称</td>
-          <td class="tg-c3ow" colspan="3">工艺要求</td>
-          <td class="tg-c3ow">难度系数</td>
-          <td class="tg-c3ow">工作者</td>
-          <td class="tg-c3ow">单件</td>
-          <td class="tg-c3ow">准结</td>
-          <td class="tg-c3ow">检查结果</td>
-          <td class="tg-c3ow">计划完成日期</td>
-          <td class="tg-c3ow">工序条码</td>
-        </tr>
-        <tr v-for="(value,key) in tableData2" :id="key" :key="key">
-          <td class="tg-c3ow">{{ key + 1 }}</td>
-          <td class="tg-c3ow">{{ value.工艺名称 }}</td>
-          <td class="tg-c3ow" colspan="3">{{ value.工艺要求 }}</td>
-          <td class="tg-c3ow">{{ value.工艺难度等级 }}</td>
-          <td class="tg-c3ow"/>
-          <td class="tg-c3ow">{{ value.单件定额工时 }}</td>
-          <td class="tg-c3ow">{{ value.准结定额工时 }}</td>
-          <td class="tg-c3ow"/>
-          <td class="tg-c3ow">{{ value.计划日期 }}</td>
-          <td class="tg-c3ow">{{ value.工序流水号 }}</td>
-        </tr>
-        <tr>
-          <td class="tg-c3ow">工艺员</td>
-          <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].工艺员 : '' }}</td>
-          <td class="tg-c3ow">定额员</td>
-          <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].定额员 : '' }}</td>
-          <td class="tg-c3ow">工艺完成</td>
-          <td class="tg-c3ow">{{ tableData2[0].工艺实际完成时间 ? tableData2[0].工艺实际完成时间.split(' ')[0] : '' }}</td>
-          <td class="tg-c3ow">加工开始</td>
-          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工开始时间 : '' }}</td>
-          <td class="tg-c3ow">加工结束</td>
-          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工结束时间 : '' }}</td>
-        </tr>
-      </table>
+      <div v-if="tableData2.length">
+        <table class="tg">
+          <tr>
+            <td class="tg-x61c" colspan="4" rowspan="2">江苏高精</td>
+            <td class="tg-c3ow" colspan="2" rowspan="2">零件条码</td>
+            <td class="tg-c3ow" colspan="3">零件图号</td>
+            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件图号 : '' }}</td>
+            <td class="tg-c3ow">数量</td>
+          </tr>
+          <tr>
+            <td class="tg-c3ow" colspan="3">零件名称</td>
+            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件名称 : '' }}</td>
+            <td class="tg-c3ow" rowspan="3">{{ tableData2[0] ? tableData2[0].投产数量 : '' }}</td>
+          </tr>
+          <tr>
+            <td class="tg-c3ow" colspan="2">项目名称</td>
+            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].项目名称 : '' }}</td>
+            <td class="tg-c3ow" colspan="2" rowspan="2">{{ tableData2[0] ? 'P' + tableData2[0].工艺计划流水号 : '' }}</td>
+            <td class="tg-c3ow" colspan="3">机床</td>
+            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机床图号 : '' }}</td>
+          </tr>
+          <tr>
+            <td class="tg-c3ow">材质</td>
+            <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].材料 : '' }}</td>
+            <td class="tg-c3ow">规格</td>
+            <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].原材料规格 : '' }}</td>
+            <td class="tg-c3ow" colspan="3">组号</td>
+            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].组号 : '' }}</td>
+          </tr>
+          <tr>
+            <td class="tg-c3ow">序次</td>
+            <td class="tg-c3ow">工艺名称</td>
+            <td class="tg-c3ow" colspan="3">工艺要求</td>
+            <td class="tg-c3ow">难度系数</td>
+            <td class="tg-c3ow">工作者</td>
+            <td class="tg-c3ow">单件</td>
+            <td class="tg-c3ow">准结</td>
+            <td class="tg-c3ow">检查结果</td>
+            <td class="tg-c3ow">计划完成日期</td>
+            <td class="tg-c3ow">工序条码</td>
+          </tr>
+          <tr v-for="(value,key) in tableData2" :id="key" :key="key">
+            <td class="tg-c3ow">{{ key + 1 }}</td>
+            <td class="tg-c3ow">{{ value.工艺名称 }}</td>
+            <td class="tg-c3ow" colspan="3">{{ value.工艺要求 }}</td>
+            <td class="tg-c3ow">{{ value.工艺难度等级 }}</td>
+            <td class="tg-c3ow"/>
+            <td class="tg-c3ow">{{ value.单件定额工时 }}</td>
+            <td class="tg-c3ow">{{ value.准结定额工时 }}</td>
+            <td class="tg-c3ow"/>
+            <td class="tg-c3ow">{{ value.计划日期 }}</td>
+            <td class="tg-c3ow">{{ value.工序流水号 }}</td>
+          </tr>
+          <tr>
+            <td class="tg-c3ow">工艺员</td>
+            <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].工艺员 : '' }}</td>
+            <td class="tg-c3ow">定额员</td>
+            <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].定额员 : '' }}</td>
+            <td class="tg-c3ow">工艺完成</td>
+            <td class="tg-c3ow">{{ tableData2[0].工艺实际完成时间 ? tableData2[0].工艺实际完成时间.split(' ')[0] : '' }}</td>
+            <td class="tg-c3ow">加工开始</td>
+            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工开始时间 : '' }}</td>
+            <td class="tg-c3ow">加工结束</td>
+            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工结束时间 : '' }}</td>
+          </tr>
+        </table>
+      </div>
     </el-card>
   </div>
 </template>
@@ -173,6 +175,7 @@ import { initMachineProject, searchgroup, initPerson, search, searchtable1,
 export default {
   data() {
     return {
+      partNumValue: '',
       machineNumberValue: '',
       machineNumber: [],
       groupNumberValue: '',

src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue

@@ -63,18 +63,17 @@
             </el-select>
           </el-col>
 
-          <el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="20">
+          <el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="15">
             <span>直径:</span>
             <el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
             <span>长度:</span>
             <el-input-number v-model="height2" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
-            <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation1()">计算重量
-            </el-button>
+            <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation1()">计算重量</el-button>
             <span>重量:</span>
             <el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
               <el-button slot="append" icon="el-icon-cjn-09" @click="saveWeight"/>
             </el-input>
-            <!--<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="insertThestring()">计算重量</el-button>-->
+            <el-button style="margin-left: 10px;" type="primary" size="small" @click="insertThestring()">合并生产</el-button>
           </el-col>
 
           <el-col v-show="materielValue==='2'||materielValue==='9'||materielValue==='10'||materielValue==='11'" :span="20">

src/views/layout/components/TagsView.vue

@@ -7,6 +7,7 @@
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
+      <li @click="refreshSelectedTag()">刷新当前</li>
       <li @click="closeSelectedTag(selectedTag)">关闭当前</li>
       <li @click="closeOthersTags">关闭其他</li>
       <li @click="closeAllTags">关闭全部</li>
@@ -20,6 +21,7 @@ import Cookies from 'js-cookie'
 
 export default {
   components: { ScrollPane },
+  inject: ['reload'],
   data() {
     return {
       visible: false,
@@ -78,6 +80,11 @@ export default {
         }
       })
     },
+    refreshSelectedTag() {
+      this.$nextTick(() => {
+        this.reload() // 2019.6.2 cjn
+      })
+    },
     closeSelectedTag(view) {
       this.$store.dispatch('delVisitedViews', view).then((views) => {
         if (this.isActive(view)) {