Ver Fonte

批次调拨

renmy há 3 anos atrás
pai
commit
c3b45b65a9

+ 4 - 4
src/views/device/allocation/allocationAdd.vue

@@ -104,19 +104,19 @@
 
 					<el-table-column label="未调拨" prop="plateNumber">
 						<template slot-scope="scope">
-							{{ scope.row.total - scope.row.handle - scope.row.out_storage - scope.row.transfer  }}
+							{{ scope.row.not_transfer }}
 						</template>
 					</el-table-column>
 
 					<el-table-column label="可调拨" prop="deptId">
 						<template slot-scope="scope">
-							{{ scope.row.in_storage }}
+							{{ scope.row.transfer_able }}
 						</template>
 					</el-table-column>
 
 					<el-table-column label="不可调拨" prop="vin">
 						<template slot-scope="scope">
-							{{ scope.row.transfer + scope.row.out_storage + scope.row.handle }}
+							{{ scope.row.total - transfer_able }}
 						</template>
 					</el-table-column>
 
@@ -193,7 +193,7 @@ export default {
 			this.addBatchVisible = true
 			let numbers = []
 			this.multipleSelection.forEach(item => {
-				numbers.push(item.batch_num)
+				numbers.push(item.operate_id)
 			})
 			this.$nextTick(() => {
 				this.$refs.addBatch.init()

+ 3 - 3
src/views/device/delivery/batchOut.vue

@@ -56,19 +56,19 @@
 
       <el-table-column label="未出库">
         <template slot-scope="scope">
-          {{ scope.row.total - scope.row.out_storage || 0 }}
+          {{ scope.row.not_outstorage || 0 }}
         </template>
       </el-table-column>
 
       <el-table-column label="可出库">
         <template slot-scope="scope">
-          {{ scope.row.transfer || 0}}
+          {{ scope.row.outstorage_able || 0}}
         </template>
       </el-table-column>
 
       <el-table-column label="不可出库">
         <template slot-scope="scope">
-          {{ scope.row.out_storage || 0 }}
+          {{ scope.row.total - scope.row.outstorage_able || 0 }}
         </template>
       </el-table-column>