|
|
@@ -255,7 +255,6 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- </el-form>
|
|
|
<el-form :model="list" ref="list" :rules="rulEs" label-position="top">
|
|
|
<!-- 货物信息-->
|
|
|
<!-- 基本资料-->
|
|
|
@@ -351,20 +350,24 @@
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div class="mainModules" v-if="whether === true">
|
|
|
- <span>设置温度(℃)</span>
|
|
|
- <el-input style="width:80%;margin-left:20px;top: 4px" v-model="list.fTemperature"/>
|
|
|
+ <el-form-item label="设置温度(℃)">
|
|
|
+ <el-input style="width:80%;" v-model="list.fTemperature" @input="temperature" onkeyup="this.value= this.value.match(/^[1-9]\d*$/)"/>
|
|
|
+ </el-form-item>
|
|
|
</div>
|
|
|
<div class="mainModules" v-if="whether === true">
|
|
|
- <span>风门开度(%)</span>
|
|
|
- <el-input style="width:80%;margin-left:20px;top: 4px" v-model="list.fDraught"/>
|
|
|
+ <el-form-item label="风门开度(%)">
|
|
|
+ <el-input style="width:80%;" v-model="list.fDraught"/>
|
|
|
+ </el-form-item>
|
|
|
</div>
|
|
|
<div class="mainModules" v-if="whether === true">
|
|
|
- <span>湿度设置(%)</span>
|
|
|
- <el-input style="width:80%;margin-left:20px;top: 4px" v-model="list.fHumidity"/>
|
|
|
+ <el-form-item label="湿度设置(%)">
|
|
|
+ <el-input style="width:80%;" v-model="list.fHumidity"/>
|
|
|
+ </el-form-item>
|
|
|
</div>
|
|
|
<div class="mainModules" v-if="whether === true">
|
|
|
- <span>预冷要求</span>
|
|
|
- <el-input style="width:80%;margin-left:20px;top: 4px" v-model="list.fPrecooling"/>
|
|
|
+ <el-form-item label="预冷要求">
|
|
|
+ <el-input style="width:80%;" v-model="list.fPrecooling"/>
|
|
|
+ </el-form-item>
|
|
|
</div>
|
|
|
<div class="mainModules">
|
|
|
<el-form-item label="危险化学品" prop="fIfdanger">
|
|
|
@@ -389,6 +392,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ </el-form>
|
|
|
<!-- 费用信息-->
|
|
|
<div class="moduleStyle">
|
|
|
<div class="titleBox">
|
|
|
@@ -399,7 +403,7 @@
|
|
|
<div class="mainModules">
|
|
|
<el-form-item label="是否办理保险" prop="fInsurance">
|
|
|
<el-select style="width:80%;" placeholder="请选择"
|
|
|
- v-model="list.fInsurance">
|
|
|
+ v-model="form.fInsurance">
|
|
|
<el-option
|
|
|
v-for="(dict, index) in insurance"
|
|
|
:key="dict.dictValue"
|
|
|
@@ -411,13 +415,12 @@
|
|
|
</div>
|
|
|
<div class="mainModules">
|
|
|
<el-form-item label="保险货值(万元)" prop="fInsuranceamt">
|
|
|
- <el-input style="width:80%;" v-model="list.fInsuranceamt" :disabled="list.fInsurance == '2'"/>
|
|
|
+ <el-input style="width:80%;" v-model="form.fInsuranceamt" :disabled="list.fInsurance == '2'"/>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-form>
|
|
|
-
|
|
|
<!-- 箱信息-->
|
|
|
<div class="moduleStyle" v-if="boxInformation">
|
|
|
<div class="titleBox">
|
|
|
@@ -658,6 +661,8 @@ export default {
|
|
|
fConsigneername: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
fConsigneeattn: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
fConsigneetel: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
+ fInsurance: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
+ fInsuranceamt: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
},
|
|
|
rulEs:{
|
|
|
fGoodsid: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
@@ -668,8 +673,6 @@ export default {
|
|
|
fCntrstatus: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
fSoc: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
fIfdanger: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
- fInsurance: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
- fInsuranceamt: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
},
|
|
|
fMblnoOptions: [],
|
|
|
paymentMethod: [],
|
|
|
@@ -684,13 +687,13 @@ export default {
|
|
|
boxInformation: false,
|
|
|
tableData: [],
|
|
|
container: [],
|
|
|
- form: {},
|
|
|
- etentioncargo:[],
|
|
|
- estimaTe: '',
|
|
|
- list: {
|
|
|
+ form: {
|
|
|
fInsuranceamt:0,
|
|
|
fInsurance:'1'
|
|
|
},
|
|
|
+ etentioncargo:[],
|
|
|
+ estimaTe: '',
|
|
|
+ list: {},
|
|
|
typeGoods: '',
|
|
|
whether: false,
|
|
|
dangerous: [],
|
|
|
@@ -726,6 +729,15 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ temperature(res){
|
|
|
+ console.log(res);
|
|
|
+ if (res < 20 || res > -30){
|
|
|
+ console.log("1111");
|
|
|
+ return
|
|
|
+ }else {
|
|
|
+ this.$message.error('冷藏箱温度为-30℃至20℃之间的整数');
|
|
|
+ }
|
|
|
+ },
|
|
|
newlyAdded() {
|
|
|
console.log(this.tableData);
|
|
|
this.tableData.push({
|
|
|
@@ -791,13 +803,16 @@ export default {
|
|
|
url: '/khwarehouse/warehousebills/submitMakingMessage',
|
|
|
method: 'post',
|
|
|
data: formData
|
|
|
- })
|
|
|
- .then(res => {
|
|
|
+ }).then(res => {
|
|
|
console.log(res);
|
|
|
if (res.data.code === 500){
|
|
|
console.log(res.data.msg);
|
|
|
+ }else {
|
|
|
+ this.goods = res.data.data;
|
|
|
+ this.$router.push({
|
|
|
+ path: '/',
|
|
|
+ });
|
|
|
}
|
|
|
- this.goods = res.data.data;
|
|
|
})
|
|
|
.catch(err => {
|
|
|
console.log(err);
|
|
|
@@ -919,7 +934,8 @@ export default {
|
|
|
confirmOrder() {
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
- this.$refs["form"].validate((valid) => {
|
|
|
+ console.log(valid);
|
|
|
+ this.$refs["list"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
let formData = new window.FormData();
|
|
|
formData.append('tWarehousebills', JSON.stringify(this.form));
|
|
|
@@ -932,6 +948,9 @@ export default {
|
|
|
.then(res => {
|
|
|
if (res.data.code === 200){
|
|
|
this.$message.success(res.data.msg);
|
|
|
+ this.$router.push({
|
|
|
+ path: '/',
|
|
|
+ });
|
|
|
}
|
|
|
console.log(res);
|
|
|
})
|
|
|
@@ -949,13 +968,8 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- handleClose(done) {
|
|
|
- this.$confirm('确认关闭？')
|
|
|
- .then(_ => {
|
|
|
- done();
|
|
|
- })
|
|
|
- .catch(_ => {
|
|
|
- });
|
|
|
+ handleClose() {
|
|
|
+ this.dialogVisible = false
|
|
|
},
|
|
|
select(id) {
|
|
|
for (let item in this.goods) {
|
|
|
@@ -969,11 +983,13 @@ export default {
|
|
|
console.log(this.container);
|
|
|
for (let item in this.container) {
|
|
|
if (this.container[item].fId === id) {
|
|
|
- this.whether = true;
|
|
|
- return;
|
|
|
- } else {
|
|
|
- this.whether = false;
|
|
|
- return;
|
|
|
+ if (this.container[item].fType === 2){
|
|
|
+ this.whether = true;
|
|
|
+ return
|
|
|
+ }else {
|
|
|
+ this.whether = false;
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
caojunjie
