|
|
@@ -10,30 +10,29 @@
|
|
|
</div>
|
|
|
<div v-if="showApproval == 0">
|
|
|
<el-button type="info" size="small" @click="addOrUpdateHandle(form, 'warehouse_status')"
|
|
|
- v-if="form.warehouseStatus > 3">查看接单审批
|
|
|
+ v-if="form.warehouseStatus > 3">查看接单审批
|
|
|
</el-button>
|
|
|
<el-button type="info" size="small" @click="addOrUpdateHand(form, 'warehouse_status')"
|
|
|
- v-if="form.warehouseStatus > 3 && approVal == true">接单审批
|
|
|
+ v-if="form.warehouseStatus > 3 && approVal == true">接单审批
|
|
|
</el-button>
|
|
|
<el-button type="info" :disabled="form.warehouseStatus >= 4" size="small" @click="verifyForm"
|
|
|
- v-if="form.fBillstatus">接单请核
|
|
|
+ v-if="form.fBillstatus">接单请核
|
|
|
</el-button>
|
|
|
<el-button type="info" :disabled="browseStatus" size="small" @click="ordersRevoke"
|
|
|
- v-if="form.warehouseStatus == 6">撤销接单请核
|
|
|
+ v-if="form.warehouseStatus == 6">撤销接单请核
|
|
|
</el-button>
|
|
|
<el-button type="info" :disabled="browseStatus" size="small" @click="revokeTwo('warehouse_status')"
|
|
|
- v-if="form.warehouseStatus == 4">撤销接单审批
|
|
|
+ v-if="form.warehouseStatus == 4">撤销接单审批
|
|
|
</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
-
|
|
|
- <br />
|
|
|
+ <br>
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="客户" prop="fCorpid">
|
|
|
<el-select v-model="form.fCorpid" clearable filterable placeholder="请输入关键词" style="width: 80%"
|
|
|
- @change="changefStltype" :disabled="detailList.length > 0">
|
|
|
+ @change="changefStltype" :disabled="detailList.length > 0">
|
|
|
<el-option v-for="(item, index) in fMblnoOptions" :key="index.fId" :label="item.fName" :value="item.fId">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
@@ -42,9 +41,9 @@
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="结算方式" prop="fStltypeid" v-if="dataShowcar == '1'">
|
|
|
<el-select v-model="form.fStltypeid" placeholder="请选择结算方式" clearable :disabled="browseStatus"
|
|
|
- style="width: 80%">
|
|
|
+ style="width: 80%">
|
|
|
<el-option v-for="(item, index) in fStltypeOptions" :key="index.dictValue" :label="item.dictLabel"
|
|
|
- :value="item.dictValue" />
|
|
|
+ :value="item.dictValue" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="作业类型" prop="fBusinessType" v-if="dataShowcar == '0'">
|
|
|
@@ -55,14 +54,14 @@
|
|
|
warehouseCrList.length > 0
|
|
|
">
|
|
|
<el-option v-for="(item, index) in businessTypeOption" :key="index.dictValue" :label="item.dictLabel"
|
|
|
- :value="item.dictValue"></el-option>
|
|
|
+ :value="item.dictValue"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="提单号" prop="fMblno">
|
|
|
<el-input v-model="form.fMblno" style="width: 80%" placeholder="请输入提单号"
|
|
|
- :disabled="detailList.length != 0" />
|
|
|
+ :disabled="detailList.length != 0" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -70,7 +69,7 @@
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="业务日期" prop="fBsdate">
|
|
|
<el-date-picker v-model="form.fBsdate" style="width: 80%" type="date" :disabled="browseStatus"
|
|
|
- value-format="timestamp" placeholder="业务日期" @change="changeDate" format="yyyy-MM-dd">
|
|
|
+ value-format="timestamp" placeholder="业务日期" @change="changeDate" format="yyyy-MM-dd">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -85,9 +84,9 @@
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="仓管员" prop="fStorekeeper">
|
|
|
<el-select v-model="form.fStorekeeper" filterable clearable :disabled="browseStatus" style="width: 80%"
|
|
|
- placeholder="请输入模糊查找">
|
|
|
+ placeholder="请输入模糊查找">
|
|
|
<el-option v-for="(item, index) in userOptions" :key="index.userName" :label="item.nickName"
|
|
|
- :value="item.userName"></el-option>
|
|
|
+ :value="item.userName"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -96,18 +95,18 @@
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="原仓库" prop="fInwarehouseid">
|
|
|
<el-select v-model="form.fInwarehouseid" filterable :disabled="browseStatus || detailList.length > 0"
|
|
|
- style="width: 80%" placeholder="请选择" @change="fInwarehouseChange">
|
|
|
+ style="width: 80%" placeholder="请选择" @change="fInwarehouseChange">
|
|
|
<el-option v-for="(item, index) in warehouseOptions" :key="index.fId" :label="item.fName"
|
|
|
- :value="item.fId"></el-option>
|
|
|
+ :value="item.fId"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="新仓库" prop="fWarehouseid">
|
|
|
<el-select v-model="form.fWarehouseid" filterable :disabled="browseStatus || detailList.length > 0"
|
|
|
- style="width: 80%" placeholder="请选择">
|
|
|
+ style="width: 80%" placeholder="请选择">
|
|
|
<el-option v-for="(item, index) in warehouseOptions" :key="index.fId" :label="item.fName"
|
|
|
- :value="item.fId"></el-option>
|
|
|
+ :value="item.fId"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -121,13 +120,13 @@
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="计划通关件数" prop="fPlanqty">
|
|
|
<el-input v-model.number="form.fPlanqty" style="width: 80%" maxlength="9" laceholder="计划件数"
|
|
|
- :disabled="browseStatus || current !== before" />
|
|
|
+ :disabled="browseStatus || current !== before" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="计划通关净重(kg)" prop="fPlannetweight">
|
|
|
<el-input v-model="form.fPlannetweight" style="width: 80%" maxlength="16" v-input-limit="2"
|
|
|
- laceholder="计划净重" :disabled="browseStatus || current !== before" @change="tfNetweight">
|
|
|
+ laceholder="计划净重" :disabled="browseStatus || current !== before" @change="tfNetweight">
|
|
|
<template slot="append">{{ tfNetweightnum }}吨</template>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
@@ -135,7 +134,7 @@
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="计划通关毛重(kg)" prop="fPlangrossweight">
|
|
|
<el-input v-model="form.fPlangrossweight" v-input-limit="2" style="width: 80%" laceholder="计划毛重"
|
|
|
- maxlength="16" :disabled="browseStatus || current !== before" @change="tfGrossweight">
|
|
|
+ maxlength="16" :disabled="browseStatus || current !== before" @change="tfGrossweight">
|
|
|
<template slot="append">{{ tfGrossweightnum }}吨</template>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
@@ -151,23 +150,23 @@
|
|
|
warehouseCrList.length > 0
|
|
|
">
|
|
|
<el-option v-for="(item, index) in businessTypeOption" :key="index.dictValue" :label="item.dictLabel"
|
|
|
- :value="item.dictValue"></el-option>
|
|
|
+ :value="item.dictValue"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="结算方式" prop="fStltypeid" v-if="dataShowcar == '0'">
|
|
|
<el-select v-model="form.fStltypeid" placeholder="请选择结算方式" clearable :disabled="browseStatus"
|
|
|
- style="width: 80%">
|
|
|
+ style="width: 80%">
|
|
|
<el-option v-for="(item, index) in fStltypeOptions" :key="index.dictValue" :label="item.dictLabel"
|
|
|
- :value="item.dictValue" />
|
|
|
+ :value="item.dictValue" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="劳务公司" prop="fLabour">
|
|
|
<el-select style="width: 80%" v-model="form.fLabour" clearable filterable placeholder="请输入关键词"
|
|
|
- :disabled="contrOl || browseStatus">
|
|
|
+ :disabled="contrOl || browseStatus">
|
|
|
<el-option v-for="(item, index) in fCompanyOptIons" :key="index.fId" :label="item.fName"
|
|
|
- :value="item.fId"></el-option>
|
|
|
+ :value="item.fId"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -178,7 +177,7 @@
|
|
|
trigger: ['blur', 'change'],
|
|
|
}">
|
|
|
<el-select style="width: 80%" v-model="form.fFleet" clearable filterable placeholder="请输入关键词"
|
|
|
- :disabled="contrOl || browseStatus">
|
|
|
+ :disabled="contrOl || browseStatus">
|
|
|
<el-option v-for="(item, index) in fleetOptions" :key="index.fId" :label="item.fName" :value="item.fId">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
@@ -227,18 +226,18 @@
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="原贸易方式" prop="fTrademodeid">
|
|
|
<el-select v-model="form.fTrademodeid" placeholder="请选择原贸易方式"
|
|
|
- :disabled="browseStatus || detailList.length > 0" clearable style="width: 80%">
|
|
|
+ :disabled="browseStatus || detailList.length > 0" clearable style="width: 80%">
|
|
|
<el-option v-for="dict in fTrademodeidOptions" :key="dict.dictValue" :label="dict.dictLabel"
|
|
|
- :value="dict.dictValue" />
|
|
|
+ :value="dict.dictValue" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="新贸易方式" prop="fNewTrademodeid">
|
|
|
<el-select v-model="form.fNewTrademodeid" placeholder="请选择新贸易方式"
|
|
|
- :disabled="browseStatus || clearanceDisabled" clearable style="width: 80%">
|
|
|
+ :disabled="browseStatus || clearanceDisabled" clearable style="width: 80%">
|
|
|
<el-option v-for="dict in fTrademodeidOptions" :key="dict.dictValue" :label="dict.dictLabel"
|
|
|
- :value="dict.dictValue" />
|
|
|
+ :value="dict.dictValue" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -247,7 +246,7 @@
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="备注" prop="remark">
|
|
|
<el-input style="width: 80%" v-model="form.remark" type="textarea" :disabled="browseStatus"
|
|
|
- placeholder="请输入内容" />
|
|
|
+ placeholder="请输入内容" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
@@ -258,7 +257,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-select placeholder="请选择箱型" v-model="scope.row.fCntrid" size="mini">
|
|
|
<el-option v-for="(item, index) in cntrList" :key="index.fId" :label="item.fName"
|
|
|
- :value="item.fId">
|
|
|
+ :value="item.fId">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</template>
|
|
|
@@ -272,7 +271,7 @@
|
|
|
<el-table-column prop="fCntrcount" label="操作" header-align="center" align="center" width="50">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button size="mini" type="text" @click.native.prevent="deleteRow(scope.$index, CntrTable)"
|
|
|
- icon="el-icon-delete"></el-button>
|
|
|
+ icon="el-icon-delete"></el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -318,14 +317,14 @@
|
|
|
<el-form-item label="制单部门" prop="fDeptid">
|
|
|
<el-select v-model="form.fDeptid" filterable disabled style="width: 80%" remote>
|
|
|
<el-option v-for="(item, index) in deptOptions" :key="index.deptId" :label="item.deptName"
|
|
|
- :value="item.deptId"></el-option>
|
|
|
+ :value="item.deptId"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item disabled label="制单日期" prop="createTime">
|
|
|
<el-date-picker v-model="form.createTime" size="large" type="date" disabled style="width: 80%"
|
|
|
- value-format="timestamp" placeholder="制单日期">
|
|
|
+ value-format="timestamp" placeholder="制单日期">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -365,13 +364,13 @@
|
|
|
</div>
|
|
|
<div style="padding: 4px; display: flex; justify-content: center">
|
|
|
<draggable v-model="setRowList" group="site" animation="300" @start="onStart" @end="onEnd"
|
|
|
- handle=".indraggable">
|
|
|
+ handle=".indraggable">
|
|
|
<transition-group>
|
|
|
<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>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -402,16 +401,16 @@
|
|
|
</el-col>
|
|
|
<el-col style="display: flex; justify-content: flex-end">
|
|
|
<el-button size="small" type="info" :disabled="browseStatus" v-if="entryPrinting == 0" prop="打印"
|
|
|
- @click="printZyd">作业单
|
|
|
+ @click="printZyd">作业单
|
|
|
</el-button>
|
|
|
<el-button size="small" v-if="entryPrinting == 0" :disabled="browseStatus" @click="discharge">叫车进场
|
|
|
</el-button>
|
|
|
<el-button size="small" :disabled="dataListSelection.length <= 0 || browseStatus || deliveryConfirmation"
|
|
|
- @click="creditClick">确认通关
|
|
|
+ @click="creditClick">确认通关
|
|
|
</el-button>
|
|
|
<el-button size="small"
|
|
|
- :disabled="dataWithdrawList.length <= 0 || browseStatus || form.fBillstatus > 3 || cancelDelivery"
|
|
|
- @click.prevent="withdrawClick">撤回通关
|
|
|
+ :disabled="dataWithdrawList.length <= 0 || browseStatus || form.fBillstatus > 3 || cancelDelivery"
|
|
|
+ @click.prevent="withdrawClick">撤回通关
|
|
|
</el-button>
|
|
|
<el-dropdown @command="handleCommand" style="margin-left: 10px">
|
|
|
<el-button :disabled="browseStatus" size="small" type="success">
|
|
|
@@ -429,11 +428,11 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-table :data="detailList" tooltip-effect="dark" stripe :summary-method="getSummaries"
|
|
|
- @selection-change="Selectinventory" show-summary>
|
|
|
+ @selection-change="Selectinventory" show-summary>
|
|
|
<el-table-column type="selection" width="55" align="center" fixed />
|
|
|
<el-table-column label="序号" type="index" width="80" 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" sortable show-overflow-tooltip>
|
|
|
+ :prop="item.label" align="center" :fixed="item.fixed" sortable show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="item.label == 'fBillstatus'">
|
|
|
<span v-if="scope.row.fBillstatus === 10">计划</span>
|
|
|
@@ -443,8 +442,8 @@
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fBsdate'">
|
|
|
<el-date-picker v-model="scope.row.fBsdate" style="width: 138px"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus >= 40" type="date" value-format="timestamp"
|
|
|
- placeholder="业务日期" format="yyyy-MM-dd">
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus >= 40" type="date" value-format="timestamp"
|
|
|
+ placeholder="业务日期" format="yyyy-MM-dd">
|
|
|
</el-date-picker>
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fGoodsid'">
|
|
|
@@ -461,91 +460,91 @@
|
|
|
<span v-else-if="item.label == 'fBusinessType'">
|
|
|
<el-select v-model="scope.row.fBusinessType" filterable disabled placeholder="请选择商品属性">
|
|
|
<el-option v-for="(item, index) in fStorageTypeOptions" :key="index.dictValue"
|
|
|
- :label="item.dictLabel" :value="item.dictValue" />
|
|
|
+ :label="item.dictLabel" :value="item.dictValue" />
|
|
|
</el-select>
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fQty'">
|
|
|
<el-input @change="qtyChange(scope.row)" v-model="scope.row.fQty"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 40" placeholder="出库件数" />
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 40" placeholder="出库件数" />
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fGrossweight'">
|
|
|
<el-input :disabled="browseStatus || scope.row.fBillstatus == 40" v-model="scope.row.fGrossweight"
|
|
|
- @change="changeOutStock(scope.row)" placeholder="出库毛重" />
|
|
|
+ @change="changeOutStock(scope.row)" placeholder="出库毛重" />
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fNetweight'">
|
|
|
<el-input v-model="scope.row.fNetweight" :disabled="browseStatus || scope.row.fBillstatus == 40"
|
|
|
- @change="changeOutStock(scope.row)" placeholder="出库净重" />
|
|
|
+ @change="changeOutStock(scope.row)" placeholder="出库净重" />
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fPackagespecs'">
|
|
|
<el-input v-model="scope.row.fPackagespecs" :disabled="browseStatus || scope.row.fBillstatus >= 40"
|
|
|
- placeholder="包装规格" />
|
|
|
+ placeholder="包装规格" />
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fCntrtype'">
|
|
|
<el-input v-model="scope.row.fCntrtype" :disabled="browseStatus || scope.row.fBillstatus >= 40"
|
|
|
- placeholder="箱型" />
|
|
|
+ placeholder="箱型" />
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fCntqty'">
|
|
|
<el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
- v-model="scope.row.fCntqty" placeholder="箱量"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus >= 40" />
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
+ v-model="scope.row.fCntqty" placeholder="箱量"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus >= 40" />
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fGoodsval'">
|
|
|
<el-input v-model="scope.row.fGoodsval" placeholder="货值"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus >= 40" />
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus >= 40" />
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fTruckno'">
|
|
|
<el-input v-model="scope.row.fTruckno" placeholder="车号"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus >= 40" />
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus >= 40" />
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fDriverName'">
|
|
|
<el-input v-model="scope.row.fDriverName" placeholder="司机名"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus >= 40" />
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus >= 40" />
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fDriverTel'">
|
|
|
<el-input v-model="scope.row.fDriverTel" placeholder="司机电话"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus >= 40" />
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus >= 40" />
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fDriverIdCar'">
|
|
|
<el-input v-model="scope.row.fDriverIdCar" placeholder="司机身份证"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus >= 40" />
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus >= 40" />
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fIsPass'">
|
|
|
<el-select v-model="scope.row.fIsPass" placeholder="是否放行"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 40" style="width: 80%">
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 40" style="width: 80%">
|
|
|
<el-option v-for="(item, index) in releaseList" :key="index.dictValue" :label="item.dictLabel"
|
|
|
- :value="item.dictValue" />
|
|
|
+ :value="item.dictValue" />
|
|
|
</el-select>
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fFleet'">
|
|
|
<el-select v-model="scope.row.fFleet" placeholder="车队"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus >= 40" style="width: 80%">
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus >= 40" style="width: 80%">
|
|
|
<el-option v-for="(item, index) in fleetOptions" :key="index.fId" :label="item.fName"
|
|
|
- :value="item.fId"></el-option>
|
|
|
+ :value="item.fId"></el-option>
|
|
|
</el-select>
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fLntype'">
|
|
|
<el-select v-model="scope.row.fLntype" placeholder="装卸方式"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus >= 40" style="width: 80%">
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus >= 40" style="width: 80%">
|
|
|
<el-option v-for="(item, index) in unloadModes" :key="index.dictValue" :label="item.dictLabel"
|
|
|
- :value="item.dictValue" />
|
|
|
+ :value="item.dictValue" />
|
|
|
</el-select>
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fForkliftman'">
|
|
|
<el-input v-model="scope.row.fForkliftman" placeholder="叉车工"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus >= 40" />
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus >= 40" />
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fStevedore'">
|
|
|
<el-input v-model="scope.row.fStevedore" placeholder="装卸工"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus >= 40" />
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus >= 40" />
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fLocalcntrno'">
|
|
|
<el-input v-model="scope.row.fLocalcntrno" placeholder="库内箱号"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus >= 40" v-Alphabet />
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus >= 40" v-Alphabet />
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fSealno'">
|
|
|
<el-input v-model="scope.row.fSealno" placeholder="封号"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus >= 40" />
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus >= 40" />
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'remark'">
|
|
|
<el-input v-model="scope.row.remark" placeholder="备注" :disabled="browseStatus" show-word-limit />
|
|
|
@@ -583,11 +582,11 @@
|
|
|
<span style="font-size: 16px; font-weight: bolder; margin-left: 5px">收款信息</span>
|
|
|
</template>
|
|
|
<income-money :browseStatus="browseStatus" @chiSave="saveForm" @chiAdd="addCollection" @feeChangeD="feeChange"
|
|
|
- :warehouseDrList="warehouseDrList" :businessTypeOption="businessTypeOption" :fDNameOptions="fDNameOptions"
|
|
|
- :fMblnoOptions="fMblnoOptions" :fFeetUnitOptions="fFeetUnitOptions" :fStltypeOptions="fStltypeOptions"
|
|
|
- :fGrossweight="fGrossweight" :fQty="fQty" :fNetweight="fNetweight" :fCntqty="fCntqty" :form="form"
|
|
|
- :company="company" :CntrTable="CntrTable" :cntrList="cntrList" :goodsOptions="goodsOptions"
|
|
|
- :fCompanyName="fCompanyName" :printFeeConfirm="printFeeConfirm" tableName="货物通关收款"></income-money>
|
|
|
+ :warehouseDrList="warehouseDrList" :businessTypeOption="businessTypeOption" :fDNameOptions="fDNameOptions"
|
|
|
+ :fMblnoOptions="fMblnoOptions" :fFeetUnitOptions="fFeetUnitOptions" :fStltypeOptions="fStltypeOptions"
|
|
|
+ :fGrossweight="fGrossweight" :fQty="fQty" :fNetweight="fNetweight" :fCntqty="fCntqty" :form="form"
|
|
|
+ :company="company" :CntrTable="CntrTable" :cntrList="cntrList" :goodsOptions="goodsOptions"
|
|
|
+ :fCompanyName="fCompanyName" :printFeeConfirm="printFeeConfirm" tableName="货物通关收款"></income-money>
|
|
|
</el-collapse-item>
|
|
|
|
|
|
<el-collapse-item>
|
|
|
@@ -596,17 +595,17 @@
|
|
|
<span style="font-size: 16px; font-weight: bolder; margin-left: 5px">付款信息</span>
|
|
|
</template>
|
|
|
<pay-money :browseStatus="browseStatus" @chiSave="saveForm" @chiAdd="addpayment" @checkRow="checkRow"
|
|
|
- @revokeRow="revokeRow" @feeChangeC="feeChange" :warehouseCrList="warehouseCrList"
|
|
|
- :businessTypeOption="businessTypeOption" :fCNameOptions="fCNameOptions" :fMblnoOptions="fMblnoOptions"
|
|
|
- :fFeetUnitOptions="fFeetUnitOptions" :fStltypeOptions="fStltypeOptions" :fGrossweight="fGrossweight"
|
|
|
- :fQty="fQty" :fNetweight="fNetweight" :fCntqty="fCntqty" :form="form" :goodsOptions="goodsOptions"
|
|
|
- :CntrTable="CntrTable" :cntrList="cntrList" tableName="货物通关付款"></pay-money>
|
|
|
+ @revokeRow="revokeRow" @feeChangeC="feeChange" :warehouseCrList="warehouseCrList"
|
|
|
+ :businessTypeOption="businessTypeOption" :fCNameOptions="fCNameOptions" :fMblnoOptions="fMblnoOptions"
|
|
|
+ :fFeetUnitOptions="fFeetUnitOptions" :fStltypeOptions="fStltypeOptions" :fGrossweight="fGrossweight"
|
|
|
+ :fQty="fQty" :fNetweight="fNetweight" :fCntqty="fCntqty" :form="form" :goodsOptions="goodsOptions"
|
|
|
+ :CntrTable="CntrTable" :cntrList="cntrList" tableName="货物通关付款"></pay-money>
|
|
|
</el-collapse-item>
|
|
|
</el-collapse>
|
|
|
<el-dialog title="在库物资" :modal="false" style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
|
|
|
- :visible.sync="whgenlegVisible" width="85%" @close="init2()" v-dialogDrag :close-on-click-modal="false">
|
|
|
+ :visible.sync="whgenlegVisible" width="85%" @close="init2()" v-dialogDrag :close-on-click-modal="false">
|
|
|
<el-dialog title="自定义列显示" :visible.sync="showSetting2" width="700px" v-dialogDrag append-to-body
|
|
|
- :close-on-click-modal="false">
|
|
|
+ :close-on-click-modal="false">
|
|
|
<template slot="title">
|
|
|
<div class="avue-crud__dialog__header">
|
|
|
<span class="el-dialog__title">
|
|
|
@@ -627,13 +626,13 @@
|
|
|
</div>
|
|
|
<div style="padding: 4px; display: flex; justify-content: center">
|
|
|
<draggable v-model="setRowList2" group="site" animation="300" @start="onStart" @end="onEnd"
|
|
|
- handle=".indraggable">
|
|
|
+ handle=".indraggable">
|
|
|
<transition-group>
|
|
|
<div v-for="item in setRowList2" :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>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -664,8 +663,8 @@
|
|
|
<el-col :span="10">
|
|
|
<el-form-item label="入库日期区间" prop="orgStorageDate" label-width="120px">
|
|
|
<el-date-picker style="width: 80%" v-model="whgenlegParams.orgStorageDate" type="daterange"
|
|
|
- start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
- :default-time="['00:00:00', '23:59:59']">
|
|
|
+ start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ :default-time="['00:00:00', '23:59:59']">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -678,10 +677,10 @@
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
<el-table :data="whgenlegList" ref="tableDialog" tooltip-effect="dark" width="100%" stripe
|
|
|
- @selection-change="whgenlegSelectionChange" :height="tableHeight">
|
|
|
+ @selection-change="whgenlegSelectionChange" :height="tableHeight">
|
|
|
<el-table-column type="selection" width="50"> </el-table-column>
|
|
|
<el-table-column v-for="(item, index) in getRowList2" :key="index" :label="item.name" :width="item.width"
|
|
|
- :prop="item.label" align="center" :fixed="item.fixed" sortable>
|
|
|
+ :prop="item.label" align="center" :fixed="item.fixed" sortable>
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="item.label == 'fQtyblc2'">
|
|
|
<el-input @change="qtyChange(scope.row)" v-model="scope.row.fQtyblc2" placeholder="件数" />
|
|
|
@@ -697,7 +696,7 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<pagination v-show="whgenlegTotal > 0" :total="whgenlegTotal" :page.sync="whgenlegParams.pageNum"
|
|
|
- :limit.sync="whgenlegParams.pageSize" @pagination="getDetailsList" />
|
|
|
+ :limit.sync="whgenlegParams.pageSize" @pagination="getDetailsList" />
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" @click="whgenlegData">导入库存总账</el-button>
|
|
|
<el-button @click="whgenlegVisible = false">取 消</el-button>
|
|
|
@@ -1027,7 +1026,7 @@ print_ykd = false;
|
|
|
</el-dialog>
|
|
|
<!-- 选择作业费协议数据 -->
|
|
|
<el-dialog v-dialogDrag title="作业费协议" :close-on-click-modal="false" :modal="false"
|
|
|
- style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important" :visible.sync="warehousingagreements" width="70%">
|
|
|
+ style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important" :visible.sync="warehousingagreements" width="70%">
|
|
|
<template slot="作业费协议">
|
|
|
<div class="avue-crud__dialog__header">
|
|
|
<span class="el-dialog__title">
|
|
|
@@ -1043,13 +1042,13 @@ print_ykd = false;
|
|
|
</div>
|
|
|
</template>
|
|
|
<el-menu :default-active="activeIndex" v-if="Navigation === true" class="el-menu-demo" mode="horizontal"
|
|
|
- @select="handleSelect">
|
|
|
+ @select="handleSelect">
|
|
|
<el-menu-item index="1">车队作业费</el-menu-item>
|
|
|
<el-menu-item index="2">劳务作业费</el-menu-item>
|
|
|
</el-menu>
|
|
|
|
|
|
<el-table :data="tasklegList" ref="table" tooltip-effect="dark" width="100%" border stripe
|
|
|
- @selection-change="whgenlegSelectionChange">
|
|
|
+ @selection-change="whgenlegSelectionChange">
|
|
|
<el-table-column type="selection" width="55"> </el-table-column>
|
|
|
<el-table-column label="行号" type="index" width="80">
|
|
|
</el-table-column>
|
|
|
@@ -1058,9 +1057,9 @@ print_ykd = false;
|
|
|
<el-table-column prop="fFeeUnitid" header-align="center" align="center" width="180px" label="计价单位">
|
|
|
<template slot-scope="scope">
|
|
|
<el-select v-model="scope.row.fFeeUnitid" placeholder="请选择计价单位" @change="changeFeeUnit(scope.row)" disabled
|
|
|
- clearable>
|
|
|
+ clearable>
|
|
|
<el-option v-for="(dict, index) in fFeetUnitOptions" :key="index.dictValue" :label="dict.dictLabel"
|
|
|
- :value="dict.dictValue" />
|
|
|
+ :value="dict.dictValue" />
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -1068,7 +1067,7 @@ print_ykd = false;
|
|
|
</el-table>
|
|
|
|
|
|
<pagination v-show="whgenlegTotal > 0" :total="whgenlegTotal" :page.sync="pageNum" :limit.sync="pageSize"
|
|
|
- @pagination="getWhgenlegList(key_id)" />
|
|
|
+ @pagination="getWhgenlegList(key_id)" />
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" @click="zhgenlegData" :disabled="browseStatus">导 入</el-button>
|
|
|
<el-button @click="
|
|
|
@@ -1078,9 +1077,9 @@ Navigation = false;
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
<el-dialog title="选择库位" :data="treeselectList" :visible.sync="choiceWarehouse" width="30%"
|
|
|
- :before-close="hanDleclose">
|
|
|
+ :before-close="hanDleclose">
|
|
|
<treeselect v-model="treeselectList.fWarehouselocid" @select="getAlltree" :options="fWarehouseidOptions"
|
|
|
- :show-count="true" :disable-branch-nodes="true" placeholder="请选择归属库区" />
|
|
|
+ :show-count="true" :disable-branch-nodes="true" placeholder="请选择归属库区" />
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="choiceWarehouse = false">取 消</el-button>
|
|
|
<el-button type="primary" @click="confirm">确 定</el-button>
|
|
|
@@ -1092,7 +1091,7 @@ Navigation = false;
|
|
|
<approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData">
|
|
|
</approval-comments>
|
|
|
<el-button type="primary" :disabled="approvalStatus" v-if="form.fBillstatus > 3"
|
|
|
- @click="addOrUpdateHandle(form, 'f_billstatus')">查看审批</el-button>
|
|
|
+ @click="addOrUpdateHandle(form, 'f_billstatus')">查看审批</el-button>
|
|
|
<el-button type="primary" v-if="approVal === true" @click="addOrUpdateHand(form, 'f_billstatus')">审批</el-button>
|
|
|
<el-button :disabled="browseStatus" type="primary" @click="saveForm()">保 存</el-button>
|
|
|
<el-button :disabled="browseStatus" style="background-color: #008000; color: #fff" @click="submitForm()">请核
|
|
|
@@ -1100,7 +1099,7 @@ Navigation = false;
|
|
|
<el-button type="danger" v-if="form.fBillstatus === 6" @click="revoke" v-hasPermi="['warehouseBusiness:revoke']">
|
|
|
撤销请核</el-button>
|
|
|
<el-button type="danger" v-if="form.fBillstatus === 4 && current == before" :disabled="doNot"
|
|
|
- @click="revokeTwo('f_billstatus')">撤销审批</el-button>
|
|
|
+ @click="revokeTwo('f_billstatus')">撤销审批</el-button>
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -1644,87 +1643,87 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
- this.setRowList = this.tableDate;
|
|
|
- this.getRowList = this.tableDate;
|
|
|
- this.setRowList2 = this.tableDate2;
|
|
|
- this.getRowList2 = this.tableDate2;
|
|
|
- this.getDicts("data_stltype_type").then((response) => {
|
|
|
- this.fStltypeOptions = response.data;
|
|
|
- });
|
|
|
- this.getDicts("data_unitfees").then((response) => {
|
|
|
- this.fFeetUnitOptions = response.data;
|
|
|
- });
|
|
|
- this.getDicts("data_trademodes").then((response) => {
|
|
|
- this.fTrademodeidOptions = response.data;
|
|
|
- });
|
|
|
- this.getDicts("data_ifweigh_status").then((response) => {
|
|
|
- this.fIfweighOptions = response.data;
|
|
|
- });
|
|
|
- this.getDicts("sys_car_type").then((response) => {
|
|
|
- this.fCartypeOptions = response.data;
|
|
|
- });
|
|
|
- this.getDicts("unload_mode").then((response) => {
|
|
|
- this.unloadModes = response.data;
|
|
|
- });
|
|
|
- this.getDicts("data_ifdamage_status").then((response) => {
|
|
|
- this.fIfdamageOptions = response.data;
|
|
|
- });
|
|
|
- this.getDicts("st_trans_type").then((response) => {
|
|
|
- this.businessTypeOption = response.data ? response.data : [];
|
|
|
- localStorage.setItem("businessTypeList", JSON.stringify(response.data));
|
|
|
- });
|
|
|
- this.getDicts("storage_type").then((response) => {
|
|
|
- this.fStorageTypeOptions = response.data;
|
|
|
- localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
|
|
|
- });
|
|
|
- this.getConfigKey("data_showcar").then((response) => {
|
|
|
- this.dataShowcar = response.msg;
|
|
|
- if (this.dataShowcar == "0") {
|
|
|
- this.detailsHidden2 = false;
|
|
|
- } else {
|
|
|
- this.detailsHidden2 = true;
|
|
|
- }
|
|
|
- });
|
|
|
- this.getConfigKey('entry.printing').then((response) => {
|
|
|
- this.entryPrinting = response.msg
|
|
|
- })
|
|
|
- listWarehousesss({ fStatus: 0, delFlag: 0 }).then((response) => {
|
|
|
- this.warehouseOptions = response.rows;
|
|
|
- });
|
|
|
- listFees({ fDc: "C" }).then((response) => {
|
|
|
- this.fCNameOptions = response.rows;
|
|
|
- });
|
|
|
- listFees({ fDc: "D" }).then((response) => {
|
|
|
- this.fDNameOptions = response.rows;
|
|
|
- });
|
|
|
- listCorps({ type: 1 }).then((response) => {
|
|
|
- this.fMblnoOptions = response.rows;
|
|
|
- });
|
|
|
- listCorps().then((response) => {
|
|
|
- this.fSbuOptions = response.rows;
|
|
|
- });
|
|
|
- listUser().then((response) => {
|
|
|
- this.userOptions = response.rows;
|
|
|
- });
|
|
|
- listGoods({ fStatus: 0, delFlag: 0 }).then((response) => {
|
|
|
- this.goodsOptions = response.rows;
|
|
|
- });
|
|
|
- listCntrs({ fStatus: "T" }).then((response) => {
|
|
|
- this.cntrList = response.rows;
|
|
|
- });
|
|
|
- listCorps({ fTypeid: 6 }).then((response) => {
|
|
|
- this.fCompanyOptIons = response.rows;
|
|
|
- });
|
|
|
- listCorps({ fTypeid: 2 }).then((response) => {
|
|
|
- this.fleetOptions = response.rows;
|
|
|
- });
|
|
|
- this.getConfigKey("outStock.orders.approvalFlow").then((response) => {
|
|
|
- this.showApproval = response.msg;
|
|
|
- });
|
|
|
- this.company = Cookies.get("companyName")
|
|
|
- this.queryUser();
|
|
|
- this.getRow();
|
|
|
- this.getRow2();
|
|
|
+ // this.setRowList = this.tableDate;
|
|
|
+ // this.getRowList = this.tableDate;
|
|
|
+ // this.setRowList2 = this.tableDate2;
|
|
|
+ // this.getRowList2 = this.tableDate2;
|
|
|
+ // this.getDicts("data_stltype_type").then((response) => {
|
|
|
+ // this.fStltypeOptions = response.data;
|
|
|
+ // });
|
|
|
+ // this.getDicts("data_unitfees").then((response) => {
|
|
|
+ // this.fFeetUnitOptions = response.data;
|
|
|
+ // });
|
|
|
+ // this.getDicts("data_trademodes").then((response) => {
|
|
|
+ // this.fTrademodeidOptions = response.data;
|
|
|
+ // });
|
|
|
+ // this.getDicts("data_ifweigh_status").then((response) => {
|
|
|
+ // this.fIfweighOptions = response.data;
|
|
|
+ // });
|
|
|
+ // this.getDicts("sys_car_type").then((response) => {
|
|
|
+ // this.fCartypeOptions = response.data;
|
|
|
+ // });
|
|
|
+ // this.getDicts("unload_mode").then((response) => {
|
|
|
+ // this.unloadModes = response.data;
|
|
|
+ // });
|
|
|
+ // this.getDicts("data_ifdamage_status").then((response) => {
|
|
|
+ // this.fIfdamageOptions = response.data;
|
|
|
+ // });
|
|
|
+ // this.getDicts("st_trans_type").then((response) => {
|
|
|
+ // this.businessTypeOption = response.data ? response.data : [];
|
|
|
+ // localStorage.setItem("businessTypeList", JSON.stringify(response.data));
|
|
|
+ // });
|
|
|
+ // this.getDicts("storage_type").then((response) => {
|
|
|
+ // this.fStorageTypeOptions = response.data;
|
|
|
+ // localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
|
|
|
+ // });
|
|
|
+ // this.getConfigKey("data_showcar").then((response) => {
|
|
|
+ // this.dataShowcar = response.msg;
|
|
|
+ // if (this.dataShowcar == "0") {
|
|
|
+ // this.detailsHidden2 = false;
|
|
|
+ // } else {
|
|
|
+ // this.detailsHidden2 = true;
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // this.getConfigKey('entry.printing').then((response) => {
|
|
|
+ // this.entryPrinting = response.msg
|
|
|
+ // })
|
|
|
+ // listWarehousesss({ fStatus: 0, delFlag: 0 }).then((response) => {
|
|
|
+ // this.warehouseOptions = response.rows;
|
|
|
+ // });
|
|
|
+ // listFees({ fDc: "C" }).then((response) => {
|
|
|
+ // this.fCNameOptions = response.rows;
|
|
|
+ // });
|
|
|
+ // listFees({ fDc: "D" }).then((response) => {
|
|
|
+ // this.fDNameOptions = response.rows;
|
|
|
+ // });
|
|
|
+ // listCorps({ type: 1 }).then((response) => {
|
|
|
+ // this.fMblnoOptions = response.rows;
|
|
|
+ // });
|
|
|
+ // listCorps().then((response) => {
|
|
|
+ // this.fSbuOptions = response.rows;
|
|
|
+ // });
|
|
|
+ // listUser().then((response) => {
|
|
|
+ // this.userOptions = response.rows;
|
|
|
+ // });
|
|
|
+ // listGoods({ fStatus: 0, delFlag: 0 }).then((response) => {
|
|
|
+ // this.goodsOptions = response.rows;
|
|
|
+ // });
|
|
|
+ // listCntrs({ fStatus: "T" }).then((response) => {
|
|
|
+ // this.cntrList = response.rows;
|
|
|
+ // });
|
|
|
+ // listCorps({ fTypeid: 6 }).then((response) => {
|
|
|
+ // this.fCompanyOptIons = response.rows;
|
|
|
+ // });
|
|
|
+ // listCorps({ fTypeid: 2 }).then((response) => {
|
|
|
+ // this.fleetOptions = response.rows;
|
|
|
+ // });
|
|
|
+ // this.getConfigKey("outStock.orders.approvalFlow").then((response) => {
|
|
|
+ // this.showApproval = response.msg;
|
|
|
+ // });
|
|
|
+ // this.company = Cookies.get("companyName")
|
|
|
+ // this.queryUser();
|
|
|
+ // this.getRow();
|
|
|
+ // this.getRow2();
|
|
|
},
|
|
|
mounted() {
|
|
|
this.$nextTick(() => {
|
caojunjie