更心

src/views/Inventory/MaterialReturn/index.vue

@@ -79,19 +79,19 @@
             {{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="退货" align="center" width="90" show-overflow-tooltip>
+        <el-table-column label="退料" align="center" width="90" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.出库数量 }}
+            {{ scope.row.退料数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="退货人" align="center" width="100" show-overflow-tooltip>
+        <el-table-column label="退料人" align="center" width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.领料人 }}
+            {{ scope.row.退料人 }}
           </template>
         </el-table-column>
-        <el-table-column label="退货时间" align="center" width="90">
+        <el-table-column label="退料时间" align="center" width="90">
           <template slot-scope="scope">
-            {{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '-' }}
+            {{ scope.row.退料时间 ? scope.row.退料时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="100">
@@ -162,6 +162,8 @@ export default {
       name: '',
       spec: '',
       model: '',
+      typeNumber: '',
+      floatNumber: '',
       locateName: [],
       tableData: [],
       pageSize1: 100,
@@ -243,10 +245,12 @@ export default {
       this.dialogFormVisible = true
       this.materialNumber = row.物料流水号
       this.basicNumber = row.组件零件基本件流水号
-      this.outNumber = row.出库数量
+      this.outNumber = Number(row.出库数量)
+      this.typeNumber = row.退料类型
+      this.floatNumber = row.零件流水号
     },
     submit() {
-      submitMaterialReturn(this.materialNumber, this.basicNumber, this.form.退料数量, this.form.货位名称, this.id).then(response => {
+      submitMaterialReturn(this.materialNumber, this.basicNumber, this.form.退料数量, this.form.货位名称, this.id, this.typeNumber, this.floatNumber).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('退料成功')
           this.dialogFormVisible = false