|
@@ -41,7 +41,7 @@
|
|
<!--任务编号-->
|
|
<!--任务编号-->
|
|
<ws-form-item label="任务编号" span="1" prop="inOutTaskNo">
|
|
<ws-form-item label="任务编号" span="1" prop="inOutTaskNo">
|
|
<el-select filterable clearable v-model="dataList.inOutTaskNo" placeholder="请选择任务编号" class="typeselect"
|
|
<el-select filterable clearable v-model="dataList.inOutTaskNo" placeholder="请选择任务编号" class="typeselect"
|
|
- @change="contractNoChange" >
|
|
|
|
|
|
+ @change="contractNoChange">
|
|
<el-option v-for="item in deptBudgetList2" :key="item.inOutTaskNo" :label="item.inOutTaskNo"
|
|
<el-option v-for="item in deptBudgetList2" :key="item.inOutTaskNo" :label="item.inOutTaskNo"
|
|
:value="item.inOutTaskNo" />
|
|
:value="item.inOutTaskNo" />
|
|
</el-select>
|
|
</el-select>
|
|
@@ -184,15 +184,19 @@
|
|
dataList.outType == '汽运' ||
|
|
dataList.outType == '汽运' ||
|
|
dataList.outType == '集装箱船'
|
|
dataList.outType == '集装箱船'
|
|
">
|
|
">
|
|
- <ws-input v-if="!carstatus || carjudge" v-model="dataList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
|
|
|
|
- <el-select v-else filterable clearable :filter-method="dataFilter2" v-model="dataList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange">
|
|
|
|
- <el-option v-for="item in options2" :key="item.constKey" :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />
|
|
|
|
|
|
+ <ws-input v-if="!carstatus || carjudge" v-model="dataList.carNo" placeholder="请输入车牌号" maxlength="7"
|
|
|
|
+ size="small" />
|
|
|
|
+ <el-select v-else filterable clearable :filter-method="dataFilter2" v-model="dataList.carNo"
|
|
|
|
+ placeholder="请选择车牌号" class="typeselect" @change="carChange">
|
|
|
|
+ <el-option v-for="item in options2" :key="item.constKey"
|
|
|
|
+ :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />
|
|
</el-select>
|
|
</el-select>
|
|
- <!-- <span style='padding-left:10px;'>发货重量(吨):{{dataList.loadNetWeight}}</span> -->
|
|
|
|
- <el-button type="primary" @click="carNoTypeChange" v-if="carstatus">{{carChange1}}</el-button>
|
|
|
|
|
|
+ <!-- <span style='padding-left:10px;'>发货重量(吨):{{dataList.loadNetWeight}}</span> -->
|
|
|
|
+ <el-button type="primary" @click="carNoTypeChange" v-if="carstatus">{{carChange1}}</el-button>
|
|
</ws-form-item>
|
|
</ws-form-item>
|
|
<ws-form-item label="发货重量(吨):" span="1" prop="loadNetWeight">
|
|
<ws-form-item label="发货重量(吨):" span="1" prop="loadNetWeight">
|
|
- <ws-input v-model="dataList.loadNetWeight" placeholder="暂无获取到发货重量" maxlength="10" disabled size="small" />
|
|
|
|
|
|
+ <ws-input v-model="dataList.loadNetWeight" placeholder="暂无获取到发货重量" maxlength="10" disabled
|
|
|
|
+ size="small" />
|
|
</ws-form-item>
|
|
</ws-form-item>
|
|
|
|
|
|
<ws-form-item label="车号" span="1" prop="carNo" v-if="dataList.outType == '火运'">
|
|
<ws-form-item label="车号" span="1" prop="carNo" v-if="dataList.outType == '火运'">
|
|
@@ -400,7 +404,7 @@
|
|
value: '3',
|
|
value: '3',
|
|
},
|
|
},
|
|
],
|
|
],
|
|
- information:'毛重检斤',
|
|
|
|
|
|
+ information: '毛重检斤',
|
|
readonly: true,
|
|
readonly: true,
|
|
typeList: ['干粮', '潮粮'],
|
|
typeList: ['干粮', '潮粮'],
|
|
qualityInspectorList: [],
|
|
qualityInspectorList: [],
|
|
@@ -449,6 +453,7 @@
|
|
},
|
|
},
|
|
contractList: [],
|
|
contractList: [],
|
|
dataList: {
|
|
dataList: {
|
|
|
|
+ outType: '',
|
|
id: '',
|
|
id: '',
|
|
grossWeight: '',
|
|
grossWeight: '',
|
|
contractNo: '',
|
|
contractNo: '',
|
|
@@ -460,7 +465,7 @@
|
|
inOutDate: '',
|
|
inOutDate: '',
|
|
inOutType: '',
|
|
inOutType: '',
|
|
goodsName: '',
|
|
goodsName: '',
|
|
- selfLoading:"0",
|
|
|
|
|
|
+ selfLoading: "0",
|
|
warehouseInOutDetail: {
|
|
warehouseInOutDetail: {
|
|
qualityInspector: '',
|
|
qualityInspector: '',
|
|
},
|
|
},
|
|
@@ -486,9 +491,9 @@
|
|
param: 9600,
|
|
param: 9600,
|
|
allowEdit: true,
|
|
allowEdit: true,
|
|
result1: '00',
|
|
result1: '00',
|
|
- grossWeight:"",//显示的毛重
|
|
|
|
- carChange1:"手动填写",
|
|
|
|
- carjudge:false
|
|
|
|
|
|
+ grossWeight: "", //显示的毛重
|
|
|
|
+ carChange1: "手动填写",
|
|
|
|
+ carjudge: false
|
|
}
|
|
}
|
|
},
|
|
},
|
|
mounted() {},
|
|
mounted() {},
|
|
@@ -502,7 +507,7 @@
|
|
this.deptBudgetList1.binNumber = this.$route.query.binNumber
|
|
this.deptBudgetList1.binNumber = this.$route.query.binNumber
|
|
this.dataList.id = this.$route.query.id
|
|
this.dataList.id = this.$route.query.id
|
|
this.dataList.grossWeight = Math.round(this.$route.query.grossWeight * 1000)
|
|
this.dataList.grossWeight = Math.round(this.$route.query.grossWeight * 1000)
|
|
- this.grossWeight = this.dataList.grossWeight
|
|
|
|
|
|
+ this.grossWeight = this.dataList.grossWeight
|
|
this.dataList.contractNo = this.$route.query.contractNo
|
|
this.dataList.contractNo = this.$route.query.contractNo
|
|
this.dataList.baseId = this.$route.query.baseId
|
|
this.dataList.baseId = this.$route.query.baseId
|
|
this.dataList.positionId = this.$route.query.positionId
|
|
this.dataList.positionId = this.$route.query.positionId
|
|
@@ -517,7 +522,7 @@
|
|
this.dataList.grade = this.$route.query.grade
|
|
this.dataList.grade = this.$route.query.grade
|
|
this.dataList.agent = this.$route.query.agent
|
|
this.dataList.agent = this.$route.query.agent
|
|
this.dataList.carNo = this.$route.query.carNo
|
|
this.dataList.carNo = this.$route.query.carNo
|
|
- this.dataList.carId = this.$route.query.carId//派车id初始化默认一下(解决第一次进来无carid)
|
|
|
|
|
|
+ this.dataList.carId = this.$route.query.carId //派车id初始化默认一下(解决第一次进来无carid)
|
|
this.dataList.inOutDate = this.$route.query.inOutDate
|
|
this.dataList.inOutDate = this.$route.query.inOutDate
|
|
this.dataList.contractNo = this.$route.query.contractNo
|
|
this.dataList.contractNo = this.$route.query.contractNo
|
|
this.dataList.inOutType = this.$route.query.inOutType
|
|
this.dataList.inOutType = this.$route.query.inOutType
|
|
@@ -529,8 +534,8 @@
|
|
this.dataList.inOutTypeKey = Number(this.$route.query.inOutTypeKey)
|
|
this.dataList.inOutTypeKey = Number(this.$route.query.inOutTypeKey)
|
|
this.dataList.statusFlag = this.$route.statusFlag
|
|
this.dataList.statusFlag = this.$route.statusFlag
|
|
this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
|
|
this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
|
|
- this.dataList.outType = this.$route.query.outType//运输方式
|
|
|
|
- this.dataList.selfLoading = this.$route.query.selfLoading//
|
|
|
|
|
|
+ this.dataList.outType = this.$route.query.outType //运输方式
|
|
|
|
+ this.dataList.selfLoading = this.$route.query.selfLoading //
|
|
if (this.$route.query.automaticWeightAcquisition == '1') {
|
|
if (this.$route.query.automaticWeightAcquisition == '1') {
|
|
this.isShowBalance = true
|
|
this.isShowBalance = true
|
|
}
|
|
}
|
|
@@ -538,14 +543,14 @@
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
//切换车牌号输入状态
|
|
//切换车牌号输入状态
|
|
- carNoTypeChange(){
|
|
|
|
- this.carjudge = !this.carjudge
|
|
|
|
- if(!this.carjudge){
|
|
|
|
- this.dataList.selfLoading = "0"
|
|
|
|
- this.carChange1="手动填写"
|
|
|
|
- }else{
|
|
|
|
- this.dataList.selfLoading = "1"
|
|
|
|
- this.carChange1="识别下拉"
|
|
|
|
|
|
+ carNoTypeChange() {
|
|
|
|
+ this.carjudge = !this.carjudge
|
|
|
|
+ if (!this.carjudge) {
|
|
|
|
+ this.dataList.selfLoading = "0"
|
|
|
|
+ this.carChange1 = "手动填写"
|
|
|
|
+ } else {
|
|
|
|
+ this.dataList.selfLoading = "1"
|
|
|
|
+ this.carChange1 = "识别下拉"
|
|
}
|
|
}
|
|
},
|
|
},
|
|
setVal(data) {
|
|
setVal(data) {
|
|
@@ -612,12 +617,12 @@
|
|
if (this.tranCarInfoList[i].carNo == this.dataList.carNo) {
|
|
if (this.tranCarInfoList[i].carNo == this.dataList.carNo) {
|
|
this.dataList.tranCarNo = this.tranCarInfoList[i].tranCarNo
|
|
this.dataList.tranCarNo = this.tranCarInfoList[i].tranCarNo
|
|
this.dataList.carId = this.tranCarInfoList[i].id
|
|
this.dataList.carId = this.tranCarInfoList[i].id
|
|
- if(this.dataList.inOutType=='移库入库'){
|
|
|
|
- if(!this.dataList.cost){
|
|
|
|
- this.dataList.cost=this.tranCarInfoList[i].cost
|
|
|
|
|
|
+ if (this.dataList.inOutType == '移库入库') {
|
|
|
|
+ if (!this.dataList.cost) {
|
|
|
|
+ this.dataList.cost = this.tranCarInfoList[i].cost
|
|
|
|
+ }
|
|
|
|
+ this.dataList.loadNetWeight = this.tranCarInfoList[i].loadNetWeight
|
|
}
|
|
}
|
|
- this.dataList.loadNetWeight=this.tranCarInfoList[i].loadNetWeight
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -663,7 +668,7 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ if (!data) return
|
|
for (var i = 0; i < this.outContractNo.length; i++) {
|
|
for (var i = 0; i < this.outContractNo.length; i++) {
|
|
if (this.outContractNo[i].contractNo == this.dataList.contractNo) {
|
|
if (this.outContractNo[i].contractNo == this.dataList.contractNo) {
|
|
if (this.outContractNo[i].inOutType == '销售出库') {
|
|
if (this.outContractNo[i].inOutType == '销售出库') {
|
|
@@ -1144,7 +1149,7 @@
|
|
return
|
|
return
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if(!this.carstatus){//若自运的合同该字段置空
|
|
|
|
|
|
+ if (!this.carstatus) { //若自运的合同该字段置空
|
|
this.deptBudgetList.selfLoading = ""
|
|
this.deptBudgetList.selfLoading = ""
|
|
}
|
|
}
|
|
this.$confirm(`确定提交毛重检斤`, {
|
|
this.$confirm(`确定提交毛重检斤`, {
|
|
@@ -1610,6 +1615,7 @@
|
|
.el-input__inner {
|
|
.el-input__inner {
|
|
width: 150px;
|
|
width: 150px;
|
|
}
|
|
}
|
|
|
|
+
|
|
.balance-row {
|
|
.balance-row {
|
|
display: flex;
|
|
display: flex;
|
|
margin: 20px 0;
|
|
margin: 20px 0;
|