|
|
@@ -47,18 +47,17 @@
|
|
|
<div class="form_box">
|
|
|
<el-form>
|
|
|
<div class="preview-group">
|
|
|
- <el-form-item label="发货港口:">
|
|
|
- <el-select
|
|
|
- v-model="portId"
|
|
|
- filterable >
|
|
|
- <el-option
|
|
|
- v-for="port in ports"
|
|
|
- :key="port.portId"
|
|
|
- :label="port.portName"
|
|
|
- :value="port.portId">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
+ <el-form-item label="发货港口:">
|
|
|
+ <el-select v-model="portId" filterable>
|
|
|
+ <el-option
|
|
|
+ v-for="port in ports"
|
|
|
+ :key="port.portId"
|
|
|
+ :label="port.portName"
|
|
|
+ :value="port.portId"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
</div>
|
|
|
</el-form>
|
|
|
<dil-form
|
|
|
@@ -178,7 +177,9 @@
|
|
|
<!-- 确定和取消 -->
|
|
|
<div class="button_box">
|
|
|
<el-button @click="cancel">取消</el-button>
|
|
|
- <el-button type="primary" @click="makeSure" :loading="isLoading">确定</el-button>
|
|
|
+ <el-button type="primary" @click="makeSure" :loading="isLoading"
|
|
|
+ >确定</el-button
|
|
|
+ >
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -191,12 +192,12 @@ export default {
|
|
|
components: { PageTitle },
|
|
|
data() {
|
|
|
return {
|
|
|
- isLoading:false,
|
|
|
+ isLoading: false,
|
|
|
a: 1,
|
|
|
cargoPictureUrl: "",
|
|
|
shippingCertificate: "",
|
|
|
- portId:null,
|
|
|
- ports:[],
|
|
|
+ portId: null,
|
|
|
+ ports: [],
|
|
|
materialType: "",
|
|
|
receiver: "",
|
|
|
input: "",
|
|
|
@@ -232,9 +233,20 @@ export default {
|
|
|
value6: undefined,
|
|
|
value7: undefined,
|
|
|
value8: undefined,
|
|
|
- batchIds:null,
|
|
|
+ batchIds: null,
|
|
|
+ portName: null,
|
|
|
};
|
|
|
},
|
|
|
+ computed: {
|
|
|
+ contactPerson() {
|
|
|
+ return this.form1.resultContactPerson;
|
|
|
+ },
|
|
|
+ },
|
|
|
+ watch: {
|
|
|
+ contactPerson() {
|
|
|
+ this.getPersonInfo();
|
|
|
+ },
|
|
|
+ },
|
|
|
mounted() {
|
|
|
// this.$set(this.form1, "requesterGroupId", 1); //委托单位（requesterGroupId）承运单位（carrierId）转移到提货委托
|
|
|
// this.$set(this.form1, "carrierId", 11);
|
|
|
@@ -242,22 +254,41 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
//查询所有港口
|
|
|
- getPorts(){
|
|
|
+ getPorts() {
|
|
|
this.axios.post("/api/v1/rms/getPortName?index=").then((res) => {
|
|
|
- if (res.data.code == 200) {
|
|
|
- //赋值
|
|
|
- this.ports=res.data.data;
|
|
|
- } else {
|
|
|
- this.$message({
|
|
|
- type: "warning",
|
|
|
- message: res.data.data,
|
|
|
- });
|
|
|
- }
|
|
|
+ if (res.data.code == 200) {
|
|
|
+ //赋值
|
|
|
+ this.ports = res.data.data;
|
|
|
+ } else {
|
|
|
+ this.$message({
|
|
|
+ type: "warning",
|
|
|
+ message: res.data.data,
|
|
|
+ });
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
+
|
|
|
+ getPersonInfo() {
|
|
|
+ this.axios
|
|
|
+ .post(
|
|
|
+ "/api/v1/tms/getNoticeContactNumberByPerson?personName=" +
|
|
|
+ this.form1.resultContactPerson
|
|
|
+ )
|
|
|
+ .then((res) => {
|
|
|
+ // this.$set(this.form1, "resultContactPerson", res.data.data.personName);
|
|
|
+ this.$set(
|
|
|
+ this.form1,
|
|
|
+ "resultTelephoneFax",
|
|
|
+ res.data.data.personPhone
|
|
|
+ );
|
|
|
+ console.log(this.form1);
|
|
|
});
|
|
|
},
|
|
|
+
|
|
|
upCLick(val) {
|
|
|
this.num = val;
|
|
|
},
|
|
|
+
|
|
|
beforeUpload(file) {
|
|
|
this.upBool = true;
|
|
|
const isLt2M = file.size < 1024 * 1024 * 0.5;
|
|
|
@@ -271,6 +302,7 @@ export default {
|
|
|
}
|
|
|
return isLt2M;
|
|
|
},
|
|
|
+
|
|
|
onError(err) {
|
|
|
if (this.upBool) {
|
|
|
if (this.num == 1) {
|
|
|
@@ -280,6 +312,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+
|
|
|
handleAvatarSuccess(res, file) {
|
|
|
if (res.code) {
|
|
|
this.upBool = false;
|
|
|
@@ -301,10 +334,7 @@ export default {
|
|
|
// 清空当前输入框中的数据
|
|
|
this.input = "";
|
|
|
},
|
|
|
- // currentRadioChange1(selection) {
|
|
|
- // (this.second.mapList1 = selection),
|
|
|
- // (this.materialName = selection.materialName);
|
|
|
- // },
|
|
|
+
|
|
|
currentRadioChange2(selection) {
|
|
|
(this.second1.mapList2 = selection), (this.cargo = selection.cargoName);
|
|
|
},
|
|
|
@@ -317,11 +347,14 @@ export default {
|
|
|
},
|
|
|
currentRadioChange5(selection) {
|
|
|
(this.second5.mapList5 = selection),
|
|
|
- (this.batchIds = selection.foreignShipName+""+selection.materialName);
|
|
|
+ (this.batchIds =
|
|
|
+ selection.foreignShipName + "" + selection.materialName);
|
|
|
},
|
|
|
+
|
|
|
onchange(val) {},
|
|
|
+
|
|
|
onclick(a) {
|
|
|
- if (a == 2) {
|
|
|
+ if (a == 2) {
|
|
|
this.second1.requestUrl =
|
|
|
"/api/v1/tms/selectShippeByName?apiId=215&con=" + this.input;
|
|
|
} else if (a == 3) {
|
|
|
@@ -331,8 +364,8 @@ export default {
|
|
|
// console.log("aaaa");
|
|
|
this.second3.requestUrl =
|
|
|
"/api/v1/rms/getMaterialTypeList?apiId=376&con=" + this.input;
|
|
|
- }else if(a==5){
|
|
|
- this.second5.requestUrl =
|
|
|
+ } else if (a == 5) {
|
|
|
+ this.second5.requestUrl =
|
|
|
"/api/v1/tms/getBatchIdByForeign?apiId=489&con=" + this.input;
|
|
|
}
|
|
|
},
|
|
|
@@ -340,58 +373,49 @@ export default {
|
|
|
handleClose(done) {
|
|
|
done();
|
|
|
},
|
|
|
+
|
|
|
makeSure() {
|
|
|
- // if (this.second.mapList1.length == 0) {
|
|
|
- // this.$message.warning("请选择物资");
|
|
|
- // return;
|
|
|
- // }
|
|
|
- // if (this.second1.mapList2.length == 0) {
|
|
|
- // this.$message.warning("请选择送达单位");
|
|
|
- // return;
|
|
|
- // }
|
|
|
- this.isLoading=true;
|
|
|
+ this.isLoading = true;
|
|
|
if (this.second2.mapList3.length == 0) {
|
|
|
this.$message.warning("请选择收货人");
|
|
|
- this.isLoading=false;
|
|
|
+ this.isLoading = false;
|
|
|
return;
|
|
|
}
|
|
|
if (this.second3.mapList4.length == 0) {
|
|
|
this.$message.warning("请选择物资品类");
|
|
|
- this.isLoading=false;
|
|
|
+ this.isLoading = false;
|
|
|
return;
|
|
|
}
|
|
|
if (this.second5.mapList5.length == 0) {
|
|
|
this.$message.warning("请选择批次");
|
|
|
- this.isLoading=false;
|
|
|
+ this.isLoading = false;
|
|
|
return;
|
|
|
}
|
|
|
-
|
|
|
//判断是否为电话号码
|
|
|
function isTelePhone() {
|
|
|
var value2 = map.resultTelephoneFax;
|
|
|
//验证是否为数字
|
|
|
var patrn = /^1[3-9]\d{9}$/;
|
|
|
- // var patrn2 = /^(\d{3,4}-)?\d{7,8}$/;
|
|
|
if (patrn.exec(value2) == null || value2 == "") {
|
|
|
return false;
|
|
|
} else {
|
|
|
return true;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
//电话号码赋值
|
|
|
var val2 = this.value2;
|
|
|
let map = {
|
|
|
- // carrierId: this.form1.carrierId, //委托单位（requesterGroupId）承运单位（carrierId）转移到提货委托
|
|
|
- // requesterGroupId: this.form1.requesterGroupId,
|
|
|
noticeCommerceMethod: this.form1.noticeCommerceMethod,
|
|
|
noticeHandoverMethod: this.form1.noticeHandoverMethod,
|
|
|
portId: this.portId,
|
|
|
noticePortConstructionFee: this.form1.noticePortConstructionFee,
|
|
|
noticeDeliveryTime: sjTime(this.form1.noticeDeliveryTime),
|
|
|
noticePileFreeDays: this.form1.noticePileFreeDays,
|
|
|
- batchIds:this.second5.mapList5.batchId,
|
|
|
+ batchIds: this.second5.mapList5.batchId,
|
|
|
purchaseContractUnitPrice: this.form1.purchaseContractUnitPrice,
|
|
|
purchaseContractMoisture: this.form1.purchaseContractMoisture,
|
|
|
+ portName: this.portName,
|
|
|
//微元素含量
|
|
|
tfeContent: this.form1.tfeContent,
|
|
|
silicaContent: this.form1.silicaContent,
|
|
|
@@ -405,17 +429,17 @@ export default {
|
|
|
resultNumberOfLoans: this.form1.resultNumberOfLoans,
|
|
|
cargoId: this.second1.mapList2.cargoId,
|
|
|
groupId: this.second2.mapList3.id,
|
|
|
- inFactoryShipName: this.form1.inFactoryShipName,
|
|
|
- foreignShipName: this.second5.mapList5.foreignShipName,
|
|
|
+ foreignShipName: this.second5.mapList5.foreignShipName,
|
|
|
materialId: this.second5.mapList5.materialId,
|
|
|
materialTypeId: this.second3.mapList4.materialTypeId,
|
|
|
isNeedPortDisCharge: this.form1.isNeedPortDisCharge,
|
|
|
isNeedPortFee: this.form1.isNeedPortFee,
|
|
|
isNeedBonded: this.form1.isNeedBonded,
|
|
|
cargoPictureUrl: this.cargoPictureUrl,
|
|
|
+ sulfurcontent: this.form1.sulfurcontent,
|
|
|
userId: getCookie("userId"),
|
|
|
};
|
|
|
- console.log(map);
|
|
|
+
|
|
|
//判断放货数量是否为数字
|
|
|
if (
|
|
|
map.noticeCommerceMethod == null ||
|
|
|
@@ -429,26 +453,22 @@ export default {
|
|
|
map.silicaContent == null ||
|
|
|
map.aluminaContent == null ||
|
|
|
map.phosphorusContent == null ||
|
|
|
- map.manganeseContent == null ||
|
|
|
map.resultContactPerson == null ||
|
|
|
map.resultTelephoneFax == null ||
|
|
|
map.resultNumberOfLoans == null ||
|
|
|
map.portId == null ||
|
|
|
map.groupId == null ||
|
|
|
- map.inFactoryShipName == null ||
|
|
|
map.isNeedPortDisCharge == null ||
|
|
|
map.isNeedPortFee == null ||
|
|
|
map.isNeedBonded == null
|
|
|
- // map.foreignShipName==null||
|
|
|
- // map.materialId==null
|
|
|
) {
|
|
|
this.$message.error("存在空值！");
|
|
|
- this.isLoading=false;
|
|
|
+ this.isLoading = false;
|
|
|
return;
|
|
|
}
|
|
|
if (!isTelePhone(val2)) {
|
|
|
this.$message.warning("电话号码或传真格式不正确");
|
|
|
- this.isLoading=false;
|
|
|
+ this.isLoading = false;
|
|
|
return;
|
|
|
}
|
|
|
if (
|
|
|
@@ -456,7 +476,7 @@ export default {
|
|
|
!isNumber(map.noticePortConstructionFee)
|
|
|
) {
|
|
|
this.$message.error("港建费金额得为数字");
|
|
|
- this.isLoading=false;
|
|
|
+ this.isLoading = false;
|
|
|
return;
|
|
|
}
|
|
|
if (
|
|
|
@@ -464,7 +484,7 @@ export default {
|
|
|
!isNumber(map.purchaseContractMoisture)
|
|
|
) {
|
|
|
this.$message.error("合同水分得为数字");
|
|
|
- this.isLoading=false;
|
|
|
+ this.isLoading = false;
|
|
|
return;
|
|
|
}
|
|
|
if (
|
|
|
@@ -472,7 +492,7 @@ export default {
|
|
|
!isNumber(map.noticePortConstructionFee)
|
|
|
) {
|
|
|
this.$message.error("港建费金额得为数字");
|
|
|
- this.isLoading=false;
|
|
|
+ this.isLoading = false;
|
|
|
return;
|
|
|
}
|
|
|
if (
|
|
|
@@ -480,7 +500,7 @@ export default {
|
|
|
!isNumber(map.noticePileFreeDays)
|
|
|
) {
|
|
|
this.$message.error("免堆天数得为数字");
|
|
|
- this.isLoading=false;
|
|
|
+ this.isLoading = false;
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
@@ -489,12 +509,12 @@ export default {
|
|
|
!isNumber(map.purchaseContractUnitPrice)
|
|
|
) {
|
|
|
this.$message.error("单价得为数字");
|
|
|
- this.isLoading=false;
|
|
|
+ this.isLoading = false;
|
|
|
return;
|
|
|
}
|
|
|
if (typeof map.tfeContent != "undefined" && !isNumber(map.tfeContent)) {
|
|
|
this.$message.error("tfe含量得为数字");
|
|
|
- this.isLoading=false;
|
|
|
+ this.isLoading = false;
|
|
|
return;
|
|
|
}
|
|
|
if (
|
|
|
@@ -502,7 +522,7 @@ export default {
|
|
|
!isNumber(map.silicaContent)
|
|
|
) {
|
|
|
this.$message.error("二氧化硅含量得为数字");
|
|
|
- this.isLoading=false;
|
|
|
+ this.isLoading = false;
|
|
|
return;
|
|
|
}
|
|
|
if (
|
|
|
@@ -510,7 +530,7 @@ export default {
|
|
|
!isNumber(map.aluminaContent)
|
|
|
) {
|
|
|
this.$message.error("氧化铝含量得为数字");
|
|
|
- this.isLoading=false;
|
|
|
+ this.isLoading = false;
|
|
|
return;
|
|
|
}
|
|
|
if (
|
|
|
@@ -518,7 +538,7 @@ export default {
|
|
|
!isNumber(map.phosphorusContent)
|
|
|
) {
|
|
|
this.$message.error("含磷量得为数字");
|
|
|
- this.isLoading=false;
|
|
|
+ this.isLoading = false;
|
|
|
return;
|
|
|
}
|
|
|
if (
|
|
|
@@ -526,25 +546,28 @@ export default {
|
|
|
!isNumber(map.resultNumberOfLoans)
|
|
|
) {
|
|
|
this.$message.error("放货数量得为数字");
|
|
|
- this.isLoading=false;
|
|
|
+ this.isLoading = false;
|
|
|
return;
|
|
|
} else
|
|
|
- this.axios.post("/api/v1/tms/insertDeliveryNotice", map).then((res) => {
|
|
|
- if (res.data.code == 200) {
|
|
|
- this.$message({
|
|
|
- type: "success",
|
|
|
- message: "新增成功",
|
|
|
- });
|
|
|
- this.cancel();
|
|
|
- } else {
|
|
|
- this.$message({
|
|
|
- type: "warning",
|
|
|
- message: res.data.data,
|
|
|
- });
|
|
|
- }
|
|
|
- }).then(()=>{
|
|
|
- this.isLoading=false;
|
|
|
- });
|
|
|
+ this.axios
|
|
|
+ .post("/api/v1/tms/insertDeliveryNotice", map)
|
|
|
+ .then((res) => {
|
|
|
+ if (res.data.code == 200) {
|
|
|
+ this.$message({
|
|
|
+ type: "success",
|
|
|
+ message: "新增成功",
|
|
|
+ });
|
|
|
+ this.cancel();
|
|
|
+ } else {
|
|
|
+ this.$message({
|
|
|
+ type: "warning",
|
|
|
+ message: res.data.data,
|
|
|
+ });
|
|
|
+ }
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ this.isLoading = false;
|
|
|
+ });
|
|
|
},
|
|
|
// 取消
|
|
|
cancel() {
|
zx