Merge branch 'wsm' of http://139.196.39.194:9021/chenc/cd-work-flow-web into wsm

src/views/oa/AssetInDetailList.vue

@@ -6,53 +6,53 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="资产编号">
-              <a-input placeholder="请输入资产编号" v-model="queryParam.assetNumber"></a-input>
+              <j-input placeholder="请输入资产编号" v-model="queryParam.assetNumber"></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.assetName"></a-input>
+              <j-input placeholder="请输入资产名称" v-model="queryParam.assetName"></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.assetsCategory"></a-input>
+                <j-input placeholder="请输入资产类别" v-model="queryParam.assetsCategory"></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.brand"></a-input>
+                <j-input placeholder="请输入品牌" v-model="queryParam.brand"></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.unitName"></a-input>
+                <j-input placeholder="请输入单位名称" v-model="queryParam.unitName"></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.model"></a-input>
+                <j-input placeholder="请输入规格型号" v-model="queryParam.model"></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.user"></a-input>
+                <j-input placeholder="请输入使用人" v-model="queryParam.user"></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.userDept"></a-input>
+                <j-input placeholder="请输入使用部门" v-model="queryParam.userDept"></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.operator"></a-input>
+                <j-input placeholder="请输入入库人" v-model="queryParam.operator"></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.operatorDept"></a-input>
+                <j-input placeholder="请输入入库部门" v-model="queryParam.operatorDept"></j-input>
               </a-form-item>
             </a-col>
             <a-col :xl="10" :lg="11" :md="12" :sm="24">
@@ -165,13 +165,15 @@
   import AssetInModal from './modules/AssetInModal'
   import { getAction } from '@api/manage'
   import JDate from '@/components/jeecg/JDate'
+  import JInput from '@/components/jeecg/JInput'
   export default {
     name: "AssetInDetailList",
     mixins:[JeecgListMixin],
     components: {
       AssetInDetailModal,
       AssetInModal,
-      JDate
+      JDate,
+      JInput
     },
     data () {
       return {

src/views/oa/AssetList.vue

@@ -6,43 +6,43 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="资产编号">
-              <a-input placeholder="请输入资产编号" v-model="queryParam.assetNumber"></a-input>
+              <j-input placeholder="请输入资产编号" v-model="queryParam.assetNumber"></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.assetName"></a-input>
+              <j-input placeholder="请输入资产名称" v-model="queryParam.assetName"></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.assetsCategory"></a-input>
+                <j-input placeholder="请输入资产类别" v-model="queryParam.assetsCategory"></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.brand"></a-input>
+                <j-input placeholder="请输入品牌" v-model="queryParam.brand"></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.unitName"></a-input>
+                <j-input placeholder="请输入单位名称" v-model="queryParam.unitName"></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.model"></a-input>
+                <j-input placeholder="请输入规格型号" v-model="queryParam.model"></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.user"></a-input>
+                <j-input placeholder="请输入使用人" v-model="queryParam.user"></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.userDept"></a-input>
+                <j-input placeholder="请输入使用部门" v-model="queryParam.userDept"></j-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -125,12 +125,14 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import AssetModal from './modules/AssetModal'
   import JDate from '@/components/jeecg/JDate.vue'
+  import JInput from '@/components/jeecg/JInput'
 
   export default {
     name: "AssetList",
     mixins:[JeecgListMixin],
     components: {
       JDate,
+      JInput,
       AssetModal
     },
     data () {

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}/>)

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 () {

src/views/oa/CarList.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 v-model="queryParam.registrantPerson" placeholder="请输入登记人"></a-input>
+              <j-input v-model="queryParam.registrantPerson" placeholder="请输入登记人"></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="车牌号" >
-              <a-input v-model="queryParam.number" placeholder="请输入车牌号"></a-input>
+              <j-input v-model="queryParam.number" placeholder="请输入车牌号"></j-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
@@ -26,17 +26,17 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="品牌" >
-              <a-input v-model="queryParam.carBrand" placeholder="请输入品牌"></a-input>
+              <j-input v-model="queryParam.carBrand" placeholder="请输入品牌"></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="发动机号" >
-              <a-input v-model="queryParam.engineNum"  placeholder="请输入发动机号"></a-input>
+              <j-input v-model="queryParam.engineNum"  placeholder="请输入发动机号"></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="车架号" >
-              <a-input v-model="queryParam.vin" placeholder="请输入车架号"></a-input>
+              <j-input v-model="queryParam.vin" placeholder="请输入车架号"></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -148,12 +148,14 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import CarModal from './modules/CarModal'
   import JDate from '@/components/jeecg/JDate'
+  import JInput from '@/components/jeecg/JInput'
   export default {
     name: "CarList",
     mixins:[JeecgListMixin],
     components: {
       CarModal,
-      JDate
+      JDate,
+      JInput
     },
     data () {
       return {

src/views/oa/CarfareDetailList.vue

@@ -11,38 +11,38 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="支付凭证编号">
-              <a-input placeholder="请输入支付凭证编号" v-model="queryParam.paymentNo"></a-input>
+              <j-input placeholder="请输入支付凭证编号" v-model="queryParam.paymentNo"></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.carNo"></a-input>
+                <j-input placeholder="请输入车牌号" v-model="queryParam.carNo"></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.submitter"></a-input>
+                <j-input placeholder="请输入报销人" v-model="queryParam.submitter"></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.dept"></a-input>
+                <j-input placeholder="请输入部门" v-model="queryParam.dept"></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.registrant"></a-input>
+                <j-input placeholder="请输入登记人" v-model="queryParam.registrant"></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.registrantDept"></a-input>
+                <j-input placeholder="请输入登记部门" v-model="queryParam.registrantDept"></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.financeOperator"></a-input>
+                <j-input placeholder="请输入财务经办人" v-model="queryParam.financeOperator"></j-input>
               </a-form-item>
             </a-col>
           </template>
@@ -147,6 +147,7 @@
   import CarfareDetailModal from './modules/CarfareDetailModal'
   import CarfareModal from './modules/CarfareModal'
   import JDate from '@/components/jeecg/JDate'  
+  import JInput from '@/components/jeecg/JInput'
   import { getAction } from '@api/manage'
 
   export default {
@@ -154,6 +155,7 @@
     mixins:[JeecgListMixin],
     components: {
       JDate,
+      JInput,
       CarfareDetailModal,
       CarfareModal
     },

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 () {

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 () {

src/views/oa/EnrollmentList.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.operator"></a-input>
+              <j-input placeholder="请输入登记人	" v-model="queryParam.operator"></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.operatorDept"></a-input>
+              <j-input placeholder="请输入登记部门" v-model="queryParam.operatorDept"></j-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
@@ -22,12 +22,12 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="姓名">
-                <a-input placeholder="请输入姓名" v-model="queryParam.realname"></a-input>
+                <j-input placeholder="请输入姓名" v-model="queryParam.realname"></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.username"></a-input>
+                <j-input placeholder="请输入用户账号" v-model="queryParam.username"></j-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -46,7 +46,7 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="职级">
-                <a-input placeholder="请输入职级" v-model="queryParam.postLevel"></a-input>
+                <j-input placeholder="请输入职级" v-model="queryParam.postLevel"></j-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -213,12 +213,14 @@
   import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
   import JDictSelectTag from "@/components/dict/JDictSelectTag"
   import JSelectPosition from '@/components/jeecgbiz/JSelectPosition'
+  import JInput from '@/components/jeecg/JInput'
 
   export default {
     name: "EnrollmentList",
     mixins:[JeecgListMixin],
     components: {
       JDate,
+      JInput,
       EnrollmentModal,
       JSelectDepart,
       JDictSelectTag,

src/views/oa/MaterialInDetailList.vue

@@ -6,38 +6,40 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="物料名称">
-              <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
+              <j-input placeholder="请输入物料名称" v-model="queryParam.materialName"></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.brand"></a-input>
+              <j-input placeholder="请输入品牌" v-model="queryParam.brand"></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.category"></a-input>
+                <j-input placeholder="请输入类别" v-model="queryParam.category"></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.model"></a-input>
+                <j-input placeholder="请输入规格型号" v-model="queryParam.model"></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.operator"></a-input>
+                <j-input placeholder="请输入入库人" v-model="queryParam.operator"></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.operatorDept"></a-input>
+                <j-input placeholder="请输入入库部门" v-model="queryParam.operatorDept"></j-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="入库日期">
-                <j-date placeholder="请选择入库日期" v-model="queryParam.operateDate" style="width: 100%;"></j-date>
+                <j-date placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.operatorDate_begin"></j-date>
+                <span class="query-group-split-cust"></span>
+                <j-date placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.operatorDate_end"></j-date>
               </a-form-item>
             </a-col>
           </template>
@@ -142,6 +144,7 @@
   import MaterialInDetailModal from './modules/MaterialInDetailModal'
   import MaterialInModal from './modules/MaterialInModal'
   import JDate from '@/components/jeecg/JDate.vue'
+  import JInput from '@/components/jeecg/JInput'
   import { getAction } from '@api/manage'
 
   export default {
@@ -149,6 +152,7 @@
     mixins:[JeecgListMixin],
     components: {
       JDate,
+      JInput,
       MaterialInDetailModal,
       MaterialInModal
     },

src/views/oa/MaterialList.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.materialName"></a-input>
+              <j-input placeholder="请输入物料名称" v-model="queryParam.materialName"></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.brand"></a-input>
+              <j-input placeholder="请输入品牌" v-model="queryParam.brand"></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.category"></a-input>
+                <j-input placeholder="请输入类别" v-model="queryParam.category"></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.model"></a-input>
+                <j-input placeholder="请输入规格型号" v-model="queryParam.model"></j-input>
               </a-form-item>
             </a-col>
           </template>
@@ -127,12 +127,14 @@
 
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import MaterialModal from './modules/MaterialModal'
+  import JInput from '@/components/jeecg/JInput'
 
   export default {
     name: "MaterialList",
     mixins:[JeecgListMixin],
     components: {
-      MaterialModal
+      MaterialModal,
+      JInput
     },
     data () {
       return {

src/views/oa/MaterialStockList.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.materialName"></a-input>
+              <j-input placeholder="请输入物料名称" v-model="queryParam.materialName"></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.brand"></a-input>
+              <j-input placeholder="请输入品牌" v-model="queryParam.brand"></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.category"></a-input>
+                <j-input placeholder="请输入类别" v-model="queryParam.category"></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.model"></a-input>
+                <j-input placeholder="请输入规格型号" v-model="queryParam.model"></j-input>
               </a-form-item>
             </a-col>
           </template>
@@ -93,12 +93,14 @@
 
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import MaterialModal from './modules/MaterialModal'
+  import JInput from '@/components/jeecg/JInput'
 
   export default {
     name: "MaterialList",
     mixins:[JeecgListMixin],
     components: {
-      MaterialModal
+      MaterialModal,
+      JInput
     },
     data () {
       return {

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 () {

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 () {

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 () {

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 () {

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 {

src/views/oa/modules/AssetInModal.vue

@@ -19,7 +19,7 @@
           </a-col>
           <a-col :span="8">
             <a-form-item label="单据号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="[ 'inNo', validatorRules.inNo]" placeholder="请输入单据号"></a-input>
+              <a-input v-decorator="[ 'inNo', validatorRules.inNo]" placeholder="请输入单据号" disabled></a-input>
             </a-form-item>
           </a-col>
           <a-col :span="8">
@@ -34,7 +34,7 @@
           </a-col>
           <a-col :span="8">
             <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择创建时间" v-decorator="[ 'createDate']" :showTime="true" dateFormat="YYYY-MM-DD HH:mm:ss" :trigger-change="true" style="width: 100%" disabled/>
+              <j-date placeholder="请选择创建时间" v-decorator="[ 'createTime']" :showTime="true" dateFormat="YYYY-MM-DD HH:mm:ss" :trigger-change="true" style="width: 100%" disabled/>
             </a-form-item>
           </a-col>
           <a-col :span="8">
@@ -318,7 +318,7 @@
           this.form.setFieldsValue({
               creater: this.$store.getters.userInfo.realname,
               createrDept: this.$store.getters.userInfo.deptName,
-              createDate: moment().format('YYYY-MM-DD HH:mm:ss')
+              createTime: moment().format('YYYY-MM-DD HH:mm:ss')
           })
         })
       },

src/views/system/NewUserList.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.realname"></a-input>
+              <j-input placeholder="请输入姓名" v-model="queryParam.realname"></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.username"></a-input>
+              <j-input placeholder="请输入用户账号" v-model="queryParam.username"></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -28,7 +28,7 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="职级">
-              <a-input placeholder="请输入职级" v-model="queryParam.postLevel"></a-input>
+              <j-input placeholder="请输入职级" v-model="queryParam.postLevel"></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -141,6 +141,7 @@
   import SysUserModal from './modules/NewUserModal'
   import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
   import JDate from '@/components/jeecg/JDate.vue'
+  import JInput from '@/components/jeecg/JInput'
   import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
   import JSelectPosition from '@/components/jeecgbiz/JSelectPosition'
 
@@ -150,6 +151,7 @@
     components: {
       JDictSelectTag,
       JDate,
+      JInput,
       SysUserModal,
       JSelectDepart,
       JSelectPosition