流程管理增加查询部门，审核人员增加部门显示

src/views/base/meetingInfo-list.vue

@@ -108,18 +108,20 @@
         <template slot-scope="{row}">
           <el-row>
             <el-col :span="10">
-              <el-link type="primary" @click="handleToDetail(row)">编辑</el-link>
+              <template slot-scope="{row}">
+              <el-link type="primary" v-if="row.status!='3'" @click="handleToDetail(row)">编辑</el-link>
+              </template>
             </el-col>
             <el-col :span="10">
-              <el-link type="primary" @click="signDetail(row)">签到详情</el-link>
+              <el-link type="primary" v-if="row.status =='3'" @click="signDetail(row)">签到详情</el-link>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="10">
-              <el-link type="danger" @click="handleClose(row)">关闭</el-link>
+              <el-link type="danger" v-if="row.status!='3'" @click="handleClose(row)">关闭</el-link>
             </el-col>
             <el-col :span="10">
-              <el-link type="success" @click="bindDevice(row)">微信推送</el-link>
+              <el-link type="success" v-if="row.status!='3'" @click="sendMessage(row)">微信推送</el-link>
             </el-col>
           </el-row>
         </template>
@@ -387,6 +389,32 @@ export default {
           });
       });
     },
+    sendMessage(record){
+      var self = this;
+
+      self
+        .$confirm("是否确认推送微信会议消息?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+        .then(() => {
+          meetingInfoApi.sendMessage(record.id).then(function(response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "推送成功!"
+              });
+            }
+          });
+        });
+    }
   },
   mounted: function() {
     var self = this;

src/views/workflow/processActivity-detail.vue

@@ -12,7 +12,7 @@
     style="text-align:left;"
     @close="closeDialog"
     :close-on-click-modal="false"
-    width="50%"
+    width="900px"
   >
   <h4>基本配置</h4>
     <div class="user-panel" v-loading="loading">
@@ -60,7 +60,7 @@
             </el-radio-group>
         </el-form-item>
         <el-form-item label="审批人" prop="approvedPersonIdArray" style="width:350px" v-if="formModel.source=='1'">
-            <el-select v-model="formModel.approvedPersonIdArray" multiple filterable placeholder="请选择审批人" style="width:250px">
+            <el-select v-model="formModel.approvedPersonIdArray" multiple filterable placeholder="请选择审批人" style="width:680px">
                 <el-option
                 v-for="item in approvedPersonList"
                 :key="item.strId"

src/views/workflow/processTemplate-list.vue

@@ -9,6 +9,38 @@
         <a href="/processTemplate">流程模版</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
+    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+      <el-form-item label="模版名称" prop="name">
+        <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+      </el-form-item>
+      <el-form-item label="谁可以发起" prop="companyId">
+        <el-select-tree
+          size="mini"
+          :props="props"
+          :options="companyResult"
+          v-model="queryModel.companyId"
+          height="200"
+        ></el-select-tree>&nbsp;
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+        >查询</el-button>&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+        >重置</el-button>&nbsp;
+      </el-form-item>
+    </el-form>
+
+
+
     <el-divider></el-divider>
     <el-row class="button-group">
       <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
@@ -80,6 +112,8 @@ import processTemplateDetail from "./processTemplate-detail";
 import processTemplateApi from "@/api/workflow/processTemplate";
 import pageUtil from "@/utils/page";
 import "nprogress/nprogress.css"; // progress bar style
+import SelectTree from "@/components/SelectTree";
+import companyInfoApi from "@/api/base/companyInfo";
 
 export default {
   name: 'workflowProcessTemplateList',
@@ -89,6 +123,7 @@ export default {
     return {
       queryModel: {
         name: "",
+        companyId:"",
       },
       processSetId:"",
       canteenId:"",
@@ -130,9 +165,30 @@ export default {
     };
   },
   created() {
+    var self = this;
+    companyInfoApi.list().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
 
+    this.loadTree();
   },
   methods: {
+    loadTree() {
+      var formData = new FormData();
+
+      companyInfoApi.loadChildren(formData).then(resp => {
+        var jsonData = resp.data;
+
+        if (jsonData.result) {
+          this.treeData = jsonData.data;
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
+    },
     changePage(pageIndex) {
       var self = this;
 
@@ -146,6 +202,11 @@ export default {
     formData.append("pageSize", self.pageSize);
 
     formData.append("processSetId", self.processSetId);
+    formData.append("name", self.queryModel.name);
+    if(self.queryModel.companyId!=null){
+      formData.append("companyId", self.queryModel.companyId);
+    }
+    
 
       processTemplateApi
         .pageList(formData)
@@ -312,6 +373,7 @@ export default {
   },
   components: {
     "processTemplate-detail": processTemplateDetail,
+    "el-select-tree": SelectTree,
   }
 };
 </script>