前端

src/api/V2/warehouse/index.js

@@ -0,0 +1,2 @@
+export const API_POST_ADDINFO = '/speedWarehouseInOutInfo/api/addInfo'
+export const API_POST_DELINFO = '/speedWarehouseInOutInfo/api/deleteInfo'

src/model/warehouse/index.js

@@ -0,0 +1,13 @@
+import { errorCatcher, errorHandle, filter } from 'base-core-lib'
+import { appRx } from '../defalutConfig/indexRx'
+import {
+    API_POST_ADDINFO,
+    API_POST_DELINFO,
+    API_GET_INFO
+} from '@/api/common'
+// 添加出入库
+export const addList = appRx.post(API_POST_ADDINFO, errorCatcher, errorHandle, filter)
+// 删除出入库
+export const delList = appRx.post(API_POST_DELINFO, errorCatcher, errorHandle, filter)
+// 出入库列表
+export const getList = appRx.get(API_GET_INFO, errorCatcher, errorHandle, filter)

src/views/boundManagement/outbound.vue

@@ -6,8 +6,8 @@
          
       </el-col>
       <el-col :span="12" class="bg-right">
-        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">保存</el-button>
-        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">新增</el-button>
+        <el-button class="bg-bottom" type="primary" size="small" @click="save()">保存</el-button>
+        <el-button class="bg-bottom" type="primary" size="small" @click="add()">新增</el-button>
       </el-col>
     </el-row>
     <div class="enterTextWrap">
@@ -28,69 +28,72 @@
               <el-checkbox v-model="checked">手动编辑重量</el-checkbox>
             </div>
             <el-form-item label="毛重（公斤）">
-              <el-input :disabled="!checked" placeholder="输入毛重" v-model="form.name"></el-input>
+              <el-input :disabled="!checked" placeholder="输入毛重" v-model="form.grossWeight"></el-input>
               <el-button type="text">获取</el-button>
             </el-form-item>
             <el-form-item label="皮重（公斤）">
-              <el-input :disabled="!checked" placeholder="输入皮重" v-model="form.name"></el-input>
+              <el-input :disabled="!checked" placeholder="输入皮重" v-model="form.tare"></el-input>
               <el-button type="text">获取</el-button>
             </el-form-item>
             <el-form-item label="净重（公斤）">
-              <el-input placeholder="自动计算" v-model="form.name"></el-input>
+              <el-input disabled placeholder="自动计算" v-model="form.netWeight"></el-input>
             </el-form-item>
             <div class="form-title">基本信息</div>
             <el-form-item label="客户姓名">
-              <el-select placeholder="输入客户姓名" v-model="form.region" >
+              <el-select allow-create filterable clearable placeholder="输入客户姓名" v-model="form.customerName" >
                 <el-option label="区域一" value="shanghai"></el-option>
                 <el-option label="区域二" value="beijing"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="车牌号">
-              <el-input placeholder="输入毛重车牌号" v-model="form.name"></el-input>
+              <el-input placeholder="输入毛重车牌号" v-model="form.carNumber"></el-input>
             </el-form-item>
             <el-form-item label="仓位号">
-              <el-input placeholder="输入仓位号" v-model="form.name"></el-input>
+              <el-select filterable clearable placeholder="输入仓位号" v-model="form.positionNo" >
+                <el-option label="区域一" value="shanghai"></el-option>
+                <el-option label="区域二" value="beijing"></el-option>
+              </el-select>
             </el-form-item>
             <div class="form-title">定价信息</div>
             <el-form-item label="单价（元/吨）">
-              <el-input placeholder="输入单价" v-model="form.desc"></el-input>
+              <el-input placeholder="输入单价" v-model="form.unitPrice"></el-input>
             </el-form-item>
             <el-form-item label="粮款（元）">
-              <el-input placeholder="自动计算" v-model="form.name"></el-input>
+              <el-input placeholder="自动计算" v-model="form.grainFund"></el-input>
             </el-form-item>
           </el-form>
         </div>
         <div class="form">
           <el-form  ref="form" :model="form" label-position="left" label-width="120px">
             <el-form-item label="货名">
-              <el-select placeholder="选择货名" v-model="form.region" >
+              <el-select filterable clearable placeholder="选择货名" v-model="form.goodsName" >
                 <el-option label="区域一" value="shanghai"></el-option>
                 <el-option label="区域二" value="beijing"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="容重(克/升)">
-              <el-input placeholder="输入容重" v-model="form.name"></el-input>
+              <el-input placeholder="输入容重" v-model="form.bulkDensity"></el-input>
             </el-form-item>
             <el-form-item label="水分（%）">
-              <el-input placeholder="输入水分占比" v-model="form.name"></el-input>
+              <el-input placeholder="输入水分占比" v-model="form.waterContent"></el-input>
             </el-form-item>
             <el-form-item label="蛋白（%）">
-              <el-input placeholder="输入蛋白占比" v-model="form.name"></el-input>
+              <el-input placeholder="输入蛋白占比" v-model="form.protein"></el-input>
             </el-form-item>
             <el-form-item label="杂质（%）">
-              <el-input placeholder="输入杂质占比" v-model="form.name"></el-input>
+              <el-input placeholder="输入杂质占比" v-model="form.impurity"></el-input>
             </el-form-item>
             <el-form-item label="霉变粒（%）">
-              <el-input placeholder="输入霉变粒占比" v-model="form.name"></el-input>
+              <el-input placeholder="输入霉变粒占比" v-model="form.mildewGrain"></el-input>
             </el-form-item>
             <el-form-item label="热损伤（%）">
-              <el-input placeholder="输入热损伤占比" v-model="form.name"></el-input>
+              <el-input placeholder="输入热损伤占比" v-model="form.jiaorenli"></el-input>
             </el-form-item>
             <el-form-item label="不完善粒（%）">
-              <el-input placeholder="输入不完善粒占比" v-model="form.name"></el-input>
+              <el-input placeholder="输入不完善粒占比" v-model="form.imperfectGrain"></el-input>
             </el-form-item>
             <el-form-item label="备注">
-              <el-input placeholder="输入备注，0-150个字" type="textarea" v-model="form.desc"></el-input>
+              <el-input placeholder="输入备注，0-150个字" type="textarea" v-model="form.remark"></el-input>
             </el-form-item>
           </el-form>
         </div>
@@ -109,7 +112,7 @@
                 src="../../../public/img/sousuo.png" alt="" /></el-button>
         </el-col>
       </el-row>
-      <el-table :data="tableData" stripe style="width: 100%" @selection-change="handleSelectionChange">
+      <el-table :data="tableData" stripe style="width: 100%" >
         <el-table-column  width="40">
           <template scope="scope">
             <img v-if="!scope.row.select" style='width:15px;vertical-align: text-top;' @click='radiochange1(index,scope.row,item)' src="../../../public/img/wxz.png" alt="">
@@ -146,13 +149,42 @@
         layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
       </el-pagination>
     </div>
+    <el-dialog
+      title="客户信息"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose">
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item label="姓名">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+        <el-form-item label="手机号">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+        <el-form-item label="银行卡号">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+        <el-form-item label="开户行">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+        <el-form-item label="开户支行">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import {
-  gChartsData,
-} from '@/model/home/index'
+  addList,
+  delList,
+  getList
+} from '@/model/warehouse/index'
 import BalanceAlert from '@/components/balanceAlert'
 // import CenterMap from "./center-map.vue";
 export default {
@@ -164,7 +196,13 @@ export default {
       tableData:[],
       form:{},
       information:'',
-      checked:false
+      checked:false,
+      searchKeyWord:'',
+      currentPage:1,
+      pageSize:10,
+      value:[],
+      deptBudgetTotal:0,
+      dialogVisible:false,
     };
   },
   filters: {
@@ -175,7 +213,7 @@ export default {
   created() {
   },
   mounted() {
-   
+    getList().toPromise()
 
   },
   beforeDestroy() {
@@ -183,6 +221,11 @@ export default {
     
   },
   methods: {
+    handleClose(){
+      this.dialogVisible=false
+    },
+    radiochange1(){},
+    radiochange(){},
     changeDate(){
       if(this.value){
         this.startDate = this.value[0]
@@ -200,6 +243,40 @@ export default {
         this.form.tare = data
       }
     },
+    add(){
+      this.form={}
+    },
+    save(){
+      addList().toPromise()
+    },
+    del(row){
+      this.$confirm('确定删除入库记录？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          delList().toPromise()
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          });
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
   },
 };
 </script>

src/views/warehousing/index.vue

@@ -6,8 +6,8 @@
          
       </el-col>
       <el-col :span="12" class="bg-right">
-        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">保存</el-button>
-        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">新增</el-button>
+        <el-button class="bg-bottom" type="primary" size="small" @click="save()">保存</el-button>
+        <el-button class="bg-bottom" type="primary" size="small" @click="add()">新增</el-button>
       </el-col>
     </el-row>
     <div class="enterTextWrap">
@@ -28,69 +28,72 @@
               <el-checkbox v-model="checked">手动编辑重量</el-checkbox>
             </div>
             <el-form-item label="毛重（公斤）">
-              <el-input :disabled="!checked" placeholder="输入毛重" v-model="form.name"></el-input>
+              <el-input :disabled="!checked" placeholder="输入毛重" v-model="form.grossWeight"></el-input>
               <el-button type="text">获取</el-button>
             </el-form-item>
             <el-form-item label="皮重（公斤）">
-              <el-input :disabled="!checked" placeholder="输入皮重" v-model="form.name"></el-input>
+              <el-input :disabled="!checked" placeholder="输入皮重" v-model="form.tare"></el-input>
               <el-button type="text">获取</el-button>
             </el-form-item>
             <el-form-item label="净重（公斤）">
-              <el-input disabled placeholder="自动计算" v-model="form.name"></el-input>
+              <el-input disabled placeholder="自动计算" v-model="form.netWeight"></el-input>
             </el-form-item>
             <div class="form-title">基本信息</div>
             <el-form-item label="客户姓名">
-              <el-select placeholder="输入客户姓名" v-model="form.region" >
+              <el-select allow-create filterable clearable placeholder="输入客户姓名" v-model="form.customerName" >
                 <el-option label="区域一" value="shanghai"></el-option>
                 <el-option label="区域二" value="beijing"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="车牌号">
-              <el-input placeholder="输入毛重车牌号" v-model="form.name"></el-input>
+              <el-input placeholder="输入毛重车牌号" v-model="form.carNumber"></el-input>
             </el-form-item>
             <el-form-item label="仓位号">
-              <el-input placeholder="输入仓位号" v-model="form.name"></el-input>
+              <el-select filterable clearable placeholder="输入仓位号" v-model="form.positionNo" >
+                <el-option label="区域一" value="shanghai"></el-option>
+                <el-option label="区域二" value="beijing"></el-option>
+              </el-select>
             </el-form-item>
             <div class="form-title">定价信息</div>
             <el-form-item label="单价（元/吨）">
-              <el-input placeholder="输入单价" v-model="form.desc"></el-input>
+              <el-input placeholder="输入单价" v-model="form.unitPrice"></el-input>
             </el-form-item>
             <el-form-item label="粮款（元）">
-              <el-input placeholder="自动计算" v-model="form.name"></el-input>
+              <el-input placeholder="自动计算" v-model="form.grainFund"></el-input>
             </el-form-item>
           </el-form>
         </div>
         <div class="form">
           <el-form  ref="form" :model="form" label-position="left" label-width="120px">
             <el-form-item label="货名">
-              <el-select placeholder="选择货名" v-model="form.region" >
+              <el-select filterable clearable placeholder="选择货名" v-model="form.goodsName" >
                 <el-option label="区域一" value="shanghai"></el-option>
                 <el-option label="区域二" value="beijing"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="容重(克/升)">
-              <el-input placeholder="输入容重" v-model="form.name"></el-input>
+              <el-input placeholder="输入容重" v-model="form.bulkDensity"></el-input>
             </el-form-item>
             <el-form-item label="水分（%）">
-              <el-input placeholder="输入水分占比" v-model="form.name"></el-input>
+              <el-input placeholder="输入水分占比" v-model="form.waterContent"></el-input>
             </el-form-item>
             <el-form-item label="蛋白（%）">
-              <el-input placeholder="输入蛋白占比" v-model="form.name"></el-input>
+              <el-input placeholder="输入蛋白占比" v-model="form.protein"></el-input>
             </el-form-item>
             <el-form-item label="杂质（%）">
-              <el-input placeholder="输入杂质占比" v-model="form.name"></el-input>
+              <el-input placeholder="输入杂质占比" v-model="form.impurity"></el-input>
             </el-form-item>
             <el-form-item label="霉变粒（%）">
-              <el-input placeholder="输入霉变粒占比" v-model="form.name"></el-input>
+              <el-input placeholder="输入霉变粒占比" v-model="form.mildewGrain"></el-input>
             </el-form-item>
             <el-form-item label="热损伤（%）">
-              <el-input placeholder="输入热损伤占比" v-model="form.name"></el-input>
+              <el-input placeholder="输入热损伤占比" v-model="form.jiaorenli"></el-input>
             </el-form-item>
             <el-form-item label="不完善粒（%）">
-              <el-input placeholder="输入不完善粒占比" v-model="form.name"></el-input>
+              <el-input placeholder="输入不完善粒占比" v-model="form.imperfectGrain"></el-input>
             </el-form-item>
             <el-form-item label="备注">
-              <el-input placeholder="输入备注，0-150个字" type="textarea" v-model="form.desc"></el-input>
+              <el-input placeholder="输入备注，0-150个字" type="textarea" v-model="form.remark"></el-input>
             </el-form-item>
           </el-form>
         </div>
@@ -122,22 +125,22 @@
               <span v-else>{{ scope.$index + 1 }}</span>
             </template>
         </el-table-column>
-        <el-table-column prop="contractNo" label="日期"></el-table-column>
-        <el-table-column prop="receivingCompany" label="仓位"></el-table-column>
-        <el-table-column prop="cumulativeTransfer" label="车牌号"></el-table-column>
-        <el-table-column prop="expectedRedemption" label="客户"></el-table-column>
-        <el-table-column width="120" prop="redeemed" label="货名"></el-table-column>
-        <el-table-column width="120" prop="settlementPrice" label="毛重（吨）"></el-table-column>
-        <el-table-column width="120" prop="settlementPrice" label="皮重（吨）"></el-table-column>
-        <el-table-column width="120" prop="settlementPrice" label="净重（吨）"></el-table-column>
-        <el-table-column width="120" prop="settlementPrice" label="容重（克/升）"></el-table-column>
-        <el-table-column width="120" prop="settlementPrice" label="水分（%）"></el-table-column>
-        <el-table-column width="120" prop="settlementPrice" label="单价（元/吨）"></el-table-column>
-        <el-table-column width="120" prop="settlementPrice" label="粮款（元）"></el-table-column>
-        <el-table-column width="120" prop="settlementPrice" label="付款状态"></el-table-column>
+        <el-table-column prop="createDate" label="日期"></el-table-column>
+        <el-table-column prop="positionNo" label="仓位"></el-table-column>
+        <el-table-column prop="carNumber" label="车牌号"></el-table-column>
+        <el-table-column prop="customerName" label="客户"></el-table-column>
+        <el-table-column width="120" prop="goodsName" label="货名"></el-table-column>
+        <el-table-column width="120" prop="grossWeight" label="毛重（吨）"></el-table-column>
+        <el-table-column width="120" prop="tare" label="皮重（吨）"></el-table-column>
+        <el-table-column width="120" prop="netWeight" label="净重（吨）"></el-table-column>
+        <el-table-column width="120" prop="bulkDensity" label="容重（克/升）"></el-table-column>
+        <el-table-column width="120" prop="waterContent" label="水分（%）"></el-table-column>
+        <el-table-column width="120" prop="unitPrice" label="单价（元/吨）"></el-table-column>
+        <el-table-column width="120" prop="grainFund" label="粮款（元）"></el-table-column>
+        <el-table-column width="120" prop="status" label="付款状态"></el-table-column>
         <el-table-column prop="address" label="操作" width="200">
           <template slot-scope="scope">
-            <el-button type="text">删除</el-button>
+            <el-button @click="del(scope.row)" type="text">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -146,13 +149,42 @@
         layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
       </el-pagination>
     </div>
+    <el-dialog
+      title="客户信息"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose">
+      <el-form ref="form" :model="client" label-width="80px">
+        <el-form-item label="姓名">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+        <el-form-item label="手机号">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+        <el-form-item label="银行卡号">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+        <el-form-item label="开户行">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+        <el-form-item label="开户支行">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import {
-  gChartsData,
-} from '@/model/home/index'
+  addList,
+  delList,
+  getList
+} from '@/model/warehouse/index'
 import BalanceAlert from '@/components/balanceAlert'
 // import CenterMap from "./center-map.vue";
 export default {
@@ -164,7 +196,8 @@ export default {
       tableData:[],
       form:{},
       information:'',
-      checked:false
+      checked:false,
+      searchKeyWord:''
     };
   },
   filters: {
@@ -175,7 +208,7 @@ export default {
   created() {
   },
   mounted() {
-   
+    getList().toPromise()
 
   },
   beforeDestroy() {
@@ -200,6 +233,40 @@ export default {
         this.form.tare = data
       }
     },
+    add(){
+      this.form={}
+    },
+    save(){
+      addList().toPromise()
+    },
+    del(row){
+      this.$confirm('确定删除入库记录？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          delList().toPromise()
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          });
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
   },
 };
 </script>