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

修改用户编辑查看

dev
caoyizhong 2 years ago
parent
28b722de03
commit
7dd71a298b
6 changed files with 58 additions and 30 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. 17
      src/views/modules/oss/OSSFileList.vue
  2. 13
      src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
  3. 2
      src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue
  4. 9
      src/views/system/UserList.vue
  5. 33
      src/views/system/modules/UserModal.vue
  6. 14
      src/views/wastematerials/ProcessWasteMaterialsList.vue

17
src/views/modules/oss/OSSFileList.vue
Unescape View File

@ -4,24 +4,31 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<a-col :md="5" :sm="8">
<a-form-item label="文件名称">
<a-input placeholder="请输入文件名称" v-model="queryParam.name"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="8">
<a-col :md="5" :sm="8">
<a-form-item label="上传人">
<a-input placeholder="上传人" v-model="queryParam.createBy"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-col :xl="5" :lg="7" :md="8" :sm="24">
<a-form-item label="类型">
<a-select v-model="queryParam.fileType" placeholder="请选择文件类型" >
<a-select-option v-for="(item,index) in typeId" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="6" :sm="8">
<a-col :xl="5" :lg="7" :md="8" :sm="24">
<a-form-item label="公司风采查询">
<a-select v-model="queryParam.status" placeholder="请选择" >
<a-select-option :value="1">公司风采</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="4" :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>
@ -95,7 +102,7 @@
<a-divider type="vertical"/>
<a @click="downloadFile(record.url)">下载</a>
<a-divider type="vertical"/>
<a @click="ossDelete(record.id)" v-if="!!record.status">删除</a>
<a @click="ossDelete(record.id)" v-if="record.status == 1">删除</a>
</span>
</a-table>

13
src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
Unescape View File

@ -11,13 +11,13 @@
</a-form-item>
</a-col>
<a-col :xl="5" :lg="7" :md="8" :sm="16">
<a-form-item label="物料">
<a-input placeholder="请输入物料" v-model="queryParam.item"/>
<a-form-item label="物料号">
<a-input placeholder="请输入物料号" v-model="queryParam.item"/>
</a-form-item>
</a-col>
<a-col :xl="5" :lg="7" :md="8" :sm="16">
<a-form-item label="物料描述">
<a-input placeholder="请输入物料描述" v-model="queryParam.itemDescription"/>
<a-form-item label="物料名称">
<a-input placeholder="请输入物料名称" v-model="queryParam.itemDescription"/>
</a-form-item>
</a-col>
<a-col :xl="5" :lg="7" :md="8" :sm="16">
@ -59,7 +59,7 @@
<a-table
ref="table"
size="middle"
:scroll="{y:460}"
:scroll="{y:600}"
bordered
rowKey="id"
:columns="columns"
@ -70,7 +70,7 @@
@change="handleTableChange">
<span slot="merchandiseName" slot-scope="text, record">
<j-ellipsis :value="text" :length="10"/>
<j-ellipsis :value="text" :length="12"/>
</span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
@ -155,6 +155,7 @@
{
title:'物料名称及规格型号',
width:200,
align:"center",
scopedSlots: { customRender: 'merchandiseName' },
dataIndex: 'merchandiseName'

2
src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue
Unescape View File

@ -131,7 +131,7 @@
<a-col :span="8">
<a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['accountingAttributes',validatorRules.accountingAttributes]"
:trigger-change="true" dictCode="stronger_material_type"
:trigger-change="true" dictCode="material_type"
placeholder="请选择物资类型" />
<!-- <a-input v-decorator="['accountingAttributes']" type="list" :trigger-change="true" placeholder="请选择核算属性" />-->

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

@ -215,7 +215,7 @@
</div>
<!-- table区域-end -->
<user-modal ref="modalForm" @ok="modalFormOk"></user-modal>
<user-modal ref="modalForm" @ok="modalFormOk" :edit-means="datum"></user-modal>
<password-modal ref="passwordmodal"></password-modal>
<!-- 用户回收站 -->
@ -257,6 +257,7 @@
description: '这是用户管理页面',
queryParam: {},
recycleBinVisible: false,
datum: false,
formData: {
areaLinkage1: '110105',
areaLinkage2: '140221',
@ -378,9 +379,15 @@
}
}
if(kai){
this.datum =false;
this.$refs.modalForm.edit(record);
this.$refs.modalForm.title = "编辑";
this.$refs.modalForm.disableSubmit = false;
}else{
this.datum = true;
this.$refs.modalForm.edit(record);
this.$refs.modalForm.title = "编辑";
this.$refs.modalForm.disableSubmit = true;
}
},

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

@ -4,9 +4,14 @@
:width="modalWidth"
:visible="visible"
:confirmLoading="confirmLoading"
@ok="handleSubmit"
@cancel="close"
cancelText="关闭">
<template slot="footer">
<!-- // closable 是否显示右上角的关闭按钮 @cancel="close" @ok="handleSubmit" -->
<!-- // slot="footer" 不需要默认确定取消按钮，重写确定和取消-->
<a-button type="primary" @click="handleSubmit" :disabled = "editMeans">确定</a-button>
<a-button @click="close">关闭</a-button>
</template>
<template slot="title">
<div style="width: 100%;">
@ -24,7 +29,7 @@
<a-col :span="12" >
<a-form-item label="用户账号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<!--:readOnly="!!model.id"-->
<a-input placeholder="请输入用户账号" v-decorator.trim="[ 'username', validatorRules.username]" />
<a-input placeholder="请输入用户账号" v-decorator.trim="[ 'username', validatorRules.username]" :disabled = "editMeans" />
</a-form-item>
</a-col>
@ -42,24 +47,24 @@
</template>
<a-col :span="12" >
<a-form-item label="用户姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" >
<a-input placeholder="请输入用户姓名" v-decorator.trim="[ 'realname', validatorRules.realname]" />
<a-input placeholder="请输入用户姓名" v-decorator.trim="[ 'realname', validatorRules.realname]" :disabled = "editMeans"/>
</a-form-item>
</a-col>
<a-col :span="12" >
<a-form-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入工号" v-decorator.trim="[ 'workNo', validatorRules.workNo]" />
<a-input placeholder="请输入工号" v-decorator.trim="[ 'workNo', validatorRules.workNo]" :disabled = "editMeans"/>
</a-form-item>
</a-col>
<a-col :span="12" >
<a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-select-position placeholder="请选择职务" :multiple="true" v-decorator.trim="['post']"/>
<j-select-position placeholder="请选择职务" :multiple="true" v-decorator.trim="['post']" :disabled = "editMeans"/>
</a-form-item>
</a-col>
<a-col :span="12" >
<a-form-item label="角色分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!roleDisabled" >
<a-select
mode="multiple"
:disabled="departDisabled"
:disabled="departDisabled || editMeans"
style="width: 100%"
placeholder="请选择用户角色"
optionFilterProp = "children"
@ -77,9 +82,10 @@
<a-input-search
placeholder="点击选择部门"
v-model="checkedDepartNameString"
:disabled = "editMeans"
readOnly
@search="onSearch">
<a-button slot="enterButton" icon="search">选择</a-button>
<a-button slot="enterButton" icon="search" :disabled = "editMeans">选择</a-button>
</a-input-search>
<!-- <j-select-depart v-model="checkedDepartNameString" :multi="false" :value="checkedDepartNameString" :trigger-change="true" ></j-select-depart>-->
</a-form-item>
@ -116,6 +122,7 @@
:action="uploadAction"
:data="{'isup':1}"
:headers="headers"
:disabled = "editMeans"
:beforeUpload="beforeUpload"
@change="handleChange"
>
@ -140,6 +147,7 @@
class="autograph-uploader"
:showUploadList="false"
:action="uploadAction"
:disabled = "editMeans"
:data="{'isup':1}"
:headers="headers"
:beforeUpload="beforeUpload"
@ -203,7 +211,7 @@
<!-- </a-form-item>-->
<a-col :span="12" >
<a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select v-decorator="[ 'sex', {}]" placeholder="请选择性别" :getPopupContainer= "(target) => target.parentNode">
<a-select v-decorator="[ 'sex', {}]" placeholder="请选择性别" :getPopupContainer= "(target) => target.parentNode" :disabled = "editMeans">
<a-select-option :value="1">男</a-select-option>
<a-select-option :value="2">女</a-select-option>
</a-select>
@ -211,12 +219,13 @@
</a-col>
<a-col :span="12" >
<a-form-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入邮箱" v-decorator="[ 'email', validatorRules.email]" />
<a-input placeholder="请输入邮箱" v-decorator="[ 'email', validatorRules.email]" :disabled = "editMeans" />
</a-form-item>
</a-col>
<a-col :span="12" >
<a-form-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入手机号码" :disabled="isDisabledAuth('user:form:phone')" v-decorator="[ 'phone', validatorRules.phone]" />
<!-- <a-input placeholder="请输入手机号码" :disabled="isDisabledAuth('user:form:phone')" v-decorator="[ 'phone', validatorRules.phone]" />-->
<a-input placeholder="请输入手机号码" v-decorator="[ 'phone', validatorRules.phone]" :disabled = "editMeans" />
</a-form-item>
</a-col>
@ -268,6 +277,9 @@
JSelectDepart,
JSelectPosition
},
props:{
editMeans:{ type: Boolean, default: false, required: false },
},
data () {
return {
departDisabled: false, //是否是我的部门调用该页面
@ -378,6 +390,7 @@
created () {
const token = Vue.ls.get(ACCESS_TOKEN);
this.headers = {"X-Access-Token":token}
console.log("=-=--",this.editMeans);
this.initTenantList()
},

14
src/views/wastematerials/ProcessWasteMaterialsList.vue
Unescape View File

@ -4,29 +4,29 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24" :hidden="show">
<a-col :xl="5" :lg="7" :md="8" :sm="24" :hidden="show">
<a-form-item label="项目部">
<a-select v-model="queryParam.departId" placeholder="请输入项目部" @mouseenter="getUnit" >
<a-select-option v-for="(item,index) in queryParamsUntil" :key="index" :value="item.id">{{item.departName}}</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-col :xl="5" :lg="7" :md="8" :sm="24">
<a-form-item label="物料组">
<a-input placeholder="请输入物料组" v-model="queryParam.materialGroup"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-col :xl="5" :lg="7" :md="8" :sm="24">
<a-form-item label="物料号">
<a-input placeholder="请输入物料号" v-model="queryParam.materialNumber"></a-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.materialDescription"></a-input>
<a-col :xl="5" :lg="7" :md="8" :sm="24">
<a-form-item label="物料名称">
<a-input placeholder="请输入物料名称" v-model="queryParam.materialDescription"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label="核算属性">
<j-dict-select-tag placeholder="请输入核算属性" v-model="queryParam.accountingAttributes" dictCode="material_type"></j-dict-select-tag>
<!-- <a-input placeholder="请输入核算属性" v-model="queryParam.accountingAttributes" dictCode="material_type"></a-input>-->

Write Preview
Loading…
Cancel
Save