Merge branch 'develop' into developer/yanjiaxu

src/views/task/edit/index.vue

@@ -297,15 +297,15 @@
       />
     </el-form>
     <!-- 文件上传 -->
-    <div class="tip-navigation">
-      <div class="tip"></div>
-      <div class="tip-title">文件信息</div>
-    </div>
-    <DocumentInfo
-      class="global-left-margin"
-      :pass-data="passDocumentInfoArr"
-      @change="handleDocumentInfoChange"
-    />
+    <!--    <div class="tip-navigation">-->
+    <!--      <div class="tip"></div>-->
+    <!--      <div class="tip-title">文件信息</div>-->
+    <!--    </div>-->
+    <!--    <DocumentInfo-->
+    <!--      class="global-left-margin"-->
+    <!--      :pass-data="passDocumentInfoArr"-->
+    <!--      @change="handleDocumentInfoChange"-->
+    <!--    />-->
     <!--返回按钮-->
     <div class="bottom-btn">
       <footer-button
@@ -348,7 +348,6 @@ export default {
     'inspection_item'
   ],
   components: {
-    DocumentInfo,
     CarInfo,
     PartInfo
   },
@@ -790,9 +789,11 @@ export default {
     },
     getUserByRole() {
       getUserByRole({ roleName: '检验员' }).then(response => {
-        this.userList = response.data.map(obj => {
-          return { ...obj, disabled: false }
-        })
+        this.userList = response.data
+          .filter(obj => obj.status.toString() !== '1')
+          .map(obj => {
+            return { ...obj, disabled: false }
+          })
         console.log('this.userList-1', this.userList)
         this.getInspectionItemDict()
       })

src/views/task/new/index.vue

@@ -296,15 +296,15 @@
       />
     </el-form>
     <!-- 文件上传 -->
-    <div class="tip-navigation">
-      <div class="tip"></div>
-      <div class="tip-title">文件信息</div>
-    </div>
-    <DocumentInfo
-      class="global-left-margin"
-      :pass-data="passDocumentInfoArr"
-      @change="handleDocumentChange"
-    />
+    <!--    <div class="tip-navigation">-->
+    <!--      <div class="tip"></div>-->
+    <!--      <div class="tip-title">文件信息</div>-->
+    <!--    </div>-->
+    <!--    <DocumentInfo-->
+    <!--      class="global-left-margin"-->
+    <!--      :pass-data="passDocumentInfoArr"-->
+    <!--      @change="handleDocumentChange"-->
+    <!--    />-->
     <!--返回按钮-->
     <div class="bottom-btn">
       <footer-button
@@ -347,7 +347,6 @@ export default {
     'inspection_item'
   ],
   components: {
-    DocumentInfo,
     CarInfo,
     PartInfo
   },
@@ -804,9 +803,11 @@ export default {
     },
     getUserByRole() {
       getUserByRole({ roleName: '检验员' }).then(response => {
-        this.userList = response.data.map(obj => {
-          return { ...obj, disabled: false }
-        })
+        this.userList = response.data
+          .filter(obj => obj.status.toString() !== '1')
+          .map(obj => {
+            return { ...obj, disabled: false }
+          })
         console.log('this.userList-1', this.userList)
         this.getInspectionItemDict()
       })

src/views/task/task-detail/index.vue

@@ -205,7 +205,7 @@
         >
           <el-table-column label="姓名" align="left" prop="nickName">
             <template slot-scope="{ row }">
-              <span v-if="row.userId !== ''">{{ row.name }}</span>
+              <span>{{ row.name }}</span>
             </template>
           </el-table-column>
           <el-table-column label="组内角色" align="left" prop="role">
@@ -250,15 +250,15 @@
         @change="handleModChange"
       />
       <!-- 文件上传 -->
-      <div class="tip-navigation">
-        <div class="tip"></div>
-        <div class="tip-title">文件信息</div>
-      </div>
-      <DocumentInfo
-        class="global-left-margin"
-        :pass-data="passDocumentInfoArr"
-        :is-detail="true"
-      />
+      <!--      <div class="tip-navigation">-->
+      <!--        <div class="tip"></div>-->
+      <!--        <div class="tip-title">文件信息</div>-->
+      <!--      </div>-->
+      <!--      <DocumentInfo-->
+      <!--        class="global-left-margin"-->
+      <!--        :pass-data="passDocumentInfoArr"-->
+      <!--        :is-detail="true"-->
+      <!--      />-->
     </el-form>
   </page-standard>
 </template>
@@ -281,7 +281,6 @@ export default {
     'inspection_item'
   ],
   components: {
-    DocumentInfo,
     CarInfo,
     PartInfo
   },