Merge remote-tracking branch 'origin/master'

Crunchy

2024-04-25 71c4ece010f68a74eeff5e986caecb9a0bb2e36c

 src/components/view/a5-capacity-scope.vue

@@ -66,9 +66,9 @@
                     v-model="itemParameterData.entity.inspectionItem" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing">
               <div class="search_label">实验室：</div>
               <div class="search_label">检验子项：</div>
               <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                     v-model="itemParameterData.entity.laboratory" @keyup.enter.native="refreshTable()"></el-input></div>
                     v-model="itemParameterData.entity.inspectionItemSubclass" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing" style="padding-left: 30px;">
               <el-button size="small" @click="refresh()">重 置</el-button>
@@ -116,7 +116,7 @@
            itemParameterData: {
               entity: {
                  inspectionItem: null,
                  laboratory: null,
                  inspectionItemSubclass: null,
                  orderBy: {
                     field: 'id',
                     order: 'asc'
@@ -210,8 +210,8 @@
               }],
               tagField: {},
               selectField: {},
               requiredAdd: ['specimenName'],
               requiredUp: ['specimenName']
               requiredAdd: ['specimenName','code'],
               requiredUp: ['specimenName','code']
            },
            itemParameterEntityCopy: {},
            testObjectDataEntityCopy: {},