0623

src/views/PblmRectify/xjdw_index.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <div>
     <a-tabs v-model="activatedTab" type="card" style="height: 100%;">
       <a-tab-pane v-for="tab in tabsForXjdw" :key="tab.value" :tab="tab.label">
@@ -23,6 +23,7 @@
 
 <script>
 import { h } from 'vue';
+import { Modal } from 'ant-design-vue';
 import { distinct, requestUserRole } from './Common/rectify_api';
 import { tabsForXjdw } from './Common/tabsForRectify';
 import xjdwDoubleCheck from './xjdw_DoubleCheck.vue';
@@ -58,7 +59,7 @@ export default {
   },
   methods: {
     showConfirm() {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: () =>
           h(
@@ -70,6 +71,7 @@ export default {
         cancelButtonProps: { style: { display: 'none' } },
         onOk() {
           console.log('OK');
+          return Promise.resolve();
         },
       });
     },

src/views/duChaGuanLi/duChaRenYuanList.vue

@@ -520,6 +520,7 @@ export default {
     },
     // 取消组长
     qxzzHandler(item) {
+      console.log(123);
       setHeadMan(item.id, item.guid, '2', item.orgId).then((res) => {
         this.getDcryResult(); // 取消组长成功之后  刷新表格数据
       });

src/views/duChaWenTi/duChaWenTi_dczfzzwtcz.vue

@@ -357,17 +357,14 @@
                       </template>
                       <template v-else-if="column.dataIndex === 'action'">
                         <a-button
-                          icon="eye"
                           type="link"
                           @click="showDialog(record.pblmId)"
-                        ></a-button>
+                        ><EyeOutlined /></a-button>
                         <a-button
-                          icon="edit"
                           type="link"
                           @click="changeSup(record)"
-                        ></a-button>
+                        ><EditOutlined /></a-button>
                         <a-button
-                          icon="delete"
                           type="link"
                           v-if="
                             record.workflowStat == 12 ||
@@ -375,8 +372,7 @@
                               record.workflowStat == 18
                           "
                           @click="removeSuperviseOne(record.pblmId)"
-                        >
-                        </a-button>
+                        ><DeleteOutlined /></a-button>
                       </template>
                     </template>
                   </a-table>
@@ -539,11 +535,10 @@
                           v-if="!addPicPanel ? !addPicPanel : addPicPanel"
                           size="small"
                           type="link"
-                          :icon="
-                            !addPicPanel ? 'plus-circle' : 'close-circle'
-                          "
                           @click="addPic"
-                        >{{ !addPicPanel ? "添加" : "取消" }}
+                        >
+                          <component :is="!addPicPanel ? PlusCircleOutlined : CloseCircleOutlined" />
+                          {{ !addPicPanel ? "添加" : "取消" }}
                         </a-button>
                       </a-row>
                       <a-row v-show="addPicPanel">
@@ -668,10 +663,10 @@
                           v-if="!addPicPanel1 ? !addPicPanel1 : addPicPanel1"
                           size="small"
                           type="link"
-                          :icon="!addPicPanel1 ? 'plus-circle' : 'close-circle'"
-                          @click="addPic1">{{ !addPicPanel1 ? "添加"
-                            : "取消"
-                          }}
+                          @click="addPic1"
+                        >
+                          <component :is="!addPicPanel1 ? PlusCircleOutlined : CloseCircleOutlined" />
+                          {{ !addPicPanel1 ? "添加" : "取消" }}
                         </a-button>
                       </a-row>
                       <a-row v-show="addPicPanel1 && offlineCancellation == '1'">
@@ -1308,10 +1303,9 @@
                       </template>
                       <template v-else-if="column.dataIndex === 'action'">
                         <a-button
-                          icon="eye"
                           type="link"
                           @click="showDialog(record.pblmId)"
-                        ></a-button>
+                        ><EyeOutlined /></a-button>
                       </template>
                     </template>
                   </a-table>
@@ -1719,10 +1713,9 @@
                       </template>
                       <template v-else-if="column.dataIndex === 'action'">
                         <a-button
-                          icon="eye"
                           type="link"
                           @click="showDialog(record.pblmId)"
-                        ></a-button>
+                        ><EyeOutlined /></a-button>
                       </template>
                     </template>
                   </a-table>
@@ -2113,17 +2106,15 @@
                       </template>
                       <template v-else-if="column.dataIndex === 'action'">
                         <a-button
-                          icon="eye"
                           type="link"
                           @click="showDialog(record.pblmId)"
-                        ></a-button>
+                        ><EyeOutlined /></a-button>
                         <a-button
-                          icon="delete"
                           type="link"
                           style="padding-left:5px;"
                           v-if="record.workflowStat == 10"
                           @click="removeSuperviseOne(record.pblmId)"
-                        ></a-button>
+                        ><DeleteOutlined /></a-button>
                       </template>
                     </template>
                   </a-table>
@@ -2268,6 +2259,8 @@ import {
   setQuestionFlag,
   transferProcStatCodeToName,
 } from '../../api/duChaProcAPI.js';
+import { h } from 'vue';
+import { EyeOutlined, EditOutlined, DeleteOutlined, PlusCircleOutlined, CloseCircleOutlined } from '@ant-design/icons-vue';
 import { hostUrl } from '../../utils/global_variable.js';
 import request from '../../utils/gw_ajax_request.js';
 import { formatD, formatDateTime2 } from '../../utils/gw_date.js';
@@ -2289,6 +2282,7 @@ import supervisionDetails from './supervisionDetails_shuiku.vue';
 export default {
   props: ['codeId'],
   components: {
+    EyeOutlined, EditOutlined, DeleteOutlined, PlusCircleOutlined, CloseCircleOutlined,
     Dealproblem_dialog,
     upload,
     // 详情页