|
|
@@ -65,9 +65,9 @@
|
|
|
type="text"
|
|
|
icon="el-icon-edit"
|
|
|
v-if="
|
|
|
- scope.row.fBillstatus == '录入' ||
|
|
|
- scope.row.fBillstatus == '暂存' ||
|
|
|
- scope.row.fBillstatus == '驳回'
|
|
|
+ scope.row.billstatus == '录入' ||
|
|
|
+ scope.row.billstatus == '暂存' ||
|
|
|
+ scope.row.billstatus == '驳回'
|
|
|
"
|
|
|
@click="handleUpdate(scope.row, false)"
|
|
|
v-hasPermi="['warehouseBusiness:outStock:edit']"
|
|
|
@@ -78,30 +78,30 @@
|
|
|
type="text"
|
|
|
icon="el-icon-delete"
|
|
|
v-if="
|
|
|
- (scope.row.fBillstatus == '录入' ||
|
|
|
- scope.row.fBillstatus == '暂存' ||
|
|
|
- scope.row.fBillstatus == '驳回')
|
|
|
+ (scope.row.billstatus == '录入' ||
|
|
|
+ scope.row.billstatus == '暂存' ||
|
|
|
+ scope.row.billstatus == '驳回')
|
|
|
&&
|
|
|
scope.row.isCreate == 0
|
|
|
||
|
|
|
- (scope.row.fBillstatus == '录入' ||
|
|
|
- scope.row.fBillstatus == '暂存' ||
|
|
|
- scope.row.fBillstatus == '驳回')
|
|
|
+ (scope.row.billstatus == '录入' ||
|
|
|
+ scope.row.billstatus == '暂存' ||
|
|
|
+ scope.row.billstatus == '驳回')
|
|
|
&&
|
|
|
scope.row.isCreate == 1
|
|
|
"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
v-hasPermi="['warehouseBusiness:outStock:remove']"
|
|
|
>删除
|
|
|
- <!-- v-if="scope.row.fItemsStatus == '计划'"-->
|
|
|
+ <!-- v-if="scope.row.itemsStatus == '计划'"-->
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-delete"
|
|
|
v-if="
|
|
|
- scope.row.fBillstatus == '请核' ||
|
|
|
- scope.row.fBillstatus == '审核中'
|
|
|
+ scope.row.billstatus == '请核' ||
|
|
|
+ scope.row.billstatus == '审核中'
|
|
|
"
|
|
|
@click="handleUpdate(scope.row, true)"
|
|
|
>审核进度
|
|
|
@@ -119,27 +119,27 @@
|
|
|
>
|
|
|
<el-row>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="客户" prop="fCorpid">
|
|
|
+ <el-form-item label="客户" prop="corpid">
|
|
|
<el-select
|
|
|
- v-model="queryParams.fCorpid"
|
|
|
+ v-model="queryParams.corpid"
|
|
|
clearable
|
|
|
filterable
|
|
|
placeholder="请输入关键词"
|
|
|
style="width: 200px"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="(item, index) in fMblnoOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="item.fName"
|
|
|
- :value="item.fId"
|
|
|
+ v-for="(item, index) in mblnoOptions"
|
|
|
+ :key="index.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id"
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="提单号" prop="fMblno">
|
|
|
+ <el-form-item label="提单号" prop="mblno">
|
|
|
<el-input
|
|
|
- v-model="queryParams.fMblno"
|
|
|
+ v-model="queryParams.mblno"
|
|
|
placeholder="请输入提单号"
|
|
|
clearable
|
|
|
style="width: 200px"
|
|
|
@@ -164,9 +164,9 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="车号" prop="fWarehouseid">
|
|
|
+ <el-form-item label="车号" prop="warehouseid">
|
|
|
<el-select
|
|
|
- v-model="queryParams.fTruckno"
|
|
|
+ v-model="queryParams.truckno"
|
|
|
clearable
|
|
|
filterable
|
|
|
placeholder="请选择车号"
|
|
|
@@ -174,10 +174,10 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="(item, index) in fTrucknoList"
|
|
|
+ v-for="(item, index) in trucknoList"
|
|
|
:key="index"
|
|
|
- :label="item.fTruckno"
|
|
|
- :value="item.fTruckno"
|
|
|
+ :label="item.truckno"
|
|
|
+ :value="item.truckno"
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
@@ -187,9 +187,9 @@
|
|
|
<div v-show="show">
|
|
|
<el-row>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="货物名称" prop="fGoodsid">
|
|
|
+ <el-form-item label="货物名称" prop="goodsid">
|
|
|
<el-select
|
|
|
- v-model="queryParams.fGoodsid"
|
|
|
+ v-model="queryParams.goodsid"
|
|
|
clearable
|
|
|
filterable
|
|
|
placeholder="请选择货物名称"
|
|
|
@@ -198,17 +198,17 @@
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in goodsOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="item.fName"
|
|
|
- :value="item.fId"
|
|
|
+ :key="index.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id"
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="品牌" prop="fMarks">
|
|
|
+ <el-form-item label="品牌" prop="marks">
|
|
|
<el-input
|
|
|
- v-model="queryParams.fMarks"
|
|
|
+ v-model="queryParams.marks"
|
|
|
placeholder="请输入品牌"
|
|
|
clearable
|
|
|
style="width: 200px"
|
|
|
@@ -217,10 +217,10 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="出库状态" prop="fItemsStatus">
|
|
|
+ <el-form-item label="出库状态" prop="itemsStatus">
|
|
|
<el-select
|
|
|
style="width: 200px"
|
|
|
- v-model="queryParams.fItemsStatus"
|
|
|
+ v-model="queryParams.itemsStatus"
|
|
|
placeholder="请选择出库状态"
|
|
|
>
|
|
|
<el-option label="计划" value="1"></el-option>
|
|
|
@@ -231,10 +231,10 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="费用状态" prop="fFeeStatus">
|
|
|
+ <el-form-item label="费用状态" prop="feeStatus">
|
|
|
<el-select
|
|
|
style="width: 200px"
|
|
|
- v-model="queryParams.fFeeStatus"
|
|
|
+ v-model="queryParams.feeStatus"
|
|
|
placeholder="请选择费用状态"
|
|
|
>
|
|
|
<el-option label="暂存" :value="1"></el-option>
|
|
|
@@ -246,9 +246,9 @@
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="业务编号" prop="fBillno">
|
|
|
+ <el-form-item label="业务编号" prop="billno">
|
|
|
<el-input
|
|
|
- v-model="queryParams.fBillno"
|
|
|
+ v-model="queryParams.billno"
|
|
|
placeholder="请输入业务编号"
|
|
|
clearable
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
@@ -276,9 +276,9 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="仓库" prop="fWarehouseid">
|
|
|
+ <el-form-item label="仓库" prop="warehouseid">
|
|
|
<el-select
|
|
|
- v-model="queryParams.fWarehouseid"
|
|
|
+ v-model="queryParams.warehouseid"
|
|
|
clearable
|
|
|
filterable
|
|
|
placeholder="请选择仓库"
|
|
|
@@ -287,40 +287,40 @@
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in warehouseOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="item.fName"
|
|
|
- :value="item.fId"
|
|
|
+ :key="index.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id"
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <!-- <el-form-item label="经营单位" prop="fSbu">-->
|
|
|
+ <!-- <el-form-item label="经营单位" prop="sbu">-->
|
|
|
<!-- <el-select-->
|
|
|
- <!-- v-model="queryParams.fSbu"-->
|
|
|
+ <!-- v-model="queryParams.sbu"-->
|
|
|
<!-- clearable-->
|
|
|
<!-- filterable-->
|
|
|
<!-- placeholder="请输入关键词"-->
|
|
|
<!-- style="width: 200px"-->
|
|
|
<!-- >-->
|
|
|
<!-- <el-option-->
|
|
|
- <!-- v-for="(item, index) in fMblnoOptions"-->
|
|
|
- <!-- :key="index.fId"-->
|
|
|
- <!-- :label="item.fName"-->
|
|
|
- <!-- :value="item.fId"-->
|
|
|
+ <!-- v-for="(item, index) in mblnoOptions"-->
|
|
|
+ <!-- :key="index.id"-->
|
|
|
+ <!-- :label="item.name"-->
|
|
|
+ <!-- :value="item.id"-->
|
|
|
<!-- ></el-option>-->
|
|
|
<!-- </el-select>-->
|
|
|
<!-- </el-form-item>-->
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="贸易方式" prop="fTrademodeid">
|
|
|
+ <el-form-item label="贸易方式" prop="trademodeid">
|
|
|
<el-select
|
|
|
- v-model="queryParams.fTrademodeid"
|
|
|
+ v-model="queryParams.trademodeid"
|
|
|
placeholder="请选择贸易方式"
|
|
|
clearable
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
style="width: 200px"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="(item, index) in fTrademodeidOptions"
|
|
|
+ v-for="(item, index) in trademodeidOptions"
|
|
|
:key="index.dictValue"
|
|
|
:label="item.dictLabel"
|
|
|
:value="item.dictValue"
|
|
|
@@ -528,10 +528,10 @@
|
|
|
sortable
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <span v-if="item.label == 'fMblno'">
|
|
|
+ <span v-if="item.label == 'mblno'">
|
|
|
<el-link :underline="false" type="primary"
|
|
|
><div @click="handleUpdate(scope.row)">
|
|
|
- {{ scope.row.fMblno }}
|
|
|
+ {{ scope.row.mblno }}
|
|
|
</div></el-link
|
|
|
>
|
|
|
</span>
|
|
|
@@ -559,9 +559,9 @@
|
|
|
type="text"
|
|
|
icon="el-icon-edit"
|
|
|
v-if="
|
|
|
- scope.row.fBillstatus == '录入' ||
|
|
|
- scope.row.fBillstatus == '暂存' ||
|
|
|
- scope.row.fBillstatus == '驳回'
|
|
|
+ scope.row.billstatus == '录入' ||
|
|
|
+ scope.row.billstatus == '暂存' ||
|
|
|
+ scope.row.billstatus == '驳回'
|
|
|
"
|
|
|
@click="handleUpdate(scope.row, false)"
|
|
|
v-hasPermi="['warehouseBusiness:outStock:edit']"
|
|
|
@@ -572,30 +572,30 @@
|
|
|
type="text"
|
|
|
icon="el-icon-delete"
|
|
|
v-if="
|
|
|
- (scope.row.fBillstatus == '录入' ||
|
|
|
- scope.row.fBillstatus == '暂存' ||
|
|
|
- scope.row.fBillstatus == '驳回')
|
|
|
+ (scope.row.billstatus == '录入' ||
|
|
|
+ scope.row.billstatus == '暂存' ||
|
|
|
+ scope.row.billstatus == '驳回')
|
|
|
&&
|
|
|
scope.row.isCreate == 0
|
|
|
||
|
|
|
- (scope.row.fBillstatus == '录入' ||
|
|
|
- scope.row.fBillstatus == '暂存' ||
|
|
|
- scope.row.fBillstatus == '驳回')
|
|
|
+ (scope.row.billstatus == '录入' ||
|
|
|
+ scope.row.billstatus == '暂存' ||
|
|
|
+ scope.row.billstatus == '驳回')
|
|
|
&&
|
|
|
scope.row.isCreate == 1
|
|
|
"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
v-hasPermi="['warehouseBusiness:outStock:remove']"
|
|
|
>删除
|
|
|
- <!-- v-if="scope.row.fItemsStatus == '计划'"-->
|
|
|
+ <!-- v-if="scope.row.itemsStatus == '计划'"-->
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-delete"
|
|
|
v-if="
|
|
|
- scope.row.fBillstatus == '请核' ||
|
|
|
- scope.row.fBillstatus == '审核中'
|
|
|
+ scope.row.billstatus == '请核' ||
|
|
|
+ scope.row.billstatus == '审核中'
|
|
|
"
|
|
|
@click="handleUpdate(scope.row, true)"
|
|
|
>审核进度
|
|
|
@@ -669,7 +669,7 @@ export default {
|
|
|
column:[
|
|
|
{
|
|
|
index: "0",
|
|
|
- prop: "fMblno",
|
|
|
+ prop: "mblno",
|
|
|
label: "提单号",
|
|
|
width: 200,
|
|
|
search: true,
|
|
|
@@ -682,113 +682,113 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
index: "2",
|
|
|
- prop: "fStorekeeper",
|
|
|
+ prop: "storekeeper",
|
|
|
label: "仓管员",
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
index: "3",
|
|
|
- prop: "fItemsStatus",
|
|
|
+ prop: "itemsStatus",
|
|
|
label: "直装状态",
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
index: "4",
|
|
|
- prop: "fCorpid",
|
|
|
+ prop: "corpid",
|
|
|
label: "客户",
|
|
|
width: 100,
|
|
|
search: true,
|
|
|
},
|
|
|
{
|
|
|
index: "6",
|
|
|
- prop: "fProductName",
|
|
|
+ prop: "productName",
|
|
|
label: "品名",
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
index: "7",
|
|
|
- prop: "fMarks",
|
|
|
+ prop: "marks",
|
|
|
label: "品牌",
|
|
|
width: 100,
|
|
|
search: true,
|
|
|
},
|
|
|
{
|
|
|
index: "8",
|
|
|
- prop: "fBsdate",
|
|
|
+ prop: "bsdate",
|
|
|
label: "出库日期",
|
|
|
width: 100,
|
|
|
search: true,
|
|
|
},
|
|
|
{
|
|
|
index: "9",
|
|
|
- prop: "fWarehouseid",
|
|
|
+ prop: "warehouseid",
|
|
|
label: "仓库",
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
index: "10",
|
|
|
- prop: "fPlanqty",
|
|
|
+ prop: "planqty",
|
|
|
label: "计划件数",
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
index: "11",
|
|
|
- prop: "fQty",
|
|
|
+ prop: "qty",
|
|
|
label: "出库件数",
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
index: "12",
|
|
|
- prop: "fGrossweight",
|
|
|
+ prop: "grossweight",
|
|
|
label: "出库毛重",
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
index: "13",
|
|
|
- prop: "fNetweight",
|
|
|
+ prop: "netweight",
|
|
|
label: "出库净重",
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
index: "14",
|
|
|
- prop: "fTruckno",
|
|
|
+ prop: "truckno",
|
|
|
label: "车号",
|
|
|
width: 100,
|
|
|
search: true,
|
|
|
},
|
|
|
{
|
|
|
index: "15",
|
|
|
- prop: "fDriverName",
|
|
|
+ prop: "driverName",
|
|
|
label: "司机名称",
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
index: "16",
|
|
|
- prop: "fDriverTel",
|
|
|
+ prop: "driverTel",
|
|
|
label: "司机电话",
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
index: "17",
|
|
|
- prop: "fDriverIdCar",
|
|
|
+ prop: "driverIdCar",
|
|
|
label: "司机身份证",
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
index: "18",
|
|
|
- prop: "fBusinessType",
|
|
|
+ prop: "businessType",
|
|
|
label: "业务类别",
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
index: "19",
|
|
|
- prop: "fFeeStatus",
|
|
|
+ prop: "feeStatus",
|
|
|
label: "费用状态",
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
index: "20",
|
|
|
- prop: "fBillno",
|
|
|
+ prop: "billno",
|
|
|
label: "系统编号",
|
|
|
width: 100,
|
|
|
}
|
|
|
@@ -800,33 +800,33 @@ export default {
|
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
- fBillno: null,
|
|
|
+ billno: null,
|
|
|
createBy: null,
|
|
|
- fTrademodeid: null,
|
|
|
- fCorpid: null,
|
|
|
- fMblno: null,
|
|
|
- fSbu: null,
|
|
|
- fGoodsid: null,
|
|
|
- fWarehouseid: null,
|
|
|
- fMarks: null,
|
|
|
- fBillstatus: null,
|
|
|
- fItemsStatus: null,
|
|
|
+ trademodeid: null,
|
|
|
+ corpid: null,
|
|
|
+ mblno: null,
|
|
|
+ sbu: null,
|
|
|
+ goodsid: null,
|
|
|
+ warehouseid: null,
|
|
|
+ marks: null,
|
|
|
+ billstatus: null,
|
|
|
+ itemsStatus: null,
|
|
|
timeInterval: null,
|
|
|
- fFeeStatus:null,
|
|
|
+ feeStatus:null,
|
|
|
},
|
|
|
// 显示搜索条件
|
|
|
showSearch: true,
|
|
|
userOptions: [],
|
|
|
- fTrademodeidOptions: [],
|
|
|
+ trademodeidOptions: [],
|
|
|
warehouseOptions: [],
|
|
|
goodsOptions: [],
|
|
|
- fMblnoOptions: [],
|
|
|
+ mblnoOptions: [],
|
|
|
show: false,
|
|
|
drag: false,
|
|
|
tableDate: [
|
|
|
{
|
|
|
surface: "0",
|
|
|
- label: "fMblno",
|
|
|
+ label: "mblno",
|
|
|
name: "提单号",
|
|
|
checked: 0,
|
|
|
width: 200,
|
|
|
@@ -841,126 +841,126 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
surface: "2",
|
|
|
- label: "fStorekeeper",
|
|
|
+ label: "storekeeper",
|
|
|
name: "仓管员",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
surface: "3",
|
|
|
- label: "fItemsStatus",
|
|
|
+ label: "itemsStatus",
|
|
|
name: "直装状态",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
surface: "4",
|
|
|
- label: "fCorpid",
|
|
|
+ label: "corpid",
|
|
|
name: "客户",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
surface: "6",
|
|
|
- label: "fProductName",
|
|
|
+ label: "productName",
|
|
|
name: "品名",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
surface: "7",
|
|
|
- label: "fMarks",
|
|
|
+ label: "marks",
|
|
|
name: "品牌",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
surface: "8",
|
|
|
- label: "fBsdate",
|
|
|
+ label: "bsdate",
|
|
|
name: "出库日期",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
surface: "9",
|
|
|
- label: "fWarehouseid",
|
|
|
+ label: "warehouseid",
|
|
|
name: "仓库",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
surface: "10",
|
|
|
- label: "fPlanqty",
|
|
|
+ label: "planqty",
|
|
|
name: "计划件数",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
surface: "11",
|
|
|
- label: "fQty",
|
|
|
+ label: "qty",
|
|
|
name: "出库件数",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
surface: "12",
|
|
|
- label: "fGrossweight",
|
|
|
+ label: "grossweight",
|
|
|
name: "出库毛重",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
surface: "13",
|
|
|
- label: "fNetweight",
|
|
|
+ label: "netweight",
|
|
|
name: "出库净重",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
surface: "14",
|
|
|
- label: "fTruckno",
|
|
|
+ label: "truckno",
|
|
|
name: "车号",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
surface: "15",
|
|
|
- label: "fDriverName",
|
|
|
+ label: "driverName",
|
|
|
name: "司机名称",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
surface: "16",
|
|
|
- label: "fDriverTel",
|
|
|
+ label: "driverTel",
|
|
|
name: "司机电话",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
surface: "17",
|
|
|
- label: "fDriverIdCar",
|
|
|
+ label: "driverIdCar",
|
|
|
name: "司机身份证",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
surface: "18",
|
|
|
- label: "fBusinessType",
|
|
|
+ label: "businessType",
|
|
|
name: "业务类别",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
surface: "19",
|
|
|
- label: "fFeeStatus",
|
|
|
+ label: "feeStatus",
|
|
|
name: "费用状态",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
surface: "20",
|
|
|
- label: "fBillno",
|
|
|
+ label: "billno",
|
|
|
name: "系统编号",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
@@ -978,33 +978,40 @@ export default {
|
|
|
formId: null,
|
|
|
ids: [],
|
|
|
copyStatus: null,
|
|
|
- fTrucknoList:[],
|
|
|
+ trucknoList:[],
|
|
|
};
|
|
|
},
|
|
|
// 使用子组件
|
|
|
components: { draggable, AddOrUpdate },
|
|
|
created() {
|
|
|
- //输出是否为开发者模式
|
|
|
- console.log(process.env.NODE_ENV === 'development')
|
|
|
+ let i = 0;
|
|
|
+ this.option.column.forEach(item => {
|
|
|
+ if (item.search) i++
|
|
|
+ })
|
|
|
+ if (i % 3 !== 0) {
|
|
|
+ const num = 3 - Number(i % 3)
|
|
|
+ this.option.searchMenuSpan = num * 8;
|
|
|
+ this.option.searchMenuPosition = "right";
|
|
|
+ }
|
|
|
queryVehicle().then(res=>{
|
|
|
- this.fTrucknoList = res.data
|
|
|
+ this.trucknoList = res.data
|
|
|
})
|
|
|
this.setRowList = this.tableDate;
|
|
|
this.getRowList = this.tableDate;
|
|
|
this.getDicts("data_trademodes").then((response) => {
|
|
|
- this.fTrademodeidOptions = response.data;
|
|
|
+ this.trademodeidOptions = response.data;
|
|
|
});
|
|
|
- listGoods({ fStatus: 0, delFlag: 0 }).then((response) => {
|
|
|
+ listGoods({ status: 0, delFlag: 0 }).then((response) => {
|
|
|
this.goodsOptions = response.rows;
|
|
|
});
|
|
|
- listWarehousesss({ fStatus: 0, delFlag: 0 }).then((response) => {
|
|
|
+ listWarehousesss({ status: 0, delFlag: 0 }).then((response) => {
|
|
|
this.warehouseOptions = response.rows;
|
|
|
});
|
|
|
listUser().then((response) => {
|
|
|
this.userOptions = response.rows;
|
|
|
});
|
|
|
listCorps({ type: 1 }).then((response) => {
|
|
|
- this.fMblnoOptions = response.rows;
|
|
|
+ this.mblnoOptions = response.rows;
|
|
|
});
|
|
|
this.getRow();
|
|
|
this.getList();
|
|
|
@@ -1108,23 +1115,23 @@ export default {
|
|
|
sums[index] = "合计";
|
|
|
return;
|
|
|
}
|
|
|
- if (column.property === "fGrossweight") {
|
|
|
- values = data.map((item) => Number(item["fGrossweight"]));
|
|
|
+ if (column.property === "grossweight") {
|
|
|
+ values = data.map((item) => Number(item["grossweight"]));
|
|
|
}
|
|
|
- if (column.property === "fNetweight") {
|
|
|
- values = data.map((item) => Number(item["fNetweight"]));
|
|
|
+ if (column.property === "netweight") {
|
|
|
+ values = data.map((item) => Number(item["netweight"]));
|
|
|
}
|
|
|
- if (column.property === "fQty") {
|
|
|
- values = data.map((item) => Number(item["fQty"]));
|
|
|
+ if (column.property === "qty") {
|
|
|
+ values = data.map((item) => Number(item["qty"]));
|
|
|
}
|
|
|
- if (column.property === "fPlanqty") {
|
|
|
- values = data.map((item) => Number(item.fPlanqty));
|
|
|
+ if (column.property === "planqty") {
|
|
|
+ values = data.map((item) => Number(item.planqty));
|
|
|
}
|
|
|
if (
|
|
|
- column.property === "fGrossweight" ||
|
|
|
- column.property === "fNetweight" ||
|
|
|
- column.property === "fQty" ||
|
|
|
- column.property === "fPlanqty"
|
|
|
+ column.property === "grossweight" ||
|
|
|
+ column.property === "netweight" ||
|
|
|
+ column.property === "qty" ||
|
|
|
+ column.property === "planqty"
|
|
|
) {
|
|
|
sums[index] = values.reduce((prev, curr) => {
|
|
|
const value = Number(curr);
|
|
|
@@ -1134,16 +1141,16 @@ export default {
|
|
|
return prev;
|
|
|
}
|
|
|
}, 0);
|
|
|
- if (column.property === "fGrossweight") {
|
|
|
+ if (column.property === "grossweight") {
|
|
|
sums[index] = sums[index].toFixed(4) + "吨";
|
|
|
}
|
|
|
- if (column.property === "fNetweight") {
|
|
|
+ if (column.property === "netweight") {
|
|
|
sums[index] = sums[index].toFixed(4) + "吨";
|
|
|
}
|
|
|
- if (column.property === "fQty") {
|
|
|
+ if (column.property === "qty") {
|
|
|
sums[index] = sums[index].toFixed(2);
|
|
|
}
|
|
|
- if (column.property === "fPlanqty") {
|
|
|
+ if (column.property === "planqty") {
|
|
|
if (sums[index]) {
|
|
|
sums[index] = sums[index];
|
|
|
}
|
|
|
@@ -1159,18 +1166,18 @@ export default {
|
|
|
},
|
|
|
// 多选框选中数据
|
|
|
handleSelectionChange(selection) {
|
|
|
- this.ids = selection.map((item) => item.fId);
|
|
|
+ this.ids = selection.map((item) => item.id);
|
|
|
this.single =
|
|
|
selection.length !== 1 ||
|
|
|
- selection.map((item) => item.fBillstatus) == 6 ||
|
|
|
- selection.map((item) => item.fBillstatus) == 4;
|
|
|
+ selection.map((item) => item.billstatus) == 6 ||
|
|
|
+ selection.map((item) => item.billstatus) == 4;
|
|
|
this.multiple = !selection.length;
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
|
- const fId = row.fId || this.ids[0]|| row;
|
|
|
+ const id = row.id || this.ids[0]|| row;
|
|
|
this.copyStatus = null;
|
|
|
- this.formId = fId;
|
|
|
+ this.formId = id;
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.addOrUpdateRef.init();
|
|
|
});
|
|
|
@@ -1192,7 +1199,7 @@ export default {
|
|
|
},
|
|
|
/** 删除按钮操作 */
|
|
|
handleDelete(row) {
|
|
|
- const ids = row.fId || this.ids;
|
|
|
+ const ids = row.id || this.ids;
|
|
|
delOutStock_s(ids).then((data) => {
|
|
|
switch (data.msg) {
|
|
|
case "0": {
|
|
|
@@ -1267,19 +1274,19 @@ export default {
|
|
|
this.queryParams = {
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
- fBillno: null,
|
|
|
+ billno: null,
|
|
|
createBy: null,
|
|
|
- fTrademodeid: null,
|
|
|
- fCorpid: null,
|
|
|
- fMblno: null,
|
|
|
- fSbu: null,
|
|
|
- fGoodsid: null,
|
|
|
- fWarehouseid: null,
|
|
|
- fMarks: null,
|
|
|
- fBillstatus: null,
|
|
|
- fItemsStatus: null,
|
|
|
+ trademodeid: null,
|
|
|
+ corpid: null,
|
|
|
+ mblno: null,
|
|
|
+ sbu: null,
|
|
|
+ goodsid: null,
|
|
|
+ warehouseid: null,
|
|
|
+ marks: null,
|
|
|
+ billstatus: null,
|
|
|
+ itemsStatus: null,
|
|
|
timeInterval: null,
|
|
|
- fFeeStatus: null,
|
|
|
+ feeStatus: null,
|
|
|
};
|
|
|
this.handleQuery();
|
|
|
},
|
caojunjie