|
@@ -2,7 +2,7 @@
|
|
|
<div id="addOder">
|
|
|
<el-card style="position: relative">
|
|
|
<span>基本信息</span>
|
|
|
- <el-form :model="basicForm" :rules="basicRules" ref="basic" label-width="auto">
|
|
|
+ <el-form :model="basicForm" :rules="basicRules" :show-message="false" ref="basic" label-width="auto">
|
|
|
<el-row :gutter="10">
|
|
|
<el-col :span="1.5">
|
|
|
<el-form-item label="调出库存组织" prop="deliveryInventoryOrg">
|
|
@@ -318,7 +318,7 @@
|
|
|
width="200px"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-form-item class="hang">
|
|
|
+ <el-form-item class="hang" :prop="'materialInfo.' + scope.$index + '.materialCode'" :rules="basicForm.materialCode">
|
|
|
<el-input
|
|
|
clearable
|
|
|
:disabled="sonDisable"
|
|
@@ -1302,7 +1302,7 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <!-- <el-col :span="1.5">
|
|
|
+ <el-col :span="1.5">
|
|
|
<el-form-item label="最后修改人">
|
|
|
<el-input
|
|
|
v-model="basicForm.updateByName"
|
|
@@ -1323,7 +1323,7 @@
|
|
|
style="width: 200px"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- </el-col> -->
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
|
|
@@ -1513,41 +1513,26 @@ export default {
|
|
|
chuHouseOptions: [],
|
|
|
liacenterOptions: [],
|
|
|
basicRules: {
|
|
|
- // billType: [
|
|
|
- // { required: true, message: "订单类型不能为空", trigger: "blur" },
|
|
|
- // ],
|
|
|
- // deliveryWarehouse: [
|
|
|
- // { required: true, message: "调出仓库不能为空", trigger: "blur" },
|
|
|
- // ],
|
|
|
- // storageWarehouse:[
|
|
|
- // { required: true, message: "调入仓库不能为空", trigger: "blur" },
|
|
|
- // ],
|
|
|
- // deliveryInventoryOrg:[
|
|
|
- // { required: true, message: "调出库存组织不能为空", trigger: "blur" },
|
|
|
- // ],
|
|
|
- // storageInventoryOrg:[
|
|
|
- // { required: true, message: "调入库存组织不能为空", trigger: "blur" },
|
|
|
- // ],
|
|
|
- // deliveryDept:[
|
|
|
- // { required: true, message: "调出部门不能为空", trigger: "blur" },
|
|
|
- // ],
|
|
|
billType: [
|
|
|
- { required: true, message: "×",fieldName: "订单类型", trigger: "blur" },
|
|
|
+ { required: true, message: "订单类型不能为空", trigger: "blur" },
|
|
|
],
|
|
|
deliveryWarehouse: [
|
|
|
- { required: true, message: "×",fieldName: "调出仓库", trigger: "blur" },
|
|
|
+ { required: true, message: "调出仓库不能为空", trigger: "blur" },
|
|
|
],
|
|
|
storageWarehouse:[
|
|
|
- { required: true, message: "×",fieldName: "调入仓库", trigger: "blur" },
|
|
|
+ { required: true, message: "调入仓库不能为空", trigger: "blur" },
|
|
|
],
|
|
|
deliveryInventoryOrg:[
|
|
|
- { required: true, message: "×",fieldName: "调出库存组织", trigger: "blur" },
|
|
|
+ { required: true, message: "调出库存组织不能为空", trigger: "blur" },
|
|
|
],
|
|
|
storageInventoryOrg:[
|
|
|
- { required: true, message: "×",fieldName: "调入库存组织", trigger: "blur" },
|
|
|
+ { required: true, message: "调入库存组织不能为空", trigger: "blur" },
|
|
|
],
|
|
|
deliveryDept:[
|
|
|
- { required: true, message: "×",fieldName: "调出部门", trigger: "blur" },
|
|
|
+ { required: true, message: "调出部门不能为空", trigger: "blur" },
|
|
|
+ ],
|
|
|
+ materialCode:[
|
|
|
+ { required: true, message: "明细物料不能为空", trigger: "blur" },
|
|
|
],
|
|
|
},
|
|
|
materialInfo: [],
|
|
@@ -1721,7 +1706,6 @@ export default {
|
|
|
},
|
|
|
save() {
|
|
|
this.$refs["basic"].validate(async (valid, obj) => {
|
|
|
- console.log(valid,obj);
|
|
|
if (valid) {
|
|
|
if (this.materialInfo.length !== 0) {
|
|
|
if (this.sonPageStu == "add") {
|
|
@@ -1763,15 +1747,11 @@ export default {
|
|
|
this.$modal.notifyWarning("明细行不能为空");
|
|
|
}
|
|
|
} else {
|
|
|
- var a = [];
|
|
|
- for (let key in obj) {
|
|
|
- a.push(obj[key][0].fieldName);
|
|
|
+ const jiaoyan = []
|
|
|
+ for(let key in obj) {
|
|
|
+ jiaoyan.push(obj[key][0].message);
|
|
|
}
|
|
|
- console.log(a);
|
|
|
- this.$message({
|
|
|
- message: a + '不能为空!',
|
|
|
- type: "warning",
|
|
|
- });
|
|
|
+ this.$modal.notifyWarning(jiaoyan[0]);
|
|
|
return false;
|
|
|
}
|
|
|
});
|