|
|
@@ -20,24 +20,20 @@
|
|
|
>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
-<ws-form ref="deptBudgetList" :v-model="deptBudgetList">
|
|
|
- <div class="center">
|
|
|
- <h2 style="padding-left: 20px">
|
|
|
- <img
|
|
|
- style="position: relative; top: 2px"
|
|
|
- width="19"
|
|
|
- height="19"
|
|
|
- src="../../../public/img/cangku.png"
|
|
|
- alt=""
|
|
|
- />
|
|
|
- {{ this.$route.query.warehouseName}}库
|
|
|
- <span class="position">
|
|
|
- {{ this.$route.query.binNumber }}仓位
|
|
|
- </span>
|
|
|
- </h2>
|
|
|
- <el-table
|
|
|
- :data="improved.records"
|
|
|
- >
|
|
|
+ <ws-form ref="deptBudgetList" :v-model="deptBudgetList">
|
|
|
+ <div class="center">
|
|
|
+ <h2 style="padding-left: 20px">
|
|
|
+ <img
|
|
|
+ style="position: relative; top: 2px"
|
|
|
+ width="19"
|
|
|
+ height="19"
|
|
|
+ src="../../../public/img/cangku.png"
|
|
|
+ alt=""
|
|
|
+ />
|
|
|
+ {{ this.$route.query.warehouseName }}库
|
|
|
+ <span class="position"> {{ this.$route.query.binNumber }}仓位 </span>
|
|
|
+ </h2>
|
|
|
+ <el-table :data="improved.records">
|
|
|
<el-table-column type="index" label="序号">
|
|
|
<template scope="scope">
|
|
|
<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
|
|
|
@@ -45,37 +41,44 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="goodsName" label="货名"> </el-table-column>
|
|
|
- <el-table-column prop="grossWeight;" label="毛重（吨）"></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="grossWeight;"
|
|
|
+ label="毛重（吨）"
|
|
|
+ ></el-table-column>
|
|
|
<el-table-column prop=" tare" label="皮重（吨）"> </el-table-column>
|
|
|
- <el-table-column prop="netWeight" label="净重（吨）"></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="netWeight"
|
|
|
+ label="净重（吨）"
|
|
|
+ ></el-table-column>
|
|
|
<el-table-column prop="grade" label="品级">
|
|
|
<template slot-scope="scope">
|
|
|
- <span v-if="scope.row.grade == '一等品'" class="top-grade">{{
|
|
|
- scope.row.grade
|
|
|
- }}</span>
|
|
|
- <span v-if="scope.row.grade == '二等品'" class="second-class">{{
|
|
|
- scope.row.grade
|
|
|
- }}</span>
|
|
|
- <span v-if="scope.row.grade == '三等品'" class="third-class">{{
|
|
|
- scope.row.grade
|
|
|
- }}</span>
|
|
|
- <span v-if="scope.row.grade == '等外'" class="substandard">{{
|
|
|
- scope.row.grade
|
|
|
- }}</span>
|
|
|
- </template>
|
|
|
-
|
|
|
- </el-table-column>
|
|
|
- <el-table-column prop="inOutDate" label="出入库日期"> </el-table-column>
|
|
|
- <el-table-column prop="inOutType" label="类型">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column prop="contractNo" label="合同编号"> </el-table-column>
|
|
|
+ <span v-if="scope.row.grade == '一等品'" class="top-grade">{{
|
|
|
+ scope.row.grade
|
|
|
+ }}</span>
|
|
|
+ <span v-if="scope.row.grade == '二等品'" class="second-class">{{
|
|
|
+ scope.row.grade
|
|
|
+ }}</span>
|
|
|
+ <span v-if="scope.row.grade == '三等品'" class="third-class">{{
|
|
|
+ scope.row.grade
|
|
|
+ }}</span>
|
|
|
+ <span v-if="scope.row.grade == '等外'" class="substandard">{{
|
|
|
+ scope.row.grade
|
|
|
+ }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="inOutDate" label="出入库日期">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="inOutType" label="类型"> </el-table-column>
|
|
|
+ <el-table-column prop="contractNo" label="合同编号">
|
|
|
+ </el-table-column>
|
|
|
<el-table-column prop="carNo" label="车牌号"> </el-table-column>
|
|
|
<el-table-column prop="agent" label="经办人"> </el-table-column>
|
|
|
<el-table-column prop="backOffice" label="内勤"> </el-table-column>
|
|
|
- <el-table-column prop="updateDate" label="保存时间"> </el-table-column>
|
|
|
+ <el-table-column prop="updateDate" label="保存时间">
|
|
|
+ </el-table-column>
|
|
|
<el-table-column prop="address" label="操作" width="200">
|
|
|
<!-- <template scope="scope"> -->
|
|
|
- <!-- <ws-button
|
|
|
+ <!-- <ws-button
|
|
|
type="primary"
|
|
|
@click="edits(scope.row)"
|
|
|
v-hasPermission="
|
|
|
@@ -83,7 +86,7 @@
|
|
|
"
|
|
|
>编辑</ws-button
|
|
|
> -->
|
|
|
- <!-- <ws-button
|
|
|
+ <!-- <ws-button
|
|
|
type="primary"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
v-hasPermission="
|
|
|
@@ -91,14 +94,16 @@
|
|
|
"
|
|
|
>删除</ws-button
|
|
|
> -->
|
|
|
- <!-- </template> -->
|
|
|
- <template slot-scope="scope">
|
|
|
- <div class="record" @click="edits(scope.row)">编辑</div>
|
|
|
- <div class="adjustment" @click="handleDelete(scope.row)">删除</div>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
+ <!-- </template> -->
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div class="record" @click="edits(scope.row)">编辑</div>
|
|
|
+ <div class="adjustment" @click="handleDelete(scope.row)">
|
|
|
+ 删除
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
</el-table>
|
|
|
-
|
|
|
+
|
|
|
<div style="text-align: right; padding: 10px">
|
|
|
<el-button
|
|
|
class="bg-bottom-up"
|
|
|
@@ -106,10 +111,10 @@
|
|
|
size="small"
|
|
|
@click="returnWarehouse()"
|
|
|
>关闭</el-button
|
|
|
- >
|
|
|
+ >
|
|
|
</div>
|
|
|
- </div>
|
|
|
- </ws-form>
|
|
|
+ </div>
|
|
|
+ </ws-form>
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
@@ -125,7 +130,7 @@ import {
|
|
|
import { downloadFile } from '@/utils/batchDown'
|
|
|
import Pagination from '@/components/Pagination'
|
|
|
import WsUpload from '@/components/WsUpload'
|
|
|
-import { dayjs} from 'base-core-lib'
|
|
|
+import { dayjs } from 'base-core-lib'
|
|
|
export default {
|
|
|
name: 'viewSpareMoney',
|
|
|
components: {
|
|
|
@@ -161,10 +166,10 @@ export default {
|
|
|
contractType: 2,
|
|
|
startDate: null,
|
|
|
endDate: null,
|
|
|
- deletewarehouse:[],
|
|
|
- improved:[],
|
|
|
- row:[],
|
|
|
- deptBudgetList1:[],
|
|
|
+ deletewarehouse: [],
|
|
|
+ improved: [],
|
|
|
+ row: [],
|
|
|
+ deptBudgetList1: [],
|
|
|
|
|
|
// 提交类型
|
|
|
submitType: true,
|
|
|
@@ -180,8 +185,8 @@ export default {
|
|
|
contractList: [],
|
|
|
deptBudgetList: {},
|
|
|
historyList: [],
|
|
|
-
|
|
|
- // inOutDate:null,
|
|
|
+
|
|
|
+ // inOutDate:null,
|
|
|
pickerBeginDateBefore: {
|
|
|
disabledDate: (time) => {
|
|
|
return time.getTime() > Date.now()
|
|
|
@@ -194,11 +199,11 @@ export default {
|
|
|
//cg.viewBudget
|
|
|
//cg.viewSpareMoney
|
|
|
// this.getVesselData();
|
|
|
- this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
|
|
|
- this.binNumber = this.$route.params.binNumber
|
|
|
-
|
|
|
+ this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
|
|
|
+ this.binNumber = this.$route.params.binNumber
|
|
|
+
|
|
|
//接参
|
|
|
- this.getList(this.$route.query.baseId,this.$route.query.positionId)
|
|
|
+ this.getList(this.$route.query.baseId, this.$route.query.positionId)
|
|
|
this.showType = this.isShow
|
|
|
},
|
|
|
methods: {
|
|
|
@@ -206,37 +211,30 @@ export default {
|
|
|
returnWarehouse() {
|
|
|
this.$router.push({ path: 'warehouseManagementList' })
|
|
|
},
|
|
|
- //删除
|
|
|
- deletes(){
|
|
|
- this.$router.push({path:'warehouseManagementDelete'})
|
|
|
- },
|
|
|
+
|
|
|
//编辑
|
|
|
- edits(row){
|
|
|
- if(row.inOutFlag==2){
|
|
|
- this.$router.push({
|
|
|
- path:'warehouseManagementPerfectput',
|
|
|
- query:{
|
|
|
- warehouseName:row.warehouseName,
|
|
|
- binNumber:row.binNumber,
|
|
|
+ edits(row) {
|
|
|
+ if (row.inOutFlag == 2) {
|
|
|
+ this.$router.push({
|
|
|
+ path: 'warehouseManagementPerfectput',
|
|
|
+ query: {
|
|
|
+ warehouseName: row.warehouseName,
|
|
|
+ binNumber: row.binNumber,
|
|
|
baseId: row.warehouseId,
|
|
|
positionId: row.binNumberId,
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- }
|
|
|
- })
|
|
|
- }else if(row.inOutFlag==1){
|
|
|
+ },
|
|
|
+ })
|
|
|
+ } else if (row.inOutFlag == 1) {
|
|
|
this.$router.push({
|
|
|
- path:'warehouseManagementPerfectDelivery',
|
|
|
- query:{
|
|
|
- warehouseName:row.warehouseName,
|
|
|
- binNumber:row.binNumber,
|
|
|
+ path: 'warehouseManagementPerfectDelivery',
|
|
|
+ query: {
|
|
|
+ warehouseName: row.warehouseName,
|
|
|
+ binNumber: row.binNumber,
|
|
|
baseId: row.warehouseId,
|
|
|
positionId: row.binNumberId,
|
|
|
- }
|
|
|
- })
|
|
|
+ },
|
|
|
+ })
|
|
|
}
|
|
|
-
|
|
|
},
|
|
|
dateFormat(fmt, date) {
|
|
|
let ret
|
|
|
@@ -273,19 +271,17 @@ export default {
|
|
|
console.log(`当前页: ${val}`)
|
|
|
this.getList()
|
|
|
},
|
|
|
- //收
|
|
|
- getList(id,id1){
|
|
|
- complete({
|
|
|
- // compId: sessionStorage.getItem('ws-pf_compId'),
|
|
|
- baseId:id,
|
|
|
- positionId:id1,
|
|
|
- pageSize:this.pageSize,
|
|
|
- currentPage:this.currentPage,
|
|
|
-
|
|
|
-
|
|
|
- // inOutDate:this.inOutDate
|
|
|
- })
|
|
|
- .toPromise()
|
|
|
+ //收
|
|
|
+ getList(id, id1) {
|
|
|
+ complete({
|
|
|
+ // compId: sessionStorage.getItem('ws-pf_compId'),
|
|
|
+ baseId: id,
|
|
|
+ positionId: id1,
|
|
|
+ pageSize: this.pageSize,
|
|
|
+ currentPage: this.currentPage,
|
|
|
+ // inOutDate:this.inOutDate
|
|
|
+ })
|
|
|
+ .toPromise()
|
|
|
.then((response) => {
|
|
|
this.improved = response
|
|
|
})
|
|
|
@@ -312,68 +308,34 @@ export default {
|
|
|
title: '成功',
|
|
|
message: '删除成功',
|
|
|
})
|
|
|
- this.getList()
|
|
|
+ this.getList(row.baseId,row.positionId)
|
|
|
})
|
|
|
.catch((response) => {
|
|
|
-
|
|
|
+
|
|
|
})
|
|
|
})
|
|
|
.catch(() => {
|
|
|
return false
|
|
|
})
|
|
|
}
|
|
|
- },
|
|
|
- // 关闭 dialog时 处理文件url 初始化upload组件
|
|
|
- handleCloe() {
|
|
|
- this.dialogViewSpareMoney = false
|
|
|
- },
|
|
|
- history(row) {
|
|
|
- console.log(row)
|
|
|
- billoperatehis({ id: row.id })
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- this.historyList = response
|
|
|
- })
|
|
|
- },
|
|
|
- find() {
|
|
|
- this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
|
|
|
- this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
|
|
|
- this.currentPage = 1
|
|
|
- this.getList()
|
|
|
- },
|
|
|
- async exportlist() {
|
|
|
- const { data } = await export1(
|
|
|
- {
|
|
|
- compId: sessionStorage.getItem('ws-pf_compId'),
|
|
|
- contractType: this.contractType,
|
|
|
- currentPage: this.currentPage,
|
|
|
- pageSize: this.pageSize,
|
|
|
- searchType: this.searchType,
|
|
|
- searchKeyWord: this.searchKeyWord,
|
|
|
- startDate: this.startDate,
|
|
|
- endDate: this.endDate,
|
|
|
- },
|
|
|
- {},
|
|
|
- { responseType: 'blob' }
|
|
|
- ).toPromise()
|
|
|
- downloadFile({
|
|
|
- res: data,
|
|
|
- fileName: `${
|
|
|
- this.date.year + (this.date.month ? `-${this.date.month}` : '')
|
|
|
- }_采购合同`,
|
|
|
- type: 'xls',
|
|
|
- })
|
|
|
- },
|
|
|
- // deletecontract(){},
|
|
|
- //删除
|
|
|
-
|
|
|
- approve() {},
|
|
|
- listQuery() {},
|
|
|
- total() {},
|
|
|
- clearfiltQuery() {},
|
|
|
- selectCrtDuty() {},
|
|
|
- }
|
|
|
+ },
|
|
|
+
|
|
|
+ find() {
|
|
|
+ this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
|
|
|
+ this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
|
|
|
+ this.currentPage = 1
|
|
|
+ this.getList()
|
|
|
+ },
|
|
|
+
|
|
|
+ // deletecontract(){},
|
|
|
+ //删除
|
|
|
|
|
|
+ approve() {},
|
|
|
+ listQuery() {},
|
|
|
+ total() {},
|
|
|
+ clearfiltQuery() {},
|
|
|
+ selectCrtDuty() {},
|
|
|
+}
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|
|
|
.center {
|
|
|
@@ -399,52 +361,54 @@ export default {
|
|
|
/deep/.el-form-item {
|
|
|
width: 33%;
|
|
|
}
|
|
|
-.el-row{
|
|
|
- background: #F6F7FC;
|
|
|
+.el-row {
|
|
|
+ background: #f6f7fc;
|
|
|
// box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.5);
|
|
|
border-radius: 4px 4px 1px 1px;
|
|
|
}
|
|
|
-.container .bg-bottom{
|
|
|
+.container .bg-bottom {
|
|
|
width: 74px;
|
|
|
height: 32px;
|
|
|
- background: #5473E8;
|
|
|
+ background: #5473e8;
|
|
|
border-radius: 4px;
|
|
|
}
|
|
|
.bg-bottom {
|
|
|
- margin-top: 5px 0px;
|
|
|
+ margin-top: 5px 0px;
|
|
|
}
|
|
|
-.el-table .el-table__header tr{
|
|
|
+.el-table .el-table__header tr {
|
|
|
width: 1091px;
|
|
|
height: 50px;
|
|
|
- background: #F6F7FC;
|
|
|
- border: 1px solid #E8ECF6;
|
|
|
+ background: #f6f7fc;
|
|
|
+ border: 1px solid #e8ecf6;
|
|
|
text-align: center;
|
|
|
}
|
|
|
-.el-table .cell{
|
|
|
+.el-table .cell {
|
|
|
text-align: center;
|
|
|
width: 29px;
|
|
|
-height: 20px;
|
|
|
-font-size: 14px;
|
|
|
-font-family: PingFangSC-Regular, PingFang SC;
|
|
|
-font-weight: 400;
|
|
|
-color: #5878E8;
|
|
|
-line-height: 20px;
|
|
|
+ height: 20px;
|
|
|
+ font-size: 14px;
|
|
|
+ font-family: PingFangSC-Regular, PingFang SC;
|
|
|
+ font-weight: 400;
|
|
|
+ color: #5878e8;
|
|
|
+ line-height: 20px;
|
|
|
}
|
|
|
-.default .winseaview-main .el-table th>.cell{
|
|
|
- color: #8890B1;
|
|
|
+.default .winseaview-main .el-table th > .cell {
|
|
|
+ color: #8890b1;
|
|
|
}
|
|
|
-.record, .adjustment {
|
|
|
- display: inline-block;
|
|
|
- color: #5878e8;
|
|
|
- padding: 0 4px !important;
|
|
|
- position: relative;
|
|
|
+.record,
|
|
|
+.adjustment {
|
|
|
+ display: inline-block;
|
|
|
+ color: #5878e8;
|
|
|
+ padding: 0 4px !important;
|
|
|
+ position: relative;
|
|
|
}
|
|
|
-/deep/.el-table td, .el-table th {
|
|
|
+/deep/.el-table td,
|
|
|
+.el-table th {
|
|
|
text-align: center;
|
|
|
}
|
|
|
/deep/.el-table .el-table__header th {
|
|
|
- border-bottom-width: 0px;
|
|
|
- text-align: center;
|
|
|
+ border-bottom-width: 0px;
|
|
|
+ text-align: center;
|
|
|
}
|
|
|
.top-grade {
|
|
|
background: linear-gradient(90deg, #5678e9, #7993f6);
|
|
|
@@ -480,29 +444,29 @@ line-height: 20px;
|
|
|
// line-height: 28px;
|
|
|
// text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5);
|
|
|
// }
|
|
|
-.a{
|
|
|
+.a {
|
|
|
width: 19px;
|
|
|
-height: 19px;
|
|
|
-background: #AFB5CB;
|
|
|
-margin-left: 10px;
|
|
|
+ height: 19px;
|
|
|
+ background: #afb5cb;
|
|
|
+ margin-left: 10px;
|
|
|
}
|
|
|
-.container .bg-left{
|
|
|
+.container .bg-left {
|
|
|
width: 140px;
|
|
|
-height: 29px;
|
|
|
-font-size: 21px;
|
|
|
-font-family: PingFangSC-Semibold, PingFang SC;
|
|
|
-font-weight: 600;
|
|
|
-color: #323233;
|
|
|
-line-height: 29px;
|
|
|
+ height: 29px;
|
|
|
+ font-size: 21px;
|
|
|
+ font-family: PingFangSC-Semibold, PingFang SC;
|
|
|
+ font-weight: 600;
|
|
|
+ color: #323233;
|
|
|
+ line-height: 29px;
|
|
|
}
|
|
|
.position {
|
|
|
- width: 52px;
|
|
|
- height: 20px;
|
|
|
- background: #AFB5CB;
|
|
|
- border-radius: 2px;
|
|
|
- font-size: 12px;
|
|
|
- font-family: PingFangSC-Medium, PingFang SC;
|
|
|
- color: #FFFFFF;
|
|
|
- line-height: 20px;
|
|
|
+ width: 52px;
|
|
|
+ height: 20px;
|
|
|
+ background: #afb5cb;
|
|
|
+ border-radius: 2px;
|
|
|
+ font-size: 12px;
|
|
|
+ font-family: PingFangSC-Medium, PingFang SC;
|
|
|
+ color: #ffffff;
|
|
|
+ line-height: 20px;
|
|
|
}
|
|
|
</style>
|
zhongtianhaoyuan