内外部会议入库流程-修改

src/pages/policyRegulation/meeting/index.vue

@@ -234,6 +234,7 @@ export default {
       this.$refs.exportDialogRef.openModel()
     },
     handleExport (exportName) {
+      alert('导出' + exportName)
       const params = {
         ...this.form,
         exportName: exportName,
@@ -256,11 +257,13 @@ export default {
     },
     // 导入
     addImportModal() {
+      alert('导入')
       this.importModalShowFlag = true
       this.importExcelUrl = '/api/lawss/sarBussionessStand/importSarBussionessStandFile?'+ 'userId=' + this.$store.getters.userInfo.userId
     },
     // 模板下载
     handleMoudel(){
+      alert('模板下载')
       window.open('/api/lawss/sarBussionessStand/exportTemplateFile?fileName=企业标准导入模板')
     },
     // 新增编辑

src/pages/processCenter/pages/creatProcess/hzwl-hyrk/step1.vue

@@ -37,6 +37,7 @@
             </ProcessTitle>
             <Topics :item="item" :index="index" :rules="rules" :disabled="disabled"></Topics>
           </div>
+          <ReceiptDescription v-model="form.commentText" title="回执说明" :disabled="disabled"></ReceiptDescription>
         </div>
         <div class="block" style="padding-top: 20px;" v-show="active === '2'">
           <PersonInfo ref="roleForm" :roleForm="roleForm" :roleRules="roleRules" :disabled="disabled"></PersonInfo>
@@ -64,6 +65,7 @@ import Basic from "./components/Basic";
 import Classification from "./components/Classification";
 import Topics from "./components/Topics";
 import PersonInfo from "./components/PersonInfo";
+import ReceiptDescription from "@/components/hzwlComponents/ReceiptDescription";
 
 import { getDicTypeListCode, saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel } from 'api/process'
 
@@ -76,7 +78,8 @@ export default {
     Basic,
     Classification,
     Topics,
-    PersonInfo
+    PersonInfo,
+    ReceiptDescription
   },
   data () {
     const form = {
@@ -99,7 +102,8 @@ export default {
           reportingUnit: '',
           agendaContent: ''
         }
-      ]
+      ],
+      commentText: ''
     }
     const rules = {
       meetingName: [
@@ -204,7 +208,7 @@ export default {
       this.form.meetingTopicList = [ ...res ]
     },
     getData () {
-      const { bpnId, taskIds, prcId, disabled } = this.$route.query
+      const { bpnId, taskIds, prcId, disabledXX } = this.$route.query
       // 1. 根据草稿查询流程详情 2.已办、已发、监控：查看流程数据
       if(bpnId) {
         queryTaskFirst({ bpnId }).then(res => {
@@ -217,8 +221,8 @@ export default {
           })
         })
       }
-      if (disabled) {
+      if (disabledXX) {
-        this.disabled = disabled
+        this.disabled = disabledXX
       }
       // 重新起草
       if (taskIds) {
@@ -251,7 +255,7 @@ export default {
       _formData.append('id', this.$route.query.bpnId || '') // 草稿id
       _formData.append('createUser', this.$store.getters.userInfo.userId)
       _formData.append('createUserName', this.$store.getters.userInfo.uName)
-      _formData.append('prcType', '28')
+      _formData.append('prcType', '29')
       _formData.append('prcName', '内外部会议入库流程')
       _formData.append('json', JSON.stringify({
         taskInfo: '起草',
@@ -265,7 +269,7 @@ export default {
         this.$router.replace({
           path: this.$route.path,
           query: {
-            prcType: '28',
+            prcType: '29',
             processName: '申请人发起流程',
             bpnId: res.result
           }
@@ -291,7 +295,7 @@ export default {
         const startProcessRollBackQuery = {
           createUser: this.$store.getters.userInfo.userId,
           createUserName: this.$store.getters.userInfo.userName,
-          type: '28',
+          type: '29',
           json: JSON.stringify(json)
         }
         const res = await this.$http._post('lawss/activiti/startProcessRollBack', startProcessRollBackQuery)

src/pages/processCenter/pages/creatProcess/hzwl-hyrk/step2.vue

@@ -37,6 +37,7 @@
             </ProcessTitle>
             <Topics :item="item" :index="index" :rules="rules" :disabled="disabled"></Topics>
           </div>
+          <ReceiptDescription v-model="form.commentText" prop="commentText" title="审批意见"></ReceiptDescription>
         </div>
         <div class="block" style="padding-top: 20px;" v-show="active === '3'">
           <ApprovalHistory :data="processData" :loading="processLoading"></ApprovalHistory>
@@ -73,6 +74,7 @@ import Classification from "./components/Classification";
 import Topics from "./components/Topics";
 import PersonInfo from "./components/PersonInfo";
 import ApprovalHistory from "@/components/hzwlComponents/ApprovalHistory";
+import ReceiptDescription from "@/components/hzwlComponents/ReceiptDescription";
 
 import { getDicTypeListCode, inboundLiaisonDetail, changeAssigneeNew, processCreateMeeting } from 'api/process'
 export default {
@@ -85,7 +87,8 @@ export default {
     Classification,
     Topics,
     PersonInfo,
-    ApprovalHistory
+    ApprovalHistory,
+    ReceiptDescription
   },
   data () {
     const form = {
@@ -108,7 +111,8 @@ export default {
           reportingUnit: '',
           agendaContent: ''
         }
-      ]
+      ],
+      commentText: ''
     }
     const rules = {
       meetingName: [
@@ -173,7 +177,7 @@ export default {
     }
     return {
       active: '1',
-      disabled: false,
+      disabled: true,
       footerLoading: false,
       reloadForm: true,
       form,
@@ -282,8 +286,22 @@ export default {
       this.form.approvalOpinion = 0
       this.handleSubmit()
     },
+    addRule () {
+      if (this.form.approvalOpinion === 0) {
+        this.rules.commentText = [
+          { required: false }
+        ]
+        this.$refs.form.clearValidate('commentText')
+      }else {
+        this.rules.commentText = [
+          { required: true, message: '审批意见不能为空' }
+        ]
+      }
+      this.rules = { ...this.rules }
+    },
     // 提交
     handleSubmit() {
+      this.addRule()
       this.$refs['form'].validate((valid) => {
         if (valid) {
           this.footerLoading = true

src/pages/processCenter/pages/creatProcess/hzwl-zcrk/step1.vue

@@ -6,7 +6,8 @@
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
+      <div v-if="title === '起草'" class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
+      <div v-else class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content">
       <el-form v-if="reloadForm"
@@ -27,6 +28,9 @@
         <div class="block" style="padding-top: 20px;" v-show="active === '2'">
           <PersonInfo ref="roleForm" :roleForm="roleForm" :roleRules="roleRules" :disabled="disabled"></PersonInfo>
         </div>
+        <div class="block" style="padding-top: 20px;" v-show="active === '3'">
+          <ApprovalHistory :data="processData" :loading="processLoading"></ApprovalHistory>
+        </div>
       </el-form>
     </div>
     <ProcessFooter
@@ -55,6 +59,7 @@ import ReceiptDescription from "@/components/hzwlComponents/ReceiptDescription";
 import PersonInfo from "./components/PersonInfo";
 
 import {saveTaskFirst, queryTaskFirst, taskDel, inboundLiaisonDetail} from "api/process";
+import ApprovalHistory from "@/components/hzwlComponents/ApprovalHistory";
 
 export default {
   name: "zrckStep1",
@@ -67,7 +72,8 @@ export default {
     Range,
     RelatesInfo,
     ReceiptDescription,
-    PersonInfo
+    PersonInfo,
+    ApprovalHistory
   },
   data () {
     const form = {
@@ -242,13 +248,17 @@ export default {
       rules: {},
       roleRules,
       reloadForm: true, // 重新渲染表单
-      bpnId: this.$route.query.bpnId || ''
+      bpnId: this.$route.query.bpnId || '',
+      // 审批历史
+      processData: [],
+      processLoading: false,
     }
   },
   created() {
     this.getDicTypeListCode()
     this.resolveRules()
     this.getData()
+    this.processTable()
   },
   watch: {
     'form.isRelateAccess' () {
@@ -321,6 +331,19 @@ export default {
         })
       }
     },
+    // 审批历史
+    processTable () {
+      if (this.$route.query.prcNum) {
+        this.$http.get('lawss/activiti/get_list_by_instance', {
+          prcNum: this.$route.query.prcNum
+        }, {
+          loading: 'processLoading',
+          _this: this
+        }, res => {
+          this.$set(this, 'processData', res)
+        }, e => {})
+      }
+    },
     // 带入流程
     dragIn (form) {
       this.reloadForm = false

src/pages/processCenter/pages/processDetail/index.vue

@@ -391,7 +391,7 @@ export default {
         }else if(prcType === '12'){
           //政策课题参会发起流程
           this.toProcessDetail('zdrzbzORzchgxxmscStep1',row)
-        }else if(prcType === '28'){
+        }else if(prcType === '29'){
           //内外部会议入库
           this.toProcessDetail('hyrk1',row)
         }

src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue

@@ -156,7 +156,7 @@
         </div>
         <div class="process-name">
           <el-card shadow="hover" v-btn-permission="'42c7b2e5011900a6eb0c09c5355f8128'">
-            <div class="card-box" @click="handleCreateProcess('28')">
+            <div class="card-box" @click="handleCreateProcess('29')">
               <div class="card-top">
                 <div class="card-top-left">
                   <img :src="getImg(Math.floor(Math.random() * 6))">
@@ -614,7 +614,7 @@ export default {
           })
           break
         // 内外部会议入库流程
-        case '28':
+        case '29':
           this.$router.push({
             name: 'hyrk1'
           })

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -2260,7 +2260,7 @@ export default {
               }
             })
           break
-        case '28': {
+        case '29': {
           let routeName = ''
           switch (row.taskInfo) {
             case '内外部会议入库审批':

src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

@@ -963,11 +963,11 @@ export default {
             }
           })
           break
-        case '28':
+        case '29':
           this.$router.push({
             name: 'hyrk1',
             query: {
-              prcType: '28',
+              prcType: '29',
               processName: '申请人发起流程',
               bpnId: id
             }