删除功能的添加

src/App.vue

@@ -8,7 +8,7 @@
 <template>
   <a-config-provider :locale="zh_CN">
     <div class="d-flex flex-row flex-nowrap" id="app">
-      <!-- <btn-con /> -->
+      <btn-con />
       <router-view class="flex-1 bg pa-3"></router-view>
     </div>
   </a-config-provider>
@@ -17,11 +17,11 @@
 <script>
 import { mapState, mapActions, mapMutations } from 'vuex';
 import zh_CN from 'ant-design-vue/lib/locale-provider/zh_CN';
-// import BtnCon from 'components/BtnCom/BtnCon.vue';
+import BtnCon from 'components/BtnCom/BtnCon.vue';
 
 export default {
   name: 'App',
-  // components: { BtnCon },
+  components: { BtnCon },
   data() {
     return { zh_CN };
   },
@@ -40,9 +40,9 @@ export default {
 
   created() {
     // 测试数据
-    // const userId = '1218763410024566784';
-    // const params = { userId };
-    // this.getUserId(params);
+    const userId = '1218763410024566784';
+    const params = { userId };
+    this.getUserId(params);
 
     const that = this;
     window.plugin = window.TallPlugin.init();

src/components/Activity/ActivityAdd.vue

@@ -93,6 +93,18 @@
           <a-textarea placeholder="活动结束内容" v-decorator="['endContent']" />
         </a-form-item>
 
+        <!-- 活动类型 -->
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="活动类型">
+          <a-radio-group v-model="informReport">
+            <a-radio :value="0">
+              通知
+            </a-radio>
+            <a-radio :value="1">
+              报道
+            </a-radio>
+         </a-radio-group>
+        </a-form-item>
+
         <!-- 详情 -->
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="详情" required>
           <quill-editor :max-size="maxSize" :placeholder="placeholder" @changeInput="changeInput" />
@@ -138,6 +150,7 @@ export default {
       placeholder: '请输入...',
       releaseTime: '', // 开始时间
       closeTime: '', // 结束时间
+      informReport:0,
     };
   },
 
@@ -168,12 +181,13 @@ export default {
         if (!err) {
           try {
             console.log('values: ', values);
-            const { releaseTime, closeTime, content, activityType } = this;
+            const { releaseTime, closeTime, content, activityType,informReport} = this;
             const params = { param: values };
             params.param.releaseTime = releaseTime;
             params.param.closeTime = closeTime;
             params.param.content = content;
             params.param.activityType = activityType;
+            params.param.informReport = informReport;
             console.log('params: ', params);
             const res = await saveActivity(params);
             const { data, msg, code } = res.data;

src/components/Activity/ActivityDate.vue

@@ -38,7 +38,10 @@
           </template>
 
           <template slot="edit" slot-scope="text, record">
-            <a-icon @click="showEditModal(record)" class="pointer mr-5" theme="twoTone" type="edit" />
+            <a-icon @click="showEditModal(record)" class="pointer mr-3" theme="twoTone" type="edit" />
+            <a-popconfirm @confirm="() => onDelete(record.activityId)" title="确定要删除这一条?">
+            <a-icon class="mr-3 pointer" theme="twoTone" two-tone-color="#ff0000" type="delete" />
+            </a-popconfirm>
             <a-button @click="openEnroll(record.activityId)" size="small" type="primary">查看报名信息</a-button>
           </template>
 
@@ -122,7 +125,7 @@
 
 <script>
 import ActivityEdit from 'components/Activity/ActivityEdit.vue';
-import { getQueryDetail, auditApply } from 'config/api';
+import { getQueryDetail, auditApply, deleteActivity} from 'config/api';
 
 const columns = [
   {
@@ -272,6 +275,23 @@ export default {
       const { query } = this.$route;
       this.$router.push({ path: `/event-registration?activityId=${id}`, query });
     },
+
+    // 删除 
+    async onDelete(activityId){
+       try {
+        const params = { param: { activityId } };
+        const res = await deleteActivity(params);
+        const { data, msg, code } = res.data;
+        if (code === 200) {
+          this.$message.success('删除成功');
+          this.$emit('getSelectTeam');
+        } else {
+          throw msg;
+        }
+      } catch (error) {
+        this.$message.error(error || '删除失败');
+      }
+    },
   },
 };
 </script>

src/components/EntityApply/EntityApplyDate.vue

@@ -47,6 +47,9 @@
           <a-button @click="handleApply(record.id, 1)" class="ml-3" size="small" type="danger" v-if="record.dealStatus === 2">
             不通过
           </a-button>
+          <a-popconfirm @confirm="() => onDelete(record.id)" title="确定要删除这一条?">
+            <a-icon class="ml-3 pointer" theme="twoTone" two-tone-color="#ff0000" type="delete" />
+          </a-popconfirm>
         </template>
 
         <div class="d-flex flex-nowrap justify-space-between" slot="expandedRowRender" slot-scope="record" style="margin: 0">
@@ -61,7 +64,7 @@
 <script>
 import EditableCellSelect from 'components/EditableCellSelect/EditableCellSelect.vue';
 import Detail from 'components/EntityApply/Detail.vue';
-import { changeStatus } from 'config/api';
+import { changeStatus, deletePlace } from 'config/api';
 
 const columns = [
   {
@@ -177,6 +180,23 @@ export default {
         this.$message.error(error || '审核失败');
       }
     },
+
+    // 删除 
+    async onDelete(id){
+       try {
+        const params = { param: { id } };
+        const res = await deletePlace(params);
+        const { data, msg, code } = res.data;
+        if (code === 200) {
+          this.$message.success('删除成功');
+          this.$emit('entityApplicationSearch');
+        } else {
+          throw msg;
+        }
+      } catch (error) {
+        this.$message.error(error || '删除失败');
+      }
+    },
   },
 };
 </script>

src/config/api.js

@@ -71,6 +71,9 @@ export const saveActivity = params => axios.post(`${activity}/save`, params);
 // 修改活动公告
 export const updateActivity = params => axios.post(`${activity}/update`, params);
 
+// 删除活动公告
+export const deleteActivity = params => axios.post(`${activity}/del`, params);
+
 // 查看活动下所有申请的人员列表
 export const getQueryApply = params => axios.post(`${activity}/query/apply`, params);
 
@@ -194,6 +197,9 @@ export const entityApplicationSearch = params => axios.post(`${place}/search`, p
 // 入驻企业申请的处理状态
 export const changeStatus = params => axios.post(`${place}/status`, params);
 
+// 入驻企业申请的删除
+export const deletePlace = params => axios.post(`${place}/delete`, params);
+
 // 入驻企业申请(管理员用)
 export const handleApplyBackend = params => axios.post(`${place}/applyBackend`, params);
 
@@ -310,3 +316,6 @@ export const addTutor = params => axios.post(`${tutorRelated}/addTutor`, params)
 
 // 修改导师类型
 export const upTutorH = params => axios.post(`${tutorRelated}/upTutorH`, params);
+
+// 删除导师类型
+export const delTutorH = params => axios.post(`${tutorRelated}/delTutorH`, params);

src/views/teacherType/teacherType.vue

@@ -50,7 +50,10 @@
           </template>
 
           <template slot="edit" slot-scope="text, record">
-            <a-icon @click="showEditModel(record)" class="pointer" theme="twoTone" type="edit" />
+            <a-icon @click="showEditModel(record)" class="mr-3 pointer" theme="twoTone" type="edit" />
+            <a-popconfirm @confirm="() => onDelete(record.id)" title="确定要删除这一条?">
+            <a-icon class="mr-3 pointer" theme="twoTone" two-tone-color="#ff0000" type="delete" />
+            </a-popconfirm>
           </template>
         </a-table>
       </div>
@@ -83,7 +86,7 @@
 </template>
 
 <script>
-import { getSelTutorH, addTutor, upTutorH } from 'config/api';
+import { getSelTutorH, addTutor, upTutorH, delTutorH } from 'config/api';
 const formItemLayout = {
   labelCol: { span: 6 },
   wrapperCol: { span: 16 },
@@ -284,6 +287,24 @@ export default {
         return '';
       }
     },
+
+    // 删除 
+    async onDelete(id){
+       try {
+        const params = { param: { id} };
+        const res = await delTutorH(params);
+        const { data, msg, code } = res.data;
+        if (code === 200) {
+          this.$message.success('删除成功');
+          this.getTeaClass();
+        } else {
+          throw msg;
+        }
+      } catch (error) {
+        this.$message.error(error || '删除失败');
+      }
+    },
+
   },
 };
 </script>

yarn.lock

@@ -1716,8 +1716,8 @@
     "color-convert" "^2.0.1"
 
 "ansi-styles@^4.1.0":
-  "integrity" "sha1-7dgDYornHATIWuegkG7a00tkiTc="
-  "resolved" "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1601839122515&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz"
+  "integrity" "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
+  "resolved" "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
   "version" "4.3.0"
   dependencies:
     "color-convert" "^2.0.1"
@@ -2535,8 +2535,8 @@
     "supports-color" "^7.1.0"
 
 "chalk@^4.1.0":
-  "integrity" "sha1-ThSHCmGNni7dl92DRf2dncMVZGo="
-  "resolved" "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz"
+  "integrity" "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="
+  "resolved" "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"
   "version" "4.1.0"
   dependencies:
     "ansi-styles" "^4.1.0"
@@ -2755,8 +2755,8 @@
     "color-name" "1.1.3"
 
 "color-convert@^2.0.1":
-  "integrity" "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM="
-  "resolved" "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz"
+  "integrity" "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="
+  "resolved" "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
   "version" "2.0.1"
   dependencies:
     "color-name" "~1.1.4"
@@ -2767,8 +2767,8 @@
   "version" "1.1.3"
 
 "color-name@~1.1.4":
-  "integrity" "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI="
-  "resolved" "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz"
+  "integrity" "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+  "resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
   "version" "1.1.4"
 
 "color-string@^1.5.4":
@@ -3393,6 +3393,11 @@
   "resolved" "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz?cache=0&sync_timestamp=1593463429320&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeepmerge%2Fdownload%2Fdeepmerge-1.5.2.tgz"
   "version" "1.5.2"
 
+"deepmerge@^4.2.2":
+  "integrity" "sha1-RNLqNnm49NT/ujPwPYZfwee/SVU="
+  "resolved" "https://registry.npm.taobao.org/deepmerge/download/deepmerge-4.2.2.tgz?cache=0&sync_timestamp=1593463429320&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeepmerge%2Fdownload%2Fdeepmerge-4.2.2.tgz"
+  "version" "4.2.2"
+
 "deepmerge@1.3.2":
   "integrity" "sha1-FmNpFinU2/42T6EqKk8KqGqjoFA="
   "resolved" "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.3.2.tgz?cache=0&sync_timestamp=1593463429320&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeepmerge%2Fdownload%2Fdeepmerge-1.3.2.tgz"
@@ -3594,7 +3599,7 @@
 
 "dompurify@^2.0.0":
   "integrity" "sha1-VJRdxcC0XOWuIocFd36OWdey7cQ="
-  "resolved" "https://registry.npm.taobao.org/dompurify/download/dompurify-2.2.6.tgz?cache=0&sync_timestamp=1608303432721&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdompurify%2Fdownload%2Fdompurify-2.2.6.tgz"
+  "resolved" "https://registry.npm.taobao.org/dompurify/download/dompurify-2.2.6.tgz"
   "version" "2.2.6"
 
 "domready@1.0.8":
@@ -4697,8 +4702,8 @@
   "version" "3.0.0"
 
 "has-flag@^4.0.0":
-  "integrity" "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s="
-  "resolved" "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz"
+  "integrity" "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+  "resolved" "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
   "version" "4.0.0"
 
 "has-symbols@^1.0.1":
@@ -5957,6 +5962,11 @@
   dependencies:
     "object-visit" "^1.0.0"
 
+"material-design-icons-iconfont@^6.1.0":
+  "integrity" "sha1-/60hpx8gADNv1BDL66Nt2/MB8PI="
+  "resolved" "https://registry.npm.taobao.org/material-design-icons-iconfont/download/material-design-icons-iconfont-6.1.0.tgz"
+  "version" "6.1.0"
+
 "md5.js@^1.3.4":
   "integrity" "sha1-tdB7jjIW4+J81yjXL3DR5qNCAF8="
   "resolved" "https://registry.npm.taobao.org/md5.js/download/md5.js-1.3.5.tgz"
@@ -8043,7 +8053,7 @@
 
 "sass-loader@^8.0.2":
   "integrity" "sha1-3r7NjDziQ8dkVPLoKQSCFQOACQ0="
-  "resolved" "https://registry.npm.taobao.org/sass-loader/download/sass-loader-8.0.2.tgz"
+  "resolved" "https://registry.npm.taobao.org/sass-loader/download/sass-loader-8.0.2.tgz?cache=0&sync_timestamp=1612804548821&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsass-loader%2Fdownload%2Fsass-loader-8.0.2.tgz"
   "version" "8.0.2"
   dependencies:
     "clone-deep" "^4.0.1"
@@ -8052,10 +8062,10 @@
     "schema-utils" "^2.6.1"
     "semver" "^6.3.0"
 
-"sass@^1.26.5":
-  "integrity" "sha1-7E4YQsFG2OqSWMKMFBuMK3xqt/E="
-  "resolved" "https://registry.npm.taobao.org/sass/download/sass-1.29.0.tgz?cache=0&sync_timestamp=1604536483628&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsass%2Fdownload%2Fsass-1.29.0.tgz"
-  "version" "1.29.0"
+"sass@^1.32.8":
+  "integrity" "sha1-8WqavY3FMK3Yg05QaHiigIwDe9w="
+  "resolved" "https://registry.npm.taobao.org/sass/download/sass-1.32.8.tgz?cache=0&sync_timestamp=1613687400541&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsass%2Fdownload%2Fsass-1.32.8.tgz"
+  "version" "1.32.8"
   dependencies:
     "chokidar" ">=2.0.0 <4.0.0"
 
@@ -8797,8 +8807,8 @@
     "has-flag" "^4.0.0"
 
 "supports-color@^7.1.0":
-  "integrity" "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo="
-  "resolved" "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1598611732186&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz"
+  "integrity" "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
+  "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
   "version" "7.2.0"
   dependencies:
     "has-flag" "^4.0.0"
@@ -9397,8 +9407,8 @@
   "version" "0.0.4"
 
 "vue-dompurify-html@^2.3.0":
-  "integrity" "sha1-sXXt2lc2LPewPShkRo+mROBaKtA="
-  "resolved" "https://registry.npm.taobao.org/vue-dompurify-html/download/vue-dompurify-html-2.3.0.tgz"
+  "integrity" "sha512-Iz9wI4iiJF+rzC2x3r8quw/VXrkwgMsWXt9p0Le4wXtolBXwMDJOmK3QNMiNg36bzU2b0f3En/wjidoeRVNZ7A=="
+  "resolved" "https://registry.npmjs.org/vue-dompurify-html/-/vue-dompurify-html-2.3.0.tgz"
   "version" "2.3.0"
   dependencies:
     "dompurify" "^2.0.0"
@@ -9421,9 +9431,9 @@
   "version" "2.3.4"
 
 "vue-loader-v16@npm:vue-loader@^16.0.0-beta.7":
-  "integrity" "sha1-nB8WhOLQHIpyIW+dTbEZ4VxiJkU="
-  "resolved" "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.0.0-rc.1.tgz?cache=0&sync_timestamp=1604764704943&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-16.0.0-rc.1.tgz"
-  "version" "16.0.0-rc.1"
+  "integrity" "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q=="
+  "resolved" "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz"
+  "version" "16.2.0"
   dependencies:
     "chalk" "^4.1.0"
     "hash-sum" "^2.0.0"
@@ -9479,11 +9489,16 @@
   "resolved" "https://registry.npm.taobao.org/vue-template-es2015-compiler/download/vue-template-es2015-compiler-1.9.1.tgz"
   "version" "1.9.1"
 
-"vue@^2.0.0", "vue@^2.6.11":
+"vue@^2.6.11":
   "integrity" "sha1-9evU+mvShpQD4pqJau1JBEVskSM="
   "resolved" "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz"
   "version" "2.6.12"
 
+"vuetify@^2.4.6":
+  "integrity" "sha1-Ens3vTbHpj9hYV4M1vl+iyA+egc="
+  "resolved" "https://registry.npm.taobao.org/vuetify/download/vuetify-2.4.6.tgz"
+  "version" "2.4.6"
+
 "vuex@^3.4.0":
   "integrity" "sha1-8bjc6mSbwlJUz09DWAgdv12hiz0="
   "resolved" "https://registry.npm.taobao.org/vuex/download/vuex-3.5.1.tgz?cache=0&sync_timestamp=1604065438225&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvuex%2Fdownload%2Fvuex-3.5.1.tgz"