From b719b41a3b74b83b0e6ad4386620a41f49d13201 Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期四, 23 五月 2024 17:25:54 +0800
Subject: [PATCH] 导入

---
 src/components/view/a5-capacity-scope.vue |   36 ++++++++++++++++++++++++------------
 1 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index 94936fc..16ce984 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -53,8 +53,9 @@
           <el-button size="medium" type="primary" v-else-if="select==2">妫�楠屽璞�</el-button>
         </el-col>
         <el-col :span="12" style="text-align: right;">
+
           <el-button size="medium" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
-          <el-button size="medium" icon="el-icon-delete">鍒犻櫎</el-button>
+           <el-button size="medium" icon="el-icon-delete">鍒犻櫎</el-button>
         </el-col>
       </el-row>
     </div>
@@ -71,13 +72,19 @@
               v-model="itemParameterData.entity.inspectionItemSubclass" @keyup.enter.native="refreshTable()"></el-input>
           </div>
         </div>
+        <div class="search_thing">
+          <div class="search_label">妫�楠屽璞★細</div>
+          <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+              v-model="itemParameterData.entity.sample" @keyup.enter.native="refreshTable()"></el-input>
+          </div>
+        </div>
         <div class="search_thing" style="padding-left: 30px;">
           <el-button size="small" @click="refresh()">閲� 缃�</el-button>
           <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
         </div>
       </div>
       <div class="table">
-        <ValueTable ref="itemParameterTable" :url="$api.capacityScope.selectItemParameterList"
+        <ValueTable ref="itemParameterTable" v-loading="logining" :url="$api.capacityScope.selectItemParameterList"
           :upUrl="$api.capacityScope.upItemParameter" :delUrl="$api.capacityScope.delItemParameter"
           :componentData="itemParameterData" :key="upIndex" />
       </div>
@@ -104,7 +111,7 @@
       <div class="body" v-if="diaProduct" style="height: 350px;overflow-y: auto;padding: 5px 0;">
         <ValueTable ref="productData" :url="$api.capacityScope.selectProductListByObjectId"
           :upUrl="$api.capacityScope.upProduct" :delUrl="$api.capacityScope.delProduct"
-          :componentData="productData" :key="upIndex" />
+          :componentData="productData" :key="upIndex"/>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="diaProduct = false">鍙� 娑�</el-button>
@@ -122,6 +129,7 @@
     },
     data() {
       return {
+        logining:false,
         radio: '-1',
         showItemParameter: true,
         showTestObject: false,
@@ -129,13 +137,14 @@
           entity: {
             inspectionItem: null,
             inspectionItemSubclass: null,
+            sample: null,
             orderBy: {
               field: 'id',
               order: 'asc'
             }
           },
-          isIndex: false,
-          showSelect: true,
+          isIndex: true,
+          showSelect: false,
           select: true,
           row: 2,
           do: [{
@@ -217,14 +226,15 @@
             props:{
               value:'name',
               label:'name',
-              checkStrictly: false
+              checkStrictly: true,
+              multiple: true
             }
           },
-          requiredAdd: ['sonLaboratory', 'inspectionItem', 'manHour', 'inspectionItemType', 'inspectionValueType',
-            'unit', 'method', 'price', 'manDay'
+          requiredAdd: ['sonLaboratory', 'inspectionItem', 'inspectionItemType', 'inspectionValueType',
+            'unit', 'method', 'manDay', 'templateId'
           ],
-          requiredUp: ['sonLaboratory', 'inspectionItem', 'manHour', 'inspectionItemType', 'inspectionValueType',
-            'unit', 'method', 'price', 'manDay'
+          requiredUp: ['sonLaboratory', 'inspectionItem', 'inspectionItemType', 'inspectionValueType',
+            'unit', 'method', 'manDay', 'templateId'
           ]
         },
         testObjectData: {
@@ -235,8 +245,8 @@
               order: 'asc'
             }
           },
-          isIndex: false,
-          showSelect: true,
+          isIndex: true,
+          showSelect: false,
           select: true,
           do: [{
             id: 'update',
@@ -328,6 +338,7 @@
         if (this.radio === '0') {
           this.showItemParameter = true;
           this.showTestObject = false;
+          this.selectTestObjectByName()
           /* this.$nextTick(() => {
           	this.$refs.itemParameterTable.selectList()
           }) */
@@ -342,6 +353,7 @@
           this.$refs['itemParameterTable'].selectList()
         } else {
           this.$refs['testObjectTable'].selectList()
+
         }
       },
       refresh() {

--
Gitblit v1.9.3