|
|
@@ -79,7 +79,7 @@
|
|
|
</template>
|
|
|
</el-table-column> -->
|
|
|
<el-table-column prop="status" label="状态"></el-table-column>
|
|
|
- <el-table-column width="300" prop="contractNo1" label="操作">
|
|
|
+ <el-table-column width="400" prop="contractNo1" label="操作">
|
|
|
<template slot-scope="scope">
|
|
|
<!-- <el-button @click="weighing(scope.row, 1)" v-if="scope.row.status != '已质检'"
|
|
|
v-hasPermission="`outbound.acquisitionWeightOut.mao`">毛重</el-button>
|
|
|
@@ -90,6 +90,7 @@
|
|
|
<el-button @click="del(scope.row)" v-if="scope.row.status == '已称皮重'"
|
|
|
v-hasPermission="`outbound.acquisitionWeightOut.view`">删除</el-button>
|
|
|
<el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchange(scope.row)" v-if="scope.row.status == '已称皮重'">换仓</el-button>
|
|
|
+ <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchangeNo(scope.row)" v-if="scope.row.status == '已称皮重'">换任务号</el-button>
|
|
|
<el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="returnBack(scope.row)" v-if="scope.row.status == '已称毛重'">退回</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -189,6 +190,31 @@
|
|
|
<el-button type="primary" @click="dialogVisibleconfirm">确 定</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
+ <el-dialog
|
|
|
+ title="提示"
|
|
|
+ :visible.sync="dialogVisible1"
|
|
|
+ width="30%"
|
|
|
+ :before-close="handleClose2">
|
|
|
+ <div style="text-align:center">
|
|
|
+ <el-form ref="form" label-width="110px">
|
|
|
+ <el-form-item label="任务编号">
|
|
|
+ <el-select filterable clearable v-model="inOutTaskNo" placeholder="请选择任务号" class="typeselect"
|
|
|
+ @change="taskNoChange">
|
|
|
+ <el-option v-for="item in taskNolist" :key="item.inOutTaskNo" :label="item.inOutTaskNo"
|
|
|
+ :value="item.inOutTaskNo" />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="合同编号">
|
|
|
+ <el-input v-model="contractNo" placeholder="合同编号" :disabled="disabled" maxlength="15">
|
|
|
+ </el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ </div>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button @click="dialogVisible1 = false">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="dialogVisibleconfirm1">确 定</el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
@@ -198,10 +224,14 @@
|
|
|
delelteWeighing,
|
|
|
getweighing,
|
|
|
changeNo,
|
|
|
+ changeTaskNo,
|
|
|
importWordSale,
|
|
|
importWordYk,
|
|
|
goBack
|
|
|
} from '@/model/outboundManagement/index'
|
|
|
+ import {
|
|
|
+ getReceiptTaskNo,
|
|
|
+ } from '@/model/warehouse/index'
|
|
|
import {
|
|
|
EventBus
|
|
|
} from 'base-core-lib'
|
|
|
@@ -240,9 +270,15 @@
|
|
|
addressUrls: [],
|
|
|
compId: localStorage.getItem('ws-pf_compId'),
|
|
|
dialogVisible:false,
|
|
|
+ dialogVisible1:false,
|
|
|
binNumber:'',
|
|
|
+ inOutTaskNo:'',
|
|
|
+ contractNo:'',
|
|
|
+ disabled: true,
|
|
|
binnumberList:[],
|
|
|
+ taskNolist:[],
|
|
|
cangweiNum:'',
|
|
|
+ contractNum:'',
|
|
|
positionId:'',
|
|
|
warehouseList1:[],
|
|
|
|
|
|
@@ -856,9 +892,26 @@
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ taskNoChange(e){
|
|
|
+ this.inOutTaskNo = e
|
|
|
+ for(let i = 0 ; i < this.taskNolist.length ; i++){
|
|
|
+ if(this.inOutTaskNo == this.taskNolist[i].inOutTaskNo){
|
|
|
+ if(this.taskNolist[i].contractNo){
|
|
|
+ this.contractNo = this.taskNolist[i].contractNo
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ this.contractNo = this.taskNolist[i].moveTaskNo
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
handleClose1(){
|
|
|
this.dialogVisible = false
|
|
|
},
|
|
|
+ handleClose2(){
|
|
|
+ this.inOutTaskNo=''
|
|
|
+ this.dialogVisible1 = false
|
|
|
+ },
|
|
|
exchange(row){
|
|
|
for(let i = 0 ; i < this.warehouseList1.length; i++ ){
|
|
|
if(this.warehouseName == this.warehouseList1[i].warehouseName){
|
|
|
@@ -870,6 +923,20 @@
|
|
|
this.cangweiNum = row.binNumber
|
|
|
this.dialogVisible = true
|
|
|
},
|
|
|
+ exchangeNo(row){
|
|
|
+ getReceiptTaskNo({
|
|
|
+ flag: 1,
|
|
|
+ warehouseName: this.warehouseName,
|
|
|
+ })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ this.taskNolist = response
|
|
|
+ })
|
|
|
+ this.id = row.id
|
|
|
+ this.contractNo = row.contractNo
|
|
|
+ this.contractNum = row.contractNo
|
|
|
+ this.dialogVisible1 = true
|
|
|
+ },
|
|
|
dialogVisibleconfirm(){
|
|
|
if(this.binNumber == this.cangweiNum){
|
|
|
this.$message.error('已是该仓位无需修改')
|
|
|
@@ -897,6 +964,31 @@
|
|
|
return false
|
|
|
})
|
|
|
},
|
|
|
+ dialogVisibleconfirm1(){
|
|
|
+ if(this.contractNo == this.contractNum){
|
|
|
+ this.$message.error('已是该任务号无需修改')
|
|
|
+ return
|
|
|
+ }
|
|
|
+ this.$confirm(`确定修改任务号？`, {
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ type: 'warning',
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ changeTaskNo({id:this.id,inOutTaskNo:this.inOutTaskNo,contractNo:this.contractNo}).toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ this.$notify.success({
|
|
|
+ title: '成功',
|
|
|
+ message: '修改任务号成功',
|
|
|
+ })
|
|
|
+ this.getList()
|
|
|
+ this.dialogVisible1=false
|
|
|
+ })
|
|
|
+ })
|
|
|
+ .catch(() => {
|
|
|
+ return false
|
|
|
+ })
|
|
|
+ },
|
|
|
warehouseNameChange(e) {
|
|
|
// this.warehouseName = e
|
|
|
console.log(this.warehouseList)
|
zhangyuewww