ysy 1 год назад
Родитель
Сommit
0c3dd3b0c4

+ 7 - 6
src/views/inspectionProject/components/user-search.vue

@@ -9,12 +9,12 @@
     <el-row>
     <el-row>
       <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
       <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
         <el-form-item label="参数编码:">
         <el-form-item label="参数编码:">
-          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.inspectionCode" placeholder="请输入" />
         </el-form-item>
         </el-form-item>
       </el-col>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
       <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
         <el-form-item label="参数名称:">
         <el-form-item label="参数名称:">
-          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.inspectionName" placeholder="请输入" />
         </el-form-item>
         </el-form-item>
       </el-col>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
       <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
@@ -28,10 +28,10 @@
       </el-col>
       </el-col>
 
 
       <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
       <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
-        <el-form-item label="标准类型:" prop="type">
+        <el-form-item label="标准类型:" prop="qualityStandardType">
           <DictSelection
           <DictSelection
             dictName="质检标准类型"
             dictName="质检标准类型"
-            v-model="where.type"
+            v-model="where.qualityStandardType"
           ></DictSelection>
           ></DictSelection>
         </el-form-item>
         </el-form-item>
       </el-col>
       </el-col>
@@ -78,8 +78,9 @@
     data() {
     data() {
       // 默认表单数据
       // 默认表单数据
       const defaultWhere = {
       const defaultWhere = {
-        code: '',
-        name: '',
+        inspectionCode: '',
+        inspectionName: '',
+        qualityStandardType: '',
         inspectionStandard: '',
         inspectionStandard: '',
         qualityStandardId: ''
         qualityStandardId: ''
       };
       };

+ 3 - 4
src/views/inspectionProject/index.vue

@@ -129,14 +129,13 @@ import dictMixins from '@/mixins/dictMixins'
           {
           {
             prop: 'inspectionCode',
             prop: 'inspectionCode',
             label: '参数编码',
             label: '参数编码',
-            showOverflowTooltip: true,
             align: 'center',
             align: 'center',
-            minWidth: 110
+            minWidth: 130
           },
           },
           {
           {
             prop: 'inspectionName',
             prop: 'inspectionName',
             label: '参数名称',
             label: '参数名称',
-            showOverflowTooltip: true,
+
             align: 'center',
             align: 'center',
             minWidth: 110
             minWidth: 110
           },
           },
@@ -144,7 +143,7 @@ import dictMixins from '@/mixins/dictMixins'
           {
           {
             prop: 'textType',
             prop: 'textType',
             label: '参数类型',
             label: '参数类型',
-            showOverflowTooltip: true,
+ 
             align: 'center',
             align: 'center',
             slot: 'textType',
             slot: 'textType',
             minWidth: 110
             minWidth: 110