Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

src/views/process-center/applyListByTableName.vue

@@ -49,6 +49,20 @@
           <a-col :md="6" :sm="12">
             <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
             <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px;">重置</a-button>
+            
+          </a-col>
+        </a-row>
+
+        <!-- 发起申请 按钮 -->
+        <a-row>
+          <a-col :md="12" :sm="12">
+            <a-button
+              type="primary"
+              @click="addApply"
+              :loading="addApplyLoading"
+              style="margin:10px 0;"
+              icon="plus-circle"
+            >发起申请</a-button>
             <a-dropdown
               v-if="data.length > 0"
               v-model="visible"
@@ -70,7 +84,10 @@
                 />
                 <a-menu-divider />
                 <a-menu-item>
-                  <a-button style="margin: 0px 2px;" @click="handleMenuClickAll_comm">{{ selectText }}</a-button>
+                  <a-button
+                    style="margin: 0px 2px;"
+                    @click="handleMenuClickAll_comm"
+                  >{{ selectText }}</a-button>
                   <a-button style="margin: 0px 2px;" @click="handleMenuClick_comm">确定</a-button>
                   <a-button style="margin: 0px 2px;" @click="colseMenuClick">取消</a-button>
                 </a-menu-item>
@@ -86,19 +103,6 @@
             </a-dropdown>
           </a-col>
         </a-row>
-
-        <!-- 发起申请 按钮 -->
-        <a-col :md="12" :sm="12">
-          <a-button
-            type="primary"
-            @click="addApply"
-            :loading="addApplyLoading"
-            style="margin:10px 0;"
-            icon="plus-circle"
-          >
-            发起申请
-          </a-button>
-        </a-col>
       </a-form>
     </div>
 
@@ -187,7 +191,11 @@
       @close="processModalVisible = false"
       :visible="processModalVisible"
     >
-      <a-input-search style="margin-bottom: 10px;width: 200px" placeholder="输入流程名称" @search="onSearchProcess" />
+      <a-input-search
+        style="margin-bottom: 10px;width: 200px"
+        placeholder="输入流程名称"
+        @search="onSearchProcess"
+      />
       <a-empty description="无流程可供选择" v-if="activeKeyAll.length == 0" />
       <div v-else>
         <a-collapse v-model="activeKey">
@@ -220,7 +228,13 @@
       </div>
     </a-drawer>
     <!--流程表单-->
-    <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%">
+    <a-modal
+      :title="lcModa.title"
+      v-model="lcModa.visible"
+      :footer="null"
+      :maskClosable="false"
+      width="80%"
+    >
       <component
         :disabled="lcModa.disabled"
         v-if="lcModa.visible"
@@ -236,19 +250,30 @@
     <a-modal title="提交申请" v-model="modalVisible" :mask-closable="false" :width="500" :footer="null">
       <div v-if="modalVisible">
         <a-form-item label="选择审批人" v-show="showAssign">
-          <a-select style="width: 80%" v-model="form.assignees" placeholder="请选择" mode="multiple" :allowClear="true">
-            <a-select-option v-for="(item, i) in assigneeList" :key="i" :value="item.username">{{
+          <a-select
+            style="width: 80%"
+            v-model="form.assignees"
+            placeholder="请选择"
+            mode="multiple"
+            :allowClear="true"
+          >
+            <a-select-option v-for="(item, i) in assigneeList" :key="i" :value="item.username">
+              {{
               item.realname
-            }}</a-select-option>
+              }}
+            </a-select-option>
           </a-select>
         </a-form-item>
         <a-form-item label="下一审批人" v-show="isGateway">
-          <a-alert type="info" showIcon message="分支网关处不支持自定义选择下一审批人，将自动下发给所有可审批人。"
-            >，将发送给下一节点所有人</a-alert
-          >
+          <a-alert type="info" showIcon message="分支网关处不支持自定义选择下一审批人，将自动下发给所有可审批人。">，将发送给下一节点所有人</a-alert>
         </a-form-item>
         <a-form-item label="优先级" prop="priority">
-          <a-select v-model="form.priority" placeholder="请选择" :allowClear="true" style="width: 100%">
+          <a-select
+            v-model="form.priority"
+            placeholder="请选择"
+            :allowClear="true"
+            style="width: 100%"
+          >
             <a-select-option :value="0">普通</a-select-option>
             <a-select-option :value="1">重要</a-select-option>
             <a-select-option :value="2">紧急</a-select-option>
@@ -266,7 +291,13 @@
         </div>
       </div>
     </a-modal>
-    <a-modal title="审批历史" v-model="modalLsVisible" :mask-closable="false" :width="'80%'" :footer="null">
+    <a-modal
+      title="审批历史"
+      v-model="modalLsVisible"
+      :mask-closable="false"
+      :width="'80%'"
+      :footer="null"
+    >
       <div v-if="modalLsVisible">
         <historicDetail :procInstId="procInstId"></historicDetail>
       </div>
@@ -391,32 +422,12 @@ export default {
   created() {
     console.log(this.$route.params)
     this.tableName = this.$route.params.tableName
+    this.initial()
   },
   //时刻监听，一旦切换到其他申请表单则重新加载数据
   watch: {
     $route(to, from) {
-      if (this.tableName != this.$route.params.tableName) {
-        this.clear()
-        this.tableName = this.$route.params.tableName
-        ///////根据表单名称查询对应相关数据
-        let businessTable = this.$route.params.tableName //表单表名称
-        this.postFormAction('/activiti_process/listData', {
-          businessTable: businessTable,
-          status: 1,
-          roles: true
-        }).then(res => {
-          // this.activeKeyAll = []
-          //是否查询成功
-          if (res.success) {
-            var result = res.result || []
-            if (result.length > 0) {
-              //获取所属表单的相关数据
-              this.tableDataObject = result[0]
-            }
-          }
-        })
-        this.loadData(1)
-      }
+      this.initial()
     }
   },
 
@@ -424,6 +435,30 @@ export default {
   mounted() {},
   computed: {},
   methods: {
+    initial() {
+      // if (this.tableName != this.$route.params.tableName) {
+      this.clear()
+      this.tableName = this.$route.params.tableName
+      ///////根据表单名称查询对应相关数据
+      let businessTable = this.$route.params.tableName //表单表名称
+      this.postFormAction('/activiti_process/listData', {
+        businessTable: businessTable,
+        status: 1,
+        roles: true
+      }).then(res => {
+        // this.activeKeyAll = []
+        //是否查询成功
+        if (res.success) {
+          var result = res.result || []
+          if (result.length > 0) {
+            //获取所属表单的相关数据
+            this.tableDataObject = result[0]
+          }
+        }
+      })
+      this.loadData(1)
+      // }
+    },
     handleMenuClickAll_comm() {
       console.log(this.tableColumns)
       if (this.checkedColumn.length === this.tableColumns.length) {