出库接口对接

src/api/device/delivery.js

@@ -9,6 +9,15 @@ export function deliveryList(data) {
     })
 }
 
+//出库列表
+export function deliveryDefualtList(data) {
+    return request({
+        url: '/api/v1/app/device/log/batchNum/out/pageQuery',
+        method: 'post',
+        data
+    })
+}
+
 //设备出库
 export function deliveryAdd(data) {
     return request({

src/router/index.js

@@ -147,6 +147,14 @@ export const constantRoutes = [{
                     import ('@/views/device/delivery/index'),
                 meta: { title: '设备出库', icon: 'el-icon-picture-outline' }
             },
+            {
+                path: 'delivery/details',
+                name: 'DeliveryDetail',
+                hidden: true,
+                component: () =>
+                    import ('@/views/device/delivery/details'),
+                meta: { title: '出库详情', icon: 'el-icon-picture-outline' }
+            },
             {
                 path: 'delivery/batchOut',
                 name: 'BatchOut',

src/views/device/delivery/batchOut.vue

@@ -49,7 +49,7 @@
 
 			<el-table-column label="批次号">
         <template slot-scope="scope">
-          {{ scope.row.intime }}
+          {{ scope.row.batch_num }}
         </template>
       </el-table-column>
 
@@ -93,7 +93,7 @@
 </template>
 
 <script>
-import { deliveryList } from '@/api/device/delivery'
+import { getBatchList } from '@/api/device/info'
 import Create from '@/views/device/delivery/delivery-add.vue'
 
 export default {
@@ -138,7 +138,7 @@ export default {
     //获取列表数据
     getDataList() {
       this.loading = true
-      deliveryList(this.listQuery).then(res => {
+      getBatchList(this.listQuery).then(res => {
         if (res.code === 200) {
           this.data = res.data
           this.total = res.total

src/views/device/delivery/details.vue

@@ -7,20 +7,12 @@
 
 		<el-form :inline="true" :model="listQuery" @keyup.enter.native="searchHandle()">
 			<el-row>
-				<el-col :span="8">
+				<el-col :span="12">
 					<el-form-item label="设备SN">
 						<el-input v-model="listQuery.sn" placeholder="请输入设备SN" clearable></el-input>
 					</el-form-item>
 				</el-col>
-				
-				<el-col :span="8">
-					<el-form-item label="出库类型">
-						<el-select v-model="listQuery.type">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
-            </el-select> 
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
+				<el-col :span="12">
 					<div style="float: right;">
 						<el-form-item>
 							<el-button type="primary" @click="searchHandle()">搜索</el-button>
@@ -31,27 +23,6 @@
 					</div>
 				</el-col>
 			</el-row>
-      <el-row>
-        <el-col :span="12">
-					<el-form-item label="出库时间">
-						<el-date-picker
-              v-model="listQuery.time"
-              type="datetimerange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期">
-            </el-date-picker>
-					</el-form-item>
-				</el-col>
-      </el-row>
-			<el-row>
-				<el-form-item>
-					<el-button type="primary" @click="cerateHandle()">新增出库</el-button>
-				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" @click="resetForm()">批次出库</el-button>
-				</el-form-item>
-			</el-row>
 		</el-form>
 
     <el-table
@@ -63,69 +34,61 @@
       fit
       highlight-current-row
     >
-			<el-table-column label="出库时间">
+			<el-table-column label="设备SN">
         <template slot-scope="scope">
-          {{ scope.row.intime }}
+          {{ scope.row.sn }}
         </template>
       </el-table-column>
 
-      <el-table-column label="设备数量">
+      <el-table-column label="电池类型">
         <template slot-scope="scope">
-          {{ scope.row.code }}
+          {{ scope.row.typeTitle }}
         </template>
       </el-table-column>
 
-      <el-table-column label="出库类型">
+      <el-table-column label="PACK厂">
         <template slot-scope="scope">
-          {{ scope.row.total}}
+          {{ scope.row.packTitle}}
         </template>
       </el-table-column>
 
-      <el-table-column label="客户">
+      <el-table-column label="产品规格">
         <template slot-scope="scope">
-          {{ scope.row.dt }}
+          {{ scope.row.expandTitle }}
         </template>
       </el-table-column>
 
-      <el-table-column label="接收人">
+      <el-table-column label="产品拓展">
         <template slot-scope="scope">
-          {{ scope.row.into }}
+          {{ scope.row.specTitle }}
         </template>
       </el-table-column>
 
-      <el-table-column label="接收人电话">
+      <el-table-column label="出库时间">
         <template slot-scope="scope">
-          {{ scope.row.create }}
+          {{ scope.row.updateTime }}
         </template>
       </el-table-column>
 
-			<el-table-column label="出库人">
+			<el-table-column label="操作人">
         <template slot-scope="scope">
           {{ scope.row.create }}
         </template>
       </el-table-column>
-
-      <el-table-column align="center" label="操作" width="180">
-        <template slot-scope="scope">
-          <el-button @click="edit(scope.row.id)" type="text">查看详情</el-button>
-        </template>
-      </el-table-column>
     </el-table>
 
 		<el-pagination style="float: right; margin-top: 30px;" :current-page="listQuery.index" :page-sizes="[10, 20, 50, 100]" :page-size="listQuery.length" :total="total"
 			layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
 			@current-change="pageCurrentChangeHandle">
 		</el-pagination>
-		<Create v-if="addVisible" ref="add" @refreshDataList="getDataList"></Create>
   </div>
 </template>
 
 <script>
 import { deliveryList } from '@/api/device/delivery'
-import Create from '@/views/device/delivery/delivery-add.vue'
 
 export default {
-  components: { Create },
+  components: {  },
   data() {
     return {
       //列表加载动画
@@ -140,7 +103,8 @@ export default {
         length: 20,
         sn: '',
         type: null,
-        sort: '+id',
+        sort: '',
+        batchNum: ''
       },
 			/**是否显示新增弹窗 */
 			addVisible: false,
@@ -154,6 +118,9 @@ export default {
     }
   },
   created() {
+    if (this.$route.query.batchId !== undefined) {
+      this.listQuery.batchNum = this.$route.query.batchId
+    }
     this.getDataList()
   },
   methods: {

src/views/device/delivery/index.vue

@@ -66,49 +66,47 @@
     >
 			<el-table-column label="出库时间">
         <template slot-scope="scope">
-          {{ scope.row.updateTime }}
+          {{ scope.row.update_time }}
         </template>
       </el-table-column>
 
       <el-table-column label="设备数量">
         <template slot-scope="scope">
-          {{ scope.row.code }}
+          {{ scope.row.total }}
         </template>
       </el-table-column>
 
       <el-table-column label="出库类型">
         <template slot-scope="scope">
-          {{ scope.row.typeTitle}}
+          {{ scope.row.out_type}}
         </template>
       </el-table-column>
 
       <el-table-column label="客户">
-        <template slot-scope="scope">
-          {{ scope.row.ss }}
-        </template>
+        骑享科技
       </el-table-column>
 
       <el-table-column label="接收人">
         <template slot-scope="scope">
-          {{ scope.row.receiverName }}
+          {{ scope.row.receiver_name }}
         </template>
       </el-table-column>
 
       <el-table-column label="接收人电话">
         <template slot-scope="scope">
-          {{ scope.row.receiverPhone }}
+          {{ scope.row.receiver_phone }}
         </template>
       </el-table-column>
 
 			<el-table-column label="出库人">
         <template slot-scope="scope">
-          {{ scope.row.create }}
+          {{ scope.row.operator }}
         </template>
       </el-table-column>
 
       <el-table-column align="center" label="操作" width="180">
         <template slot-scope="scope">
-          <el-button @click="edit(scope.row.id)" type="text">查看详情</el-button>
+          <el-button @click="gotoDetailHandle(scope.row.batch_num)" type="text">查看详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -122,7 +120,8 @@
 </template>
 
 <script>
-import { deliveryList } from '@/api/device/delivery'
+import { deliveryDefualtList } from '@/api/device/delivery'
+import { getBatchList } from '@/api/device/info'
 import Create from '@/views/device/delivery/delivery-add.vue'
 
 export default {
@@ -167,7 +166,7 @@ export default {
     //获取列表数据
     getDataList() {
       this.loading = true
-      deliveryList(this.listQuery).then(res => {
+      deliveryDefualtList(this.listQuery).then(res => {
         if (res.code === 200) {
           this.data = res.data
           this.total = res.total
@@ -210,17 +209,12 @@ export default {
         // }
       })
     },
-    del(val) {
-      this.$confirm('此操作将删除该数据, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        postJson('/api/v1/carinfo/delete', { id: val }).then(response => {
-          if (response.code === 200) {
-            this.fetchData()
-          }
-        })
+    gotoDetailHandle(batchId) {
+      this.$router.push({
+        path: '/device/delivery/details',
+        query: {
+          batchId: batchId
+        }
       })
     }
   }