From f5f79b7df99aaca3ad1a08de05893d58dd2aa62b Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Wed, 1 Sep 2021 11:24:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/list.vue                 | 25 ++-----------------------
 src/views/ysjl/3000/common/index.vue    | 22 +++++++---------------
 src/views/ysjl/3000/jj/wjf-yy/index.vue |  5 ++++-
 src/views/ysjl/3000/jj/xfdt/index.vue   |  5 ++++-
 src/views/ysjl/3000/jj/yjf-yy/index.vue |  7 +++++--
 src/views/ysjl/3000/jj/yy-jj/index.vue  |  5 ++++-
 src/views/ysjl/3000/jj/yyfb/index.vue   |  5 ++++-
 src/views/ysjl/3000/jj/zdft/index.vue   |  5 ++++-
 src/views/ysjl/3000/jj/zw/index.vue     |  5 ++++-
 9 files changed, 38 insertions(+), 46 deletions(-)

diff --git a/src/views/task/list.vue b/src/views/task/list.vue
index 5ccb901..b9988d9 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 searchNblist" :key="item.code" :label="item.name" :value="item.code" />
+            <el-option v-for="item in $store.getters.allCategory" v-show="item.parentId" :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" />
@@ -183,17 +183,10 @@ 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 qs from 'qs'
 export default {
   name: 'MyTask',
   components: { Sticky, Pagination },
-  filters: {
-    screen(value) {
-      console.log(value, 254444)
-      return value.charAt(0).toUpperCase() + value.slice(1)
-    }
-  },
   data() {
     return {
       total: 0,
@@ -244,21 +237,7 @@ export default {
         sbpzdm: ''
       },
       currentRenwuId: 0,
-      dialogEnclosureVisible: false,
-      isSysUser: this.$store.getters.clientType === 'System',
-      searchNblist: []
-    }
-  },
-  computed: {
-    ...mapGetters(['allCategory'])
-  },
-  watch: {
-    allCategory: {
-      handler(n, o) {
-        console.log(n.filter(item => item.parentId))
-        this.searchNblist = n.filter(item => item.parentId)
-      },
-      deep: true
+      dialogEnclosureVisible: false
     }
   },
   created() {
diff --git a/src/views/ysjl/3000/common/index.vue b/src/views/ysjl/3000/common/index.vue
index 8d21c6e..a07ca50 100644
--- a/src/views/ysjl/3000/common/index.vue
+++ b/src/views/ysjl/3000/common/index.vue
@@ -220,22 +220,10 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row
-              v-if="
-                fromType === 2 ||
-                  fromType === 6 ||
-                  fromType === 8 ||
-                  fromType === 12
-              "
-              :gutter="20"
-            >
+            <el-row v-if="fieldSetting.anzhuangdidian" :gutter="20">
               <el-col :span="18">
                 <el-form-item label="安装地点" prop="anzhuangdidian">
-                  <el-input
-                    v-model="ysjl.anzhuangdidian"
-                    type="text"
-                    :disabled="edit"
-                  />
+                  <el-input v-model="ysjl.anzhuangdidian" type="text" :disabled="edit" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -310,7 +298,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType !== 6 && fromType !== 10" :gutter="20">
+            <el-row v-if="fromType !== 2 && fromType !== 6 && fromType !== 10" :gutter="20">
               <el-col :span="18">
                 <el-form-item label="设备使用地点" prop="anzhuangdidian">
                   <el-input
@@ -813,6 +801,10 @@ export default {
     jlbh1: {
       type: String,
       default: 'DT'
+    },
+    fieldSetting: {
+      type: Object,
+      default: () => {}
     }
   },
   data() {
diff --git a/src/views/ysjl/3000/jj/wjf-yy/index.vue b/src/views/ysjl/3000/jj/wjf-yy/index.vue
index 7a4f8fc..caa1bd8 100644
--- a/src/views/ysjl/3000/jj/wjf-yy/index.vue
+++ b/src/views/ysjl/3000/jj/wjf-yy/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DTJ'" />
+    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DTJ'" :field-setting="fieldSetting" />
   </div>
 </template>
 <script>
@@ -12,6 +12,9 @@ export default {
   data() {
     return {
       type: 2,
+      fieldSetting: {
+        anzhuangdidian: true
+      },
       arrayGroup: [
         {
           header: [
diff --git a/src/views/ysjl/3000/jj/xfdt/index.vue b/src/views/ysjl/3000/jj/xfdt/index.vue
index 7f52a0e..2a61f6d 100644
--- a/src/views/ysjl/3000/jj/xfdt/index.vue
+++ b/src/views/ysjl/3000/jj/xfdt/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DTJ'" />
+    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DTJ'" :field-setting="fieldSetting" />
   </div>
 </template>
 <script>
@@ -12,6 +12,9 @@ export default {
   data() {
     return {
       type: 10,
+      fieldSetting: {
+        anzhuangdidian: true
+      },
       arrayGroup: [
         {
           header: [
diff --git a/src/views/ysjl/3000/jj/yjf-yy/index.vue b/src/views/ysjl/3000/jj/yjf-yy/index.vue
index 87a8dcb..cce48ee 100644
--- a/src/views/ysjl/3000/jj/yjf-yy/index.vue
+++ b/src/views/ysjl/3000/jj/yjf-yy/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" :jlbh1="'DTJ'" />
+    <baseInfo :from-type="type" :jlbh1="'DTJ'" :field-setting="fieldSetting" />
   </div>
 </template>
 <script>
@@ -11,7 +11,10 @@ export default {
   components: { baseInfo },
   data() {
     return {
-      type: 2
+      type: 2,
+      fieldSetting: {
+        anzhuangdidian: true
+      }
     }
   },
   computed: {
diff --git a/src/views/ysjl/3000/jj/yy-jj/index.vue b/src/views/ysjl/3000/jj/yy-jj/index.vue
index 47d778c..af113d0 100644
--- a/src/views/ysjl/3000/jj/yy-jj/index.vue
+++ b/src/views/ysjl/3000/jj/yy-jj/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DTJ'" />
+    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DTJ'" :field-setting="fieldSetting" />
   </div>
 </template>
 <script>
@@ -12,6 +12,9 @@ export default {
   data() {
     return {
       type: 4,
+      fieldSetting: {
+        anzhuangdidian: true
+      },
       arrayGroup: [
         {
           header: [
diff --git a/src/views/ysjl/3000/jj/yyfb/index.vue b/src/views/ysjl/3000/jj/yyfb/index.vue
index d8c9cdc..7214fcd 100644
--- a/src/views/ysjl/3000/jj/yyfb/index.vue
+++ b/src/views/ysjl/3000/jj/yyfb/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DTJ'" />
+    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DTJ'" :field-setting="fieldSetting" />
   </div>
 </template>
 <script>
@@ -12,6 +12,9 @@ export default {
   data() {
     return {
       type: 8,
+      fieldSetting: {
+        anzhuangdidian: true
+      },
       arrayGroup: [
         {
           header: [
diff --git a/src/views/ysjl/3000/jj/zdft/index.vue b/src/views/ysjl/3000/jj/zdft/index.vue
index a6a1035..542d49c 100644
--- a/src/views/ysjl/3000/jj/zdft/index.vue
+++ b/src/views/ysjl/3000/jj/zdft/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DTJ'" />
+    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DTJ'" :field-setting="fieldSetting" />
   </div>
 </template>
 <script>
@@ -12,6 +12,9 @@ export default {
   data() {
     return {
       type: 6,
+      fieldSetting: {
+        anzhuangdidian: true
+      },
       arrayGroup: [
         {
           header: [
diff --git a/src/views/ysjl/3000/jj/zw/index.vue b/src/views/ysjl/3000/jj/zw/index.vue
index 3732ad9..cf74dc8 100644
--- a/src/views/ysjl/3000/jj/zw/index.vue
+++ b/src/views/ysjl/3000/jj/zw/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DTJ'" />
+    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DTJ'" :field-setting="fieldSetting" />
   </div>
 </template>
 <script>
@@ -12,6 +12,9 @@ export default {
   data() {
     return {
       type: 12,
+      fieldSetting: {
+        anzhuangdidian: true
+      },
       arrayGroup: [
         {
           header: [