sampleModel add Unit V1

src/views/system/jbdScan/goods/manualConfirmation.vue

@@ -23,7 +23,7 @@
                                 <div class="dynamic-form-table__block panel panel-info">
                                     <div class="panel-heading ibps-clearfix">
                                         <!--块模式：工具栏-->
-                                        <div class="ibps-fl dynamic-form-table__label">
+                                        <div class="ibps-fl dynamic-form-table__label" >
                                             样品No:{{ index + 1 }}
                                         </div>
                                     </div>
@@ -58,260 +58,321 @@
                             </el-row>
 
 
-                            <el-row>
-                                <el-col :span="6">
-                                    <el-form-item label="样品类型(一)">
-                                        <!-- <el-input v-model="item.yang_pin_lei_xing " ></el-input> -->
-                                        <template slot-scope="scope">
-                                            <el-select v-model="item.yang_pin_lei_xing" placeholder="请选择" filterable
-                                                allow-create>
-                                                <el-option v-for="item in sampleTypes" :key="item.value" :label="item.label"
-                                                    :value="item.value">
-                                                </el-option>
-                                            </el-select>
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-
-                                <el-col :span="6">
-                                    <el-form-item label="样品运输条件(一)">
-                                        <!-- <el-input v-model="item.yang_ben_yun_shu_" ></el-input> -->
-                                        <template slot-scope="scope">
-                                            <el-select v-model="item.yang_ben_yun_shu_" placeholder="请选择" filterable
-                                                allow-create>
-                                                <el-option v-for="item in sampleTransportationConditions" :key="item.value"
-                                                    :label="item.label" :value="item.value">
-                                                </el-option>
-                                            </el-select>
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-
-                                <el-col :span="6">
-                                    <el-form-item label="样品数量(一)">
-                                        <el-input v-model="item.shu_liang_" @change="changeShuLiang(index)"></el-input>
-                                    </el-form-item>
-                                </el-col>
+                            <div v-if="item.yang_pin_lei_xing">
+                                <div>
+                                    <el-alert
+                                        title="样品类型①信息"
+                                        type="success">
+                                    </el-alert>
+                                </div>
 
-                                <el-col :span="6">
-                                    <el-form-item label="样品规格(一)">
-                                        <!-- <el-input v-model="item.yang_pin_gui_ge_"></el-input> -->
-                                        <template slot-scope="scope">
-                                            <el-select v-model="item.yang_pin_gui_ge_" placeholder="请选择" filterable
-                                                allow-create>
-                                                <el-option v-for="item in sampleSpecifications" :key="item.value"
-                                                    :label="item.label" :value="item.value">
-                                                </el-option>
-                                            </el-select>
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                            </el-row>
-                            <!--每种类型对应的留样数量和留样存放位置-->
+                                <el-row>
+                                    <el-col :span="8">
+                                        <el-form-item label="样品类型(一)">
+                                            <!-- <el-input v-model="item.yang_pin_lei_xing " ></el-input> -->
+                                            <template slot-scope="scope">
+                                                <el-select v-model="item.yang_pin_lei_xing" placeholder="请选择" filterable
+                                                    allow-create>
+                                                    <el-option v-for="item in sampleTypes" :key="item.value" :label="item.label"
+                                                        :value="item.value">
+                                                    </el-option>
+                                                </el-select>
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+
+                                    <el-col :span="8">
+                                        <el-form-item label="样品运输条件(一)">
+                                            <!-- <el-input v-model="item.yang_ben_yun_shu_" ></el-input> -->
+                                            <template slot-scope="scope">
+                                                <el-select v-model="item.yang_ben_yun_shu_" placeholder="请选择" filterable
+                                                    allow-create>
+                                                    <el-option v-for="item in sampleTransportationConditions" :key="item.value"
+                                                        :label="item.label" :value="item.value">
+                                                    </el-option>
+                                                </el-select>
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+
+                                    <el-col :span="8">
+                                        <el-form-item label="样品数量(一)">
+                                            <el-input v-model="item.shu_liang_" @change="changeShuLiang(index)"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                    </el-row>
+
+                                    <el-row>
+                                        <el-col :span="8">
+                                            <el-form-item label="样品规格(一)">
+                                                <template slot-scope="scope">
+                                                    <el-select 
+                                                        v-model="item.yang_pin_gui_ge_"     
+                                                        placeholder="请选择" 
+                                                        filterable
+                                                        allow-create
+                                                        @change="changeGuiGe(index,0)">
+                                                        <el-option v-for="item in sampleSpecifications" :key="item.value"
+                                                            :label="item.label" :value="item.value">
+                                                        </el-option>
+                                                    </el-select>
+                                                </template>
+                                            </el-form-item>
+                                        </el-col>
+                                        <el-col :span="8">
+                                            <el-form-item label="单位(一)" v-if="UnitFlag">
+                                                <el-input v-model="item.dan_wei_yi"></el-input>
+                                            </el-form-item>
+                                        </el-col>
+                                        <el-col :span="8">
+                                        <el-form-item label="样品存放位置(一)" required>
+                                            <template slot-scope="scope">
+                                                <weizhiData v-model="item.shou_yang_wei_zhi_yi" />
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+                                <!--每种类型对应的留样数量和留样存放位置-->
+                                <el-row>
+                                
+                                    <el-col :span="8">
+                                        <el-form-item label="是否留样" class="zzj">
+                                            <template slot-scope="scope">
+                                                <el-select v-model="item.shi_fou_liu_yang_yi" placeholder="请选择"
+                                                    @change="ifLiuYangChange_One(index)">
+                                                    <el-option v-for="item in ifLY" :key="item.value" :label="item.label"
+                                                        :value="item.value">
+                                                    </el-option>
+                                                </el-select>
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <el-form-item label="留样数量(一)" required class="zzj">
+                                            <template slot-scope="scope">
+                                                <el-input v-model="item.liu_yang_shu_lian_yi"></el-input>
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <el-form-item label="留样存放位置(一)" required>
+                                            <template slot-scope="scope">
+                                                <liuyangData v-model="item.liu_yang_wei_zhi_yi" ref="LyPositionOne" />
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+                            </div>
+                            
+                            <div  v-if="item.flag2">
+                                <div>
+                                    <el-alert
+                                        title="样品类型②信息"
+                                        type="success">
+                                    </el-alert>
+                                </div>
+                                <el-row>
+                                    <el-col :span="8">
+                                        <el-form-item label="样品类型(二)">
+                                            <!-- <el-input v-model="item.yang_pin_lei_er_"   ></el-input> -->
+                                            <template slot-scope="scope">
+                                                <el-select v-model="item.yang_pin_lei_er_" placeholder="请选择" filterable
+                                                    allow-create>
+                                                    <el-option v-for="item in sampleTypes" :key="item.value" :label="item.label"
+                                                        :value="item.value">
+                                                    </el-option>
+                                                </el-select>
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <el-form-item label="样品运输条件(二)">
+                                            <!-- <el-input v-model="item.yang_pin_yun_shu_"  ></el-input> -->
+                                            <template slot-scope="scope">
+                                                <el-select v-model="item.yang_pin_yun_shu_" placeholder="请选择" filterable
+                                                    allow-create>
+                                                    <el-option v-for="item in sampleTransportationConditions" :key="item.value"
+                                                        :label="item.label" :value="item.value">
+                                                    </el-option>
+                                                </el-select>
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <el-form-item label="样品数量(二)">
+                                            <el-input v-model="item.shu_liang_er_" @change="changeShuLiang(index)"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+
+                                <el-row>
+                                    <el-col :span="8">
+                                        <el-form-item label="样品规格(二)">
+                                            <!-- <el-input v-model="item.yang_pin_gui_ge_e"  ></el-input> -->
+                                            <template slot-scope="scope">
+                                                <el-select v-model="item.yang_pin_gui_ge_e" placeholder="请选择" filterable
+                                                    allow-create @change="changeGuiGe(index,1)">
+                                                    <el-option v-for="item in sampleSpecifications" :key="item.value"
+                                                        :label="item.label" :value="item.value">
+                                                    </el-option>
+                                                </el-select>
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                            <el-form-item label="单位(二)" v-if="UnitFlag">
+                                                <el-input v-model="item.dan_wei_er"></el-input>
+                                            </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <el-form-item label="样品存放位置(二)" required>
+                                            <template slot-scope="scope">
+                                                <weizhiData v-model="item.shou_yang_wei_zhi_er" />
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+                                <!--每种类型对应的留样数量和留样存放位置-->
+                                <el-row>
+                                    <el-col :span="8">
+                                        <el-form-item label="是否留样" class="zzj">
+                                            <template slot-scope="scope">
+                                                <el-select v-model="item.shi_fou_liu_yang_er" placeholder="请选择"
+                                                    @change="ifLiuYangChange_Two(index)">
+                                                    <el-option v-for="item in ifLY" :key="item.value" :label="item.label"
+                                                        :value="item.value">
+                                                    </el-option>
+                                                </el-select>
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <el-form-item label="留样数量(二)" required class="zzj">
+                                            <template slot-scope="scope">
+                                                <el-input v-model="item.liu_yang_shu_lian_er"></el-input>
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <el-form-item label="留样存放位置(二)" required>
+                                            <template slot-scope="scope">
+                                                <liuyangData v-model="item.liu_yang_wei_zhi_er" ref="LyPositionTwo" />
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+                            </div>
+                            
+                            
+                            <div v-if="item.flag3">
+                                <div>
+                                    <el-alert
+                                        title="样品类型③信息"
+                                        type="success">
+                                    </el-alert>
+                                </div>
+                                <el-row>
+                                    <el-col :span="8">
+                                        <el-form-item label="样品类型(三)">
+                                            <!-- <el-input v-model="item.yang_pin_lei_san_"  ></el-input> -->
+                                            <template slot-scope="scope">
+                                                <el-select v-model="item.yang_pin_lei_san_" placeholder="请选择" filterable
+                                                    allow-create>
+                                                    <el-option v-for="item in sampleTypes" :key="item.value" :label="item.label"
+                                                        :value="item.value">
+                                                    </el-option>
+                                                </el-select>
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <el-form-item label="样品运输条件(三)">
+                                            <!-- <el-input v-model="item.yang_pin_yun_san"  ></el-input> -->
+                                            <template slot-scope="scope">
+                                                <el-select v-model="item.yang_pin_yun_san" placeholder="请选择" filterable
+                                                    allow-create>
+                                                    <el-option v-for="item in sampleTransportationConditions" :key="item.value"
+                                                        :label="item.label" :value="item.value">
+                                                    </el-option>
+                                                </el-select>
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <el-form-item label="样品数量(三)">
+                                            <el-input v-model="item.shu_liang_san_" @change="changeShuLiang(index)"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+                                <el-row>
+                                    <el-col :span="8">
+                                        <el-form-item label="样品规格(三)">
+                                            <!-- <el-input v-model="item.yang_pin_gui_ge_s"  ></el-input> -->
+                                            <template slot-scope="scope">
+                                                <el-select v-model="item.yang_pin_gui_ge_s" placeholder="请选择" filterable
+                                                    allow-create @change="changeGuiGe(index,2)">
+                                                    <el-option v-for="item in sampleSpecifications" :key="item.value"
+                                                        :label="item.label" :value="item.value">
+                                                    </el-option>
+                                                </el-select>
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                                <el-form-item label="单位(三)" v-if="UnitFlag">
+                                                    <el-input v-model="item.dan_wei_san"></el-input>
+                                                </el-form-item>
+                                        </el-col>
+                                        <el-col :span="8">
+                                        <el-form-item label="样品存放位置(三)" required>
+                                            <template slot-scope="scope">
+                                                <weizhiData v-model="item.shou_yang_wei_zhi_san" />
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+                              
+                                <!--每种类型对应的留样数量和留样存放位置-->
+                                <el-row>
+                                    <el-col :span="8">
+                                        <el-form-item label="是否留样" class="zzj">
+                                            <template slot-scope="scope">
+                                                <el-select v-model="item.shi_fou_liu_yang_san" placeholder="请选择"
+                                                    @change="ifLiuYangChange_Three(index)">
+                                                    <el-option v-for="item in ifLY" :key="item.value" :label="item.label"
+                                                        :value="item.value">
+                                                    </el-option>
+                                                </el-select>
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <el-form-item label="留样数量(三)" required class="zzj">
+                                            <template slot-scope="scope">
+                                                <el-input v-model="item.liu_yang_shu_lian_san"></el-input>
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <el-form-item label="留样存放位置(三)" required>
+                                            <template slot-scope="scope">
+                                                <liuyangData v-model="item.liu_yang_wei_zhi_san" ref="LyPositionThree" />
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+                            </div>
+                            
+
+                            <div v-if="item.flag4">
+                                <div>
+                                    <el-alert
+                                        title="样品类型④信息"
+                                        type="success">
+                                    </el-alert>
+                                </div>
                             <el-row>
-                                <el-col :span="6">
-                                    <el-form-item label="样品存放位置(一)" required>
-                                        <template slot-scope="scope">
-                                            <weizhiData v-model="item.shou_yang_wei_zhi_yi" />
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-form-item label="是否留样" class="zzj">
-                                        <template slot-scope="scope">
-                                            <el-select v-model="item.shi_fou_liu_yang_yi" placeholder="请选择"
-                                                @change="ifLiuYangChange_One(index)">
-                                                <el-option v-for="item in ifLY" :key="item.value" :label="item.label"
-                                                    :value="item.value">
-                                                </el-option>
-                                            </el-select>
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-form-item label="留样数量(一)" required class="zzj">
-                                        <template slot-scope="scope">
-                                            <el-input v-model="item.liu_yang_shu_lian_yi"></el-input>
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-form-item label="留样存放位置(一)" required>
-                                        <template slot-scope="scope">
-                                            <liuyangData v-model="item.liu_yang_wei_zhi_yi" ref="LyPositionOne" />
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                            </el-row>
-
-                            <el-row v-if="item.flag2">
-                                <el-col :span="6">
-                                    <el-form-item label="样品类型(二)">
-                                        <!-- <el-input v-model="item.yang_pin_lei_er_"   ></el-input> -->
-                                        <template slot-scope="scope">
-                                            <el-select v-model="item.yang_pin_lei_er_" placeholder="请选择" filterable
-                                                allow-create>
-                                                <el-option v-for="item in sampleTypes" :key="item.value" :label="item.label"
-                                                    :value="item.value">
-                                                </el-option>
-                                            </el-select>
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-form-item label="样品运输条件(二)">
-                                        <!-- <el-input v-model="item.yang_pin_yun_shu_"  ></el-input> -->
-                                        <template slot-scope="scope">
-                                            <el-select v-model="item.yang_pin_yun_shu_" placeholder="请选择" filterable
-                                                allow-create>
-                                                <el-option v-for="item in sampleTransportationConditions" :key="item.value"
-                                                    :label="item.label" :value="item.value">
-                                                </el-option>
-                                            </el-select>
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-form-item label="样品数量(二)">
-                                        <el-input v-model="item.shu_liang_er_" @change="changeShuLiang(index)"></el-input>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-form-item label="样品规格(二)">
-                                        <!-- <el-input v-model="item.yang_pin_gui_ge_e"  ></el-input> -->
-                                        <template slot-scope="scope">
-                                            <el-select v-model="item.yang_pin_gui_ge_e" placeholder="请选择" filterable
-                                                allow-create>
-                                                <el-option v-for="item in sampleSpecifications" :key="item.value"
-                                                    :label="item.label" :value="item.value">
-                                                </el-option>
-                                            </el-select>
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                            </el-row>
-                            <!--每种类型对应的留样数量和留样存放位置-->
-                            <el-row v-if="item.flag2">
-                                <el-col :span="6">
-                                    <el-form-item label="样品存放位置(二)" required>
-                                        <template slot-scope="scope">
-                                            <weizhiData v-model="item.shou_yang_wei_zhi_er" />
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-form-item label="是否留样" class="zzj">
-                                        <template slot-scope="scope">
-                                            <el-select v-model="item.shi_fou_liu_yang_er" placeholder="请选择"
-                                                @change="ifLiuYangChange_Two(index)">
-                                                <el-option v-for="item in ifLY" :key="item.value" :label="item.label"
-                                                    :value="item.value">
-                                                </el-option>
-                                            </el-select>
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-form-item label="留样数量(二)" required class="zzj">
-                                        <template slot-scope="scope">
-                                            <el-input v-model="item.liu_yang_shu_lian_er"></el-input>
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-form-item label="留样存放位置(二)" required>
-                                        <template slot-scope="scope">
-                                            <liuyangData v-model="item.liu_yang_wei_zhi_er" ref="LyPositionTwo" />
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                            </el-row>
-
-                            <el-row v-if="item.flag3">
-                                <el-col :span="6">
-                                    <el-form-item label="样品类型(三)">
-                                        <!-- <el-input v-model="item.yang_pin_lei_san_"  ></el-input> -->
-                                        <template slot-scope="scope">
-                                            <el-select v-model="item.yang_pin_lei_san_" placeholder="请选择" filterable
-                                                allow-create>
-                                                <el-option v-for="item in sampleTypes" :key="item.value" :label="item.label"
-                                                    :value="item.value">
-                                                </el-option>
-                                            </el-select>
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-form-item label="样品运输条件(三)">
-                                        <!-- <el-input v-model="item.yang_pin_yun_san"  ></el-input> -->
-                                        <template slot-scope="scope">
-                                            <el-select v-model="item.yang_pin_yun_san" placeholder="请选择" filterable
-                                                allow-create>
-                                                <el-option v-for="item in sampleTransportationConditions" :key="item.value"
-                                                    :label="item.label" :value="item.value">
-                                                </el-option>
-                                            </el-select>
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-form-item label="样品数量(三)">
-                                        <el-input v-model="item.shu_liang_san_" @change="changeShuLiang(index)"></el-input>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-form-item label="样品规格(三)">
-                                        <!-- <el-input v-model="item.yang_pin_gui_ge_s"  ></el-input> -->
-                                        <template slot-scope="scope">
-                                            <el-select v-model="item.yang_pin_gui_ge_s" placeholder="请选择" filterable
-                                                allow-create>
-                                                <el-option v-for="item in sampleSpecifications" :key="item.value"
-                                                    :label="item.label" :value="item.value">
-                                                </el-option>
-                                            </el-select>
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                            </el-row>
-                            <!--每种类型对应的留样数量和留样存放位置-->
-                            <el-row v-if="item.flag3">
-                                <el-col :span="6">
-                                    <el-form-item label="样品存放位置(三)" required>
-                                        <template slot-scope="scope">
-                                            <weizhiData v-model="item.shou_yang_wei_zhi_san" />
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-form-item label="是否留样" class="zzj">
-                                        <template slot-scope="scope">
-                                            <el-select v-model="item.shi_fou_liu_yang_san" placeholder="请选择"
-                                                @change="ifLiuYangChange_Three(index)">
-                                                <el-option v-for="item in ifLY" :key="item.value" :label="item.label"
-                                                    :value="item.value">
-                                                </el-option>
-                                            </el-select>
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-form-item label="留样数量(三)" required class="zzj">
-                                        <template slot-scope="scope">
-                                            <el-input v-model="item.liu_yang_shu_lian_san"></el-input>
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-form-item label="留样存放位置(三)" required>
-                                        <template slot-scope="scope">
-                                            <liuyangData v-model="item.liu_yang_wei_zhi_san" ref="LyPositionThree" />
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                            </el-row>
-
-                            <el-row v-if="item.flag4">
-                                <el-col :span="6">
+                                <el-col :span="8">
                                     <el-form-item label="样品类型(四)">
                                         <!-- <el-input v-model="item.yang_pin_lei_si_"   ></el-input> -->
                                         <template slot-scope="scope">
@@ -324,7 +385,7 @@
                                         </template>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="6">
+                                <el-col :span="8">
                                     <el-form-item label="样品运输条件(四)">
                                         <!-- <el-input v-model="item.yang_pin_yun_si_"  ></el-input> -->
                                         <template slot-scope="scope">
@@ -337,17 +398,19 @@
                                         </template>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="6">
+                                <el-col :span="8">
                                     <el-form-item label="样品数量(四)">
                                         <el-input v-model="item.shu_liang_si_" @change="changeShuLiang(index)"></el-input>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="6">
+                            </el-row>
+                            <el-row>
+                                <el-col :span="8">
                                     <el-form-item label="样品规格(四)">
                                         <!-- <el-input v-model="item.yang_pin_gui_si_"  ></el-input> -->
                                         <template slot-scope="scope">
                                             <el-select v-model="item.yang_pin_gui_si_" placeholder="请选择" filterable
-                                                allow-create>
+                                                allow-create @change="changeGuiGe(index,3)">
                                                 <el-option v-for="item in sampleSpecifications" :key="item.value"
                                                     :label="item.label" :value="item.value">
                                                 </el-option>
@@ -355,46 +418,60 @@
                                         </template>
                                     </el-form-item>
                                 </el-col>
-                            </el-row>
-                            <!--每种类型对应的留样数量和留样存放位置 -->
-                            <el-row v-if="item.flag4">
-                                <el-col :span="6">
-                                    <el-form-item label="样品存放位置(四)" required>
-                                        <template slot-scope="scope">
-                                            <weizhiData v-model="item.shou_yang_wei_zhi_si" />
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-form-item label="是否留样" class="zzj">
-                                        <template slot-scope="scope">
-                                            <el-select v-model="item.shi_fou_liu_yang_si" placeholder="请选择"
-                                                @change="ifLiuYangChange_Four(index)">
-                                                <el-option v-for="item in ifLY" :key="item.value" :label="item.label"
-                                                    :value="item.value">
-                                                </el-option>
-                                            </el-select>
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-form-item label="留样数量(四)" required class="zzj">
-                                        <template slot-scope="scope">
-                                            <el-input v-model="item.liu_yang_shu_lian_si"></el-input>
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-form-item label="留样存放位置(四)" required>
-                                        <template slot-scope="scope">
-                                            <liuyangData v-model="item.liu_yang_wei_zhi_si" ref="LyPositionFour" />
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
-                            </el-row>
+                                <el-col :span="8">
+                                    <el-form-item label="单位(四)" v-if="UnitFlag">
+                                        <el-input v-model="item.dan_wei_si"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                
+                                <el-col :span="8">
+                                        <el-form-item label="样品存放位置(四)" required>
+                                            <template slot-scope="scope">
+                                                <weizhiData v-model="item.shou_yang_wei_zhi_si" />
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+                                <!--每种类型对应的留样数量和留样存放位置 -->
+                                <el-row>
+                                    <el-col :span="8">
+                                        <el-form-item label="是否留样" class="zzj">
+                                            <template slot-scope="scope">
+                                                <el-select v-model="item.shi_fou_liu_yang_si" placeholder="请选择"
+                                                    @change="ifLiuYangChange_Four(index)">
+                                                    <el-option v-for="item in ifLY" :key="item.value" :label="item.label"
+                                                        :value="item.value">
+                                                    </el-option>
+                                                </el-select>
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <el-form-item label="留样数量(四)" required class="zzj">
+                                            <template slot-scope="scope">
+                                                <el-input v-model="item.liu_yang_shu_lian_si"></el-input>
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <el-form-item label="留样存放位置(四)" required>
+                                            <template slot-scope="scope">
+                                                <liuyangData v-model="item.liu_yang_wei_zhi_si" ref="LyPositionFour" />
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+                            </div>
 
+                            <div>
+                                    <el-alert
+                                        title="样品信息配置"
+                                        type="warning"
+                                        description="上面样品单位自动截取样品规格中被 / 与 * 包裹着的字符，如果样品规格中不存在匹配的字符，则需要手动填写">
+                                    </el-alert>
+                                </div>
                             <el-row>
-                                <el-col :span="6">
+                                <el-col :span="8">
                                     <el-form-item label="留样日期">
                                         <template slot-scope="scope">
                                             <el-date-picker v-model="item.liu_yang_ri_qi_" type="date"
@@ -403,7 +480,7 @@
                                         </template>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="6">
+                                <el-col :span="8">
                                     <el-form-item label="留样期限至">
                                         <template slot-scope="scope">
                                             <el-date-picker v-model="item.liu_yang_qi_xian" type="date"
@@ -412,25 +489,21 @@
                                         </template>
                                     </el-form-item>
                                 </el-col>
-                                <!-- <el-col :span="6">
-                            <el-form-item v-if="flag" label="销毁日期" >
-                              <template slot-scope="scope">
-                                <el-date-picker
-                                  v-model="item.xiao_hui_ri_qi_"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  format="yyyy-MM-dd"
-                                  placeholder="请选择"
-                                  :readonly="true"
-                                  :clearable="true"
-                                />
-                              </template>
-                            </el-form-item>
-                          </el-col> -->
+                                <el-col :span="6">
+                                    <el-form-item label="验收结果">
+                                        <template slot-scope="scope">
+                                            <el-select v-model="item.yan_shou_jie_guo_" placeholder="请选择">
+                                                <el-option v-for="item in checkOptions" :key="item.value"
+                                                    :label="item.label" :value="item.value">
+                                                </el-option>
+                                            </el-select>
+                                        </template>
+                                    </el-form-item>
+                                </el-col>
                             </el-row>
 
                             <el-row>
-                                <el-col :span="6">
+                                <el-col :span="8">
                                     <el-form-item label="返样日期">
                                         <template slot-scope="scope">
                                             <el-date-picker v-model="item.fan_yang_ri_qi_" type="date"
@@ -439,7 +512,7 @@
                                         </template>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="6">
+                                <el-col :span="8">
                                     <el-form-item label="返样接样人">
                                         <template slot-scope="scope">
                                             <el-input v-model="item.fan_yang_jyr" placeholder="请输入" type="text"
@@ -448,26 +521,16 @@
                                     </el-form-item>
                                 </el-col>
 
-                                <el-col :span="6">
+                                <el-col :span="8">
                                     <el-form-item label="是否加急">
                                         <el-input v-model="item.chu_ju_bao_gao_ya" readonly="true" ></el-input>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="6">
-                                    <el-form-item label="验收结果">
-                                        <template slot-scope="scope">
-                                            <el-select v-model="item.yan_shou_jie_guo_" placeholder="请选择">
-                                                <el-option v-for="item in checkOptions" :key="item.value"
-                                                    :label="item.label" :value="item.value">
-                                                </el-option>
-                                            </el-select>
-                                        </template>
-                                    </el-form-item>
-                                </el-col>
+                               
                             </el-row>
 
                             <el-row>
-                                <el-col :span="6">
+                                <el-col :span="8">
                                     <el-form-item label="姓名">
                                         <template slot-scope="scope">
                                             <el-input v-model="item.xing_ming_" placeholder="请输入" type="text"
@@ -475,7 +538,7 @@
                                         </template>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="6">
+                                <el-col :span="8">
                                     <el-form-item label="性别">
                                         <template slot-scope="scope">
                                             <el-select v-model="item.xing_bie_" placeholder="请选择">
@@ -486,7 +549,7 @@
                                         </template>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="6">
+                                <el-col :span="8">
                                     <el-form-item label="年龄">
                                         <template slot-scope="scope">
                                             <el-input v-model="item.nian_ling_" placeholder="请输入" type="text"
@@ -498,7 +561,7 @@
 
                             <el-row>
 
-                                <el-col :span="6">
+                                <el-col :span="8">
                                     <el-form-item label="备注">
                                         <template slot-scope="scope">
                                             <el-input v-model="item.bei_zhu_" placeholder="请输入" type="text"
@@ -506,7 +569,7 @@
                                         </template>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="6">
+                                <el-col :span="8">
                                     <el-form-item label="送样要求">
                                         <template slot-scope="scope">
                                             <el-input v-model="item.song_yang_yao_qiu" placeholder="请输入" type="text"
@@ -514,7 +577,7 @@
                                         </template>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="6">
+                                <el-col :span="7">
                                     <el-form-item label="接样确认状态">
                                         <template slot-scope="scope">
                                             <el-select v-model="item.jie_yang_zhuang_t" placeholder="请选择">
@@ -525,7 +588,7 @@
                                         </template>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="6">
+                                <el-col :span="1">
                                     <el-form-item label="功能">
                                         <template slot-scope="scope">
                                             <el-button size="small" type="danger" icon="el-icon-delete"
@@ -656,6 +719,7 @@ export default {
             pageCount: 1,
             item: '',
             flag: true,
+            UnitFlag : true
         }
     },
     methods: {
@@ -740,6 +804,24 @@ export default {
                 this.listData[index].liu_yang_ri_qi_ = null
                 this.listData[index].liu_yang_qi_xian = null
             }
+        },
+        /*
+            规格触发事件：匹配规格中 被 / 和 * 包裹的字符串，并赋值给单位字段展示
+        */
+        changeGuiGe(index,specificationIndex){
+            this.UnitFlag = false
+            let SpecificationsArgs = ['yang_pin_gui_ge_','yang_pin_gui_ge_e','yang_pin_gui_ge_s','yang_pin_gui_si_']
+            let UnitArgs = ['dan_wei_yi','dan_wei_er','dan_wei_san','dan_wei_si']
+            let unit = this.handleSpecificationsToUnit(this.listData[index][SpecificationsArgs[specificationIndex]])
+            this.listData[index][UnitArgs[specificationIndex]] = unit
+            this.UnitFlag = true
+        },
+        /**
+         * 匹配表达式，符合则返回值，否则返回空字符串
+         */
+        handleSpecificationsToUnit(val){
+            const regex = /[\/\*]([^\/*]*)[\/\*]/
+            return val.match(regex) ? val.match(regex)[1] : ''
         }
     }
 }
@@ -786,6 +868,8 @@ export default {
     padding: 0;
     margin-right: 5px;
     width: 120px;
+    // width: 101px;
+    // margin-left:25px;
 }
 
 /deep/.el-input__inner {

src/views/system/jbdScan/js/manualConfirmationJS.js

@@ -253,10 +253,6 @@ export default {
                             this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 验收结果不能为空!')
                             return;
                         }
-                        // if (ypInfoList[yp].shi_fou_liu_yang_ == null || ypInfoList[yp].shi_fou_liu_yang_ == '') {
-                        //     this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 是否留样不能为空!')
-                        //     return;
-                        // }
                         /** 如果四个是否留样中有一个为‘是’ 则 留样日期 和对应的留样位置就不能为空 */
                         if (ypInfoList[yp].shi_fou_liu_yang_yi == "是" ||
                          (ypInfoList[yp].flag2 == true && ypInfoList[yp].shi_fou_liu_yang_er == "是") ||
@@ -317,22 +313,44 @@ export default {
                             }
                         }
 
-                        // 判断位置是否为空
+                        // 判断位置是否为空 且判断单位是否为空
                         if (ypInfoList[yp].shou_yang_wei_zhi_yi == null || ypInfoList[yp].shou_yang_wei_zhi_yi == '') {
                             this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 类型1的位置选择不能为空!')
                             return;
                         }
-                        if (ypInfoList[yp].flag2 == true && (ypInfoList[yp].shou_yang_wei_zhi_er == '' || ypInfoList[yp].shou_yang_wei_zhi_er == null)) {
-                            this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 类型2的位置选择不能为空!')
+                        if(ypInfoList[yp].dan_wei_yi == null || ypInfoList[yp].dan_wei_yi == ''){
+                            this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 类型1的单位不能为空!')
                             return;
                         }
-                        if (ypInfoList[yp].flag3 == true && (ypInfoList[yp].shou_yang_wei_zhi_san == '' || ypInfoList[yp].shou_yang_wei_zhi_san == null)) {
-                            this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 类型3的位置选择不能为空!')
-                            return;
+                        if(ypInfoList[yp].flag2 == true){
+                            if (ypInfoList[yp].shou_yang_wei_zhi_er == '' || ypInfoList[yp].shou_yang_wei_zhi_er == null) {
+                                this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 类型2的位置选择不能为空!')
+                                return;
+                            }
+                            if(ypInfoList[yp].dan_wei_er == null || ypInfoList[yp].dan_wei_er == ''){
+                                this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 类型2的单位不能为空!')
+                                return;
+                            }
                         }
-                        if (ypInfoList[yp].flag4 == true && (ypInfoList[yp].shou_yang_wei_zhi_si == '' || ypInfoList[yp].shou_yang_wei_zhi_si == null)) {
-                            this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 类型4的位置选择不能为空!')
-                            return;
+                        if(ypInfoList[yp].flag3 == true){
+                            if(ypInfoList[yp].shou_yang_wei_zhi_san == '' || ypInfoList[yp].shou_yang_wei_zhi_san == null) {
+                                this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 类型3的位置选择不能为空!')
+                                return;
+                            }
+                            if(ypInfoList[yp].dan_wei_san == null || ypInfoList[yp].dan_wei_san == ''){
+                                this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 类型3的单位不能为空!')
+                                return;
+                            }
+                        }
+                        if(ypInfoList[yp].flag4 == true){
+                            if (ypInfoList[yp].shou_yang_wei_zhi_si == '' || ypInfoList[yp].shou_yang_wei_zhi_si == null) {
+                                this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 类型4的位置选择不能为空!')
+                                return;
+                            }
+                            if(ypInfoList[yp].dan_wei_si == null || ypInfoList[yp].dan_wei_si == ''){
+                                this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 类型4的单位不能为空!')
+                                return;
+                            }
                         }
                         // 判断留样日期不得早于当前日期
                         if(ypInfoList[yp].liu_yang_ri_qi_ != null && ypInfoList[yp].liu_yang_ri_qi_ != ''){
@@ -516,10 +534,10 @@ export default {
                                     let liuYangList = []
                                     lxList.push(ypInfoList[index].yang_pin_lei_xing, ypInfoList[index].yang_pin_lei_er_, ypInfoList[index].yang_pin_lei_san_, ypInfoList[index].yang_pin_lei_si_)
                                     ypggList.push(
-                                        ypInfoList[index].yang_pin_gui_ge_?ypInfoList[index].yang_pin_gui_ge_ +'*'+ ypInfoList[index].shu_liang_:'',
-                                         ypInfoList[index].yang_pin_gui_ge_e? ypInfoList[index].yang_pin_gui_ge_e+'*'+ ypInfoList[index].shu_liang_er_:'',
-                                         ypInfoList[index].yang_pin_gui_ge_s?ypInfoList[index].yang_pin_gui_ge_s +'*'+ ypInfoList[index].shu_liang_san_:'',
-                                         ypInfoList[index].yang_pin_gui_si_?ypInfoList[index].yang_pin_gui_si_ +'*'+ ypInfoList[index].shu_liang_si_:'')
+                                        ypInfoList[index].yang_pin_gui_ge_? ypInfoList[index].yang_pin_gui_ge_ +'*'+ ypInfoList[index].shu_liang_+ ypInfoList[index].dan_wei_yi:'',
+                                         ypInfoList[index].yang_pin_gui_ge_e? ypInfoList[index].yang_pin_gui_ge_e+'*'+ ypInfoList[index].shu_liang_er_+ ypInfoList[index].dan_wei_er:'',
+                                         ypInfoList[index].yang_pin_gui_ge_s?ypInfoList[index].yang_pin_gui_ge_s +'*'+ ypInfoList[index].shu_liang_san_+ ypInfoList[index].dan_wei_san:'',
+                                         ypInfoList[index].yang_pin_gui_si_?ypInfoList[index].yang_pin_gui_si_ +'*'+ ypInfoList[index].shu_liang_si_+ ypInfoList[index].dan_wei_si:'')
                                     liuYangList.push(ypInfoList[index].liu_yang_shu_lian_yi, ypInfoList[index].liu_yang_shu_lian_er, ypInfoList[index].liu_yang_shu_lian_san, ypInfoList[index].liu_yang_shu_lian_si)
                                     let yplxz = lxList.filter(i => i).join('；')
                                     let ypggStr = ypggList.filter(i => i).join('；')