From 4d4e0486ecfeda1ac3ef45e565aaa133f5aca57d Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Mon, 16 Aug 2021 18:22:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=85=8D=E7=BD=AE=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=A2=9E=E5=8A=A0=E5=88=97=EF=BC=9A=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawerDialog/index.vue         |  1 +
 src/views/task/list.vue                       | 21 +++++++------------
 .../ysjl/3000/common/inspection-items.vue     |  3 +--
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/components/drawerDialog/index.vue b/src/components/drawerDialog/index.vue
index 2842fe1..a83b70e 100644
--- a/src/components/drawerDialog/index.vue
+++ b/src/components/drawerDialog/index.vue
@@ -251,6 +251,7 @@
                   @current-change="rowClick"
                 >
                   <el-table-column align="center" label="序号" width="50" type="index" />
+                  <el-table-column :formatter="(row, index, cellValue) => jyxmModes[cellValue]" align="center" label="检验项目模式" prop="jyxmMode" />
                   <el-table-column align="center" label="检验项目索引" prop="sort" />
                   <el-table-column
                     align="center"
diff --git a/src/views/task/list.vue b/src/views/task/list.vue
index 4b67df9..74e4666 100644
--- a/src/views/task/list.vue
+++ b/src/views/task/list.vue
@@ -32,7 +32,7 @@
             <el-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
           <el-select v-model="listQuery.neibuleibie" placeholder="请选择检验类别" clearable>
-            <el-option v-for="item in searchNblbList" :key="item.code" :label="item.name" :value="item.code" v-show="item.parentId" />
+            <el-option v-for="item in searchNblbList" :key="item.code" :label="item.name" :value="item.code" />
           </el-select>
           <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 340px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 230px" @keyup.enter.native="handleFilter" />
@@ -232,7 +232,6 @@ import Pagination from '@/components/Pagination'
 import Utils from '../../utils/contact.js'
 import { getOwnList, terminateRenwu, completeRenwuFn } from '@/api/renwu'
 import { cancelRenwuFn } from '@/api/common'
-import { mapGetters } from 'vuex'
 import Enclosure from '@/views/common/Enclosure'
 export default {
   name: 'MyTask',
@@ -291,23 +290,17 @@ export default {
       isSysUser: this.$store.getters.clientType === 'System'
     }
   },
-  filters: {
-  screen(value) {
-    console.log(value,254444)
-    return value.charAt(0).toUpperCase() + value.slice(1)
-  }
-},
+  computed: {
+    // 使用对象展开运算符将 getter 混入 computed 对象中
+    searchNblbList() {
+      return this.$store.getters.allCategory.filter(row => row.parentId)
+    }
+  },
   created() {
     this.getList()
     this.getSbList(undefined, undefined, 1)
     this.jylbList = this.$store.getters.allCategory
   },
-  computed: {
-  // 使用对象展开运算符将 getter 混入 computed 对象中
-    searchNblbList(){
-     return this.$store.getters.allCategory
-    }
-  },
   mounted() {
     const that = this
     this.common.$on('task-list', function() {
diff --git a/src/views/ysjl/3000/common/inspection-items.vue b/src/views/ysjl/3000/common/inspection-items.vue
index ce57d39..d059ae6 100644
--- a/src/views/ysjl/3000/common/inspection-items.vue
+++ b/src/views/ysjl/3000/common/inspection-items.vue
@@ -1,4 +1,3 @@
-
 <template>
   <div class="app-container">
     <el-table
@@ -28,7 +27,7 @@
         label="项目编号"
         prop="jianyanmu"
       />
-      <el-table-column align="center" label="检验项目及内容" prop="jianyanneirong" />
+      <el-table-column align="left" label="检验项目及内容" prop="jianyanneirong" />
       <el-table-column
         align="center"
         prop="jianyanjieguo"