Skip to content

T
template_vue
Commit eeed2ff2 authored by kzy's avatar kzy
Browse files
Options

Merge branch 'project1' of http://gitlab.91isoft.com:90/yangshuo/template_vue into project1

parents a42e3281 f93e5086
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1633 additions and 843 deletions
src/api/equipment/draw.js 0 → 100644
View file @ eeed2ff2
import request from '@/utils/request'
import Qs from 'qs'
// 查询基础信息列表
export function listWbApply(query) {
return request({
url: '/wbapply/queryWbApplyByPagination',
method: 'get',
params: query
})
}
export function getlistRole() {
return request({
url: 'system/role/listAll',
method: 'get'
})
}
// 查询角色详细
export function getRole(businessId) {
return request({
url: '/system/role/detail/' + businessId,
method: 'get'
})
}
// 新增角色
export function addRole(data) {
data = Qs.stringify(data)
return request({
url: '/system/role/add',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
// 修改角色
export function updateRole(data) {
const businessId = data.businessId
data = Qs.stringify(data)
return request({
url: '/system/role/update/' + businessId,
method: 'put',
data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
// 角色数据权限
export function dataScope(data) {
data = Qs.stringify(data)
return request({
url: '/system/role/dataScope',
method: 'put',
data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
// 角色状态修改
export function changeRoleStatus(businessId, flag) {
const data = {
businessId,
flag
}
return request({
url: '/system/role/changeStatus',
method: 'put',
params: data
})
}
// 删除角色
export function delRole(roleId) {
return request({
url: '/system/role/deleteLogical/' + roleId,
method: 'delete'
})
}
// 导出角色
export function exportRole(query) {
return request({
url: '/system/role/export',
method: 'get',
params: query,
responseType: 'blob'
})
}
src/api/processLibrary/InventoryRecord.js
View file @ eeed2ff2
import request from '@/utils/request'
export function listLog(queryParams) {
console.log('this is date:', queryParams.dateRange)
return request({
url: '/wbwarehouselog/queryWbWarehouseLogByPagination',
method: 'get',
......
src/api/sample/basicInformation.js
View file @ eeed2ff2
......@@ -8,3 +8,41 @@ export function queryList(params) {
params
})
}
// 添加基础信息接口
export function add(data) {
return request({
url: '/wbchemistrybaseinfo/add',
method: 'post',
data,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})
}
// 根据id查询基础信息接口
export function getDetailById(id) {
return request({
url: '/wbchemistrybaseinfo/detail/' + id,
method: 'get'
})
}
// 编辑基础信息接口
export function updataInfo(data) {
return request({
url: '/wbchemistrybaseinfo/update',
method: 'put',
data,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})
}
// 逻辑删除基础信息接口
export function deleteLogical(id) {
return request({
url: '/wbchemistrybaseinfo/deleteLogical/' + id,
method: 'delete'
})
}
src/components/Table/BaseTable/index.vue
View file @ eeed2ff2
<template>
<div>
<div style="padding:5px 10px">
<div class="mb12 font-small-bold">{{ allTableArguments.listName }}</div>
<div class="tableList" style="height:600px;">
<div class="tableList" style=" height:600px;">
<el-scrollbar style="height: 100%;">
<el-table
v-loading="allTableArguments.loading"
......@@ -11,46 +11,6 @@
style="width: 100%"
@selection-change="handleSelectionChange"
>
<!-- <el-table-column type="index" label="序号" width="50" :index="allTableArguments.nIndex" />-->
<!-- <el-table-column label="工序名称" prop="processName" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.processName || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="生产车间" prop="workshop">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.workshop || '-' }}-->
<!-- </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="操作人" prop="createBy" width="210px">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.createBy || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="操作"-->
<!-- class-name="small-padding fixed-width"-->
<!-- width="180px"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <div class="processListBtns">-->
<!-- <el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)">-->
<!-- 详情-->
<!-- </el-button>-->
<!-- <el-button :type="typeParent" :size="size" @click="handleUpdate(scope.row)">-->
<!-- 修改-->
<!-- </el-button>-->
<!-- <el-button :type="typeParent" :size="size" @click="handleDelete(scope.row)">-->
<!-- 删除-->
<!-- </el-button>-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column type="index" label="序号" width="50" :index="allTableArguments.nIndex" />
......@@ -100,14 +60,14 @@
<!-- 操作按钮 -->
<span v-if="column.isOperation" class="processListBtns">
<span v-for="(operations, index) in column.operation" :key="index">
<el-button v-if="operations.isShow(row,$index)" :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="operations.buttonClick(row,$index)">{{ operations.label }}</el-button>
<el-button v-if=" operations.clickType === '1' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleDetail">{{ operations.label }}</el-button>
<el-button v-else-if=" operations.clickType === '2' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleUpdate">{{ operations.label }}</el-button>
<el-button v-else-if=" operations.clickType === '3' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleDelete">{{ operations.label }}</el-button>
</span>
</span>
</template>
</el-table-column>
</el-table>
</el-scrollbar>
<div />
</div>
......@@ -171,7 +131,7 @@ export default {
/* TODO: 这里是控制内容列表的样式 */
.processListBtns {
.el-button {
margin: 0 7px;
margin: 0 12px;
}
}
......
src/permission.js
View file @ eeed2ff2
......@@ -24,7 +24,7 @@ router.beforeEach((to, from, next) => {
store.dispatch('GetInfo').then(res => {
// 判断用户是否有权限 有角色
if (res.data.roles && res.data.roles.length > 0 && res.data.permissions && res.data.permissions.length > 0) {
if (res.data.permissions && res.data.permissions.length > 0) {
// 拉取user_info
const roles = res.data.roles
store.dispatch('GenerateRoutes', { roles }).then((routers) => {
......
src/store/modules/user.js
View file @ eeed2ff2
......@@ -61,10 +61,10 @@ const user = {
const avatar = user.avatar === null ? require('@/assets/image/profile.jpg') : user.avatar
if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.data.roles)
commit('SET_PERMISSIONS', res.data.permissions)
} else {
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
commit('SET_PERMISSIONS', res.data.permissions)
commit('SET_NAME', user.username)
commit('SET_SPECIALTAG', user.specialTag)
commit('SET_AVATAR', avatar)
......
src/views/equipment/basicInfo.vue
View file @ eeed2ff2
This diff is collapsed.
src/views/equipment/boundManagement.vue
View file @ eeed2ff2
......@@ -152,7 +152,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="plocation：" prop="plocation">
......@@ -160,21 +159,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="prank：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" />
<el-form-item label="厚度：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
......@@ -190,10 +176,22 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item label="厚度：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
<el-form-item label="parnk：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" />
</el-form-item>
</el-form>
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
</el-dialog>
</div>
</template>
......
src/views/equipment/draw.vue
View file @ eeed2ff2
This diff is collapsed.
src/views/equipment/management.vue
View file @ eeed2ff2
......@@ -140,7 +140,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="plocation：" prop="plocation">
......@@ -148,21 +147,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="prank：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" />
<el-form-item label="厚度：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
......@@ -178,10 +164,22 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item label="厚度：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
<el-form-item label="parnk：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" />
</el-form-item>
</el-form>
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
</el-dialog>
</div>
</template>
......
src/views/processManagement/basicProcessManagement/index.vue
View file @ eeed2ff2
......@@ -149,7 +149,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="plocation：" prop="plocation">
......@@ -157,21 +156,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="prank：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" />
<el-form-item label="厚度：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
......@@ -187,10 +173,22 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item label="厚度：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
<el-form-item label="parnk：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" />
</el-form-item>
</el-form>
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
</el-dialog>
</div>
</template>
......
src/views/processManagement/draw.vue 0 → 100644
View file @ eeed2ff2
This diff is collapsed.
src/views/sample/basicInformation/index.vue
View file @ eeed2ff2
......@@ -49,7 +49,7 @@
<div class="placeholder" />
<!-- 表单区 -->
<div style="padding:5px 10px">
<div class="mb12 font-small-bold">基础样式列表</div>
<div class="mb12 font-small-bold">基础信息列表</div>
<el-table v-loading="loading" border :data="basicinfoMationList">
<el-table-column type="index" label="序号" width="50" />
<el-table-column label="pn" prop="pn" :show-overflow-tooltip="true">
......@@ -57,24 +57,24 @@
{{ scope.row.pn || '-' }}
</template>
</el-table-column>
<el-table-column label="qty" prop="qty" :show-overflow-tooltip="true">
<el-table-column label="name" prop="name" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.qty || '-' }}
{{ scope.row.name || '-' }}
</template>
</el-table-column>
<el-table-column label="name" prop="name" :show-overflow-tooltip="true">
<el-table-column label="qty" prop="qty" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.name || '-' }}
{{ scope.row.qty || '-' }}
</template>
</el-table-column>
<el-table-column label="max_qty" prop="max_qty" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.max_qty || '-' }}
{{ scope.row.maxQty || '-' }}
</template>
</el-table-column>
<el-table-column label="min_qty" prop="min_qty" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.min_qty || '-' }}
{{ scope.row.minQty || '-' }}
</template>
</el-table-column>
<el-table-column label="unit" prop="unit" :show-overflow-tooltip="true">
......@@ -87,9 +87,9 @@
{{ scope.row.createName || '-' }}
</template>
</el-table-column>
<el-table-column label="操作时间" prop="create_date" :show-overflow-tooltip="true">
<el-table-column label="操作时间" prop="createDate" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.create_date || '-' }}
{{ parseTime(scope.row.createDate,'{y}-{m}-{d}') || '-' }}
</template>
</el-table-column>
<el-table-column label="操作">
......@@ -126,28 +126,25 @@
@pagination="getList"
/>
<!-- 新增修改弹出 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" @close="cancel">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="pn" prop="pn">
<el-input v-model.trim="form.pn" show-word-limit :maxlength="30" placeholder="请输入pn" />
</el-form-item>
<el-form-item label="qty" prop="qty">
<el-input v-model.trim="form.qty" show-word-limit :maxlength="30" placeholder="请输入qty" />
<el-input v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" />
</el-form-item>
<el-form-item label="name" prop="name">
<el-input v-model.trim="form.name" show-word-limit :maxlength="30" placeholder="请输入name" />
<el-input v-model.trim="form.name" :maxlength="30" placeholder="请输入name" />
</el-form-item>
<el-form-item label="pgx" prop="pgx">
<el-input-number v-model="form.pgx" style="width: 100%" controls-position="right" :min="0" placeholder="请输入pgx" />
<el-form-item label="qty" prop="qty">
<el-input v-model.trim="form.qty" :maxlength="30" placeholder="请输入qty" />
</el-form-item>
<el-form-item label="max_qty" prop="max_qty">
<el-input-number v-model="form.max_qty" style="width: 100%" controls-position="right" :min="0" placeholder="请输入max_qty" />
<el-form-item label="maxQty" prop="maxQty">
<el-input v-model.trim="form.maxQty" :maxlength="30" placeholder="请输入max_qty" />
</el-form-item>
<el-form-item label="min_qty" prop="min_qty">
<el-input-number v-model="form.min_qty" style="width: 100%" controls-position="right" :min="0" placeholder="请输入min_qty" />
<el-form-item label="minQty" prop="minQty">
<el-input v-model.trim="form.minQty" :maxlength="30" placeholder="请输入min_qty" />
</el-form-item>
<el-form-item label="unit" prop="unit">
<el-input-number v-model="form.unit" style="width: 100%" controls-position="right" :min="0" placeholder="请输入unit" />
<el-input v-model.trim="form.unit" :maxlength="30" placeholder="请输入unit" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -159,7 +156,8 @@
</template>
<script>
import { queryList } from '@/api/sample/basicInformation'
import { queryList, add, getDetailById, updataInfo, deleteLogical } from '@/api/sample/basicInformation'
import {parseTime} from "@/utils";
export default {
name: 'Index',
......@@ -171,7 +169,12 @@ export default {
},
rules: {
pn: [{ required: true, message: '输入pn', trigger: 'change' }]
pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],
name: [{ required: true, message: '请输入name', trigger: 'blur' }],
qty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
maxQty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
minQty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
unit: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }]
},
total: 0,
loading: false,
......@@ -189,23 +192,94 @@ export default {
this.getList()
},
methods: {
// 清空表单
reFrom() {
this.form = {
businessId: undefined,
pn: '',
name: '',
qty: '',
maxQty: '',
minQty: '',
unit: ''
}
this.$refs.form.clearValidate()
},
// 提交
submitForm() {
this.$refs.form.validate((valid) => {
if (valid) {
// 校验通过，提交表单或进行其他操作
console.log('form', this.form)
if (this.form.businessId !== undefined) {
console.log('更新')
updataInfo(this.form).then(res => {
console.log('res', res)
if (res.code === 200) {
this.open = false
this.$message.success('操作成功')
this.getList()
this.reFrom()
} else if (res.code === null) {
this.$message.error(res.message)
}
})
} else {
add(this.form).then(res => {
console.log('res', res)
if (res.code === 200) {
this.open = false
this.$message.success('操作成功')
this.getList()
this.reFrom()
} else if (res.code === null) {
this.$message.error(res.message)
}
})
}
} else {
// 校验失败，显示错误信息或进行其他操作
console.log('22222')
}
})
},
cancel() {
this.open = false
this.reFrom()
},
handleDelete() {
handleDelete(row) {
console.log('row', row)
const id = row.businessId
this.$confirm('是否确认操作?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(res => {
deleteLogical(id).then(res => {
console.log('res', res)
if (res.code === 200) {
this.$message.success('操作成功')
this.getList()
}
})
})
},
handleUpdate() {
// 编辑
handleUpdate(row) {
console.log('row', row)
const id = row.businessId
getDetailById(id).then(res => {
console.log('res', res)
this.form = res.data
this.open = true
})
},
// 初始化获取数据
getList() {
this.loading = true
queryList(this.queryParams).then(res => {
console.log('res', res)
res.rows.createDate = parseTime(res.rows.createDate,'{y}-{m}-{d}')
this.total = res.total
this.basicinfoMationList = res.rows
this.loading = false
......@@ -227,7 +301,8 @@ export default {
this.getList()
},
handleAdd() {
this.open = true
this.title = '添加基础信息表单'
},
handleExport() {
......
src/views/system/user/index.vue
View file @ eeed2ff2
......@@ -184,8 +184,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page.sync="queryParams.page"
:limit.sync="queryParams.rows"
@pagination="getList"
/>
</el-col>
......@@ -529,8 +529,8 @@ export default {
},
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
page: 1,
rows: 10,
username: undefined,
email: undefined,
phone: undefined,
......
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