样品名称和规格型号规则

itdmWeb/src/views/module-iTDM/weituo/modules/step/Step2.vue

@@ -83,12 +83,15 @@ export default {
     }
   },
   data() {
-    let checkSampleName = (rule, value, callback) => {
+    let checkSampleNameGgxh = (rule, value, callback) => {
       // console.log(rule, value, callback)
-      var arr = this.model.data.filter(item => item.sampleName === value)
-      console.log(arr)
+      var currentRowIndex = parseInt(rule.field.substring(5, 6))
+      var currentValue = this.model.data[currentRowIndex]
+      // console.log(this.model.data[currentRowIndex])
+      var arr = this.model.data.filter(item => item.sampleName === currentValue.sampleName && item.sampleModelSpecification === currentValue.sampleModelSpecification)
+      // console.log(arr)
       if (arr.length > 1) {
-        callback(new Error('该样品名称存在重复'))
+        callback(new Error('样品名称和规格型号不能全重复'))
       } else {
         callback()
       }
@@ -107,10 +110,11 @@ export default {
       validatorRules: {
         sampleName: [
           { required: true, message: '请输入样品名称!' },
-          // { validator: checkSampleName }
+          { validator: checkSampleNameGgxh }
         ],
         sampleModelSpecification: [
-          { required: true, message: '请输入样品规格/型号!' }
+          { required: true, message: '请输入样品规格/型号!' },
+          { validator: checkSampleNameGgxh }
         ],
         sampleQuantities: [
           { required: true, message: '请输入样品数量!' },
@@ -224,6 +228,7 @@ export default {
       console.log(key)
       const newData = this.model.data.filter(item => item.key !== key)
       this.model.data = newData
+      // this.model.data.splice(this.model.data.findIndex(item=>item.key === key), 1)
     },
     //saveRow(key) {
     //   let target = this.data.filter(item => item.key === key)[0]