|
@@ -22,47 +22,6 @@
|
|
|
:accordion="true"
|
|
|
@getValue="(value, label) => {searchForm.wareHouseType=value}"/>
|
|
|
</el-form-item>
|
|
|
-<!-- <el-form-item label="入库人" prop="wareHouseMan">-->
|
|
|
-<!-- <UserSelect :limit='1' :userName="searchForm.wareHouseMan" @getValue='(value, label) => {searchForm.wareHouseMan = label}'></UserSelect>-->
|
|
|
-<!--<!– <SelectUserTree–>-->
|
|
|
-<!--<!– ref="companyTree"–>-->
|
|
|
-<!--<!– :props="{–>-->
|
|
|
-<!--<!– value: 'id', // ID字段名–>-->
|
|
|
-<!--<!– label: 'name', // 显示名称–>-->
|
|
|
-<!--<!– children: 'children' // 子级字段名–>-->
|
|
|
-<!--<!– }"–>-->
|
|
|
-<!--<!– :url="`/sys/user/treeUserDataAllOffice?type=2`"–>-->
|
|
|
-<!--<!– :value="searchForm.wareHouseMan"–>-->
|
|
|
-<!--<!– :clearable="true"–>-->
|
|
|
-<!--<!– :accordion="true"–>-->
|
|
|
-<!--<!– @getValue="(value) => {searchForm.wareHouseMan=value}"/>–>-->
|
|
|
-<!-- </el-form-item>-->
|
|
|
-<!-- <el-form-item prop="wareHouseManOffice" label="入库人部门">-->
|
|
|
-<!-- <SelectTree-->
|
|
|
-<!-- ref="officeTree"-->
|
|
|
-<!-- :props="{-->
|
|
|
-<!-- value: 'id', // ID字段名-->
|
|
|
-<!-- label: 'name', // 显示名称-->
|
|
|
-<!-- children: 'children' // 子级字段名-->
|
|
|
-<!-- }"-->
|
|
|
-
|
|
|
-<!-- :url="`/sys/office/treeData?type=1`"-->
|
|
|
-<!-- :value="searchForm.wareHouseManOffice"-->
|
|
|
-<!-- :accordion="true"-->
|
|
|
-<!-- @getValue="(value) => {searchForm.wareHouseManOffice=value}"/>-->
|
|
|
-<!-- </el-form-item>-->
|
|
|
-<!-- <el-form-item label="入库时间" prop="wareHouseDates">-->
|
|
|
-<!-- <el-date-picker-->
|
|
|
-<!-- placement="bottom-start"-->
|
|
|
-<!-- format="yyyy-MM-dd HH:mm:ss"-->
|
|
|
-<!-- value-format="yyyy-MM-dd HH:mm:ss"-->
|
|
|
-<!-- v-model="searchForm.wareHouseDates"-->
|
|
|
-<!-- type="datetimerange"-->
|
|
|
-<!-- range-separator="至"-->
|
|
|
-<!-- start-placeholder="开始日期"-->
|
|
|
-<!-- end-placeholder="结束日期">-->
|
|
|
-<!-- </el-date-picker>-->
|
|
|
-<!-- </el-form-item>-->
|
|
|
|
|
|
<el-form-item>
|
|
|
<el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
|
|
@@ -89,9 +48,6 @@
|
|
|
:data="dataList"
|
|
|
:checkbox-config="{}">
|
|
|
<vxe-column type="seq" width="60" title="序号"></vxe-column>
|
|
|
-<!-- <vxe-column min-width="160" align="center" title="入库编号" field="wareHouseNumber"></vxe-column>-->
|
|
|
-<!-- <vxe-column min-width="160" align="center" title="入库人" field="wareHouseManName"></vxe-column>-->
|
|
|
-<!-- <vxe-column min-width="160" align="center" title="入库部门" field="wareHouseManOfficeName"></vxe-column>-->
|
|
|
<vxe-column min-width="160" align="center" title="入库类型" field="wareHouseTypeName"></vxe-column>
|
|
|
<vxe-column min-width="160" align="center" title="商品名称" field="tradeName">
|
|
|
<template slot-scope="scope">
|
|
@@ -104,7 +60,6 @@
|
|
|
<vxe-column min-width="160" align="center" title="领用量" field="borrowNumber"></vxe-column>
|
|
|
<vxe-column min-width="160" align="center" title="剩余量" field="tradeNumber"></vxe-column>
|
|
|
<vxe-column min-width="160" align="center" title="单位" field="company"></vxe-column>
|
|
|
-<!-- <vxe-column min-width="160" align="center" title="入库时间" field="wareHouseDate"></vxe-column>-->
|
|
|
|
|
|
</vxe-table>
|
|
|
<vxe-pager
|
|
@@ -117,9 +72,6 @@
|
|
|
:layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
|
|
|
@page-change="currentChangeHandle">
|
|
|
</vxe-pager>
|
|
|
- <WareHouseAddForm ref="wareHouseAddForm" @refreshList="refreshList"></WareHouseAddForm>
|
|
|
- <WareHouseHistory ref="wareHouseHistory"></WareHouseHistory>
|
|
|
- <WareHouseHistoryPopup ref="wareHouseHistoryPopup"></WareHouseHistoryPopup>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -127,9 +79,6 @@
|
|
|
|
|
|
<script>
|
|
|
import UserSelect from '@/components/userSelect'
|
|
|
- import WareHouseAddForm from '../wareHouse/WareHouseAddForm'
|
|
|
- import WareHouseHistory from './WareHouseHistory'
|
|
|
- import WareHouseHistoryPopup from './WareHouseHistoryPopup'
|
|
|
import InputNumber from '@/views/modules/cw/workContract/InputNumber.vue'
|
|
|
import SelectTree from '@/components/treeSelect/treeSelect.vue'
|
|
|
import WorkClientService from '@/api/cw/workClientInfo/WorkClientService'
|
|
@@ -186,10 +135,7 @@
|
|
|
UserSelect,
|
|
|
InputNumber,
|
|
|
SelectUserTree,
|
|
|
- WareHouseHistory,
|
|
|
- WareHouseHistoryPopup,
|
|
|
- SelectTree,
|
|
|
- WareHouseAddForm
|
|
|
+ SelectTree
|
|
|
},
|
|
|
computed: {
|
|
|
userName () {
|