|
|
@@ -135,9 +135,9 @@
|
|
|
value-format="yyyy-MM-dd" />
|
|
|
</ws-form-item>
|
|
|
<ws-form-item label="运输方式" span="1" prop="outType">
|
|
|
- <el-select v-model="weighingList.outType" placeholder="请选择运输方式">
|
|
|
+ <el-select v-model="weighingList.outType" placeholder="请选择运输方式" :disabled="recheck1">
|
|
|
<el-option v-for="item in multiSelector" :key="item.value" :label="item.name"
|
|
|
- :value="item.name" />
|
|
|
+ :value="item.name" />
|
|
|
</el-select>
|
|
|
</ws-form-item>
|
|
|
<ws-form-item v-if="fleetNameList.length > 0 && tpyeNo == 1" label="车队" span="1" prop="fleetName">
|
|
|
@@ -151,9 +151,9 @@
|
|
|
weighingList.outType == '集装箱船'
|
|
|
">
|
|
|
<el-input v-if="!carstatus || carjudge" v-model="weighingList.carNo" placeholder="请输入车牌号"
|
|
|
- size="small" />
|
|
|
+ size="small" :disabled="recheck1"/>
|
|
|
<el-select v-else filterable clearable v-model="weighingList.carNo" placeholder="请选择车牌号"
|
|
|
- class="typeselect" @change="carChange">
|
|
|
+ class="typeselect" @change="carChange" :disabled="recheck1">
|
|
|
<el-option v-for="item in options2" :key="item.constKey"
|
|
|
:label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />
|
|
|
</el-select>
|
|
|
@@ -163,26 +163,26 @@
|
|
|
weighingList.outType == '汽运' ||
|
|
|
weighingList.outType == '集装箱船'
|
|
|
">
|
|
|
- <ws-input v-model="weighingList.boxNo" placeholder="请输入箱号" maxlength="20" size="small" />
|
|
|
+ <ws-input v-model="weighingList.boxNo" placeholder="请输入箱号" maxlength="20" size="small" :disabled="recheck1"/>
|
|
|
</ws-form-item>
|
|
|
<ws-form-item label="封号-1" span="1" prop="titleNo" v-if="
|
|
|
weighingList.outType == '汽运' ||
|
|
|
weighingList.outType == '集装箱船'
|
|
|
">
|
|
|
- <ws-input v-model="weighingList.titleNo" placeholder="请输入封号" maxlength="20" size="small" />
|
|
|
+ <ws-input v-model="weighingList.titleNo" placeholder="请输入封号" maxlength="20" size="small" :disabled="recheck1"/>
|
|
|
</ws-form-item>
|
|
|
<ws-form-item label="箱号-2" span="1" prop="boxNoOther" v-if="
|
|
|
weighingList.outType == '汽运' ||
|
|
|
weighingList.outType == '集装箱船'
|
|
|
">
|
|
|
- <ws-input v-model="weighingList.boxNoOther" placeholder="请输入箱号" maxlength="20" size="small" />
|
|
|
+ <ws-input v-model="weighingList.boxNoOther" placeholder="请输入箱号" maxlength="20" size="small" :disabled="recheck1"/>
|
|
|
</ws-form-item>
|
|
|
|
|
|
<ws-form-item label="封号-2" span="1" prop="titleNoOther" v-if="
|
|
|
weighingList.outType == '汽运' ||
|
|
|
weighingList.outType == '集装箱船'
|
|
|
">
|
|
|
- <ws-input v-model="weighingList.titleNoOther" placeholder="请输入封号" maxlength="20" size="small" />
|
|
|
+ <ws-input v-model="weighingList.titleNoOther" placeholder="请输入封号" maxlength="20" size="small" :disabled="recheck1"/>
|
|
|
</ws-form-item>
|
|
|
<ws-form-item label="车厢号-1" span="1" prop="wingNumber" v-if="weighingList.outType == '火运'">
|
|
|
<ws-input v-model="weighingList.wingNumber" placeholder="请输入车厢号" maxlength="20" size="small" />
|
|
|
@@ -381,6 +381,8 @@
|
|
|
options2: [],
|
|
|
isSelectType: false,
|
|
|
recheck: false,
|
|
|
+ recheck1:false,
|
|
|
+ recheckPrice:false,
|
|
|
disabled: true,
|
|
|
pListTop: [],
|
|
|
tpyeNo: 1,
|
|
|
@@ -823,6 +825,12 @@
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
this.weighingList = response
|
|
|
+ if(response.inOutType == '移库出库' && this.warehouseType == '1'){
|
|
|
+ this.recheckPrice = true
|
|
|
+ }else{
|
|
|
+ this.recheckPrice = false
|
|
|
+ }
|
|
|
+
|
|
|
this.carstatus=false
|
|
|
// this.weighingList.carNo =
|
|
|
// response.qualityInspectionManagement.carNumber
|
|
|
@@ -940,7 +948,7 @@
|
|
|
// }debugger
|
|
|
// console.log(this.weighingList.customer)
|
|
|
this.weighingList.carNumber = this.weighingList.carNo
|
|
|
- if (this.types == 1 || this.types == 2) {
|
|
|
+ if (this.tpyeNo == 1 || this.tpyeNo == 2) {
|
|
|
if (!this.weighingList.contractNo) {
|
|
|
this.$message({
|
|
|
message: '合同编号不能为空',
|
|
|
@@ -962,7 +970,7 @@
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
- if (!this.weighingList.contractPrice) {
|
|
|
+ if (!this.weighingList.contractPrice && this.weighingList.inOutType != '移库出库') {
|
|
|
this.$message({
|
|
|
message: '价格不能为空',
|
|
|
type: 'warning',
|
|
|
@@ -1412,10 +1420,12 @@
|
|
|
this.statusType = '3'
|
|
|
this.information = '皮重'
|
|
|
this.tpyeNo = '1'
|
|
|
+ this.recheck1 = false
|
|
|
} else {
|
|
|
this.statusType = 3
|
|
|
this.tpyeNo = '2'
|
|
|
this.information = '毛重'
|
|
|
+ this.recheck1 = true
|
|
|
}
|
|
|
this.getList()
|
|
|
},
|
|
|
@@ -1694,6 +1704,13 @@
|
|
|
data = this.taskNolist[i]
|
|
|
if(this.taskNolist[i].inOutType=='移库出库'){
|
|
|
this.weighingList.contractNo = this.taskNolist[i].moveTaskNo
|
|
|
+
|
|
|
+ if(this.warehouseType == '1'){
|
|
|
+ this.recheckPrice = true
|
|
|
+ }else{
|
|
|
+ this.recheckPrice = false
|
|
|
+ }
|
|
|
+
|
|
|
}else{
|
|
|
if (this.taskNolist[i].contractNo) {
|
|
|
// console.log(this.taskNolist[i])
|
|
|
@@ -1701,6 +1718,7 @@
|
|
|
} else {
|
|
|
this.weighingList.contractNo = this.taskNolist[i].moveTaskNo
|
|
|
}
|
|
|
+ this.recheckPrice = false
|
|
|
}
|
|
|
|
|
|
}
|
zxz