|
|
@@ -79,11 +79,11 @@
|
|
|
<span>{{ row.bailorA}}{{ row.bailorB}}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <!-- <el-table-column label="委托人电话" align="center" width="130">
|
|
|
+ <el-table-column label="委托人电话" align="center" width="130">
|
|
|
<template slot-scope="{row}">
|
|
|
- <span>{{ row.bailorATel }} {{ row.bailorBTel }}</span>
|
|
|
+ <span>{{ row.bailorATel===null?row.bailorBTel:row.bailorATel }}</span>
|
|
|
</template>
|
|
|
- </el-table-column> -->
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="客户经理" align="center">
|
|
|
<template slot-scope="{row}">
|
|
|
<span>{{ row.clientManager }}</span>
|
|
|
@@ -122,22 +122,25 @@
|
|
|
</el-table-column>
|
|
|
</parentTable>
|
|
|
</y-page-list-layout>
|
|
|
- <el-dialog :visible.sync="batchAllotDialogVisible" width="90%"center custom-class="doWarehouseClass" @closed="getPage">
|
|
|
- <div style="padding: 17px;">
|
|
|
+ <el-dialog :visible.sync="batchAllotDialogVisible" width="90%" center top="10vh" custom-class="doWarehouseClass" @closed="getPage">
|
|
|
+ <div>
|
|
|
<el-divider content-position="left">
|
|
|
- <el-tooltip class="item" effect="dark" content="批量勾选订单后，点击外业人员即可完成分单。" placement="top-start">
|
|
|
- <span>外业人员<i class="el-icon-question"></i></span>
|
|
|
- </el-tooltip>
|
|
|
+ <span>订单关键字搜索:
|
|
|
+ <el-input v-model="orderKeyword" placeholder="关键字..." clearable style="width: 270px;" />
|
|
|
+ </span>
|
|
|
</el-divider>
|
|
|
- <el-button style="float: left;" type="info" plain v-for="(user,index) in outwardUsers" :key="index" @click="batchAllot(user)">{{ user.name }}</el-button>
|
|
|
+ <div class="outwardStaff-div">
|
|
|
+ <el-button style="margin-top: 10px;margin-left: 2px;" type="info" size="mini" plain v-for="(user,index) in outwardUsers" :key="index" @click="batchAllot(user)">{{ user.name }}</el-button>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- <y-page-list-layout :page-list="allotOrderData" :page-para="allotOrderQuery" >
|
|
|
- <template slot="left"></template>
|
|
|
+ <y-page-list-layout :page-list="allotOrderData" :page-para="allotOrderQuery" :get-page-list="getAllotOrderList">
|
|
|
+ <template slot="left">
|
|
|
+ </template>
|
|
|
<parentTable ref="table" :clickRowToPick="true" :data="allotOrderData.records" slot="table"
|
|
|
- style="width: 100%;" :selectionChange="handleSelectionChange" :isBoard=480 >
|
|
|
+ style="width: 100%;" :selectionChange="handleSelectionChange" >
|
|
|
<el-table-column align="center" type="selection" claimOrders width="100" border="true">
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="坐落" align="center" width="200">
|
|
|
+ <el-table-column label="坐落" align="center" width="400">
|
|
|
<template slot-scope="{row}">
|
|
|
<span>{{ row.location }}</span>
|
|
|
</template>
|
|
|
@@ -199,6 +202,7 @@ import Breadcrumb from '@/components/Breadcrumb'
|
|
|
import PermissionButton from '@/components/PermissionButton/PermissionButton'
|
|
|
import MoreSearchBar from '@/components/MoreSearchBar'
|
|
|
import TransferDialog from '@/components/TaskTransferDialog'
|
|
|
+import { getCookie } from '@/utils/auth'
|
|
|
|
|
|
export default {
|
|
|
name: 'personalTodoList',
|
|
|
@@ -216,7 +220,7 @@ export default {
|
|
|
listLoading: false,
|
|
|
listQuery: {
|
|
|
page: 1,
|
|
|
- size: 100,
|
|
|
+ size: 10,
|
|
|
current: 1,
|
|
|
descs: null,
|
|
|
ascs:null,
|
|
|
@@ -232,10 +236,24 @@ export default {
|
|
|
page: 1,
|
|
|
size: 10,
|
|
|
descs: 'id',
|
|
|
+ keyword:null
|
|
|
},
|
|
|
allotOrderData: { records: [] },
|
|
|
outwardUsers:[],
|
|
|
- batchOrders:[]
|
|
|
+ batchOrders:[],
|
|
|
+ orderKeyword:null
|
|
|
+ }
|
|
|
+
|
|
|
+ },
|
|
|
+ watch:{
|
|
|
+ orderKeyword:{
|
|
|
+ handler(nv,ov){
|
|
|
+ console.log(nv)
|
|
|
+ this.allotOrderQuery.keyword = nv;
|
|
|
+ this.getAllotOrderList();
|
|
|
+ },
|
|
|
+ deep:true
|
|
|
+
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
@@ -244,6 +262,7 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
getPage() {
|
|
|
+ this.listQuery.size = parseInt(getCookie('personalTodoList'));
|
|
|
this.$api.workNodeTaskRecord.personalTaskTodoList(this.listQuery).then(res=>{
|
|
|
if (res.code ===200){
|
|
|
this.pageData = res.data;
|
|
|
@@ -271,7 +290,7 @@ export default {
|
|
|
this.$router.push({ query: {} });
|
|
|
this.listQuery = {
|
|
|
current: 1,
|
|
|
- size: 100,
|
|
|
+ size: 10,
|
|
|
descs: 'created',
|
|
|
}
|
|
|
this.getPage();
|
|
|
@@ -279,7 +298,7 @@ export default {
|
|
|
searchList() {
|
|
|
// 重置分页
|
|
|
this.listQuery.page = 1
|
|
|
- this.listQuery.size = 100
|
|
|
+ this.listQuery.size = 10
|
|
|
this.getPage()
|
|
|
},
|
|
|
|
|
|
@@ -336,7 +355,7 @@ export default {
|
|
|
this.batchOrders = pickeds;
|
|
|
},
|
|
|
getAllotOrderList(){
|
|
|
- this.$api.personal.waitingAllotOrder().then(res => {
|
|
|
+ this.$api.personal.waitingAllotOrder(this.allotOrderQuery).then(res => {
|
|
|
if (res.code === 200) {
|
|
|
this.allotOrderData = res.data;
|
|
|
}
|
|
|
@@ -378,4 +397,10 @@ export default {
|
|
|
/deep/.doWarehouseClass {
|
|
|
border-radius: 10px;
|
|
|
}
|
|
|
+
|
|
|
+.outwardStaff-div{
|
|
|
+ width: 100%;
|
|
|
+ padding-left: 17px;
|
|
|
+}
|
|
|
+
|
|
|
</style>
|
