yuansh 2 лет назад
Родитель
Сommit
6e90746554

+ 4 - 4
src/store/modules/user.js

@@ -215,10 +215,10 @@ const user = {
             let serviceUrl = encodeURIComponent(sevice)
             // window.location.href = process.env.VUE_APP_CAS_BASE_URL + '/logout?service=' + serviceUrl
             window.location.href = window._CONFIG['casPrefixUrl']+"/logout?service="+serviceUrl;
-          // resolve()
-            setTimeout(function(){
-              resolve()
-            },0)
+            resolve()
+            // setTimeout(function(){
+            //   resolve()
+            // },0)
         }).catch(() => {
           resolve()
         })

+ 5 - 0
src/views/activiti/doneManage.vue

@@ -13,6 +13,11 @@
                 <a-input type="text" v-model="searchForm.name" placeholder="请输入" clearable />
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-item label="所属流程" prop="defname">
+                <a-input type="text" v-model="searchForm.defname" placeholder="请输入" clearable />
+              </a-form-item>
+            </a-col>
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-col :md="6" :sm="12">
                 <a-button @click="handleSearch" type="primary" icon="search">搜索</a-button>

+ 4 - 0
src/views/activiti/form/demoForm2.vue

@@ -67,6 +67,7 @@ import FixedZyModal from './fixedZyModal'
 import { postAction, postFormDataAction} from '@/api/manage'
 import {annualLeave} from '@api/oa/cd-personnel-files'
 import moment from 'moment'
+import {getProjctName}from '../../../../url.config'
 export default {
     name: 'DemoForm',
     props: {
@@ -164,6 +165,9 @@ export default {
         }
     },
     created () {
+      
+        console.log("==============="+getProjctName());
+      
         window.deleteRow = this.deleteRow
         // console.log('流程数据', this.processData)
         // 加载一些下拉选择数据等