yijing 1 年之前
父節點
當前提交
fc04373b86
共有 2 個文件被更改,包括 10 次插入6 次删除
  1. 3 4
      src/views/inspectionPlan/components/baseInfo.vue
  2. 7 2
      src/views/inspectionPlan/components/edit.vue

+ 3 - 4
src/views/inspectionPlan/components/baseInfo.vue

@@ -181,10 +181,10 @@
             trigger: 'blur'
           }">
             <div style="display: flex;align-items: center;justify-content: space-between;">
-              <el-input type="number" v-model="form.sampleNumber" disabled style="width: calc(100% - 80px)">
+              <el-input type="number" v-model="form.sampleNumber" disabled style="width: calc(100% - 90px)">
               </el-input>
               <DictSelection dictName="计量单位" clearable v-model="form.sampleMeasureUnit" disabled size="mini"
-                style="width: 80px;margin-left: 15px;">
+                style="width: 90px;margin-left: 12px;">
               </DictSelection>
             </div>
           </el-form-item>
@@ -492,8 +492,7 @@ export default {
       this.$emit('getCategoryInfo', this.categoryInfo)
     },
     getsampleMeasureUnit(val) {
-      console.log(val, '单位')
-      this.form.sampleMeasureUnit = val
+      this.$set(this.form, 'sampleMeasureUnit', val);
     }
 
   }

+ 7 - 2
src/views/inspectionPlan/components/edit.vue

@@ -651,7 +651,8 @@ export default {
       //如果取小样
       if (this.conditionType == 2) {
         // this.baseForm.sampleMeasureUnit = this.$refs.table12.getData()[0].measureUnit
-        this.formData.sampleUnit = this.$refs.table12.getData()[0].measureUnit
+        const data1 = this.$refs.table12.getData()
+        this.formData.sampleUnit = data1[0]?.measureUnit;
       }
     },
 
@@ -857,7 +858,10 @@ export default {
     getNewSampleList(measureQ, unit, nums) {
       this.sampleList = [];
       let data = [];
-
+      if (this.selectedList.length == 0) {
+        this.$message.warning('请先选择样品!')
+        return;
+      }
       this.selectedList.forEach(oldItem => {
 
         delete oldItem.id;
@@ -900,6 +904,7 @@ export default {
         let unit = this.formData.sampleUnit;
         let nums = Number(this.formData.portion);
 
+        console.log(measureQ, unit, nums, 'measureQ, unit, nums')
         this.getNewSampleList(measureQ, unit, nums)
       }
       this.activeName = '2'