From 44ed106775c861fac31caac2087e771e4cf7e1ef Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sat, 11 May 2024 21:40:49 +0800
Subject: [PATCH] =?UTF-8?q?build=20:=20=E9=9C=80=E6=B1=82=E5=BE=81?=
 =?UTF-8?q?=E9=9B=86=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project-demand/index.js               | 15 +++++
 src/utils/request.js                          |  2 -
 .../projectdemand/demandcollection/add.vue    | 64 ++++++++++---------
 .../projectdemand/demandcollection/detail.vue | 22 +++++--
 4 files changed, 64 insertions(+), 39 deletions(-)

diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js
index 6675a54..043e7fc 100644
--- a/src/api/project-demand/index.js
+++ b/src/api/project-demand/index.js
@@ -19,3 +19,18 @@ export const getInfo = (requirementId) => {
     method: "get"
   });
 };
+export const agreeTask = (data) => {
+  return request({
+    url: `/workflow/mosr/process/task/agree`,
+    method: "post",
+    data: data
+  });
+};
+
+export const addRequirement = (data) => {
+  return request({
+    url: `/workflow/mosr/requirement`,
+    method: "post",
+    data: data
+  });
+};
diff --git a/src/utils/request.js b/src/utils/request.js
index 9c580c1..d95c00b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -29,8 +29,6 @@ serveice.interceptors.response.use(response => {
     if (response.request.responseType === 'blob' || response.request.responseType === 'arraybuffer') {
         return response.data
     }
-    console.log("window.location.pathname", window.location.pathname)
-    console.log("windows", window.location.search)
     return response.data
 }, error => {
     let response = error.response
diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index 88234cb..76cc048 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -1,13 +1,13 @@
 <template>
   <div v-loading="loading" class="add-block">
     <baseTitle title="需求征集信息录入"></baseTitle>
-    <el-form :model="demandInfo" inline class="query-form" ref="demandForm">
+    <el-form :model="fromData" inline class="query-form" ref="demandForm">
       <div class="left-info">
         <el-form-item label="名称" prop="name">
-          <el-input v-model="demandInfo.name" placeholder="请输入名称" clearable></el-input>
+          <el-input v-model="fromData.name" placeholder="请输入名称" clearable></el-input>
         </el-form-item>
         <el-form-item label="所属公司" prop="company">
-          <el-select v-model="demandInfo.company" placeholder="登录状态" clearable filterable>
+          <el-select v-model="fromData.company" placeholder="登录状态" clearable filterable>
             <el-option
                 v-for="item in companyOption"
                 :key="item.value"
@@ -17,7 +17,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="征集类型" prop="type">
-          <el-select v-model="demandInfo.type" placeholder="登录状态" clearable filterable>
+          <el-select v-model="fromData.type" placeholder="登录状态" clearable filterable>
             <el-option
                 v-for="item in typeOption"
                 :key="item.value"
@@ -61,19 +61,15 @@
 </template>
 
 <script setup lang="jsx">
-import {getInitiateInfo} from "@/api/workflow/process-definition.js";
 import {useTagsView} from '@/stores/tagsview.js'
 import {useAuthStore} from '@/stores/userstore.js'
-import {ElLoading, ElMessage, ElNotification} from 'element-plus';
-import {getMenuList} from '@/api/system/menuman.js'
-import {getWorkflowInfo} from "@/api/project-demand/index.js";
+import {getWorkflowInfo, addRequirement} from "@/api/project-demand/index.js";
 import FileUpload from "../../../components/FileUpload.vue";
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
-import ProcessTree from '@/views/workflow/process/ProcessTree.vue';
 import {useProcessStore} from '@/stores/processStore.js';
 
 const dateValue = ref()
-const demandInfo = reactive({
+const fromData = reactive({
   name: '',
   company: '',
   type: '',
@@ -85,7 +81,12 @@ const authStore = useAuthStore()
 const route = useRoute()
 const demandForm = ref()
 const typeOption = ref([])
-const companyOption = ref([])
+const companyOption = ref([
+  {
+    label: "测试公司",
+    value: 1
+  }
+])
 const form = ref(null)
 const fileList = ref(null)
 const menuTree = ref(null)
@@ -178,6 +179,8 @@ const getFile = (val) => {
   console.log('fileList', val)
   fileList.value = val
 }
+
+
 const init = async () => {
   getWorkflowInfo().then(res => {
     let data = res.data
@@ -189,8 +192,8 @@ const init = async () => {
     processStore.noTakeList.value = data.noTakeList;
     processStore.refuseList.value = data.refuseList;
     processStore.passList.value = data.passList;
-    nextTick(()=>{
-      processDiagramViewer.value=true
+    nextTick(() => {
+      processDiagramViewer.value = true
     })
   })
 }
@@ -208,25 +211,24 @@ const init = async () => {
 //   });
 // }
 // getTree()
-const handleSubmit = async () => {
-  // const loading = ElLoading.service({fullscreen: true})
-  // const {isValidate} = await form.value.validate()
-  // if (!isValidate) return Promise.reject()
-  // const values = form.value.getValues()
-  // values.menuIds = checkChange()
-  // operate(values).then(res => {
-  //   ElNotification({
-  //     title: route.query.isAdd ? '新增' : '编辑',
-  //     message: res.msg,
-  //     type: res.code === 1000 ? 'success' : 'error'
-  //   })
-  //   loading.close()
-  //   res.code === 1000 ? tagsViewStore.delViewAndGoView('/system/role') : null
-  // }).finally(() => {
-  //   loading.close()
-  // })
+
+
+const handleSubmit = () => {
+  console.log(fromData,"fromData")
+  addRequirement({
+    "collectExplain": "需求说明",
+    "collectType": "征集类型",
+    "companyIds": [22,23,24],
+    "files": [],
+    "requirementId": 0,
+    "requirementName": "测试需求征集20240519001",
+    "deploymentId": "1817079f-0f74-11ef-8b96-f268fc747b04"
+  }).then(res=>{
+
+  })
 }
 
+
 const handleBack = () => {
   history.back()
 }
@@ -237,7 +239,7 @@ watch(localData, (val) => {
 
 // onMounted(async () => {
 //   loading.value = true
-  init()
+init()
 //   if (route.query.id) {
 //     await getInfo()
 //   }
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index f89771e..685272f 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -71,8 +71,8 @@
       <!--      </el-row>-->
     </el-form>
     <div class="oper-page-btn" v-if="processInstanceData.taskId">
-      <el-button @click="handleSubmit">驳回</el-button>
-      <el-button color="#DED0B2" @click="handleBack">同意</el-button>
+      <el-button @click="handleBack">驳回</el-button>
+      <el-button color="#DED0B2" @click="handleSubmit">同意</el-button>
     </div>
   </div>
 </template>
@@ -81,8 +81,7 @@
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {useProcessStore} from '@/stores/processStore.js';
-import {getInfo} from "@/api/project-demand/index.js";
-import {CircleCheckFilled, Close, Loading, MoreFilled} from "@element-plus/icons-vue";
+import {getInfo, agreeTask} from "@/api/project-demand/index.js";
 
 const route = useRoute()
 const form = ref();
@@ -123,7 +122,18 @@ const tableConfig = reactive({
   ],
   api: ''
 })
-const getTree = async () => {
+const handleSubmit = () => {
+  let approve = {
+    taskId: processInstanceData.value.taskId,
+    auditOpinion : auditOpinion.value,
+    formData: formData.value
+  }
+  agreeTask(approve).then(res => {
+    console.log(res)
+  })
+}
+
+const init = async () => {
   getInfo(route.query.id).then(res => {
     let data = res.data
     formData.value = data.formData;
@@ -139,7 +149,7 @@ const getTree = async () => {
     })
   })
 }
-getTree()
+init()
 </script>
 
 <style lang="scss" scoped>