Merge remote-tracking branch 'origin/wsm' 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/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">
@@ -146,12 +146,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/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/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