|
|
@@ -3,17 +3,36 @@
|
|
|
<div>
|
|
|
<BaseHeaderLayout :leftSpan="12">
|
|
|
<template slot="left">
|
|
|
- <ws-button class="but" :type="searchType==1 ?'primary':''" @click="statusquery(1)"> 执行中</ws-button>
|
|
|
- <ws-button class="but" :type="searchType==2 ?'primary':''" @click="statusquery(2)">已完成</ws-button>
|
|
|
- <ws-button class="but" :type="searchType== undefined ?'primary':''" @click="statusquery()">全部任务</ws-button>
|
|
|
+ <ws-button
|
|
|
+ class="but"
|
|
|
+ :type="searchType == 1 ? 'primary' : ''"
|
|
|
+ @click="statusquery(1)"
|
|
|
+ >
|
|
|
+ 执行中</ws-button
|
|
|
+ >
|
|
|
+ <ws-button
|
|
|
+ class="but"
|
|
|
+ :type="searchType == 2 ? 'primary' : ''"
|
|
|
+ @click="statusquery(2)"
|
|
|
+ >已完成</ws-button
|
|
|
+ >
|
|
|
+ <ws-button
|
|
|
+ class="but"
|
|
|
+ :type="searchType == undefined ? 'primary' : ''"
|
|
|
+ @click="statusquery()"
|
|
|
+ >全部任务</ws-button
|
|
|
+ >
|
|
|
</template>
|
|
|
<!-- 接单开始 -->
|
|
|
<template slot="right">
|
|
|
<div>
|
|
|
- <span style="display: inline-block; width: 60px;color: #8890B1;">接单日期</span>
|
|
|
+ <span style="display: inline-block; width: 60px; color: #8890b1"
|
|
|
+ >接单日期</span
|
|
|
+ >
|
|
|
</div>
|
|
|
- <el-date-picker
|
|
|
- v-model="deptBudgetList.inOutDate"
|
|
|
+ <!-- v-model="deptBudgetList.inOutDate" -->
|
|
|
+ <el-date-picker
|
|
|
+ v-model="inOutDate"
|
|
|
type="daterange"
|
|
|
align="right"
|
|
|
unlink-panels
|
|
|
@@ -24,7 +43,7 @@
|
|
|
</el-date-picker>
|
|
|
<ws-input
|
|
|
v-model="searchKeyWord"
|
|
|
- placeholder="可按照合同编号、买方名称、卖方名称进行查找"
|
|
|
+ placeholder="可按发货人、收货人、任务编号查找"
|
|
|
clearable
|
|
|
maxlength="500"
|
|
|
type="input"
|
|
|
@@ -94,13 +113,20 @@
|
|
|
v-if="scope.row.processStatus == '执行中'"
|
|
|
class="inExecution"
|
|
|
></span>
|
|
|
- <span v-if="scope.row.processStatus == '已完成'" class="done"></span
|
|
|
+ <span
|
|
|
+ v-if="scope.row.processStatus == '已完成'"
|
|
|
+ class="done"
|
|
|
+ ></span
|
|
|
>{{ scope.row.processStatus }}
|
|
|
</span>
|
|
|
</template>
|
|
|
<div>
|
|
|
<p style="margin-top: 0; padding-left: 10px">XXXXX</p>
|
|
|
- <div v-for="(item, index) in historyList" class="flex" :key="index">
|
|
|
+ <div
|
|
|
+ v-for="(item, index) in historyList"
|
|
|
+ class="flex"
|
|
|
+ :key="index"
|
|
|
+ >
|
|
|
<div class="vertical-text vertical-text-left">
|
|
|
{{ item.updateDate }}
|
|
|
</div>
|
|
|
@@ -131,18 +157,8 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="seller" label="操作" width="300">
|
|
|
<template slot-scope="scope">
|
|
|
- <div
|
|
|
- class="record"
|
|
|
- @click="trainSee(scope.row)"
|
|
|
- >
|
|
|
- 查看
|
|
|
- </div>
|
|
|
- <div
|
|
|
- class="adjustment"
|
|
|
- @click="trainNumber(scope.row)"
|
|
|
- >
|
|
|
- 车次
|
|
|
- </div>
|
|
|
+ <div class="record" @click="trainSee(scope.row)">查看</div>
|
|
|
+ <div class="adjustment" @click="trainNumber(scope.row)">车次</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -150,7 +166,7 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
-import { automobileList ,alsostate} from '@/model/transport/index'
|
|
|
+import { automobileList, alsostate } from '@/model/transport/index'
|
|
|
import Pagination from '@/components/Pagination'
|
|
|
import WsUpload from '@/components/WsUpload'
|
|
|
import { dayjs, fmoney, EventBus } from 'base-core-lib'
|
|
|
@@ -194,11 +210,14 @@ export default {
|
|
|
spanArr: [],
|
|
|
warehouseName: '',
|
|
|
searchType: 1,
|
|
|
+ startDate: null,
|
|
|
+ endDate: null,
|
|
|
compId: sessionStorage.getItem('ws-pf_compId'),
|
|
|
deptCircularPage: {},
|
|
|
tranManagementList: [],
|
|
|
deptBudgetList: {},
|
|
|
historyList: [],
|
|
|
+ inOutDate: [],
|
|
|
pickerBeginDateBefore: {
|
|
|
disabledDate: (time) => {
|
|
|
return time.getTime() > Date.now()
|
|
|
@@ -259,7 +278,7 @@ export default {
|
|
|
},
|
|
|
})
|
|
|
},
|
|
|
- statusquery(state){
|
|
|
+ statusquery(state) {
|
|
|
this.searchType = state
|
|
|
this.getList()
|
|
|
},
|
|
|
@@ -303,10 +322,13 @@ export default {
|
|
|
automobileList({
|
|
|
compId: sessionStorage.getItem('ws-pf_compId'),
|
|
|
contractType: this.contractType,
|
|
|
- searchType : this.searchType,
|
|
|
+ searchType: this.searchType,
|
|
|
currentPage: this.currentPage,
|
|
|
pageSize: this.pageSize,
|
|
|
tranTypeKey: this.tranTypeKey,
|
|
|
+ startDate: this.startDate,
|
|
|
+ endDate: this.endDate,
|
|
|
+ searchKeyWord: this.searchKeyWord,
|
|
|
})
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
@@ -315,19 +337,18 @@ export default {
|
|
|
},
|
|
|
editClick(row) {
|
|
|
var status = ''
|
|
|
- if (row.status == '待执行' || row.status == '已完成') {
|
|
|
+ if (row.processStatus == '待执行' || row.processStatus == '已完成') {
|
|
|
status = '执行中'
|
|
|
- } else if (row.status == '执行中') {
|
|
|
+ } else if (row.processStatus == '执行中') {
|
|
|
status = '已完成'
|
|
|
}
|
|
|
- //cancelButtonClass: "btn-custom-cancel"
|
|
|
this.$confirm(`是否将状态改为${status}`, {
|
|
|
confirmButtonText: '确定',
|
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning',
|
|
|
})
|
|
|
.then(() => {
|
|
|
- alsostate({ id: row.id })
|
|
|
+ alsostate({ id: row.id })
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
this.$notify.success({
|
|
|
@@ -383,6 +404,13 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
find() {
|
|
|
+ if (this.inOutDate) {
|
|
|
+ this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
|
|
|
+ this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
|
|
|
+ } else {
|
|
|
+ this.startDate = ''
|
|
|
+ this.endDate = ''
|
|
|
+ }
|
|
|
this.currentPage = 1
|
|
|
this.getList()
|
|
|
},
|
zhongtianhaoyuan