1
0

2 Ревизии a6835fa8ea ... f1944300b9

Автор SHA1 Съобщение Дата
  xieyn f1944300b9 Merge remote-tracking branch 'origin/wsm' into wsm преди 1 година
  xieyn 7af5b33da2 页面改为模糊查询 преди 1 година

+ 15 - 6
src/views/oa/BudgetCostList.vue

@@ -6,27 +6,32 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="部门">
-              <a-input placeholder="请输入部门" v-model="queryParam.department"></a-input>
+                <j-search-select-tag
+                  placeholder="请做出你的选择"
+                  v-model="queryParam.department"
+                  dict="sys_depart,depart_name,id"
+                  >
+                </j-search-select-tag>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="费用资金类别">
-              <a-input placeholder="请输入费用资金类别" v-model="queryParam.costFundType"></a-input>
+              <j-input placeholder="请输入费用资金类别" v-model="queryParam.costFundType"></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="预算资金名称">
-              <a-input placeholder="请输入预算资金名称" v-model="queryParam.budgetFundName"></a-input>
+              <j-input placeholder="请输入预算资金名称" v-model="queryParam.budgetFundName"></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="登记人">
-              <a-input placeholder="请输入登记人" v-model="queryParam.registerPerson"></a-input>
+              <j-input placeholder="请输入登记人" v-model="queryParam.registerPerson"></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="登记部门">
-              <a-input placeholder="请输入登记部门" v-model="queryParam.registerDept"></a-input>
+              <j-input placeholder="请输入登记部门" v-model="queryParam.registerDept"></j-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
@@ -164,13 +169,17 @@
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { getAction } from '@api/manage'
   import JEllipsis from '@/components/jeecg/JEllipsis'
+  import JInput from '@/components/jeecg/JInput.vue'
+  import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
   export default {
     name: "BudgetCostList",
     mixins:[JeecgListMixin],
     components: {
       JDate,
+      JInput,
       BudgetCostModal,
-      JEllipsis
+      JEllipsis,
+      JSearchSelectTag
     },
     data () {
       let ellipsis = (v, l = 10) => (<j-ellipsis value={v} length={l}/>)

+ 4 - 2
src/views/oa/BudgetReplyList.vue

@@ -6,12 +6,12 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="登记人">
-              <a-input placeholder="请输入登记人" v-model="queryParam.registerPerson"></a-input>
+              <j-input placeholder="请输入登记人" v-model="queryParam.registerPerson"></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="登记部门">
-              <a-input placeholder="请输入登记部门" v-model="queryParam.registerDept"></a-input>
+              <j-input placeholder="请输入登记部门" v-model="queryParam.registerDept"></j-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
@@ -137,12 +137,14 @@
   import BudgetReplyModal from './modules/BudgetReplyModal'
   import JDate from '@/components/jeecg/JDate.vue'
   import { getAction } from '@api/manage'
+  import JInput from '@/components/jeecg/JInput.vue'
 
   export default {
     name: "BudgetReplyList",
     mixins:[JeecgListMixin],
     components: {
       JDate,
+      JInput,
       BudgetReplyModal
     },
     data () {

+ 6 - 4
src/views/oa/ConferenceApplyList.vue

@@ -6,18 +6,18 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="会议议题">
-              <a-input placeholder="请输入会议议题" v-model="queryParam.conferenceTitle"></a-input>
+              <j-input placeholder="请输入会议议题" v-model="queryParam.conferenceTitle"></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="会议信息发布人">
-              <a-input placeholder="请输入会议信息发布人" v-model="queryParam.postedPerson"></a-input>
+              <j-input placeholder="请输入会议信息发布人" v-model="queryParam.postedPerson"></j-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="发布部门">
-                <a-input placeholder="请输入发布部门" v-model="queryParam.postedDept"></a-input>
+                <j-input placeholder="请输入发布部门" v-model="queryParam.postedDept"></j-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -32,7 +32,7 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="会议地点">
-                <a-input placeholder="请输入会议地点" v-model="queryParam.conferenceAddress"></a-input>
+                <j-input placeholder="请输入会议地点" v-model="queryParam.conferenceAddress"></j-input>
               </a-form-item>
             </a-col>
           </template>
@@ -138,12 +138,14 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ConferenceApplyModal from './modules/ConferenceApplyModal'
   import JDate from '@/components/jeecg/JDate.vue'
+  import JInput from '@/components/jeecg/JInput.vue'
 
   export default {
     name: "ConferenceApplyList",
     mixins:[JeecgListMixin],
     components: {
       JDate,
+      JInput,
       ConferenceApplyModal
     },
     data () {

+ 6 - 4
src/views/oa/ConferenceMinutesList.vue

@@ -6,23 +6,23 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="会议纪要编号">
-              <a-input placeholder="请输入会议纪要编号" v-model="queryParam.minutesId"></a-input>
+              <j-input placeholder="请输入会议纪要编号" v-model="queryParam.minutesId"></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="会议议题">
-              <a-input placeholder="请输入会议议题" v-model="queryParam.conferenceTitle"></a-input>
+              <j-input placeholder="请输入会议议题" v-model="queryParam.conferenceTitle"></j-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="上传人">
-                <a-input placeholder="请输入上传人" v-model="queryParam.uploadPerson"></a-input>
+                <j-input placeholder="请输入上传人" v-model="queryParam.uploadPerson"></j-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="上传部门">
-                <a-input placeholder="请输入上传部门" v-model="queryParam.uploadDept"></a-input>
+                <j-input placeholder="请输入上传部门" v-model="queryParam.uploadDept"></j-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -131,12 +131,14 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ConferenceMinutesModal from './modules/ConferenceMinutesModal'
   import JDate from '@/components/jeecg/JDate'
+  import JInput from '@/components/jeecg/JInput.vue'
 
   export default {
     name: "ConferenceMinutesList",
     mixins:[JeecgListMixin],
     components: {
       ConferenceMinutesModal,
+      JInput,
       JDate
     },
     data () {

+ 4 - 2
src/views/oa/MuseumDutyList.vue

@@ -6,12 +6,12 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="申请人">
-              <a-input placeholder="请输入申请人" v-model="queryParam.applyPerson"></a-input>
+              <j-input placeholder="请输入申请人" v-model="queryParam.applyPerson"></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="申请部门">
-              <a-input placeholder="请输入申请部门" v-model="queryParam.applyDept"></a-input>
+              <j-input placeholder="请输入申请部门" v-model="queryParam.applyDept"></j-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
@@ -136,12 +136,14 @@
   import MuseumDutyModal from './modules/MuseumDutyModal'
   import JDate from '@/components/jeecg/JDate.vue'
   import { getAction } from '@api/manage'
+  import JInput from '@/components/jeecg/JInput.vue'
 
   export default {
     name: "MuseumDutyList",
     mixins:[JeecgListMixin],
     components: {
       JDate,
+      JInput,
       MuseumDutyModal
     },
     data () {

+ 5 - 3
src/views/oa/ReceivedMainList.vue

@@ -6,12 +6,12 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="来文单位">
-              <a-input placeholder="请输入来文单位" v-model="queryParam.communicationsUnit"></a-input>
+              <j-input placeholder="请输入来文单位" v-model="queryParam.communicationsUnit"></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="收文名称">
-              <a-input placeholder="请输入收文名称" v-model="queryParam.receivedName"></a-input>
+              <j-input placeholder="请输入收文名称" v-model="queryParam.receivedName"></j-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
@@ -32,7 +32,7 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="文号">
-                <a-input placeholder="请输入文号" v-model="queryParam.documentSymbol"></a-input>
+                <j-input placeholder="请输入文号" v-model="queryParam.documentSymbol"></j-input>
               </a-form-item>
             </a-col>
           </template>
@@ -137,12 +137,14 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ReceivedMainModal from './modules/ReceivedMainModal'
   import JDate from '@/components/jeecg/JDate.vue'
+  import JInput from '@/components/jeecg/JInput.vue'
 
   export default {
     name: "ReceivedMainList",
     mixins:[JeecgListMixin],
     components: {
       JDate,
+      JInput,
       ReceivedMainModal
     },
     data () {

+ 8 - 6
src/views/oa/SealArchivesList.vue

@@ -6,23 +6,23 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="印章类别">
-              <a-input placeholder="请输入印章类别" v-model="queryParam.sealType"></a-input>
+              <j-input placeholder="请输入印章类别" v-model="queryParam.sealType"></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="印章名称">
-              <a-input placeholder="请输入印章名称" v-model="queryParam.sealName"></a-input>
+              <j-input placeholder="请输入印章名称" v-model="queryParam.sealName"></j-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="印章材质">
-                <a-input placeholder="请输入印章材质" v-model="queryParam.sealMaterial"></a-input>
+                <j-input placeholder="请输入印章材质" v-model="queryParam.sealMaterial"></j-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="印章尺寸">
-                <a-input placeholder="请输入印章尺寸" v-model="queryParam.sealSize"></a-input>
+                <j-input placeholder="请输入印章尺寸" v-model="queryParam.sealSize"></j-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -35,12 +35,12 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="印章保管人">
-                <a-input placeholder="请输入印章保管人" v-model="queryParam.sealCustodian"></a-input>
+                <j-input placeholder="请输入印章保管人" v-model="queryParam.sealCustodian"></j-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="保管部门">
-                <a-input placeholder="请输入保管部门" v-model="queryParam.custodianDept"></a-input>
+                <j-input placeholder="请输入保管部门" v-model="queryParam.custodianDept"></j-input>
               </a-form-item>
             </a-col>
           </template>
@@ -165,12 +165,14 @@
   import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
   import { httpAction } from '@api/manage'
   import pick from 'lodash.pick'
+  import JInput from '@/components/jeecg/JInput.vue'
 
   export default {
     name: "SealArchivesList",
     mixins:[JeecgListMixin],
     components: {
       JDictSelectTag,
+      JInput,
       SealArchivesModal
     },
     data () {

+ 7 - 5
src/views/oa/SealDestroyList.vue

@@ -6,18 +6,18 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="印章名称">
-              <a-input placeholder="请输入印章名称" v-model="queryParam.sealName"></a-input>
+              <j-input placeholder="请输入印章名称" v-model="queryParam.sealName"></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="印制材质">
-              <a-input placeholder="请输入印制材质" v-model="queryParam.sealMaterial"></a-input>
+              <j-input placeholder="请输入印制材质" v-model="queryParam.sealMaterial"></j-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="印章尺寸">
-                <a-input placeholder="请输入印章尺寸" v-model="queryParam.sealSize"></a-input>
+                <j-input placeholder="请输入印章尺寸" v-model="queryParam.sealSize"></j-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -27,12 +27,12 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="经办人">
-                <a-input placeholder="请输入经办人" v-model="queryParam.handlingPerson"></a-input>
+                <j-input placeholder="请输入经办人" v-model="queryParam.handlingPerson"></j-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="经办部门">
-                <a-input placeholder="请输入经办部门" v-model="queryParam.handlingDept"></a-input>
+                <j-input placeholder="请输入经办部门" v-model="queryParam.handlingDept"></j-input>
               </a-form-item>
             </a-col>
           </template>
@@ -135,12 +135,14 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import SealDestroyModal from './modules/SealDestroyModal'
   import JDate from '@/components/jeecg/JDate.vue'
+  import JInput from '@/components/jeecg/JInput.vue'
 
   export default {
     name: "SealDestroyList",
     mixins:[JeecgListMixin],
     components: {
       JDate,
+      JInput,
       SealDestroyModal
     },
     data () {

+ 10 - 8
src/views/oa/SealTurnList.vue

@@ -6,7 +6,7 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="印章名称">
-              <a-input placeholder="请输入印章名称" v-model="queryParam.sealName"></a-input>
+              <j-input placeholder="请输入印章名称" v-model="queryParam.sealName"></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -17,32 +17,32 @@
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="原保管人">
-                <a-input placeholder="请输入原保管人" v-model="queryParam.oldCustodian"></a-input>
+                <j-input placeholder="请输入原保管人" v-model="queryParam.oldCustodian"></j-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="原保管部门">
-                <a-input placeholder="请输入原保管部门" v-model="queryParam.oldDept"></a-input>
+                <j-input placeholder="请输入原保管部门" v-model="queryParam.oldDept"></j-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="现上缴人">
-                <a-input placeholder="请输入现上缴人" v-model="queryParam.nowTurnPerson"></a-input>
+                <j-input placeholder="请输入现上缴人" v-model="queryParam.nowTurnPerson"></j-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="现上缴部门">
-                <a-input placeholder="请输入现上缴部门" v-model="queryParam.nowTurnDept"></a-input>
+                <j-input placeholder="请输入现上缴部门" v-model="queryParam.nowTurnDept"></j-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="经办人">
-                <a-input placeholder="请输入经办人" v-model="queryParam.handlingPerson"></a-input>
+                <j-input placeholder="请输入经办人" v-model="queryParam.handlingPerson"></j-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="经办部门">
-                <a-input placeholder="请输入经办部门" v-model="queryParam.handlingDept"></a-input>
+                <j-input placeholder="请输入经办部门" v-model="queryParam.handlingDept"></j-input>
               </a-form-item>
             </a-col>
           </template>
@@ -145,13 +145,15 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import SealTurnModal from './modules/SealTurnModal'
   import JDate from '@/components/jeecg/JDate.vue'
+  import JInput from '@/components/jeecg/JInput.vue'
 
   export default {
     name: "SealTurnList",
     mixins:[JeecgListMixin],
     components: {
       JDate,
-      SealTurnModal
+      SealTurnModal,
+      JInput
     },
     data () {
       return {