Skip to content

T
template_vue
Commit eeb6a4bf authored by 岑歆奕's avatar 岑歆奕 Committed by AiNoeLiYa
Browse files
Options

1.EsLint修复了各方文件格式报错问题 

2.基础工序管理增加了详情信息以及删除了部分不需要的界面元素
parent 916f927b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1852 additions and 1886 deletions
src/api/mesCenter/message.js
View file @ eeb6a4bf
......@@ -46,7 +46,7 @@ export function deleteMes(id) {
export function deleteBatch(ids) {
return request({
url: `/authority/messages/${ids}`,
method: 'delete',
method: 'delete'
})
}
......
src/api/monitor/loginInfo.js
View file @ eeb6a4bf
......@@ -28,7 +28,7 @@ export function cleanLogininfo(query) {
return request({
url: '/monitor/loginInfo/clean',
method: 'delete',
params: query,
params: query
})
}
......
src/api/system/menu.js
View file @ eeb6a4bf
......@@ -89,7 +89,7 @@ export function updateMenu(data) {
const businessId = data.businessId
data = Qs.stringify(data)
return request({
url: '/system/menu/update/'+ businessId,
url: '/system/menu/update/' + businessId,
method: 'put',
data,
headers: {
......
src/components/IconSelect/index.vue
View file @ eeb6a4bf
......@@ -5,9 +5,9 @@
<i slot="suffix" class="el-icon-search el-input__icon" />
</el-input>
<div class="icon-list">
<div class="icon__single" v-for="(item, index) in iconList" :key="index" @click="selectedIcon(item)">
<div v-for="(item, index) in iconList" :key="index" class="icon__single" @click="selectedIcon(item)">
<svg-icon :icon-class="item" style="height: 30px;width: 16px;display: block;margin-right: 5px" />
<div :title="item" class="icon__single__text" style="width: calc(100% - 30px)">{{item}}</div>
<div :title="item" class="icon__single__text" style="width: calc(100% - 30px)">{{ item }}</div>
</div>
</div>
</div>
......@@ -23,6 +23,8 @@ export default {
iconList: icons
}
},
mounted() {
},
methods: {
filterIcons() {
this.iconList = icons
......@@ -38,8 +40,6 @@ export default {
this.name = ''
this.iconList = icons
}
},
mounted() {
}
}
</script>
......
src/components/filterFields/index.vue
View file @ eeb6a4bf
......@@ -88,7 +88,7 @@ export default {
case 'getDepts':
return { value: 'id', label: 'label', emitPath: false }
default:
return {emitPath: false}
return { emitPath: false }
}
}
}
......
src/layout/index.vue
View file @ eeb6a4bf
......@@ -7,7 +7,7 @@
<Header />
</div>
<div class="nav-container-two">
<div class="placeholder"></div>
<div class="placeholder" />
<tags-view />
<navbar />
</div>
......
src/views/equipment/application.vue
View file @ eeb6a4bf
This diff is collapsed.
src/views/equipment/boundinout.vue
View file @ eeb6a4bf
This diff is collapsed.
src/views/equipment/draw.vue
View file @ eeb6a4bf
......@@ -88,7 +88,7 @@
<template>
<div>
<el-table v-loading="loading" border :data="list" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" width="55" label="序号" align="center" />
<el-table-column label="设备名称" align="center" prop="username" />
<el-table-column label="XXXX" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
......@@ -119,7 +119,7 @@
</template>
</el-table-column>
</el-table>
<el-button
type="primary"
size="small"
......@@ -202,8 +202,8 @@ export default {
data() {
return {
loading: false,
list: [],
selection: [],
list: [],
selection: [],
endDatePicker: this.handelFixDate(),
// 自定义按钮
deletetypePrimary: 'danger',
......@@ -269,30 +269,42 @@ export default {
}
}
},
created() {
if (this.$store.getters.searchParams[this.$route.path]) {
const { searchParams } = this.$store.getters; const { path } = this.$route
const param = JSON.parse(searchParams[path]) // 保留着的查询条件
this.queryParams = { ...param }
}
// this.queryParams.loginTime = this.$parseDate(new Date(), 'YYYY-MM-DD HH:mm:ss')
this.getList()
// this.getDicts(dictCons['COMMON_STATUS']).then(response => {
// this.statusOptions = response.data
// })
},
// 多选提交操作
methods: {
handleSelectionChange(selection) {
this.selectedRows = selection;
this.selectedRows = selection
},
submitSelectedRows() {
if (this.selectedRows.length === 0) {
return; // 如果没有选中行，不进行提交操作
return // 如果没有选中行，不进行提交操作
}
axios
.post('/api/submit', this.selectedRows) // 将选中的行数据提交到服务器的接口地址
.then(response => {
// 提交成功处理
console.log(response.data);
console.log(response.data)
// 清空选中的行
this.selectedRows = [];
this.selectedRows = []
})
.catch(error => {
// 提交失败处理
console.error(error);
});
},
console.error(error)
})
}
},
/** 路由离开前存储筛选条件*/
......@@ -305,18 +317,6 @@ export default {
})
next()
},
created() {
if (this.$store.getters.searchParams[this.$route.path]) {
const { searchParams } = this.$store.getters; const { path } = this.$route
const param = JSON.parse(searchParams[path]) // 保留着的查询条件
this.queryParams = { ...param }
}
// this.queryParams.loginTime = this.$parseDate(new Date(), 'YYYY-MM-DD HH:mm:ss')
this.getList()
// this.getDicts(dictCons['COMMON_STATUS']).then(response => {
// this.statusOptions = response.data
// })
},
methods: {
// 清空和导出弹出框的日期选择器禁用当前月份之后的月份
handelFixDate() {
......
src/views/equipment/income.vue
View file @ eeb6a4bf
This diff is collapsed.
src/views/equipment/statistic.vue
View file @ eeb6a4bf
......@@ -36,18 +36,18 @@
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
</el-form-item>
<div style="float: right">
<el-form-item/>
<el-form-item />
</div>
</el-form>
<div class="placeholder"/>
<div class="placeholder" />
<div class="Role" style="width:100%;height:400px; display: flex; flex-direction: column;">
<div class="chart-row" style="display: flex; justify-content: space-between; height: 50%;">
<div id="myChart1" style="width:50%;height:100%;"></div>
<div id="myChart4" style="width:50%;height:100%;"></div>
<div id="myChart1" style="width:50%;height:100%;" />
<div id="myChart4" style="width:50%;height:100%;" />
</div>
<div class="chart-row" style="display: flex; justify-content: space-between; height: 50%;">
<div id="myChart2" style="width:50%;height:100%;"></div>
<div id="myChart3" style="width:50%;height:100%;"></div>
<div id="myChart2" style="width:50%;height:100%;" />
<div id="myChart3" style="width:50%;height:100%;" />
</div>
</div>
</div>
......
src/views/instance/InstanceList.vue
View file @ eeb6a4bf
......@@ -3,7 +3,7 @@
<div class="header-container">
<filter-fields
:filter-fields="filterFields"
:optionDic = "optionDic"
:option-dic="optionDic"
@search="fileSearch"
@reset="fileSearch"
/>
......@@ -27,8 +27,8 @@
<el-table-column
label="序号"
type="index"
width="50">
</el-table-column>
width="50"
/>
<el-table-column type="selection" width="55" />
<el-table-column type="index" width="50" />
<el-table-column
......@@ -232,7 +232,7 @@ export default {
processId: processId,
flowType: 4,
instanceId: instanceId,
processName: this.processName,
processName: this.processName
}
})
},
......
src/views/instance/ListDetail.vue
View file @ eeb6a4bf
......@@ -13,7 +13,7 @@
<div class="instance-template-title-container-title">
{{ getTitle }}
</div>
<!-- <el-button v-show="showDownLoad" type="primary" class="download-btn" @click="downFile">下载</el-button>-->
<!-- <el-button v-show="showDownLoad" type="primary" class="download-btn" @click="downFile">下载</el-button>-->
</div>
<!-- 主容器 -->
<div class="instance-template-main-container">
......
src/views/instance/Template.vue
View file @ eeb6a4bf
......@@ -49,8 +49,8 @@
<el-table-column
label="序号"
type="index"
width="50">
</el-table-column>
width="50"
/>
<el-table-column prop="actName" label="操作步骤" />
<el-table-column prop="updateBy" label="操作人" />
<el-table-column prop="transition" label="操作" />
......
src/views/instance/components/TemplateEndorsementDialog.vue
View file @ eeb6a4bf
......@@ -93,7 +93,7 @@ export default {
// 需要提交的表单
submitForm: {
// 加签类型
type: '1',
type: '1'
},
// 多选选中的数据
multipleSelection: []
......
src/views/instance/doneList.vue
View file @ eeb6a4bf
......@@ -16,7 +16,7 @@
class="instance-todo-list-search-param"
>
<el-form-item label="申请人">
<el-input v-model.trim="searchForm.user" :maxlength="30"/>
<el-input v-model.trim="searchForm.user" :maxlength="30" />
</el-form-item>
<el-form-item label="申请人所属部门">
<el-cascader
......
src/views/login/login.vue
View file @ eeb6a4bf
<template>
<div class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<!-- <img class="fy-logo" src="../../assets/image/denglu_logo.png">-->
<!-- <img class="fy-logo" src="../../assets/image/denglu_logo.png">-->
<h3 class="title">信息化管理系统</h3>
<div class="login-form-content">
<el-form-item prop="username">
......@@ -20,20 +20,20 @@
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
</el-input>
</el-form-item>
<!-- <el-form-item prop="code">-->
<!-- <el-input-->
<!-- v-model="loginForm.code"-->
<!-- auto-complete="off"-->
<!-- placeholder="验证码"-->
<!-- style="width: 63%"-->
<!-- @keyup.enter.native="handleLogin"-->
<!-- >-->
<!-- <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />-->
<!-- </el-input>-->
<!-- &lt;!&ndash;<div class="login-code">-->
<!-- <img :src="codeUrl" @click="getCode">-->
<!-- </div>&ndash;&gt;-->
<!-- </el-form-item>-->
<!-- <el-form-item prop="code">-->
<!-- <el-input-->
<!-- v-model="loginForm.code"-->
<!-- auto-complete="off"-->
<!-- placeholder="验证码"-->
<!-- style="width: 63%"-->
<!-- @keyup.enter.native="handleLogin"-->
<!-- >-->
<!-- <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />-->
<!-- </el-input>-->
<!-- &lt;!&ndash;<div class="login-code">-->
<!-- <img :src="codeUrl" @click="getCode">-->
<!-- </div>&ndash;&gt;-->
<!-- </el-form-item>-->
<el-form-item style="width:80%;margin-bottom: 20px">
<el-button
class="blue-btn"
......@@ -50,12 +50,12 @@
class="buttons-content"
>
<el-checkbox v-model="loginForm.rememberMe" class="rem-code">记住密码</el-checkbox>
<!-- <el-link-->
<!-- :underline="false"-->
<!-- @click="goDetail('/forgetPwd')"-->
<!-- >-->
<!-- <router-link to="/forgetPwd">忘记密码</router-link>-->
<!-- </el-link>-->
<!-- <el-link-->
<!-- :underline="false"-->
<!-- @click="goDetail('/forgetPwd')"-->
<!-- >-->
<!-- <router-link to="/forgetPwd">忘记密码</router-link>-->
<!-- </el-link>-->
</div>
</div>
</el-form>
......
src/views/mesCenter/addMes.vue
View file @ eeb6a4bf
......@@ -190,7 +190,7 @@
<el-checkbox v-model="scope.row.isChecked" @change="(val) => { setOrRemoveUser(val, scope.row) }" />
</template>
</el-table-column>
<!-- <el-table-column type="selection" width="55" :reserve-selection="true" />-->
<!-- <el-table-column type="selection" width="55" :reserve-selection="true" />-->
<el-table-column type="index" label="序号" width="55" />
<!-- <el-table-column property="userId" label="人员编号" width="150" />-->
<el-table-column label="姓名" width="200">
......
src/views/mesCenter/bussinessMes.vue
View file @ eeb6a4bf
......@@ -6,16 +6,16 @@
<el-form style="padding: 0 0 0 10px" :inline="true" size="small" class="demo-form-inline">
<el-form-item label="标题">
<el-input
placeholder="请输入消息标题"
v-model.trim="queryParams.TITLE"
placeholder="请输入消息标题"
:maxlength="30"
clearable
/>
</el-form-item>
<el-form-item label="接收人">
<el-input
placeholder="请输入接收人"
v-model.trim="queryParams.recipientName"
placeholder="请输入接收人"
:maxlength="30"
clearable
/>
......@@ -33,19 +33,19 @@
border
>
<el-table-column type="index" width="50" label="序号" />
<el-table-column :show-overflow-tooltip="true" prop="fromSystem" label="系统" >
<el-table-column :show-overflow-tooltip="true" prop="fromSystem" label="系统">
<template slot-scope="scope">
{{scope.row.fromSystem || '-'}}
{{ scope.row.fromSystem || '-' }}
</template>
</el-table-column>
<el-table-column prop="title" label="标题" width="180" :show-overflow-tooltip="true" >
<el-table-column prop="title" label="标题" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{scope.row.title || '-'}}
{{ scope.row.title || '-' }}
</template>
</el-table-column>
<el-table-column prop="content" label="内容" width="300" :show-overflow-tooltip="true" >
<el-table-column prop="content" label="内容" width="300" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{scope.row.content || '-'}}
{{ scope.row.content || '-' }}
</template>
</el-table-column>
<el-table-column prop="type" label="类型">
......@@ -55,9 +55,9 @@
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="recipientName" label="接收人" >
<el-table-column :show-overflow-tooltip="true" prop="recipientName" label="接收人">
<template slot-scope="scope">
{{scope.row.recipientName || '-'}}
{{ scope.row.recipientName || '-' }}
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" label="创建时间" align="center" prop="createTime">
......
src/views/mesCenter/mailMes.vue
View file @ eeb6a4bf
......@@ -3,7 +3,7 @@
<div class="body">
<!-- 条件查询 -->
<section class="search-group">
<el-form style="padding: 0 0 0 10px" :inline="true" size="small" class="demo-form-inline">
<el-form style="padding: 0 0 0 10px" :inline="true" size="small" class="demo-form-inline">
<el-form-item label="标题">
<el-input v-model.trim="queryParams.TITLE" clearable :maxlength="30" placeholder="请输入消息标题" />
</el-form-item>
......@@ -24,29 +24,29 @@
style="width: 100%;"
>
<el-table-column type="index" width="50" label="序号" />
<el-table-column prop="fromSystem" label="系统" >
<el-table-column prop="fromSystem" label="系统">
<template slot-scope="scope">
{{scope.row.fromSystem || '-'}}
{{ scope.row.fromSystem || '-' }}
</template>
</el-table-column>
<el-table-column prop="title" label="标题" width="180" :show-overflow-tooltip="true" >
<el-table-column prop="title" label="标题" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{scope.row.title || '-'}}
{{ scope.row.title || '-' }}
</template>
</el-table-column>
<el-table-column prop="content" label="内容" width="300" :show-overflow-tooltip="true" >
<el-table-column prop="content" label="内容" width="300" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{scope.row.content || '-'}}
{{ scope.row.content || '-' }}
</template>
</el-table-column>
<el-table-column prop="receiveMail" label="接收人邮箱" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.receiveMail || '-'}}
{{ scope.row.receiveMail || '-' }}
</template>
</el-table-column>
<el-table-column prop="createTime" width="180" label="创建时间" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm')}}
{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}
</template>
</el-table-column>
<!-- <el-table-column label="操作" width="250">-->
......
src/views/mesCenter/msgConfigOld.vue
View file @ eeb6a4bf
......@@ -77,7 +77,7 @@
/>
<span style="font-size: 12px;">${name}代表员工姓名,${item}代表物品名称,${tel}代表电话号码</span>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</span>
</el-dialog>
......
src/views/mobileIntegrated/appManage.vue
View file @ eeb6a4bf
......@@ -74,7 +74,7 @@
</el-table-column>
<el-table-column prop="pcIcon" label="PC图标" :show-overflow-tooltip="true">
<template slot-scope="scope">
<!-- 图片预览-->
<!-- 图片预览-->
<template v-if="scope.row.pcIcon">
<viewer :images="[]">
<img style="height: 34px;width: 40px;margin-top: 2.5px;cursor: pointer" :src="scope.row.pcIcon">
......@@ -90,7 +90,7 @@
</el-table-column>
<el-table-column prop="mobileIcon" label="mobile图标" width="150">
<template slot-scope="scope">
<!-- 图片预览-->
<!-- 图片预览-->
<template v-if="scope.row.mobileIcon">
<viewer :images="[]">
<img v-if="scope.row.mobileIcon" style="height: 34px;width: 40px;margin-top: 2.5px;cursor: pointer" :src="scope.row.mobileIcon">
......
src/views/monitor/errorLog/index.vue
View file @ eeb6a4bf
......@@ -392,22 +392,22 @@ export default {
// const query = Object.assign({}, this.queryParams)
// query.operTime = query.operTime ? this.$parseDate(new Date(query.operTime), 'YYYYMM') : ''
list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.list = response.rows.map(item => {
const title = item.title
if (title) {
const temp = title.split('-')
const systemMode = temp.filter((item, index) => { return index < temp.length - 1 }).join('-')
item.systemMode = systemMode
item.optionName = temp[temp.length - 1]
} else {
item.systemMode = undefined
item.optionName = undefined
}
return item
})
this.total = response.total
this.loading = false
}
this.list = response.rows.map(item => {
const title = item.title
if (title) {
const temp = title.split('-')
const systemMode = temp.filter((item, index) => { return index < temp.length - 1 }).join('-')
item.systemMode = systemMode
item.optionName = temp[temp.length - 1]
} else {
item.systemMode = undefined
item.optionName = undefined
}
return item
})
this.total = response.total
this.loading = false
}
)
},
handleClose() {
......
src/views/monitor/operLog/index.vue
View file @ eeb6a4bf
......@@ -392,22 +392,22 @@ export default {
// const query = Object.assign({}, this.queryParams)
// query.operTime = query.operTime ? this.$parseDate(new Date(query.operTime), 'YYYY-MM-DD HH:mm:ss') : ''
list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.list = response.rows.map(item => {
const title = item.title
if (title) {
const temp = title.split('-')
const systemMode = temp.filter((item, index) => { return index < temp.length - 1 }).join('-')
item.systemMode = systemMode
item.optionName = temp[temp.length - 1]
} else {
item.systemMode = undefined
item.optionName = undefined
}
return item
})
this.total = response.total
this.loading = false
}
this.list = response.rows.map(item => {
const title = item.title
if (title) {
const temp = title.split('-')
const systemMode = temp.filter((item, index) => { return index < temp.length - 1 }).join('-')
item.systemMode = systemMode
item.optionName = temp[temp.length - 1]
} else {
item.systemMode = undefined
item.optionName = undefined
}
return item
})
this.total = response.total
this.loading = false
}
)
},
handleClose() {
......
src/views/practice/jt/index.vue
View file @ eeb6a4bf
<template>
<div class="user-manage">
<div class="search" style="border-bottom: 14px solid #f4f4f4">
<el-form ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" v-show="showSearch" :inline="true" label-width="auto">
<!-- <el-form-item label="用户类型" prop="name" class="noMargin">-->
<!-- <el-input-->
<!-- v-model="queryParams.name"-->
<!-- placeholder="请输入用户类型"-->
<!-- clearable-->
<!-- :maxlength="30"-->
<!-- size="small"-->
<!-- style="width: 150px"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" :inline="true" label-width="auto">
<!-- <el-form-item label="用户类型" prop="name" class="noMargin">-->
<!-- <el-input-->
<!-- v-model="queryParams.name"-->
<!-- placeholder="请输入用户类型"-->
<!-- clearable-->
<!-- :maxlength="30"-->
<!-- size="small"-->
<!-- style="width: 150px"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="登录名" prop="username">
<el-input
v-model="queryParams.username"
......@@ -44,8 +44,8 @@
</el-form-item>
<el-form-item style="float: right">
<el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:add']"
style="padding: 8px 7px;"
type="primary"
size="small"
icon="el-icon-plus"
......@@ -59,8 +59,8 @@
@click="handleImport"
>导入</el-button>
<el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:export']"
style="padding: 8px 7px;"
type="success"
size="small"
icon="el-icon-download"
......@@ -211,16 +211,17 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="手机号码" prop="phone">
<el-form-item label="手机号码" prop="phone">
<el-input
value="phone"
v-model.trim="form.phone"
value="phone"
placeholder="请输入手机号码"
maxlength="11" />
maxlength="11"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-form-item label="邮箱" prop="email">
<el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="25" />
</el-form-item>
</el-col>
......@@ -239,13 +240,13 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="用户类型" prop="name">
<el-form-item label="用户类型" prop="name">
<el-input v-model.trim="form.name" placeholder="请输入用户类型" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="身份证号" prop="idNumber">
<el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" />
<el-form-item label="身份证号" prop="idNumber">
<el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" />
</el-form-item>
</el-col>
</el-row>
......
src/views/practice/lms/index.vue
View file @ eeb6a4bf
<template>
<div class="user-manage">
<div class="search" style="border-bottom: 14px solid #f4f4f4">
<el-form ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" v-show="showSearch" :inline="true" label-width="auto">
<!-- <el-form-item label="用户类型" prop="name" class="noMargin">-->
<!-- <el-input-->
<!-- v-model="queryParams.name"-->
<!-- placeholder="请输入用户类型"-->
<!-- clearable-->
<!-- :maxlength="30"-->
<!-- size="small"-->
<!-- style="width: 150px"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" :inline="true" label-width="auto">
<!-- <el-form-item label="用户类型" prop="name" class="noMargin">-->
<!-- <el-input-->
<!-- v-model="queryParams.name"-->
<!-- placeholder="请输入用户类型"-->
<!-- clearable-->
<!-- :maxlength="30"-->
<!-- size="small"-->
<!-- style="width: 150px"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="登录名" prop="username">
<el-input
v-model="queryParams.username"
......@@ -44,8 +44,8 @@
</el-form-item>
<el-form-item style="float: right">
<el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:add']"
style="padding: 8px 7px;"
type="primary"
size="small"
icon="el-icon-plus"
......@@ -59,8 +59,8 @@
@click="handleImport"
>导入</el-button>
<el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:export']"
style="padding: 8px 7px;"
type="success"
size="small"
icon="el-icon-download"
......@@ -211,16 +211,17 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="手机号码" prop="phone">
<el-form-item label="手机号码" prop="phone">
<el-input
value="phone"
v-model.trim="form.phone"
value="phone"
placeholder="请输入手机号码"
maxlength="11" />
maxlength="11"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-form-item label="邮箱" prop="email">
<el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="25" />
</el-form-item>
</el-col>
......@@ -239,13 +240,13 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="用户类型" prop="name">
<el-form-item label="用户类型" prop="name">
<el-input v-model.trim="form.name" placeholder="请输入用户类型" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="身份证号" prop="idNumber">
<el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" />
<el-form-item label="身份证号" prop="idNumber">
<el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" />
</el-form-item>
</el-col>
</el-row>
......
src/views/practice/qzy/index.vue
View file @ eeb6a4bf
<template>
<div class="user-manage">
<div class="search" style="border-bottom: 14px solid #f4f4f4">
<el-form ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" v-show="showSearch" :inline="true" label-width="auto">
<!-- <el-form-item label="用户类型" prop="name" class="noMargin">-->
<!-- <el-input-->
<!-- v-model="queryParams.name"-->
<!-- placeholder="请输入用户类型"-->
<!-- clearable-->
<!-- :maxlength="30"-->
<!-- size="small"-->
<!-- style="width: 150px"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" :inline="true" label-width="auto">
<!-- <el-form-item label="用户类型" prop="name" class="noMargin">-->
<!-- <el-input-->
<!-- v-model="queryParams.name"-->
<!-- placeholder="请输入用户类型"-->
<!-- clearable-->
<!-- :maxlength="30"-->
<!-- size="small"-->
<!-- style="width: 150px"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="登录名" prop="username">
<el-input
v-model="queryParams.username"
......@@ -44,8 +44,8 @@
</el-form-item>
<el-form-item style="float: right">
<el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:add']"
style="padding: 8px 7px;"
type="primary"
size="small"
icon="el-icon-plus"
......@@ -59,8 +59,8 @@
@click="handleImport"
>导入</el-button>
<el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:export']"
style="padding: 8px 7px;"
type="success"
size="small"
icon="el-icon-download"
......@@ -211,16 +211,17 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="手机号码" prop="phone">
<el-form-item label="手机号码" prop="phone">
<el-input
value="phone"
v-model.trim="form.phone"
value="phone"
placeholder="请输入手机号码"
maxlength="11" />
maxlength="11"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-form-item label="邮箱" prop="email">
<el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="25" />
</el-form-item>
</el-col>
......@@ -239,13 +240,13 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="用户类型" prop="name">
<el-form-item label="用户类型" prop="name">
<el-input v-model.trim="form.name" placeholder="请输入用户类型" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="身份证号" prop="idNumber">
<el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" />
<el-form-item label="身份证号" prop="idNumber">
<el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" />
</el-form-item>
</el-col>
</el-row>
......
src/views/practice/wqc/index.vue
View file @ eeb6a4bf
<template>
<div class="user-manage">
<div class="search" style="border-bottom: 14px solid #f4f4f4">
<el-form ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" v-show="showSearch" :inline="true" label-width="auto">
<!-- <el-form-item label="用户类型" prop="name" class="noMargin">-->
<!-- <el-input-->
<!-- v-model="queryParams.name"-->
<!-- placeholder="请输入用户类型"-->
<!-- clearable-->
<!-- :maxlength="30"-->
<!-- size="small"-->
<!-- style="width: 150px"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" :inline="true" label-width="auto">
<!-- <el-form-item label="用户类型" prop="name" class="noMargin">-->
<!-- <el-input-->
<!-- v-model="queryParams.name"-->
<!-- placeholder="请输入用户类型"-->
<!-- clearable-->
<!-- :maxlength="30"-->
<!-- size="small"-->
<!-- style="width: 150px"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="登录名" prop="username">
<el-input
v-model="queryParams.username"
......@@ -44,8 +44,8 @@
</el-form-item>
<el-form-item style="float: right">
<el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:add']"
style="padding: 8px 7px;"
type="primary"
size="small"
icon="el-icon-plus"
......@@ -59,8 +59,8 @@
@click="handleImport"
>导入</el-button>
<el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:export']"
style="padding: 8px 7px;"
type="success"
size="small"
icon="el-icon-download"
......@@ -211,16 +211,17 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="手机号码" prop="phone">
<el-form-item label="手机号码" prop="phone">
<el-input
value="phone"
v-model.trim="form.phone"
value="phone"
placeholder="请输入手机号码"
maxlength="11" />
maxlength="11"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-form-item label="邮箱" prop="email">
<el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="25" />
</el-form-item>
</el-col>
......@@ -239,13 +240,13 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="用户类型" prop="name">
<el-form-item label="用户类型" prop="name">
<el-input v-model.trim="form.name" placeholder="请输入用户类型" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="身份证号" prop="idNumber">
<el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" />
<el-form-item label="身份证号" prop="idNumber">
<el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" />
</el-form-item>
</el-col>
</el-row>
......
src/views/practice/zxw/index.vue
View file @ eeb6a4bf
<template>
<div class="user-manage">
<div class="search" style="border-bottom: 14px solid #f4f4f4">
<el-form ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" v-show="showSearch" :inline="true" label-width="auto">
<!-- <el-form-item label="用户类型" prop="name" class="noMargin">-->
<!-- <el-input-->
<!-- v-model="queryParams.name"-->
<!-- placeholder="请输入用户类型"-->
<!-- clearable-->
<!-- :maxlength="30"-->
<!-- size="small"-->
<!-- style="width: 150px"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" :inline="true" label-width="auto">
<!-- <el-form-item label="用户类型" prop="name" class="noMargin">-->
<!-- <el-input-->
<!-- v-model="queryParams.name"-->
<!-- placeholder="请输入用户类型"-->
<!-- clearable-->
<!-- :maxlength="30"-->
<!-- size="small"-->
<!-- style="width: 150px"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="登录名" prop="username">
<el-input
v-model="queryParams.username"
......@@ -44,8 +44,8 @@
</el-form-item>
<el-form-item style="float: right">
<el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:add']"
style="padding: 8px 7px;"
type="primary"
size="small"
icon="el-icon-plus"
......@@ -59,8 +59,8 @@
@click="handleImport"
>导入</el-button>
<el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:export']"
style="padding: 8px 7px;"
type="success"
size="small"
icon="el-icon-download"
......@@ -211,16 +211,17 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="手机号码" prop="phone">
<el-form-item label="手机号码" prop="phone">
<el-input
value="phone"
v-model.trim="form.phone"
value="phone"
placeholder="请输入手机号码"
maxlength="11" />
maxlength="11"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-form-item label="邮箱" prop="email">
<el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="25" />
</el-form-item>
</el-col>
......@@ -239,13 +240,13 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="用户类型" prop="name">
<el-form-item label="用户类型" prop="name">
<el-input v-model.trim="form.name" placeholder="请输入用户类型" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="身份证号" prop="idNumber">
<el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" />
<el-form-item label="身份证号" prop="idNumber">
<el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" />
</el-form-item>
</el-col>
</el-row>
......
src/views/processManagement/basicProcessManagement/index.vue
View file @ eeb6a4bf
......@@ -24,22 +24,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="生产状态" prop="flag">
<el-select
v-model="queryParams.flag"
placeholder="请选择生产状态"
clearable
size="small"
style="width: 150px"
>
<el-option
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
</el-form-item>
......@@ -69,26 +53,11 @@
{{ scope.row.workshop || '-' }}
</template>
</el-table-column>
<el-table-column label="状态" align="center" width="100">
<template slot-scope="scope">
<el-switch
v-model="scope.row.flag"
active-value="1"
inactive-value="0"
@change="handleStatusChange(scope.row)"
/>
</template>
</el-table-column>
<el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime">
<template slot-scope="scope">
<span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="修改时间" :show-overflow-tooltip="true" align="center" prop="updataTime">
<template slot-scope="scope">
<span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" prop="createBy">
<template slot-scope="scope">
{{ scope.row.createBy || '-' }}
......@@ -96,7 +65,10 @@
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="240px">
<template slot-scope="scope">
<el-button style="color: #49cec9" :type="typeParent" :size="size" @click="handleUpdate(scope.row)">
<el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)">
详情
</el-button>
<el-button :type="typeParent" :size="size" @click="handleUpdate(scope.row)">
{{ updataName }}
</el-button>
<el-button
......@@ -125,12 +97,8 @@
<el-form-item label="工厂车间" prop="workshop">
<el-input v-model.trim="form.workshop" show-word-limit :maxlength="30" placeholder="请输入工厂车间" />
</el-form-item>
<el-form-item label="状态">
<el-radio v-model="form.flag" label="1">启用</el-radio>
<el-radio v-model="form.flag" label="0">停用</el-radio>
</el-form-item>
<el-form-item label="备注">
<el-input v-model.trim="form.remark" maxlength="200" show-word-limit type="textarea" placeholder="请输入内容" />
<el-form-item label="创建人" prop="createBy">
<el-input v-model.trim="form.createBy" :maxlength="30" show-word-limit placeholder="请输入创建人" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -139,6 +107,24 @@
</div>
</el-dialog>
<!-- TODO: 单项详情信息表单配置 -->
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body>
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<el-form-item label="名称：" prop="processName">
<el-input v-model.trim="singleDetails.processName" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="工厂车间：" prop="workshop">
<el-input v-model.trim="singleDetails.workshop" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="创建时间：" prop="createTime">
<el-input v-model.trim="singleDetails.createTime" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="创建人：" prop="createBy">
<el-input v-model.trim="singleDetails.createBy" :readonly="isReadOnly" />
</el-form-item>
</el-form>
</el-dialog>
</div>
</template>
......@@ -163,10 +149,10 @@ export default {
addIcon: 'el-icon-plus',
exportIcon: 'el-icon-download',
resetIcon: '',
// TODO: 控制只读
isReadOnly: true,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
......@@ -179,8 +165,8 @@ export default {
title: '',
// 是否显示弹出层
open: false,
// 是否显示弹出层（数据权限）
openDataScope: false,
// 是否显示弹出层（数据详情）
openDetails: false,
// 日期范围
// dateRange: [],
// 菜单表格数据
......@@ -189,40 +175,6 @@ export default {
menuNodeAll: false,
deptExpand: true,
deptNodeAll: false,
// 状态数据字典
statusOptions: [
{
dictLabel: '启用',
dictValue: '1'
},
{
dictLabel: '停用',
dictValue: '0'
}
],
// 数据范围选项
dataScopeOptions: [
{
value: '1',
label: '全部数据权限'
},
{
value: '2',
label: '自定数据权限'
},
{
value: '3',
label: '本部门数据权限'
},
{
value: '4',
label: '本部门及以下数据权限'
},
{
value: '5',
label: '仅本人数据权限'
}
],
// 查询参数
queryParams: {
pageNum: 1,
......@@ -232,7 +184,7 @@ export default {
flag: undefined
},
defaultProps: {},
// 表单参数
// TODO: 表单参数
form: {
processName: '',
workshop: '',
......@@ -242,6 +194,7 @@ export default {
updataTime: new Date(),
createBy: ''
},
// TODO: 表单初始参数
formReset: {
processName: '',
workshop: '',
......@@ -250,6 +203,15 @@ export default {
updataTime: new Date(),
createBy: ''
},
// TODO: 表单里的单项详情参数
singleDetails: {
processName: '',
workshop: '',
flag: '1',
createTime: new Date(),
updataTime: new Date(),
createBy: ''
},
// TODO: 模拟测试数据
simulateProcessList: [{ processName: '打磨', workshop: '车间1', flag: 1, createTime: new Date(), updataTime: new Date(), createBy: '张三' }, { processName: '焊接', workshop: '车间2', flag: 2, createTime: new Date(), updataTime: new Date(), createBy: '李四' }],
......@@ -262,8 +224,8 @@ export default {
workshop: [
{ required: true, message: '请输入车间名称', trigger: 'blur' }
],
flag: [
{ required: true, trigger: 'blur' }
createBy: [
{ required: true, message: '请输入创建人姓名', trigger: 'blur' }
]
},
deptOptions: []
......@@ -295,22 +257,6 @@ export default {
console.log(this.roleList)
this.loading = false
},
// 角色状态修改
handleStatusChange(row) {
const text = row.flag === '1' ? '启用' : '停用'
this.$confirm('是否确认操作?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$message({
message: text + '成功',
type: 'success'
})
}).catch(function() {
row.flag = row.flag === '0' ? '1' : '0'
})
},
// 取消按钮
cancel() {
this.open = false
......@@ -326,18 +272,25 @@ export default {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
/** TODO: 重置按钮操作 */
resetQuery() {},
// 多选框选中数据
handleSelectionChange(selection) {},
/** 新增按钮操作 */
/** TODO: 新增按钮操作 */
handleAdd() {
// TODO: 初始化新增对话框的状态
this.form = this.formReset
this.title = '添加工序'
this.open = !this.open
},
/** 修改按钮操作 */
// TODO: 获取所选行详情信息操作
handleDetail(row) {
this.singleDetails = this.formReset
this.singleDetails = row
this.title = '详情信息'
this.openDetails = !this.openDetails
},
/** TODO: 修改按钮操作 */
handleUpdate(row) {
this.reset()
this.title = '修改工序'
......@@ -444,5 +397,19 @@ export default {
width: 4px;
}
.aboutSingleDetails{
.el-form-item{
.el-input >>> .el-input__inner {
-webkit-appearance: none;
background-color: #FFF;
background-image: none;
border-radius: 4px;
border: 0;
width: 100%;
}
}
}
</style>
src/views/production/craftsmanship/index.vue
View file @ eeb6a4bf
<template>
<el-form ref="form" :model="form" label-width="80px" >
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="活动区域">
<el-select v-model="form.region" placeholder="请选择活动区域">
<el-option label="区域一" value="shanghai"></el-option>
<el-option label="区域二" value="beijing"></el-option>
<el-option label="区域一" value="shanghai" />
<el-option label="区域二" value="beijing" />
</el-select>
</el-form-item>
<el-form style="display: flex; flex-wrap: wrap;">
<el-form-item label="文本框1" style="flex-basis: 50%;">
<el-input ref="input1" v-model="form.name" @keyup.enter.native="handelTab(1,$event)" :style="{ width: '400px', height: '30px' }"></el-input>
</el-form-item>
<el-form-item label="文本框2" style="flex-basis: 50%;">
<el-input ref="input2" v-model="form.date1" @keyup.enter.native="handelTab(2,$event)" :style="{ width: '400px', height: '30px' }"></el-input>
</el-form-item>
<el-form-item label="文本框3" style="flex-basis: 50%;">
<el-input ref="input3" v-model="form.date2" @keyup.enter.native="handelTab(3,$event)" :style="{ width: '400px', height: '30px' }"></el-input>
</el-form-item>
<el-form-item v-if="form.region === 'beijing'" label="文本框4" style="flex-basis: 50%;">
<el-input ref="input4" v-model="form.type" @keyup.enter.native="handelTab(4,$event)" :style="{ width: '400px', height: '30px' }"></el-input>
</el-form-item>
<el-form-item v-if="form.region === 'beijing'" label="文本框5" style="flex-basis: 50%;">
<el-input ref="input5" v-model="form.resource" @keyup.enter.native="handelTab(5,$event)" :style="{ width: '400px', height: '30px' }"></el-input>
</el-form-item>
<el-form-item label="文本框6" style="flex-basis: 50%;">
<el-input ref="input6" v-model="form.desc" @keyup.enter.native="handelTab(6,$event)" :style="{ width: '400px', height: '30px' }"></el-input>
</el-form-item>
</el-form>
<el-form-item style="width: 100%;">
<el-form-item label="文本框1" style="flex-basis: 50%;">
<el-input ref="input1" v-model="form.name" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(1,$event)" />
</el-form-item>
<el-form-item label="文本框2" style="flex-basis: 50%;">
<el-input ref="input2" v-model="form.date1" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(2,$event)" />
</el-form-item>
<el-form-item label="文本框3" style="flex-basis: 50%;">
<el-input ref="input3" v-model="form.date2" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(3,$event)" />
</el-form-item>
<el-form-item v-if="form.region === 'beijing'" label="文本框4" style="flex-basis: 50%;">
<el-input ref="input4" v-model="form.type" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(4,$event)" />
</el-form-item>
<el-form-item v-if="form.region === 'beijing'" label="文本框5" style="flex-basis: 50%;">
<el-input ref="input5" v-model="form.resource" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(5,$event)" />
</el-form-item>
<el-form-item label="文本框6" style="flex-basis: 50%;">
<el-input ref="input6" v-model="form.desc" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(6,$event)" />
</el-form-item>
</el-form>
<el-form-item style="width: 100%;">
<el-button type="primary" @click="submitForm">提交</el-button>
</el-form-item>
</el-form>
</template>
<script>
......@@ -48,21 +47,21 @@ export default {
resource: '',
desc: ''
}
};
}
},
methods: {
handelTab(i, e) {
const that = this
if (!that.$refs['input' + i]) {
return
}
that.$nextTick(() => {
e.target.blur()
const index = i + 1
that.$refs['input' + index].focus()
})
},
}
const that = this
if (!that.$refs['input' + i]) {
return
}
that.$nextTick(() => {
e.target.blur()
const index = i + 1
that.$refs['input' + index].focus()
})
}
}
}
</script>
\ No newline at end of file
</script>
src/views/production/data/index.vue
View file @ eeb6a4bf
......@@ -12,8 +12,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
</el-form-item>
......@@ -27,7 +26,7 @@
<!-- >新增</el-button>-->
<!-- <coolbutton style="padding: 8px 7px;" :type="typePrimary" :name="addName" :size="smallSize" :icon="addIcon" :haspermi="addHaspermi" @btn-click="handleAdd" /> -->
<!-- <el-button-->
<!-- v-hasPermi="['sys:role:export']"-->
<!-- style="padding: 8px 7px;"-->
......@@ -51,20 +50,18 @@
<el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="index" label="序号" width="380" /> -->
<el-table-column label="xxx" prop="xxx" :show-overflow-tooltip="true" width="250">
<template slot-scope="scope">
{{ scope.row.xxx || '-' }}
</template>
</el-table-column>
<el-table-column label="xxx" prop="xxx" :show-overflow-tooltip="true" width="250">
<template slot-scope="scope">
{{ scope.row.xxx || '-' }}
</template>
</el-table-column>
<el-table-column label="xxx" prop="xxx" :show-overflow-tooltip="true" width="250">
<template slot-scope="scope">
{{ scope.row.xxx || '-' }}
......@@ -103,7 +100,7 @@
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column> -->
</el-table>
</div>
<pagination
......
src/views/system/deptManage/index.vue
View file @ eeb6a4bf
......@@ -16,7 +16,7 @@
width="120"
>
<template slot-scope="scope">
{{ scope.$index + 1}}
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="deptId" label="部门编号">
......
src/views/system/dict/index.vue
View file @ eeb6a4bf
......@@ -420,11 +420,11 @@ export default {
/** 查询字典类型列表 */
getList() {
listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.options = response.rows
this.typeList = response.rows
this.total = response.total
this.loading = false
}
this.options = response.rows
this.typeList = response.rows
this.total = response.total
this.loading = false
}
)
},
// 获取当前父字典数据
......
src/views/system/menu/index.vue
View file @ eeb6a4bf
......@@ -266,7 +266,7 @@ import dictCons from '@/utils/dictCons'
import Coolbutton from '@/components/coolbutton'
export default {
name: 'Menu',
components: { Treeselect, IconSelect,Coolbutton },
components: { Treeselect, IconSelect, Coolbutton },
data() {
var trueGroupName = (rule, value, callback) => {
if (!value.trim()) {
......
src/views/system/post/index.vue
View file @ eeb6a4bf
......@@ -113,8 +113,7 @@
inactive-value="0"
active-value="1"
@click.native="handleStatusChange(scope.row)"
>
</el-switch>
/>
</template>
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.flag || '-' }}-->
......@@ -227,7 +226,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import dictCons from '@/utils/dictCons'
import { listDept } from '@/api/system/dept'
import { listRole } from '@/api/system/role'
import {updateType} from "@/api/system/dict/type";
import { updateType } from '@/api/system/dict/type'
export default {
name: 'Post',
components: { Treeselect },
......
src/views/system/user/index.vue
View file @ eeb6a4bf
......@@ -660,10 +660,10 @@ export default {
getList() {
this.loading = true
listUser(this.queryParams).then(response => {
this.userList = response.rows
this.total = response.total
this.loading = false
}
this.userList = response.rows
this.total = response.total
this.loading = false
}
)
},
roleChange(e) {
......
src/views/test/test.vue
View file @ eeb6a4bf
......@@ -16,8 +16,8 @@
<el-table-column
label="序号"
type="index"
width="50">
</el-table-column>
width="50"
/>
<el-table-column
prop="date"
label="日期"
......
src/views/workflow/formTemplateHtml/add.vue
View file @ eeb6a4bf
......@@ -6,7 +6,8 @@
<el-input
v-model.trim="form.name"
:maxlength="30"
style="width: 10.3vw;min-width: 148px; height: 2.9vh; min-height:32px"/>
style="width: 10.3vw;min-width: 148px; height: 2.9vh; min-height:32px"
/>
</el-form-item>
<el-form-item label="选择分组" prop="groupId">
<el-select
......@@ -20,15 +21,17 @@
<el-form-item class="right">
<el-button
type="primary"
@click="submitForm('2')"
style="width: 3.1vw; min-width: 60px; height: 2.9vh; min-height:32px"
@click="submitForm('2')"
>{{ id ? '保存并发布' : '保存并发布' }}</el-button>
<el-button
style="width: 3.1vw; min-width: 60px; height: 2.9vh; min-height:32px"
@click="submitForm('1')">保存</el-button>
@click="submitForm('1')"
>保存</el-button>
<el-button
style="width: 3.1vw; min-width: 60px; height: 2.9vh; min-height:32px"
@click="toBack">返回列表</el-button>
@click="toBack"
>返回列表</el-button>
</el-form-item>
</el-form>
</header>
......
src/views/workflow/formTemplateHtml/list.vue
View file @ eeb6a4bf
......@@ -56,9 +56,9 @@
<div class="placeholder" />
<!-- emementUI表格 -->
<div class="template-list-table">
<!-- <div class="mb12 font-small-bold"></div>-->
<!-- <div class="mb12 font-small-bold"></div>-->
<div class="mb12 font-main-bold">表单模板列表</div>
<!-- <h5 style="margin: 1vh 0 1vh 0; font-size: 14px"></h5>-->
<!-- <h5 style="margin: 1vh 0 1vh 0; font-size: 14px"></h5>-->
<el-table
ref="multipleTable"
v-loading="queryLoading"
......@@ -129,7 +129,7 @@
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button v-else v-hasPermi="['zt:workflowTemplate:cancelPublish']" size="mini" @click.native="publish(scope.row.businessId, '1')" type="text">取消发布</el-button>
<el-button v-else v-hasPermi="['zt:workflowTemplate:cancelPublish']" size="mini" type="text" @click.native="publish(scope.row.businessId, '1')">取消发布</el-button>
</template>
</el-table-column>
</el-table>
......
src/views/workflow/group/index.vue
View file @ eeb6a4bf
......@@ -121,15 +121,15 @@
class="edit-form"
:before-close="formHandleClose"
>
<el-form ref="editForm" :model="editForm" label-width="80px" :rules="editFormRules">
<el-form ref="editForm" :model="editForm" label-width="80px" :rules="editFormRules">
<el-form-item label="业务编号" prop="groupCode">
<el-input v-model.trim="editForm.groupCode" style="width: 95%" :maxlength="30" auto-complete="off" show-word-limit placeholder="请输入业务编号" />
</el-form-item>
<el-form-item label="业务名称" prop="groupName">
<el-input style="width: 95%" v-model.trim="editForm.groupName" :maxlength="30" auto-complete="off" show-word-limit placeholder="请输入业务名称" />
<el-input v-model.trim="editForm.groupName" style="width: 95%" :maxlength="30" auto-complete="off" show-word-limit placeholder="请输入业务名称" />
</el-form-item>
<el-form-item label="业务排序" prop="sort">
<el-input-number style="width: 95%" v-model="editForm.sort" controls-position="right" :min="0" :max="100" />
<el-input-number v-model="editForm.sort" style="width: 95%" controls-position="right" :min="0" :max="100" />
</el-form-item>
<el-form-item label="应用选择" prop="adhibitionId">
<el-select v-model="editForm.adhibitionId" style="width: 95%" clearable placeholder="请选择应用" @visible-change="clearClosed">
......
src/views/workflow/processLIst/ProcessList.vue
View file @ eeb6a4bf
......@@ -613,8 +613,8 @@ export default {
})
that.getList()
}).catch(err => {
loading.close()
})
loading.close()
})
} else {
// 发布
publishProcess(params).then(res => {
......
src/views/workflow/workFlowInstance/index.vue
View file @ eeb6a4bf
......@@ -69,7 +69,7 @@
<el-table-column v-if="activeName==='0'" prop="currentPoint" label="当前节点" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.currentPoint || '-' }}
<el-button style="display: none" type="text primary" size="mini" @click="goDetail(scope.row)">查看</el-button>
<el-button style="display: none" type="text primary" size="mini" @click="goDetail(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column v-if="activeName==='1'" prop="updateDate" label="结束时间" show-overflow-tooltip>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment