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

src/components/jeecgbiz/modal/JSelectUserByDepModal.vue

@@ -155,7 +155,7 @@
       initUserNames() {
         if (this.userIds) {
           // 这里最后加一个 , 的原因是因为无论如何都要使用 in 查询，防止后台进行了模糊匹配，导致查询结果不准确
-          let values = this.userIds.split(',') + ','
+          let values = ','+ this.userIds.split(',') + ','
           var param = {
             // username: values,
               pageNo: 1,
@@ -173,6 +173,7 @@
               })
               this.selectedRowKeys = selectedRowKeys
               console.log("回显用户",selectedRowKeys)
+              console.log("回显用户名",realNames.join(','))
               this.$emit('initComp', realNames.join(','))
             }
           })

src/views/oa/AssetInDetailList.vue

@@ -316,6 +316,7 @@
         this.$refs.multiAddModalForm.add();
         this.$refs.multiAddModalForm.title = "新增";
         this.$refs.multiAddModalForm.disableSubmit = false;
+        this.$refs.multiAddModalForm.init();
       },
     }
   }

src/views/oa/DepartList.vue

@@ -7,10 +7,10 @@
         <a-row style="margin-left: 14px">
           <a-button @click="handleAdd(2)" type="primary">添加子部门</a-button>
           <a-button @click="handleAdd(1)" type="primary">添加一级部门</a-button>
-          <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
+          <!-- <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
           <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
             <a-button type="primary" icon="import">导入</a-button>
-          </a-upload>
+          </a-upload> -->
           <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
           <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
         </a-row>
@@ -78,7 +78,7 @@
               <a-form-item
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
-                label="机构名称">
+                label="部门名称">
                 <a-input placeholder="部门名称" v-decorator="['departName', validatorRules.departName ]"/>
               </a-form-item>
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级部门">
@@ -109,9 +109,9 @@
             </div>
           </a-card>
         </a-tab-pane>
-        <a-tab-pane tab="部门权限" key="2" forceRender>
+        <!-- <a-tab-pane tab="部门权限" key="2" forceRender>
           <depart-auth-modal ref="departAuth"/>
-        </a-tab-pane>
+        </a-tab-pane> -->
       </a-tabs>
 
     </a-col>

src/views/oa/modules/AssetInDetailModal.vue

@@ -17,7 +17,13 @@
           <a-input v-decorator="[ 'assetName', validatorRules.assetName]" placeholder="请输入资产名称"></a-input>
         </a-form-item>
         <a-form-item label="资产类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input v-decorator="[ 'assetsCategory', validatorRules.assetsCategory]" placeholder="请输入资产类别"></a-input>
+          <a-select  v-decorator="[ 'assetsCategory', validatorRules.assetsCategory]">
+            <a-select-option value="办公家具">办公家具</a-select-option>
+            <a-select-option value="办公设备">办公设备</a-select-option>
+            <a-select-option value="不动产">不动产</a-select-option>
+            <a-select-option value="车辆">车辆</a-select-option>
+            <a-select-option value="其他">其他</a-select-option>
+          </a-select>
         </a-form-item>
         <a-form-item label="品牌" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input v-decorator="[ 'brand', validatorRules.brand]" placeholder="请输入品牌"></a-input>
@@ -71,13 +77,13 @@
           <j-upload v-decorator="['attachment', validatorRules.attachment]" :trigger-change="true"></j-upload>
         </a-form-item>
         <a-form-item label="入库人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input v-decorator="[ 'operator', validatorRules.operator]" placeholder="请输入入库人"></a-input>
+          <a-input v-decorator="[ 'operator', validatorRules.operator]" placeholder="请输入入库人" disabled></a-input>
         </a-form-item>
         <a-form-item label="入库部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input v-decorator="[ 'operatorDept', validatorRules.operatorDept]" placeholder="请输入入库部门"></a-input>
+          <a-input v-decorator="[ 'operatorDept', validatorRules.operatorDept]" placeholder="请输入入库部门" disabled></a-input>
         </a-form-item>
         <a-form-item label="入库日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-date placeholder="请选择入库日期" v-decorator="[ 'operatorDate', validatorRules.operatorDate]" :trigger-change="true" style="width: 100%"/>
+          <j-date placeholder="请选择入库日期" v-decorator="[ 'operatorDate', validatorRules.operatorDate]" :trigger-change="true" style="width: 100%" disabled/>
         </a-form-item>
 
       </a-form>

src/views/oa/modules/AssetInModal.vue

@@ -24,17 +24,17 @@
           </a-col>
           <a-col :span="8">
             <a-form-item label="创建人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="[ 'creater', validatorRules.creater]" placeholder="请输入创建人"></a-input>
+              <a-input v-decorator="[ 'creater', validatorRules.creater]" placeholder="请输入创建人" disabled></a-input>
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="创建部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="[ 'createrDept', validatorRules.createrDept]" placeholder="请输入创建部门"></a-input>
+              <a-input v-decorator="[ 'createrDept', validatorRules.createrDept]" placeholder="请输入创建部门" disabled></a-input>
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择创建时间" v-decorator="[ 'createDate']" :trigger-change="true" style="width: 100%"/>
+              <j-date placeholder="请选择创建时间" v-decorator="[ 'createDate']" :trigger-change="true" style="width: 100%" disabled/>
             </a-form-item>
           </a-col>
           <a-col :span="8">
@@ -89,6 +89,7 @@
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { validateDuplicateValue } from '@/utils/util'
   import JDate from '@/components/jeecg/JDate'  
+  import moment from 'moment'
 
   export default {
     name: 'AssetInModal',
@@ -122,10 +123,12 @@
           createrDept: {rules: [
           ]},
           operator: {rules: [
+            {required: true, message: '请选择入库人	!'},
           ]},
           operatorDept: {rules: [
           ]},
           operatorDate: {rules: [
+            {required: true, message: '请选择入库日期	!'},
           ]},
         },
         refKeys: ['assetInDetail', ],
@@ -157,8 +160,14 @@
               key: 'assetsCategory',
               type: FormTypes.input,
               width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue: '',
+              type: FormTypes.select,
+              options: [ // 下拉选项  
+                { title: '办公家具', value: '办公家具' },
+                { title: '办公设备', value: '办公设备' },
+                { title: '不动产', value: '不动产' },
+                { title: '车辆', value: '车辆' },
+                { title: '其他', value: '其他' },
+              ],
             },
             {
               title: '品牌',
@@ -245,8 +254,8 @@
               key: 'user',
               type: FormTypes.popup,
               popupCode:"user_dept",
-              destFields:"user,userDept",
-              orgFieldse:"realname,depart_name",
+              destFields:"user,userDept,state",
+              orgFieldse:"realname,depart_name,state",
               width:"200px",
               placeholder: '请输入${title}',
               defaultValue: '',
@@ -300,6 +309,15 @@
       }
     },
     methods: {
+      init(){
+        this.$nextTick(() => {
+          this.form.setFieldsValue({
+              creater: this.$store.getters.userInfo.realname,
+              createrDept: this.$store.getters.userInfo.deptName,
+              createDate: moment().format('YYYY-MM-DD')
+          })
+        })
+      },
       getAllTable() {
         let values = this.tableKeys.map(key => getRefPromise(this, key))
         return Promise.all(values)

src/views/oa/modules/CarfareModal.vue

@@ -110,7 +110,7 @@
         addDefaultRowNum: 1,
         validatorRules: {
           registrant: {rules: [
-            {required: true, message: '请输入登记人!'},
+            {required: true, message: '请选择登记人!'},
           ]},
           registrantDept: {rules: [
           ]},
@@ -118,7 +118,7 @@
             {required: true, message: '请输入报销总额!'},
           ]},
           financeOperator: {rules: [
-            {required: true, message: '请输入财务经办人!'},
+            {required: true, message: '请选择财务经办人!'},
           ]},
           financeDept: {rules: [
           ]},

src/views/oa/modules/EnrollmentModal.vue

@@ -86,7 +86,12 @@
           </a-col>
           <a-col :span="8  ">
             <a-form-item label="学历" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="[ 'education', validatorRules.education]" placeholder="请输入学历"></a-input>
+              <a-select v-decorator="['education', validatorRules.education]" placeholder="请选择学历">
+                <a-select-option value="大专">大专</a-select-option>
+                <a-select-option value="本科">本科</a-select-option>
+                <a-select-option value="硕士">硕士</a-select-option>
+                <a-select-option value="博士">博士</a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :span="8  ">
@@ -277,7 +282,7 @@
             {required: true, message: '请输入职级!'},
           ]},
           education: {rules: [
-            {required: true, message: '请输入学历!'},
+            {required: true, message: '请选择学历!'},
           ]},
           positionType: {rules: [
             {required: true, message: '请输入岗位类型!'},
@@ -375,10 +380,14 @@
             {
               title: '性别',
               key: 'sex',
-              type: FormTypes.input,
               width:"200px",
               placeholder: '请输入${title}',
               defaultValue: '',
+              type: FormTypes.select,
+              options: [ // 下拉选项  
+                { title: '男', value: '1' },
+                { title: '女', value: '2' },
+              ],
             },
             {
               title: '联系方式',

src/views/oa/modules/MaterialInModal.vue

@@ -102,10 +102,13 @@
         addDefaultRowNum: 1,
         validatorRules: {
           operator: {rules: [
+            {required: true, message: '请选择入库人	!'},
+            
           ]},
           operatorDept: {rules: [
           ]},
           operateDate: {rules: [
+            {required: true, message: '请选择入库日期	!'},
           ]},
           remark: {rules: [
           ]},
@@ -130,6 +133,7 @@
               width:"200px",
               placeholder: '请选择物料',
               defaultValue: '',
+              validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             {
               title: '品牌',

src/views/system/modules/AddressListRight.vue

@@ -118,13 +118,13 @@
             title: '手机',
             width: '15%',
             align: 'center',
-            dataIndex: 'phone'
+            dataIndex: 'mobile'
           },
           {
             title: '座机',
             width: '15%',
             align: 'center',
-            dataIndex: 'ncompanyPhone'
+            dataIndex: 'phone'
           },
           // {
           //   title: '虚拟网号',
@@ -150,12 +150,12 @@
           //   align: 'center',
           //   dataIndex: 'telephone'
           // },
-          {
-            title: '公司邮箱',
-            width: '15%',
-            align: 'center',
-            dataIndex: 'email'
-          }
+          // {
+          //   title: '公司邮箱',
+          //   width: '15%',
+          //   align: 'center',
+          //   dataIndex: 'email'
+          // }
         ],
         url: {
           exportXlsUrl: "/sys/user/exportXls?address=1",

src/views/system/modules/NewUserModal.vue

@@ -65,7 +65,12 @@
           </a-col>
           <a-col :span="8  ">
             <a-form-item label="学历" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="[ 'education', validatorRules.education]" placeholder="请输入学历"></a-input>
+              <a-select v-decorator="['education', validatorRules.education]" placeholder="请选择学历">
+                <a-select-option value="大专">大专</a-select-option>
+                <a-select-option value="本科">本科</a-select-option>
+                <a-select-option value="硕士">硕士</a-select-option>
+                <a-select-option value="博士">博士</a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :span="8  ">
@@ -258,7 +263,7 @@
             {required: true, message: '请输入职级!'},
           ]},
           education: {rules: [
-            {required: true, message: '请输入学历!'},
+            {required: true, message: '请选择学历!'},
           ]},
           positionType: {rules: [
             {required: true, message: '请输入岗位类型!'},
@@ -356,10 +361,14 @@
             {
               title: '性别',
               key: 'sex',
-              type: FormTypes.input,
               width:"200px",
               placeholder: '请输入${title}',
               defaultValue: '',
+              type: FormTypes.select,
+              options: [ // 下拉选项  
+                { title: '男', value: '1' },
+                { title: '女', value: '2' },
+              ],
             },
             {
               title: '联系方式',