bug
value
2023-08-29 b902771e24bf87e0940d00cea8671d8ba84ede26
bug
已修改2个文件
38 ■■■■ 文件已修改
src/views/inspectionManagement/commissionInspection/addCommision.vue 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/laboratory/ledger/index.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inspectionManagement/commissionInspection/addCommision.vue
@@ -177,12 +177,11 @@
                            <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"
                                        <el-option v-for="options in model_sta_options" :value="options.value"
                                            :key="options.key">{{ options.value }}</el-option>
                                    </el-select>
                                </el-form-item>
                            </el-col>
                        </el-row>
                        <el-row :gutter="50">
@@ -191,13 +190,11 @@
                                    <el-input type="text" v-model="addPointerForm.unit" placeholder="请输入单位" autocomplete="off" />
                                </el-form-item>
                            </el-col>
                            <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-row>
                        <el-row :gutter="50">
                            <el-col :span="9">
@@ -210,7 +207,8 @@
                            </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-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>
@@ -288,6 +286,8 @@
                    value: ''
                }],
                model_spe_options: [],
                model_sta_options: [],
                model_options: [],
                sampleDeliveryMode: [{
                    key: '1',
                    value: '送样'
@@ -298,6 +298,26 @@
                dialogueFormVisible: false,
                showDetail: false,
                viewId: null
            }
        },
        watch: {
            addPointerForm: {
                handler: function(val) {
                    if(val.addway!=""){
                        this.model_sta_options = []
                        this.model_options.forEach(a=>{
                            if(a.specificationsName==val.addway){
                                this.model_sta_options = a.children.map(item=>{
                                    return{
                                        key: item.modelId,
                                        value: item.modelName
                                    }
                                })
                            }
                        })
                    }
                },
                deep: true
            }
        },
        created() {
@@ -338,6 +358,7 @@
                const res = await getModelSpecification({
                    materialId: val
                })
                this.model_options = res.data
                this.model_spe_options = res.data.map((item) => {
                    return {
                        key: item.specificationsId,
src/views/laboratory/ledger/index.vue
@@ -54,7 +54,7 @@
        <div class="table-box">
          <el-table ref="equipmentTable" node-key="father_name" :cell-style="{ textAlign: 'center' }"
            :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
            :data="equipmentTable" style="width: 100%">
            :data="equipmentTable" style="width: 100%;">
            <el-table-column type="index" label="序号" min-width="90" />
            <el-table-column prop="equipment_code" label="仪器设备编号" min-width="200" />
            <el-table-column prop="equipment_name" label="仪器设备名称" min-width="150" />
@@ -68,7 +68,6 @@
              </template>
            </el-table-column>
            <el-table-column prop="storage_place" label="存放地" min-width="200" />
            <el-table-column label="操作" min-width="120" fixed="right">
              <template slot-scope="scope">
                <el-button type="text" size="small" @click="openDetail(scope.row)">编辑</el-button>
@@ -1052,7 +1051,7 @@
    background: #fff;
    display: flex;
    justify-content: space-between;
    padding: 0 24px 12px 24px;
    padding: 15px 24px 12px 24px;
    .search-bar {
      .el-radio-button.is-active {
@@ -1088,6 +1087,7 @@
    .library-bom {
      flex: 2;
      margin-right: 12px;
            height: 80vh;
      .bom-item-search {
        margin-bottom: 12px;
@@ -1119,6 +1119,7 @@
      margin-left: 12px;
      display: flex;
      flex-direction: column;
            height: 80vh;
      .table-box {
        margin-top: 30px;