|
|
@@ -1,78 +1,37 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
<div v-show="pageShow">
|
|
|
- <el-form
|
|
|
- :model="queryParams"
|
|
|
- ref="queryForm"
|
|
|
- v-show="showSearch"
|
|
|
- label-width="90px"
|
|
|
- size="small"
|
|
|
- >
|
|
|
+ <el-form :model="queryParams" ref="queryForm" v-show="showSearch" label-width="90px" size="small">
|
|
|
<el-row>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="客户" prop="fCorpid">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fCorpid"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="请输入关键词"
|
|
|
- style="width: 200px"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in fMblnoOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="item.fName"
|
|
|
- :value="item.fId"
|
|
|
- ></el-option>
|
|
|
+ <el-select v-model="queryParams.fCorpid" clearable filterable placeholder="请输入关键词" style="width: 200px">
|
|
|
+ <el-option v-for="(item, index) in fMblnoOptions" :key="index.fId" :label="item.fName"
|
|
|
+ :value="item.fId"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="提单号" prop="fMblno">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.fMblno"
|
|
|
- placeholder="请输入提单号"
|
|
|
- clearable
|
|
|
- style="width: 200px"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
+ <el-input v-model="queryParams.fMblno" placeholder="请输入提单号" clearable style="width: 200px"
|
|
|
+ @keyup.enter.native="handleQuery" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="入库日期" prop="timeInterval">
|
|
|
- <el-date-picker
|
|
|
- v-model="queryParams.timeInterval"
|
|
|
- type="daterange"
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
- :default-time="['00:00:00', '23:59:59']"
|
|
|
- clearable
|
|
|
- style="width: 230px"
|
|
|
- range-separator="至"
|
|
|
- start-placeholder="开始日期"
|
|
|
- end-placeholder="结束日期"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- :picker-options="pickerOptions"
|
|
|
- unlink-panels
|
|
|
- >
|
|
|
+ <el-date-picker v-model="queryParams.timeInterval" type="daterange" value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ :default-time="['00:00:00', '23:59:59']" clearable style="width: 230px" range-separator="至"
|
|
|
+ start-placeholder="开始日期" end-placeholder="结束日期" @keyup.enter.native="handleQuery"
|
|
|
+ :picker-options="pickerOptions" unlink-panels>
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="车号" prop="fWarehouseid">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fTruckno"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="请选择车号"
|
|
|
- style="width: 200px"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in fTrucknoList"
|
|
|
- :key="index"
|
|
|
- :label="item.fTruckno"
|
|
|
- :value="item.fTruckno"
|
|
|
- ></el-option>
|
|
|
+ <el-select v-model="queryParams.fTruckno" clearable filterable placeholder="请选择车号" style="width: 200px"
|
|
|
+ @keyup.enter.native="handleQuery">
|
|
|
+ <el-option v-for="(item, index) in fTrucknoList" :key="index" :label="item.fTruckno"
|
|
|
+ :value="item.fTruckno"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -82,41 +41,22 @@
|
|
|
<el-row>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="货物名称" prop="fGoodsid">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fGoodsid"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="请选择货物名称"
|
|
|
- style="width: 200px"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in goodsOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="item.fName"
|
|
|
- :value="item.fId"
|
|
|
- ></el-option>
|
|
|
+ <el-select v-model="queryParams.fGoodsid" clearable filterable placeholder="请选择货物名称"
|
|
|
+ style="width: 200px" @keyup.enter.native="handleQuery">
|
|
|
+ <el-option v-for="(item, index) in goodsOptions" :key="index.fId" :label="item.fName"
|
|
|
+ :value="item.fId"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="属性详情" prop="fMarks">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.fMarks"
|
|
|
- placeholder="请输入属性详情"
|
|
|
- clearable
|
|
|
- style="width: 200px"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
+ <el-input v-model="queryParams.fMarks" placeholder="请输入属性详情" clearable style="width: 200px"
|
|
|
+ @keyup.enter.native="handleQuery" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="入库状态" prop="fItemsStatus">
|
|
|
- <el-select
|
|
|
- style="width: 200px"
|
|
|
- v-model="queryParams.fItemsStatus"
|
|
|
- placeholder="请选择入库状态"
|
|
|
- >
|
|
|
+ <el-select style="width: 200px" v-model="queryParams.fItemsStatus" placeholder="请选择入库状态">
|
|
|
<el-option label="计划" value="1"></el-option>
|
|
|
<el-option label="待入库" value="2"></el-option>
|
|
|
<el-option label="入库中" value="3"></el-option>
|
|
|
@@ -126,11 +66,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="费用状态" prop="fFeeStatus">
|
|
|
- <el-select
|
|
|
- style="width: 200px"
|
|
|
- v-model="queryParams.fFeeStatus"
|
|
|
- placeholder="请选择费用状态"
|
|
|
- >
|
|
|
+ <el-select style="width: 200px" v-model="queryParams.fFeeStatus" placeholder="请选择费用状态">
|
|
|
<el-option label="暂存" :value="1"></el-option>
|
|
|
<el-option label="部分" :value="2"></el-option>
|
|
|
<el-option label="全部入账" :value="3"></el-option>
|
|
|
@@ -141,50 +77,26 @@
|
|
|
<el-row>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="业务编号" prop="fBillno">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.fBillno"
|
|
|
- placeholder="请输入业务编号"
|
|
|
- clearable
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- style="width: 200px"
|
|
|
- />
|
|
|
+ <el-input v-model="queryParams.fBillno" placeholder="请输入业务编号" clearable
|
|
|
+ @keyup.enter.native="handleQuery" style="width: 200px" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="制单人" prop="createBy">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.createBy"
|
|
|
- filterable
|
|
|
- clearable
|
|
|
- placeholder="请输入关键词"
|
|
|
- style="width: 200px"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in userOptions"
|
|
|
- :key="index.userName"
|
|
|
- :label="item.nickName"
|
|
|
- :value="item.userName"
|
|
|
- >
|
|
|
+ <el-select v-model="queryParams.createBy" filterable clearable placeholder="请输入关键词"
|
|
|
+ style="width: 200px">
|
|
|
+ <el-option v-for="(item, index) in userOptions" :key="index.userName" :label="item.nickName"
|
|
|
+ :value="item.userName">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="仓库" prop="fWarehouseid">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fWarehouseid"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="请选择仓库"
|
|
|
- style="width: 200px"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in warehouseOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="item.fName"
|
|
|
- :value="item.fId"
|
|
|
- ></el-option>
|
|
|
+ <el-select v-model="queryParams.fWarehouseid" clearable filterable placeholder="请选择仓库"
|
|
|
+ style="width: 200px" @keyup.enter.native="handleQuery">
|
|
|
+ <el-option v-for="(item, index) in warehouseOptions" :key="index.fId" :label="item.fName"
|
|
|
+ :value="item.fId"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<!-- <el-form-item label="经营单位" prop="fSbu">-->
|
|
|
@@ -206,19 +118,10 @@
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="贸易方式" prop="fTrademodeid">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fTrademodeid"
|
|
|
- placeholder="请选择贸易方式"
|
|
|
- clearable
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- style="width: 200px"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in fTrademodeidOptions"
|
|
|
- :key="index.dictValue"
|
|
|
- :label="item.dictLabel"
|
|
|
- :value="item.dictValue"
|
|
|
- />
|
|
|
+ <el-select v-model="queryParams.fTrademodeid" placeholder="请选择贸易方式" clearable
|
|
|
+ @keyup.enter.native="handleQuery" style="width: 200px">
|
|
|
+ <el-option v-for="(item, index) in fTrademodeidOptions" :key="index.dictValue"
|
|
|
+ :label="item.dictLabel" :value="item.dictValue" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -226,46 +129,23 @@
|
|
|
<el-row>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="箱使日期" prop="freeContainerList">
|
|
|
- <el-date-picker
|
|
|
- v-model="queryParams.freeContainerList"
|
|
|
- type="daterange"
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
- :default-time="['00:00:00', '23:59:59']"
|
|
|
- clearable
|
|
|
- style="width: 230px"
|
|
|
- range-separator="至"
|
|
|
- start-placeholder="开始日期"
|
|
|
- end-placeholder="结束日期"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- >
|
|
|
+ <el-date-picker v-model="queryParams.freeContainerList" type="daterange"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']" clearable
|
|
|
+ style="width: 230px" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
|
|
|
+ @keyup.enter.native="handleQuery">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6" v-if="company === '青岛金港物流有限公司'">
|
|
|
<el-form-item label="报关单号">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.fCustomno"
|
|
|
- placeholder="请输入报关单号"
|
|
|
- clearable
|
|
|
- style="width: 200px"
|
|
|
- />
|
|
|
+ <el-input v-model="queryParams.fCustomno" placeholder="请输入报关单号" clearable style="width: 200px" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6" v-if="company === '青岛金港物流有限公司'">
|
|
|
<el-form-item label="境内收货人" prop="fSbu">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fSbu"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="请输入关键词"
|
|
|
- style="width: 200px"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in fSbuOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="item.fName"
|
|
|
- :value="item.fId"
|
|
|
- ></el-option>
|
|
|
+ <el-select v-model="queryParams.fSbu" clearable filterable placeholder="请输入关键词" style="width: 200px">
|
|
|
+ <el-option v-for="(item, index) in fSbuOptions" :key="index.fId" :label="item.fName"
|
|
|
+ :value="item.fId"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -275,153 +155,72 @@
|
|
|
</el-form>
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
<el-col :span="1.5">
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- icon="el-icon-plus"
|
|
|
- size="mini"
|
|
|
- @click="handleAdd"
|
|
|
- v-hasPermi="['warehouseBusiness:inStock:add']"
|
|
|
- >新增
|
|
|
+ <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
|
|
|
+ v-hasPermi="['warehouseBusiness:inStock:add']">新增
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
- <el-button
|
|
|
- type="success"
|
|
|
- icon="el-icon-edit"
|
|
|
- size="mini"
|
|
|
- :disabled="single"
|
|
|
- @click="handleUpdate"
|
|
|
- v-hasPermi="['warehouseBusiness:inStock:edit']"
|
|
|
- >修改
|
|
|
+ <el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
|
|
|
+ v-hasPermi="['warehouseBusiness:inStock:edit']">修改
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
- <el-button
|
|
|
- type="warning"
|
|
|
- icon="el-icon-download"
|
|
|
- size="mini"
|
|
|
- @click="handleExport"
|
|
|
- v-hasPermi="['warehouseBusiness:inStock:export']"
|
|
|
- >导出
|
|
|
+ <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
|
|
|
+ v-hasPermi="['warehouseBusiness:inStock:export']">导出
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
- <el-button
|
|
|
- type="info"
|
|
|
- icon="el-icon-download"
|
|
|
- size="mini"
|
|
|
- :disabled="single"
|
|
|
- @click="copyUpdate"
|
|
|
- v-hasPermi="['agreement:agreementStorage:export']"
|
|
|
- >复制新增
|
|
|
+ <el-button type="info" icon="el-icon-download" size="mini" :disabled="single" @click="copyUpdate"
|
|
|
+ v-hasPermi="['agreement:agreementStorage:export']">复制新增
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
<div class="tabSetting">
|
|
|
<div style="margin-right: 20px">
|
|
|
- <el-button
|
|
|
- type="cyan"
|
|
|
- icon="el-icon-search"
|
|
|
- size="mini"
|
|
|
- @click="handleQuery"
|
|
|
- >搜索</el-button
|
|
|
- >
|
|
|
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
|
- >重置</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- v-show="show"
|
|
|
- @click="show = !show"
|
|
|
- icon="el-icon-arrow-up"
|
|
|
- size="mini"
|
|
|
- >展开</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- v-show="!show"
|
|
|
- @click="show = !show"
|
|
|
- icon="el-icon-arrow-down"
|
|
|
- size="mini"
|
|
|
- >展开</el-button
|
|
|
- >
|
|
|
+ <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
|
+ <el-button v-show="show" @click="show = !show" icon="el-icon-arrow-up" size="mini">展开</el-button>
|
|
|
+ <el-button v-show="!show" @click="show = !show" icon="el-icon-arrow-down" size="mini">展开</el-button>
|
|
|
</div>
|
|
|
- <right-toolbar
|
|
|
- :showSearch.sync="showSearch"
|
|
|
- @queryTable="getList"
|
|
|
- ></right-toolbar>
|
|
|
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
<div style="margin: 0 12px">
|
|
|
- <el-button
|
|
|
- icon="el-icon-setting"
|
|
|
- size="mini"
|
|
|
- circle
|
|
|
- @click="showSetting = !showSetting"
|
|
|
- ></el-button>
|
|
|
+ <el-button icon="el-icon-setting" size="mini" circle @click="showSetting = !showSetting"></el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-row>
|
|
|
|
|
|
- <el-dialog
|
|
|
- title="自定义列显示"
|
|
|
- :visible.sync="showSetting"
|
|
|
- width="700px"
|
|
|
- v-dialogDrag
|
|
|
- :close-on-click-modal="false"
|
|
|
- >
|
|
|
+ <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px" v-dialogDrag :close-on-click-modal="false">
|
|
|
<template slot="title">
|
|
|
<div class="avue-crud__dialog__header">
|
|
|
<span class="el-dialog__title">
|
|
|
- <span
|
|
|
- style="
|
|
|
+ <span style="
|
|
|
display: inline-block;
|
|
|
width: 3px;
|
|
|
height: 20px;
|
|
|
margin-right: 5px;
|
|
|
float: left;
|
|
|
margin-top: 2px;
|
|
|
- "
|
|
|
- ></span>
|
|
|
+ "></span>
|
|
|
</span>
|
|
|
</div>
|
|
|
</template>
|
|
|
<div>配置排序列数据（拖动调整顺序）</div>
|
|
|
<div style="margin-left: 17px">
|
|
|
- <el-checkbox
|
|
|
- v-model="allCheck"
|
|
|
- label="全选"
|
|
|
- @change="allChecked"
|
|
|
- ></el-checkbox>
|
|
|
+ <el-checkbox v-model="allCheck" label="全选" @change="allChecked"></el-checkbox>
|
|
|
</div>
|
|
|
<div style="padding: 4px; display: flex; justify-content: center">
|
|
|
- <draggable
|
|
|
- v-model="setRowList"
|
|
|
- group="site"
|
|
|
- animation="300"
|
|
|
- @start="onStart"
|
|
|
- @end="onEnd"
|
|
|
- handle=".indraggable"
|
|
|
- >
|
|
|
+ <draggable v-model="setRowList" group="site" animation="300" @start="onStart" @end="onEnd"
|
|
|
+ handle=".indraggable">
|
|
|
<transition-group>
|
|
|
- <div
|
|
|
- v-for="item in setRowList"
|
|
|
- :key="item.surface"
|
|
|
- class="listStyle"
|
|
|
- >
|
|
|
+ <div v-for="item in setRowList" :key="item.surface" class="listStyle">
|
|
|
<div style="width: 500px" class="indraggable">
|
|
|
<div class="progress" :style="{ width: item.width + 'px' }">
|
|
|
- <el-checkbox
|
|
|
- :label="item.name"
|
|
|
- v-model="item.checked"
|
|
|
- :true-label="0"
|
|
|
- :false-label="1"
|
|
|
- >{{ item.name }}
|
|
|
+ <el-checkbox :label="item.name" v-model="item.checked" :true-label="0" :false-label="1">{{ item.name
|
|
|
+ }}
|
|
|
</el-checkbox>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-input-number
|
|
|
- v-model.number="item.width"
|
|
|
- controls-position="right"
|
|
|
- :min="1"
|
|
|
- :max="500"
|
|
|
- size="mini"
|
|
|
- ></el-input-number>
|
|
|
+ <el-input-number v-model.number="item.width" controls-position="right" :min="1" :max="500" size="mini">
|
|
|
+ </el-input-number>
|
|
|
</div>
|
|
|
</transition-group>
|
|
|
</draggable>
|
|
|
@@ -433,158 +232,87 @@
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <el-table
|
|
|
- ref="table"
|
|
|
- v-loading="loading"
|
|
|
- :data="warehousebillsList"
|
|
|
- @selection-change="handleSelectionChange"
|
|
|
- show-summary
|
|
|
- :summary-method="getSum"
|
|
|
- :height="tableHeight"
|
|
|
- @expand-change="expandChange"
|
|
|
- >
|
|
|
- <el-table-column type="selection" fixed align="center" width="58" />
|
|
|
- <el-table-column type="expand" fixed="left">
|
|
|
- <template slot-scope="props">
|
|
|
- <el-table
|
|
|
- :data="props.row.dataList"
|
|
|
- v-loading="props.row.loading"
|
|
|
- >
|
|
|
- <el-table-column
|
|
|
- type="index"
|
|
|
- label="行号"
|
|
|
- width="50"
|
|
|
- align="center"
|
|
|
- fixed
|
|
|
- />
|
|
|
- <el-table-column label="状态" prop="fBillstatus" align="center" show-overflow-tooltip width="100">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{ scope.row.fBillstatus | fBillstatusFormat }}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="入库日期" prop="fBsdate" align="center" show-overflow-tooltip width="100">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="品名" prop="fGoodsid" align="center" show-overflow-tooltip width="100">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{ scope.row.fGoodsid | goodsFormat(goodsOptions) }}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="货物属性" prop="fBusinessType" align="center" show-overflow-tooltip width="100">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{ scope.row.fBusinessType | fStorageTypeFormat(fStorageTypeOptions) }}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="属性详情" prop="fMarks" align="center" show-overflow-tooltip width="100">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="入库件数" prop="fQty" align="center" show-overflow-tooltip width="100">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="入库毛重(kg)" prop="fGrossweight" align="center" show-overflow-tooltip width="150">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="入库净重(kg)" prop="fNetweight" align="center" show-overflow-tooltip width="150">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="箱号" prop="fCntrno" align="center" show-overflow-tooltip width="180">
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- type="index"
|
|
|
- label="行号"
|
|
|
- align="center"
|
|
|
- fixed
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- v-for="(item, index) in getRowList"
|
|
|
- :key="index"
|
|
|
- :label="item.name"
|
|
|
- :width="item.width"
|
|
|
- :prop="item.label"
|
|
|
- align="center"
|
|
|
- :fixed="item.fixed"
|
|
|
- :show-overflow-tooltip="true"
|
|
|
- sortable
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <span v-if="item.label == 'fMblno'">
|
|
|
- <el-link :underline="false" type="primary"
|
|
|
- ><div @click="handleUpdate(scope.row)">
|
|
|
- {{ scope.row.fMblno }}
|
|
|
- </div></el-link
|
|
|
- >
|
|
|
- </span>
|
|
|
- <span v-else>{{ scope.row[item.label] }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- label="操作"
|
|
|
- align="center"
|
|
|
- class-name="small-padding fixed-width"
|
|
|
- min-width="200"
|
|
|
- fixed="right"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-edit"
|
|
|
- @click="handleUpdate(scope.row, true)"
|
|
|
- v-hasPermi="['warehouseBusiness:inStock:edit']"
|
|
|
- >查看
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-edit"
|
|
|
- v-if="
|
|
|
- scope.row.fBillstatus == '录入' ||
|
|
|
- scope.row.fBillstatus == '暂存' ||
|
|
|
- scope.row.fBillstatus == '驳回'
|
|
|
- "
|
|
|
- @click="handleUpdate(scope.row, false)"
|
|
|
- v-hasPermi="['warehouseBusiness:inStock:edit']"
|
|
|
- >修改
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-delete"
|
|
|
- v-if="(scope.row.fItemsStatus == '待入库' || scope.row.fItemsStatus == '计划') && scope.row.warehouseStatus < 4 && scope.row.isCreate == 1 || (scope.row.fItemsStatus == '待入库' || scope.row.fItemsStatus == '计划') && scope.row.warehouseStatus < 4 && scope.row.isCreate == 0"
|
|
|
- @click="handleDelete(scope.row)"
|
|
|
- v-hasPermi="['warehouseBusiness:inStock:remove']"
|
|
|
- >删除
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-delete"
|
|
|
- v-if="
|
|
|
- scope.row.fBillstatus == '请核' ||
|
|
|
- scope.row.fBillstatus == '审核中'
|
|
|
- "
|
|
|
- @click="handleUpdate(scope.row, true)"
|
|
|
- >审核进度
|
|
|
- </el-button>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
- <pagination
|
|
|
- v-show="total > 0"
|
|
|
- :total="total"
|
|
|
- :page.sync="queryParams.pageNum"
|
|
|
- :limit.sync="queryParams.pageSize"
|
|
|
- @pagination="getList"
|
|
|
- />
|
|
|
+ <el-table ref="table" v-loading="loading" :data="warehousebillsList" @selection-change="handleSelectionChange"
|
|
|
+ show-summary :summary-method="getSum" :height="tableHeight" @expand-change="expandChange">
|
|
|
+ <el-table-column type="selection" fixed align="center" width="58" />
|
|
|
+ <el-table-column type="expand" fixed="left">
|
|
|
+ <template slot-scope="props">
|
|
|
+ <el-table :data="props.row.dataList" v-loading="props.row.loading">
|
|
|
+ <el-table-column type="index" label="行号" width="50" align="center" fixed />
|
|
|
+ <el-table-column label="状态" prop="fBillstatus" align="center" show-overflow-tooltip width="100">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.fBillstatus | fBillstatusFormat }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="入库日期" prop="fBsdate" align="center" show-overflow-tooltip width="100">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="品名" prop="fGoodsid" align="center" show-overflow-tooltip width="100">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.fGoodsid | goodsFormat(goodsOptions) }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="货物属性" prop="fBusinessType" align="center" show-overflow-tooltip width="100">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.fBusinessType | fStorageTypeFormat(fStorageTypeOptions) }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="属性详情" prop="fMarks" align="center" show-overflow-tooltip width="100">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="入库件数" prop="fQty" align="center" show-overflow-tooltip width="100">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="入库毛重(kg)" prop="fGrossweight" align="center" show-overflow-tooltip width="150">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="入库净重(kg)" prop="fNetweight" align="center" show-overflow-tooltip width="150">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="箱号" prop="fCntrno" align="center" show-overflow-tooltip width="180">
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column type="index" label="行号" align="center" fixed />
|
|
|
+ <el-table-column v-for="(item, index) in getRowList" :key="index" :label="item.name" :width="item.width"
|
|
|
+ :prop="item.label" align="center" :fixed="item.fixed" :show-overflow-tooltip="true" sortable>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="item.label == 'fMblno'">
|
|
|
+ <el-link :underline="false" type="primary">
|
|
|
+ <div @click="handleUpdate(scope.row)">
|
|
|
+ {{ scope.row.fMblno }}
|
|
|
+ </div>
|
|
|
+ </el-link>
|
|
|
+ </span>
|
|
|
+ <span v-else>{{ scope.row[item.label] }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="200" fixed="right">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row, true)"
|
|
|
+ v-hasPermi="['warehouseBusiness:inStock:edit']">查看
|
|
|
+ </el-button>
|
|
|
+ <el-button size="mini" type="text" icon="el-icon-edit" v-if="
|
|
|
+ scope.row.fBillstatus == '录入' ||
|
|
|
+ scope.row.fBillstatus == '暂存' ||
|
|
|
+ scope.row.fBillstatus == '驳回'
|
|
|
+ " @click="handleUpdate(scope.row, false)" v-hasPermi="['warehouseBusiness:inStock:edit']">修改
|
|
|
+ </el-button>
|
|
|
+ <el-button size="mini" type="text" icon="el-icon-delete"
|
|
|
+ v-if="(scope.row.fItemsStatus == '待入库' || scope.row.fItemsStatus == '计划') && scope.row.warehouseStatus < 4 && scope.row.isCreate == 1 || (scope.row.fItemsStatus == '待入库' || scope.row.fItemsStatus == '计划') && scope.row.warehouseStatus < 4 && scope.row.isCreate == 0"
|
|
|
+ @click="handleDelete(scope.row)" v-hasPermi="['warehouseBusiness:inStock:remove']">删除
|
|
|
+ </el-button>
|
|
|
+ <el-button size="mini" type="text" icon="el-icon-delete" v-if="
|
|
|
+ scope.row.fBillstatus == '请核' ||
|
|
|
+ scope.row.fBillstatus == '审核中'
|
|
|
+ " @click="handleUpdate(scope.row, true)">审核进度
|
|
|
+ </el-button>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
|
|
|
+ @pagination="getList" />
|
|
|
|
|
|
|
|
|
</div>
|
|
|
- <add-or-update
|
|
|
- v-show="pageShow2"
|
|
|
- @changeShow="showAddOrUpdate"
|
|
|
- ref="addOrUpdateRef"
|
|
|
- :chiId="formId"
|
|
|
- :copyStatus="copyStatus"
|
|
|
- :key="timer"
|
|
|
- ></add-or-update>
|
|
|
+ <add-or-update v-show="pageShow2" @changeShow="showAddOrUpdate" ref="addOrUpdateRef" :chiId="formId"
|
|
|
+ :copyStatus="copyStatus" :key="timer"></add-or-update>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -599,7 +327,7 @@ import {
|
|
|
} from "@/api/warehouseBusiness/warehouseInStock";
|
|
|
import { listCorps } from "@/api/basicdata/corps";
|
|
|
import { listWarehousesss } from "@/api/basicdata/warehouse";
|
|
|
-import { listGoods ,queryVehicle} from "@/api/basicdata/goods";
|
|
|
+import { listGoods, queryVehicle } from "@/api/basicdata/goods";
|
|
|
import { listUser, queryUserVal } from "@/api/system/user";
|
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
|
import Cookies from "js-cookie";
|
|
|
@@ -743,104 +471,125 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
surface: "14",
|
|
|
+ label: "fApplyMoney",
|
|
|
+ name: "开票金额",
|
|
|
+ checked: 0,
|
|
|
+ width: 130,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ surface: "15",
|
|
|
+ label: "invoiceNo",
|
|
|
+ name: "发票号",
|
|
|
+ checked: 0,
|
|
|
+ width: 130,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ surface: "16",
|
|
|
+ label: "fAccbilldate",
|
|
|
+ name: "开票时间",
|
|
|
+ checked: 0,
|
|
|
+ width: 130,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ surface: "17",
|
|
|
label: "fTruckno",
|
|
|
name: "车号",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
- surface: "15",
|
|
|
+ surface: "18",
|
|
|
label: "fDriverName",
|
|
|
name: "司机名称",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
- surface: "16",
|
|
|
+ surface: "19",
|
|
|
label: "fDriverTel",
|
|
|
name: "司机电话",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
- surface: "17",
|
|
|
+ surface: "20",
|
|
|
label: "fDriverIdCar",
|
|
|
name: "司机身份证",
|
|
|
checked: 0,
|
|
|
width: 180,
|
|
|
},
|
|
|
{
|
|
|
- surface: "18",
|
|
|
+ surface: "21",
|
|
|
label: "fBusinessType",
|
|
|
name: "业务类别",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
- surface: "19",
|
|
|
+ surface: "22",
|
|
|
label: "fFeeStatus",
|
|
|
name: "费用状态",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
- surface: "20",
|
|
|
+ surface: "23",
|
|
|
label: "freeContainerDate",
|
|
|
name: "箱使日期",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
- surface: "21",
|
|
|
+ surface: "24",
|
|
|
label: "fStorekeeper",
|
|
|
name: "仓管员",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
- surface: "22",
|
|
|
+ surface: "25",
|
|
|
label: "fBillno",
|
|
|
name: "系统编号",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
- surface: "23",
|
|
|
+ surface: "26",
|
|
|
label: "fReceivable",
|
|
|
name: "应收合计",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
- surface: "24",
|
|
|
+ surface: "27",
|
|
|
label: "fDue",
|
|
|
name: "应付合计",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
- surface: "25",
|
|
|
+ surface: "28",
|
|
|
label: "",
|
|
|
name: "利润",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
- surface: "26",
|
|
|
+ surface: "29",
|
|
|
label: "fRecycle",
|
|
|
name: "实收合计",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
- surface: "27",
|
|
|
+ surface: "30",
|
|
|
label: "fPay",
|
|
|
name: "实付合计",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
- surface: "28",
|
|
|
+ surface: "31",
|
|
|
label: "remark",
|
|
|
name: "备注",
|
|
|
checked: 0,
|
|
|
@@ -859,7 +608,7 @@ export default {
|
|
|
formId: null,
|
|
|
ids: [],
|
|
|
copyStatus: null,
|
|
|
- fTrucknoList:[],
|
|
|
+ fTrucknoList: [],
|
|
|
// 公司名称
|
|
|
company: '',
|
|
|
fSbuOptions: [],
|
|
|
@@ -934,7 +683,7 @@ export default {
|
|
|
listGoods({ fStatus: 0, delFlag: 0 }).then((response) => {
|
|
|
this.goodsOptions = response.rows;
|
|
|
});
|
|
|
- queryVehicle().then(res=>{
|
|
|
+ queryVehicle().then(res => {
|
|
|
this.fTrucknoList = res.data
|
|
|
})
|
|
|
listWarehousesss({ fStatus: 0, delFlag: 0 }).then((response) => {
|
|
|
@@ -1104,8 +853,8 @@ export default {
|
|
|
});
|
|
|
this.warehousebillsList = response.rows;
|
|
|
this.warehousebillsList.forEach(item => {
|
|
|
- this.$set(item,'dataList',[])
|
|
|
- this.$set(item,'loading', true)
|
|
|
+ this.$set(item, 'dataList', [])
|
|
|
+ this.$set(item, 'loading', true)
|
|
|
})
|
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
|
@@ -1307,7 +1056,7 @@ export default {
|
|
|
this.pageShow2 = false;
|
|
|
}
|
|
|
},
|
|
|
- expandChange(row,index) {
|
|
|
+ expandChange(row, index) {
|
|
|
if (row.loading == true) {
|
|
|
getWarehousebills(row.fId).then(res => {
|
|
|
row.dataList = res.data.warehouseBillsItem
|
qukaidi