Browse Source

森语-事故处理单,质量书孤单

jbb 2 years ago
parent
commit
44637c5bc3
2 changed files with 9 additions and 2 deletions
  1. 3 0
      src/views/activiti/form/demoForm2.vue
  2. 6 2
      src/views/oa/IncidentTicketList.vue

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

@@ -1711,4 +1711,7 @@ function updateModel (object, childIndex) {
  /deep/ .anticon-question-circle-o {
     display: none !important;
 }
+/deep/ textarea#presentation_condition {
+    height: 290px;
+}
 </style>

+ 6 - 2
src/views/oa/IncidentTicketList.vue

@@ -16,7 +16,9 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="填报人">
-              <j-dict-select-tag placeholder="请选择填报人" v-model="queryParam.informant" dictCode="sys_user ,realname,username"/>
+              <j-search-select-tag v-model="queryParam.informant" placeholder="" 
+                   dict="sys_user,realname,username" @search="searchName"/>
+              <!-- <j-dict-select-tag placeholder="请选择填报人" v-model="queryParam.informant" dictCode="sys_user ,realname,username"/> -->
             </a-form-item>
           </a-col>
           
@@ -34,7 +36,7 @@
               
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="单状态">
+              <a-form-item label="单状态">
                 <a-select placeholder="" v-model="queryParam.state">
                   <a-select-option value="">请选择</a-select-option>
                   <a-select-option value="1">未处理</a-select-option>
@@ -161,6 +163,7 @@
 <script>
 
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
   import IncidentTicketModal from './modules/IncidentTicketModal'
   import IncidentTicketModalDetail from './modules/IncidentTicketModalDetail'
   import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
@@ -177,6 +180,7 @@ import moment from 'moment'
       JDictSelectTag,
       IncidentTicketModal,
       IncidentTicketModalDetail,
+      JSearchSelectTag,
       JEllipsis,
       JInput,
       moment