模块更新

src/views/modules/gage/qmsGageResume.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-05-08 11:11:06
- * @LastEditTime: 2023-05-10 16:20:50
+ * @LastEditTime: 2023-05-23 14:33:55
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -29,30 +29,34 @@
       <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
         @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
         <gageResume-search ref="searchOrUpdate" @refreshDataList="conditionSearchSubmit">
-          </gageResume-search>
-          <el-row slot="footer" type="flex" justify="end">
-            <el-col :span="12">
-              <el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">
-                {{ $t("close") }}
-              </el-button>
-              <el-button size="small" class="btnTextStyle" type="primary" plain @click="handleSearchReset">{{
-                $t("reset")
-                }}</el-button>
-              <el-button type="primary" size="small" class="btnTextStyle" @click="handleSearchConfirm">
-                {{ $t("search") }}
-              </el-button>
-            </el-col>
-          </el-row>
+        </gageResume-search>
+        <el-row slot="footer" type="flex" justify="end">
+          <el-col :span="12">
+            <el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">
+              {{ $t("close") }}
+            </el-button>
+            <el-button size="small" class="btnTextStyle" type="primary" plain @click="handleSearchReset">{{
+              $t("reset")
+              }}</el-button>
+            <el-button type="primary" size="small" class="btnTextStyle" @click="handleSearchConfirm">
+              {{ $t("search") }}
+            </el-button>
+          </el-col>
+        </el-row>
       </base-dialog>
+      <parameter-show v-if="showParameterVisible" ref="showParameterOrUpdate" @refreshDataList="getDataList" />
     </div>
   </el-card>
 </template>
 
 <script>
 import basicPage from "@/mixins/basic-page"
+import parameterShow from './components/parameter-show'
+
 import qmsGageResumeAdd from "./components/qmsGageResume-add"
 // import gage from '@/filters/gage'
 import { timeFormatter } from '@/filters'
+import gage from '@/filters/gage'
 // import AddOrUpdate from './params-add-or-update'
 import gageResumeSearch from "./components/gageResumeSearch"
 // import available from "./components/available.vue"
@@ -72,7 +76,8 @@ const tableProps = [
   {
     prop: 'measurToolEvent',
     label: i18n.t("gage.measurToolEvent"),
-    align: 'center'
+    align: 'center',
+    filter: gage('eventList')
   },
   {
     prop: 'createDate',
@@ -119,13 +124,24 @@ const tableBtn = [
   {
     type: "parameter",
     btnName: "台差参数",
+    showParam: {
+      type: '&',
+      data: [
+        {
+          name: 'measurToolEvent',
+          type: 'equal',
+          value: 5
+        }
+      ]
+    }
   }
 ];
 export default {
   mixins: [basicPage, basicSearch],
   components: {
     gageResumeSearch,
-    qmsGageResumeAdd
+    qmsGageResumeAdd,
+    parameterShow
   },
   data() {
     return {
@@ -136,18 +152,10 @@ export default {
       },
       tableProps,
       tableBtn,
+      showParameterVisible:false,
       searchOrEditTitle: '',
       searchOrUpdateVisible: false,
       formConfig: [
-        // {
-        //   type: "",
-        //   label: i18n.t("params.paramCode"),
-        //   placeholder: i18n.t("params.paramCode"),
-        //   param: "paramCode",
-        // },
-        // {
-        //   type: "separate",
-        // },
         {
           type: "button",
           btnName: i18n.t('add'),
@@ -226,6 +234,12 @@ export default {
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
+      } else if (val.type === 'parameter') {
+        this.showParameterVisible = true
+        this.$nextTick(() => {
+          console.log(Object.prototype.toString.call(val.data.id) )
+          this.$refs.showParameterOrUpdate.init(val.data.id)
+        })
       }
     },
     buttonClick(val) {