Merge pull request 'master' (#176) from master into prod

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

src/views/project-demand/collection/add.vue

@@ -80,7 +80,7 @@ const formData = ref({
   deadline: '',
   collectExplain: ''
 })
-const showTinymce = ref(false)
+const showTinymce = ref(true)
 const processDiagramViewer = ref(false)
 const typeOption = ref([
   {
@@ -214,7 +214,7 @@ const handleSubmit = async (instance) => {
       ElMessage.success(res.msg)
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
       await router.push({
-        path: '/projectdemand/demandcollection'
+        name: 'Collection'
       })
     } else {
       ElMessage.error(res.msg)
@@ -231,7 +231,7 @@ const handleResubmit = () => {
       ElMessage.success(res.msg)
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
       router.push({
-        path: '/projectdemand/demandcollection'
+        name: 'Collection'
       })
     } else {
       ElMessage.error(res.msg)

src/views/project-demand/collection/detail.vue

@@ -2,7 +2,6 @@
   <div class="detail-block">
     <el-form :model="formData" ref="demandForm" label-width="auto" :rules="rules">
       <baseTitle title="需求征集详情"></baseTitle>
-      <div class="left-info">
       <el-row>
         <el-col :span="12">
           <el-form-item label="名称">
@@ -58,7 +57,6 @@
           </div>
         </el-col>
       </el-row>
-      </div>
       <div class="approval-record">
         <baseTitle title="审批记录"></baseTitle>
         <div class="process">
@@ -147,7 +145,7 @@ const handleSubmit = () => {
       ElMessage.success(res.msg)
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
       router.push({
-        path: '/projectdemand/demandcollection'
+        name: 'Collection'
       })
     } else {
       ElMessage.error(res.msg)
@@ -167,7 +165,7 @@ const handleReject = (instance) => {
         ElMessage.success(res.msg)
         tagsViewStore.delVisitedViews(router.currentRoute.value.path)
         router.push({
-          path: '/projectdemand/demandcollection'
+          name: 'Collection'
         })
       } else {
         ElMessage.error(res.msg)
@@ -229,11 +227,11 @@ init()
 :deep(.el-empty__description) {
   margin-top: 0;
 }
+
 .detail-block {
   overflow: hidden;
   padding-right: 10px;
 
-  .left-info {
   .info {
     display: flex;
     flex-wrap: wrap;
@@ -250,7 +248,6 @@ init()
       }
     }
   }
-  }
 
   .approval-record {
     padding-bottom: 30px;

src/views/project-management/initiation/apply.vue

@@ -1,10 +1,23 @@
 <template>
-  <div>
+  <div class="apply-block">
-    项目立项申请
+    <el-form :model="formData" ref="applyForm" label-width="auto" :rules="rules">
+      <baseTitle title="项目立项-申请"></baseTitle>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="前置流程">
+            <el-input v-model="formData.requirementName" clearable></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
   </div>
 </template>
 
 <script setup lang="jsx">
+const formData = ref({})
+const rules = reactive({
+  auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
+})
 </script>
 
 <style scoped>

src/views/projectdemand/demandcollection/add.vue

@@ -214,7 +214,7 @@ const handleSubmit = async (instance) => {
       ElMessage.success(res.msg)
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
       await router.push({
-        path: '/projectdemand/demandcollection'
+        name: 'Collection'
       })
     } else {
       ElMessage.error(res.msg)
@@ -231,7 +231,7 @@ const handleResubmit = () => {
       ElMessage.success(res.msg)
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
       router.push({
-        path: '/projectdemand/demandcollection'
+        name: 'Collection'
       })
     } else {
       ElMessage.error(res.msg)

src/views/projectdemand/demandcollection/detail.vue

@@ -147,7 +147,7 @@ const handleSubmit = () => {
       ElMessage.success(res.msg)
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
       router.push({
-        path: '/projectdemand/demandcollection'
+        name: 'Collection'
       })
     } else {
       ElMessage.error(res.msg)
@@ -167,7 +167,7 @@ const handleReject = (instance) => {
         ElMessage.success(res.msg)
         tagsViewStore.delVisitedViews(router.currentRoute.value.path)
         router.push({
-          path: '/projectdemand/demandcollection'
+          name: 'Collection'
         })
       } else {
         ElMessage.error(res.msg)