|
|
@@ -85,9 +85,17 @@
|
|
|
<el-button type="primary" @click="checkTrans()"
|
|
|
><i class="el-icon-truck"></i>轨迹</el-button
|
|
|
>
|
|
|
- <el-button type="primary" @click="operation()"
|
|
|
+ <!-- <el-button type="primary" @click="operation()"
|
|
|
><i class="el-icon-edit"></i>更改</el-button
|
|
|
+ > -->
|
|
|
+ <el-button
|
|
|
+ type="success"
|
|
|
+ circle
|
|
|
+ @click="updateDetailsOrderPrice"
|
|
|
+ v-if="!notRoutList.includes('capacityNo')"
|
|
|
>
|
|
|
+ <i class="el-icon-edit"></i>修改计费详单
|
|
|
+ </el-button>
|
|
|
<!-- <el-button type="primary" @click="batchoperation()"
|
|
|
><i class="el-icon-edit"></i>批量更改</el-button
|
|
|
> -->
|
|
|
@@ -117,243 +125,568 @@
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
</div>
|
|
|
- <div class="table">
|
|
|
- <el-table
|
|
|
- :data="visibleList"
|
|
|
- :span-method="objectSpanMethod"
|
|
|
- ref="tableRef"
|
|
|
- border
|
|
|
- style="width: 100%; margin-top: 20px"
|
|
|
- :height="maxHeight"
|
|
|
- :row-class-name="tableRowClassName"
|
|
|
- @cell-click="cellClik"
|
|
|
- @cell-mouse-enter="cellMouse1"
|
|
|
- @cell-mouse-leave="cellLeave1"
|
|
|
- @row-click="rowClick"
|
|
|
- :cell-style="cellStyle"
|
|
|
- @filter-change="filterChange"
|
|
|
- :key="saleSteelKey"
|
|
|
- id="salesLogisticsStat_saleSteelReports_table"
|
|
|
- individual-panel
|
|
|
- @resetTable="reset"
|
|
|
- @selection-change="handleSelectionChange()"
|
|
|
- >
|
|
|
- <el-table-column type="selection" width="30" label="选择">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- width="50"
|
|
|
- label="序号"
|
|
|
- align="center"
|
|
|
- :resizable="false"
|
|
|
- >
|
|
|
- <template slot-scope="scope">{{ scope.row.group + 1 }}</template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="orderTime"
|
|
|
- label="订单日期"
|
|
|
- width="110px"
|
|
|
- align="center"
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="consigneeName"
|
|
|
- label="客户"
|
|
|
- width="160px"
|
|
|
- align="center"
|
|
|
- column-key="consigneeName"
|
|
|
- :filters="filterConsigneeList"
|
|
|
- sortable
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="areaName"
|
|
|
- label="销售片区"
|
|
|
- width="150px"
|
|
|
- align="center"
|
|
|
- column-key="saleAreaList"
|
|
|
- :filters="filterSaleAreaList"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="carrierName"
|
|
|
- label="承运商"
|
|
|
- align="center"
|
|
|
- width="80px"
|
|
|
- column-key="carrierList"
|
|
|
- sortable
|
|
|
- show-overflow-tooltip
|
|
|
- :filters="filterCarrierList"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="capacityNo"
|
|
|
- column-key="capacityNo"
|
|
|
- label="车牌号"
|
|
|
- align="center"
|
|
|
- width="90px"
|
|
|
- sortable
|
|
|
- show-overflow-tooltip
|
|
|
- :filters="filterCapacityList"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="materialName"
|
|
|
- column-key="materialNameList"
|
|
|
- label="物资名称"
|
|
|
- align="center"
|
|
|
- width="150px"
|
|
|
- sortable
|
|
|
- :filters="filtermaterialNameList"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="materialSpe"
|
|
|
- label="物资规格"
|
|
|
- column-key="materialSpe"
|
|
|
- align="center"
|
|
|
- sortable
|
|
|
- :filters="filtermaterialSpe"
|
|
|
- width="120px"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="materialNum"
|
|
|
- label="物资件数"
|
|
|
- align="center"
|
|
|
- width="50px"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="addressPlace"
|
|
|
- label="收货地址"
|
|
|
- width="250px"
|
|
|
- sortable
|
|
|
- column-key="addressPlace"
|
|
|
- :filters="filteraddressPlace"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="saleRemark"
|
|
|
- column-key="saleRemark"
|
|
|
- label="摘要"
|
|
|
- width="150px"
|
|
|
- align="center"
|
|
|
- :filters="filterSaleRemark"
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="capacityTel"
|
|
|
- label="司机电话"
|
|
|
- width="120px"
|
|
|
- align="center"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="tareWeightTime"
|
|
|
- label="皮重时间"
|
|
|
- width="130px"
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column prop="tareWeight" label="皮重" show-overflow-tooltip>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="grossWeightTime"
|
|
|
- label="毛重时间"
|
|
|
- width="130px"
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column prop="grossWeight" label="毛重" show-overflow-tooltip>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column prop="netWeight" label="净重" show-overflow-tooltip>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="isPrintDelivery"
|
|
|
- label="送货单打印"
|
|
|
- align="center"
|
|
|
- width="100px"
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="outGateTime"
|
|
|
- column-key="outGateTimeList"
|
|
|
- label="出厂时间"
|
|
|
- width="130px"
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="arrivalAddress"
|
|
|
- label="抵达地址"
|
|
|
- width="280px"
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column prop="arrivalTime" label="抵达时间" width="150px">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="receiptAddress"
|
|
|
- label="签收地址"
|
|
|
- width="280px"
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column prop="receiptTime" label="签收时间" width="150px">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column prop="priceValue" label="系统建议运价" width="100px">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="detailsAmount"
|
|
|
- label="系统建议运费"
|
|
|
- width="100px"
|
|
|
- ></el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="orderNo"
|
|
|
- label="运输订单号"
|
|
|
- width="180px"
|
|
|
- align="center"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
+ <div class="table11">
|
|
|
+ <el-tabs v-model="activeName">
|
|
|
+ <el-tab-pane label="未结算" name="first">
|
|
|
+ <div class="table">
|
|
|
+ <el-table
|
|
|
+ :data="visibleList"
|
|
|
+ :span-method="objectSpanMethod"
|
|
|
+ ref="tableRef"
|
|
|
+ border
|
|
|
+ style="width: 100%; margin-top: 20px"
|
|
|
+ :height="maxHeight"
|
|
|
+ :row-class-name="tableRowClassName"
|
|
|
+ @cell-click="cellClik"
|
|
|
+ @cell-mouse-enter="cellMouse1"
|
|
|
+ @cell-mouse-leave="cellLeave1"
|
|
|
+ @row-click="rowClick"
|
|
|
+ :cell-style="cellStyle"
|
|
|
+ @filter-change="filterChange"
|
|
|
+ :key="saleSteelKey"
|
|
|
+ id="salesLogisticsStat_saleSteelReports_table"
|
|
|
+ individual-panel
|
|
|
+ @resetTable="reset"
|
|
|
+ @selection-change="handleSelectionChange()"
|
|
|
+ >
|
|
|
+ <el-table-column type="selection" width="30" label="选择">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ width="50"
|
|
|
+ label="序号"
|
|
|
+ align="center"
|
|
|
+ :resizable="false"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">{{
|
|
|
+ scope.row.group + 1
|
|
|
+ }}</template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="orderTime"
|
|
|
+ label="订单日期"
|
|
|
+ width="110px"
|
|
|
+ align="center"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="consigneeName"
|
|
|
+ label="客户"
|
|
|
+ width="160px"
|
|
|
+ align="center"
|
|
|
+ column-key="consigneeName"
|
|
|
+ :filters="filterConsigneeList"
|
|
|
+ sortable
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="areaName"
|
|
|
+ label="销售片区"
|
|
|
+ width="150px"
|
|
|
+ align="center"
|
|
|
+ column-key="saleAreaList"
|
|
|
+ :filters="filterSaleAreaList"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="carrierName"
|
|
|
+ label="承运商"
|
|
|
+ align="center"
|
|
|
+ width="80px"
|
|
|
+ column-key="carrierList"
|
|
|
+ sortable
|
|
|
+ show-overflow-tooltip
|
|
|
+ :filters="filterCarrierList"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="capacityNo"
|
|
|
+ column-key="capacityNo"
|
|
|
+ label="车牌号"
|
|
|
+ align="center"
|
|
|
+ width="90px"
|
|
|
+ sortable
|
|
|
+ show-overflow-tooltip
|
|
|
+ :filters="filterCapacityList"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="materialName"
|
|
|
+ column-key="materialNameList"
|
|
|
+ label="物资名称"
|
|
|
+ align="center"
|
|
|
+ width="150px"
|
|
|
+ sortable
|
|
|
+ :filters="filtermaterialNameList"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="materialSpe"
|
|
|
+ label="物资规格"
|
|
|
+ column-key="materialSpe"
|
|
|
+ align="center"
|
|
|
+ sortable
|
|
|
+ :filters="filtermaterialSpe"
|
|
|
+ width="120px"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="materialNum"
|
|
|
+ label="物资件数"
|
|
|
+ align="center"
|
|
|
+ width="50px"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="addressPlace"
|
|
|
+ label="收货地址"
|
|
|
+ width="250px"
|
|
|
+ sortable
|
|
|
+ column-key="addressPlace"
|
|
|
+ :filters="filteraddressPlace"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="saleRemark"
|
|
|
+ column-key="saleRemark"
|
|
|
+ label="摘要"
|
|
|
+ width="150px"
|
|
|
+ align="center"
|
|
|
+ :filters="filterSaleRemark"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="capacityTel"
|
|
|
+ label="司机电话"
|
|
|
+ width="120px"
|
|
|
+ align="center"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="tareWeightTime"
|
|
|
+ label="皮重时间"
|
|
|
+ width="130px"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="tareWeight"
|
|
|
+ label="皮重"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="grossWeightTime"
|
|
|
+ label="毛重时间"
|
|
|
+ width="130px"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="grossWeight"
|
|
|
+ label="毛重"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="netWeight"
|
|
|
+ label="净重"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="isPrintDelivery"
|
|
|
+ label="送货单打印"
|
|
|
+ align="center"
|
|
|
+ width="100px"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="outGateTime"
|
|
|
+ column-key="outGateTimeList"
|
|
|
+ label="出厂时间"
|
|
|
+ width="130px"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="arrivalAddress"
|
|
|
+ label="抵达地址"
|
|
|
+ width="280px"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="arrivalTime"
|
|
|
+ label="抵达时间"
|
|
|
+ width="150px"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="receiptAddress"
|
|
|
+ label="签收地址"
|
|
|
+ width="280px"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="receiptTime"
|
|
|
+ label="签收时间"
|
|
|
+ width="150px"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="priceValue"
|
|
|
+ label="系统建议运价"
|
|
|
+ width="100px"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="detailsAmount"
|
|
|
+ label="系统建议运费"
|
|
|
+ width="100px"
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="futurePriceValue"
|
|
|
+ label="修改后的运价"
|
|
|
+ width="100px"
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="futureDetailsAmount"
|
|
|
+ label="修改后的运费"
|
|
|
+ width="100px"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="orderNo"
|
|
|
+ label="运输订单号"
|
|
|
+ width="180px"
|
|
|
+ align="center"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+ <el-table-column prop="saler" label="业务员" align="center">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="shipperName"
|
|
|
+ label="发货单位"
|
|
|
+ width="170px"
|
|
|
+ align="center"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="consigneeTel"
|
|
|
+ label="收货客户电话"
|
|
|
+ width="120px"
|
|
|
+ align="center"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="isSelfMention"
|
|
|
+ label="是否自提"
|
|
|
+ align="center"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
+ prop="saleOrderNo"
|
|
|
+ label="销售订单号"
|
|
|
+ width="200px"
|
|
|
+ align="center"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="closeEntryId"
|
|
|
+ label="金蝶分录ID"
|
|
|
+ width="120px"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ </el-tab-pane>
|
|
|
+ <el-tab-pane label="已结算" name="second">
|
|
|
+ <div class="table1">
|
|
|
+ <el-table
|
|
|
+ :data="visibleList1"
|
|
|
+ :span-method="objectSpanMethod"
|
|
|
+ ref="tableRef1"
|
|
|
+ border
|
|
|
+ style="width: 100%; margin-top: 20px"
|
|
|
+ :height="maxHeight"
|
|
|
+ :row-class-name="tableRowClassName"
|
|
|
+ @cell-click="cellClik"
|
|
|
+ @cell-mouse-enter="cellMouse1"
|
|
|
+ @cell-mouse-leave="cellLeave1"
|
|
|
+ @row-click="rowClick"
|
|
|
+ :cell-style="cellStyle"
|
|
|
+ @filter-change="filterChange"
|
|
|
+ :key="saleSteelKey"
|
|
|
+ id="salesLogisticsStat_saleSteelReports_table"
|
|
|
+ individual-panel
|
|
|
+ @resetTable="reset"
|
|
|
+ >
|
|
|
+ <el-table-column
|
|
|
+ width="50"
|
|
|
+ label="序号"
|
|
|
+ align="center"
|
|
|
+ :resizable="false"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">{{
|
|
|
+ scope.row.group + 1
|
|
|
+ }}</template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="orderTime"
|
|
|
+ label="订单日期"
|
|
|
+ width="110px"
|
|
|
+ align="center"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="consigneeName"
|
|
|
+ label="客户"
|
|
|
+ width="160px"
|
|
|
+ align="center"
|
|
|
+ column-key="consigneeName"
|
|
|
+ :filters="filterConsigneeList"
|
|
|
+ sortable
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="areaName"
|
|
|
+ label="销售片区"
|
|
|
+ width="150px"
|
|
|
+ align="center"
|
|
|
+ column-key="saleAreaList"
|
|
|
+ :filters="filterSaleAreaList"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="carrierName"
|
|
|
+ label="承运商"
|
|
|
+ align="center"
|
|
|
+ width="80px"
|
|
|
+ column-key="carrierList"
|
|
|
+ sortable
|
|
|
+ show-overflow-tooltip
|
|
|
+ :filters="filterCarrierList"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="capacityNo"
|
|
|
+ column-key="capacityNo"
|
|
|
+ label="车牌号"
|
|
|
+ align="center"
|
|
|
+ width="90px"
|
|
|
+ sortable
|
|
|
+ show-overflow-tooltip
|
|
|
+ :filters="filterCapacityList"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="materialName"
|
|
|
+ column-key="materialNameList"
|
|
|
+ label="物资名称"
|
|
|
+ align="center"
|
|
|
+ width="150px"
|
|
|
+ sortable
|
|
|
+ :filters="filtermaterialNameList"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="materialSpe"
|
|
|
+ label="物资规格"
|
|
|
+ column-key="materialSpe"
|
|
|
+ align="center"
|
|
|
+ sortable
|
|
|
+ :filters="filtermaterialSpe"
|
|
|
+ width="120px"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="materialNum"
|
|
|
+ label="物资件数"
|
|
|
+ align="center"
|
|
|
+ width="50px"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="addressPlace"
|
|
|
+ label="收货地址"
|
|
|
+ width="250px"
|
|
|
+ sortable
|
|
|
+ column-key="addressPlace"
|
|
|
+ :filters="filteraddressPlace"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="saleRemark"
|
|
|
+ column-key="saleRemark"
|
|
|
+ label="摘要"
|
|
|
+ width="150px"
|
|
|
+ align="center"
|
|
|
+ :filters="filterSaleRemark"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="capacityTel"
|
|
|
+ label="司机电话"
|
|
|
+ width="120px"
|
|
|
+ align="center"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="tareWeightTime"
|
|
|
+ label="皮重时间"
|
|
|
+ width="130px"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="tareWeight"
|
|
|
+ label="皮重"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="grossWeightTime"
|
|
|
+ label="毛重时间"
|
|
|
+ width="130px"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="grossWeight"
|
|
|
+ label="毛重"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="netWeight"
|
|
|
+ label="净重"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="isPrintDelivery"
|
|
|
+ label="送货单打印"
|
|
|
+ align="center"
|
|
|
+ width="100px"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="outGateTime"
|
|
|
+ column-key="outGateTimeList"
|
|
|
+ label="出厂时间"
|
|
|
+ width="130px"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="arrivalAddress"
|
|
|
+ label="抵达地址"
|
|
|
+ width="280px"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="arrivalTime"
|
|
|
+ label="抵达时间"
|
|
|
+ width="150px"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="receiptAddress"
|
|
|
+ label="签收地址"
|
|
|
+ width="280px"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="receiptTime"
|
|
|
+ label="签收时间"
|
|
|
+ width="150px"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="priceValue"
|
|
|
+ label="系统建议运价"
|
|
|
+ width="100px"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="detailsAmount"
|
|
|
+ label="系统建议运费"
|
|
|
+ width="100px"
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="futurePriceValue"
|
|
|
+ label="修改后的运价"
|
|
|
+ width="100px"
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="futureDetailsAmount"
|
|
|
+ label="修改后的运费"
|
|
|
+ width="100px"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="orderNo"
|
|
|
+ label="运输订单号"
|
|
|
+ width="180px"
|
|
|
+ align="center"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
|
|
|
- <el-table-column prop="saler" label="业务员" align="center">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="shipperName"
|
|
|
- label="发货单位"
|
|
|
- width="170px"
|
|
|
- align="center"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="consigneeTel"
|
|
|
- label="收货客户电话"
|
|
|
- width="120px"
|
|
|
- align="center"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column prop="isSelfMention" label="是否自提" align="center">
|
|
|
- </el-table-column>
|
|
|
+ <el-table-column prop="saler" label="业务员" align="center">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="shipperName"
|
|
|
+ label="发货单位"
|
|
|
+ width="170px"
|
|
|
+ align="center"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="consigneeTel"
|
|
|
+ label="收货客户电话"
|
|
|
+ width="120px"
|
|
|
+ align="center"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="isSelfMention"
|
|
|
+ label="是否自提"
|
|
|
+ align="center"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
- prop="saleOrderNo"
|
|
|
- label="销售订单号"
|
|
|
- width="200px"
|
|
|
- align="center"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="closeEntryId"
|
|
|
- label="金蝶分录ID"
|
|
|
- width="120px"
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
+ <el-table-column
|
|
|
+ prop="saleOrderNo"
|
|
|
+ label="销售订单号"
|
|
|
+ width="200px"
|
|
|
+ align="center"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="closeEntryId"
|
|
|
+ label="金蝶分录ID"
|
|
|
+ width="120px"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ </el-tab-pane>
|
|
|
+ </el-tabs>
|
|
|
</div>
|
|
|
<div>
|
|
|
<vxe-modal
|
|
|
@@ -721,14 +1054,16 @@ export default {
|
|
|
centerDialogVisibleBatch: false,
|
|
|
reallyList: [],
|
|
|
visibleList: [],
|
|
|
+ visibleList1: [],
|
|
|
itemHeight: 30,
|
|
|
scrollTop: 0,
|
|
|
totalHeight: 0,
|
|
|
debounceS: false,
|
|
|
carNumber: '',
|
|
|
+ activeName: 'first',
|
|
|
//弹出框
|
|
|
centerDialogVisible: false,
|
|
|
- //根据车序号查询的值
|
|
|
+ //
|
|
|
steelMap: {},
|
|
|
//钢材子表数据
|
|
|
steelList: [],
|
|
|
@@ -920,6 +1255,9 @@ export default {
|
|
|
aaadrawer: false,
|
|
|
downloadCapacityNo: null,
|
|
|
makeSurePriceOrderList: [],
|
|
|
+ makeSurePriceId: null,
|
|
|
+ makeSurePlaceId: null,
|
|
|
+
|
|
|
ops: {
|
|
|
vuescroll: {},
|
|
|
scrollPanel: {},
|
|
|
@@ -1097,14 +1435,12 @@ export default {
|
|
|
updateDetailsOrderPrice() {
|
|
|
this.originalAddress = this.steelMap.addressPlace
|
|
|
this.originalPriceValue = this.steelMap.priceValue
|
|
|
- console.log('数据是否正确')
|
|
|
- console.log(this.originalAddress)
|
|
|
- console.log(this.originalPriceValue)
|
|
|
this.Address.requestUrl =
|
|
|
'/api/v1/ams/getAddressDeliveryAddress?apiId=511&i=' + new Date()
|
|
|
this.dialogFormVisible = true
|
|
|
},
|
|
|
currentRadioChange2(val) {
|
|
|
+ console.log(val)
|
|
|
//若具体地址有值，清空值
|
|
|
if (this.place != null) {
|
|
|
this.place = null
|
|
|
@@ -1113,14 +1449,38 @@ export default {
|
|
|
this.steelMap.address = val.address
|
|
|
this.steelMap.addressId = val.addressId
|
|
|
this.steelMap.priceId = val.priceid
|
|
|
+ this.makeSurePriceId = val.priceid
|
|
|
+ this.makeSurePlaceId = val.placeId
|
|
|
},
|
|
|
makeSure() {
|
|
|
//若没有单价Id
|
|
|
- let mapValue = {
|
|
|
- orderId: this.steelMap.orderId,
|
|
|
- priceId: this.steelMap.priceId,
|
|
|
- placeId: this.steelMap.placeId
|
|
|
+ // let mapValue = {
|
|
|
+ // orderId: this.steelMap.orderId,
|
|
|
+ // priceId: this.steelMap.priceId,
|
|
|
+ // placeId: this.steelMap.placeId,
|
|
|
+ // detailsAmount: this.steelMap.mapList[0].detailsAmount
|
|
|
+ // }
|
|
|
+ console.log(this.makeSurePriceOrderList)
|
|
|
+ if (this.makeSurePriceOrderList.length == 0) {
|
|
|
+ this.$message({
|
|
|
+ type: 'success',
|
|
|
+ message: '请先选择需要修改的单价',
|
|
|
+ duration: 2000,
|
|
|
+ offset: '250'
|
|
|
+ })
|
|
|
+ return
|
|
|
}
|
|
|
+ let mapList = []
|
|
|
+ debugger
|
|
|
+ this.makeSurePriceOrderList.forEach(e => {
|
|
|
+ let map = {}
|
|
|
+ map.orderId = e
|
|
|
+ map.priceId = this.makeSurePriceId
|
|
|
+ map.placeId = this.makeSurePlaceId
|
|
|
+ mapList.push(map)
|
|
|
+ })
|
|
|
+ let mapValue = {}
|
|
|
+ mapValue.mapList = mapList
|
|
|
//是否确定修改详单地址!
|
|
|
this.$confirm('确定修改', '提示', {
|
|
|
confirmButtonText: '仅修改单价',
|
|
|
@@ -1132,12 +1492,13 @@ export default {
|
|
|
.then(() => {
|
|
|
//初始化修改详单地址对话框的信息
|
|
|
this.axios
|
|
|
- .post('/api/v1/bms/updateDetailsOrder', mapValue)
|
|
|
+ .post('/api/v1/bms/updateBatchDetailsOrder', mapValue)
|
|
|
.then(res => {
|
|
|
- if (res.data.code == '0') {
|
|
|
+ if (res.data.code == '200') {
|
|
|
this.$message.success('修改详单单价成功!')
|
|
|
+ this.$refs.tableRef.clearSelection()
|
|
|
//重置未结算详单表单信息
|
|
|
- this.operation(this.steelMap)
|
|
|
+ // this.operation(this.steelMap)
|
|
|
this.getSteelReport()
|
|
|
this.dialogFormVisible = false
|
|
|
} else {
|
|
|
@@ -1150,11 +1511,12 @@ export default {
|
|
|
if (action === 'cancel') {
|
|
|
mapValue.updatePlace = 1
|
|
|
this.axios
|
|
|
- .post('/api/v1/bms/updateDetailsOrder', mapValue)
|
|
|
+ .post('/api/v1/bms/updateBatchDetailsOrder', mapValue)
|
|
|
.then(res => {
|
|
|
- if (res.data.code == '0') {
|
|
|
+ if (res.data.code == '200') {
|
|
|
+ this.$refs.tableRef.clearSelection()
|
|
|
this.$message.success('修改详单单价和地址成功!')
|
|
|
- this.operation(this.steelMap)
|
|
|
+ // this.operation(this.steelMap)
|
|
|
this.getSteelReport()
|
|
|
this.dialogFormVisible = false
|
|
|
}
|
|
|
@@ -2549,6 +2911,40 @@ export default {
|
|
|
loading.close()
|
|
|
console.log(this.visibleList)
|
|
|
})
|
|
|
+ this.axios
|
|
|
+ .post(
|
|
|
+ '/api/v1/tms/getSettledSaleSteelReportNew?startTime=' +
|
|
|
+ startTime +
|
|
|
+ '&endTime=' +
|
|
|
+ endTime +
|
|
|
+ '&carrierSsoId=' +
|
|
|
+ carrierSsoId +
|
|
|
+ '&i=' +
|
|
|
+ new Date() +
|
|
|
+ '&remark=' +
|
|
|
+ remark +
|
|
|
+ '&consigneeName=' +
|
|
|
+ consigneeName +
|
|
|
+ '&carrierName=' +
|
|
|
+ carrierName +
|
|
|
+ '&capacityNo=' +
|
|
|
+ capacityNo +
|
|
|
+ '&saler=' +
|
|
|
+ saler +
|
|
|
+ '&easPrimaryId=' +
|
|
|
+ easPrimaryId,
|
|
|
+ obj
|
|
|
+ )
|
|
|
+ .then(res => {
|
|
|
+ this.tableData = res.data.data
|
|
|
+ this.totalHeight += this.itemHeight
|
|
|
+ this.visibleList1 = res.data.data
|
|
|
+ console.log(this.visibleList1, 'this.visibleList1')
|
|
|
+ this.getSpanArr(this.visibleList1)
|
|
|
+ this.getTotalNum(this.tableData)
|
|
|
+ loading.close()
|
|
|
+ console.log(this.visibleList1)
|
|
|
+ })
|
|
|
},
|
|
|
//重新获取表格数据
|
|
|
refresh() {
|
|
|
@@ -2610,7 +3006,6 @@ export default {
|
|
|
if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
|
|
|
saler = getCookie('loginName')
|
|
|
}
|
|
|
-
|
|
|
this.axios
|
|
|
.post(
|
|
|
'/api/v1/tms/getSaleSteelReportNew?startTime=' +
|
|
|
@@ -2649,6 +3044,45 @@ export default {
|
|
|
.catch(() => {
|
|
|
loading.close()
|
|
|
})
|
|
|
+
|
|
|
+ this.axios
|
|
|
+ .post(
|
|
|
+ '/api/v1/tms/getSettledSaleSteelReportNew?startTime=' +
|
|
|
+ startTime +
|
|
|
+ '&endTime=' +
|
|
|
+ endTime +
|
|
|
+ '&carrierSsoId=' +
|
|
|
+ carrierSsoId +
|
|
|
+ '&saler=' +
|
|
|
+ saler +
|
|
|
+ '&i=' +
|
|
|
+ new Date() +
|
|
|
+ '&remark=' +
|
|
|
+ remark +
|
|
|
+ '&consigneeName=' +
|
|
|
+ consigneeName +
|
|
|
+ '&carrierName=' +
|
|
|
+ carrierName +
|
|
|
+ '&capacityNo=' +
|
|
|
+ capacityNo,
|
|
|
+ this.filterMap
|
|
|
+ )
|
|
|
+ .then(res => {
|
|
|
+ this.tableData = res.data.data
|
|
|
+ this.totalHeight += this.itemHeight
|
|
|
+ this.visibleList1 = []
|
|
|
+ this.visibleList1 = this.tableData.slice(
|
|
|
+ 0,
|
|
|
+ Math.floor(this.maxHeight / this.itemHeight) + 1
|
|
|
+ )
|
|
|
+ console.log(this.visibleList1)
|
|
|
+ this.getSpanArr(this.visibleList1)
|
|
|
+ this.getTotalNum(this.tableData)
|
|
|
+ loading.close()
|
|
|
+ })
|
|
|
+ .catch(() => {
|
|
|
+ loading.close()
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
}
|
luobang