接口对接

src/api/device/delivery.js

@@ -7,4 +7,13 @@ export function deliveryList(data) {
         method: 'post',
         data
     })
+}
+
+//设备出库
+export function deliveryAdd(data) {
+    return request({
+        url: '/api/v1/app/device/log/outstorage',
+        method: 'post',
+        data
+    })
 }

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.transfer}}
+							{{ scope.row.in_storage -  scope.row.transfer - scope.row.out_storage }}
 						</template>
 					</el-table-column>
 
 					<el-table-column label="可调拨" prop="deptId">
 						<template slot-scope="scope">
-							{{ scope.row.total -  scope.row.transfer }}
+							{{ scope.row.in_storage -  scope.row.transfer - scope.row.out_storage }}
 						</template>
 					</el-table-column>
 
 					<el-table-column label="不可调拨" prop="vin">
 						<template slot-scope="scope">
-							{{ scope.row.out_storage }}
+							{{ scope.row.transfer + scope.row.out_storage }}
 						</template>
 					</el-table-column>
 

src/views/device/allocation/details.vue

@@ -125,7 +125,6 @@ export default {
     },
     //重置
     resetForm() {
-      debugger
       this.listQuery = {
         index: 1,
         length: 20,
@@ -136,7 +135,6 @@ export default {
         sn: '',
         sort: ''
       }
-      debugger
       this.getDataList()
     },
 		/**获取列表数据 */

src/views/device/delivery/delivery-add.vue

@@ -1,8 +1,8 @@
 <template>
   <el-dialog :visible.sync="visible" title="新增电池设备" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="'120px'">
-      <el-form-item label="电池SN" prop="sn">
-        <el-input :maxlength="30" show-word-limit v-model="dataForm.sn" placeholder="请使用扫码枪扫电池二维码或输入SN号"></el-input>
+      <el-form-item label="电池SN" prop="snStr">
+        <el-input :maxlength="30" @blur="inputHandle" show-word-limit v-model="dataForm.snStr" placeholder="请使用扫码枪扫电池二维码或输入SN号"></el-input>
       </el-form-item>
 			<el-row>
 				<el-col :span="8">
@@ -47,23 +47,23 @@
 			</el-row>
 			<el-row>
 				<el-col :span="12">
-					<el-form-item label="接收人姓名" prop="sn">
-						<el-input :maxlength="30" show-word-limit v-model="dataForm.sn" placeholder="请输入姓名"></el-input>
+					<el-form-item label="接收人姓名" prop="receiverName">
+						<el-input :maxlength="30" show-word-limit v-model="dataForm.receiverName" placeholder="请输入姓名"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="手机号" prop="sn">
-						<el-input :maxlength="30" show-word-limit v-model="dataForm.sn" placeholder="请输入手机号"></el-input>
+					<el-form-item label="手机号" prop="receiverPhone">
+						<el-input :maxlength="30" show-word-limit v-model="dataForm.receiverPhone" placeholder="请输入手机号"></el-input>
 					</el-form-item>
 				</el-col>
 			</el-row>
-			<el-form-item label="出库类型" prop="sn">
-        <el-select v-model="type">
+			<el-form-item label="出库类型" prop="outType">
+        <el-select v-model="dataForm.outType">
 					<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
 				</el-select> 
       </el-form-item>
-			<el-form-item label="备注" prop="sn">
-        <el-input type="textarea" :maxlength="200" show-word-limit v-model="dataForm.sn" placeholder="备注"></el-input>
+			<el-form-item label="备注" prop="remark">
+        <el-input type="textarea" :maxlength="200" show-word-limit v-model="dataForm.remark" placeholder="备注"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
@@ -76,7 +76,7 @@
 
 <script>
 import debounce from 'lodash/debounce'
-import { addStorageIn } from '@/api/device/storage'
+import { deliveryAdd } from '@/api/device/delivery'
 export default {
   data () {
     return {
@@ -84,9 +84,11 @@ export default {
       visible: false,
       //表单对象
       dataForm: {
-        id: '',
-        sn: '',
-        status: 1
+        sn: [],
+        snStr: '',
+        receiverName: '',
+        receiverPhone: '',
+        remark: ''
       },
 			//出库类型选项
       options: [
@@ -99,9 +101,18 @@ export default {
   computed: {
     dataRule () {
       return {
-        sn: [
+        snStr: [
           { required: true, message: "电池SN不能为空", trigger: 'blur' }
         ],
+        receiverName: [
+          { required: true, message: "接收人姓名不能为空", trigger: 'blur' }
+        ],
+        receiverPhone: [
+          { required: true, message: "接收人手机号不能为空", trigger: 'blur' }
+        ],
+        outType: [
+          { required: true, message: "出库类型不能为空", trigger: 'change' }
+        ]
       }
     }
   },
@@ -117,21 +128,23 @@ export default {
         this.$refs.sn.focus()
       })
     },
+    inputHandle() {
+      let sn = []
+      sn.push(this.dataForm.snStr)
+      this.dataForm.sn = sn
+    },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       this.$refs['dataForm'].validate((valid) => {
         if (!valid) {
           return false
         }
-        let dataForm = {
-          sn: [this.dataForm.sn]
-        }
-        addStorageIn(dataForm).then(res => {
+        deliveryAdd(this.dataForm).then(res => {
           if (res.code !== 200) {
             return this.$message.error(res.msg)
           }
           this.$message({
-            message: `${this.dataForm.sn} 电池入库成功`,
+            message: `${this.dataForm.sn} 电池出库成功`,
             type: 'success',
             duration: 1000,
             onClose: () => {

src/views/device/delivery/index.vue

@@ -66,7 +66,7 @@
     >
 			<el-table-column label="出库时间">
         <template slot-scope="scope">
-          {{ scope.row.intime }}
+          {{ scope.row.updateTime }}
         </template>
       </el-table-column>
 
@@ -78,25 +78,25 @@
 
       <el-table-column label="出库类型">
         <template slot-scope="scope">
-          {{ scope.row.total}}
+          {{ scope.row.typeTitle}}
         </template>
       </el-table-column>
 
       <el-table-column label="客户">
         <template slot-scope="scope">
-          {{ scope.row.dt }}
+          {{ scope.row.ss }}
         </template>
       </el-table-column>
 
       <el-table-column label="接收人">
         <template slot-scope="scope">
-          {{ scope.row.into }}
+          {{ scope.row.receiverName }}
         </template>
       </el-table-column>
 
       <el-table-column label="接收人电话">
         <template slot-scope="scope">
-          {{ scope.row.create }}
+          {{ scope.row.receiverPhone }}
         </template>
       </el-table-column>