项目文件管理完成

src/api/approve.js

@@ -15,3 +15,28 @@ export const getProjectProcessId = (id) => {
         method: 'GET'
     })
 }
+// 审批
+export const processApproval = (data) => {
+    return service({
+        url: '/description/processOperate',
+        method: 'POST',
+        data
+    })
+}
+
+// 查询发起人申请列表
+export const getApplyList = (data) => {
+    return service({
+        url: '/projectProcess/queryProjectApplicantList',
+        method: 'POST',
+        data
+    })
+}
+
+// 补充完毕
+export const supplyFinish = (id) => {
+    return service({
+        url: '/projectProcess/replenished?id=' + id,
+        method: 'GET'
+    })
+}

src/view/approve/approve.vue

@@ -17,7 +17,6 @@ const costOption = [
   { text: '申请列表', value: '/navigation/approve/applyList' },
 ];
 const changeDropdown = (val) => {
-  console.log(val)
   router.push({path: val})
 }
 </script>

src/view/approve/components/applyList.vue

@@ -1,13 +1,233 @@
 <template>
-
+  <van-cell-group>
+    <van-cell
+        v-for="item in applyList"
+        :title="item.projectProcessName"
+        :label="processType(item.projectType)"
+        :value="approvePeople(item.node.approver.nickName)"
+        :key="item.ID"
+        @click="openDetail(item)"
+    >
+    </van-cell>
+  </van-cell-group>
+  <van-popup
+      v-model:show="detailShow"
+      position="bottom"
+      style="height: 100%;"
+  >
+    <van-nav-bar
+        title="流程详情"
+        left-text="返回"
+        left-arrow
+        @click-left="detailShow = false"
+    />
+    <van-row style="margin-top: 0.1rem">
+      <van-col
+          :span="24">
+        <van-steps
+            :active="currentStep"
+            finish-icon="checked"
+            active-color="#19a7fc"
+            active-icon="more"
+        >
+          <van-step v-for="item in nodeList">
+            {{item.nodeName}}
+          </van-step>
+        </van-steps>
+      </van-col>
+    </van-row>
+    <van-tabs v-model:active="tabActive" class="tabsBox">
+      <van-tab title="流程信息" style="margin-top: 0.6rem">
+        <van-collapse v-model="infoActive">
+          <van-collapse-item
+              v-for="(item,index) in infoList"
+              :key="index + 'a'"
+              :title="item.optionResult"
+              :name="index">
+            {{item.approvalOpinion}}
+          </van-collapse-item>
+        </van-collapse>
+      </van-tab>
+      <van-tab title="流程文件">
+        <van-row style="margin-top: 0.7rem" justify="space-around">
+          <van-col>
+            <van-button
+                icon="plus"
+                type="primary"
+                size="small"
+            >
+              补充文件
+            </van-button>
+          </van-col>
+          <van-col>
+            <van-button
+                icon="success"
+                type="primary"
+                size="small"
+                @click="supplyComplete"
+            >
+              补充完毕
+            </van-button>
+          </van-col>
+        </van-row>
+        <van-row style="margin-top: 0.7rem">
+          <van-col :span="24">
+            <van-cell-group>
+              <van-cell
+                  v-for="item in fileList"
+                  :key="item.ID"
+                  size="large"
+                  :title="item.name"
+                  :value="fileId(item.ID)"
+              >
+              </van-cell>
+            </van-cell-group>
+          </van-col>
+        </van-row>
+      </van-tab>
+    </van-tabs>
+  </van-popup>
 </template>
 
 <script setup>
+import { getApplyList, getProjectProcessId, supplyFinish } from "@/api/approve"
+import { useUserStore } from "@/pinia/modules/user"
+import { getProjectFile } from "@/api/project";
+import { showConfirmDialog, showNotify } from "vant"
+const useUser = useUserStore()
 defineOptions({
   name: 'applyList',
 })
+const condition = reactive({
+  pageInfo: {
+    page: 1,
+    pageSize: 10,
+  },
+  userId: useUser.userInfo.userId
+})
+onMounted(() => {
+  queryApproveList()
+})
+// 获取申请人列表
+const applyList = reactive([])
+const queryApproveList = () => {
+  getApplyList(condition).then(res => {
+    if (res.code === 0) {
+      const list = res.data.list
+      console.log('list', list)
+      applyList.length = 0
+      if (list.length !== 0) {
+        applyList.push(...list)
+      }
+    }
+  })
+}
+// 申请步骤
+const currentStep = ref(0)
+// 申请详情.....................................
+const detailShow = ref(false)
+const processId = ref(0)
+const infoList = reactive([])
+const nodeList = reactive([])
+const fileList = reactive([])
+// 项目流程信息
+const comprehensive = reactive({})
+// 查询项目文件条件
+const fileCondition = reactive({
+  code: '',
+  name: '',
+  genre: 0,
+  pageInfo: {
+    page: 1,
+    pageSize: 1000
+  }
+})
+// 审核数据
+const approvalData = reactive({
+  projectProcess: {},
+  description: {
+    projectProcessId: 0,
+    approvalOpinion: '',
+    nodeId: 2,
+    approvalTime: '2024-09-23',
+    optionResult: '通过'
+  }
+})
+const openDetail = (data) => {
+  console.log(data)
+  processId.value = data.ID
+  queryProjectProcessId(data.ID)
+  detailShow.value = true
+}
+// 留言
+const tabActive = ref(0)
+const infoActive = ref(['1'])
+const queryProjectProcessId = (id) => {
+  getProjectProcessId(id).then(res => {
+    if (res.code === 0) {
+      const data = res.data
+      infoList.length = 0
+      if (data.descriptions.length !== 0) {
+        infoList.push(...data.descriptions)
+      }
+      const node = data.process.nodes
+      nodeList.length = 0
+      nodeList.push(...node)
+      node.forEach(item => {
+        if (item.ID === data.currentNodeOrder) {
+          currentStep.value = item.order - 1
+        }
+      })
+      Object.assign(comprehensive, data)
+      Object.assign(approvalData.projectProcess, data)
+      approvalData.description.projectProcessId = data.ID
+      approvalData.description.nodeId = data.node.ID
+      fileCondition.code = data.code
+      getProjectFile(fileCondition).then(res => {
+        if (res.code === 0) {
+          fileList.length = 0
+          fileList.push(...res.data.list)
+        }
+      })
+    }
+  })
+}
+
+const supplyComplete = () => {
+  showConfirmDialog({
+    message:
+        '请确认文件已补充完毕',
+  })
+      .then(() => {
+        supplyFinish(comprehensive.ID).then(res => {
+          if (res.code === 0) {
+            showNotify({
+              type: 'success',
+              message: '申请已再次发送请等待审核结果'
+            })
+          }
+        })
+      })
+      .catch(() => {
+      })
+}
+
+// 计算属性
+const processType = computed(() => {
+  return (type) => "类型：" + type
+})
+
+const approvePeople = computed(() => {
+  return (people) => "审批人：" + people
+})
+
+const fileId = computed(() => {
+  return (id) => "id：" + id
+})
 </script>
 
 <style scoped lang="less">
-
+.tabsBox{
+  width: 100vw;
+}
 </style>

src/view/approve/components/approveList.vue

@@ -24,7 +24,12 @@
     <van-row style="margin-top: 0.1rem">
       <van-col
           :span="24">
-        <van-steps :active="currentStep">
+        <van-steps
+            :active="currentStep"
+            finish-icon="checked"
+            active-color="#19a7fc"
+            active-icon="more"
+        >
           <van-step v-for="item in nodeList">
             {{item.nodeName}}
           </van-step>
@@ -68,6 +73,7 @@
             <van-button
                 icon="success"
                 type="primary"
+                @click="adoptShow = true"
                 size="small">
               审核通过
             </van-button>
@@ -101,17 +107,33 @@
         v-model="repulseContent"
         rows="3"
         autosize
-        label="打回理由"
         type="textarea"
         placeholder="请输入打回申请的理由"
     />
   </van-dialog>
+  <van-dialog
+      v-model:show="adoptShow"
+      title="通过申请"
+      show-cancel-button
+      @cancel="adoptShow = false"
+      @confirm="confirmAdopt"
+  >
+    <van-field
+        v-model="adoptContent"
+        rows="3"
+        autosize
+        type="textarea"
+        placeholder="请输入通过申请的留言（选填）"
+    />
+  </van-dialog>
 </template>
 
 <script setup>
-import { getExamineList, getProjectProcessId } from "@/api/approve";
+import { getExamineList, getProjectProcessId, processApproval } from "@/api/approve";
 import { getProjectFile } from "@/api/project"
 import { useUserStore } from "@/pinia/modules/user"
+import { showNotify } from "vant";
+import moment from "moment";
 defineOptions({
   name: 'approveList',
 })
@@ -153,19 +175,26 @@ const fileCondition = reactive({
 })
 const fileList = reactive([])
 const openDetail = (data) => {
-  const node = data.process.nodes
-  nodeList.length = 0
-  nodeList.push(...node)
-  node.forEach(item => {
-    if (item.ID === data.currentNodeOrder) {
-      currentStep.value = item.order - 1
-    }
-  })
-  infoList.length = 0
-  infoList.push(...data.descriptions)
-  getProjectProcessId(data.ID).then(res => {
+  processId.value = data.ID
+  queryProjectProcessId(data.ID)
+  detailShow.value = true
+}
+const queryProjectProcessId = (id) => {
+  getProjectProcessId(id).then(res => {
     if (res.code === 0) {
       const data = res.data
+      infoList.length = 0
+      if (data.descriptions.length !== 0) {
+        infoList.push(...data.descriptions)
+      }
+      const node = data.process.nodes
+      nodeList.length = 0
+      nodeList.push(...node)
+      node.forEach(item => {
+        if (item.ID === data.currentNodeOrder) {
+          currentStep.value = item.order - 1
+        }
+      })
       Object.assign(approvalData.projectProcess, data)
       approvalData.description.projectProcessId = data.ID
       approvalData.description.nodeId = data.node.ID
@@ -178,17 +207,32 @@ const openDetail = (data) => {
       })
     }
   })
-  detailShow.value = true
 }
-
 const tabActive = ref(0)
-
 const infoActive = ref(['1'])
 
+// 当前流程id
+const processId = ref(0)
 // 打回申请
 const repulseShow = ref(false)
 const repulseContent = ref('')
 const confirmRepulse = () => {
+  if (repulseContent.value.length === 0) {
+    showNotify({ type: 'danger', message: '请输入打回申请的理由' })
+    return
+  }
+  const date = moment()
+  approvalData.description.approvalOpinion = repulseContent.value
+  approvalData.description.approvalTime = date.format('YYYY-MM-DD')
+  approvalData.description.optionResult = '打回'
+  processApproval(approvalData).then(res => {
+    if (res.code === 0) {
+      showNotify({ type: 'success', message: '打回成功' })
+      queryProjectProcessId(processId.value)
+      repulseContent.value = ''
+      repulseShow.value = false
+    }
+  })
 }
 // 审核数据
 const approvalData = reactive({
@@ -201,6 +245,23 @@ const approvalData = reactive({
     optionResult: '通过'
   }
 })
+// 审核通过
+const adoptShow = ref(false)
+const adoptContent = ref('')
+const confirmAdopt = () => {
+  const date = moment()
+  approvalData.description.approvalOpinion = adoptContent.value
+  approvalData.description.approvalTime = date.format('YYYY-MM-DD')
+  approvalData.description.optionResult = '通过'
+  processApproval(approvalData).then(res => {
+    if (res.code === 0) {
+      showNotify({ type: 'success', message: '审核通过' })
+      queryProjectProcessId(processId.value)
+      adoptContent.value = ''
+      adoptShow.value = false
+    }
+  })
+}
 //计算属性
 const applyPeople = computed(() => {
   return (name) => "申请人：" + name