Merge pull request 'fix : 完善需求新增页面' (#127) from dd into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/127

src/components/Tinymce.vue

@@ -69,8 +69,8 @@ const props = defineProps({
     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,
+    type: String,
-    default: 600
+    default: 'auto'
   },
   height:{
     type: Number,

src/views/projectdemand/demandcollection/add.vue

@@ -1,63 +1,58 @@
 <template>
-  <div v-loading="loading"  class="add-block">
+  <div v-loading="loading" class="add-block">
     <baseTitle title="需求征集信息录入"></baseTitle>
     <el-form :model="queryParams" inline class="query-form" ref="demandForm">
-      <el-row gutter="20">
+      <div class="left-info">
-        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="14">
+        <el-form-item label="名称" prop="name">
-         <div class="left-info">
+          <el-input v-model="queryParams.name" placeholder="请输入子公司编码" clearable></el-input>
-           <el-form-item label="名称" prop="name">
+        </el-form-item>
-             <el-input v-model="queryParams.name" placeholder="请输入子公司编码" clearable></el-input>
+        <el-form-item label="所属公司" prop="company">
-           </el-form-item>
+          <el-select v-model="queryParams.company" placeholder="登录状态" clearable filterable>
-           <el-form-item label="所属公司" prop="company">
+            <el-option
-             <el-select v-model="queryParams.company" placeholder="登录状态" clearable filterable>
+                v-for="item in companyOption"
-               <el-option
+                :key="item.value"
-                   v-for="item in companyOption"
+                :label="item.label"
-                   :key="item.value"
+                :value="item.value"
-                   :label="item.label"
+            />
-                   :value="item.value"
+          </el-select>
-               />
+        </el-form-item>
-             </el-select>
+        <el-form-item label="征集类型" prop="type">
-           </el-form-item>
+          <el-select v-model="queryParams.type" placeholder="登录状态" clearable filterable>
-           <el-form-item label="征集类型" prop="type">
+            <el-option
-             <el-select v-model="queryParams.type" placeholder="登录状态" clearable filterable>
+                v-for="item in typeOption"
-               <el-option
+                :key="item.value"
-                   v-for="item in typeOption"
+                :label="item.label"
-                   :key="item.value"
+                :value="item.value"
-                   :label="item.label"
+            />
-                   :value="item.value"
+          </el-select>
-               />
+        </el-form-item>
-             </el-select>
+        <el-form-item label="截止时间" prop="time">
-           </el-form-item>
+          <el-config-provider>
-           <el-form-item label="截止时间" prop="time">
+            <el-date-picker
-             <el-config-provider>
+                v-model="dateValue"
-               <el-date-picker
+                type="datetime"
-                   v-model="dateValue"
+                value-format="YYYY-MM-DD HH:mm:ss"
-                   type="datetime"
+            />
-                   value-format="YYYY-MM-DD HH:mm:ss"
+          </el-config-provider>
-               />
+        </el-form-item>
-             </el-config-provider>
+        <el-form-item>
-           </el-form-item>
+          <el-button type="primary" @click="getList">搜索</el-button>
-           <el-form-item>
+          <el-button type="primary" @click="handleReset">重置</el-button>
-             <el-button type="primary" @click="getList">搜索</el-button>
+        </el-form-item>
-             <el-button type="primary" @click="handleReset">重置</el-button>
+      </div>
-           </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"/>
+    <div class="approval-record">
+      <baseTitle title="流程"></baseTitle>
+      <process-diagram-viewer/>
+      <!--      <div class="process" id="approvalRecord">-->
+      <!--        <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>-->
+      <!--      </div>-->
+    </div>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
       <el-button @click="handleBack">返回</el-button>
@@ -66,13 +61,16 @@
 </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 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 queryParams = reactive({
   name: '',
@@ -93,6 +91,9 @@ const loading = ref(false)
 const localData = reactive({
   affiliatedCompany: []
 })
+
+const processStore = useProcessStore()
+const processInstanceData = ref()
 const instructions = ref()
 const schame = computed(() => {
   let arr = [
@@ -175,16 +176,34 @@ const getFile = (val) => {
   console.log('fileList', val)
   fileList.value = val
 }
-const init =  () => {
+const init = () => {
   console.log("asdasdasd")
   getWorkflowInfo().then(res => {
+    let data = res.data
     console.log('res', res)
-    processStore.setDesign(res.data)
+    processInstanceData.value = data
-    nextTick(() => {
+    processStore.setDesign(data)
-      processTree.value.init()
+    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;
   })
 }
+// 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()
@@ -225,7 +244,7 @@ init()
 </script>
 
 <style lang="scss" scoped>
-.add-block{
+.add-block {
   //display: flex;
   //justify-content: space-between;
   overflow-x: hidden;