修改流程配置

src/api/resource/examine.ts

@@ -2,7 +2,7 @@
  * @Author: tengmingxue 1473375109@qq.com
  * @Date: 2023-09-11 19:36:34
  * @LastEditors: tengmingxue 1473375109@qq.com
- * @LastEditTime: 2023-09-20 15:34:53
+ * @LastEditTime: 2023-09-21 14:51:09
  * @FilePath: \xld-gis-admin\src\api\resource\examine.ts
  * @Description: 流程配置信息api
  */
@@ -22,13 +22,13 @@ enum Api {
  * @param: keyStr:模糊查询关键字
  * @param: id:流程id
  */
-export const queryFlowInfo = (params) => {
-    params['row'] = params?.pageSize ? params?.pageSize : 10
+export const queryFlowInfoPage = (params) => {
+    params['rows'] = params?.pageSize ? params?.pageSize : 10
     return new Promise<void>((resolve) => {
         defHttp.post({ url: Api.SelectFlowInfo, params: params }).then((res) => {
-            const result = res.resp_code === 0 ? res.datas : []
+            const result = res.resp_code === 0 ? res.datas.pageData: []
             result.forEach(item => {
-                item['status'] = true
+                item['id'] = item['ID']
             });
             resolve(result)
         })
@@ -58,6 +58,28 @@ export const queryFlowInfoById = (param) => {
 }
 
 
+
+
+/**
+ * @description：根据流程业务查询流程配置所有信息
+ * @param: ids：字符串数组
+*/
+export const queryFlowInfo = (params) => {
+    return new Promise<void>((resolve) => {
+        defHttp.post({
+            url: Api.SelectLowConfig,
+            params,
+            headers: {
+                'Content-Type': 'application/json;charset=UTF-8'
+            },
+        }).then((res) => {
+            const result = (res.resp_code === 0) ? res.datas : null
+            resolve(result)
+        })
+    })
+}
+
+
 /**
  * @description: 一次提交流程配置信息
  * @param: flowInfo:流程信息              must

src/views/dataAdmin/dataAdmin/configProcess/AddProcess.vue

@@ -49,14 +49,18 @@
                 style="height: 100%"
               >
                 <template #operation="{ record }">
-                  <a style="color: #2d74e7" @click="editStep(record)" v-if="record.xh !== 1">编辑</a>
-                  <a style="color: #9b9c9e"  v-else>编辑</a>
+                  <a style="color: #2d74e7" @click="editStep(record)" v-if="record.xh !== 1"
+                    ><span v-if="optType !== 3">编辑</span><span v-else>查看</span></a
+                  >
+                  <a style="color: #9b9c9e" v-else>编辑</a
+                  >
                 </template>
               </a-table>
             </div>
             <div class="right-continer">
               <add-step-form
                 :currStep="currStep"
+                :optType="optType"
                 @editStep="updateStep"
                 @reduceStep="reduceStep"
                 ref="addStepForm"
@@ -131,14 +135,14 @@ export default defineComponent({
     const formRef = ref();
     let show1 = ref(true);
     const isUpdate = ref(true);
-    const optType = ref(1);  //操作类型  1：新增，2：修改 3:查看
+    const optType = ref(1); //操作类型  1：新增，2：修改 3:查看
     const rowId = ref('');
-    const currVersion = ref(0);   //当前版本
+    const currVersion = ref(0); //当前版本
     const postData = ref(null);
     const formState = reactive({
       type: '',
       name: '',
-      steps: ref([{ xh: 1, name: '', model: 'update', dept: [], user: [],userList:[] }]),
+      steps: ref([{ xh: 1, name: '', model: 'update', dept: [], user: [], userList: [] }]),
     });
 
     const rules = {
@@ -151,9 +155,7 @@ export default defineComponent({
     const addStepForm = ref(null);
     const { createMessage } = useMessage();
 
-    onMounted(() => {
-      
-    });
+    onMounted(() => {});
     const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
       labelWidth: 100,
       schemas: show1 ? accountFormSchema : accountFormSchema2,
@@ -170,21 +172,21 @@ export default defineComponent({
       postData.value = data?.record ? data.record : null;
       //修改
       if (isUpdate.value) {
-        optType.value = 2;  //操作类型  1：新增，2：修改 3:查看
-        rowId.value = data.record.id; 
+        optType.value = 2; //操作类型  1：新增，2：修改 3:查看
+        rowId.value = data.record.id;
         //setFieldsValue(data.record);
-        setFormdata()
-      }
-      else{
-        if(postData.value){    //查看
+        setFormdata();
+      } else {
+        if (postData.value) {
+          //查看
           optType.value = 3;
           //setFieldsValue(data.record);
-          setFormdata()
-        }
-        else{ //新增
+          setFormdata();
+        } else {
+          //新增
           optType.value = 1;
           //初始化
-          clearFormData()
+          clearFormData();
         }
       }
     });
@@ -194,30 +196,36 @@ export default defineComponent({
     );
     /**
      * 根据查询的接口数据设置表单数据
-    */
+     */
     const setFormdata = async () => {
-      if(postData.value){
-        const flowInfo =  (postData.value as any).flowInfo
-        const flowNode =  (postData.value as any).flowNode
-        const flowNodePerson = (postData.value as any).flowNodePerson
-        currVersion.value = parseInt(flowInfo?.VERSION ? flowInfo?.VERSION : 0)   //获取当前本版
-        const dbs = dicBusiness.find(item=>item.label === flowInfo['FLOWNAME'])
-        formState.type = dbs? dbs.value : '0'
-        formState.name = flowInfo['FLOWNAME']
-        formState.steps = [{ xh: 1, name: flowInfo['FLOWNAME'], model: '1', dept: [], user: [],userList:[] }]
-        flowNode.map((item,index)=>{
-          const user = flowNodePerson.filter(fp=>item['ID']===fp['FLOWNODEID'])
+      if (postData.value) {
+        const flowInfo = (postData.value as any).flowInfo;
+        const flowNode = (postData.value as any).flowNode;
+        const flowNodePerson = (postData.value as any).flowNodePerson;
+        currVersion.value = parseInt(flowInfo?.VERSION ? flowInfo?.VERSION : 0); //获取当前本版
+        const dbs = dicBusiness.find((item) => item.label === flowInfo['FLOWNAME']);
+        formState.type = dbs ? dbs.value : '0';
+        formState.name = flowInfo['FLOWNAME'];
+        formState.steps = [
+          { xh: 1, name: flowInfo['FLOWNAME'], model: '1', dept: [], user: [], userList: [] },
+        ];
+        flowNode.map((item, index) => {
+          const user = flowNodePerson.filter((fp) => item['ID'] === fp['FLOWNODEID']);
           formState.steps.push({
-            xh:index+2,
-            name:item['NODENAME'],
-            model: '1', 
-            dept: item['DEPTS'].split(','), 
-            user: user ? user.map(u=>{return u['USERID']}) : [],
-            userList:[]
-          })
-        })
+            xh: index + 2,
+            name: item['NODENAME'],
+            model: '1',
+            dept: item['DEPTS'].split(','),
+            user: user
+              ? user.map((u) => {
+                  return u['USERID'];
+                })
+              : [],
+            userList: [],
+          });
+        });
 
-        currStep.value = formState.steps[0]
+        currStep.value = formState.steps[0];
       }
     };
 
@@ -285,7 +293,7 @@ export default defineComponent({
 
     /**
      * 修改步骤
-    */
+     */
     const updateStep = (row) => {
       nextTick(() => {
         const obj = formState.steps.find((item) => item.xh === row.xh);
@@ -330,22 +338,21 @@ export default defineComponent({
         emit('success');
         createMessage.success(unref(isUpdate) ? '编辑成功' : '新增成功');
         //清理数据
-        clearFormData()
-      }
-      else{
-        createMessage.error('数据提交失败!失败原因：'+res.resp_msg)
+        clearFormData();
+      } else {
+        createMessage.error('数据提交失败!失败原因：' + res.resp_msg);
       }
     };
     /**
      * 清空数据
-    */
+     */
     const clearFormData = () => {
-      resetForm()
-      formState.type = ''
-      formState.name = ''
-      formState.steps = [{ xh: 1, name: '', model: 'update', dept: [], user: [],userList:[] }]
+      resetForm();
+      formState.type = '';
+      formState.name = '';
+      formState.steps = [{ xh: 1, name: '', model: 'update', dept: [], user: [], userList: [] }];
       currStep.value = null;
-      (addStepForm.value as any)?.clearFormData()
+      (addStepForm.value as any)?.clearFormData();
     };
 
     /**
@@ -359,7 +366,7 @@ export default defineComponent({
         flowdiscription: '',
         flowname: formData.name,
         id: flowId,
-        version:optType.value === 1 ? 0 : currVersion.value + 1,
+        version: optType.value === 1 ? 0 : currVersion.value + 1,
       };
       //排除第一个
       const steps = formData.steps.value.filter((step) => step.xh !== 1);
@@ -459,7 +466,7 @@ export default defineComponent({
     };
 
     const customRow = (record, index) => {
-      console.log(record, index)
+      console.log(record, index);
       return {
         on: {
           // 鼠标单击行

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-09-21 09:17:05
+ * @LastEditTime: 2023-09-21 17:21:11
  * @FilePath: \xld-gis-admin\src\views\dataAdmin\dataAdmin\configProcess\addStepForm.vue
  * @Description: 流程步骤配置表单
 -->
@@ -27,7 +27,7 @@
         :disabled="true"
         style="width: 50px; float: left"
       />
-      <div class="btn-group">
+      <div class="btn-group" v-show="optType !== 3">
         <span class="addBtn btn" @click="stepEdit(1)">+</span>
         <span class="redBtn btn" @click="stepEdit(-1)">-</span>
       </div>
@@ -42,7 +42,7 @@
       <a-input
         v-model:value="formState.name"
         @change="stepInfoChange"
-        :disabled="formState.xh === 1"
+        :disabled="formState.xh === 1 || optType === 3"
       />
     </a-form-item>
     <a-form-item
@@ -53,7 +53,11 @@
       :labelCol="{ span: 4 }"
       :wrapper-col="{ span: 12 }"
     >
-      <a-radio-group v-model:value="formState.model" @change="stepInfoChange">
+      <a-radio-group
+        v-model:value="formState.model"
+        @change="stepInfoChange"
+        :disabled="optType === 3"
+      >
         <a-radio value="1">逐级</a-radio>
         <a-radio value="2">并行</a-radio>
       </a-radio-group>
@@ -78,6 +82,7 @@
         multiple
         tree-default-expand-all
         @change="treeSelectChange"
+        :disabled="optType === 3"
       >
         <template #title="{ key, value }">
           <span style="color: #08c" v-if="key === '0-0-1'">Child Node1 {{ value }}</span>
@@ -97,6 +102,7 @@
         placeholder="请选择处理人员"
         mode="multiple"
         style="width: 100%"
+        :disabled="optType === 3"
       >
         <template v-for="user in handlers" :key="user.userid">
           <a-select-option :value="user['userId']">{{ user['userName'] }}</a-select-option>
@@ -112,18 +118,32 @@
       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 < formState.userList.length"
-          style="color: #2d74e7; margin: 10px"
-          @click="moveClick(1, record)"
-          >下移</a
-        >
+        <template v-if="optType !== 3">
+          <a
+            v-if="record.xh !== 1"
+            style="color: #2d74e7; margin: 10px"
+            @click="moveClick(-1, record)"
+            >上移</a
+          >
+          <a
+            v-if="record.xh < formState.userList.length"
+            style="color: #2d74e7; margin: 10px"
+            @click="moveClick(1, record)"
+            >下移</a
+          >
+        </template>
+        <template v-else>
+          <a
+            v-if="record.xh !== 1"
+            style="color: #9c9d9e; margin: 10px"
+            >上移</a
+          >
+          <a
+            v-if="record.xh < formState.userList.length"
+            style="color: #9c9d9e; margin: 10px"
+            >下移</a
+          >
+        </template>
       </template>
     </a-table>
   </a-form>
@@ -138,6 +158,7 @@ import { queryPersonByDepId } from '/@/api/sys/user';
 
 const props = {
   currStep: { type: Object, require: true },
+  optType: { type: Number, require: true },
 };
 interface FormState {
   xh: number;
@@ -153,6 +174,7 @@ export default defineComponent({
   props,
   setup(props, { emit }) {
     let currStep = ref(props.currStep);
+    const optType = ref(props.optType);
     const formRef = ref();
     const columns = [
       {
@@ -215,19 +237,26 @@ export default defineComponent({
       }
     );
 
+    watch(
+      () => props.optType,
+      (i) => {
+        optType.value = i;
+      }
+    );
+
     watch(
       () => formState.value.user,
       (list) => {
-        changeUserId(list)
+        changeUserId(list);
       }
     );
     /**
      * 用户改变
-    */
-    const changeUserId = async(ids) => {
+     */
+    const changeUserId = async (ids) => {
       formState.value.userList = [];
       if (!ids || ids.length < 1) return;
-      if(handlers.value.length === 0) await queryUsers(formState.value.dept)
+      if (handlers.value.length === 0) await queryUsers(formState.value.dept);
       ids.map((item, index) => {
         const obj = handlers.value.find((user) => user['userId'] === item) as any;
         if (obj) {
@@ -235,6 +264,7 @@ export default defineComponent({
           formState.value.userList.push(obj);
         }
       });
+      stepInfoChange();
     };
 
     /**
@@ -311,7 +341,7 @@ export default defineComponent({
     };
 
     const queryDept = async () => {
-      const res = await structureList() as any;
+      const res = (await structureList()) as any;
       if (res && res.length > 0) {
         treeData.value = dealData(res);
       }
@@ -322,7 +352,7 @@ export default defineComponent({
     const queryUsers = async (nodeIds) => {
       const formData = new FormData();
       formData.append('depId', nodeIds.toString());
-      const res = await queryPersonByDepId(formData) as any;
+      const res = (await queryPersonByDepId(formData)) as any;
       if (res && res.resp_code === 0) {
         //过滤userId不存在的
         handlers.value = res?.datas ? res?.datas : [];
@@ -331,11 +361,12 @@ export default defineComponent({
     };
 
     const treeSelectChange = async (nodeIds, nodeNames, nodes) => {
-       console.log('选择部门',nodeIds,nodeNames,nodes)
+      console.log('选择部门', nodeIds, nodeNames, nodes);
       if (nodeIds.length > 0) queryUsers(nodeIds);
       else {
         handlers.value = [];
       }
+      stepInfoChange();
     };
 
     /**
@@ -379,6 +410,7 @@ export default defineComponent({
       columns,
       stepEdit,
       currStep,
+      optType,
       validateForm,
       stepInfoChange,
       moveClick,

src/views/dataAdmin/dataAdmin/configProcess/configData.js

@@ -2,7 +2,7 @@
  * @Author: tengmingxue 1473375109@qq.com
  * @Date: 2023-08-28 21:12:52
  * @LastEditors: tengmingxue 1473375109@qq.com
- * @LastEditTime: 2023-09-21 08:37:42
+ * @LastEditTime: 2023-09-21 14:46:32
  * @FilePath: \xld-gis-admin\src\views\dataAdmin\dataAdmin\configProcess\configData.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -11,24 +11,24 @@
 export const columns = [
   {
     title: '流程业务',
-    dataIndex: 'flowname',
+    dataIndex: 'FLOWNAME',
   },
   {
     title: '本版',
-    dataIndex: 'version',
+    dataIndex: 'VERSION',
   },
   {
     title: '启用状态',
-    dataIndex: 'status',
+    dataIndex: 'STATUS',
     slots: { customRender: 'status' },
   },
   {
     title: '维护人',
-    dataIndex: 'createuser',
+    dataIndex: 'CREATEUSER',
   },
   {
     title: '维护时间',
-    dataIndex: 'createtime',
+    dataIndex: 'CREATETIME',
     slots: { customRender: 'pdate' },
   }
 ];

src/views/dataAdmin/dataAdmin/configProcess/index.vue

@@ -57,7 +57,7 @@
         <a-switch
           checked-children="启用"
           un-checked-children="停用"
-          v-model:checked="record.status"
+          :checked="record.STATUS === 0 ? true : false"
           @change="changeCheck(record)"
         />
       </template>
@@ -81,7 +81,12 @@ import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
 import AddProcess from './AddProcess.vue';
 import { useMessage } from '/@/hooks/web/useMessage';
 import Moment from 'moment';
-import { queryFlowInfo, queryFlowInfoById, delFlowInfo } from '/@/api/resource/examine';
+import {
+  queryFlowInfoPage,
+  queryFlowInfoById,
+  queryFlowInfo,
+  delFlowInfo,
+} from '/@/api/resource/examine';
 
 export default defineComponent({
   name: 'configProcess',
@@ -107,7 +112,7 @@ export default defineComponent({
       // 表格题目
       title: '流程配置列表',
       // 分页查询请求函数
-      api: queryFlowInfo, //list,
+      api: queryFlowInfoPage, //list,
       // 表头
       columns,
       // 查询条件框配置
@@ -162,46 +167,44 @@ export default defineComponent({
      * 查看
      */
     const handleView = async (record) => {
-      const result = await queryFlowInfoById([record.id]);
-      console.log('查询流程配置信息',result)
+      const result = await queryFlowInfo({
+        flowInfo: {
+          id: record.id,
+        },
+      });
       if (result) {
         openModal(true, {
-          record:result,
+          record: result,
           isUpdate: false,
         });
+      } else {
+        createMessage.error('查询流程明细异常！请联系管理员处理');
       }
-      else{
-        createMessage.error('查询流程明细异常！请联系管理员处理')
-      }
-    }
+    };
 
     /**
      * 编辑
      */
-    const handleEdit = async(record) => {
-      // openModal(true, {
-      //   record,
-      //   isUpdate: true,
-      // });
-
-      const result = await queryFlowInfoById([record.id]);
-      console.log('查询流程配置信息',result)
+    const handleEdit = async (record) => {
+      const result = await queryFlowInfo({
+        flowInfo: {
+          id: record.id,
+        },
+      });
       if (result) {
         openModal(true, {
-          record:result,
+          record: result,
           isUpdate: true,
         });
+      } else {
+        createMessage.error('查询流程明细异常！请联系管理员处理');
       }
-      else{
-        createMessage.error('查询流程明细异常！请联系管理员处理')
-      }
-    }
+    };
 
     function changeCheck(row) {
       //console.log(row);
     }
 
-
     return {
       moment,
       registerModal,

src/views/dataAdmin/dataAdmin/mapUpload/SourceDetail.vue

@@ -2,7 +2,7 @@
  * @Author: tengmingxue 1473375109@qq.com
  * @Date: 2023-08-15 22:08:21
  * @LastEditors: tengmingxue 1473375109@qq.com
- * @LastEditTime: 2023-08-28 14:26:58
+ * @LastEditTime: 2023-09-21 17:58:43
  * @FilePath: \xld-gis-admin\src\views\resource\map\SourceDetail.vue
  * @Description: 地图资源明细界面
 -->
@@ -63,7 +63,7 @@
 
           <a-col :span="24" class="form-col">
             <a-form-item ref="thumbnail" label="缩略图" name="thumbnail" class="label-form-item">
-              <a-upload action="" v-model:file-list="fileList" :disabled="isView">
+              <a-upload action="" v-model:file-list="fileList" @change="uploadFilesChange" :multiple="false" :disabled="isView">
                 <a-button style="background-color: #0671dd; color: #fff; border-radius: 4px">
                   <upload-outlined></upload-outlined>
                   文件上传
@@ -570,6 +570,13 @@ export default defineComponent({
       formState.coordinate = data.detail?.crs;
       formState.searched = data.detail.searched === 0 ? false : true;
     };
+    
+    /**
+     * 上传缩略图改变
+    */
+    const uploadFilesChange = (file,fileList,evelt) => {
+      console.log('上传缩略图改变',file,fileList)
+    }
 
     onMounted(() => {
       resetForm();
@@ -585,6 +592,7 @@ export default defineComponent({
       createMessage,
       setSubmitForm,
       setFormData,
+      uploadFilesChange,
     };
   },
 });