Browse Source

修改流程审核

tengmingxue 2 năm trước cách đây
mục cha
commit
6adbe64587

+ 1 - 2
src/api/resource/files.ts

@@ -2,7 +2,7 @@
  * @Author: tengmingxue 1473375109@qq.com
  * @Date: 2023-08-15 11:20:48
  * @LastEditors: tengmingxue 1473375109@qq.com
- * @LastEditTime: 2023-08-25 10:40:29
+ * @LastEditTime: 2023-08-30 13:49:12
  * @FilePath: \xld-gis-admin\src\api\resource\scene.ts
  * @Description: 文件资源接口
  */
@@ -26,7 +26,6 @@ export function list() {
         defHttp.post({ url: Api.Login, params: formData, ...interfaceType })
             .then((r) => {
                 let result = r.result === '' ? {} : JSON.parse(r.result)
-                console.log('文件资源数据',result)
                 resolve(result);
             })
     })

+ 72 - 28
src/views/dataAdmin/dataAdmin/configProcess/AddProcess.vue

@@ -21,7 +21,11 @@
           <div class="title">基本信息</div>
           <div class="form-continer">
             <a-form-item label="业务类型" name="type">
-              <a-select v-model:value="formState.type" placeholder="请选择业务类型">
+              <a-select
+                v-model:value="formState.type"
+                placeholder="请选择业务类型"
+                :disabled="getTitle === '查看流程配置'"
+              >
                 <template v-for="item in dicBusiness" :key="item.value">
                   <a-select-option :value="item.value">{{ item.label }}</a-select-option>
                 </template>
@@ -34,11 +38,13 @@
           <div class="form-continer">
             <div class="left-continer">
               <a-table
-                v-if="dataSource.length > 0"
+                v-if="formState.steps.length > 0"
                 bordered
-                :data-source="dataSource"
+                rowKey="xh"
+                :data-source="formState.steps"
                 :columns="pColumns"
                 :pagination="false"
+                :customRow="customRow"
                 style="height: 100%"
               >
                 <template #operation="{ record }">
@@ -47,7 +53,11 @@
               </a-table>
             </div>
             <div class="right-continer">
-              <add-step-form :currStep="currStep" @editStep="updateStep"></add-step-form>
+              <add-step-form
+                :currStep="currStep"
+                @editStep="updateStep"
+                @reduceStep="reduceStep"
+              ></add-step-form>
             </div>
           </div>
         </div>
@@ -64,7 +74,6 @@ import {
   unref,
   reactive,
   onMounted,
-  watch,
   UnwrapRef,
   toRaw,
   nextTick,
@@ -73,13 +82,17 @@ import { BasicModal, useModalInner } from '/@/components/Modal';
 import { BasicForm, useForm } from '/@/components/Form/index';
 import { accountFormSchema, accountFormSchema2, busType, stepColumns } from './configData';
 import { useMessage } from '/@/hooks/web/useMessage';
-import { cloneDeep } from 'lodash-es';
-import { addFileResource } from '../../api/fileUploadApi';
 import AddStepForm from './addStepForm.vue';
-
+interface StepInfo {
+  xh: number;
+  name: string;
+  model: string;
+  dept: string[];
+  user: string[];
+}
 interface FormState {
   type: string;
-  steps: Object[];
+  steps: StepInfo[];
 }
 export default defineComponent({
   name: 'AccountModal',
@@ -94,10 +107,10 @@ export default defineComponent({
     let show1 = ref(true);
     const isUpdate = ref(true);
     const rowId = ref('');
-    const postData = reactive({});
+    const postData = ref(null);
     const formState: UnwrapRef<FormState> = reactive({
       type: '',
-      steps: [],
+      steps: ref([{ xh: 1, name: '', model: 'update', dept: [], user: [] }]),
     });
     const rules = {
       type: [{ required: true, message: '请选择业务类型', trigger: 'change' }],
@@ -105,9 +118,10 @@ export default defineComponent({
     };
     const dicBusiness = busType;
     const pColumns = stepColumns;
-    let currStep = ref({ xh: 1, name: '', code: '' });
-    const dataSource = [{ xh: 1, name: '', code: 'update' }];
-    onMounted(async () => {});
+    const currStep = ref(null);
+    onMounted(async () => {
+      //判断当前类型是否新增
+    });
     const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
       labelWidth: 100,
       schemas: show1 ? accountFormSchema : accountFormSchema2,
@@ -121,23 +135,20 @@ export default defineComponent({
       await resetFields();
       setModalProps({ confirmLoading: false });
       isUpdate.value = !!data?.isUpdate;
+      postData.value = data?.record ? data?.record : null;
       if (unref(isUpdate)) {
         rowId.value = data.record.id;
         setFieldsValue(data.record);
       }
     });
-    const getTitle = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
 
+    const getTitle = computed(() =>
+      !unref(isUpdate) ? (unref(postData) ? '查看流程配置' : '新增流程配置') : '编辑流程配置'
+    );
     async function handleSubmit() {
       setModalProps({ confirmLoading: true });
       try {
         const { createMessage } = useMessage();
-        const values = await validate(['parentId']);
-        Object.assign(postData, values);
-
-        console.log('准备传递的参数' + JSON.stringify(postData));
-
-        await addFileResource(paramsToFormData(postData as any), unref(isUpdate));
         closeModal();
         emit('success');
         createMessage.success(unref(isUpdate) ? '编辑成功' : '新增成功');
@@ -147,6 +158,7 @@ export default defineComponent({
         }, 300);
       }
     }
+
     function preProcessData(data) {
       Object.keys(data).forEach((item) => {
         if (typeof data[item] === 'undefined' || data[item] === null || data[item] === '') {
@@ -175,19 +187,34 @@ export default defineComponent({
      * 编辑步骤
      */
     const editStep = (row) => {
-      console.log('编辑步骤', row);
-      currStep = row;
+      currStep.value = row;
     };
 
     const updateStep = (row) => {
       nextTick(() => {
-        dataSource.forEach((item) => {
-          if (item.xh === row.xh) item.name = row.name;
-        });
-        console.log('数据改变了', dataSource);
+        const obj = formState.steps.find((item) => item.xh === row.xh);
+        if (obj) {
+          formState.steps.forEach((item) => {
+            if (item.xh === row.xh) {
+              for (const key in row) {
+                item[key] = row[key];
+              }
+            }
+          });
+        } else {
+          formState.steps.push(row);
+        }
       });
     };
 
+    const reduceStep = (row) => {
+      const obj = formState.steps.find((item) => item.xh === row.xh);
+      const index = formState.steps.indexOf(obj as any);
+      if (index > -1) formState.steps.splice(index, 1);
+      //当前数据显示最后一个
+      currStep.value = formState.steps[formState.steps.length - 1];
+    };
+
     const onSubmit = () => {
       formRef.value
         .validate()
@@ -202,14 +229,30 @@ export default defineComponent({
       formRef.value.resetFields();
     };
 
+    const customRow = (record, index) => {
+      return {
+        on: {
+          // 鼠标单击行
+          click: (event) => {
+            debugger
+            event.currentTarget.parentNode.querySelectorAll('tr').forEach((item) => {
+              item.style.background = 'white';
+            });
+            event.currentTarget.style.background = 'green';
+          },
+        },
+      };
+    };
+
     return {
+      postData,
       formRef,
       formState,
       rules,
       dicBusiness,
       pColumns,
       currStep,
-      dataSource,
+      customRow,
       registerModal,
       registerForm,
       handleSubmit,
@@ -219,6 +262,7 @@ export default defineComponent({
       resetForm,
       editStep,
       updateStep,
+      reduceStep,
     };
   },
 });

+ 113 - 26
src/views/dataAdmin/dataAdmin/configProcess/addStepForm.vue

@@ -2,7 +2,7 @@
  * @Author: tengmingxue 1473375109@qq.com
  * @Date: 2023-08-29 16:44:32
  * @LastEditors: tengmingxue 1473375109@qq.com
- * @LastEditTime: 2023-08-29 22:21:07
+ * @LastEditTime: 2023-08-30 17:04:36
  * @FilePath: \xld-gis-admin\src\views\dataAdmin\dataAdmin\configProcess\addStepForm.vue
  * @Description: 流程步骤配置表单
 -->
@@ -11,7 +11,6 @@
     ref="formRef"
     :model="formState"
     :rules="formState.xh === 1 ? rules1 : rules"
-    style="height: 100%"
     class="step-form"
   >
     <a-form-item
@@ -40,7 +39,7 @@
       :labelCol="{ span: 4 }"
       :wrapper-col="{ span: 12 }"
     >
-      <a-input v-model:value="formState.name" />
+      <a-input v-model:value="formState.name" @change="stepInfoChange" />
     </a-form-item>
     <a-form-item
       v-if="formState.xh !== 1"
@@ -50,7 +49,7 @@
       :labelCol="{ span: 4 }"
       :wrapper-col="{ span: 12 }"
     >
-      <a-radio-group v-model:value="formState.model">
+      <a-radio-group v-model:value="formState.model" @change="stepInfoChange">
         <a-radio value="1">逐级</a-radio>
         <a-radio value="2">并行</a-radio>
       </a-radio-group>
@@ -67,6 +66,7 @@
         v-model:value="formState.dept"
         placeholder="请选择处理部门"
         mode="multiple"
+        @change="stepInfoChange"
         style="width: 100%"
       >
         <a-select-option value="1">部门1</a-select-option>
@@ -85,27 +85,32 @@
         v-model:value="formState.user"
         placeholder="请选择处理人员"
         mode="multiple"
+        @change="stepInfoChange"
         style="width: 100%"
       >
-        <a-select-option value="1">人员1</a-select-option>
-        <a-select-option value="2">人员2</a-select-option>
+        <template v-for="user in handlers" :key="user.userid">
+          <a-select-option :value="user.userid">{{ user.username }}</a-select-option>
+        </template>
       </a-select>
     </a-form-item>
+    <a-table
+      v-if="formState.user.length > 0"
+      bordered
+      :data-source="userList"
+      :columns="columns"
+      :pagination="false"
+      style="height: 100%"
+    >
+      <template #operation="{ record }">
+        <a v-if="record.xh !== 1" style="color: #2d74e7;margin: 10px;" @click="moveClick(-1,record)">上移</a>
+        <a v-if="record.xh < userList.length" style="color: #2d74e7;margin: 10px;" @click="moveClick(1,record)">下移</a>
+      </template>
+    </a-table>
   </a-form>
 </template>
 <script lang="ts">
-import {
-  defineComponent,
-  ref,
-  computed,
-  unref,
-  reactive,
-  onMounted,
-  watch,
-  UnwrapRef,
-  toRaw,
-  nextTick,
-} from 'vue';
+import { defineComponent, ref, reactive, onMounted, watch, UnwrapRef, toRaw } from 'vue';
+import { cloneDeep } from 'lodash-es';
 import { DeleteOutlined } from '@ant-design/icons-vue';
 import { ValidateErrorEntity } from 'ant-design-vue/es/form/interface';
 const props = {
@@ -125,6 +130,33 @@ export default defineComponent({
   setup(props, { emit }) {
     let currStep = ref(props.currStep);
     const formRef = ref();
+    const columns = [
+      {
+        title: '处理顺序',
+        dataIndex: 'xh',
+        width: '30%',
+        align: 'center',
+      },
+      {
+        title: '人员',
+        dataIndex: 'username',
+        width: '40%',
+        align: 'center',
+      },
+      {
+        title: '操作',
+        dataIndex: 'operation',
+        width: '30%',
+        align: 'center',
+        slots: { customRender: 'operation' },
+      },
+    ];
+    const handlers = [
+      { userid: '001', username: '张三' },
+      { userid: '002', username: '王维' },
+      { userid: '003', username: '李白' },
+    ];
+    const userList = ref([]);
     const formState: UnwrapRef<FormState> = reactive({
       xh: 1,
       name: '',
@@ -135,8 +167,8 @@ export default defineComponent({
     const rules = {
       name: [{ required: true, message: '请填写步骤名称', trigger: 'blur' }],
       model: [{ required: true, message: '请选择处理模式', trigger: 'change' }],
-      dept: [{ required: true, message: '请选择处理部门', trigger: 'change' }],
-      user: [{ required: true, message: '请选择处理人员', trigger: 'change' }],
+      dept: [{ required: true, message: '请选择处理部门', trigger: 'change', type: 'array' }],
+      user: [{ required: true, message: '请选择处理人员', trigger: 'change', type: 'array' }],
     };
     const rules1 = {
       name: [{ required: true, message: '请填写步骤名称', trigger: 'blur' }],
@@ -145,19 +177,36 @@ export default defineComponent({
     watch(
       () => props.currStep,
       (obj) => {
-        currStep = obj;
+        currStep.value = obj;
+        formState.xh = currStep.value?.xh;
+        formState.name = currStep.value?.name;
+        formState.model = currStep.value?.model;
+        formState.dept = currStep.value?.dept;
+        formState.user = currStep.value?.user;
       }
     );
 
     watch(
-      () => formState.name,
-      (nVal) => {
-        //名字改变回显
-        emit('editStep', formState);
+      () => formState.user,
+      (list) => {
+        userList.value = []
+        list.map((item, index) => {
+          const obj = handlers.find((user) => user.userid === item);
+          if (obj) {
+            obj['xh'] = index + 1;
+            userList.value.push(obj);
+          }
+        });
       }
     );
+    /**
+     * 信息内容改变
+    */
+    const stepInfoChange = () => {
+      emit('editStep', formState);
+    };
+
     const stepEdit = (flag) => {
-      console.log('编辑步骤', flag);
       if (flag === 1) {
         formRef.value
           .validate()
@@ -169,12 +218,43 @@ export default defineComponent({
             formState.model = '1';
             formState.dept = [];
             formState.user = [];
+            const stepInfo = cloneDeep({
+              xh: formState.xh,
+              name: '',
+              model: '',
+              dept: [],
+              user: [],
+            });
+            emit('editStep', stepInfo);
           })
           .catch((error: ValidateErrorEntity<FormState>) => {
             console.log('校验失败', error);
           });
       }
+      if (flag === -1) {
+        //删除当前数据
+        emit('reduceStep', cloneDeep(formState));
+      }
     };
+
+    /**
+     * 审核顺序改变
+    */
+    const moveClick = (flag,row) => {
+      //1、修改顺序
+      const obj = userList.value.find((item) => item.xh === row.xh);
+      const index = userList.value.indexOf(obj);
+      if(index < 0) return
+      const temp = cloneDeep(userList.value[index])
+      const increment = flag
+      userList.value[index] = cloneDeep(userList.value[index + increment])
+      userList.value[index + increment] = cloneDeep(temp)
+      //2、重新生成序号
+      userList.value.forEach((item,index)=>{
+        item['xh'] = index + 1
+      })
+    };
+
     onMounted(async () => {});
 
     return {
@@ -182,14 +262,21 @@ export default defineComponent({
       formState,
       rules,
       rules1,
+      handlers,
+      columns,
+      userList,
       stepEdit,
       currStep,
+      stepInfoChange,
+      moveClick,
     };
   },
 });
 </script>
 <style scoped lang="less">
 .step-form {
+  height: 100%;
+  overflow: auto;
   .btn-group {
     float: left;
     height: 30px;

+ 23 - 7
src/views/dataAdmin/dataAdmin/configProcess/index.vue

@@ -30,7 +30,7 @@
           :actions="[
             {
               label: '查看',
-              onClick: handleEdit.bind(null, record),
+              onClick: handleView.bind(null, record),
             },
             {
               label: '编辑',
@@ -144,18 +144,33 @@ export default defineComponent({
     nextTick(() => {
       setProps(selectionOptions);
     });
-    // 新增
+
+    /**
+     * 新增
+    */
     function addMethod() {
       openModal(true, {
         isUpdate: false,
       });
     }
-    // 编辑
+
+    /**
+     * 查看
+    */
+    function handleView(record){
+      openModal(true, {
+        record,
+        isUpdate: false,
+      });
+    }
+    /**
+     * 编辑
+    */
     function handleEdit(record) {
-      // openDrawer(true, {
-      //   record,
-      //   isUpdate: true,
-      // });
+      openModal(true, {
+        record,
+        isUpdate: true,
+      });
     }
 
     function changeCheck(row) {
@@ -168,6 +183,7 @@ export default defineComponent({
       authList,
       registerTable,
       addMethod,
+      handleView,
       handleEdit,
       handleSuccess,
       hasBatchDelete,

+ 67 - 0
src/views/dataAdmin/dataAdmin/flowStep/flowData.ts

@@ -0,0 +1,67 @@
+export const columns = [
+    {
+      title: '资源类型',
+      dataIndex: 'resourceNumber',
+      width: 100,
+    },
+    {
+        title: '资源名称',
+        dataIndex: 'resourceName',
+        width: 100,
+      },
+      {
+        title: '发布人',
+        dataIndex: 'publisher',
+        width: 100,
+      },
+      {
+        title: '发布时间',
+        dataIndex: 'publisherTime',
+        width: 100,
+      },
+      {
+        title: '审核人',
+        dataIndex: 'reviewer',
+        width: 100,
+      },
+      {
+        title: '审核时间',
+        dataIndex: 'reviewTime',
+        width: 100,
+      },
+      {
+        title: '审核状态',
+        dataIndex: 'auditStatus',
+        width: 100,
+      },
+      {
+        title: '审核意见',
+        dataIndex: 'auditStatus',
+        width: 100,
+      },
+];
+
+export const searchFormSchema = [
+  {
+    field: 'resourceName',
+    label: '关键字',
+    component: 'Input',
+    colProps: { span: 6 },
+    componentProps: {
+      maxLength: 255,
+    },
+  },
+  {
+    field: 'auditStatus',
+    label: '审核状态',
+    component: 'Select',
+    componentProps: {
+      options: [
+        { label: '审核不通过', value: 2 },
+        { label: '审核中', value: 1 },
+        { label: '审核通过', value: 0 },
+      ],
+    },
+    colProps: { span: 6 },
+  },
+]

+ 239 - 0
src/views/dataAdmin/dataAdmin/flowStep/index.vue

@@ -0,0 +1,239 @@
+<!--
+ * @Author: tengmingxue 1473375109@qq.com
+ * @Date: 2023-08-30 17:25:03
+ * @LastEditors: tengmingxue 1473375109@qq.com
+ * @LastEditTime: 2023-08-30 23:18:14
+ * @FilePath: \xld-gis-admin\src\views\dataAdmin\dataAdmin\flowStep\index.vue
+ * @Description: 流程图表
+-->
+<template>
+  <div class="flow-chart">
+    <div class="flow-title">{{ flowTitle }}</div>
+    <div class="flow-code">
+      <span>流程编号:</span>
+      <span>{{ flowCode }}</span>
+    </div>
+    <div class="legend">
+      <template v-for="legend in legends" :key="legend.key">
+        <div class="item-list">
+          <span class="item-span-legend" :style="`background-color:${legend.color};`"></span>
+          <span class="item-span">{{ legend.name }}</span>
+        </div>
+      </template>
+    </div>
+    <div class="flow">
+      <a-steps>
+        <template v-for="(step, index) in steps" :key="step.xh">
+          <!-- status 1:已完成,2:进行中,3:驳回,0:未开始 -->
+          <a-step :status="status[step.status]">
+            <template #icon>
+              <div class="cicle-out">
+                <div class="cicle" style="border: 2px solid #67c23a">{{ index + 1 }}</div>
+              </div>
+            </template>
+            <template #description>
+              <div class="desc-step-name">{{ step.stepName }}</div>
+              <div class="desc-handler">
+                <template v-for="user in step.handlers" :key="user.id">
+                  <span class="handler-name">{{ user.handler }}</span>
+                </template>
+              </div>
+            </template>
+          </a-step>
+        </template>
+      </a-steps>
+    </div>
+  </div>
+</template>
+<script>
+import { defineComponent, ref, watch, reactive, onMounted, nextTick, toRefs } from 'vue';
+// 引入封装的table
+import { BasicTable, TableAction, useTable } from '/@/components/Table';
+// 引入封装的权限识别
+import { Authority } from '/@/components/Authority';
+// 引入搜索框和表格表头
+import { columns, searchFormSchema } from './flowData';
+// 引入删除
+import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+import { message, Popconfirm } from 'ant-design-vue';
+const props = {
+  flowTitle: { type: String, require: true },
+  flowCode: { type: String, default: '' },
+};
+export default defineComponent({
+  components: { BasicTable, Authority, Popconfirm, TableAction },
+  props,
+  setup(props, { emit }) {
+    const data = reactive({
+      flowTitle: ref(props.flowTitle),
+      flowCode: ref(props.flowCode),
+      legends: [
+        { key: 1, name: '已完成', color: '#67C23A' },
+        { key: 2, name: '进行中', color: '#2D74E7' },
+        { key: 3, name: '驳回', color: '#E6A23C' },
+        { key: 4, name: '未开始', color: '#989898' },
+      ],
+      status: ['wait', 'finish', 'process', 'back'],
+      steps: [
+        //status 1:已完成,2:进行中,3:驳回,0:未开始
+        {
+          xh: '1',
+          stepName: '地图资源上传',
+          handlers: [{ handler: '张三', id: '1' }],
+          status: '1',
+        },
+        {
+          xh: '2',
+          stepName: '审核1',
+          handlers: [
+            { handler: '张三', id: '1' },
+            { handler: '李斯', id: '2' },
+          ],
+          status: '1',
+        },
+        {
+          xh: '3',
+          stepName: '审核2',
+          handlers: [
+            { handler: '张三', id: '1' },
+            { handler: '李斯', id: '2' },
+          ],
+          status: '2',
+        },
+        { xh: '4', stepName: '审核3', handlers: [{ handler: '张三', id: '1' }], status: '3' },
+        {
+          xh: '5',
+          stepName: '审核4',
+          handlers: [
+            { handler: '张三', id: '1' },
+            { handler: '李斯', id: '2' },
+          ],
+          status: '0',
+        },
+        { xh: '6', stepName: '完成', handlers: [], status: '0' },
+      ],
+    });
+
+    // 生命周期函数
+    onMounted(() => {});
+
+    return {
+      ...toRefs(data),
+    };
+  },
+});
+</script>
+  
+  <style lang="scss" scoped>
+.flow-chart {
+  height: 100%;
+  .flow-title {
+    width: 100%;
+    height: 40px;
+    line-height: 40px;
+    text-align: center;
+    font-family: Source Han Sans CN;
+    font-size: 20px;
+    font-weight: 300;
+    letter-spacing: 0px;
+    color: #2d74e7;
+  }
+  .flow-code {
+    height: 20px;
+    text-align: center;
+    font-family: Source Han Sans CN;
+    font-size: 16px;
+    font-weight: 300;
+    letter-spacing: 0px;
+    color: rgba(0, 0, 0, 0.6);
+    margin-bottom: 20px;
+  }
+
+  .legend {
+    position: absolute;
+    right: 0;
+    top: 53px;
+    height: 100px;
+    width: 72px;
+    .item-list {
+      margin: 4px 0;
+      display: flex;
+      align-items: center;
+      .item-span-legend {
+        display: flex;
+        height: 10px;
+        width: 10px;
+        margin-right: 10px;
+      }
+      .item-span {
+        font-family: Source Han Sans CN;
+        font-size: 12px;
+        font-weight: 300;
+        line-height: normal;
+        letter-spacing: 0px;
+        color: #333333;
+      }
+    }
+  }
+
+  .flow {
+    height: 200px;
+    width: 100%;
+    padding: 0 20px;
+
+    :deep(.ant-steps) {
+      height: 100%;
+      .ant-steps-item {
+        margin-right: 0px !important;
+        height: 100%;
+        .ant-steps-item-container {
+          margin-top: 20px;
+          height: 100%;
+          .ant-steps-item-content {
+            height: 100%;
+            margin-top: 20px;
+            .ant-steps-item-description {
+              margin-top: -30px;
+              margin-left: -15px;
+              height: 100%;
+              .desc-step-name {
+                margin-top: 4px;
+              }
+              .desc-handler {
+                margin-top: 38px;
+                .handler-name {
+                  display: flex;
+                  float: left;
+                  height: 50px;
+                  line-height: 50px;
+                  width: 58px;
+                  margin-right: 6px;
+                  justify-content: center;
+                  color: #fff;
+                  background-color: #2d74e7;
+                  border-radius: 6px;
+                }
+              }
+            }
+          }
+          .ant-steps-item-icon {
+            margin-right: -15px;
+            margin-top: 20px;
+            .cicle-out {
+              height: 50px;
+              width: 30px;
+              .cicle {
+                height: 30px;
+                width: 30px;
+                line-height: 24px;
+                border-radius: 50%;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>
+  

+ 6 - 4
src/views/dataAdmin/dataAdmin/mapUpload/MapSourceModal.vue

@@ -2,7 +2,7 @@
  * @Author: tengmingxue 1473375109@qq.com
  * @Date: 2023-08-15 16:19:10
  * @LastEditors: tengmingxue 1473375109@qq.com
- * @LastEditTime: 2023-08-28 13:57:55
+ * @LastEditTime: 2023-08-30 18:21:07
  * @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
 -->
@@ -20,8 +20,8 @@
           <!-- <BasicForm @register="registerForm"></BasicForm> -->
           <source-detail ref="refSourceDetail" @RtnMain="RtnMain" :formData="formData" :isUpdate="isUpdate" :isView="isView"></source-detail>
         </a-tab-pane>
-        <a-tab-pane key="2" tab="流程信息" force-render>
-          <div class="tab2"></div>
+        <a-tab-pane key="2" tab="流程信息">
+          <FlowStep :flowTitle="'地图资源上传流程信息'" :flowCode="'20220523001'"></FlowStep>
         </a-tab-pane>
       </a-tabs>
     </div>
@@ -34,6 +34,7 @@ import { BasicForm, useForm } from '/@/components/Form/index';
 import { BasicTree } from '/@/components/Tree';
 import { PlusOutlined } from '@ant-design/icons-vue';
 import SourceDetail from './SourceDetail.vue';
+import FlowStep from '../flowStep/index.vue'
 
 export default defineComponent({
   name: 'AccountModal',
@@ -43,13 +44,14 @@ export default defineComponent({
     BasicTree,
     PlusOutlined,
     SourceDetail,
+    FlowStep,
     VNodes: (_, { attrs }) => {
       return attrs.vnodes;
     },
   },
   emits: ['success', 'register'],
   setup(_, { emit }) {
-    let activeKey = '1';
+    const activeKey = ref('1');
     const refSourceDetail = ref(null);
     let formData = ref(null)
     let isUpdate = ref(true);