2213980799@qq.com пре 1 година
родитељ
комит
d83e7f3be6

+ 1 - 1
src/views/inspectionProject/components/search.vue

@@ -1,4 +1,4 @@
-<!-- 搜索表单 --> 6
+<!-- 搜索表单 --> 
 <template>
   <el-form label-width="90px" class="ele-form-search" @keyup.enter.native="search" @submit.native.prevent>
     <el-row :gutter="15">

+ 68 - 0
src/views/inspectionStandard/components/projectSearch.vue

@@ -0,0 +1,68 @@
+<!-- 搜索表单 --> 
+<template>
+  <el-form
+    label-width="90px"
+    class="ele-form-search"
+    @keyup.enter.native="search"
+    @submit.native.prevent
+  >
+    <el-row :gutter="15">
+      <el-col :span="16">
+        <el-form-item label="名称:">
+          <el-input
+            clearable
+            v-model="where.inspectionName"
+            placeholder="请输入"
+          />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="8">
+        <div class="ele-form-actions">
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            class="ele-btn-icon"
+            @click="search"
+          >
+            查询
+          </el-button>
+          <el-button @click="reset">重置</el-button>
+        </div>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script>
+export default {
+  data() {
+    // 默认表单数据
+    const defaultWhere = {
+      inspectionName: ''
+    };
+    return {
+      defaultWhere,
+      // 表单数据
+      where: { ...defaultWhere }
+    };
+  },
+  computed: {
+    // 是否开启响应式布局
+    styleResponsive() {
+      return this.$store.state.theme.styleResponsive;
+    }
+  },
+  methods: {
+    /* 搜索 */
+    search() {
+      this.$emit('search', this.where);
+    },
+    /*  重置 */
+    reset() {
+      this.where = { ...this.defaultWhere };
+      this.search();
+    }
+  }
+};
+</script>

+ 26 - 9
src/views/inspectionStandard/components/standardDialog.vue

@@ -21,18 +21,28 @@
             row-key="id"
             height="50vh"
           >
-          <template v-slot:textType="{ row }">
-          {{ row.textType == 1 ? '数值' : row.textType == 2 ? '选择' : row.textType == 3 ? '产品参数' : row.textType == 4 ? '规格' :
-             row.textType == 5 ? '时间' : '' }}
-        </template>
-
+            <template v-slot:textType="{ row }">
+              {{
+                row.textType == 1
+                  ? '数值'
+                  : row.textType == 2
+                  ? '选择'
+                  : row.textType == 3
+                  ? '产品参数'
+                  : row.textType == 4
+                  ? '规格'
+                  : row.textType == 5
+                  ? '时间'
+                  : ''
+              }}
+            </template>
           </ele-pro-table>
         </el-col>
         <el-col :span="12" class="table_col" v-if="equipmentdialog">
           <div class="title">质检项</div>
-
+          <search ref="search" @search="search"></search>
           <ele-pro-table
-            ref="equiTable"
+            ref="equiTable1"
             :columns="columns1"
             :datasource="datasource1"
             :current.sync="current1"
@@ -54,9 +64,10 @@
 <script>
 import { parameterList } from '@/api/inspectionStandard';
 import { getList } from '@/api/inspectionProject';
+import search from './projectSearch.vue';
 
 export default {
-  components: {},
+  components: { search },
   props: {
     selectList: Array,
     type: {
@@ -147,7 +158,7 @@ export default {
           label: '质检标准',
           prop: 'inspectionStandard',
           formatter: (row, column, cellValue) => {
-            return row.symbol+' '+cellValue+' '+row.unit
+            return row.symbol + ' ' + cellValue + ' ' + row.unit;
           }
         },
 
@@ -195,6 +206,12 @@ export default {
         size: limit
       });
     },
+    search(where) {
+      this.$refs.equiTable1.reload({
+        where: where,
+        page: 1
+      });
+    },
     open() {
       this.equipmentdialog = true;
     },

+ 2 - 2
src/views/inspectionStatistics/qualityControlWorkOrder/index.vue

@@ -344,13 +344,13 @@ export default {
         },
         {
           label: '釜号',
-          prop: 'workOrderCode1',
+          prop: 'famBeNo',
           align: 'center',
           width: 60
         },
         {
           label: '计划号',
-          prop: 'workOrderCode2',
+          prop: 'planCode',
           align: 'center',
           width: 150
         },