|
|
@@ -4,17 +4,17 @@
|
|
|
<BaseHeaderLayout :leftSpan="20">
|
|
|
<template slot="left">
|
|
|
<ws-button
|
|
|
- class="but"
|
|
|
+ class="but"
|
|
|
type="primary"
|
|
|
@click="handleAdd()"
|
|
|
v-hasPermission="
|
|
|
`${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
|
|
|
"
|
|
|
- >
|
|
|
+ >
|
|
|
执行中</ws-button
|
|
|
>
|
|
|
<ws-button
|
|
|
- class="but"
|
|
|
+ class="but"
|
|
|
@click="handleLook()"
|
|
|
v-hasPermission="
|
|
|
`${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
|
|
|
@@ -22,32 +22,29 @@
|
|
|
>已完成</ws-button
|
|
|
>
|
|
|
<ws-button
|
|
|
- class="but"
|
|
|
+ class="but"
|
|
|
@click="handleEdit()"
|
|
|
v-hasPermission="
|
|
|
`${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
|
|
|
"
|
|
|
>全部任务</ws-button
|
|
|
- >
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+ >
|
|
|
</template>
|
|
|
<!-- 接单开始 -->
|
|
|
<template slot="left">
|
|
|
- <ws-date-picker
|
|
|
- v-model="deptBudgetList.inOutDate"
|
|
|
- type="date"
|
|
|
- placeholder="请选择开始日期"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- />
|
|
|
- <span>至</span>
|
|
|
- <ws-date-picker
|
|
|
- v-model="deptBudgetList.inOutDate"
|
|
|
- type="date"
|
|
|
- placeholder="请选择结束日期"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- />
|
|
|
+ <ws-date-picker
|
|
|
+ v-model="deptBudgetList.inOutDate"
|
|
|
+ type="date"
|
|
|
+ placeholder="请选择开始日期"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ />
|
|
|
+ <span>至</span>
|
|
|
+ <ws-date-picker
|
|
|
+ v-model="deptBudgetList.inOutDate"
|
|
|
+ type="date"
|
|
|
+ placeholder="请选择结束日期"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ />
|
|
|
<ws-input
|
|
|
v-model="searchKeyWord"
|
|
|
placeholder="可按照合同编号、买方名称、卖方名称进行查找"
|
|
|
@@ -87,7 +84,7 @@
|
|
|
>
|
|
|
<el-table-column prop="warehouseName" label="序号" width="80">
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="binNumber" label="运输任务编号" width="80">
|
|
|
+ <el-table-column prop="binNumber" label="运输任务编号" width="120">
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="capacity" label="货名">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -138,61 +135,60 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
-
|
|
|
|
|
|
- <el-table-column prop="status" label="状态">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-popover
|
|
|
- placement="left"
|
|
|
- :width="285"
|
|
|
- trigger="click"
|
|
|
- visible-arrow="false"
|
|
|
- @show="history(scope.row)"
|
|
|
- >
|
|
|
- <template>
|
|
|
- <span slot="reference">
|
|
|
- <span
|
|
|
- v-if="scope.row.status =='待执行'"
|
|
|
- class="executory"
|
|
|
- ></span>
|
|
|
- <span
|
|
|
- v-if="scope.row.status == '执行中'"
|
|
|
- class="inExecution"
|
|
|
- ></span>
|
|
|
- <span v-if="scope.row.status == '已完成'" class="done"></span
|
|
|
- >{{scope.row.status}}
|
|
|
- </span>
|
|
|
- </template>
|
|
|
- <div>
|
|
|
- <p style="margin-top: 0; padding-left: 10px">XXXXX</p>
|
|
|
- <div v-for="(item, index) in historyList" class="flex">
|
|
|
- <div class="vertical-text vertical-text-left">
|
|
|
- {{ item.updateDate }}
|
|
|
- </div>
|
|
|
- <div>
|
|
|
- <div class="vertical-circle"></div>
|
|
|
- <div
|
|
|
- v-if="index != historyList.length - 1"
|
|
|
- class="vertical-line"
|
|
|
- ></div>
|
|
|
- </div>
|
|
|
- <div class="vertical-text">
|
|
|
- {{ item.operateUser }}<br />{{ item.dealMsg }}
|
|
|
+ <el-table-column prop="status" label="状态">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-popover
|
|
|
+ placement="left"
|
|
|
+ :width="285"
|
|
|
+ trigger="click"
|
|
|
+ visible-arrow="false"
|
|
|
+ @show="history(scope.row)"
|
|
|
+ >
|
|
|
+ <template>
|
|
|
+ <span slot="reference">
|
|
|
+ <span
|
|
|
+ v-if="scope.row.status == '待执行'"
|
|
|
+ class="executory"
|
|
|
+ ></span>
|
|
|
+ <span
|
|
|
+ v-if="scope.row.status == '执行中'"
|
|
|
+ class="inExecution"
|
|
|
+ ></span>
|
|
|
+ <span v-if="scope.row.status == '已完成'" class="done"></span
|
|
|
+ >{{ scope.row.status }}
|
|
|
+ </span>
|
|
|
+ </template>
|
|
|
+ <div>
|
|
|
+ <p style="margin-top: 0; padding-left: 10px">XXXXX</p>
|
|
|
+ <div v-for="(item, index) in historyList" class="flex">
|
|
|
+ <div class="vertical-text vertical-text-left">
|
|
|
+ {{ item.updateDate }}
|
|
|
+ </div>
|
|
|
+ <div>
|
|
|
+ <div class="vertical-circle"></div>
|
|
|
+ <div
|
|
|
+ v-if="index != historyList.length - 1"
|
|
|
+ class="vertical-line"
|
|
|
+ ></div>
|
|
|
+ </div>
|
|
|
+ <div class="vertical-text">
|
|
|
+ {{ item.operateUser }}<br />{{ item.dealMsg }}
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- </el-popover>
|
|
|
- <img
|
|
|
- width="17"
|
|
|
- height="18"
|
|
|
- style="vertical-align: text-top; position: relative; top: -1px"
|
|
|
- src="../../../public/img/edit.png"
|
|
|
- @click="editClick(scope.row)"
|
|
|
- alt=""
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column class="table_td" label="接单日期">
|
|
|
+ </el-popover>
|
|
|
+ <img
|
|
|
+ width="17"
|
|
|
+ height="18"
|
|
|
+ style="vertical-align: text-top; position: relative; top: -1px"
|
|
|
+ src="../../../public/img/edit.png"
|
|
|
+ @click="editClick(scope.row)"
|
|
|
+ alt=""
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column class="table_td" label="接单日期">
|
|
|
<template slot-scope="scope">
|
|
|
<div
|
|
|
style="height: 24px"
|
|
|
@@ -224,12 +220,7 @@
|
|
|
</ws-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <!-- <el-table-column prop="address" label="操作" width="200">
|
|
|
- <template slot-scope="scope">
|
|
|
- <div class="record" @click="record(scope.row)">记录</div>
|
|
|
- <div class="adjustment" @click="loss(scope.row)">盘损</div>
|
|
|
- </template>
|
|
|
- </el-table-column> -->
|
|
|
+
|
|
|
</el-table>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -331,7 +322,7 @@ export default {
|
|
|
positionId: item.binNumberId,
|
|
|
warehouseName: item.warehouseName,
|
|
|
binNumber: item.binNumber,
|
|
|
- capacity:item.capacity - free ,
|
|
|
+ capacity: item.capacity - free,
|
|
|
},
|
|
|
})
|
|
|
},
|
|
|
@@ -419,8 +410,8 @@ export default {
|
|
|
this.$router.push({ path: 'tranManagementTransportEdit' })
|
|
|
},
|
|
|
// 派车
|
|
|
- warehousing(){
|
|
|
- this.$router.push({ path: 'tranManagementVehicleDispatching'})
|
|
|
+ warehousing() {
|
|
|
+ this.$router.push({ path: 'tranManagementVehicleDispatching' })
|
|
|
},
|
|
|
dateFormat(fmt, date) {
|
|
|
let ret
|
|
|
@@ -630,20 +621,20 @@ export default {
|
|
|
height: 12px;
|
|
|
background: #e9ecf7;
|
|
|
}
|
|
|
-.el-row{
|
|
|
- height: 150px;
|
|
|
+.el-row {
|
|
|
+ height: 150px;
|
|
|
}
|
|
|
-.base_header_layout .grid-content{
|
|
|
- margin-top: 80px;
|
|
|
+.base_header_layout .grid-content {
|
|
|
+ margin-top: 80px;
|
|
|
}
|
|
|
-.but{
|
|
|
- margin-top: 150px;
|
|
|
+.but {
|
|
|
+ margin-top: 150px;
|
|
|
}
|
|
|
-.el-input--small .el-input__inner{
|
|
|
- margin-left: 20px;
|
|
|
+.el-input--small .el-input__inner {
|
|
|
+ margin-left: 20px;
|
|
|
}
|
|
|
.el-range-editor--small.el-input__inner {
|
|
|
- height: 32px;
|
|
|
- margin-left: -20%;
|
|
|
+ height: 32px;
|
|
|
+ margin-left: -20%;
|
|
|
}
|
|
|
</style>
|
zhongtianhaoyuan