From 61519ddb13366184c2e0e791bce248ae431c8e45 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Wed, 18 Aug 2021 21:24:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/icons/svg/termination.svg        |  1 +
 src/views/task/list.vue              | 22 +++------------
 src/views/ysjl/3000/common/index.vue | 40 ----------------------------
 3 files changed, 5 insertions(+), 58 deletions(-)
 create mode 100644 src/icons/svg/termination.svg

diff --git a/src/icons/svg/termination.svg b/src/icons/svg/termination.svg
new file mode 100644
index 0000000..96362ee
--- /dev/null
+++ b/src/icons/svg/termination.svg
@@ -0,0 +1 @@
+<svg t="1629288862231" class="icon" viewBox="0 0 1025 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11331" width="200" height="200"><path d="M151.379964 874.277018A511.17222 511.17222 0 0 1 861.398178 138.891882l12.907099 12.459823A511.17222 511.17222 0 1 1 151.379964 874.277018z m90.34969-632.575623a380.503822 380.503822 0 0 0-106.068236 206.385784h754.362405a380.503822 380.503822 0 0 0-93.48062-193.159203l-12.587616-13.226581a383.379165 383.379165 0 0 0-530.532868-11.181893l-11.693065 11.181893z m648.294169 335.840149H135.661418a380.503822 380.503822 0 0 0 93.48062 193.159202l12.587616 13.226582a383.379165 383.379165 0 0 0 530.532868 11.181892l11.629168-11.181892a380.503822 380.503822 0 0 0 106.068236-206.385784z" fill="#ffffff" opacity=".8" p-id="11332"></path></svg>
diff --git a/src/views/task/list.vue b/src/views/task/list.vue
index 577a9ed..b6e0039 100644
--- a/src/views/task/list.vue
+++ b/src/views/task/list.vue
@@ -21,8 +21,8 @@
           <el-button v-if="notHasDepartmentId(74)" type="success" icon="el-icon-success" @click="completeRenwu">
             任务完成
           </el-button>
-          <el-button type="info" icon="el-icon-minus" @click="terminationFn">
-            终止任务
+          <el-button type="danger" @click="terminationFn">
+            <svg-icon icon-class="termination" /> 终止任务
           </el-button>
         </div>
       </sticky>
@@ -37,7 +37,6 @@
           <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" />
           <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="使用登记证号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <!--<el-input v-model="listQuery.danweineibubianhao" placeholder="单位内编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />-->
           <el-button type="primary" icon="el-icon-search" @click="handleFilter">
             查询
           </el-button>
@@ -109,14 +108,6 @@
         <el-table-column :formatter="formatterSlrq" align="center" label="报检日期" prop="shouliriqi" width="120" sortable />
         <el-table-column align="center" label="下次检验日期" prop="xiacijianyanriqi" width="120" />
         <el-table-column :formatter="formatter.getChineseName" align="center" label="认领人" prop="renlingren" width="140" />
-        <el-table-column v-if="$store.getters.departmentId === 70 || hasRole('ADMIN')" align="center" label="操作" prop="acces" width="110" fixed="right">
-          <template slot-scope="scope">
-            <template v-if="scope.row.shebeizhongleidaima === '2000'">
-              <el-button title="预览 原始资料" circle size="medium" type="info" icon="el-icon-view" style="float: left" @click="common.viewRawRecords(scope.row.id)" />
-              <slice-upload :renwu-id="scope.row.id" />
-            </template>
-          </template>
-        </el-table-column>
       </template>
     </el-table>
     <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
@@ -218,25 +209,20 @@
       </el-table>
       <pagination v-show="totalCount>0" :total="totalCountCopy" :page-num.sync="listQueryCopy.pageNum" :page-row.sync="listQueryCopy.pageRow" @pagination="getListCopy" />
     </el-dialog>
-
-    <el-dialog title="查看相关鉴证" :modal-append-to-body="false" :visible.sync="dialogEnclosureVisible">
-      <enclosure :relation-id.sync="currentRenwuId" :if-liaison="false" :view-button="false" :is-show-hetong="isSysUser" />
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import Sticky from '@/components/Sticky'
-import SliceUpload from '@/components/SliceUpload'
 import Pagination from '@/components/Pagination'
 import Utils from '../../utils/contact.js'
 import { getOwnList, terminateRenwu, completeRenwuFn } from '@/api/renwu'
 import { cancelRenwuFn } from '@/api/common'
-import Enclosure from '@/views/common/Enclosure'
 import { mapGetters } from 'vuex'
+
 export default {
   name: 'MyTask',
-  components: { Sticky, Pagination, SliceUpload, Enclosure },
+  components: { Sticky, Pagination },
   filters: {
     screen(value) {
       console.log(value, 254444)
diff --git a/src/views/ysjl/3000/common/index.vue b/src/views/ysjl/3000/common/index.vue
index 75c748f..67986b9 100644
--- a/src/views/ysjl/3000/common/index.vue
+++ b/src/views/ysjl/3000/common/index.vue
@@ -22,7 +22,6 @@
             更新
           </el-button>
           <el-button
-            v-if="isSysUser"
             type="success"
             icon="el-icon-upload2"
             size="medium"
@@ -39,44 +38,6 @@
             预览
           </el-button>
         </template>
-        <template v-if="isSysUser">
-          <el-button type="primary" size="medium" @click="Signjyxm">
-            <svg-icon icon-class="sign" />
-            检验项目批量签名
-          </el-button>
-          <el-button
-            type="danger"
-            icon="el-icon-delete"
-            size="medium"
-            @click="signClear"
-          >
-            批量清除签名
-          </el-button>
-          <el-button
-            type="success"
-            size="medium"
-            icon="el-icon-edit"
-            @click="batchUpdDate"
-          >
-            批量修改日期
-          </el-button>
-          <el-button
-            type="primary"
-            size="medium"
-            icon="el-icon-info"
-            @click="showDialogRoleVisible"
-          >
-            编辑权限
-          </el-button>
-        </template>
-        <el-button
-          type="info"
-          size="medium"
-          icon="el-icon-info"
-          @click="dialogEnclosureVisible = true"
-        >
-          相关鉴证
-        </el-button>
       </div>
     </sticky>
     <el-tabs v-model="checkedTab" type="card">
@@ -816,7 +777,6 @@ export default {
       renlingren: [],
       xinghaoList: [],
       dicGzjz: [],
-      isSysUser: this.$store.getters.clientType === 'System',
       cols: [
         {
           name: 'jianyanxiang', // 参与计算的列名，必须和el-table-column prop=''值一致