修改数据审核

src/views/resource/examine/check.vue

@@ -1,16 +1,14 @@
 <template>
-  <BasicModal title="审核管理" @register="registerModal" @ok="handleSubmit">
-    <div style="height: 80px;">
+  <div style="height: 80px;">
       <BasicForm @register="registerForm">
         <template #descinfo>
-          <div class="basic-info-title">审核意见</div>
+          <div class="basic-info-title">审核信息</div>
         </template>
       </BasicForm>
     </div>
-  </BasicModal>
 </template>
 <script lang="ts">
-import { defineComponent, ref, unref, onMounted } from 'vue';
+import { defineComponent, ref, computed, unref, onMounted } from 'vue';
 import { BasicModal, useModalInner } from '/@/components/Modal';
 import { BasicForm, useForm } from '/@/components/Form/index';
 import { accountFormSchema } from './map.data.ts';
@@ -20,7 +18,7 @@ import { TOption } from '/@/views/rule/linkedge/config/config.data';
 import { PlusOutlined } from '@ant-design/icons-vue';
 import { subminExamineResult } from '/@/api/resource/examine';
 import { session } from '/@/utils/Memory.js';
-import eventBus from '/@/utils/eventBus';
+import { object } from 'vue-types';
 
 export default defineComponent({
   name: 'AccountModal',
@@ -70,16 +68,14 @@ export default defineComponent({
       }
     });
     const getTitle = '审核';
-    async function handleSubmit() {
-      var id = bussid.value;
-      console.log('审核', id);
+    async function handleSubmit(bussid) {
       //setModalProps({ confirmLoading: true });
       try {
         const { createMessage } = useMessage();
         const values = await validate(); //validate(['parentId']);
         console.log('userinfo', userinfo)
         const params = {
-          bussInfoId: id,    //业务id
+          bussInfoId: bussid,    //业务id
           ispass: values.ispass,       //是否通过
           opinion: values.opinion,      //意见
         }
@@ -87,8 +83,6 @@ export default defineComponent({
         if (res && res.resp_code === 0) {
           var type = res.resp_code == 0 ? 'success' : 'error';
           createMessage[type](res.resp_msg);
-          closeModal()
-          eventBus.emit('sjscshsj');
           return true
         } else {
           return false

src/views/resource/examine/index.vue

@@ -70,14 +70,22 @@
           }}
         </template> -->
       </BasicTable>
-      <check v-show="ischect && showAuditModal" @register="registerModalSH" @success="handleSuccess" />
-      <map-resource-upload v-if="!ischect && current === 'MR'" @register="registerModalMR"
+      <!-- <check v-if="ischect" @register="registerModal" @success="handleSuccess" />
+      <map-resource-upload v-if="!ischect && current === 'MR'" @register="registerModal"
         @success="handleSuccess"></map-resource-upload>
-      <scene-resource-upload v-if="!ischect && current === 'ER'" @register="registerModalER"
+      <scene-resource-upload v-if="!ischect && current === 'ER'" @register="registerModal"
         @success="handleSuccess"></scene-resource-upload>
-      <file-resource-upload v-if="!ischect && current === 'DR'" @register="registerModalDR"
+      <file-resource-upload v-if="!ischect && current === 'DR'" @register="registerModal"
         @success="handleSuccess"></file-resource-upload>
-      <ass-resource-upload v-if="!ischect && current === 'SR'" @register="registerModalSR"
+      <ass-resource-upload v-if="!ischect && current === 'SR'" @register="registerModal"
+        @success="handleSuccess"></ass-resource-upload> -->
+      <map-resource-upload v-if="current === 'MR'" @register="registerModal"
+        @success="handleSuccess"></map-resource-upload>
+      <scene-resource-upload v-if="current === 'ER'" @register="registerModal"
+        @success="handleSuccess"></scene-resource-upload>
+      <file-resource-upload v-if="current === 'DR'" @register="registerModal"
+        @success="handleSuccess"></file-resource-upload>
+      <ass-resource-upload v-if="current === 'SR'" @register="registerModal"
         @success="handleSuccess"></ass-resource-upload>
     </div>
   </div>
@@ -111,7 +119,6 @@ import { updateExamine } from '/@/api/resource/updateExamine';
 import { useModal } from '/@/components/Modal';
 import { useRouter } from 'vue-router';
 import { useAppStore } from '/@/store/modules/app';
-import eventBus from '/@/utils/eventBus';
 
 export default defineComponent({
   name: 'RoleManagement',
@@ -131,7 +138,7 @@ export default defineComponent({
     const appStore = useAppStore();
     const { currentRoute } = useRouter();
     const currRoute = currentRoute.value;
-    const current = ref(currRoute?.query?.type || 'MR');
+    let current = ref(currRoute?.query?.type || 'MR');
     let statusShow = ref(1);
     const [registerTable, { getSelectRows, setProps, reload, setSelectedRowKeys, getDataSource }] = useTable({
       title: '地图资源审核列表',
@@ -186,8 +193,6 @@ export default defineComponent({
 
     const moment = Moment;
     const ischect = ref(true)
-    const showAuditModal = ref(false)
-
     const sourceTypes = ref([
       { SERVICETYPE: 'MR', name: '地图资源', SUM: 0 },
       { SERVICETYPE: 'ER', name: '场景资源', SUM: 0 },
@@ -204,17 +209,7 @@ export default defineComponent({
       //   return { disabled: false };
       // }
     };
-    const [registerModalSH, { openModal: openModalSH }] = useModal();
-    const [registerModalMR, { openModal: openModalMR }] = useModal();
-    const [registerModalDR, { openModal: openModalDR }] = useModal();
-    const [registerModalER, { openModal: openModalER }] = useModal();
-    const [registerModalSR, { openModal: openModalSR }] = useModal();
-    var open = {
-      MR: openModalMR,
-      DR: openModalDR,
-      ER: openModalER,
-      SR: openModalSR,
-    }
+    const [registerModal, { openModal }] = useModal();
     watch(
       () => current.value, (val) => {
         let searchFormSchema = searchFormSchemaMR;
@@ -262,7 +257,7 @@ export default defineComponent({
         }
         const result = Object.assign(res.metadata, res.servicebase, res.dataVersionConf || {});
         if (record.bussid) res.bussid = record.BUSSID;
-        open[current.value](true, {
+        openModal(true, {
           record: result,
           isUpdate: true,
           isView: true,
@@ -275,11 +270,8 @@ export default defineComponent({
      * 审核
      */
     async function handleEdit(record: Recordable) {
-      appStore.setRouterPushAuditFlag(false)
       ischect.value = true;
-      showAuditModal.value = true;
-
-      if (!record?.BUSSID) return;
+      if(!record?.BUSSID) return;
       // setTimeout(() => {
       //   openModal(true, {
       //     record,
@@ -293,9 +285,9 @@ export default defineComponent({
         if (res.dataVersionConf) {
           res.metadata.isnew = res.servicebase.isnew = res.dataVersionConf.active == 'Y' ? "1" : "0";
         }
-        const result = Object.assign(res.metadata, res.servicebase, res.dataVersionConf || {}, { BUSSID: record?.BUSSID });
+        const result = Object.assign(res.metadata, res.servicebase, res.dataVersionConf || {},{BUSSID:record?.BUSSID});
         if (record.bussid) res.bussid = record.BUSSID;
-        openModalSH(true, {
+        openModal(true, {
           record: result,
           isUpdate: true,
           isView: true,
@@ -379,8 +371,6 @@ export default defineComponent({
       console.log('审核数据', getSelectRows());
     };
 
-    eventBus.one('sjscshsj', () => reload())
-
 
     return {
       statusShow,
@@ -389,18 +379,13 @@ export default defineComponent({
       ischect,
       sourceTypes,
       registerTable,
-      registerModalDR,
-      registerModalMR,
-      registerModalER,
-      registerModalSR,
+      registerModal,
       handleVliew,
       handleDetail,
       handleEdit,
       handleSuccess,
       RoleEnum,
       hasBatchDelete,
-      showAuditModal,
-      registerModalSH,
       handleDeleteOrBatchDelete,
       statusChange,
       batchExamine,