Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/api/warehouseBusiness/warehouseOutStock.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询仓库主(出入库)列表
+export function listWarehousebills(query) {
+  return request({
+    url: '/warehouseBusiness/outStock/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询仓库主(出入库)详细
+export function getWarehousebills(fId) {
+  return request({
+    url: '/warehouseBusiness/outStock/' + fId,
+    method: 'get'
+  })
+}
+
+// 新增仓库主(出入库)
+export function addWarehousebills(data) {
+  return request({
+    url: '/warehouseBusiness/outStock/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改仓库主(出入库)
+export function updateWarehousebills(data) {
+  return request({
+    url: '/warehouseBusiness/outStock',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除仓库主(出入库)
+export function delWarehousebills(fId) {
+  return request({
+    url: '/warehouseBusiness/outStock/' + fId,
+    method: 'delete'
+  })
+}
+
+// 导出仓库主(出入库)
+export function exportWarehousebills(query) {
+  return request({
+    url: '/warehouseBusiness/outStock/export',
+    method: 'get',
+    params: query
+  })
+}

src/views/warehouseBusiness/inStock/index.vue

@@ -1241,7 +1241,7 @@ import {
   addWarehousebills,
   updateWarehousebills,
   exportWarehousebills,
-} from "@/api/warehouseBusiness/warehousebills";
+} from "@/api/warehouseBusiness/warehouseInStock";
 
 export default {
   name: "Warehousebills",

src/views/warehouseBusiness/outStock/index.vue

@@ -187,7 +187,7 @@
       <el-table-column label="状态(数据字典),N 入" align="center" prop="fId" />
       <el-table-column
         label="业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。
-RK CK DB HZ 
+RK CK DB HZ
 "
         align="center"
         prop="fBillno"
@@ -374,14 +374,14 @@ RK CK DB HZ
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item
           label="业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。
-RK CK DB HZ 
+RK CK DB HZ
 "
           prop="fBillno"
         >
           <el-input
             v-model="form.fBillno"
             placeholder="请输入业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。
-RK CK DB HZ 
+RK CK DB HZ
 "
           />
         </el-form-item>
@@ -684,7 +684,7 @@ import {
   addWarehousebills,
   updateWarehousebills,
   exportWarehousebills,
-} from "@/api/warehouseBusiness/warehousebills";
+} from "@/api/warehouseBusiness/warehouseOutStock";
 
 export default {
   name: "Warehousebills",

src/views/warehouseBusiness/warehousebills/index.vue

@@ -104,7 +104,7 @@
         >
         </el-date-picker>
       </el-form-item>
-      
+
       <el-form-item label="船名航次" prop="fVslvoy">
         <el-input
           v-model="queryParams.fVslvoy"
@@ -283,14 +283,14 @@
       </el-form-item>
       <el-form-item
         label="业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。
-RK CK DB HZ 
+RK CK DB HZ
 "
         prop="fBillno"
       >
         <el-input
           v-model="queryParams.fBillno"
           placeholder="请输入业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。
-RK CK DB HZ 
+RK CK DB HZ
 "
           clearable
           size="small"
@@ -501,7 +501,7 @@ RK CK DB HZ
       <el-table-column label="状态(数据字典),N 入" align="center" prop="fId" />
       <el-table-column
         label="业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。
-RK CK DB HZ 
+RK CK DB HZ
 "
         align="center"
         prop="fBillno"
@@ -688,14 +688,14 @@ RK CK DB HZ
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item
           label="业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。
-RK CK DB HZ 
+RK CK DB HZ
 "
           prop="fBillno"
         >
           <el-input
             v-model="form.fBillno"
             placeholder="请输入业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。
-RK CK DB HZ 
+RK CK DB HZ
 "
           />
         </el-form-item>
@@ -998,7 +998,7 @@ import {
   addWarehousebills,
   updateWarehousebills,
   exportWarehousebills,
-} from "@/api/warehouseBusiness/warehousebills";
+} from "@/api/warehouseBusiness/warehouseInStock";
 
 export default {
   name: "Warehousebills",