更新

src/views/TechnologyCenter/CreatePackingList/index.vue

@@ -98,7 +98,7 @@
               />
               <el-table-column
                 align="center"
-                prop="部件名称"
+                prop="名称"
                 label="名称"
               />
               <el-table-column
@@ -108,7 +108,7 @@
               />
               <el-table-column
                 align="center"
-                prop="部件数量"
+                prop="数量"
                 label="数量"
               />
               <el-table-column
@@ -183,10 +183,10 @@
           <template slot-scope="scope">{{ scope.row.名称 }}</template>
         </el-table-column>
         <el-table-column
-          label="规格"
+          label="代号"
           align="center"
           min-width="100px">
-          <template slot-scope="scope">{{ scope.row.规格 }}</template>
+          <template slot-scope="scope">{{ scope.row.图号 }}</template>
         </el-table-column>
         <el-table-column
           label="数量"
@@ -595,13 +595,16 @@ export default {
       this.machineTableData = []
       const response = await getMachineData(this.receiptNum)
       const data = response.data
+      console.log(data, 1111)
       for (let i = 0; i < data.length; i++) {
-        const resp = await getGroupData(this.projectName, data[i].代号)
+        const resp = await getGroupData(data[i].机床号)
+        console.log(resp)
         const groupData = resp.data.map(item => {
           item.类别 = '机床所属部件'
-          item.代号 = data[i].代号 + '-' + item.组号.split('-')[0]
+          item.代号 = data[i].代号 + '-' + item.代号 + '组'
           return item
         })
+        console.log(groupData)
         this.machineTableData.push({
           序号: data[i].序号,
           代号: data[i].代号,
@@ -686,6 +689,10 @@ export default {
     },
     async getSpareData() {
       const response = await getSpareData(this.receiptNum)
+      console.log(response)
+      for (let i = 0; i < response.data.length; i++) {
+        response.data[i].图号 = response.data[i].图号 + response.data[i].规格
+      }
       this.spareData = response.data
     },
     addSpare() {

src/views/TechnologyCenter/ImportParts/index.vue

@@ -118,6 +118,7 @@ export default {
     },
     async selected(data) { // 选择需要导入的文件
       this.worksheet = data.worksheet // 获取每个多选文件的表格坐标及值
+      console.log(this.worksheet)
       this.itemFile = data.itemFile
     },
     handleRemove(file) { // 移除文件

src/views/TechnologyCenter/ImportParts/specificationData.vue

@@ -522,7 +522,7 @@ export default {
               const data = this.tableDataAll[i]
               console.log(data)
               const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量)
-              const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id)
+              const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.备件数量)
               await sleep(10)
               if (resp.data[0].result === '0') {
                 this.err++
@@ -538,7 +538,7 @@ export default {
               } else {
                 dataType = 1
               }
-              const resp = await transferWG(data.组件流水号, data.物料流水号, total, data.备注, data.标记, data.设计者编号, data.是否传递, dataType, data.序号, data.id)
+              const resp = await transferWG(data.组件流水号, data.物料流水号, total, data.备注, data.标记, data.设计者编号, data.是否传递, dataType, data.序号, data.id, data.备件数量)
               await sleep(10)
               if (resp.data[0].result === '0') {
                 this.err++