Merge pull request 'fix : 完善页面' (#123) from dj into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/123
2024-05-11 06:59:05 +00:00
parent 332d843dc2 dde77b1425
commit cf367951a5
5 changed files with 167 additions and 50 deletions
--- a/src/api/project-demand/index.js
+++ b/src/api/project-demand/index.js
@@ -0,0 +1,14 @@
+import request from '@/utils/request.js'
+
+export const getWorkflowInfo = () => {
+  return request({
+    url: '/workflow/mosr/requirement/process',
+    method: "get"
+  });
+};
+export const getInfo = (requirementId) => {
+  return request({
+    url: `/workflow/mosr/requirement/info/${requirementId}`,
+    method: "get"
+  });
+};
--- a/src/components/Tinymce.vue
+++ b/src/components/Tinymce.vue
@@ -68,6 +68,10 @@ const props = defineProps({
    type: [String, Array],
    default: "微软雅黑=Microsoft YaHei,Helvetica Neue,PingFang SC,sans-serif;苹果苹方=PingFang SC,Microsoft YaHei,sans-serif;宋体=simsun,serif;仿宋体=FangSong,serif;黑体=SimHei,sans-serif;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;"
  },
+  width:{
+    type: Number,
+    default: 600
+  },
  height:{
    type: Number,
    default: 450
@@ -84,6 +88,7 @@ const init = reactive({
  placeholder: "在这里输入文字", //textarea中的提示信息
  min_width: 300,
  min_height: 200,
+  width:props.width,
  height: props.height, //注：引入autoresize插件时，此属性失效
  resize: "both", //编辑器宽高是否可变，false-否,true-高可变，'both'-宽高均可，注意引号
  promotion: false,
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -1,11 +1,63 @@
 <template>
-  <div v-loading="loading">
+  <div v-loading="loading"  class="add-block">
    <baseTitle title="需求征集信息录入"></baseTitle>
-    <fvForm :schema="schame" @getInstance="getInstance" :rules="rules"></fvForm>
+    <el-form :model="queryParams" inline class="query-form" ref="demandForm">
+      <el-row gutter="20">
+        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="14">
+         <div class="left-info">
+           <el-form-item label="名称" prop="name">
+             <el-input v-model="queryParams.name" placeholder="请输入子公司编码" clearable></el-input>
+           </el-form-item>
+           <el-form-item label="所属公司" prop="company">
+             <el-select v-model="queryParams.company" placeholder="登录状态" clearable filterable>
+               <el-option
+                   v-for="item in companyOption"
+                   :key="item.value"
+                   :label="item.label"
+                   :value="item.value"
+               />
+             </el-select>
+           </el-form-item>
+           <el-form-item label="征集类型" prop="type">
+             <el-select v-model="queryParams.type" placeholder="登录状态" clearable filterable>
+               <el-option
+                   v-for="item in typeOption"
+                   :key="item.value"
+                   :label="item.label"
+                   :value="item.value"
+               />
+             </el-select>
+           </el-form-item>
+           <el-form-item label="截止时间" prop="time">
+             <el-config-provider>
+               <el-date-picker
+                   v-model="dateValue"
+                   type="datetime"
+                   value-format="YYYY-MM-DD HH:mm:ss"
+               />
+             </el-config-provider>
+           </el-form-item>
+           <el-form-item>
+             <el-button type="primary" @click="getList">搜索</el-button>
+             <el-button type="primary" @click="handleReset">重置</el-button>
+           </el-form-item>
+         </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="10">
+          <div class="approval-record">
+            <baseTitle title="xx"></baseTitle>
+            <div class="process" id="approvalRecord">
+              <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+    </el-form>
+    <!--    <fvForm :schema="schame" @getInstance="getInstance" :rules="rules"></fvForm>-->
    <baseTitle title="征集说明"></baseTitle>
-    <Tinymce image-url="/notice/file" file-url="/notice/file" v-model:value="instructions" height="300"/>
+    <Tinymce image-url="/notice/file" file-url="/notice/file" v-model:value="instructions"  height="300"/>
    <baseTitle title="申请文件"></baseTitle>
-    <file-upload  @getFile="getFile"/>
+    <file-upload @getFile="getFile"/>
    <div class="oper-page-btn">
      <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
      <el-button @click="handleBack">返回</el-button>
@@ -14,16 +66,28 @@
 </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, ElNotification} from 'element-plus';
+import {ElLoading, ElMessage, ElNotification} from 'element-plus';
 import {getMenuList} from '@/api/system/menuman.js'
-import {getRoleDetail, operate, getTemRoleOption} from "@/api/role/role";
+import {getWorkflowInfo} from "@/api/project-demand/index.js";
 import FileUpload from "../../../components/FileUpload.vue";

+import ProcessTree from '@/views/workflow/process/ProcessTree.vue';
+const dateValue = ref()
+const queryParams = reactive({
+  name: '',
+  company: '',
+  type: '',
+})
+const processTree = ref()
 const tagsViewStore = useTagsView()
 const authStore = useAuthStore()
 const route = useRoute()
+const demandForm = ref()
+const typeOption = ref([])
+const companyOption = ref([])
 const form = ref(null)
 const fileList = ref(null)
 const menuTree = ref(null)
@@ -100,30 +164,39 @@ const rules = reactive({
  subCompanyId: [{required: true, message: '请输入', trigger: 'change'}]
 })

+//重置功能
+const handleReset = () => {
+  demandForm.value.resetFields()
+  init()
+}
+
 const getInstance = (e) => {
  form.value = e
 }
-const getFile=(val)=>{
+const getFile = (val) => {
  console.log('fileList', val)
-  fileList.value=val
+  fileList.value = val
 }
-const init = async () => {
-  form.value.setValues({state: '1', template: false})
-  const res = await getTemRoleOption()
-  localData.tempRoleOpt = res.data
-  const {data} = await getMenuList()
-  localData.menuData = data
-}
-
-const getInfo = async () => {
-  if (!route.query.id) return
-  const {data} = await getRoleDetail(route.query.id)
-  data.menuIds.forEach(key => {
-    menuTree.value.setChecked(key, true, false)
+const init =  () => {
+  console.log("asdasdasd")
+  getWorkflowInfo().then(res => {
+    console.log('res', res)
  })
-  form.value.setValues(data)
 }
-
+const getTree = async () => {
+  getInitiateInfo('pronode_46c5e446-b4d1-495e-a97d-40667fa6aa9f').then(res => {
+    console.log('res11', res)
+    // processDefinition.value = res.data;
+    //构建表单及校验规则
+    processStore.setDesign(res.data)
+    nextTick(() => {
+      processTree.value.init()
+    })
+  }).catch(err => {
+    ElMessage.error(err);
+  });
+}
+getTree()
 const handleSubmit = async () => {
  // const loading = ElLoading.service({fullscreen: true})
  // const {isValidate} = await form.value.validate()
@@ -151,16 +224,23 @@ watch(localData, (val) => {
  menuTree.value.filter(val.filterText)
 })

-onMounted(async () => {
-  loading.value = true
-  await init()
-  if (route.query.id) {
-    await getInfo()
-  }
-  loading.value = false
-})
+// onMounted(async () => {
+//   loading.value = true
+init()
+//   if (route.query.id) {
+//     await getInfo()
+//   }
+//   loading.value = false
+// })
+
+
 </script>

 <style lang="scss" scoped>
-
+.add-block{
+  //display: flex;
+  //justify-content: space-between;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
 </style>
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -45,7 +45,8 @@
          <div class="approval-record">
            <baseTitle title="审批记录"></baseTitle>
            <div class="process" id="approvalRecord">
-              <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>
+              <process-diagram-viewer/>
+<!--              <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>-->
            </div>
          </div>
        </el-col>
@@ -61,11 +62,15 @@
 <script setup lang="jsx">
 import {getInitiateInfo} from "@/api/workflow/process-definition.js";
 import ProcessTree from '@/views/workflow/process/ProcessTree.vue';
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {useProcessStore} from '@/stores/processStore.js';
+import {getInfo} from "@/api/project-demand/index.js";
 import {ElMessage} from "element-plus";

 const form = ref();
 const processStore = useProcessStore()
+const processInstanceData = ref()
+
 const list = ref([
  {
    title: '名称',
@@ -115,17 +120,30 @@ const tableConfig = reactive({
  api: ''
 })
 const getTree = async () => {
-  getInitiateInfo('pronode_46c5e446-b4d1-495e-a97d-40667fa6aa9f').then(res => {
-    console.log('res11', res)
-    // processDefinition.value = res.data;
-    //构建表单及校验规则
-    processStore.setDesign(res.data)
-    nextTick(() => {
-      processTree.value.init()
-    })
-  }).catch(err => {
-    ElMessage.error(err);
-  });
+  getInfo(9).then(res => {
+    let data = res.data
+    processInstanceData.value = data
+    processStore.setDesign(data)
+    processStore.runningList.value = data.runningList;
+    processStore.endList.value = data.endList;
+    processStore.noTakeList.value = data.noTakeList;
+    processStore.refuseList.value = data.refuseList;
+    processStore.passList.value = data.passList;
+  })
+
+
+
+  // getInitiateInfo('pronode_46c5e446-b4d1-495e-a97d-40667fa6aa9f').then(res => {
+  //   console.log('res11', res)
+  //   // processDefinition.value = res.data;
+  //   //构建表单及校验规则
+  //   processStore.setDesign(res.data)
+  //   nextTick(() => {
+  //     processTree.value.init()
+  //   })
+  // }).catch(err => {
+  //   ElMessage.error(err);
+  // });
 }
 getTree()
 </script>
--- a/vite.config.js
+++ b/vite.config.js
@@ -69,12 +69,12 @@ export default defineConfig({
    strictPort: false,
    open: true,
    proxy: {
-      // '/api/admin': {
-      //   target: 'http://dev-mosr.frp.feashow.cn/',
-      //   // target: 'http://192.168.31.175:8000',
-      //   changeOrigin: true,
-      //   rewrite: (path) => path.replace(/^\/api/, '')
-      // },
+      '/api/workflow': {
+        target: 'http://clay.frp.feashow.cn/',
+        // target: 'http://192.168.31.175:8000',
+        changeOrigin: true,
+        rewrite: (path) => path.replace(/^\/api/, '')
+      },
      '/api': {
        target: 'http://mosr.feashow.cn',
        changeOrigin: true,