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

src/api/ManufacturingCenter/ProjectPlanningQuery.js

@@ -0,0 +1,49 @@
+import request from '@/utils/request'
+
+// 初始化 项目名称
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_项目名称_查询数据_按时间排序'
+    }
+  })
+}
+// 查询机床
+export function initMachine(projectNum) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_机床名称_查询数据2',
+      param: `项目流水号=${projectNum}`
+    }
+  })
+}
+// 查询总计划
+export function searchtable(projectNum, machineValue) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '项目计划管理_项目总计划_查询数据',
+      param: '项目流水号_check=1&项目流水号=' + projectNum + '&机床流水号_check=1&机床流水号=' + machineValue
+    }
+  })
+}
+// 查询分计划
+export function searchtable2(machineValue, type) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '项目计划管理_项目详细计划_查询数据',
+      param: '机床流水号=' + machineValue + '&计划类型=' + type
+    }
+  })
+}

src/api/PurchasingCenter/BacklogGoodsAnalysis.js

@@ -0,0 +1,40 @@
+import request from '@/utils/request'
+
+// 查询库存量
+export function searchMaterialNum(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_物料与货位对照_查询数据',
+      param: `物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}`,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 查询滞货库存量
+export function searchBacklogNum(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_滞货物料与货位对照_查询数据',
+      param: `物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}`,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 转为滞货
+export function submitTurn(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_转为滞货',
+      param: `物料流水号=${params[0]}&转滞货数量=${params[1]}&物料与货位对照流水号=${params[2]}&货位流水号=${params[3]}`
+    }
+  })
+}

src/api/PurchasingCenter/CreateInquirySheet.js

@@ -1,27 +1,27 @@
 import request from '@/utils/request'
 
 // 查询分配后的标准件和外购件
-export function searchMaterial(pageCurrent, pageSize, check1, num1, check2, num2, person) {
+export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, person) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '采购管理_采购部采购_查询物料_分配后',
-      param: `询价状态编号_check=${check1}&询价状态编号=${num1}&物料名称_check=${check2}&物料名称=${num2}&人员编号=${person}`,
+      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&人员编号=${person}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
 // 查询分配后的基本件
-export function searchPart(pageCurrent, pageSize, check1, num1, person) {
+export function searchPart(pageCurrent, pageSize, num1, person) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '采购管理_采购部采购_查询物料_基本件_分配后',
-      param: `询价状态编号_check=${check1}&询价状态编号=${num1}&人员编号=${person}`,
+      param: `物料状态编号=${num1}&人员编号=${person}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -183,3 +183,27 @@ export function saveOrder(num1, num2, num3) {
     }
   })
 }
+// 使用滞货
+export function submitUseInventory(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_使用滞货',
+      param: `物料流水号=${params[0]}&使用滞货数量=${params[1]}&组件零件流水号=${params[2]}`
+    }
+  })
+}
+// 取消使用滞货
+export function cancelUseInventory(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_取消使用滞货',
+      param: `物料流水号=${params[0]}&取消数量=${params[1]}&组件零件流水号=${params[2]}`
+    }
+  })
+}

src/api/TechnologyCenter/CreatePackingList.js

@@ -117,6 +117,30 @@ export function getGroupData(machine) {
   })
 }
 
+export function editGroupData(num, num1, num2, num3, num4, num5) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: 'PDM_装箱单_部件_编辑数据',
+      param: `部件编号=${num}&代号=${num1}&名称=${num2}&规格=${num3}&数量=${num4}&备注=${num5}`
+    }
+  })
+}
+
+export function deleteGroupData(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: 'PDM_装箱单_部件_删除数据',
+      param: `部件编号=${num}`
+    }
+  })
+}
+
 export function machineSelect(projectValue) {
   return request({
     url: '',
@@ -177,14 +201,14 @@ export function addFileData(name, number, remark, num) {
   })
 }
 
-export function getSpareData(num) {
+export function getSpareData(num, num1) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: 'PDM_装箱单_备件_查询数据',
-      param: `项目流水号=${num}&机床流水号=${num}`
+      param: `项目流水号=${num}&机床流水号=${num1}`
     }
   })
 }

src/icons/svg/BacklogGoodsAnalysis.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="1553736654324" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1686" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M1020.221442 259.023358l0.057305-0.01535L512.668731 6.224772 5.978666 258.526031l-0.948605 0 0 505.962493 507.639692 252.7904 507.610016-252.7904L1020.27977 259.023358 1020.221442 259.023358zM512.668731 67.442018l381.63693 190.562127L749.096465 330.981227l-383.65796-190.004425L512.668731 67.442018zM298.950208 176.850847l388.576993 186.487322-174.857447 84.181261-381.642047-188.511421L298.950208 176.850847zM68.45458 322.952366l20.269649-0.025583-20.269649-0.696872 0-31.654954L480.873584 495.91772l0 442.368106L68.45458 732.932832 68.45458 322.952366zM956.881858 353.789699l0 379.144156L544.462854 938.285826 544.462854 495.91772l412.417981-205.343785L956.880835 353.789699z" p-id="1687"></path></svg>

src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue

@@ -0,0 +1,376 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <span>项目名称</span>
+      <el-select v-model="projectValue" placeholder="请选择项目名称" filterable size="small" @change="searchMachine">
+        <el-option
+          v-for="item in project"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+
+      <span>机床图号</span>
+      <el-select v-model="machineValue" placeholder="请选择机床图号" filterable size="small">
+        <el-option
+          v-for="item in machine"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+
+      <!--<span>签订日期:</span>-->
+      <!--<el-date-picker-->
+      <!--v-model="startTime"-->
+      <!--value-format="yyyy-MM-dd"-->
+      <!--size="small"-->
+      <!--style="width: 160px"-->
+      <!--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-date-picker-->
+      <!--v-model="startTime1"-->
+      <!--value-format="yyyy-MM-dd"-->
+      <!--size="small"-->
+      <!--style="width: 160px"-->
+      <!--type="date"-->
+      <!--placeholder="选择日期"/>-->
+      <!--<span class="demonstration">~</span>-->
+      <!--<el-date-picker-->
+      <!--v-model="endTime1"-->
+      <!--value-format="yyyy-MM-dd"-->
+      <!--size="small"-->
+      <!--style="width: 160px"-->
+      <!--type="date"-->
+      <!--placeholder="选择日期"/>-->
+
+      <el-button icon="el-icon-search" type="success" size="small" style="margin-left: 20px" @click="searchTable()">查询</el-button>
+      <el-table v-loading="loading" :data="tableData" size="mini" highlight-current-row style="width: 100%; margin-top: 30px" border element-loading-text="拼命加载中">
+        <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">
+          <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>
+    </el-card>
+
+    <el-card>
+      <div class="word">设计</div>
+      <el-table v-loading="loading1" :data="tableData1" size="mini" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
+        <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">
+          <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>
+    </el-card>
+    <el-card>
+      <div class="word">采购</div>
+      <el-table v-loading="loading1" :data="tableData2" size="mini" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
+        <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">
+          <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>
+    </el-card>
+    <el-card>
+      <div class="word">备料</div>
+      <el-table v-loading="loading1" :data="tableData3" size="mini" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
+        <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">
+          <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>
+    </el-card>
+    <el-card>
+      <div class="word">制造</div>
+      <el-table v-loading="loading1" :data="tableData4" size="mini" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
+        <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">
+          <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>
+    </el-card>
+    <el-card>
+      <div class="word">装配调试</div>
+      <el-table v-loading="loading1" :data="tableData5" size="mini" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
+        <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">
+          <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>
+    </el-card>
+  </div>
+</template>
+
+<script>import { initProject, initMachine, searchtable, searchtable2 } from '@/api/ManufacturingCenter/ProjectPlanningQuery'
+
+export default {
+  data() {
+    return {
+      projectValue: '',
+      project: [],
+      machineValue: '',
+      machine: [],
+      loading: false,
+      loading1: false,
+      tableData: [], // 表格数据
+      tableData1: [], // 表格数据
+      tableData2: [], // 表格数据
+      tableData3: [], // 表格数据
+      tableData4: [], // 表格数据
+      tableData5: [] // 表格数据
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
+    },
+    searchMachine() {
+      this.machine = []
+      initMachine(this.projectValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machine.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号
+          })
+        }
+      })
+    },
+    // 查询表格数据
+    searchTable() {
+      this.loading = true
+      this.tableData = []
+      this.tableData1 = []
+      this.tableData2 = []
+      this.tableData3 = []
+      this.tableData4 = []
+      this.tableData5 = []
+      if (this.projectValue !== '') {
+        if (this.machineValue !== '') {
+          searchtable(this.projectValue, this.machineValue).then(response => {
+            this.loading = false
+            this.tableData = response.data
+          }).then(() => {
+            searchtable2(this.machineValue, 1).then(response => {
+              this.loading1 = false
+              console.log(response.data, 2)
+              this.tableData1 = response.data
+            })
+            searchtable2(this.machineValue, 2).then(response => {
+              this.loading1 = false
+              console.log(response.data, 3)
+              this.tableData2 = response.data
+            })
+            searchtable2(this.machineValue, 3).then(response => {
+              this.loading1 = false
+              console.log(response.data, 4)
+              this.tableData3 = response.data
+            })
+            searchtable2(this.machineValue, 4).then(response => {
+              this.loading1 = false
+              console.log(response.data, 5)
+              this.tableData4 = response.data
+            })
+            searchtable2(this.machineValue, 5).then(response => {
+              this.loading1 = false
+              console.log(response.data, 6)
+              this.tableData5 = response.data
+            })
+          })
+        } else {
+          this.$message.warning('请选择机床')
+        }
+      } else {
+        this.$message.warning('请选择项目')
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .el-card{
+    margin-bottom: 10px;
+  }
+  .word{
+    font-size: 20px;
+    margin-bottom: 20px;
+    margin-left: 20px;
+  }
+  span{
+    margin: 10px 0 10px 10px;
+  }
+</style>
+

src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue

@@ -0,0 +1,251 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <div slot="header" class="clearfix">
+        <span>物料名称：</span>
+        <el-input v-model="materialName" placeholder="物料名称" clearable size="small"/>
+        <span>物料规格：</span>
+        <el-input v-model="materialSpec" placeholder="物料规格" clearable size="small"/>
+        <span>物料型号：</span>
+        <el-input v-model="materialModel" placeholder="物料型号" clearable size="small"/>
+        <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1();pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
+      </div>
+      <h4 style="margin-top: 0">采购件列表</h4>
+      <el-table :data="tableData1" size="mini" border style="width: 100%;" height="440">
+        <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="150">
+          <template slot-scope="scope">
+            {{ scope.row.物料规格 }}
+          </template>
+        </el-table-column>
+        <el-table-column props="仓库名称" label="仓库名称" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.仓库名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="货位名称" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.货位名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="货位存量" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.货位存量 }}
+          </template>
+        </el-table-column>
+        <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">
+          <template slot-scope="scope">
+            {{ scope.row.可转滞货数量 = scope.row.货位存量 - 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="80">
+          <template slot-scope="scope">
+            {{ scope.row.组号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="100">
+          <template slot-scope="scope" align="center">
+            <el-button size="mini" type="primary" @click="turnToBacklogGoods(scope.row)">转为滞货</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <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>
+      <h4>滞货件列表</h4>
+      <el-table :data="tableData2" size="mini" border style="width: 100%;" height="440">
+        <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="120">
+          <template slot-scope="scope">
+            {{ scope.row.物料型号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="规格" align="center" min-width="120">
+          <template slot-scope="scope">
+            {{ scope.row.物料规格 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="仓库名称" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.仓库名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="货位名称" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.货位名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="滞货货位存量" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.货位存量 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="pageCurrent2"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pageSize2"
+          :total="total2"
+          style="display:inline-block;width:50%"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange2"
+          @current-change="handleCurrentChange2"/>
+      </div>
+    </el-card>
+
+    <el-dialog :visible.sync="dialogFormVisible" title="转为滞货" center width="380px">
+      <span>转为滞货数量：</span>
+      <el-input-number :min="0" :max="maxNumber" v-model="number" controls-position="right"/>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible=false">取消</el-button>
+        <el-button :disabled="Number(number)===0" type="primary" @click="submitTurn()">确定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { searchMaterialNum, searchBacklogNum, submitTurn } from '@/api/PurchasingCenter/BacklogGoodsAnalysis'
+import { mapGetters } from 'vuex'
+export default {
+  name: 'BacklogGoodsAnalysis',
+  data() {
+    return {
+      materialName: '',
+      materialSpec: '',
+      materialModel: '',
+      pageCurrent1: 1,
+      pageSize1: 10,
+      total1: 0,
+      tableData1: [],
+      number: 0,
+      maxNumber: 0,
+      dialogFormVisible: false,
+      pageCurrent2: 1,
+      pageSize2: 10,
+      total2: 0,
+      tableData2: [],
+      materialNum: '', // 物料流水号
+      materialLocalNum: '', // 物料与货位对照流水号
+      localNum: '' // 货位流水号
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'name',
+      'id' // 人员编号
+    ])
+  },
+  mounted() {
+    this.searchTable1()
+    this.searchTable2()
+  },
+  methods: {
+    searchTable1() {
+      let check1, check2, check3
+      this.materialName ? check1 = 1 : check1 = 0
+      this.materialSpec ? check2 = 1 : check2 = 0
+      this.materialModel ? check3 = 1 : check3 = 0
+      searchMaterialNum(this.pageCurrent1, this.pageSize1, check1, this.materialName, check2, this.materialSpec, check3, this.materialModel).then(response => {
+        this.tableData1 = response.data.rows
+        this.total1 = response.data.total
+      })
+    },
+    handleSizeChange1(val) {
+      this.pageSize1 = val
+      this.pageCurrent1 = 1
+      this.searchTable1()
+    },
+    handleCurrentChange1(val) {
+      this.pageCurrent1 = val
+      this.searchTable1()
+    },
+    turnToBacklogGoods(row) {
+      this.number = 0
+      this.dialogFormVisible = true
+      this.maxNumber = row.可转滞货数量
+      this.materialNum = row.物料流水号
+      this.materialLocalNum = row.物料与货位对照流水号
+      this.localNum = row.货位流水号
+    },
+    submitTurn() {
+      submitTurn(this.materialNum, this.number, this.materialLocalNum, this.localNum).then(response => {
+        if (response.data[0].result === '1') {
+          this.searchTable1()
+          this.searchTable2()
+          this.$message.success('操作成功')
+          this.dialogFormVisible = false
+        } else {
+          this.$message.error('操作失败')
+        }
+      })
+    },
+    searchTable2() {
+      let check1, check2, check3
+      this.materialName ? check1 = 1 : check1 = 0
+      this.materialSpec ? check2 = 1 : check2 = 0
+      this.materialModel ? check3 = 1 : check3 = 0
+      searchBacklogNum(this.pageCurrent2, this.pageSize2, check1, this.materialName, check2, this.materialSpec, check3, this.materialModel).then(response => {
+        this.tableData2 = response.data.rows
+        this.total2 = response.data.total
+      })
+    },
+    handleSizeChange2(val) {
+      this.pageSize2 = val
+      this.pageCurrent2 = 1
+      this.searchTable2()
+    },
+    handleCurrentChange2(val) {
+      this.pageCurrent2 = val
+      this.searchTable2()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .el-card{
+    margin-bottom: 15px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  span{
+    margin: 10px 0 10px 10px;
+  }
+</style>

src/views/PurchasingCenter/CreateInquirySheet/index.vue

@@ -3,14 +3,8 @@
     <el-tabs type="border-card" @tab-click="searchTable11();searchTable12()">
       <el-tab-pane label="标准件和外购件">
         <el-row style="margin-bottom: 10px">
-          <span>询价状态:</span>
+          <span>物料状态:</span>
-          <el-select v-model="inquiryStateValue" placeholder="询价状态" size="small" clearable>
+          <el-cascader :options="materialStatus" v-model="materialStatusValue" size="small" change-on-select/>
-            <el-option
-              v-for="item in inquiryState"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
           <span>物料名称:</span>
           <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
           <el-button
@@ -36,7 +30,7 @@
                 <el-button :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1" type="primary" size="mini" @click="materialChange(scope.row)">物料变更</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="物料状态" align="center" width="100">
+            <el-table-column label="物料状态" align="center" width="80">
               <template slot-scope="scope">
                 <el-tag v-if="parseInt(scope.row.询价状态编号)===1" type="warning" size="small">未询价</el-tag>
                 <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
@@ -48,11 +42,11 @@
                 {{ scope.row.物料计划到货时间.split(' ')[0] }}
               </template>
             </el-table-column>
-            <el-table-column label="项目名称" align="center" min-width="100">
+            <!--<el-table-column label="项目名称" align="center" min-width="100">-->
-              <template slot-scope="scope">
+            <!--<template slot-scope="scope">-->
-                {{ scope.row.项目名称 }}
+            <!--{{ scope.row.项目名称 }}-->
-              </template>
+            <!--</template>-->
-            </el-table-column>
+            <!--</el-table-column>-->
             <el-table-column label="机床图号" align="center" min-width="100">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
@@ -73,26 +67,51 @@
                 {{ 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">
+            <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="200">
               <template slot-scope="scope">
                 {{ scope.row.物料规格 }}
               </template>
             </el-table-column>
-            <el-table-column label="数量" align="center" min-width="80">
+            <el-table-column label="分配数量" align="center" min-width="80">
               <template slot-scope="scope">
                 {{ scope.row.零件数量 }}
               </template>
             </el-table-column>
+            <el-table-column label="待询价数量" align="center" min-width="90">
+              <template slot-scope="scope">
+                {{ scope.row.待询价数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="使用滞货数量" align="center" min-width="100">
+              <template slot-scope="scope">
+                {{ Number(scope.row.使用滞货数量) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="使用滞货" align="center" min-width="130">
+              <template slot-scope="scope">
+                <el-tooltip class="item" effect="dark" content="使用滞货" placement="top-start">
+                  <el-button :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1||Number(scope.row.滞货数量)===0" icon="el-icon-goods" plain type="primary" size="mini" @click="useInventory(scope.row)"/>
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="取消使用滞货" placement="top-start">
+                  <el-button :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1||Number(scope.row.使用滞货数量)===0" icon="el-icon-sold-out" plain type="danger" size="mini" @click="cancelUseInventory(scope.row)"/>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+            <el-table-column label="滞货数量" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ Number(scope.row.滞货数量) }}
+              </template>
+            </el-table-column>
             <el-table-column label="备注" align="center" min-width="100">
               <template slot-scope="scope">
                 {{ scope.row.备注 }}
@@ -119,14 +138,8 @@
       </el-tab-pane>
       <el-tab-pane label="基本件">
         <el-row style="margin-bottom: 10px">
-          <span>询价状态:</span>
+          <span>物料状态:</span>
-          <el-select v-model="inquiryStateValue" placeholder="询价状态" size="small" clearable>
+          <el-cascader :options="materialStatus" v-model="materialStatusValue" size="small" change-on-select/>
-            <el-option
-              v-for="item in inquiryState"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
           <el-button
             type="success"
             size="small"
@@ -316,12 +329,12 @@
             {{ scope.row.组件零件流水号 ? scope.row.物料规格 : scope.row.规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="技术下达数量" align="center" width="110">
+        <el-table-column label="待询价数量" align="center" width="110">
           <template slot-scope="scope">
             {{ scope.row.技术下达数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="实际采购数量" align="center" width="110">
+        <el-table-column label="实际询价(采购)数量" align="center" width="130">
           <template slot-scope="scope">
             <el-input v-model="scope.row.数量" size="mini" style="width:100%"/>
           </template>
@@ -559,12 +572,23 @@
         <el-button type="primary" size="small" @click="submitMaterialChange">确定</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :visible.sync="dialogVisible4" title="使用滞货" center style="min-height: 300px;" width="460px">
+      <span>使用滞货数量：</span>
+      <el-input-number :min="0" :max="maxUseNumber" v-model="useNumber" controls-position="right"/>
+      <div style="margin-top: 10px;color: red">注意：若设置待询价物料全部使用滞货，则将不可再取消使用滞货</div>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisible4=false">取消</el-button>
+        <el-button :disabled="Number(useNumber)===0" type="primary" size="small" @click="submitUseInventory">确定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, searchCreateInquirySheet2, searchSheetDetail, editInquirySheet,
-  createInquirySheet, deleteInquirySheet, addInquirySheet1, addInquirySheet2, outInquirySheet, searchAllMaterial, materialChange, saveOrder } from '@/api/PurchasingCenter/CreateInquirySheet'
+  createInquirySheet, deleteInquirySheet, addInquirySheet1, addInquirySheet2, outInquirySheet, searchAllMaterial, materialChange, saveOrder,
+  submitUseInventory, cancelUseInventory } from '@/api/PurchasingCenter/CreateInquirySheet'
 import { mapGetters } from 'vuex'
 import { exportExcelMethod } from './exportExcel'
 
@@ -572,18 +596,29 @@ export default {
   name: '', // 创建询价单
   data() {
     return {
-      check1: 0, // 询价状态
-      check2: 0, // 物料名称
       check3: 0, // 供应商
       check4: 0, // 询价单号
-      inquiryStateValue: '', // 询价状态
+      materialStatusValue: [0], // 物料状态
-      inquiryState: [{
+      materialStatus: [
-        label: '未询价',
+        {
-        value: 1
+          value: 0,
-      }, {
+          label: '全部'
-        label: '已询价',
+        },
-        value: 3
+        {
-      }],
+          value: 1,
+          label: '未询价'
+        }, {
+          value: 2,
+          label: '已询价',
+          children: [{
+            value: 3,
+            label: '未采购'
+          }, {
+            value: 4,
+            label: '已采购'
+          }]
+        }
+      ], // 物料状态
       materialName: '',
       tableData11: [], // 标准件和外购件列表
       total11: 0,
@@ -656,13 +691,17 @@ export default {
       standardAndPurchaseValue: '', // 标准件和外购件流水号
       title2: '',
       orderExport: '',
-      supplierExport: ''
+      supplierExport: '',
+      useNumber: '',
+      maxUseNumber: '',
+      dialogVisible4: false,
+      backlogGroupPartNum: '',
+      backlogMaterialNum: '',
+      cancelNum: 0
     }
   },
   computed: {
     ...mapGetters([
-      'sidebar',
-      'avatar',
       'name',
       'id' // 人员编号
     ])
@@ -672,6 +711,45 @@ export default {
     this.searchTable2() // 查表2
   },
   methods: {
+    submitUseInventory() {
+      submitUseInventory(this.backlogMaterialNum, this.useNumber, this.backlogGroupPartNum).then(response => {
+        console.log(response.data)
+        if (response.data[0].result === '1') {
+          this.searchTable11()
+          this.dialogVisible4 = false
+          this.$message.success('操作成功')
+        } else { this.$message.error('操作失败') }
+      })
+    },
+    useInventory(row) { // 使用滞货
+      console.log(row)
+      this.useNumber = 0
+      row.滞货数量 < row.待询价数量 ? this.maxUseNumber = Number(row.滞货数量) : this.maxUseNumber = Number(row.待询价数量)
+      this.backlogMaterialNum = row.物料流水号
+      this.backlogGroupPartNum = row.组件零件流水号
+      this.dialogVisible4 = true
+    },
+    cancelUseInventory(row) { // 取消使用滞货
+      console.log(row)
+      this.backlogMaterialNum = row.物料流水号
+      this.backlogGroupPartNum = row.组件零件流水号
+      this.cancelNum = row.使用滞货数量
+      this.$confirm('确定取消使用滞货?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        console.log(this.backlogMaterialNum, this.cancelNum, this.backlogGroupPartNum)
+        cancelUseInventory(this.backlogMaterialNum, this.cancelNum, this.backlogGroupPartNum).then(response => {
+          if (response.data[0].result === '1') {
+            this.searchTable11()
+            this.$message.success('操作成功')
+          } else { this.$message.error('操作失败') }
+        })
+      }).catch(() => {
+        this.$message.info('已取消操作')
+      })
+    },
     saveOrder() { // 保存询价单
       const orderNumGroup = []
       const numGroup = []
@@ -694,11 +772,10 @@ export default {
       return row['供货商'] === value
     },
     searchTable11() { // 查询标准件和外购件列表
-      this.inquiryStateValue !== '' && this.inquiryStateValue !== null ? this.check1 = 1 : this.check1 = 0
+      let check1
-      this.materialName ? this.check2 = 1 : this.check2 = 0
+      this.materialName ? check1 = 1 : check1 = 0
-      searchMaterial(this.pageCurrent11, this.pageSize11, this.check1, this.inquiryStateValue, this.check2, this.materialName, this.id).then(response => {
+      searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, this.id).then(response => {
         this.tableData11 = response.data.rows
-        console.log(response.data.rows)
         this.total11 = response.data.total
       })
     },
@@ -712,10 +789,8 @@ export default {
       this.searchTable11()
     },
     searchTable12() { // 查询基本件列表
-      this.inquiryStateValue !== '' && this.inquiryStateValue !== null ? this.check1 = 1 : this.check1 = 0
+      searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], this.id).then(response => {
-      searchPart(this.pageCurrent12, this.pageSize12, this.check1, this.inquiryStateValue, this.id).then(response => {
         this.tableData12 = response.data.rows
-        console.log(response.data.rows)
         this.total12 = response.data.total
       })
     },
@@ -899,7 +974,7 @@ export default {
       this.allNum = []
       for (let i = 0; i < val.length; i++) {
         this.groupPartNum[i] = val[i].组件零件流水号
-        this.allNum[i] = val[i].零件数量
+        this.allNum[i] = val[i].待询价数量
       }
     },
     handleSelectionChange2(val) { // 基本件多选
@@ -1047,7 +1122,6 @@ export default {
       this.supplierExport = row.供应商名称
       this.orderExport = row.询价单编号
       searchSheetDetail(row.询价单流水号).then(response => {
-        console.log(response.data)
         this.tableData3 = response.data
       })
     },

src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue

@@ -89,6 +89,16 @@
                 {{ scope.row.项目名称 }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="机床图号" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.机床图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="组号" min-width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.组号 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="物料类别" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.物料类别 }}
@@ -215,6 +225,16 @@
                 {{ scope.row.项目名称 }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="机床图号" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.机床图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="组号" min-width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.组号 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="图号" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}

src/views/TechnologyCenter/CreatePackingList/index.vue

@@ -9,7 +9,7 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-circle-plus-outline" @click="addReceipt">增加</el-button>
+      <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" @click="addReceipt">增加</el-button>
       <el-button type="warning" size="small" icon="el-icon-download" @click="exportTable()">导出</el-button>
       <div class="title">总装箱单</div>
       <el-table
@@ -17,7 +17,8 @@
         :data="receiptData"
         border
         size="mini"
-        style="margin-top:20px">
+        style="margin-top:20px"
+        @row-click="searchTable">
         <el-table-column
           label="装箱单号"
           align="center"
@@ -417,7 +418,7 @@
         <el-button v-else-if="spareTitle==='编辑备件'" type="primary" @click="submitEditSpare">确定</el-button>
       </div>
     </el-dialog>
-    <div v-show="false" id="cjn">
+    <div v-show="true" id="cjn">
       <!--封面-->
       <table class="tg" style="width: 900px">
         <colgroup>
@@ -597,6 +598,7 @@ export default {
       receiptVisible: false,
       machineTitle: '',
       machineVisible: false,
+      GroupDataVisible: false,
       spareVisible: false,
       spareTitle: '',
       spareForm: {
@@ -621,6 +623,18 @@ export default {
         联系人: '',
         联系方式: ''
       },
+      GroupDataForm: {
+        部件编号: '',
+        代号: '',
+        名称: '',
+        规格: '',
+        备注: '',
+        数量: ''
+      },
+      GroupDataRule: {
+        名称: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+        数量: [{ required: true, message: '请输入数量', trigger: 'blur' }]
+      },
       receiptRules: {
         装箱单号: [{ required: true, message: '请输入装箱单号', trigger: 'blur' }],
         名称: [{ required: true, message: '请输入名称', trigger: 'blur' }],
@@ -678,6 +692,8 @@ export default {
       this.receiptData = []
       this.spareData = []
       this.fileData = []
+      this.receiptNum = 0
+      this.receiptName = ''
       if (val) {
         this.getMachineSelect(val)
       }
@@ -686,13 +702,12 @@ export default {
     receiptNum(val) {
       if (val !== 0) {
         this.getMachineData()
-        this.getFileData()
-        this.getSpareData()
       }
     },
-    machine(val) {
+    machineTableData(val) {
       if (val.length > 0) {
-        this.machineValue = val[0].value
+        this.getFileData()
+        this.getSpareData()
       }
     }
   },
@@ -712,12 +727,12 @@ export default {
       const response = await getReciptData(this.projectValue)
       const data = response.data
       if (data.length > 0) {
-        this.receiptNum = data[0].装箱单编号
+        // this.receiptNum = data[0].装箱单编号
-        this.receiptName = data[0].装箱单号
+        // this.receiptName = data[0].装箱单号
         this.receiptData = data
       } else {
-        this.receiptNum = 0
+        // this.receiptNum = 0
-        this.receiptName = ''
+        // this.receiptName = ''
       }
     },
     addReceipt() {
@@ -733,6 +748,8 @@ export default {
     submitAddReceipt() {
       this.addTable(insertReciptData, [this.receiptForm.装箱单号, this.receiptForm.发货节点, this.receiptForm.名称, this.receiptForm.收货单位, this.receiptForm.联系方式, this.receiptForm.联系人, this.projectValue], 'receiptForm', function() {
         this.receiptVisible = false
+        this.receiptNum = 0
+        this.receiptName = ''
         this.getReceipt()
       })
     },
@@ -745,6 +762,8 @@ export default {
     submitEditReceipt() {
       this.editTable(updateReciptData, [this.receiptForm.装箱单号, this.receiptForm.发货节点, this.receiptForm.名称, this.receiptForm.收货单位, this.receiptForm.联系方式, this.receiptForm.联系人, this.receiptNum], 'receiptForm', function() {
         this.receiptVisible = false
+        this.receiptNum = 0
+        this.receiptName = ''
         this.getReceipt()
       })
     },
@@ -761,11 +780,24 @@ export default {
       this.fileVisible = false
       this.spareVisible = false
     },
+    searchTable(row) {
+      console.log(row)
+      this.receiptNum = row.装箱单编号
+      this.receiptName = row.装箱单号
+    },
     async getMachineData() {
       this.machineTableData = []
       const response = await getMachineData(this.receiptNum)
       const data = response.data
-      console.log(data, 1111)
+      console.log(data, 111)
+      if (data.length === 0) {
+        this.machineValue = ''
+        this.spareData = []
+        this.fileData = []
+      } else {
+        this.machineValue = data[0].机床号
+      }
+      console.log(this.machineValue, 222)
       this.groupData = []
       for (let i = 0; i < data.length; i++) {
         const resp = await getGroupData(data[i].机床号)
@@ -782,7 +814,6 @@ export default {
           数量: data[i].数量,
           备注: data[i].备注
         })
-        console.log(this.groupData, 11112)
       }
     },
     addMachine() {
@@ -824,6 +855,24 @@ export default {
         this.getMachineData()
       })
     },
+    // editGroupData(row) {
+    //   console.log(row)
+    //   this.editForm(row, 'GroupDataForm', function() {
+    //     this.GroupDataVisible = true
+    //   })
+    // },
+    // async submitEditGroupData() {
+    //   console.log(this.GroupDataForm.部件编号, this.GroupDataForm.代号, this.GroupDataForm.名称, this.GroupDataForm.规格, this.GroupDataForm.数量, this.GroupDataForm.备注)
+    //   editGroupData(this.GroupDataForm.部件编号, this.GroupDataForm.代号, this.GroupDataForm.名称, this.GroupDataForm.规格, this.GroupDataForm.数量, this.GroupDataForm.备注).then(response => {
+    //     if (response.data[0].result === '1') {
+    //       this.$message.success('编辑成功')
+    //       this.GroupDataVisible = false
+    //       this.getMachineData()
+    //     } else {
+    //       this.$message.error('编辑失败')
+    //     }
+    //   })
+    // },
     async getFileData() {
       const response = await getFileData(this.receiptNum)
       this.fileData = response.data
@@ -858,6 +907,7 @@ export default {
       })
     },
     async getSpareData() {
+      console.log(this.machineValue, 333)
       const response = await getSpareData(this.projectValue, this.machineValue)
       console.log(response)
       for (let i = 0; i < response.data.length; i++) {
@@ -910,7 +960,7 @@ export default {
     },
     exportTable() {
       const htmlNode = $('#cjn').html()
-      const body = $('body').attr('style', 'padding: 20px;margin: 0 auto;display: block;width: 800px;background: #fff;')
+      const body = $('body').attr('style', 'padding: 20px;margin: 0 auto;display: block;width: 950px;background: #fff;')
       body.children().hide()
       const printNode = $(htmlNode)
       body.append(printNode)

src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue

@@ -18,7 +18,7 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button :disabled="disabled" type="primary" icon="el-icon-d-caret" size="small" style="margin-left: 10px" @click="transferData">传递</el-button>
+        <el-button :loading="listLoading" :disabled="disabled" type="primary" icon="el-icon-d-caret" size="small" style="margin-left: 10px" @click="transferData">传递</el-button>
       </div>
     </el-card>
     <el-card>

src/views/TechnologyCenter/ImportParts/specificationData.vue

@@ -18,7 +18,7 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button :disabled="disabled" type="primary" icon="el-icon-d-caret" size="small" style="margin-left: 10px" @click="transferData">传递</el-button>
+        <el-button :loading="listLoading" :disabled="disabled" type="primary" icon="el-icon-d-caret" size="small" style="margin-left: 10px" @click="transferData">传递</el-button>
         <el-button type="danger" icon="el-icon-delete" size="small" @click="allDelete">一键删除</el-button>
       </div>
     </el-card>
@@ -92,20 +92,20 @@
             {{ scope.row.分类码 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="200">
+        <!--<el-table-column label="操作" fixed="right" align="center" width="200">-->
-          <template slot-scope="scope">
+        <!--<template slot-scope="scope">-->
-            <el-button
+        <!--<el-button-->
-              size="mini"
+        <!--size="mini"-->
-              type="primary"
+        <!--type="primary"-->
-              icon="el-icon-edit"
+        <!--icon="el-icon-edit"-->
-              @click="handleEdit(scope.row)">编辑</el-button>
+        <!--@click="handleEdit(scope.row)">编辑</el-button>-->
-            <el-button
+        <!--<el-button-->
-              size="mini"
+        <!--size="mini"-->
-              type="danger"
+        <!--type="danger"-->
-              icon="el-icon-delete"
+        <!--icon="el-icon-delete"-->
-              @click="handleDelete(scope.row)">删除</el-button>
+        <!--@click="handleDelete(scope.row)">删除</el-button>-->
-          </template>
+        <!--</template>-->
-        </el-table-column>
+        <!--</el-table-column>-->
       </el-table>
       <div class="block" style="margin-top: 10px;">
         <el-pagination
@@ -389,6 +389,7 @@ export default {
     },
     async fetchData() {
       this.pageCurrent = 1
+      this.tableData10 = []
       try {
         this.listLoading = true
         this.total = 0
@@ -436,6 +437,7 @@ export default {
           allDelete(this.projectName, this.machineValue, this.groupValue).then(response => {
             if (response.data[0].result === '1') {
               this.tableData = []
+              this.tableData10 = []
               this.$message.success('删除成功')
             } else {
               this.$message.error('删除失败')
@@ -575,6 +577,7 @@ export default {
             this.$message.success(`传递成功`)
             this.tableDataAll = []
             this.tableData = []
+            this.tableData10 = []
           } else {
             this.$message.error(`${this.err}个零件传递失败`)
           }