|
|
@@ -3,7 +3,7 @@
|
|
|
<div class="container">
|
|
|
<el-scrollbar style="height: 100%">
|
|
|
<el-row>
|
|
|
- <el-col style="padding-left: 15px" :span="16">
|
|
|
+ <el-col style="padding-left: 15px" :span="10">
|
|
|
<ws-button
|
|
|
:type="searchType == 1 ? 'primary' : ''"
|
|
|
@click="handlestatus(1)"
|
|
|
@@ -50,8 +50,8 @@
|
|
|
> -->
|
|
|
</el-col>
|
|
|
<el-col
|
|
|
- style="text-align: right; line-height: 60px; padding-right: 10px"
|
|
|
- :span="8"
|
|
|
+ style="text-align: right; line-height: 60px; padding-right: 10px;display: flex;"
|
|
|
+ :span="14"
|
|
|
>
|
|
|
<el-select
|
|
|
v-model="contractNo"
|
|
|
@@ -65,22 +65,71 @@
|
|
|
class="findValue"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-if="item.reportStatus"
|
|
|
v-for="item in options"
|
|
|
:key="item.constKey"
|
|
|
- :label="item.contractNo + '(' + item.reportStatus + ')'"
|
|
|
+ :label="item.contractNo"
|
|
|
:value="item.contractNo"
|
|
|
/>
|
|
|
+ </el-select>
|
|
|
+ <el-select
|
|
|
+ v-model="taskNo"
|
|
|
+ placeholder="请选择运输任务编号"
|
|
|
+ clearable
|
|
|
+ filterable
|
|
|
+ :filter-method="dataFilter"
|
|
|
+ @change="taskNochange"
|
|
|
+ maxlength="500"
|
|
|
+ type="input"
|
|
|
+ class="findValue"
|
|
|
+ >
|
|
|
<el-option
|
|
|
+ v-for="item in taskNoList"
|
|
|
+ :key="item.taskNoKey"
|
|
|
+ :label="item.taskNoValue "
|
|
|
+ :value="item.taskNoValue"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ <el-select
|
|
|
+ v-model="processNo"
|
|
|
+ placeholder="请选择运输阶段编号"
|
|
|
+ clearable
|
|
|
+ filterable
|
|
|
+ :filter-method="processNo"
|
|
|
+ @change="processNochange"
|
|
|
+ maxlength="500"
|
|
|
+ type="input"
|
|
|
+ class="findValue"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in processNoList"
|
|
|
+ :key="item.processNoKey"
|
|
|
+ :label="item.processNoValue "
|
|
|
+ :value="item.processNoValue"
|
|
|
+ />
|
|
|
+ <!-- <el-option
|
|
|
v-if="!item.reportStatus"
|
|
|
v-for="item in options"
|
|
|
:key="item.constKey"
|
|
|
:label="item.contractNo"
|
|
|
:value="item.contractNo"
|
|
|
- />
|
|
|
+ /> -->
|
|
|
</el-select>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
+ <div class="freightSet">
|
|
|
+ <div style="display: flex;width:200px;line-height: 30px;"> 预计运费（元）：{{tranPriceIng}}元</div>
|
|
|
+ <span style="display: flex;line-height: 30px;">实际运费（元）：<el-input type="text" maxlength="70" size="small" v-model="actualFreight" v-show="textShow"/><span v-show="!textShow">{{actualFreight}}</span>元</span>
|
|
|
+ <i @click="actualFreightchange" class="iconfont icon-dui" v-show="textShow" style="margin-top:10px"></i>
|
|
|
+ <img
|
|
|
+ width="17"
|
|
|
+ height="18"
|
|
|
+ style="vertical-align: text-top; position: relative; top: 6px"
|
|
|
+ src="../../../public/img/edit.png"
|
|
|
+ @click="textShow = true"
|
|
|
+ alt=""
|
|
|
+ v-show="!textShow"
|
|
|
+ />
|
|
|
+ </div>
|
|
|
|
|
|
<el-table
|
|
|
class="wenzi"
|
|
|
@@ -337,6 +386,9 @@ import {
|
|
|
autocontract,
|
|
|
autopaymoney,
|
|
|
openinvoicelist,
|
|
|
+ getYunShuXiaLa,
|
|
|
+ getYunShuNumber,
|
|
|
+ SetYunShuPrice
|
|
|
// postaudit,
|
|
|
// getselectctcontractno,
|
|
|
} from '@/model/statisticalReport/index'
|
|
|
@@ -345,6 +397,7 @@ import { downloadFile } from '@/utils/batchDown'
|
|
|
import Pagination from '@/components/Pagination'
|
|
|
import WsUpload from '@/components/WsUpload'
|
|
|
import { EventBus } from 'base-core-lib'
|
|
|
+import { flatten } from 'lodash'
|
|
|
export default {
|
|
|
name: 'viewSpareMoney',
|
|
|
components: {
|
|
|
@@ -421,6 +474,14 @@ export default {
|
|
|
enter: {
|
|
|
closePositionList: [],
|
|
|
},
|
|
|
+ taskNoList:[],
|
|
|
+ processNoList:[],
|
|
|
+ taskNo:"",
|
|
|
+ processNo:"",
|
|
|
+ textShow:false,
|
|
|
+ actualFreight:"",
|
|
|
+ processNoId:"",
|
|
|
+ tranPriceIng:"",
|
|
|
|
|
|
// 提交类型
|
|
|
submitType: true,
|
|
|
@@ -463,14 +524,6 @@ export default {
|
|
|
paymentScreenshotUrls: [],
|
|
|
carryovercontractnolist: [],
|
|
|
historyList: [],
|
|
|
- account: [
|
|
|
- {
|
|
|
- value: '个人账户',
|
|
|
- },
|
|
|
- {
|
|
|
- value: '企业账户',
|
|
|
- },
|
|
|
- ],
|
|
|
pickerBeginDateBefore: {
|
|
|
disabledDate: (time) => {
|
|
|
return time.getTime() > Date.now()
|
|
|
@@ -768,6 +821,24 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
+ actualFreightchange(){
|
|
|
+ // this.actualFreight
|
|
|
+ this.$confirm(`是否提交实际总价？`, {
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ type: 'warning',
|
|
|
+ }).then(() => {
|
|
|
+ SetYunShuPrice({
|
|
|
+ actualFreight:this.actualFreight,
|
|
|
+ id:this.processNoId,
|
|
|
+ flag :3
|
|
|
+ })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ this.textShow = false
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
//修改结算重量
|
|
|
changesettlementWeight(item) {
|
|
|
if (!this.settlementWeight) {
|
|
|
@@ -865,9 +936,8 @@ export default {
|
|
|
this.$message.warning('修改扣款失败')
|
|
|
})
|
|
|
},
|
|
|
- editdeductionAmount(item) {
|
|
|
- this.deductionAmount = item.deductionAmount
|
|
|
- item.deductionAmountchange = true
|
|
|
+ editdeductionAmount() {
|
|
|
+ this.textShow = false
|
|
|
},
|
|
|
//装车磅单
|
|
|
lookloadingImg(row) {
|
|
|
@@ -971,12 +1041,59 @@ export default {
|
|
|
handleSelectionChange(val) {
|
|
|
this.modification = val
|
|
|
},
|
|
|
+
|
|
|
handlestatus(status) {
|
|
|
this.searchType = status
|
|
|
this.getList()
|
|
|
},
|
|
|
contractchange(e) {
|
|
|
this.contractNo = e
|
|
|
+ this.taskNoList = []
|
|
|
+ this.taskNo = ""
|
|
|
+ this.processNoList= []
|
|
|
+ this.processNo = ""
|
|
|
+ getYunShuNumber({
|
|
|
+ contractNo:this.contractNo,
|
|
|
+ flag:2
|
|
|
+ })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ for(let i = 0 ; i < response.length ; i++){
|
|
|
+ this.taskNoList.push({
|
|
|
+ taskNoKey : i,
|
|
|
+ taskNoValue : response[i].taskNo,
|
|
|
+ processNo: response[i].tranProcessInfoList
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ taskNochange(e){
|
|
|
+ this.taskNo = e
|
|
|
+ this.processNoList= []
|
|
|
+ this.processNo = ""
|
|
|
+ for(let i = 0 ; i < this.taskNoList.length ; i++ ){
|
|
|
+ if(e == this.taskNoList[i].taskNoValue){
|
|
|
+ for(let j = 0 ; j < this.taskNoList.length ; j++){
|
|
|
+ this.processNoList.push({
|
|
|
+ processNoKey:i,
|
|
|
+ processNoValue:this.taskNoList[i].processNo[j].processNo,
|
|
|
+ actualFreight : this.taskNoList[i].processNo[j].actualFreight,
|
|
|
+ id:this.taskNoList[i].processNo[j].id,
|
|
|
+ tranPriceIng:this.taskNoList[i].processNo[j].tranPriceIng
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ processNochange(e){
|
|
|
+ this.processNo = e
|
|
|
+ for(let i = 0 ; i < this.processNoList.length ; i++){
|
|
|
+ if(this.processNoList[i].processNoValue == e){
|
|
|
+ this.actualFreight = this.processNoList[i].actualFreight
|
|
|
+ this.processNoId =this.processNoList[i].id
|
|
|
+ this.tranPriceIng = this.processNoList[i].tranPriceIng
|
|
|
+ }
|
|
|
+ }
|
|
|
this.getList()
|
|
|
},
|
|
|
updated() {
|
|
|
@@ -1026,6 +1143,8 @@ export default {
|
|
|
searchType: this.searchType,
|
|
|
contractNo: this.contractNo,
|
|
|
manualFlag: this.manualFlag,
|
|
|
+ taskNo:this.taskNo,
|
|
|
+ processNo:this.processNo
|
|
|
})
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
@@ -1045,15 +1164,18 @@ export default {
|
|
|
this.deptBudgetTotal = response.total
|
|
|
this.warehouseList = response
|
|
|
})
|
|
|
- autocontract({
|
|
|
- compId: sessionStorage.getItem('ws-pf_compId'),
|
|
|
- currentPage: this.currentPage,
|
|
|
- pageSize: this.pageSize,
|
|
|
- // roleFlag: this.roleFlag,
|
|
|
+ this.contractNoList=[]
|
|
|
+ getYunShuXiaLa({
|
|
|
+ flag:2,
|
|
|
})
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
- this.contractNoList = response
|
|
|
+ for(let i = 0 ; i < response.length ; i++){
|
|
|
+ this.contractNoList.push({
|
|
|
+ constKey : i,
|
|
|
+ contractNo : response[i]
|
|
|
+ })
|
|
|
+ }
|
|
|
this.contractNoList.unshift({ contractNo: '全部合同' })
|
|
|
this.options = this.contractNoList
|
|
|
})
|
|
|
@@ -1204,9 +1326,8 @@ export default {
|
|
|
border-bottom-left-radius: 0px;
|
|
|
}
|
|
|
/deep/.findValue .el-input__inner {
|
|
|
- border-top-right-radius: 0px;
|
|
|
- border-bottom-right-radius: 0px;
|
|
|
- width: 385px;
|
|
|
+ width: 300px;
|
|
|
+
|
|
|
}
|
|
|
.completed.el-button--default {
|
|
|
border-color: #5878e8;
|
|
|
@@ -1377,8 +1498,6 @@ export default {
|
|
|
}
|
|
|
.el-input--small {
|
|
|
font-size: 13px;
|
|
|
- width: 390px;
|
|
|
- margin-left: 74%;
|
|
|
}
|
|
|
/deep/.el-table .el-table__header .cell,
|
|
|
.el-table .el-table__body .cell {
|
|
|
@@ -1412,7 +1531,6 @@ hr {
|
|
|
margin-left: 9%;
|
|
|
}
|
|
|
.el-date-editor.el-input,
|
|
|
-.el-date-editor.el-input__inner,
|
|
|
.el-input-number--small {
|
|
|
width: 123% !important;
|
|
|
}
|
|
|
@@ -1422,4 +1540,14 @@ hr {
|
|
|
text-align: center;
|
|
|
height: 40px;
|
|
|
}
|
|
|
+/deep/.freightSet .el-input__inner{
|
|
|
+ width: 100px;
|
|
|
+}
|
|
|
+.freightSet{
|
|
|
+ display: flex;
|
|
|
+ width:500px;
|
|
|
+}
|
|
|
+/deep/.freightSet .el-input{
|
|
|
+ width: 44%;
|
|
|
+}
|
|
|
</style>
|
zhongtianhaoyuan