yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

完善盘点管理

master
yunuo970428 2 months ago
parent
054a1ece97
commit
ca35af1012
5 changed files with 973 additions and 1209 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 512
      yxt-as-ui/src/views/storage/stocktaking/index.vue
  2. 2
      yxt-as-ui/src/views/storage/stocktaking/stocktakingEditReport.vue
  3. 150
      yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeDetail.vue
  4. 284
      yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeList.vue
  5. 2
      yxt-as-ui/src/views/storage/stocktaking/stocktakingReportDetail.vue

512
yxt-as-ui/src/views/storage/stocktaking/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div v-show="viewState == 1"> <div v-show="viewState == 1">
<button-bar ref="btnbar" view-title="盘点列表" :btndisabled="btndisabled" @btnhandle="btnHandle" /> <button-bar ref="btnbar" view-title="盘点列表" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content"> <div class="main-content">
<div class="searchcon"> <div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow"> <el-button size="small" class="searchbtn" @click="clicksearchShow">
@ -10,28 +10,26 @@
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header"> <el-form :inline="true" class="tab-header">
<el-form-item label="部门名称"> <el-form-item label="部门名称">
<el-input v-model="queryParams.params.deptNmae" placeholder="" clearable /> <el-input v-model="queryParams.params.deptNmae" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="盘点编号"> <el-form-item label="盘点编号">
<el-input v-model="queryParams.params.billNo" placeholder="" clearable /> <el-input v-model="queryParams.params.billNo" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="生成日期"> <el-form-item label="生成日期">
<el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期" <el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"/>
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" /> <span style="padding: 0px 8px">至</span>
至 <el-date-picker v-model="queryParams.params.createEndTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"/>
<el-date-picker v-model="queryParams.params.createEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
</el-form-item> </el-form-item>
<el-form-item label="盘点状态"> <el-form-item label="盘点状态">
<el-select v-model="queryParams.params.checkState" placeholder="请选择" style="width: 200px;"> <el-select v-model="queryParams.params.checkState" placeholder="请选择" style="width: 200px;">
<el-option v-for="item in checkStateList" :key="item.sid" :label="item.name" :value="item.name" /> <el-option v-for="item in checkStateList" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="盘点人"> <el-form-item label="盘点人">
<el-input v-model="queryParams.params.createByName" placeholder="" clearable /> <el-input v-model="queryParams.params.createByName" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="监盘人"> <el-form-item label="监盘人">
<el-input v-model="queryParams.params.superviseName" placeholder="" clearable /> <el-input v-model="queryParams.params.superviseName" placeholder="" clearable/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="btn" style="text-align: center;"> <div class="btn" style="text-align: center;">
@ -47,17 +45,14 @@
<!-- End 项目列表头部 --> <!-- End 项目列表头部 -->
<!-- Start 项目列表 --> <!-- Start 项目列表 -->
<div class=""> <div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="selectionLineChangeHandle">
@selection-change="selectionLineChangeHandle"> <el-table-column fixed width="50" type="selection" align="center"/>
<el-table-column fixed width="50" type="selection" align="center" /> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" align="center" width="220"> <el-table-column fixed label="操作" align="center" width="220">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="toDetail(scope.row)">查看</el-button> <el-button type="primary" size="mini" @click="toDetail(scope.row)">查看</el-button>
<el-button type="primary" size="mini" v-show="scope.row.state=='0'" <el-button type="primary" size="mini" v-show="scope.row.state=='0'" @click="toEdit(scope.row)">办理</el-button>
@click="toEdit(scope.row)">办理</el-button> <el-button type="primary" size="mini" v-show="scope.row.state=='0'" @click="toReport(scope.row)">盘库报告</el-button>
<el-button type="primary" size="mini" v-show="scope.row.state=='0'"
@click="toReport(scope.row)">盘库报告</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="流程状态" width="120" align="center"> <el-table-column label="流程状态" width="120" align="center">
@ -66,150 +61,132 @@
<span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span> <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="deptName" label="部门" width="120" align="center" /> <el-table-column prop="deptName" label="部门" width="120" align="center"/>
<el-table-column prop="billNo" label="盘点编号" width="120" align="center" /> <el-table-column prop="billNo" label="盘点编号" width="120" align="center"/>
<el-table-column prop="createTime" label="生成日期" width="120" align="center" /> <el-table-column prop="createTime" label="生成日期" width="120" align="center"/>
<el-table-column prop="createByName" label="盘点人" width="120" align="center" /> <el-table-column prop="createByName" label="盘点人" width="120" align="center"/>
<el-table-column prop="superviseName" label="监盘人" width="120" align="center" /> <el-table-column prop="superviseName" label="监盘人" width="120" align="center"/>
<el-table-column prop="checkState" label="盘点状态" width="120" align="center" /> <el-table-column prop="checkState" label="盘点状态" width="120" align="center"/>
<el-table-column label="应盘" align="center"> <el-table-column label="应盘" align="center">
<el-table-column prop="bookCount" label="数量" align="center" width="100" /> <el-table-column prop="bookCount" label="数量" align="center" width="100"/>
<el-table-column prop="bookAmount" label="金额" align="center" width="100" /> <el-table-column prop="bookAmount" label="金额" align="center" width="100"/>
</el-table-column> </el-table-column>
<el-table-column label="实盘" align="center"> <el-table-column label="实盘" align="center">
<el-table-column prop="realCount" label="数量" align="center" width="100" /> <el-table-column prop="realCount" label="数量" align="center" width="100"/>
<el-table-column prop="realAmount" label="金额" align="center" width="100" /> <el-table-column prop="realAmount" label="金额" align="center" width="100"/>
</el-table-column> </el-table-column>
<el-table-column label="未盘" align="center"> <el-table-column label="未盘" align="center">
<el-table-column prop="notCount" label="数量" align="center" width="100" /> <el-table-column prop="notCount" label="数量" align="center" width="100"/>
<el-table-column prop="notAmount" label="金额" align="center" width="100" /> <el-table-column prop="notAmount" label="金额" align="center" width="100"/>
</el-table-column> </el-table-column>
<el-table-column label="盘盈" align="center"> <el-table-column label="盘盈" align="center">
<el-table-column prop="profitCount" label="数量" align="center" width="100" /> <el-table-column prop="profitCount" label="数量" align="center" width="100"/>
<el-table-column prop="profitAmount" label="金额" align="center" width="100" /> <el-table-column prop="profitAmount" label="金额" align="center" width="100"/>
</el-table-column> </el-table-column>
<el-table-column label="盘亏" align="center"> <el-table-column label="盘亏" align="center">
<el-table-column prop="loseCount" label="数量" align="center" width="100" /> <el-table-column prop="loseCount" label="数量" align="center" width="100"/>
<el-table-column prop="loseAmount" label="金额" align="center" width="100" /> <el-table-column prop="loseAmount" label="金额" align="center" width="100"/>
</el-table-column> </el-table-column>
<el-table-column label="盘损" align="center"> <el-table-column label="盘损" align="center">
<el-table-column prop="lossCount" label="数量" align="center" width="100" /> <el-table-column prop="lossCount" label="数量" align="center" width="100"/>
<el-table-column prop="lossAmount" label="金额" align="center" width="100" /> <el-table-column prop="lossAmount" label="金额" align="center" width="100"/>
</el-table-column> </el-table-column>
<el-table-column prop="remarks" label="备注" align="center" width="200" /> <el-table-column prop="remarks" label="备注" align="center" width="200"/>
</el-table> </el-table>
</div> </div>
<!-- End 项目列表 --> <!-- End 项目列表 -->
<div class="pages"> <div class="pages">
<div class="tit" /> <div class="tit"/>
<!-- 翻页 --> <!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div> </div>
</div> </div>
</div> </div>
<!-- 盘库 --> <!-- 盘库 -->
<stocktakingRackCodeList v-show="viewState == 2 " ref="divstocktak" @doback="resetState" @reloadlist="loadList" /> <stocktakingRackCodeList v-show="viewState == 2 " ref="divstocktak" @doback="resetState" @reloadlist="loadList"/>
<!-- 办理 --> <!-- 办理 -->
<stocktakingEditReport v-show="viewState == 3 " ref="divedit" @doback="resetState" @reloadlist="loadList" /> <stocktakingEditReport v-show="viewState == 3 " ref="divedit" @doback="resetState" @reloadlist="loadList"/>
<!-- 盘库报告 --> <!-- 盘库报告 -->
<stocktakingReportDetail v-show="viewState == 4 " ref="divreport" @doback="resetState" @reloadlist="loadList" /> <stocktakingReportDetail v-show="viewState == 4 " ref="divreport" @doback="resetState" @reloadlist="loadList"/>
<!--查看详情 --> <!--查看详情 -->
<stocktakingInfo v-show="viewState == 5" ref="divinfo" @doback="resetState" /> <stocktakingInfo v-show="viewState == 5" ref="divinfo" @doback="resetState"/>
<el-dialog title="新建盘点单" :visible.sync="dialogVisible" :before-close="handleClose"> <el-dialog title="新建盘点单" :visible.sync="dialogVisible" :before-close="handleClose">
<el-form ref="form_obj" class="formaddcopy02" :rules="rules" style="margin-top: -40px;" :model="formobj"> <el-form ref="form_obj" class="formaddcopy02" :rules="rules" style="margin-top: -40px;" :model="formobj">
<el-row class="first_row"> <el-row class="first_row">
<el-col :span="12"> <el-col :span="12">
<div class="span-sty">盘点人</div> <div class="span-sty">盘点人</div>
<el-form-item> <span class="addinputInfo addinputw">{{formobj.createByName}}</span></el-form-item> <el-form-item><span class="addinputInfo addinputw">{{ formobj.createByName }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty">生成日期</div> <div class="span-sty">生成日期</div>
<el-form-item> <span class="addinputInfo addinputw">{{formobj.createDate}}</span></el-form-item> <el-form-item><span class="addinputInfo addinputw">{{ formobj.createDate }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row class="first_row"> <el-row class="first_row">
<el-col :span="12"> <el-col :span="12">
<div class="span-sty"><span class="must">*</span> 盘点类型</div> <div class="span-sty"><span class="must">*</span> 盘点类型</div>
<el-form-item prop="checkTypeValue"> <el-form-item prop="checkTypeValue">
<el-select v-model="formobj.checkTypeValue" placeholder="请选择" class="addinputInfo addinputw" <el-select v-model="formobj.checkTypeValue" placeholder="请选择" class="addinputInfo addinputw" @change="selectStocktakTyp">
@change="selectStocktakTyp"> <el-option v-for="item in stocktakTypeList" :key="item.sid" :label="item.name" :value="item.sid"/>
<el-option v-for="item in stocktakTypeList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select> </el-select>
<!-- <el-select v-model="formobj.financeSid" placeholder="请选择" class="addinputInfo addinputw" filterable
multiple @change="selectFinance">
<el-option v-for="item in financeList" :key="item" :label="item.name" :value="item.sid"></el-option>
</el-select> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty"><span class="must">*</span> 监盘人</div> <div class="span-sty"><span class="must">*</span> 监盘人</div>
<el-form-item prop="superviseName"> <el-form-item prop="superviseName">
<el-select v-model="formobj.superviseName" placeholder="请选择" class="addinputInfo addinputw" <el-select v-model="formobj.superviseName" placeholder="请选择" class="addinputInfo addinputw" @change="selectFinance">
@change="selectFinance"> <el-option v-for="item in financeList" :key="item.sid" :label="item.name" :value="item.sid"/>
<el-option v-for="item in financeList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select> </el-select>
<!-- <el-select v-model="formobj.financeSid" placeholder="请选择" class="addinputInfo addinputw" filterable
multiple @change="selectFinance">
<el-option v-for="item in financeList" :key="item" :label="item.name" :value="item.sid"></el-option>
</el-select> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item><el-input v-model="formobj.remarks" placeholder="请填写" class="addinputInfo addinputw" <el-form-item>
clearable /> <el-input v-model="formobj.remarks" placeholder="请填写" class="addinputInfo addinputw" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title titleOne" v-show="showList=='1'"> <div class="title titleOne" v-show="showList=='1'">
<div>盘点库位</div> <div>盘点库位</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="seleRack()">选择库位</el-button> <el-button type="primary" size="mini" class="btntopblueline" @click="seleRack()">选择库位</el-button>
</div> </div>
<el-table v-loading="tableLoading" :data="formobj.dataList" border style="width: 100%" v-show="showList=='1'"> <el-table v-loading="tableLoading" :data="formobj.dataList" border style="width: 100%" v-show="showList=='1'">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" /> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" align="center" width="100"> <el-table-column fixed label="操作" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="toDeleted(scope.row)">删除</el-button> <el-button type="danger" size="mini" @click="toDeleted(scope.$index)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="warehouseName" label="仓库" align="center" /> <el-table-column prop="warehouseName" label="仓库" align="center"/>
<el-table-column prop="locationName" label="库区" align="center" /> <el-table-column prop="zoneName" label="区域" align="center"/>
<el-table-column prop="rackCode" label="库位" align="center" /> <el-table-column prop="locationName" label="库区" align="center"/>
<el-table-column prop="rackCode" label="库位" align="center"/>
</el-table> </el-table>
</el-form> </el-form>
<div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;"> <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
<el-button type="primary" style="margin-top: 20px;" @click="saveExamine">保 存</el-button> <el-button type="primary" style="margin-top: 20px;" @click="saveExamine">保 存</el-button>
<el-button type="primary" style="margin-top: 20px;" @click="handleClose">关 闭</el-button> <el-button type="primary" style="margin-top: 20px;" @click="handleClose">关 闭</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="选择盘点库位" :visible.sync="dialogVisible2" :before-close="handleClose2"> <el-dialog title="选择盘点库位" :visible.sync="dialogVisible2" :before-close="handleClose2">
<el-form ref="form_obj2" class="formaddcopy02" :rules="rules" style="margin-top: -40px;" :model="formobj"> <el-form ref="form_obj2" class="formaddcopy02" :rules="rules" style="margin-top: -40px;" :model="formobj">
<el-form :inline="true" class="tab-header"> <el-form :inline="true" class="tab-header">
<el-form-item label="仓库"> <el-form-item label="仓库">
<el-select v-model="dialogParams.params.warehouseName" placeholder="请选择仓库" @change="selectWarehouseChange" <el-select v-model="dialogParams.params.warehouseName" placeholder="请选择仓库" @change="selectWarehouseChange" style="width: 200px;">
style="width: 200px;"> <el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName" :value="item.sid"/>
<el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName" :value="item.sid" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="库区"> <el-form-item label="库区">
<el-select v-model="dialogParams.params.warehouseAreaName" placeholder="请选择库区" <el-select v-model="dialogParams.params.warehouseAreaName" placeholder="请选择库区" @change="selectWarehouseAreaChange" style="width: 200px;">
@change="selectWarehouseAreaChange" style="width: 200px;"> <el-option v-for="item in warehouseAreaList" :key="item.sid" :label="item.areaName" :value="item.sid"/>
<el-option v-for="item in warehouseAreaList" :key="item.sid" :label="item.areaName" :value="item.sid" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="库位"> <el-form-item label="库位">
<el-select v-model="dialogParams.params.warehouseRackCode" placeholder="请选择库位" style="width: 200px;" <el-select v-model="dialogParams.params.warehouseRackCode" placeholder="请选择库位" style="width: 200px;" @change="selectWarehouseRackChange">
@change="selectWarehouseRackChange">
<el-option v-for="item in warehouseRackList" :key="item.sid" :label="item.rackCode" :value="item.sid"> <el-option v-for="item in warehouseRackList" :key="item.sid" :label="item.rackCode" :value="item.sid">
</el-option> </el-option>
</el-select> </el-select>
@ -222,63 +199,52 @@
<div class="title titleOne" style="margin-top: 0px;"> <div class="title titleOne" style="margin-top: 0px;">
<div>库位列表</div> <div>库位列表</div>
</div> </div>
<el-table v-loading="tableLoading" :data="allWarehouseRackList" border style="width: 100%;" <el-table v-loading="tableLoading" :data="allWarehouseRackList" border style="width: 100%;" @selection-change="selectionWarehouseRack">
@selection-change="selectionWarehouseRack"> <el-table-column fixed width="50" type="selection" align="center"/>
<el-table-column fixed width="50" type="selection" align="center" /> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" /> <el-table-column prop="warehouseName" label="仓库" align="center"/>
<el-table-column prop="warehouseName" label="仓库" align="center" /> <el-table-column prop="locationName" label="库区" align="center"/>
<el-table-column prop="locationName" label="库区" align="center" /> <el-table-column prop="rackCode" label="库位" align="center"/>
<el-table-column prop="rackCode" label="库位" align="center" />
</el-table> </el-table>
<pagination v-show="allWarehouseRackList.length > 0" :total="dialogParams.total" <pagination v-show="allWarehouseRackList.length > 0" :total="dialogParams.total" :page.sync="dialogParams.current" :limit.sync="dialogParams.size" class="pagination" @pagination="seleRack"/>
:page.sync="dialogParams.current" :limit.sync="dialogParams.size" class="pagination" @pagination="seleRack" />
</el-form> </el-form>
<div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;"> <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
<el-button type="primary" style="margin-top: 20px;" @click="addRck">确 认</el-button> <el-button type="primary" style="margin-top: 20px;" @click="addRck">确 认</el-button>
<el-button type="primary" style="margin-top: 20px;" @click="handleClose2">关 闭</el-button> <el-button type="primary" style="margin-top: 20px;" @click="handleClose2">关 闭</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 流程审批记录 --> <!-- 流程审批记录 -->
<el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center> <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
:src="this.centerDialogVisible === true ? url :''"></iframe>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import req from '@/api/storage/stocktaking.js' import req from '@/api/storage/stocktaking.js'
import ButtonBar from '@/components/ButtonBar' import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye' import stocktakingAdd from './stocktakingAdd.vue'
import stocktakingAdd from './stocktakingAdd.vue' import stocktakingInfo from './stocktakingInfo.vue'
import stocktakingInfo from './stocktakingInfo.vue' import stocktakingRackCodeList from './stocktakingRackCodeList.vue'
import stocktakingRackCodeList from './stocktakingRackCodeList.vue' import stocktakingEditReport from './stocktakingEditReport.vue'
import stocktakingEditReport from './stocktakingEditReport.vue' import stocktakingReportDetail from './stocktakingReportDetail.vue'
import stocktakingReportDetail from './stocktakingReportDetail.vue' import { getAllRackByKQSid, getAllWarehouse, getWarehouseareas } from '@/api/Common/dictcommons'
import req2 from '@/api/warehouse/warehouse.js' import req4 from '@/api/warehouse/goodsShelves.js'
import req3 from '@/api/warehouse/warehouseArea.js' import {
import req4 from '@/api/warehouse/goodsShelves.js'
import {
getCurrentDate getCurrentDate
} from '@/utils/index.js' } from '@/utils/index.js'
import { import {
selAllByOrgSidPath selAllByOrgSidPath
} from '@/api/Common/dictcommons' } from '@/api/Common/dictcommons'
import { import {
getStorage getStorage
} from '@/utils/auth' } from '@/utils/auth'
export default { export default {
components: { components: {
ButtonBar, ButtonBar,
Pagination, Pagination,
pageye,
stocktakingAdd, stocktakingAdd,
stocktakingInfo, stocktakingInfo,
stocktakingRackCodeList, stocktakingRackCodeList,
@ -333,79 +299,73 @@
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
"deptNmae": "", deptNmae: '',
"billNo": "", billNo: '',
"createStartTime": "", createStartTime: '',
"createEndTime": "", createEndTime: '',
"checkState": "", checkState: '',
"createByName": "", createByName: '',
"superviseName": "", superviseName: '',
"warehouseTypeKey": "01" warehouseTypeKey: '01',
orgPath: '',
userSid: '',
menuUrl: ''
} }
}, },
sids: [], sids: [],
selectionList: [], selectionList: [],
checkStateList: [{ checkStateList: [
{
sid: '1', sid: '1',
name: '未完成' name: '盘点中'
}, },
{ {
sid: '2', sid: '2',
name: '已完成' name: '盘点完成'
} }
], ],
stocktakTypeList: [{ stocktakTypeList: [
{
sid: '1', sid: '1',
name: '月度抽盘' name: '月度抽盘'
}, },
{ {
sid: '2', sid: '2',
name: '季度全盘' name: '季度全盘'
}, }
], ],
formobj: { formobj: {
createByName: window.sessionStorage.getItem('name'), createByName: window.sessionStorage.getItem('name'),
createBySid: window.sessionStorage.getItem('userSid'), createBySid: window.sessionStorage.getItem('userSid'),
deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
.getItem('defaultOrgPath').lastIndexOf('/') + 1), deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
createDate: getCurrentDate(), createDate: getCurrentDate(),
checkTypeValue: '', checkTypeValue: '',
checkTypeKey: '', checkTypeKey: '',
superviseName: '', superviseName: '',
superviseSid: '', superviseSid: '',
remarks: "", remarks: '',
dataList: [], dataList: [],
"warehouseTypeKey": "01", warehouseTypeKey: '01',
"warehouseTypeValue": "配件库" warehouseTypeValue: '配件库'
}, },
financeList: [], financeList: [],
rules: { rules: {
checkTypeValue: [{ checkTypeValue: [{ required: true, message: '请选择盘点类型', trigger: 'change' }],
required: true, superviseName: [{ required: true, message: '请选择监盘人', trigger: 'change' }]
message: '请选择盘点类型',
trigger: 'change'
}],
superviseName: [{
required: true,
message: '请选择监盘人',
trigger: 'change'
}],
}, },
dialogParams: { dialogParams: {
current: 1, current: 1,
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
"warehouseSid": "", warehouseSid: '',
"warehouseName": "", warehouseName: '',
"warehouseAreaSid": "", warehouseAreaSid: '',
"warehouseAreaName": "", warehouseAreaName: '',
"warehouseRackSid": "", warehouseRackSid: '',
"warehouseRackCode": "", warehouseRackCode: '',
"warehouseTypeKey": "01", warehouseTypeKey: '01'
} }
}, },
warehouseList: [], warehouseList: [],
@ -422,21 +382,14 @@
}, },
created() { created() {
this.loadList() this.loadList()
selAllByOrgSidPath({ orgSidPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
selAllByOrgSidPath({
orgSidPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) { if (res.success) {
this.financeList = res.data this.financeList = res.data
} }
}) })
getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '配件库' }).then(resp => {
req2.getAllWarehouse({
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
}).then(resp => {
this.warehouseList = resp.data this.warehouseList = resp.data
}) })
}, },
methods: { methods: {
async handleMessage(event) { async handleMessage(event) {
@ -470,60 +423,34 @@
getWarehouseArea(sid) { getWarehouseArea(sid) {
this.dialogParams.params.warehouseAreaSid = '' this.dialogParams.params.warehouseAreaSid = ''
this.dialogParams.params.warehouseAreaName = '' this.dialogParams.params.warehouseAreaName = ''
getWarehouseareas({ ckSid: sid }).then(resp => {
var params = {
ckSid: sid
}
req3.getAllWarehouseareaBysid(params).then(resp => {
console.log('>>>>>>>>>getAllWarehousearea', resp)
this.warehouseAreaList = resp.data this.warehouseAreaList = resp.data
}).catch(() => {}) })
}, },
getAllTypeByAreaSid(sid) { getAllTypeByAreaSid(sid) {
this.dialogParams.params.warehouseRackSid = '' this.dialogParams.params.warehouseRackSid = ''
this.dialogParams.params.warehouseRackCode = '' this.dialogParams.params.warehouseRackCode = ''
getAllRackByKQSid({ kqSid: sid }).then(resp => {
var params = {
areaSid: sid
}
req4.getAllTypeByAreaSid(params).then(resp => {
console.log('>>>>>>>>>getAllTypeByAreaSid', resp)
this.warehouseRackList = resp.data this.warehouseRackList = resp.data
}).catch(() => {}) })
}, },
selectWarehouseChange(val) { selectWarehouseChange(val) {
const choose = this.warehouseList.filter((item) => item.sid == val) const choose = this.warehouseList.filter((item) => item.sid === val)
console.log('>>>>>>>>>selectWarehouseChange', choose)
this.dialogParams.params.warehouseSid = choose[0].sid this.dialogParams.params.warehouseSid = choose[0].sid
this.dialogParams.params.warehouseName = choose[0].warehouseName this.dialogParams.params.warehouseName = choose[0].warehouseName
this.getWarehouseArea(choose[0].sid) this.getWarehouseArea(choose[0].sid)
}, },
selectWarehouseAreaChange(val) { selectWarehouseAreaChange(val) {
const choose = this.warehouseAreaList.filter((item) => item.sid == val) const choose = this.warehouseAreaList.filter((item) => item.sid === val)
console.log('>>>>>>>>>selectWarehouseAreaChange', choose)
this.dialogParams.params.warehouseAreaSid = choose[0].sid this.dialogParams.params.warehouseAreaSid = choose[0].sid
this.dialogParams.params.warehouseAreaName = choose[0].areaName this.dialogParams.params.warehouseAreaName = choose[0].areaName
this.getAllTypeByAreaSid(choose[0].sid) this.getAllTypeByAreaSid(choose[0].sid)
}, },
selectWarehouseRackChange(val) { selectWarehouseRackChange(val) {
const choose = this.warehouseRackList.filter((item) => item.sid == val) const choose = this.warehouseRackList.filter((item) => item.sid === val)
console.log('>>>>>>>>>selectWarehouseRackChange', choose)
this.dialogParams.params.warehouseRackSid = choose[0].sid this.dialogParams.params.warehouseRackSid = choose[0].sid
this.dialogParams.params.warehouseRackCode = choose[0].rackCode this.dialogParams.params.warehouseRackCode = choose[0].rackCode
}, },
dialogDosearch() { dialogDosearch() {
this.dialogParams.current = 1 this.dialogParams.current = 1
this.seleRack() this.seleRack()
@ -534,26 +461,22 @@
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
"warehouseSid": "", warehouseSid: '',
"warehouseName": "", warehouseName: '',
"warehouseAreaSid": "", warehouseAreaSid: '',
"warehouseAreaName": "", warehouseAreaName: '',
"warehouseRackSid": "", warehouseRackSid: '',
"warehouseRackCode": "", warehouseRackCode: '',
"warehouseTypeKey": "01", warehouseTypeKey: '01'
} }
} }
this.seleRack() this.seleRack()
}, },
seleRack() { seleRack() {
this.dialogParams.params.userSid = window.sessionStorage.getItem('userSid') this.dialogParams.params.userSid = window.sessionStorage.getItem('userSid')
this.dialogParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') this.dialogParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.dialogParams.params.menuUrl = this.$route.path this.dialogParams.params.menuUrl = this.$route.path
req4.warehouserackListAll(this.dialogParams).then(resp => { req4.warehouserackListAll(this.dialogParams).then(resp => {
console.log('>>>>>>>>>warehouserackListAll', resp)
if (resp.success) { if (resp.success) {
const data = resp.data const data = resp.data
this.dialogParams.total = data.total this.dialogParams.total = data.total
@ -564,36 +487,29 @@
this.allWarehouseRackList = [] this.allWarehouseRackList = []
this.dialogParams.total = 0 this.dialogParams.total = 0
} }
}).catch(() => {
}).catch(() => {}) })
}, },
selectionWarehouseRack(val) { selectionWarehouseRack(val) {
console.log('>>>>>>>>>selectionWarehouseRack', val)
this.selectionWarehouseRackList = val this.selectionWarehouseRackList = val
}, },
addRck() { addRck() {
this.formobj.dataList = []
for (var i = 0; i < this.selectionWarehouseRackList.length; i++) { for (var i = 0; i < this.selectionWarehouseRackList.length; i++) {
var item = this.selectionWarehouseRackList[i] var item = this.selectionWarehouseRackList[i]
this.formobj.dataList.push(item) this.formobj.dataList.push(item)
} }
console.log('>>>>>>>>>addRck', this.formobj.dataList)
this.dialogParams = { this.dialogParams = {
current: 1, current: 1,
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
"warehouseSid": "", warehouseSid: '',
"warehouseName": "", warehouseName: '',
"warehouseAreaSid": "", warehouseAreaSid: '',
"warehouseAreaName": "", warehouseAreaName: '',
"warehouseRackSid": "", warehouseRackSid: '',
"warehouseRackCode": "", warehouseRackCode: '',
"warehouseTypeKey": "01", warehouseTypeKey: '01'
} }
} }
this.dialogVisible2 = false this.dialogVisible2 = false
@ -604,54 +520,34 @@
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
"warehouseSid": "", warehouseSid: '',
"warehouseName": "", warehouseName: '',
"warehouseAreaSid": "", warehouseAreaSid: '',
"warehouseAreaName": "", warehouseAreaName: '',
"warehouseRackSid": "", warehouseRackSid: '',
"warehouseRackCode": "", warehouseRackCode: '',
"warehouseTypeKey": "01", warehouseTypeKey: '01'
} }
} }
this.dialogVisible2 = false this.dialogVisible2 = false
}, },
toDeleted(row) { toDeleted(index) {
console.log('>>>>>>>>>toDeleted', row)
const index = this.formobj.dataList.findIndex((item) => item == row)
this.formobj.dataList.splice(index, 1) this.formobj.dataList.splice(index, 1)
}, },
selectStocktakTyp(val) { selectStocktakTyp(val) {
this.showList = val this.showList = val
console.log('>>>>>>>>>selectStocktakTyp', val)
const choose = this.stocktakTypeList.filter((item) => val.includes(item.sid)) const choose = this.stocktakTypeList.filter((item) => val.includes(item.sid))
console.log('>>>>>>>>>selectStocktakTyp', choose)
this.formobj.checkTypeValue = choose[0].name this.formobj.checkTypeValue = choose[0].name
this.formobj.checkTypeKey = choose[0].sid this.formobj.checkTypeKey = choose[0].sid
}, },
selectFinance(val) { selectFinance(val) {
console.log('>>>>>>>>>selectFinance', val)
const choose = this.financeList.filter((item) => val.includes(item.sid)) const choose = this.financeList.filter((item) => val.includes(item.sid))
console.log('>>>>>>>>>selectFinance', choose)
this.formobj.superviseName = choose[0].name this.formobj.superviseName = choose[0].name
this.formobj.superviseSid = choose[0].sid this.formobj.superviseSid = choose[0].sid
// this.formobj.finances = []
// for (var i = 0; i < choose.length; i++) {
// this.formobj.finances.push({
// name: choose[i].name,
// sid: choose[i].sid
// })
// }
}, },
handleClose() { handleClose() {
this.dialogVisible = false this.dialogVisible = false
this.showList = "2" this.showList = '2'
this.formobj.checkTypeValue = '' this.formobj.checkTypeValue = ''
this.formobj.checkTypeKey = '' this.formobj.checkTypeKey = ''
this.formobj.superviseName = '' this.formobj.superviseName = ''
@ -660,14 +556,11 @@
this.formobj.dataList = [] this.formobj.dataList = []
}, },
saveExamine() { saveExamine() {
console.log('>>>>>>>>>saveExamine', this.formobj)
this.formobj.rackSids = [] this.formobj.rackSids = []
for (var i = 0; i < this.formobj.dataList.length; i++) { for (var i = 0; i < this.formobj.dataList.length; i++) {
var item = this.formobj.dataList[i] var item = this.formobj.dataList[i]
this.formobj.rackSids.push(item.sid) this.formobj.rackSids.push(item.sid)
} }
this.$refs['form_obj'].validate((valid) => { this.$refs['form_obj'].validate((valid) => {
if (valid) { if (valid) {
req.createBill(this.formobj).then((resp) => { req.createBill(this.formobj).then((resp) => {
@ -680,7 +573,8 @@
this.handleClose() this.handleClose()
this.loadList() this.loadList()
} }
}).catch(() => {}) }).catch(() => {
})
} }
}) })
}, },
@ -731,19 +625,7 @@
}).catch(() => { }).catch(() => {
this.tableLoading = false this.tableLoading = false
}) })
// this.$http({
// method: "post",
// url: "http://127.0.0.1:4523/mock/430173/user/list",
// params: this.queryParams,
// }).then((resp) => {
// const data = resp.data
// this.queryParams.total = data.total
// this.dataList = data.records
// });
}, },
// 序号 // 序号
indexMethod(index) { indexMethod(index) {
var pagestart = (this.queryParams.current - 1) * this.queryParams.size var pagestart = (this.queryParams.current - 1) * this.queryParams.size
@ -760,23 +642,22 @@
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
"deptNmae": "", deptNmae: '',
"billNo": "", billNo: '',
"createStartTime": "", createStartTime: '',
"createEndTime": "", createEndTime: '',
"checkState": "", checkState: '',
"createByName": "", createByName: '',
"superviseName": "", superviseName: '',
"warehouseTypeKey": "01", warehouseTypeKey: '01',
orgPath: '',
userSid: '',
menuUrl: ''
} }
} }
this.loadList() this.loadList()
}, },
toAdd() { toAdd() {
// this.viewState = 2
// this.$refs['divadd'].showAdd()
this.dialogVisible = true this.dialogVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
@ -799,8 +680,7 @@
this.$refs['divinfo'].showDetail(row.sid) this.$refs['divinfo'].showDetail(row.sid)
}, },
toShowBill() { toShowBill() {
if (this.selectionList.length !== 1) {
if (this.selectionList.length != 1) {
this.$message({ this.$message({
type: 'warning', type: 'warning',
message: '请选择一条数据。', message: '请选择一条数据。',
@ -808,12 +688,11 @@
}) })
return return
} }
this.viewState = 2 this.viewState = 2
this.$refs['divstocktak'].showDetail(this.selectionList[0].sid) this.$refs['divstocktak'].showDetail(this.selectionList[0].sid)
}, },
toStocktak() { toStocktak() {
if (this.selectionList.length != 1) { if (this.selectionList.length !== 1) {
this.$message({ this.$message({
type: 'warning', type: 'warning',
message: '请选择一条数据。', message: '请选择一条数据。',
@ -831,18 +710,16 @@
return return
} }
this.$confirm("请确认是否盘点完毕，生成盘点报告后将不能再盘点！", "提示", { this.$confirm('请确认是否盘点完毕，生成盘点报告后将不能再盘点！', '提示', {
// iconClass: "el-icon-question", //自定义图标样式 // iconClass: "el-icon-question", //自定义图标样式
confirmButtonText: "确认", //确认按钮文字更换 confirmButtonText: '确认',
cancelButtonText: "取消", //取消按钮文字更换 cancelButtonText: '取消',
showClose: true, //是否显示右上角关闭按钮 showClose: true,
type: "warning", //提示类型 success/info/warning/error type: 'warning'
}).then(() => { }).then(() => {
//确认操作
var params = { var params = {
sid: this.selectionList[0].sid sid: this.selectionList[0].sid
} }
req.billCreateReport(params).then((resp) => { req.billCreateReport(params).then((resp) => {
if (resp.success) { if (resp.success) {
this.$message({ this.$message({
@ -850,24 +727,18 @@
message: '操作成功', message: '操作成功',
showClose: true showClose: true
}) })
this.loadList() this.loadList()
} }
}).catch(() => {})
}).catch(() => { }).catch(() => {
//取消操作 })
}); }).catch(() => {
})
}, },
toEdit(row) { toEdit(row) {
this.viewState = 3 this.viewState = 3
this.$refs['divedit'].showEdit(row) this.$refs['divedit'].showEdit(row)
}, },
toReport(row) { toReport(row) {
this.viewState = 4 this.viewState = 4
this.$refs['divreport'].showDetail(row) this.$refs['divreport'].showDetail(row)
}, },
@ -875,54 +746,53 @@
this.$store.dispatch('tagsView/delView', this.$route) this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1) this.$router.go(-1)
}, },
resetState() { resetState() {
this.viewState = 1 this.viewState = 1
} }
} }
} }
</script> </script>
<style scoped> <style scoped>
/deep/ .el-form-item__error { /deep/ .el-form-item__error {
margin-left: 120px !important; margin-left: 120px !important;
} }
.must { .must {
color: #f00; color: #f00;
} }
.span-sty { .span-sty {
width: 90px !important; width: 90px !important;
} }
.addinputInfo { .addinputInfo {
margin-left: 80px !important; margin-left: 80px !important;
} }
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw { .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 80px !important; margin-left: 80px !important;
width: calc(100% - 70px); width: calc(100% - 70px);
} }
.first_row { .first_row {
border-top: 1px solid #E0E3EB; border-top: 1px solid #E0E3EB;
} }
.titleOne { .titleOne {
padding: 7px; padding: 7px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
/deep/ .el-form-item__error { /deep/ .el-form-item__error {
margin-left: 180px !important; margin-left: 180px !important;
} }
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group { .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline; display: inline;
line-height: 1px; line-height: 1px;
vertical-align: middle; vertical-align: middle;
} }
</style> </style>

2
yxt-as-ui/src/views/storage/stocktaking/stocktakingEditReport.vue
View File

@ -127,7 +127,7 @@
</div> </div>
<el-table :data="formobj.arehouseAreaeStocktakList" :index="index" border style="width: 100%;"> <el-table :data="formobj.arehouseAreaeStocktakList" :index="index" border style="width: 100%;">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" /> <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="warehouseAreaeName" label="仓库-库区" width="200" align="center" /> <el-table-column prop="warehouseAreaeName" label="仓库-区域-库区" width="200" align="center" />
<el-table-column prop="ypNum" label="应盘" align="center" /> <el-table-column prop="ypNum" label="应盘" align="center" />
<el-table-column prop="ypMoney" label="应盘金额" align="center" /> <el-table-column prop="ypMoney" label="应盘金额" align="center" />
<el-table-column prop="spNum" label="实盘" align="center" /> <el-table-column prop="spNum" label="实盘" align="center" />

150
yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeDetail.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div v-show="viewState == 1"> <div v-show="viewState == 1">
<button-bar ref="btnbar" view-title="库位商品盘点明细" :btndisabled="btndisabled" @btnhandle="btnHandle" /> <button-bar ref="btnbar" view-title="库位商品盘点明细" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content"> <div class="main-content">
<div class="searchcon"> <div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow"> <el-button size="small" class="searchbtn" @click="clicksearchShow">
@ -10,13 +10,13 @@
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header"> <el-form :inline="true" class="tab-header">
<el-form-item label="商品ID"> <el-form-item label="商品ID">
<el-input v-model="queryParams.params.goodsID" placeholder="" clearable /> <el-input v-model="queryParams.params.goodsID" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="商品名称"> <el-form-item label="商品名称">
<el-input v-model="queryParams.params.goodsSkuTitle" placeholder="" clearable /> <el-input v-model="queryParams.params.goodsSkuTitle" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="商品图号"> <el-form-item label="商品图号">
<el-input v-model="queryParams.params.goodsSkuCode" placeholder="" clearable /> <el-input v-model="queryParams.params.goodsSkuCode" placeholder="" clearable/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="btn" style="text-align: center;"> <div class="btn" style="text-align: center;">
@ -33,72 +33,64 @@
<!-- Start 项目列表 --> <!-- Start 项目列表 -->
<div class=""> <div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"> <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" /> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column prop="goodsID" label="商品ID" width="120" align="center" /> <el-table-column prop="goodsID" label="商品ID" width="120" align="center"/>
<el-table-column prop="goodsSkuTitle" label="商品名称" width="120" align="center" /> <el-table-column prop="goodsSkuTitle" label="商品名称" width="120" align="center"/>
<el-table-column prop="goodsSkuCode" label="图号" width="120" align="center" /> <el-table-column prop="goodsSkuCode" label="图号" width="120" align="center"/>
<el-table-column prop="warehouseName" label="仓库" width="120" align="center" /> <el-table-column prop="warehouseName" label="仓库" width="120" align="center"/>
<el-table-column prop="warehouseArea" label="库区" width="120" align="center" /> <el-table-column prop="zoneName" label="区域" width="120" align="center"/>
<el-table-column prop="warehouseRackName" label="库位" width="120" align="center" /> <el-table-column prop="warehouseArea" label="库区" width="120" align="center"/>
<el-table-column prop="unit" label="单位" width="120" align="center" /> <el-table-column prop="warehouseRackName" label="库位" width="120" align="center"/>
<el-table-column prop="cost" label="单价" width="120" align="center" /> <el-table-column prop="unit" label="单位" width="120" align="center"/>
<el-table-column prop="bookCount" label="库存数量" width="120" align="center" /> <el-table-column prop="cost" label="单价" width="120" align="center"/>
<el-table-column prop="bookAmount" label="库存金额" width="120" align="center" /> <el-table-column prop="bookCount" label="库存数量" width="120" align="center"/>
<el-table-column prop="realCount" label="实盘数量" width="120" align="center" /> <el-table-column prop="bookAmount" label="库存金额" width="120" align="center"/>
<el-table-column prop="realCount" label="实盘金额" width="120" align="center" /> <el-table-column prop="realCount" label="实盘数量" width="120" align="center"/>
<el-table-column prop="state" label="状态" width="120" align="center" /> <el-table-column prop="realAmount" label="实盘金额" width="120" align="center"/>
<el-table-column prop="profitAndLoseCount" label="亏盈数" width="120" align="center" /> <el-table-column prop="state" label="状态" width="120" align="center"/>
<el-table-column prop="profitAndLoseAmount" label="盈亏金额" width="120" align="center" /> <el-table-column prop="profitAndLoseCount" label="亏盈数" width="120" align="center"/>
<el-table-column prop="lossCount" label="盘损数量" width="120" align="center" /> <el-table-column prop="profitAndLoseAmount" label="亏盈金额" width="120" align="center"/>
<el-table-column prop="lossAmount" label="盘损金额" width="120" align="center" /> <el-table-column prop="lossCount" label="盘损数量" width="120" align="center"/>
<el-table-column prop="remarks" label="备注" align="center" width="200" /> <el-table-column prop="lossAmount" label="盘损金额" width="120" align="center"/>
<el-table-column prop="remarks" label="备注" align="center" width="200"/>
<el-table-column label="附件" align="center"> <el-table-column label="附件" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="color: #1890FF; text-decoration: underline ;" @click="showImage(scope.row.fillPaths)"> <span class="bluezi" @click="showImage(scope.row.fillPaths)">查看</span>
查看
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<!-- End 项目列表 --> <!-- End 项目列表 -->
<div class="pages"> <div class="pages">
<div class="tit" /> <div class="tit"/>
<!-- 翻页 --> <!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div> </div>
</div> </div>
</div> </div>
<el-dialog title="附件" :visible.sync="dialogVisible" :before-close="handleClose"> <el-dialog title="附件" :visible.sync="dialogVisible" :before-close="handleClose">
<el-form ref="dataForm1" class="formadd" style="margin-top: -30px;"> <el-form ref="dataForm1" class="formadd" style="margin-top: -30px;">
<el-row class="first_row"> <el-row class="first_row">
<el-col :span="24" class="trightb"> <el-col :span="24" class="trightb">
<el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;" <el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;" v-for="(item, index) in fileList" :key="index" :src="item.url" :preview-src-list="[item]">
v-for="(item,index) in fileList" :src="item.url" :preview-src-list="[item]">
</el-image> </el-image>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import req from '@/api/storage/stocktaking.js' import req from '@/api/storage/stocktaking.js'
import ButtonBar from '@/components/ButtonBar' import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
export default { export default {
components: { components: {
ButtonBar, ButtonBar,
Pagination, Pagination
pageye,
}, },
data() { data() {
return { return {
@ -121,23 +113,20 @@
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
"billSid": "", billSid: '',
"warehouseRackSid": "", warehouseRackSid: '',
"goodsID": "", goodsID: '',
"goodsSkuTitle": "", goodsSkuTitle: '',
"goodsSkuCode": "" goodsSkuCode: ''
} }
}, },
billSid: "", billSid: '',
warehouseRackSid: "", warehouseRackSid: '',
fileList: [] fileList: []
} }
}, },
mounted() { mounted() {
this.$refs['btnbar'].setButtonList(this.btnList) this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
}, },
methods: { methods: {
showImage(paths) { showImage(paths) {
@ -208,64 +197,23 @@
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
"billSid": this.billSid, billSid: this.billSid,
"warehouseRackSid": this.warehouseRackSid, warehouseRackSid: this.warehouseRackSid,
"goodsID": "", goodsID: '',
"goodsSkuTitle": "", goodsSkuTitle: '',
"goodsSkuCode": "" goodsSkuCode: ''
} }
} }
this.loadList() this.loadList()
}, },
close() { close() {
this.$emit('doback') this.$emit('doback')
},
} }
} }
}
</script> </script>
<style scoped> <style scoped>
/deep/ .el-form-item__error { .first_row {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 90px !important;
}
.addinputInfo {
margin-left: 80px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 80px !important;
width: calc(100% - 70px);
}
.first_row {
border-top: 1px solid #E0E3EB; border-top: 1px solid #E0E3EB;
} }
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
/deep/ .el-form-item__error {
margin-left: 180px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
</style> </style>

284
yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeList.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div v-show="viewState == 1"> <div v-show="viewState == 1">
<button-bar ref="btnbar" view-title="盘库明细" :btndisabled="btndisabled" @btnhandle="btnHandle" /> <button-bar ref="btnbar" view-title="盘库明细" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content"> <div class="main-content">
<div class="searchcon"> <div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow"> <el-button size="small" class="searchbtn" @click="clicksearchShow">
@ -10,24 +10,26 @@
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header"> <el-form :inline="true" class="tab-header">
<el-form-item label="仓库"> <el-form-item label="仓库">
<el-select v-model="queryParams.params.warehouseName" placeholder="请选择仓库" <el-select v-model="queryParams.params.warehouseName" filterable clearable placeholder="请选择" style="width:100%" @change="selectWarehouseName">
@change="selectWarehouseChange"> <el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName" :value="item.sid">
<el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName" </el-option>
:value="item.sid" /> </el-select>
</el-form-item>
<el-form-item label="区域">
<el-select v-model="queryParams.params.zoneName" filterable clearable placeholder="请选择" @change="selectWareZoneName">
<el-option v-for="item in warehouseZoneList" :key="item.sid" :label="item.zoneName" :value="item.sid">
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="库区"> <el-form-item label="库区">
<el-select v-model="queryParams.params.warehouseAreaName" placeholder="请选择库区" <el-select v-model="queryParams.params.warehouseAreaName" filterable clearable placeholder="请选择" @change="selectWareAreaName">
@change="selectWarehouseAreaChange"> <el-option v-for="item in wareAreaList" :key="item.sid" :label="item.areaName" :value="item.sid">
<el-option v-for="item in warehouseAreaList" :key="item.sid" :label="item.areaName" </el-option>
:value="item.sid" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="库位"> <el-form-item label="库位">
<el-select v-model="queryParams.params.warehouseRackName" placeholder="请选择库位" <el-select v-model="queryParams.params.warehouseRackCode" filterable clearable placeholder="请选择" style="width:100%">
@change="selectWarehouseRackChange"> <el-option v-for="item in warehouseRackList" :key="item.rackCode" :label="item.rackCode" :value="item.rackCode">
<el-option v-for="item in warehouseRackList" :key="item.sid" :label="item.rackName"
:value="item.sid">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -46,69 +48,66 @@
<!-- Start 项目列表 --> <!-- Start 项目列表 -->
<div class=""> <div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"> <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" /> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" align="center" width="100"> <el-table-column fixed label="操作" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="toDetail(scope.row)">查看</el-button> <el-button type="primary" size="mini" @click="toDetail(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="warehouseName" label="仓库" width="120" align="center" /> <el-table-column prop="warehouseName" label="仓库" width="120" align="center"/>
<el-table-column prop="warehouseArea" label="库区" width="120" align="center" /> <el-table-column prop="zoneName" label="区域" width="120" align="center"/>
<el-table-column prop="warehouseRackName" label="库位" width="120" align="center" /> <el-table-column prop="warehouseArea" label="库区" width="120" align="center"/>
<el-table-column prop="warehouseRackName" label="库位" width="120" align="center"/>
<el-table-column label="应盘" align="center"> <el-table-column label="应盘" align="center">
<el-table-column prop="bookCount" label="数量" align="center" width="100" /> <el-table-column prop="bookCount" label="数量" align="center" width="100"/>
<el-table-column prop="bookAmount" label="金额" align="center" width="100" /> <el-table-column prop="bookAmount" label="金额" align="center" width="100"/>
</el-table-column> </el-table-column>
<el-table-column label="实盘" align="center"> <el-table-column label="实盘" align="center">
<el-table-column prop="realCount" label="数量" align="center" width="100" /> <el-table-column prop="realCount" label="数量" align="center" width="100"/>
<el-table-column prop="realAmount" label="金额" align="center" width="100" /> <el-table-column prop="realAmount" label="金额" align="center" width="100"/>
</el-table-column> </el-table-column>
<el-table-column label="未盘" align="center"> <el-table-column label="未盘" align="center">
<el-table-column prop="notCount" label="数量" align="center" width="100" /> <el-table-column prop="notCount" label="数量" align="center" width="100"/>
<el-table-column prop="notAmount" label="金额" align="center" width="100" /> <el-table-column prop="notAmount" label="金额" align="center" width="100"/>
</el-table-column> </el-table-column>
<el-table-column label="盘盈" align="center"> <el-table-column label="盘盈" align="center">
<el-table-column prop="profitCount" label="数量" align="center" width="100" /> <el-table-column prop="profitCount" label="数量" align="center" width="100"/>
<el-table-column prop="profitAmount" label="金额" align="center" width="100" /> <el-table-column prop="profitAmount" label="金额" align="center" width="100"/>
</el-table-column> </el-table-column>
<el-table-column label="盘亏" align="center"> <el-table-column label="盘亏" align="center">
<el-table-column prop="loseCount" label="数量" align="center" width="100" /> <el-table-column prop="loseCount" label="数量" align="center" width="100"/>
<el-table-column prop="loseAmount" label="金额" align="center" width="100" /> <el-table-column prop="loseAmount" label="金额" align="center" width="100"/>
</el-table-column> </el-table-column>
<el-table-column label="盘损" align="center"> <el-table-column label="盘损" align="center">
<el-table-column prop="lossCount" label="数量" align="center" width="100" /> <el-table-column prop="lossCount" label="数量" align="center" width="100"/>
<el-table-column prop="lossAmount" label="金额" align="center" width="100" /> <el-table-column prop="lossAmount" label="金额" align="center" width="100"/>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<!-- End 项目列表 --> <!-- End 项目列表 -->
<div class="pages"> <div class="pages">
<div class="tit" /> <div class="tit"/>
<!-- 翻页 --> <!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div> </div>
</div> </div>
</div> </div>
<!-- 查看库位明细 --> <!-- 查看库位明细 -->
<stocktakingRackCodeDetail v-show="viewState == 2" ref="divSp" @doback="resetState" /> <stocktakingRackCodeDetail v-show="viewState == 2" ref="divSp" @doback="resetState"/>
</div> </div>
</template> </template>
<script> <script>
import req from '@/api/storage/stocktaking.js' import req from '@/api/storage/stocktaking.js'
import ButtonBar from '@/components/ButtonBar' import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye' import stocktakingRackCodeDetail from './stocktakingRackCodeDetail.vue'
import stocktakingRackCodeDetail from './stocktakingRackCodeDetail.vue' import { getAllRackByKQSid, getAllWarehouse, getAllWarehouseareaByZoneSid, getAllWarehousezoneBysid } from '@/api/Common/dictcommons'
import req2 from '@/api/warehouse/warehouse.js'
import req3 from '@/api/warehouse/warehouseArea.js' export default {
import req4 from '@/api/warehouse/goodsShelves.js'
export default {
components: { components: {
ButtonBar, ButtonBar,
Pagination, Pagination,
pageye,
stocktakingRackCodeDetail stocktakingRackCodeDetail
}, },
data() { data() {
@ -120,28 +119,28 @@
searchxianshitit: '显示查询条件', searchxianshitit: '显示查询条件',
tableLoading: false, tableLoading: false,
dataList: [], dataList: [],
btnList: [{ btnList: [
{
type: 'info', type: 'info',
size: 'small', size: 'small',
icon: 'cross', icon: 'cross',
btnKey: 'doClose', btnKey: 'doClose',
btnLabel: '关闭' btnLabel: '关闭'
}], }
],
queryParams: { queryParams: {
current: 1, current: 1,
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
"billSid": "", billSid: '',
"warehouseSid": "", warehouseName: '',
"warehouseName": "", zoneName: '',
"warehouseAreaSid": "", wareAreaName: '',
"warehouseAreaName": "", warehouseRackCode: ''
"warehouseRackSid": "",
"warehouseRackName": "",
} }
}, },
billSid: "", billSid: '',
warehouseList: [], warehouseList: [],
warehouseAreaList: [], warehouseAreaList: [],
warehouseRackList: [] warehouseRackList: []
@ -149,80 +148,75 @@
}, },
mounted() { mounted() {
this.$refs['btnbar'].setButtonList(this.btnList) this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
}, },
methods: { methods: {
initData() { initData() {
getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '配件库' }).then((res) => {
var parpams = { if (res.success) {
orgPath: window.sessionStorage.getItem('defaultOrgPath'), this.warehouseList = res.data
} }
req2.getAllWarehouse(parpams).then(resp => {
this.warehouseList = resp.data
}) })
}, },
selectWarehouseName(val) {
getWarehouseArea(sid) { this.warehouseZoneList = []
this.queryParams.params.warehouseAreaSid = '' this.wareAreaList = []
this.queryParams.params.warehouseAreaName = '' this.warehouseRackList = []
const choose = this.warehouseList.filter((item) => item.sid === val)
var params = { if (choose !== null || choose.length > 0) {
ckSid: sid this.queryParams.params.warehouseName = choose[0].warehouseName
this.getWarehouseZoneList(choose[0].sid)
} else {
this.queryParams.params.warehouseName = ''
} }
this.queryParams.params.wareZoneName = ''
req3.getAllWarehouseareaBysid(params).then(resp => { this.queryParams.params.wareAreaName = ''
console.log('>>>>>>>>>getAllWarehousearea', resp) this.queryParams.params.warehouseRackCode = ''
this.warehouseAreaList = resp.data
}).catch(() => {})
}, },
getWarehouseZoneList(sid) {
getAllTypeByAreaSid(sid) { getAllWarehousezoneBysid({ ckSid: sid }).then((res) => {
this.queryParams.params.warehouseRackSid = '' if (res.success) {
this.queryParams.params.warehouseRackName = '' this.warehouseZoneList = res.data
var params = {
areaSid: sid
} }
})
req4.getAllTypeByAreaSid(params).then(resp => {
console.log('>>>>>>>>>getAllTypeByAreaSid', resp)
this.warehouseRackList = resp.data
}).catch(() => {})
}, },
selectWareZoneName(val) {
this.wareAreaList = []
selectWarehouseChange(val) { this.warehouseRackList = []
const choose = this.warehouseList.filter((item) => item.sid == val) const choose = this.warehouseZoneList.filter((item) => item.sid === val)
console.log('>>>>>>>>>selectWarehouseChange', choose) if (choose !== null && choose.length > 0) {
this.queryParams.params.warehouseSid = choose[0].sid this.queryParams.params.wareZoneName = choose[0].zoneName
this.queryParams.params.warehouseName = choose[0].warehouseName this.getWareAreaList(choose[0].sid)
} else {
this.getWarehouseArea(choose[0].sid) this.queryParams.params.wareZoneName = ''
}
this.queryParams.params.wareAreaName = ''
this.queryParams.params.warehouseRackCode = ''
}, },
getWareAreaList(sid) {
selectWarehouseAreaChange(val) { getAllWarehouseareaByZoneSid({ qySid: sid }).then((res) => {
const choose = this.warehouseAreaList.filter((item) => item.sid == val) if (res.success) {
console.log('>>>>>>>>>selectWarehouseAreaChange', choose) this.wareAreaList = res.data
this.queryParams.params.warehouseAreaSid = choose[0].sid }
this.queryParams.params.warehouseAreaName = choose[0].areaName })
this.getAllTypeByAreaSid(choose[0].sid)
}, },
selectWareAreaName(val) {
selectWarehouseRackChange(val) { this.warehouseRackList = []
const choose = this.warehouseRackList.filter((item) => item.sid == val) const choose = this.wareAreaList.filter((item) => item.sid === val)
console.log('>>>>>>>>>selectWarehouseRackChange', choose) if (choose !== null && choose.length > 0) {
this.queryParams.params.warehouseRackSid = choose[0].sid this.queryParams.params.wareAreaName = choose[0].areaName
this.queryParams.params.warehouseRackName = choose[0].rackName this.getWarehouseRackList(choose[0].sid)
} else {
this.queryParams.params.wareAreaName = ''
}
this.queryParams.params.warehouseRackCode = ''
},
getWarehouseRackList(sid) {
getAllRackByKQSid({ kqSid: sid }).then((res) => {
if (res.success) {
this.warehouseRackList = res.data
}
})
}, },
// 搜索条件效果 // 搜索条件效果
clicksearchShow() { clicksearchShow() {
this.isSearchShow = !this.isSearchShow this.isSearchShow = !this.isSearchShow
@ -247,7 +241,6 @@
this.queryParams.params.billSid = sid this.queryParams.params.billSid = sid
this.loadList() this.loadList()
}, },
loadList() { loadList() {
this.tableLoading = true this.tableLoading = true
req.billStocktak(this.queryParams).then((resp) => { req.billStocktak(this.queryParams).then((resp) => {
@ -265,7 +258,6 @@
this.tableLoading = false this.tableLoading = false
}) })
}, },
// 序号 // 序号
indexMethod(index) { indexMethod(index) {
var pagestart = (this.queryParams.current - 1) * this.queryParams.size var pagestart = (this.queryParams.current - 1) * this.queryParams.size
@ -282,74 +274,28 @@
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
"billSid": this.billSid, billSid: this.billSid,
"warehouseSid": "", warehouseName: '',
"warehouseName": "", zoneName: '',
"warehouseAreaSid": "", wareAreaName: '',
"warehouseAreaName": "", warehouseRackCode: ''
"warehouseRackSid": "",
"warehouseRackName": "",
} }
} }
this.loadList() this.loadList()
}, },
toDetail(row) { toDetail(row) {
this.viewState = 2 this.viewState = 2
this.$refs['divSp'].showDetail(row.billSid, row.warehouseRackSid) this.$refs['divSp'].showDetail(row.billSid, row.warehouseRackSid)
}, },
close() { close() {
this.$emit('doback') this.$emit('doback')
}, },
resetState() { resetState() {
this.viewState = 1 this.viewState = 1
} }
} }
} }
</script> </script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must { <style scoped>
color: #f00;
}
.span-sty {
width: 90px !important;
}
.addinputInfo {
margin-left: 80px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 80px !important;
width: calc(100% - 70px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
/deep/ .el-form-item__error {
margin-left: 180px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
</style> </style>

2
yxt-as-ui/src/views/storage/stocktaking/stocktakingReportDetail.vue
View File

@ -124,7 +124,7 @@
</div> </div>
<el-table :data="formobj.arehouseAreaeStocktakList" :index="index" border style="width: 100%;"> <el-table :data="formobj.arehouseAreaeStocktakList" :index="index" border style="width: 100%;">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" /> <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="warehouseAreaeName" label="仓库-库区" align="center" /> <el-table-column prop="warehouseAreaeName" label="仓库-区域-库区" align="center" />
<el-table-column prop="ypNum" label="应盘" align="center" /> <el-table-column prop="ypNum" label="应盘" align="center" />
<el-table-column prop="ypMoney" label="应盘金额" width="150" align="center" /> <el-table-column prop="ypMoney" label="应盘金额" width="150" align="center" />
<el-table-column prop="spNum" label="实盘" width="150" align="center" /> <el-table-column prop="spNum" label="实盘" width="150" align="center" />

Write Preview
Loading…
Cancel
Save