出入库记录

src/api/warehouse.js

@@ -105,3 +105,27 @@ export function updateTemplate (data) {
     data
   })
 }
+// 模板出库List
+export function getTemplateOutList (params) {
+  return request({
+    url: request.adornUrl(`/biz-service/template-outbound-ctl/list`),
+    method: 'get',
+    params
+  })
+}
+// 单位换算List
+export function getUnitConversionList (params) {
+  return request({
+    url: request.adornUrl(`/biz-service/conversion-ctl/list`),
+    method: 'get',
+    params
+  })
+}
+// 出入库记录查询
+export function getRecordList (params) {
+  return request({
+    url: request.adornUrl(`/biz-service/inbound-record-ctl/list`),
+    method: 'get',
+    params
+  })
+}

src/views/modules/warehouse/in-record.vue

@@ -1,11 +1,22 @@
+<!-- 出入库记录 -->
 <template>
   <div class="stock-order">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-      <el-form-item label="编号">
-        <el-input v-model="dataForm.number" placeholder="编号" clearable></el-input>
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="queryData()">
+      <el-form-item label="出入库类型">
+        <el-select v-model="dataForm.recordType" placeholder="请选择">
+          <el-option
+            v-for="item in recordTypeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="名称">
-        <el-input v-model="dataForm.name" placeholder="名称" clearable></el-input>
+      <el-form-item label="编码">
+        <el-input v-model="dataForm.recordCode" placeholder="编码" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="申请人">
+        <user-component v-model="dataForm.userId"/>
       </el-form-item>
       <el-form-item label="入库日期">
         <el-date-picker
@@ -18,8 +29,8 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getDataList()">查询</el-button>
-        <el-button @click="inBound()"  type="primary">导出</el-button>
+        <el-button @click="queryData()">查询</el-button>
+        <el-button @click="exportData()" type="primary">导出</el-button>
       </el-form-item>
     </el-form>
     <el-table
@@ -35,79 +46,88 @@
         align="center">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="recordCode"
         header-align="center"
         align="center"
+        min-width="160"
         label="编码">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="materialName"
         header-align="center"
         align="center"
         label="名称">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="recordType"
         header-align="center"
         align="center"
-        label="类型">
+        :formatter="formatRecordType"
+        label="出入库类型">
       </el-table-column>
       <el-table-column
-        prop="recordType"
+        prop="specifications"
         header-align="center"
         align="center"
-        label="数量">
+        label="规格">
       </el-table-column>
       <el-table-column
-        prop="state"
+        prop="unitName"
         header-align="center"
         align="center"
         label="单位">
       </el-table-column>
       <el-table-column
-        prop="state"
+        prop="cnt"
+        header-align="center"
+        align="center"
+        label="数量">
+      </el-table-column>
+      <el-table-column
+        prop="price"
         header-align="center"
         align="center"
         label="单价">
       </el-table-column>
       <el-table-column
-        prop="approver"
+        prop="amount"
         header-align="center"
         align="center"
         label="金额">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="batchNumber"
         header-align="center"
         align="center"
         label="批次号">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="source"
         header-align="center"
         align="center"
+        min-width="100"
         label="来源">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="recordTime"
         header-align="center"
         align="center"
-        label="入库时间">
+        label="出入库时间">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="applicant"
         header-align="center"
         align="center"
         label="申请人">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="approver"
         header-align="center"
         align="center"
         label="操作人">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="notes"
         header-align="center"
         align="center"
         label="备注">
@@ -126,8 +146,14 @@
 </template>
 
 <script>
+  import UserComponent from '../common/user-component'
+  import { getRecordList } from '@/api/warehouse'
   export default {
     name: 'stock-order',
+    components: {UserComponent},
+    created () {
+      this.queryData()
+    },
     data () {
       return {
         inboundVisible: false,
@@ -141,24 +167,42 @@
         pageSize: 10,
         totalPage: 0,
         dataListLoading: false,
-        dataListSelections: []
+        dataListSelections: [],
+        recordTypeOptions: [
+          {
+            value: null,
+            label: '请选择'
+          },
+          {
+            value: '0',
+            label: '入库'
+          },
+          {
+            value: '1',
+            label: '出库'
+          }
+        ]
       }
     },
     methods: {
+      // 查询
+      queryData () {
+        this.pageIndex = 1
+        this.getDataList()
+      },
       // 获取数据列表
       getDataList () {
         this.dataListLoading = true
-        this.$http({
-          url: this.$http.adornUrl('/biz-service/inbound-record-ctl/list'),
-          method: 'get',
-          params: this.$http.adornParams({
-            'current': this.pageIndex,
-            'size': this.pageSize,
-            'beginTime': this.dataForm.date[0],
-            'endTime': this.dataForm.date[1],
-            'recordType': 0
-          })
-        }).then(({data}) => {
+        let params = {
+          'current': this.pageIndex,
+          'size': this.pageSize,
+          'beginTime': this.dataForm.date[0],
+          'endTime': this.dataForm.date[1],
+          'recordType': this.dataForm.recordType ? this.dataForm.recordType : null,
+          'recordCode': this.dataForm.recordCode ? this.dataForm.recordCode : null,
+          'userId': this.dataForm.userId ? this.dataForm.userId : null
+        }
+        getRecordList(params).then(({data}) => {
           if (data && data.code === '200') {
             this.dataList = data.data.records
             this.totalPage = Number(data.data.total)
@@ -184,12 +228,16 @@
       selectionChangeHandle (val) {
         this.dataListSelections = val
       },
-      // 入库申请
-      inBound () {
-        this.inboundVisible = true
-        this.$nextTick(() => {
-          this.$refs.inbound.init()
-        })
+      // 导出
+      exportData () {
+        // todo
+      },
+      // 申请单类型
+      formatRecordType (row) {
+        if (!row.recordType) return ''
+        if (row.recordType === '0') return '入库'
+        if (row.recordType === '1') return '出库'
+        return ''
       }
     }
   }

src/views/modules/warehouse/out-record.vue

@@ -1,3 +1,4 @@
+<!-- 出库记录 -->
 <template>
   <div class="stock-order">
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">

src/views/modules/warehouse/stock-order.vue

@@ -139,6 +139,9 @@
   export default {
     name: 'stock-order',
     components: {StockOrderInbound, UserComponent, StockOrderOutbound},
+    created () {
+      this.queryData()
+    },
     data () {
       return {
         inboundVisible: false,

src/views/modules/warehouse/template-delivery.vue

@@ -1,22 +1,23 @@
+<!-- 模板出库管理 -->
 <template>
   <div class="stock-order">
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
       <el-form-item label="模板名称">
         <el-input v-model="dataForm.name" placeholder="模板名称" clearable></el-input>
       </el-form-item>
-      <el-form-item label="申请日期">
+      <el-form-item label="创建时间">
         <el-date-picker
           v-model="dataForm.date"
-          value-format="yyyy-MM-dd"
-          type="daterange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
           range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期">
+          start-placeholder="开始时间"
+          end-placeholder="结束时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button @click="getDataList()">查询</el-button>
-        <el-button type="primary" @click="inBound()">新增</el-button>
+        <el-button type="primary" @click="outBound()">模板出库</el-button>
       </el-form-item>
     </el-form>
     <el-table
@@ -96,6 +97,7 @@
 
 <script>
   import templateDeliveryAdd from './template-delivery-add'
+  import { getTemplateOutList } from '@/api/warehouse'
   export default {
     name: 'stock-order',
     components: {templateDeliveryAdd},
@@ -133,19 +135,17 @@
       // 获取数据列表
       getDataList () {
         this.dataListLoading = true
-        this.$http({
-          url: this.$http.adornUrl('/biz-service/template-outbound-ctl/list'),
-          method: 'get',
-          params: this.$http.adornParams({
-            'current': this.pageIndex,
-            'size': this.pageSize,
-            'templateName': this.dataForm.name,
-            'beginTime': this.dataForm.date[0],
-            'endTime': this.dataForm.date[1]
-          })
-        }).then(({data}) => {
+        let params = {
+          'current': this.pageIndex,
+          'size': this.pageSize,
+          'templateName': this.dataForm.name,
+          'beginTime': this.dataForm.date[0],
+          'endTime': this.dataForm.date[1]
+        }
+        getTemplateOutList(params).then(({data}) => {
           if (data && data.code === '200') {
             this.dataList = data.data.records
+            console.log('dataList = ' + JSON.stringify(this.dataList))
             this.totalPage = Number(data.data.total)
           } else {
             this.dataList = []
@@ -169,8 +169,8 @@
       selectionChangeHandle (val) {
         this.dataListSelections = val
       },
-      // 入库申请
-      inBound () {
+      // 模板出库
+      outBound () {
         this.inboundVisible = true
         this.$nextTick(() => {
           this.$refs.inbound.init()

src/views/modules/warehouse/template.vue

@@ -1,17 +1,18 @@
+<!-- 模板管理 -->
 <template>
   <div class="stock-order">
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="queryData()">
       <el-form-item label="模板名称">
         <el-input v-model="dataForm.name" placeholder="模板名称" clearable></el-input>
       </el-form-item>
-      <el-form-item label="创建日期">
+      <el-form-item label="创建时间">
         <el-date-picker
           v-model="dataForm.date"
           value-format="yyyy-MM-dd HH:mm:ss"
           type="datetimerange"
           range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期">
+          start-placeholder="开始时间"
+          end-placeholder="结束时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item>

src/views/modules/warehouse/unit-conversion.vue

@@ -1,22 +1,23 @@
+<!-- 单位换算 -->
 <template>
   <div class="stock-order">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="queryData()">
       <el-form-item label="创建人">
         <el-input v-model="dataForm.name" placeholder="创建人" clearable></el-input>
       </el-form-item>
       <el-form-item label="创建时间">
         <el-date-picker
           v-model="dataForm.date"
-          value-format="yyyy-MM-dd"
-          type="daterange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
           range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期">
+          start-placeholder="开始时间"
+          end-placeholder="结束时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getDataList()">查询</el-button>
-        <el-button @click="inBound()"  type="primary">新增换算</el-button>
+        <el-button @click="queryData()">查询</el-button>
+        <el-button @click="addOrUpdateHandle(0, false)"  type="primary">新增换算</el-button>
       </el-form-item>
     </el-form>
     <el-table
@@ -106,12 +107,13 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
     <!--    入库-->
-    <unit-add v-if="inboundVisible" ref="inbound" @refreshDataList="getDataList"></unit-add>
+    <unit-add v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></unit-add>
   </div>
 </template>
 
 <script>
   import unitAdd from './unit-add'
+  import { getUnitConversionList } from '@/api/warehouse'
   export default {
     name: 'stock-order',
     components: {unitAdd},
@@ -145,21 +147,22 @@
       }
     },
     methods: {
+      // 查询
+      queryData () {
+        this.pageIndex = 1
+        this.getDataList()
+      },
       // 获取数据列表
       getDataList () {
         this.dataListLoading = true
-        this.$http({
-          url: this.$http.adornUrl('/biz-service/inbound-record-ctl/list'),
-          method: 'get',
-          params: this.$http.adornParams({
-            'current': this.pageIndex,
-            'size': this.pageSize,
-            'userId': this.dataForm.userId,
-            'beginTime': this.dataForm.date[0],
-            'endTime': this.dataForm.date[1],
-            'recordType': this.dataForm.recordType
-          })
-        }).then(({data}) => {
+        let params = {
+          'current': this.pageIndex,
+          'size': this.pageSize,
+          'userId': this.$store.state.user.id,
+          'beginTime': this.dataForm.date[0],
+          'endTime': this.dataForm.date[1]
+        }
+        getUnitConversionList(params).then(({data}) => {
           if (data && data.code === '200') {
             this.dataList = data.data.records
             this.totalPage = Number(data.data.total)
@@ -186,10 +189,10 @@
         this.dataListSelections = val
       },
       // 入库申请
-      inBound () {
-        this.inboundVisible = true
+      addOrUpdateHandle () {
+        this.addOrUpdateVisible = true
         this.$nextTick(() => {
-          this.$refs.inbound.init()
+          this.$refs.addOrUpdate.init()
         })
       }
     }