Przeglądaj źródła

Merge remote-tracking branch 'origin/master'

lizhenhao 2 lat temu
rodzic
commit
699988460e

+ 1 - 1
src/views/modules/cw/reportManagement/ReportManagementList.vue

@@ -419,7 +419,7 @@
             this.$router.push({
               path: '/flowable/task/TaskFormDetail',
               query: {
-                ...pick(data.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+                ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 isShow: 'false',
                 readOnly: true,
                 title: '质控管理' + '流程详情',

+ 1 - 1
src/views/modules/finance/invoice/UserPullForm.vue

@@ -12,7 +12,7 @@
       <div style="height: calc(100% - 80px);">
         <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
           <!-- 搜索框-->
-          <el-form-item label="用户名称" prop="name">
+          <el-form-item label="" prop="name">
             <el-input size="small" v-model="searchForm.name" placeholder="请输入用户名称" clearable></el-input>
           </el-form-item>