Prechádzať zdrojové kódy

Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

5 rokov pred
rodič
commit
b8c4b2e728
1 zmenil súbory, kde vykonal 31 pridanie a 9 odobranie
  1. 31 9
      ys_vue/src/views/base/allocation.vue

+ 31 - 9
ys_vue/src/views/base/allocation.vue

@@ -87,13 +87,14 @@
         :inline="true"
         class="demo-form-inline"
       >
-        <el-form-item label="云模盒编号">
+        <el-form-item label="云模盒编号" prop="equipmentNo">
           <el-input v-model="newAllocation.equipmentNo" autocomplete="off" placeholder="请填写"></el-input>
         </el-form-item>
-        <el-form-item label="所属公司">
+        <el-form-item label="所属公司" prop="belongCompanyId">
           <el-select
             v-model="newAllocation.belongCompanyId"
             filterable
+            clearable
             placeholder="请选择"
             style="width: 202px"
           >
@@ -105,7 +106,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="使用年限">
+        <el-form-item label="使用年限" prop="useLife">
           <el-input v-model="newAllocation.useLife" autocomplete="off" placeholder="请填写"></el-input>
         </el-form-item>
       </el-form>
@@ -131,13 +132,14 @@
         :inline="true"
         class="demo-form-inline"
       >
-        <el-form-item label="云模盒编号">
+        <el-form-item label="云模盒编号" prop="equipmentNo">
           <el-input v-model="newAllocation.equipmentNo" autocomplete="off" placeholder="请填写"></el-input>
         </el-form-item>
-        <el-form-item label="所属公司">
+        <el-form-item label="所属公司" prop="belongCompanyId">
           <el-select
             v-model="newAllocation.belongCompanyId"
             filterable
+            clearable
             placeholder="请选择"
             style="width: 202px"
           >
@@ -149,10 +151,10 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="设备名称">
+        <el-form-item label="设备名称" prop="equipmentName">
           <el-input v-model="newAllocation.equipmentName" autocomplete="off" placeholder="请填写"></el-input>
         </el-form-item>
-        <el-form-item label="使用年限">
+        <el-form-item label="使用年限" prop="useLife">
           <el-input v-model="newAllocation.useLife" autocomplete="off" placeholder="请填写"></el-input>
         </el-form-item>
       </el-form>
@@ -173,7 +175,6 @@ export default {
       companies: {},
       newAllocation: {
         equipmentNo: "", //设备编号
-        // power: "",
         useLife: "", //使用年限
         equipmentName: "", //设备名称
         id: "", //设备id
@@ -183,7 +184,28 @@ export default {
         name: "",
         value: ""
       },
-      formRules: {},
+      formRules: {
+        equipmentNo: [
+          { required: true, message: "请输入云模盒编号", trigger: "blur" }
+        ],
+        useLife: [
+          {
+            required: true,
+            message: "请输入使用年限",
+            trigger: "blur"
+          }
+        ],
+        equipmentName: [
+          { required: true, message: "请输入设备名称", trigger: "blur" }
+        ],
+        belongCompanyId: [
+          {
+            required: true,
+            message: "请选择所属公司",
+            trigger: ["blur", "change"]
+          }
+        ]
+      },
       listLoading: false,
       addLoading: false,
       editLoading: false,