瀏覽代碼

报销类型筛选不出现父节点或子节点修复

lizhenhao 2 年之前
父節點
當前提交
912d430bf4

+ 7 - 8
src/views/modules/cw/reimbursementApproval/type/TypeList.vue

@@ -5,9 +5,9 @@
       <el-form-item label="报销内容名称" prop="name">
         <el-input size="small" v-model="searchForm.name" placeholder="请输入报销内容名称" clearable></el-input>
       </el-form-item>
-      <el-form-item label="序号" prop="sort">
-        <el-input size="small" v-model="searchForm.sort" placeholder="请输入序号" clearable></el-input>
-      </el-form-item>
+<!--      <el-form-item label="序号" prop="sort">-->
+<!--        <el-input size="small" v-model="searchForm.sort" placeholder="请输入序号" clearable></el-input>-->
+<!--      </el-form-item>-->
 
       <el-form-item>
         <el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
@@ -41,9 +41,9 @@
           :checkbox-config="{}">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
-          <vxe-column title="报销内容名称" field="name" align="left" tree-node></vxe-column>
-          <vxe-column title="关联部门" field="relateDepartment"></vxe-column>
-          <vxe-column width="100" title="序号" field="sort"></vxe-column>
+          <vxe-column min-width="200" title="报销内容名称" field="name" align="left" tree-node></vxe-column>
+          <vxe-column min-width="200" title="关联部门" field="relateDepartment" align="center"></vxe-column>
+          <vxe-column min-width="100" title="序号" field="sort" align="center"></vxe-column>
 
           <vxe-column title="操作" width="230px" fixed="right" align="center">
             <template  slot-scope="scope">
@@ -68,8 +68,7 @@
     data () {
       return {
         searchForm: {
-          name: '',
-          no: ''
+          name: ''
         },
         dataList: [],
         tablePage: {

+ 13 - 4
src/views/modules/flowable/task/TaskForm.vue

@@ -28,7 +28,7 @@
 
 
 <el-card style="margin-top:10px; padding-bottom:66px" v-if="!procInsId || taskId">
-    <el-form size="small" :model="auditForm"   ref="auditForm" label-width="120px">
+    <el-form size="small" :model="auditForm"  :loading="loading" ref="auditForm" label-width="120px">
       <el-col :span="16">
         <!--<el-form-item  v-if="!procInsId && isShow !== 'false'"  label="流程标题" prop="title">
           <el-input
@@ -84,8 +84,8 @@
 
   <template v-for="(button, index) in buttons">
       <template v-if="button.isHide === '0'">
-        <el-button type="primary"  v-if="button.code !== '_flow_print'"  :key="index" @click="submit(button, buttons)"  v-noMoreClick plain>{{button.name}}</el-button>
-        <el-button type="primary" v-if="button.code === '_flow_print'" v-print="printObj" :key="index" @click="submit(button, buttons)"  v-noMoreClick plain>{{button.name}}</el-button>
+        <el-button type="primary"  v-if="button.code !== '_flow_print'"  :key="index" @click="submit(button, buttons)" :loading="loading"  v-noMoreClick plain>{{button.name}}</el-button>
+        <el-button type="primary" v-if="button.code === '_flow_print'" v-print="printObj" :key="index" @click="submit(button, buttons)" :loading="loading" v-noMoreClick plain>{{button.name}}</el-button>
       </template>
   </template>
 </div>
@@ -990,6 +990,14 @@
             this.buttons = data.flowButtonList
           })
         }
+      },
+      // 开启/关闭taskForm页面的加载中状态
+      changeLoading (loading) {
+        if (this.commonJS.isNotEmpty(loading)) {
+          this.loading = loading
+        } else {
+          this.loading = false
+        }
       }
     },
     data () {
@@ -1026,7 +1034,8 @@
           userIds: null,
           assignee: null
         },
-        cUser: false
+        cUser: false,
+        loading: false
       }
     }
   }