Browse Source

试验修改

duy 1 month ago
parent
commit
369668d54b
2 changed files with 48 additions and 12 deletions
  1. 8 2
      src/views/codeRule/ruleManage.vue
  2. 40 10
      src/views/manager/projectinfo/codeSet.vue

+ 8 - 2
src/views/codeRule/ruleManage.vue

@@ -393,7 +393,7 @@
           <el-form-item label="规范名称" prop="name" >
             <el-input v-model="fileForm.name" ></el-input>
           </el-form-item>
-          <el-form-item label="下达日期" >
+          <el-form-item label="下达日期" prop="issueDate">
             <el-date-picker
             style="width: 100%;"
               format="yyyy 年 MM 月 dd 日"
@@ -403,7 +403,7 @@
               placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="实施日期" >
+          <el-form-item label="实施日期"  prop="actualizeDate">
             <el-date-picker
                format="yyyy 年 MM 月 dd 日"
               value-format="yyyy-MM-dd"
@@ -522,6 +522,12 @@ import { getStore, setStore } from "@/util/store";
           name: [
             { required: true, message: '请输入规范名称', trigger: 'blur' }
           ],
+          issueDate: [
+            { required: true, message: '请输入规范名称', trigger: 'blur' }
+          ],
+          actualizeDate: [
+            { required: true, message: '请输入规范名称', trigger: 'blur' }
+          ],
         },
         ypList:[
           {id:1,name:'样品名称',

+ 40 - 10
src/views/manager/projectinfo/codeSet.vue

@@ -26,6 +26,7 @@
      </div>
       
       <el-table
+ 
         :data="tableData"
         style="width: 100%"
         v-loading="loading"
@@ -68,6 +69,8 @@
             <el-input v-model="scope.row.data" placeholder="*自动获取当前年份" v-if="scope.row.rule===4" disabled></el-input>
              <el-input v-model="scope.row.data" placeholder="*自动获取当前月份" v-if="scope.row.rule===5" disabled></el-input>
              <el-input
+               ref="inputField"
+              v-bind:class="{ 'input-error': scope.row.rule === 6 && !scope.row.data }"
               v-model="scope.row.data"
               v-if="scope.row.rule === 6"
               @input="scope.row.data = scope.row.data.replace(/[^0-9]/g, '')"></el-input>
@@ -217,8 +220,12 @@ export default {
 
     }
   },
-
+mounted(){
+ 
+},
   methods: {
+
+
     show(pid) {
       this.dialogVisible = true
       this.projectId = pid
@@ -361,9 +368,12 @@ export default {
     if(!row.rule) {
       this.$message.warning('请选择规则!')
       return;
+    }
+    if(row.rule===6&&!row.data){
+      this.$message.warning('请输入数据填充!')
+      return;
     }
      row.isEdit = false;
- 
     },
     saveCodeSet(){
         if (this.tableData.length === 0) {
@@ -371,16 +381,26 @@ export default {
           return;
         }
 
-          for (let row of this.tableData) {
+        for (let [index, row] of this.tableData.entries()) {
             row.projectId = this.projectId;
-            row.type=this.activeName;
-              // 检查 row.rule 是否有值
-              if (!row.rule) {
-                  // 显示警告信息
-                  this.$message.warning('请选择规则!');
-                  return;
-              }
+            row.type = this.activeName;
+
+            // 检查 row.rule 是否有值
+            if (!row.rule) {
+              // 显示警告信息
+              this.$message.warning('请选择规则!');
+              return
+            } else if (row.rule === 6 && !row.data) {
+              // 记录错误行的索引
+          
+              this.$message.warning('请输入数据填充!');
+              return;
+            }
           }
+        
+                  
+  
+      
           this.saveCodeLoad = true;
                   submitList(this.tableData).then((res) => {
                       if (res.data.code === 200) {
@@ -465,4 +485,14 @@ export default {
     padding: 10px;
   }
 }
+.input-error {
+  border-color: red;
+}
+</style>
+<style>
+.input-error{
+  .el-input__inner{
+    border-color: red;
+  }
+}
 </style>