java_project
/
hy-vue
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

流程关联回显不能修改,模糊查询,部门查询

dev
0.0 2 years ago
parent
8c3b675330
commit
b02b95a4e3
4 changed files with 102 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
  2. 14
      src/views/activiti/form/ProcessUdgetPlanForm.vue
  3. 109
      src/views/system/UserList.vue
  4. 12
      src/views/system/modules/UserModal.vue

20
src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
Unescape View File

@ -48,16 +48,16 @@
<j-date placeholder="请选择授权时间(结束时间)" v-decorator="['privilegedTimeEnd',validatorRules.privilegedTimeEnd]" @change="dateback2" :trigger-change="true" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="是否继续授权" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag v-decorator="['continueAuthorize', {}]" placeholder="是否继续授权" :type="'radio'" :triggerChange="true" dictCode="authorize_code"/>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="授权确认时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-date placeholder="请选择授权时间(确认时间)" v-decorator="['privilegedAffirmedTime',validatorRules.privilegedAffirmedTime]" :trigger-change="true" style="width: 100%" />
</a-form-item>
</a-col>
<!-- <a-col :span="12">-->
<!-- <a-form-item label="是否继续授权" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <j-dict-select-tag v-decorator="['continueAuthorize', {}]" placeholder="是否继续授权" :type="'radio'" :triggerChange="true" dictCode="authorize_code"/>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :span="12">-->
<!-- <a-form-item label="授权确认时间" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <j-date placeholder="请选择授权时间(确认时间)" v-decorator="['privilegedAffirmedTime',validatorRules.privilegedAffirmedTime]" :trigger-change="true" style="width: 100%" />-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :span="12">
<a-form-item label="授权天数" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-number v-decorator="['authorizationNumberDays']" placeholder="授权天数" style="width: 100%" disabled/>

14
src/views/activiti/form/ProcessUdgetPlanForm.vue
Unescape View File

@ -190,6 +190,7 @@
// slotName: 'actions', // <-------------slot 的名称，对应 v-slot 冒号后面和等号前面的内容
// type: FormTypes.slot,
type: FormTypes.sel_search,
disabled: this.disabled,
// slotName: 'group',
width: '200px',
options: [],
@ -205,6 +206,7 @@
key: 'materialNumber',
type: FormTypes.sel_search,
dictCode: '',
disabled: this.disabled,
width: '200px',
placeholder: '请输入${title}',
options: [],
@ -269,6 +271,7 @@
title: '物料名称及规格型号',
key: 'materialName',
type: FormTypes.input,
disabled: this.disabled,
// type: FormTypes.sel_search,
// dictCode: '',
width: '200px',
@ -279,6 +282,7 @@
title: '系列',
key: 'materialSeries',
type: FormTypes.input,
disabled: this.disabled ,
// dictCode: '',
width: '200px',
placeholder: '请输入${title}',
@ -288,6 +292,7 @@
title: '单位',
key: 'materialUnit',
type: FormTypes.input,
disabled: this.disabled,
// type: FormTypes.select,
// dictCode: '',
width: '200px',
@ -298,6 +303,7 @@
title: '单价(元）',
key: 'materialPrice',
type: FormTypes.inputNumber,
disabled: this.disabled,
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
@ -306,6 +312,7 @@
title: '对比单价',
key: 'action',
type: FormTypes.slot,
disabled: this.disabled,
width: '80px',
// placeholder: '请输入${title}',
// defaultValue: '',
@ -316,6 +323,7 @@
title: '数量',
key: 'materialQuantity',
type: FormTypes.inputNumber,
disabled: this.disabled,
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
@ -324,6 +332,7 @@
title: '金额（元）',
key: 'materialAmount',
type: FormTypes.inputNumber,
disabled: this.disabled,
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
@ -332,6 +341,7 @@
title: '供应商',
key: 'supplierId',
type: FormTypes.input,
disabled: this.disabled,
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
@ -340,6 +350,7 @@
title: '执行标准',
key: 'materialStandard',
type: FormTypes.input,
disabled: this.disabled,
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
@ -348,6 +359,7 @@
title: '交货时间',
key: 'deliveryTime',
type: FormTypes.date,
disabled: this.disabled,
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
@ -356,6 +368,7 @@
title: '备注',
key: 'remarks',
type: FormTypes.input,
disabled: this.disabled,
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
@ -376,6 +389,7 @@
}
},
btndisabled: false,
isShowInput: '',
// 表单校验
validatorRules: {
// 'blur'是鼠标失去焦点的时候会触发验证

109
src/views/system/UserList.vue
Unescape View File

@ -14,48 +14,74 @@
</a-col>
<a-col :md="6" :sm="8">
<a-form-item label="性别">
<a-select v-model="queryParam.sex" placeholder="请选择性别">
<a-form-item label="用户状态">
<a-select v-model="queryParam.status" placeholder="请选择">
<a-select-option value="">请选择</a-select-option>
<a-select-option value="1">男性</a-select-option>
<a-select-option value="2">女性</a-select-option>
<a-select-option value="1">正常</a-select-option>
<a-select-option value="2">冻结</a-select-option>
</a-select>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :md="6" :sm="8">
<a-form-item label="真实名字">
<a-input placeholder="请输入真实名字" v-model="queryParam.realname"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="8">
<a-form-item label="手机号码">
<a-input placeholder="请输入手机号码查询" v-model="queryParam.phone"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="8">
<a-form-item label="用户状态">
<a-select v-model="queryParam.status" placeholder="请选择">
<a-select-option value="">请选择</a-select-option>
<a-select-option value="1">正常</a-select-option>
<a-select-option value="2">冻结</a-select-option>
</a-select>
</a-form-item>
</a-col>
</template>
<a-col :md="6" :sm="8">
<a-form-item label="真实名字">
<a-input placeholder="请输入真实名字" v-model="queryParam.realname"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="8">
<a-form-item label="部门">
<j-select-depart v-model="queryParam.departIds" :trigger-change="true" ></j-select-depart>
</a-form-item>
</a-col>
<!-- <a-row :gutter="24">-->
<!-- <a-col :md="6" :sm="8">-->
<!-- <a-form-item label="选择职务">-->
<!-- <j-select-position :buttons="false" v-model="formData.post" />-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- </a-row>-->
<!-- <a-col :md="6" :sm="8">-->
<!-- <a-form-item label="性别">-->
<!-- <a-select v-model="queryParam.sex" placeholder="请选择性别">-->
<!-- <a-select-option value="">请选择</a-select-option>-->
<!-- <a-select-option value="1">男性</a-select-option>-->
<!-- <a-select-option value="2">女性</a-select-option>-->
<!-- </a-select>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <template v-if="toggleSearchStatus">-->
<!-- <a-col :md="6" :sm="8">-->
<!-- <a-form-item label="真实名字">-->
<!-- <a-input placeholder="请输入真实名字" v-model="queryParam.realname"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!--&lt;!&ndash; <a-col :md="6" :sm="8">&ndash;&gt;-->
<!--&lt;!&ndash; <a-form-item label="手机号码">&ndash;&gt;-->
<!--&lt;!&ndash; <a-input placeholder="请输入手机号码查询" v-model="queryParam.phone"></a-input>&ndash;&gt;-->
<!--&lt;!&ndash; </a-form-item>&ndash;&gt;-->
<!--&lt;!&ndash; </a-col>&ndash;&gt;-->
<!-- <a-col :md="6" :sm="8">-->
<!-- <a-form-item label="用户状态">-->
<!-- <a-select v-model="queryParam.status" placeholder="请选择">-->
<!-- <a-select-option value="">请选择</a-select-option>-->
<!-- <a-select-option value="1">正常</a-select-option>-->
<!-- <a-select-option value="2">冻结</a-select-option>-->
<!-- </a-select>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- </template>-->
<a-col :md="6" :sm="8">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<!-- <a @click="handleToggleSearch" style="margin-left: 8px">-->
<!-- {{ toggleSearchStatus ? '收起' : '展开' }}-->
<!-- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
<!-- </a>-->
</span>
</a-col>
@ -129,9 +155,9 @@
更多 <a-icon type="down"/>
</a>
<a-menu slot="overlay">
<a-menu-item>
<a href="javascript:;" @click="handleDetail(record)">详情</a>
</a-menu-item>
<!-- <a-menu-item>-->
<!-- <a href="javascript:;" @click="handleDetail(record)">详情</a>-->
<!-- </a-menu-item>-->
<a-menu-item>
<a href="javascript:;" @click="handleChangePassword(record.username)">密码</a>
@ -183,6 +209,8 @@
import JInput from '@/components/jeecg/JInput'
import UserRecycleBinModal from './modules/UserRecycleBinModal'
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
import JSelectPosition from '@comp/jeecgbiz/JSelectPosition'
export default {
name: "UserList",
@ -193,13 +221,20 @@
PasswordModal,
JInput,
UserRecycleBinModal,
JSuperQuery
JSuperQuery,
JSelectDepart,
JSelectPosition
},
data() {
return {
description: '这是用户管理页面',
queryParam: {},
recycleBinVisible: false,
formData: {
areaLinkage1: '110105',
areaLinkage2: '140221',
sex: 1
},
columns: [
/*{
title: '#',

12
src/views/system/modules/UserModal.vue
Unescape View File

@ -175,13 +175,13 @@
<a-input placeholder="请输入手机号码" :disabled="isDisabledAuth('user:form:phone')" v-decorator="[ 'phone', validatorRules.phone]" />
</a-form-item>
<a-form-item label="座机" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入座机" v-decorator="[ 'telephone', validatorRules.telephone]"/>
</a-form-item>
<!-- <a-form-item label="座机" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <a-input placeholder="请输入座机" v-decorator="[ 'telephone', validatorRules.telephone]"/>-->
<!-- </a-form-item>-->
<a-form-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag v-decorator="['activitiSync', {}]" placeholder="请选择是否同步工作流引擎" :type="'radio'" :triggerChange="true" dictCode="activiti_sync"/>
</a-form-item>
<!-- <a-form-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <j-dict-select-tag v-decorator="['activitiSync', {}]" placeholder="请选择是否同步工作流引擎" :type="'radio'" :triggerChange="true" dictCode="activiti_sync"/>-->
<!-- </a-form-item>-->
</a-form>
</a-spin>

Write Preview
Loading…
Cancel
Save