数据审核中新增详情显示

src/views/dataAdmin/assembly/MapSourceModal.vue

@@ -12,6 +12,7 @@
           <FlowStep :flowTitle="'组件资源上传'" :flowCode="flowCode" :formData="formData"></FlowStep>
         </a-tab-pane>
       </a-tabs>
+      <check v-if="isCheck" ref="checkDom" />
     </div>
   </BasicModal>
 </template>
@@ -21,11 +22,12 @@ import { BasicModal, useModalInner } from '/@/components/Modal';
 import { BasicForm } from '/@/components/Form/index';
 import { BasicTree } from '/@/components/Tree';
 import { PlusOutlined } from '@ant-design/icons-vue';
+import { useMessage } from '/@/hooks/web/useMessage';
 import SourceDetail from './SourceDetail.vue';
 // import FlowStep from './flowStep/index.vue';
 import FlowStep from '../dataAdmin/flowStep/index.vue';
 import { queryFlowInfoPage } from '/@/api/resource/examine'; 
-
+import Check from '/@/views/resource/examine/check.vue';
 
 export default defineComponent({
   name: 'AccountModal',
@@ -36,6 +38,7 @@ export default defineComponent({
     PlusOutlined,
     FlowStep,
     SourceDetail,
+    Check,
     VNodes: (_, { attrs }) => {
       return attrs.vnodes;
     },
@@ -48,11 +51,15 @@ export default defineComponent({
     let formData = ref(null)
     const isUpdate = ref(true);
     const isView = ref(false);
+    const checkDom = ref(null);
+    let isCheck = ref(false);
     const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
       setModalProps({ confirmLoading: false });
       isUpdate.value = !!data?.isUpdate;
       isView.value = data.see;
+      isCheck.value = !!data?.isCheck;
       isUpdate.value ? formData.value = data.record : formData.value = null;
+      if (isCheck.value) formData.value = data.record;
       activeKey.value = '1';
     });
     const getTitle = computed(() => {
@@ -66,7 +73,20 @@ export default defineComponent({
     });
 
     async function handleSubmit() {
-      refSourceDetail.value.submitForm();
+      // refSourceDetail.value.submitForm();
+      const { createMessage } = useMessage();
+      if (!isCheck.value) refSourceDetail.value.submitForm();
+      else {
+        let flag = await checkDom.value.handleSubmit(formData.value?.BUSSID)
+        if (flag) {
+          refSourceDetail.value.resetForm();
+          closeModal();
+          emit('success');
+        }
+        else{
+          createMessage.error('审核失败!');
+        }
+      }
     }
     const RtnMain = (status) => {
       emit('success')
@@ -107,6 +127,8 @@ export default defineComponent({
       getTitle,
       refSourceDetail,
       isUpdate,
+      isCheck,
+      checkDom,
       formData,
       RtnMain,
     };

src/views/dataAdmin/dataAdmin/fileResourceUpload/AddMethod.vue

@@ -1,6 +1,15 @@
 <template>
-  <BasicModal width="1200px" v-bind="$attrs" @register="registerModal" @cancel="handleCancel" :title="getTitle"
-    @ok="handleSubmit" :useWrapper="true" :minHeight="500" :maxHeight="600">
+  <BasicModal
+    width="1200px"
+    v-bind="$attrs"
+    @register="registerModal"
+    @cancel="handleCancel"
+    :title="getTitle"
+    @ok="handleSubmit"
+    :useWrapper="true"
+    :minHeight="500"
+    :maxHeight="600"
+  >
     <div style="height: 50vh">
       <!-- <div class="text-center text-black text-2xl">
         <a-typography-title style="font-size: 16px;">流域基础信息</a-typography-title>
@@ -13,31 +22,56 @@
         <a-tab-pane key="1" tab="基本信息">
           <BasicForm @register="registerForm" v-if="show1">
             <template #upload>
-              <a-upload :disabled="isView" name="file" :multiple="true" :fileList="fileList" action=""
-                :showUploadList="false" :customRequest="() => { }" @change="fileChange">
+              <a-upload
+                :disabled="isView"
+                name="file"
+                :multiple="true"
+                :fileList="fileList"
+                action=""
+                :showUploadList="false"
+                :customRequest="() => {}"
+                @change="fileChange"
+              >
                 <a-button type="primary">
                   <upload-outlined></upload-outlined>
                   选择文件
                 </a-button>
-                <span style="font-size: 14px; margin-left: 10px">支持上传png、jpeg、gif、tif、doc、xls、pdf等格式文件</span>
+                <span style="font-size: 14px; margin-left: 10px"
+                  >支持上传png、jpeg、gif、tif、doc、xls、pdf等格式文件</span
+                >
               </a-upload>
             </template>
             <template #upload-table>
               <div style="height: auto; width: 100%; padding: 0 20px">
-                <upload-file-list :isView="isView" ref="imgList" :fileList="fileList"></upload-file-list>
+                <upload-file-list
+                  :isView="isView"
+                  ref="imgList"
+                  :fileList="fileList"
+                ></upload-file-list>
               </div>
             </template>
             <template #roleSlot="{ model, field }">
-              <a-select :disabled="isView" mode="multiple" allowClear placeholder="请选择资源标签" v-model:value="model[field]"
-                :options="serviceTags">
+              <a-select
+                :disabled="isView"
+                mode="multiple"
+                allowClear
+                placeholder="请选择资源标签"
+                v-model:value="model[field]"
+                :options="serviceTags"
+              >
               </a-select>
             </template>
           </BasicForm>
         </a-tab-pane>
         <a-tab-pane key="2" tab="流程信息" force-render :disabled="!formData || !formData.bussid">
-          <FlowStep :flowTitle="'文件资源上传'" :flowCode="'20220523001'" :formData="formData"></FlowStep>
+          <FlowStep
+            :flowTitle="'文件资源上传'"
+            :flowCode="'20220523001'"
+            :formData="formData"
+          ></FlowStep>
         </a-tab-pane>
       </a-tabs>
+      <check v-if="isCheck" ref="checkDom" />
     </div>
   </BasicModal>
 </template>
@@ -58,6 +92,7 @@ import { update } from '/@/api/dataAdmin/assembly';
 import { insertFilesService, updateService } from '/@/api/resource/map';
 import { session } from '/@/utils/Memory.js';
 import { serviceTags } from '../sysDic';
+import Check from '/@/views/resource/examine/check.vue';
 
 export default defineComponent({
   name: 'AccountModal',
@@ -68,6 +103,7 @@ export default defineComponent({
     PlusOutlined,
     UploadFileList,
     FlowStep,
+    Check,
   },
   emits: ['success', 'register'],
   setup(_, { emit }) {
@@ -83,10 +119,11 @@ export default defineComponent({
     const postData = reactive({});
     const fileList = ref([]);
     const serviceid = ref(null);
-    const imgList = ref(null)
-
+    const imgList = ref(null);
+    const checkDom = ref(null);
+    let isCheck = ref(false);
     const { createMessage } = useMessage();
-    onMounted(async () => { });
+    onMounted(async () => {});
 
     const [registerForm, { setFieldsValue, resetFields, validate, setProps }] = useForm({
       labelWidth: 100,
@@ -99,11 +136,11 @@ export default defineComponent({
 
     var formData = ref(null);
     const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
-      console.log('文件资源查看某个:', data);
       await resetFields();
       setModalProps({ confirmLoading: false });
       isUpdate.value = !!data?.isUpdate;
       isView.value = !!data?.isView;
+      isCheck.value = !!data?.isCheck;
       //修改
       if (unref(isUpdate)) {
         rowId.value = data.record.id;
@@ -111,23 +148,27 @@ export default defineComponent({
       }
       setProps({ disabled: isView.value });
       if (isUpdate.value || isView.value) {
-        data.record.keywords = data.record.keywords.indexOf('[') > -1 ? JSON.parse(data.record.keywords) : [data.record.keywords];
+        data.record.keywords =
+          data.record.keywords.indexOf('[') > -1
+            ? JSON.parse(data.record.keywords)
+            : [data.record.keywords];
         formData.value = data.record;
         serviceid.value = data.record.serviceid;
-        setFileList(data.record)
+        setFileList(data.record);
       }
       if (!isUpdate.value) formData.value = null;
+      if (isCheck.value) formData.value = data.record;
       activeKey.value = '1';
     });
 
     //修改标题
     const getTitle = computed(() => {
       if (isUpdate.value && !isView.value) {
-        return '编辑文件资源'
+        return '编辑文件资源';
       } else if (isView.value) {
-        return '查看文件资源'
+        return '查看文件资源';
       } else {
-        return '新增文件资源'
+        return '新增文件资源';
       }
     });
 
@@ -140,108 +181,121 @@ export default defineComponent({
 
     //获取文件资源列表
     function setFileList(i) {
-      fileList.value = [{
-        fileId: i.fileid,
-        fileName: i.name,
-        fileFormat: i.format,
-        fileCode: i.servicealiasname,
-        thumbnail: i.thumbnail,
-        status: '上传成功',
-        mapingurl: i.mapingurl,
-      }];
+      fileList.value = [
+        {
+          fileId: i.fileid,
+          fileName: i.name,
+          fileFormat: i.format,
+          fileCode: i.servicealiasname,
+          thumbnail: i.thumbnail,
+          status: '上传成功',
+          mapingurl: i.mapingurl,
+        },
+      ];
     }
 
     //提交表单
     async function handleSubmit() {
-      if (isView.value) {
-        return closeModal();
-      }
-      setModalProps({ confirmLoading: true });
-      try {
-        const values = await validate();
-        Object.assign(postData, values);
-        const userinfo = session.getItem('userInfo');
-        const validateValue = validateFiles();
-        if (!validateValue) {
-          createMessage.warning('请维护完整资源编码!');
-          return;
-        }
-        const servicebase = Object.assign(
-          {
-            name: values.servicename, // 资源名称
-            thumbnail: '', //缩略图名称-------------根据上传的缩略图更新
-            workSpace: '', //工作空间
-            bz: '', //备注
-            publisher: userinfo?.EMPLOYEE?.NAME, //发布者
-            username: userinfo?.EMPLOYEE?.NAME, //用户名称
-            userid: userinfo?.EMPLOYEE?.EMPLOYEE_ID, //用户id
-          },
-          values
-        );
-        const metadata = Object.assign(
-          {
-            thumbnail: '', //缩略图名称-------------根据上传的缩略图更新
-            workSpace: '', //工作空间
-            publisher: userinfo?.EMPLOYEE?.NAME, //发布者
-            username: userinfo?.EMPLOYEE?.NAME, //用户名称
-            userid: userinfo?.EMPLOYEE?.EMPLOYEE_ID, //用户id
-          },
-          values
-        );
-        let formDataList = [];
-
-        if (unref(isUpdate)) {
-          servicebase.serviceid = serviceid.value;
-          metadata.serviceid = serviceid.value;
-        }
-
-        var dataVersionConf = {
-          active: metadata.isnew || servicebase.isnew,
-          versionNum: servicebase.versionNum || metadata.versionNum,
-          vid: servicebase.vid || metadata.vid
+      const { createMessage } = useMessage();
+      if (!isCheck.value) {
+        if (isView.value) {
+          return closeModal();
         }
-        if (unref(isUpdate)) dataVersionConf.rid = serviceid.value;
+        setModalProps({ confirmLoading: true });
+        try {
+          const values = await validate();
+          Object.assign(postData, values);
+          const userinfo = session.getItem('userInfo');
+          const validateValue = validateFiles();
+          if (!validateValue) {
+            createMessage.warning('请维护完整资源编码!');
+            return;
+          }
+          const servicebase = Object.assign(
+            {
+              name: values.servicename, // 资源名称
+              thumbnail: '', //缩略图名称-------------根据上传的缩略图更新
+              workSpace: '', //工作空间
+              bz: '', //备注
+              publisher: userinfo?.EMPLOYEE?.NAME, //发布者
+              username: userinfo?.EMPLOYEE?.NAME, //用户名称
+              userid: userinfo?.EMPLOYEE?.EMPLOYEE_ID, //用户id
+            },
+            values
+          );
+          const metadata = Object.assign(
+            {
+              thumbnail: '', //缩略图名称-------------根据上传的缩略图更新
+              workSpace: '', //工作空间
+              publisher: userinfo?.EMPLOYEE?.NAME, //发布者
+              username: userinfo?.EMPLOYEE?.NAME, //用户名称
+              userid: userinfo?.EMPLOYEE?.EMPLOYEE_ID, //用户id
+            },
+            values
+          );
+          let formDataList = [];
 
+          if (unref(isUpdate)) {
+            servicebase.serviceid = serviceid.value;
+            metadata.serviceid = serviceid.value;
+          }
 
-        fileList.value.map((item) => {
-          var n = {
-            name: item['fileName'],
-            mapingurl_show: item['fileId'],
-            mapingurl: item['fileId'],
-            fileId: item['fileId'],
-            format: item['fileFormat'],
-            servicename: item['fileName'],
-            servicealiasname: item['fileCode'],
-            fileListUrls: item['fileId'],
-            thumbnail: item['thumbnail'],
-          };
-          let postFormData = {
-            type: 'DR',
-            servicebase: Object.assign({}, servicebase, n),
-            metadata: Object.assign({}, metadata, n),
+          var dataVersionConf = {
+            active: metadata.isnew || servicebase.isnew,
+            versionNum: servicebase.versionNum || metadata.versionNum,
+            vid: servicebase.vid || metadata.vid,
           };
-          if (dataVersionConf) postFormData.dataVersionConf = dataVersionConf;
-          formDataList.push(postFormData);
-        });
-        console.log("文件资源上传参数:", formDataList);
-        var type = unref(isUpdate);
-        const res = await insertFilesService(type ? formDataList[0] : formDataList, type);
-        if (res && res.status === '0') {
-          var obj = JSON.parse(res.result);
-          if (obj?.errList?.length) {
-            var arr = obj.errList.map(i => i.servicebase.servicealiasname);
-            message.error(arr.toString() + '等文件资源的编码已经存在！')
-          } else {
-            handleCancel();
-            closeModal();
-            emit('success');
-            createMessage.success(type ? '修改成功' : '新增成功');
+          if (unref(isUpdate)) dataVersionConf.rid = serviceid.value;
+
+          fileList.value.map((item) => {
+            var n = {
+              name: item['fileName'],
+              mapingurl_show: item['fileId'],
+              mapingurl: item['fileId'],
+              fileId: item['fileId'],
+              format: item['fileFormat'],
+              servicename: item['fileName'],
+              servicealiasname: item['fileCode'],
+              fileListUrls: item['fileId'],
+              thumbnail: item['thumbnail'],
+            };
+            let postFormData = {
+              type: 'DR',
+              servicebase: Object.assign({}, servicebase, n),
+              metadata: Object.assign({}, metadata, n),
+            };
+            if (dataVersionConf) postFormData.dataVersionConf = dataVersionConf;
+            formDataList.push(postFormData);
+          });
+          console.log('文件资源上传参数:', formDataList);
+          var type = unref(isUpdate);
+          const res = await insertFilesService(type ? formDataList[0] : formDataList, type);
+          if (res && res.status === '0') {
+            var obj = JSON.parse(res.result);
+            if (obj?.errList?.length) {
+              var arr = obj.errList.map((i) => i.servicebase.servicealiasname);
+              message.error(arr.toString() + '等文件资源的编码已经存在！');
+            } else {
+              handleCancel();
+              closeModal();
+              emit('success');
+              createMessage.success(type ? '修改成功' : '新增成功');
+            }
           }
+        } finally {
+          setTimeout(() => {
+            setModalProps({ confirmLoading: false });
+          }, 300);
+        }
+      } else {
+        let flag = await checkDom.value.handleSubmit(formData.value?.BUSSID);
+        if (flag) {
+          handleCancel();
+          closeModal();
+          emit('success');
+        } else {
+          createMessage.error('审核失败!');
         }
-      } finally {
-        setTimeout(() => {
-          setModalProps({ confirmLoading: false });
-        }, 300);
       }
     }
     // async function customUpload({ file }) {
@@ -374,6 +428,8 @@ export default defineComponent({
       fileList,
       fileChange,
       validateFiles,
+      checkDom,
+      isCheck,
     };
   },
 });

src/views/dataAdmin/dataAdmin/mapUpload/MapSourceModal.vue

@@ -2,23 +2,37 @@
  * @Author: tengmingxue 1473375109@qq.com
  * @Date: 2023-08-15 16:19:10
  * @LastEditors: tengmingxue 1473375109@qq.com
- * @LastEditTime: 2023-09-25 15:05:22
+ * @LastEditTime: 2024-02-23 23:33:55
  * @FilePath: \xld-gis-admin\src\views\resource\map\MapSourceModal.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
-  <BasicModal width="1200px" v-bind="$attrs" @register="registerModal" @cancel="handleCancel" :title="getTitle"
-    @ok="handleSubmit">
+  <BasicModal
+    width="1200px"
+    v-bind="$attrs"
+    @register="registerModal"
+    @cancel="handleCancel"
+    :title="getTitle"
+    @ok="handleSubmit"
+  >
     <div style="height: 60vh" class="res-form-container">
       <a-tabs v-model:activeKey="activeKey" class="res-a-tabs">
         <a-tab-pane key="1" tab="地图资源信息">
-          <source-detail ref="refSourceDetail" @RtnMain="RtnMain" @closeModal="closeModal" :formData="formData"
-            :isUpdate="isUpdate" :isView="isView" :flowName="flowName"></source-detail>
+          <source-detail
+            ref="refSourceDetail"
+            @RtnMain="RtnMain"
+            @closeModal="closeModal"
+            :formData="formData"
+            :isUpdate="isUpdate"
+            :isView="isView"
+            :flowName="flowName"
+          ></source-detail>
         </a-tab-pane>
         <a-tab-pane key="2" tab="流程信息" force-render :disabled="!formData || !formData.bussid">
           <FlowStep :flowTitle="flowName" :flowCode="'20220523001'" :formData="formData"></FlowStep>
         </a-tab-pane>
       </a-tabs>
+      <check v-if="isCheck" ref="checkDom" />
     </div>
   </BasicModal>
 </template>
@@ -28,9 +42,10 @@ import { BasicModal, useModalInner } from '/@/components/Modal';
 import { BasicForm, useForm } from '/@/components/Form/index';
 import { BasicTree } from '/@/components/Tree';
 import { PlusOutlined } from '@ant-design/icons-vue';
+import { useMessage } from '/@/hooks/web/useMessage';
 import SourceDetail from './SourceDetail.vue';
-import FlowStep from '../flowStep/index.vue'
-
+import FlowStep from '../flowStep/index.vue';
+import Check from '/@/views/resource/examine/check.vue';
 export default defineComponent({
   name: 'AccountModal',
   components: {
@@ -40,42 +55,58 @@ export default defineComponent({
     PlusOutlined,
     SourceDetail,
     FlowStep,
+    Check,
     VNodes: (_, { attrs }) => {
       return attrs.vnodes;
     },
   },
   emits: ['success', 'register'],
   setup(_, { emit }) {
-    const activeKey = ref('1')
-    const refSourceDetail = ref(null)
-    let formData = ref(null)
-    let isUpdate = ref(true)
-    let isView = ref(false)
-    const flowName = ref('地图资源上传')
+    const activeKey = ref('1');
+    const refSourceDetail = ref(null);
+    const checkDom = ref(null);
+    let formData = ref(null);
+    let isUpdate = ref(true);
+    let isView = ref(false);
+    let isCheck = ref(false);
+    const flowName = ref('地图资源上传');
     const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
       setModalProps({ confirmLoading: false });
       isUpdate.value = !!data?.isUpdate;
       isView.value = !!data?.isView;
-      if (isUpdate.value || isView.value) formData.value = data.record;
+      isCheck.value = !!data?.isCheck;
+      if (isUpdate.value || isView.value || isCheck.value) formData.value = data.record;
       if (!isUpdate.value) formData.value = null;
       activeKey.value = '1';
     });
     const getTitle = computed(() => {
       if (isUpdate.value && !isView.value) {
-        return '编辑地图资源'
+        return '编辑地图资源';
       } else if (isView.value) {
-        return '查看地图资源'
+        return '查看地图资源';
       } else {
-        return '新增地图资源'
+        return '新增地图资源';
       }
     });
 
     async function handleSubmit() {
-      refSourceDetail.value.submitForm();
+      const { createMessage } = useMessage();
+      if (!isCheck.value) refSourceDetail.value.submitForm();
+      else {
+        let flag = await checkDom.value.handleSubmit(formData.value?.BUSSID)
+        if (flag) {
+          refSourceDetail.value.resetForm();
+          closeModal();
+          emit('success');
+        }
+        else{
+          createMessage.error('审核失败!');
+        }
+      }
     }
     const RtnMain = (status) => {
-      emit('success')
-    }
+      emit('success');
+    };
 
     function handleCancel() {
       if (refSourceDetail.value) {
@@ -84,7 +115,7 @@ export default defineComponent({
       }
     }
 
-    onMounted(() => { });
+    onMounted(() => {});
     return {
       handleCancel,
       closeModal,
@@ -94,8 +125,10 @@ export default defineComponent({
       handleSubmit,
       getTitle,
       refSourceDetail,
+      checkDom,
       isUpdate,
       isView,
+      isCheck,
       formData,
       RtnMain,
     };

src/views/dataAdmin/dataAdmin/mapUpload/index.vue

@@ -189,6 +189,7 @@ export default defineComponent({
     function handleCreate() {
       openModal(true, {
         isUpdate: false,
+        isCheck:false,
       });
     }
 
@@ -202,6 +203,7 @@ export default defineComponent({
           record: result,
           isUpdate: true,
           isView: true,
+          isCheck:false,
         });
       }
     }
@@ -215,6 +217,7 @@ export default defineComponent({
         openModal(true, {
           record: result,
           isUpdate: true,
+          isCheck:false,
         });
       }
     }
@@ -295,6 +298,7 @@ export default defineComponent({
     function handleSuccess() {
       openModal(false, {
         isUpdate: false,
+        isCheck:false,
       });
       reload();
     }

src/views/dataAdmin/dataAdmin/sceneResourceUpload/AddMethod.vue

@@ -1,6 +1,14 @@
 <template>
-  <BasicModal width="1200px" v-bind="$attrs" @register="registerModal" @cancel="handleCancel" :title="getTitle"
-    @ok="handleSubmit" :useWrapper="true" :minHeight="500">
+  <BasicModal
+    width="1200px"
+    v-bind="$attrs"
+    @register="registerModal"
+    @cancel="handleCancel"
+    :title="getTitle"
+    @ok="handleSubmit"
+    :useWrapper="true"
+    :minHeight="500"
+  >
     <div style="height: 50vh">
       <!-- <BasicForm @register="registerForm">
         <template #title>
@@ -43,14 +51,28 @@
               <div class="basic-info-title">描述信息</div>
             </template>
             <template #keywords="{ model, field }">
-              <a-select mode="multiple" :disabled="isView" allowClear placeholder="请选择资源标签" v-model:value="model[field]"
-                :options="serviceTags">
+              <a-select
+                mode="multiple"
+                :disabled="isView"
+                allowClear
+                placeholder="请选择资源标签"
+                v-model:value="model[field]"
+                :options="serviceTags"
+              >
               </a-select>
             </template>
             <template #upload>
-              <a-upload id="thumbnail2" name="thumbnail1" :custom-request="customUpload" v-model:file-list="fileList"
-                :disabled="isView">
-                <a-button style="background-color: #0671dd; color: #fff; border-radius: 4px" :disabled="isView">
+              <a-upload
+                id="thumbnail2"
+                name="thumbnail1"
+                :custom-request="customUpload"
+                v-model:file-list="fileList"
+                :disabled="isView"
+              >
+                <a-button
+                  style="background-color: #0671dd; color: #fff; border-radius: 4px"
+                  :disabled="isView"
+                >
                   <upload-outlined></upload-outlined>
                   文件上传
                 </a-button>
@@ -60,9 +82,14 @@
           </BasicForm>
         </a-tab-pane>
         <a-tab-pane key="2" tab="流程信息" force-render :disabled="!formData || !formData.bussid">
-          <FlowStep :flowTitle="'场景资源上传'" :flowCode="'20220523001'" :formData="formData"></FlowStep>
+          <FlowStep
+            :flowTitle="'场景资源上传'"
+            :flowCode="'20220523001'"
+            :formData="formData"
+          ></FlowStep>
         </a-tab-pane>
       </a-tabs>
+      <check v-if="isCheck" ref="checkDom" />
     </div>
   </BasicModal>
 </template>
@@ -87,7 +114,7 @@ import { update, getImgUrl } from '/@/api/dataAdmin/assembly';
 import { insertService, updateService } from '/@/api/resource/map';
 import { session } from '/@/utils/Memory.js';
 import { img } from '/@/api/resource/plat';
-
+import Check from '/@/views/resource/examine/check.vue';
 export default defineComponent({
   name: 'AccountModal',
   components: {
@@ -96,6 +123,7 @@ export default defineComponent({
     Upload,
     PlusOutlined,
     FlowStep,
+    Check,
   },
   emits: ['success', 'register'],
   setup(_, { emit }) {
@@ -109,6 +137,8 @@ export default defineComponent({
     const serviceid = ref('');
     const postData = reactive({});
     const activeKey = ref('1');
+    const checkDom = ref(null);
+    let isCheck = ref(false);
     const getRoleList = async () => {
       const res = await filterRoleList();
       console.log(res);
@@ -133,25 +163,27 @@ export default defineComponent({
     });
 
     function getImg(i) {
-      img(i).then(r => {
+      img(i).then((r) => {
         if (r && r.length) {
-          r.map(i => {
+          r.map((i) => {
             if (i.thumbnail && i.thumbnail.indexOf(',') > -1) {
-              var arr = i.thumbnail.split(',')
-              getImgUrl(arr[0], arr[1]).then(res => {
-                console.log("tup:", res)
+              var arr = i.thumbnail.split(',');
+              getImgUrl(arr[0], arr[1]).then((res) => {
+                console.log('tup:', res);
                 var name = res.match(/\/([^/]+)\?/)[1];
-                fileList.value = [{
-                  uid: '1',
-                  name: name,
-                  status: 'done',
-                  url: res,
-                }];
-              })
+                fileList.value = [
+                  {
+                    uid: '1',
+                    name: name,
+                    status: 'done',
+                    url: res,
+                  },
+                ];
+              });
             }
-          })
+          });
         }
-      })
+      });
     }
 
     var formData = ref(null);
@@ -160,43 +192,49 @@ export default defineComponent({
       setModalProps({ confirmLoading: false });
       isUpdate.value = !!data?.isUpdate;
       isView.value = !!data?.isView;
+      isCheck.value = !!data?.isCheck;
       if (unref(isUpdate)) {
         rowId.value = data.record.id;
         serviceid.value = data.record.serviceid;
         setFieldsValue(data.record);
-        getImg(data.record.serviceid)
+        getImg(data.record.serviceid);
       }
       setProps({ disabled: isView.value });
       if (isUpdate.value || isView.value) {
-        data.record.keywords = data.record.keywords.indexOf('[') > -1 ? JSON.parse(data.record.keywords) : [data.record.keywords];
+        data.record.keywords =
+          data.record.keywords.indexOf('[') > -1
+            ? JSON.parse(data.record.keywords)
+            : [data.record.keywords];
         formData.value = data.record;
       }
       if (!isUpdate.value) formData.value = null;
+      if (isCheck.value) formData.value = data.record;
       activeKey.value = '1';
     });
     const getTitle = computed(() => {
       if (isUpdate.value && !isView.value) {
-        return '编辑场景资源'
+        return '编辑场景资源';
       } else if (isView.value) {
-        return '查看场景资源'
+        return '查看场景资源';
       } else {
-        return '新增场景资源'
+        return '新增场景资源';
       }
     });
 
     var thumbnail = ref('');
     async function handleSubmit() {
-      if (isView.value) {
-        return closeModal();
-      }
-      setModalProps({ confirmLoading: true });
-      try {
-        const { createMessage } = useMessage();
-        const values = await validate(); //validate(['parentId']);
-        Object.assign(postData, values);
-        const userinfo = session.getItem('userInfo');
-        let servicebase = Object.assign(values,
-          {
+      const { createMessage } = useMessage();
+      if (!isCheck.value) {
+        if (isView.value) {
+          return closeModal();
+        }
+        setModalProps({ confirmLoading: true });
+        try {
+          const { createMessage } = useMessage();
+          const values = await validate(); //validate(['parentId']);
+          Object.assign(postData, values);
+          const userinfo = session.getItem('userInfo');
+          let servicebase = Object.assign(values, {
             name: values.servicename, // 资源名称
             thumbnail: thumbnail.value, //缩略图名称-------------根据上传的缩略图更新
             workSpace: '', //工作空间
@@ -208,8 +246,7 @@ export default defineComponent({
             username: userinfo?.EMPLOYEE?.NAME, //用户名称
             userid: userinfo?.EMPLOYEE?.EMPLOYEE_ID, //用户id
           });
-        let metadata = Object.assign(values,
-          {
+          let metadata = Object.assign(values, {
             thumbnail: thumbnail.value, //缩略图名称-------------根据上传的缩略图更新
             workSpace: '', //工作空间
             urlInfo: '', //路径信息
@@ -220,35 +257,45 @@ export default defineComponent({
             username: userinfo?.EMPLOYEE?.NAME, //用户名称
             userid: userinfo?.EMPLOYEE?.EMPLOYEE_ID, //用户id
           });
-        let res = null;
-        if (!unref(isUpdate)) {
-          let postFormData = {
-            type: 'ER',
-            servicebase: servicebase,
-            metadata: metadata,
-          };
-          res = await insertService(postFormData);
-        } else {
-          Object.assign(servicebase, { serviceid: serviceid.value })
-          Object.assign(metadata, { serviceid: serviceid.value, id: rowId.value })
-          let postFormData = {
-            type: 'ER',
-            servicebase: servicebase,
-            metadata: metadata,
-          };
-          res = await updateService(postFormData);
+          let res = null;
+          if (!unref(isUpdate)) {
+            let postFormData = {
+              type: 'ER',
+              servicebase: servicebase,
+              metadata: metadata,
+            };
+            res = await insertService(postFormData);
+          } else {
+            Object.assign(servicebase, { serviceid: serviceid.value });
+            Object.assign(metadata, { serviceid: serviceid.value, id: rowId.value });
+            let postFormData = {
+              type: 'ER',
+              servicebase: servicebase,
+              metadata: metadata,
+            };
+            res = await updateService(postFormData);
+          }
+          if (res) {
+            closeModal();
+            emit('success');
+            createMessage.success(unref(isUpdate) ? '编辑成功' : '新增成功');
+          } else {
+            setModalProps({ confirmLoading: false });
+          }
+        } finally {
+          setTimeout(() => {
+            setModalProps({ confirmLoading: false });
+          }, 300);
         }
-        if (res) {
+      } else {
+        let flag = await checkDom.value.handleSubmit(formData.value?.BUSSID);
+        if (flag) {
+          handleCancel();
           closeModal();
           emit('success');
-          createMessage.success(unref(isUpdate) ? '编辑成功' : '新增成功');
         } else {
-          setModalProps({ confirmLoading: false });
+          createMessage.error('审核失败!');
         }
-      } finally {
-        setTimeout(() => {
-          setModalProps({ confirmLoading: false });
-        }, 300);
       }
     }
 
@@ -307,23 +354,23 @@ export default defineComponent({
     var fileList = ref([]);
     function imgBut() {
       if (fileList.value.length) {
-        return message.error('只能上传一个文件,请先删除之前的文件！')
+        return message.error('只能上传一个文件,请先删除之前的文件！');
       } else if (fileList.value.length == 0) {
-        document.getElementById("thumbnail2").click()
+        document.getElementById('thumbnail2').click();
       }
     }
 
     function customUpload({ file, onSuccess, onError }) {
       const formData = new FormData();
       formData.append('file', file);
-      update(formData, session.getItem('sysFild').dirId).then(r => {
-        if (r && r.resp_code == 0 && r.resp_msg == "OK") {
+      update(formData, session.getItem('sysFild').dirId).then((r) => {
+        if (r && r.resp_code == 0 && r.resp_msg == 'OK') {
           thumbnail.value = `${r.datas.id},${r.datas.dirId}`;
-          onSuccess()
+          onSuccess();
         } else {
-          onError()
+          onError();
         }
-      })
+      });
     }
 
     function handleCancel() {
@@ -350,6 +397,8 @@ export default defineComponent({
       tenantLogo,
       loading,
       func,
+      checkDom,
+      isCheck,
     };
   },
 });

src/views/resource/examine/check.vue

@@ -1,14 +1,11 @@
 <template>
-  <BasicModal width="600px" v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit"
-    :useWrapper="true" :minHeight="200">
-    <div style="height: 50vh">
+  <div style="height: 80px;">
       <BasicForm @register="registerForm">
         <template #descinfo>
           <div class="basic-info-title">描述信息</div>
         </template>
       </BasicForm>
     </div>
-  </BasicModal>
 </template>
 <script lang="ts">
 import { defineComponent, ref, computed, unref, onMounted } from 'vue';
@@ -21,6 +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 { object } from 'vue-types';
 
 export default defineComponent({
   name: 'AccountModal',
@@ -70,28 +68,24 @@ export default defineComponent({
       }
     });
     const getTitle = '审核';
-    async function handleSubmit() {
-      setModalProps({ confirmLoading: true });
+    async function handleSubmit(bussid) {
+      //setModalProps({ confirmLoading: true });
       try {
         const { createMessage } = useMessage();
         const values = await validate(); //validate(['parentId']);
         console.log('userinfo', userinfo)
         const params = {
-          bussInfoId: bussid.value,    //业务id
+          bussInfoId: bussid,    //业务id
           ispass: values.ispass,       //是否通过
           opinion: values.opinion,      //意见
         }
         const res = await subminExamineResult(params) as any
-        if (res) {
-          console.log(res);
-          closeModal();
-          emit('success');
+        if (res && res.resp_code === 0) {
           var type = res.resp_code == 0 ? 'success' : 'error';
           createMessage[type](res.resp_msg);
+          return true
         } else {
-          closeModal();
-          emit('success');
-          createMessage.error('审核失败!');
+          return false
         }
       } finally {
         setTimeout(() => {

src/views/resource/examine/check_bak.vue

@@ -0,0 +1,143 @@
+<template>
+  <BasicModal width="600px" v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit"
+    :useWrapper="true" :minHeight="200">
+    <div style="height: 50vh">
+      <BasicForm @register="registerForm">
+        <template #descinfo>
+          <div class="basic-info-title">描述信息</div>
+        </template>
+      </BasicForm>
+    </div>
+  </BasicModal>
+</template>
+<script lang="ts">
+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';
+import { filterRoleList } from '/@/api/system/system';
+import { useMessage } from '/@/hooks/web/useMessage';
+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';
+
+export default defineComponent({
+  name: 'AccountModal',
+  components: {
+    BasicModal,
+    BasicForm,
+    PlusOutlined,
+  },
+  emits: ['success', 'register'],
+  setup(_, { emit }) {
+    const tenantLogo = ref('');
+    const loading = ref(false);
+    const roleOptions = ref<TOption[]>([]);
+    const isUpdate = ref(true);
+    const bussid = ref('');
+    const userinfo = session.getItem('userInfo');
+    const getRoleList = async () => {
+      const res = await filterRoleList();
+      console.log(res);
+      roleOptions.value = res.map((m) => {
+        return {
+          label: m.name,
+          value: m.id,
+        };
+      });
+    };
+    onMounted(async () => {
+      //await getRoleList();   //这个会导致查询失败
+    });
+
+    const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
+      labelWidth: 100,
+      schemas: accountFormSchema,
+      showActionButtonGroup: false,
+      actionColOptions: {
+        span: 18,
+      },
+    });
+
+    const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+      await resetFields();
+      setModalProps({ confirmLoading: false });
+      isUpdate.value = !!data?.isUpdate;
+      if (unref(isUpdate)) {
+        bussid.value = data.record.BUSSID;
+        setFieldsValue(data.record);
+      }
+    });
+    const getTitle = '审核';
+    async function handleSubmit() {
+      setModalProps({ confirmLoading: true });
+      try {
+        const { createMessage } = useMessage();
+        const values = await validate(); //validate(['parentId']);
+        console.log('userinfo', userinfo)
+        const params = {
+          bussInfoId: bussid.value,    //业务id
+          ispass: values.ispass,       //是否通过
+          opinion: values.opinion,      //意见
+        }
+        const res = await subminExamineResult(params) as any
+        if (res) {
+          console.log(res);
+          closeModal();
+          emit('success');
+          var type = res.resp_code == 0 ? 'success' : 'error';
+          createMessage[type](res.resp_msg);
+        } else {
+          closeModal();
+          emit('success');
+          createMessage.error('审核失败!');
+        }
+      } finally {
+        setTimeout(() => {
+          setModalProps({ confirmLoading: false });
+        }, 300);
+      }
+    }
+
+    return {
+      registerModal,
+      registerForm,
+      handleSubmit,
+      getTitle,
+      roleOptions,
+      tenantLogo,
+      loading,
+    };
+  },
+});
+</script>
+<style scoped lang="less">
+:deep(.vben-basic-tree) {
+  width: 100% !important;
+}
+
+:deep(.is-unflod) {
+  display: none !important;
+}
+
+:deep(.is-flod) {
+  display: none !important;
+}
+
+.basic-info-title {
+  height: 19px;
+  line-height: 18px;
+  padding-left: 6px;
+  margin-left: 20px;
+  border-left: 3px solid #0671dd;
+  font-family: Source Han Sans CN;
+  font-size: 16px;
+  font-weight: 350;
+  letter-spacing: 0px;
+}
+
+:deep(.ant-calendar-picker) {
+  width: 100% !important;
+}
+</style>

src/views/resource/examine/index.vue

@@ -70,7 +70,7 @@
           }}
         </template> -->
       </BasicTable>
-      <check v-if="ischect" @register="registerModal" @success="handleSuccess" />
+      <!-- <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="registerModal"
@@ -78,6 +78,14 @@
       <file-resource-upload v-if="!ischect && current === 'DR'" @register="registerModal"
         @success="handleSuccess"></file-resource-upload>
       <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>
@@ -253,6 +261,7 @@ export default defineComponent({
           record: result,
           isUpdate: true,
           isView: true,
+          isCheck: false,
         });
       }
     }
@@ -260,15 +269,31 @@ export default defineComponent({
     /**
      * 审核
      */
-    function handleEdit(record: Recordable) {
+    async function handleEdit(record: Recordable) {
       ischect.value = true;
-      setTimeout(() => {
+      if(!record?.BUSSID) return;
+      // setTimeout(() => {
+      //   openModal(true, {
+      //     record,
+      //     isUpdate: true,
+      //     isCheck: true,
+      //   });
+      //   appStore.setRouterPushAuditFlag(false)
+      // }, 100);
+      const res = (await queryResourceById(record?.SERVICEID)) as any;
+      if (res) {
+        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});
+        if (record.bussid) res.bussid = record.BUSSID;
         openModal(true, {
-          record,
+          record: result,
           isUpdate: true,
+          isView: true,
+          isCheck: true,
         });
-        appStore.setRouterPushAuditFlag(false)
-      }, 100);
+      }
     }
     /**
      * 浏览
@@ -315,6 +340,7 @@ export default defineComponent({
     function handleSuccess() {
       openModal(false, {
         isUpdate: false,
+        isCheck: false,
       });
       reload();
     }