Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-26 7264eb37b4332ae414ed1bb7a2bad22a5e27ddb2

 src/views/inspectionManagement/commissionInspection/addCommision.vue

@@ -22,7 +22,9 @@
                  :data="detectionInfo" style="width: 100%;margin-bottom: 20px;">
                  <el-table-column type="index" label="序号" min-width="10%" />
                  <el-table-column prop="sampleNumber" label="样品编号" min-width="8%" />

                  <el-table-column prop="sampleName" label="样品名称" min-width="10%" />

                  <el-table-column prop="specificationsModels" label="规格型号" min-width="10%" />
                  <el-table-column prop="unit" label="单位" min-width="8%" />
                  <el-table-column prop="samplesNumber" label="数量" min-width="8%" />
@@ -165,6 +167,14 @@
                  </el-row>
                  <el-row :gutter="50">
                     <el-col :span="11">
                        <el-form-item label="评定标准：">
                           <el-select v-model="addPointerForm.addway" size="small" placeholder="请选择评定标准">
                              <el-option v-for="options in model_spe_options" :value="options.value"
                                 :key="options.key">{{ options.value }}</el-option>
                           </el-select>
                        </el-form-item>
                     </el-col>
                     <el-col :span="11">
                        <el-form-item label="规格型号：">
                           <el-select v-model="addPointerForm.specificationsModels" size="small" placeholder="请先选择样品名称">
                              <el-option v-for="options in model_spe_options" :value="options.value"
@@ -172,31 +182,35 @@
                           </el-select>
                        </el-form-item>
                     </el-col>
							
                  </el-row>
                  <el-row :gutter="50">

                     <el-col :span="11">
                        <el-form-item label="样品单位：">
                           <el-input type="text" v-model="addPointerForm.unit" placeholder="请输入单位" autocomplete="off" />
                        </el-form-item>
                     </el-col>
                  </el-row>
                  <el-row :gutter="50">

                     <el-col :span="11">
                        <el-form-item label="样品数量：">
                           <el-input type="text" v-model="addPointerForm.samplesNumber" placeholder="请输入数量" autocomplete="off" />
                        </el-form-item>
                     </el-col>
                     <el-col :span="11">
                        <el-form-item label="备注：">
                           <el-input type="text" v-model="addPointerForm.remarks" placeholder="请输入备注" autocomplete="off" />
                        </el-form-item>
                     </el-col>
							
                  </el-row>
                  <el-row :gutter="50">
                     <el-col :span="10">
                     <el-col :span="9">
                        <el-form-item label="添加项目：">
                           <el-checkbox-group v-model="addPointerForm.experiment" style="display: flex; flex-direction: column;">
                              <el-checkbox v-for="expers in experList" :label="expers.label"
                                 :key="expers.key">{{ expers.label }}</el-checkbox>
                           </el-checkbox-group>
                        </el-form-item>
                     </el-col>
                     <el-col :span="41">
                        <el-form-item label="备注：">
                           <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 20}"  style="width: 200px;" v-model="addPointerForm.remarks" placeholder="请输入备注" autocomplete="off" />
                        </el-form-item>
                     </el-col>
                  </el-row>
@@ -337,6 +351,7 @@
            for (let i = 1; i < this.addPointerForm.experiment.length; i++) {
               exper += ',' + this.addPointerForm.experiment[i]
            }
				
            // console.log(exper)
            this.addPointerForm.experiment = exper
            let tmp = this.addPointerForm