chenying 3 سال پیش
والد
کامیت
5adeb20247

+ 69 - 52
src/views/modules/warehouse/template-delivery-look.vue → src/views/modules/warehouse/template-delivery-add.vue

@@ -8,20 +8,81 @@
       <el-row class="my-row">
         <el-col :span="12">
           <el-form-item label="编码">
-            <el-input v-model="dataForm.code" disabled placeholder="编码"></el-input>
+            <el-input v-model="dataForm.code"  placeholder="编码"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12" style="padding-left: 20px">
           <el-form-item label="模板">
-            <el-input v-model="dataForm.code" disabled placeholder="模板"></el-input>
+            <el-input v-model="dataForm.code"  placeholder="模板"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row class="my-row">
         <el-form-item label="备注">
-            <el-input v-model="dataForm.code" disabled placeholder="备注"></el-input>
+            <el-input v-model="dataForm.code"  placeholder="备注"></el-input>
           </el-form-item>
       </el-row>
+      <el-row>
+        <el-table
+          :data="dataList"
+          border
+          style="width: 100%;">
+          <el-table-column
+            label="序号"
+            type="index"
+            width="50"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="-"
+            header-align="center"
+            align="center"
+            label="物品名称">
+          </el-table-column>
+          <el-table-column
+            prop="recordType"
+            header-align="center"
+            align="center"
+            label="规格">
+          </el-table-column>
+          <el-table-column
+            prop="state"
+            header-align="center"
+            align="center"
+            label="数量">
+          </el-table-column>
+          <el-table-column
+            prop="approver"
+            header-align="center"
+            align="center"
+            label="单位">
+          </el-table-column>
+          <el-table-column
+            prop="-"
+            header-align="center"
+            align="center"
+            label="仓库库存数量">
+          </el-table-column>
+          <el-table-column
+            prop="-"
+            header-align="center"
+            align="center"
+            label="请选择数量">
+          </el-table-column>
+          <el-table-column
+            prop="-"
+            header-align="center"
+            align="center"
+            label="未出库数量">
+          </el-table-column>
+          <el-table-column
+            prop="-"
+            header-align="center"
+            align="center"
+            label="备注">
+          </el-table-column>
+        </el-table>
+      </el-row>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取消</el-button>
@@ -41,26 +102,12 @@
       return {
         visible: false,
         dictType: 'material_type',
-        dataForm: [{
+        dataList: [],
+        dataForm: {
           id: '',
           amount: 0,
-          applicant: '',
-          approver: '',
-          batchNumber: '',
-          cnt: '',
-          materialId: '',
-          materialName: '',
-          notes: '',
-          orgId: '',
-          price: '',
-          recordType: '',
-          source: '',
-          state: 0,
-          templateItemPlanId: '',
-          usage: '',
-          userId: '',
-          orgName: ''
-        }],
+          applicant: ''
+        },
         dataRule: {
         }
       }
@@ -68,37 +115,7 @@
     methods: {
       init () {
         this.visible = true
-        this.dataForm = []
-        this.addOne()
-      },
-      addOne () {
-        this.dataForm.push({
-          id: '',
-          code: getUUID(),
-          amount: 0,
-          applicant: '',
-          approver: '',
-          batchNumber: '',
-          cnt: '',
-          materialId: '',
-          materialName: '',
-          notes: '',
-          orgId: '',
-          price: '',
-          recordType: '',
-          source: '',
-          state: 0,
-          templateItemPlanId: '',
-          usage: '',
-          userId: '',
-          orgName: ''
-        })
-      },
-      removeOne (index) {
-        this.dataForm.splice(index, 1)
-        if (this.dataForm.length === 0) {
-          this.addOne()
-        }
+        this.dataForm.code = getUUID()
       },
       // 表单提交
       dataFormSubmit () {

+ 5 - 11
src/views/modules/warehouse/template-delivery.vue

@@ -16,6 +16,7 @@
       </el-form-item>
       <el-form-item>
         <el-button @click="getDataList()">查询</el-button>
+        <el-button @click="inBound()">新增</el-button>
       </el-form-item>
     </el-form>
     <el-table
@@ -88,17 +89,16 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
     <!--    入库-->
-    <template-delivery-look v-if="inboundVisible" ref="inbound" @refreshDataList="getDataList"></template-delivery-look>
-    <stock-order-outbound v-if="outboundVisible" ref="outbound" @refreshDataList="getDataList"></stock-order-outbound>
+    <template-delivery-add v-if="inboundVisible" ref="inbound" @refreshDataList="getDataList"></template-delivery-add>
+    <!-- <stock-order-outbound v-if="outboundVisible" ref="outbound" @refreshDataList="getDataList"></stock-order-outbound> -->
   </div>
 </template>
 
 <script>
-  import templateDeliveryLook from './template-delivery-look'
-  import StockOrderOutbound from './stock-order-outbound'
+  import templateDeliveryAdd from './template-delivery-add'
   export default {
     name: 'stock-order',
-    components: {templateDeliveryLook, StockOrderOutbound},
+    components: {templateDeliveryAdd},
     data () {
       return {
         inboundVisible: false,
@@ -176,12 +176,6 @@
         this.$nextTick(() => {
           this.$refs.inbound.init()
         })
-      },
-      outBound () {
-        this.outboundVisible = true
-        this.$nextTick(() => {
-          this.$refs.outbound.init()
-        })
       }
     }
   }

+ 175 - 2
src/views/modules/warehouse/template.vue

@@ -1,10 +1,183 @@
 <template>
-    <div>模板管理</div>
+  <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-date-picker
+          v-model="dataForm.date"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="getDataList()">查询</el-button>
+        <el-button @click="inBound()">新增</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      @selection-change="selectionChangeHandle"
+      style="width: 100%;">
+      <el-table-column
+        label="序号"
+        type="index"
+        width="50"
+        align="center">
+      </el-table-column>
+      <el-table-column
+        prop="-"
+        header-align="center"
+        align="center"
+        label="编码">
+      </el-table-column>
+      <el-table-column
+        prop="recordType"
+        header-align="center"
+        align="center"
+        label="模板名称">
+      </el-table-column>
+      <el-table-column
+        prop="state"
+        header-align="center"
+        align="center"
+        label="当前状态">
+      </el-table-column>
+      <el-table-column
+        prop="approver"
+        header-align="center"
+        align="center"
+        label="原因">
+      </el-table-column>
+      <el-table-column
+        prop="-"
+        header-align="center"
+        align="center"
+        label="创建时间">
+      </el-table-column>
+      <el-table-column
+        prop="-"
+        header-align="center"
+        align="center"
+        label="备注">
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="150"
+        label="操作">
+        <template slot-scope="scope">
+          <el-button v-if="isAuth('wh:inbound-record-ctl:info')" type="text" size="small" @click="details(scope.row.id)">查看</el-button>
+          <el-button type="text" size="small" @click="exportItem(scope.row.id)">出库</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+    <!--    入库-->
+    <template-delivery-add v-if="inboundVisible" ref="inbound" @refreshDataList="getDataList"></template-delivery-add>
+    <!-- <stock-order-outbound v-if="outboundVisible" ref="outbound" @refreshDataList="getDataList"></stock-order-outbound> -->
+  </div>
 </template>
 
 <script>
+  import templateDeliveryAdd from './template-delivery-add'
   export default {
-    name: 'template'
+    name: 'stock-order',
+    components: {templateDeliveryAdd},
+    data () {
+      return {
+        inboundVisible: false,
+        outboundVisible: false,
+        dataForm: {
+          name: '',
+          date: ''
+        },
+        recordTypeOptions: [
+          {
+            value: null,
+            label: '请选择'
+          },
+          {
+            value: '0',
+            label: '入库'
+          },
+          {
+            value: '1',
+            label: '出库'
+          }
+        ],
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false,
+        dataListSelections: []
+      }
+    },
+    methods: {
+      // 获取数据列表
+      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}) => {
+          if (data && data.code === '200') {
+            this.dataList = data.data.records
+            this.totalPage = Number(data.data.total)
+          } else {
+            this.dataList = []
+            this.totalPage = 0
+          }
+          this.dataListLoading = false
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+      // 多选
+      selectionChangeHandle (val) {
+        this.dataListSelections = val
+      },
+      // 入库申请
+      inBound () {
+        this.inboundVisible = true
+        this.$nextTick(() => {
+          this.$refs.inbound.init()
+        })
+      }
+    }
   }
 </script>