|
|
@@ -67,7 +67,7 @@
|
|
|
src="../../../public/img/sousuo.png" alt />
|
|
|
</ws-button>
|
|
|
<el-button type="primary" @click="batchPrint">批量打印</el-button>
|
|
|
- <el-button type="primary" @click="salesTransfer">销售转移</el-button>
|
|
|
+ <!-- <el-button type="primary" @click="salesTransfer">销售转移</el-button> -->
|
|
|
<el-table show-summary ref="tableData" :data="warehouseList.records" height="570"
|
|
|
v-show="this.warehouseType== '1'" @selection-change="handleSelectionChange">
|
|
|
<el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column>
|
|
|
@@ -121,7 +121,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="contractNo" label="任务编号" width="180">
|
|
|
<template slot-scope="scope">
|
|
|
- <span style="color: #8890b1">{{ scope.row.contractNo }}</span>
|
|
|
+ <span style="color: #8890b1">{{ scope.row.inOutTaskNo }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="binNumber" label="仓位号" width="60px"> </el-table-column>
|
|
|
@@ -187,6 +187,9 @@
|
|
|
<span v-if='scope.row.inOutFlag==1'>{{ scope.row.backOffice }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column prop="salesTransferStatus" label="销售转移状态">
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
<el-table-column prop="addressUrl" label="操作" width="100px">
|
|
|
<template slot-scope="scope">
|
|
|
<!-- <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
|
|
|
@@ -317,24 +320,26 @@
|
|
|
<div style="display:inline-block;" v-for="item in modification">{{ item.carNo }} ({{ item.netWeight }})</div>
|
|
|
</div>
|
|
|
<div>合计：{{modification.length}}车 {{num}}吨 合同编号：{{currectdata.contractNo}}（{{currectdata.pointOut}}）</div>
|
|
|
- <el-form ref="form" :model="form" label-width="80px">
|
|
|
- <el-form-item label="转至销售/移库">
|
|
|
- <el-select v-model="form.region" placeholder="选择转移后的销售合同编号或移库编号">
|
|
|
- <el-option label="区域一" value="shanghai"></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
+
|
|
|
+ <el-form label-position="left" class="sale-form" ref="form" :model="currectdata" label-width="160px">
|
|
|
<el-form-item label="出入库任务">
|
|
|
- <el-select v-model="form.region" placeholder="选择转移后的出入库任务编号">
|
|
|
- <el-option label="区域一" value="shanghai"></el-option>
|
|
|
- <el-option label="区域二" value="beijing"></el-option>
|
|
|
+ <el-select @change="taskNochange" v-model="currectdata.taskNoNew" placeholder="选择转移后的出入库任务编号">
|
|
|
+ <el-option v-for="item in taskNolist" :key="item.id" :label="item.inOutTaskNo+(item.taskFlag?'（'+item.taskFlag+'）':'')" :value="item.inOutTaskNo"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="转至销售/移库">
|
|
|
+ <el-input disabled v-model="currectdata.contractNoNew" placeholder="选择转移后的销售合同编号或移库编号"></el-input>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="运输任务（自运必填）">
|
|
|
- <el-select v-model="form.region" placeholder="选择转移后的运输任务编号">
|
|
|
- <el-option label="区域一" value="shanghai"></el-option>
|
|
|
- <el-option label="区域二" value="beijing"></el-option>
|
|
|
+ <!-- <el-input disabled v-model="currectdata.tranTaskNew" placeholder="选择转移后的运输任务编号"></el-input> -->
|
|
|
+ <el-select :disabled="this.contractNo.deliverType==2" v-model="currectdata.tranTaskNew" placeholder="选择转移后的运输任务编号">
|
|
|
+ <el-option v-for="item in taskInfo" :label="item.taskNo" :value="item.taskNo"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item>
|
|
|
+ <el-button @click="show=false">取消</el-button>
|
|
|
+ <el-button type="primary" @click="onSubmit">提交</el-button>
|
|
|
+ </el-form-item>
|
|
|
</el-form>
|
|
|
</WinseaContentModal>
|
|
|
</div>
|
|
|
@@ -348,11 +353,20 @@
|
|
|
recordss,
|
|
|
getPrintInfo,
|
|
|
getbinnumber,
|
|
|
- getExpense
|
|
|
+ getExpense,
|
|
|
+ getReceiptTaskNo,
|
|
|
+ salestraninfo
|
|
|
} from '@/model/warehouse/index'
|
|
|
import {
|
|
|
downloadFile
|
|
|
} from '@/utils/batchDown'
|
|
|
+ import {
|
|
|
+ getcontract
|
|
|
+ } from '@/model/outboundManagement/index'
|
|
|
+ import {
|
|
|
+ getYunShuXiaLa,
|
|
|
+ getYunShuNumber,
|
|
|
+ } from '@/model/statisticalReport/index'
|
|
|
import Pagination from '@/components/Pagination'
|
|
|
import WsUpload from '@/components/WsUpload'
|
|
|
import {
|
|
|
@@ -385,9 +399,13 @@
|
|
|
showType: true,
|
|
|
// 年
|
|
|
year: '',
|
|
|
+ form:{},
|
|
|
+ contractNo:{},
|
|
|
show:false,
|
|
|
srcList: [],
|
|
|
- currectdata:{},
|
|
|
+ currectdata:{
|
|
|
+ compId: localStorage.getItem('ws-pf_compId'),
|
|
|
+ },
|
|
|
inOutType:'',
|
|
|
inOutTypeList:[
|
|
|
{value:'货权转入'},
|
|
|
@@ -400,6 +418,7 @@
|
|
|
{value:'折转出库'},
|
|
|
{value:'退库'}],
|
|
|
num:0,
|
|
|
+ taskInfo:[],
|
|
|
deptBudgetTotal: 0,
|
|
|
currentPage: 1,
|
|
|
pageSize: 10,
|
|
|
@@ -426,6 +445,7 @@
|
|
|
month: dayjs().format('MM'),
|
|
|
},
|
|
|
warehouseList: [],
|
|
|
+ taskNolist:[],
|
|
|
deptBudgetList: {},
|
|
|
historyList: [],
|
|
|
searchType: '',
|
|
|
@@ -455,10 +475,48 @@
|
|
|
},
|
|
|
updated() {
|
|
|
this.$nextTick(() => {
|
|
|
- this.$refs['tableData'].doLayout();
|
|
|
+ // this.$refs['tableData'].doLayout();
|
|
|
})
|
|
|
},
|
|
|
methods: {
|
|
|
+ onSubmit(){
|
|
|
+ if(!this.currectdata.taskNoNew){
|
|
|
+ this.$message.error("合同/移库编号不能为空！")
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if(!this.currectdata.contractNoNew){
|
|
|
+ this.$message.error("出入库任务编号不能为空！")
|
|
|
+ return
|
|
|
+ }
|
|
|
+ this.$confirm('确定转移出库数据？', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning',
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ salestraninfo(this.currectdata).toPromise().then(() => {
|
|
|
+ this.show=false
|
|
|
+ this.currectdata={
|
|
|
+ compId: localStorage.getItem('ws-pf_compId'),
|
|
|
+ }
|
|
|
+ this.$message.success("提交成功！")
|
|
|
+ this.getList()
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
+ async taskNochange(e){
|
|
|
+ for (let i = 0; i < this.taskNolist.length; i++) {
|
|
|
+ if(this.taskNolist[i].inOutTaskNo==e){
|
|
|
+ this.currectdata.contractNoNew=this.taskNolist[i].contractNo?this.taskNolist[i].contractNo:this.taskNolist[i].moveTaskNo
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.contractNo=await getcontract({contractNo:this.currectdata.contractNoNew,warehouseName:this.warehouseName,compId:localStorage.getItem('ws-pf_compId')}).toPromise()
|
|
|
+ this.currectdata.pointOutNew=this.contractNo.pointOut
|
|
|
+ var data=await getYunShuNumber({contractNo:this.currectdata.contractNoNew}).toPromise()
|
|
|
+ this.currectdata.tranTaskNew=data[0].taskNo
|
|
|
+ this.taskInfo=data
|
|
|
+ console.log(this.taskinfo)
|
|
|
+ },
|
|
|
async salesTransfer(){
|
|
|
var arr=[]
|
|
|
if (this.modification.length == 0) {
|
|
|
@@ -488,6 +546,15 @@
|
|
|
this.$message.error("已完成的合同记录不可转移！")
|
|
|
return
|
|
|
}
|
|
|
+ this.currectdata.warehouseInOutInfoList=this.modification
|
|
|
+
|
|
|
+ let map = new Map();
|
|
|
+ for (let item of this.modification) {
|
|
|
+ map.set(item.inOutTaskNo, item.inOutTaskNo);
|
|
|
+ }
|
|
|
+ var arr = [...map.values()]
|
|
|
+ console.log(arr)
|
|
|
+ this.currectdata.taskNo=arr.toString()
|
|
|
this.currectdata.contractNo=this.modification[0].contractNo
|
|
|
this.currectdata.pointOut=contractNo.pointOut
|
|
|
this.show=true
|
|
|
@@ -726,6 +793,15 @@
|
|
|
this.warehouseList = response
|
|
|
})
|
|
|
}
|
|
|
+ getReceiptTaskNo({
|
|
|
+ flag: 1,
|
|
|
+ warehouseName: this.deptBudgetList.warehouseName,
|
|
|
+ agentKey: localStorage.getItem('ws-pf_userId'),
|
|
|
+ })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ this.taskNolist = response
|
|
|
+ })
|
|
|
|
|
|
},
|
|
|
selecttaskType(e) {
|
|
|
@@ -1034,10 +1110,6 @@
|
|
|
padding: 0 1%;
|
|
|
}
|
|
|
|
|
|
- .el-form-item {
|
|
|
- width: 50%;
|
|
|
- }
|
|
|
-
|
|
|
.el-form-item__label {
|
|
|
text-align: center;
|
|
|
}
|
|
|
@@ -1208,4 +1280,18 @@
|
|
|
font-size: 18px;
|
|
|
margin-left: 20px;
|
|
|
}
|
|
|
+ /deep/.sale-form .el-select{
|
|
|
+ width:100%;
|
|
|
+ }
|
|
|
+ /deep/.winsea__content-modal .winsea__content-modal__win-wrap {
|
|
|
+ width:50%;
|
|
|
+ position: absolute;
|
|
|
+ top: 0;
|
|
|
+ bottom: 0;
|
|
|
+ left: 0;
|
|
|
+ right: 0;
|
|
|
+ margin: auto;
|
|
|
+ height: 410px;
|
|
|
+ border-radius: 10px;
|
|
|
+ }
|
|
|
</style>
|
