rev:报表优化、新增区域人员权限

This commit is contained in:
2023-07-10 08:50:19 +08:00
parent 4a0fae0317
commit 8b1c3853c8
100 changed files with 1330 additions and 5278 deletions

View File

@@ -1,274 +0,0 @@
<template>
<el-dialog
:title="crud.status.title"
append-to-body
fullscreen
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0 || crud.status.view > 0"
>
<el-row v-show="crud.status.cu > 0 || crud.status.view > 0" :gutter="20">
<el-col :span="20" style="border: 1px solid white">
<span />
</el-col>
<el-col :span="4">
<span>
<el-button
icon="el-icon-check"
size="mini"
:loading="crud.cu === 2"
:disabled="crud.status.view > 0"
type="primary"
@click="crud.submitCU"
>保存</el-button>
<el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
</span>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form
ref="form"
:inline="true"
:model="form"
:rules="rules"
style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
class="demo-form-inline"
size="mini"
label-width="auto"
label-position="right"
label-suffix=":"
>
<el-form-item label="工艺路线号" prop="processroute_code">
<el-input
v-model="form.processroute_code"
:disabled="crud.status.view > 0"
size="mini"
style="width: 210px"
class="filter-item"
/>
</el-form-item>
<el-form-item label="工艺路线名称" prop="processroute_name">
<el-input
v-model="form.processroute_name"
:disabled="crud.status.view > 0"
size="mini"
style="width: 210px"
class="filter-item"
/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
</el-form-item>
</el-form>
</el-col>
</el-row>
<!--如果想在工具栏加入更多按钮,可以使用插槽方式, slot = 'left' or 'right'-->
<div class="crud-opts2" style="margin-bottom: 5px;">
<span class="role-span">工艺路线明细</span>
<span v-if="crud.status.cu > 0 || crud.status.view > 0" class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
:disabled="crud.status.view > 0"
@click="insertLine"
>
新增一行
</el-button>
<el-button
slot="left"
class="filter-item"
type="danger"
icon="el-icon-close"
size="mini"
:disabled="crud.status.view > 0"
@click="delLine"
>
删除一行
</el-button>
</span>
</div>
<!--表格渲染-->
<el-table
ref="table"
:data="form.tableData"
style="width: 100%;"
height="400"
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column v-model="form.tableData.workprocedure_no" type="index" label="序号" width="50" align="center" />
<el-table-column prop="workprocedure_name" label="工序名称" align="center">
<template slot-scope="scope">
<el-select v-model="form.tableData[scope.$index].workprocedure_id" style="width: 200px" size="mini" clearable class="edit-input" :disabled="crud.status.view > 0" placeholder="请选择" @change="getName(scope.row)">
<el-option
v-for="item in workList"
:label="item.label"
:value="item.value"
/>
</el-select>
</template>
</el-table-column>
<el-table-column prop="workprocedure_code" label="工序号" align="center" show-overflow-tooltip>
<template slot-scope="scope">
<el-input v-model="form.tableData[scope.$index].workprocedure_code" style="width: 200px" size="mini" class="edit-input" disabled />
</template>
</el-table-column>
<el-table-column prop="process_explain" label="加工说明" align="center">
<template slot-scope="scope">
<el-input v-model="form.tableData[scope.$index].process_explain" style="width: 200px" size="mini" class="edit-input" :disabled="crud.status.view > 0" />
</template>
</el-table-column>
<el-table-column prop="is_check" label="是否需要质检" align="center">
<template slot-scope="scope">
<el-select v-model="form.tableData[scope.$index].is_check" style="width: 200px" size="mini" class="edit-input" :disabled="crud.status.view > 0" placeholder="请选择">
<el-option
v-for="item in isChckList"
:label="item.label"
:value="item.value"
/>
</el-select>
</template>
</el-table-column>
</el-table>
</el-dialog>
</template>
<script>
import crudProcessroute from '@/views/wms/pdm/base/routing/processroute'
import CRUD, { crud, form } from '@crud/crud'
const defaultForm = {
processroute_id: null,
processroute_code: null,
processroute_name: null,
processroute_status: null,
remark: null,
tableData: []
}
export default {
name: 'AddDialog',
mixins: [form(defaultForm), crud()],
dicts: ['ST_INV_TYPE_RC'],
props: {
dialogShow: {
type: Boolean,
default: false
},
openParam: {
type: Object
}
},
data() {
return {
dialogVisible: false,
workList: [],
isChckList: [
{ value: '0', label: '否' },
{ value: '1', label: '是' }
],
rules: {
processroute_code: [
{ required: true, message: '工艺路线编码不能为空', trigger: 'blur' }
],
processroute_name: [
{ required: true, message: '工艺路线名称不能为空', trigger: 'blur' }
]
}
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
created() {
crudProcessroute.getWorkList().then(res => {
this.workList = res
})
},
methods: {
[CRUD.HOOK.afterToEdit]() {
crudProcessroute.getDtl({ 'processroute_id': this.form.processroute_id }).then(res => {
this.form.tableData = res
})
},
[CRUD.HOOK.beforeSubmit]() {
const data = this.form.tableData
if (data.length === 0) {
this.crud.notify('请至少新增一条工艺路线', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
for (let i = 0; i < data.length; i++) {
const item = data[i]
if (!item.workprocedure_id) {
this.crud.notify('工序号或者工序名称不能为空', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
}
},
[CRUD.HOOK.afterToView]() {
crudProcessroute.getDtl({ 'processroute_id': this.form.processroute_id }).then(res => {
this.form.tableData = res
})
},
handleClose(done) {
this.$confirm('确认关闭?')
.then(_ => {
done()
})
.catch(_ => {
})
},
close() {
this.$emit('update:dialogShow', false)
},
insertLine() {
this.form.tableData.push({ workprocedure_no: '', is_check: '1' })
},
delLine() {
this.form.tableData.splice(-1)
},
getName(val) {
debugger
const arr = this.workList
for (let i = 0; i < arr.length; i++) {
if (arr[i].value === val.workprocedure_id) {
val.workprocedure_code = arr[i].code
}
}
}
}
}
</script>
<style>
.crud-opts2 {
padding: 4px 0;
display: -webkit-flex;
display: flex;
align-items: center;
}
.crud-opts2 .crud-opts-right2 {
margin-left: auto;
}
</style>
<style rel="stylesheet/scss" lang="scss" scoped>
::v-deep .el-dialog__body {
padding-top: 2px;
}
</style>

View File

@@ -1,187 +0,0 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="11 0px"
label-suffix=":"
>
<el-form-item label="工艺路线">
<el-input
v-model="query.processroute_code"
clearable
size="mini"
placeholder="工路线编码或名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="工艺路线状态">
<el-select
v-model="query.processroute_status"
clearable
size="mini"
placeholder="单据状态"
class="filter-item"
@change="hand"
>
<el-option
v-for="item in procStatusList"
:label="item.label"
:value="item.code"
/>
</el-select>
</el-form-item>
<rrOperation />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
@click="submit"
>
提交
</el-button>
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
@click="CancelSubmit"
>
取消提交
</el-button>
</crudOperation>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="processroute_id" label="工艺路线标识" />
<el-table-column prop="processroute_status" label="状态" :formatter="formatStatus" />
<el-table-column prop="processroute_code" label="工艺路线编码">
<template slot-scope="scope">
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.processroute_code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="processroute_name" label="工艺路线名称" show-overflow-tooltip min-width="130" />
<el-table-column prop="detail_count" label="工序数" />
<el-table-column prop="remark" label="备注" min-width="130" show-overflow-tooltip />
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" width="150px" />
<el-table-column prop="audit_optname" label="审核人" />
<el-table-column prop="audit_time" label="审核时间" width="150px" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
:disabled-edit="canUd(scope.row)"
:disabled-dle="canUd(scope.row)"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
<AddDialog />
</div>
</template>
<script>
import crudProcessroute from '@/views/wms/pdm/base/routing/processroute'
import CRUD, { presenter, header, form, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import AddDialog from '@/views/wms/pdm/base/routing/AddDialog'
export default {
name: 'Processroute',
components: { AddDialog, pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(), crud()],
cruds() {
return CRUD({
title: '工艺路线',
url: 'api/processroute',
idField: 'processroute_id',
sort: 'processroute_id,desc',
crudMethod: { ...crudProcessroute },
optShow: {
add: true,
edit: false,
del: false,
download: false,
reset: true
}
})
},
data() {
return {
procStatusList: [
{ 'label': '生成', 'code': '10' },
{ 'label': '提交', 'code': '20' }
],
permission: {}
}
},
methods: {
// 钩子在获取表格数据之前执行false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
hand(value) {
this.crud.toQuery()
},
formatStatus(row, column) {
if (row.processroute_status === '10') {
return '生成'
} else if (row.processroute_status === '20') {
return '提交'
}
},
canUd(row) {
return row.processroute_status !== '10'
},
submit() {
const _selectData = this.$refs.table.selection
if (_selectData.length === 0) {
return this.crud.notify('请至少选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
}
const data = {
'data': _selectData
}
crudProcessroute.submit(data).then(res => {
this.crud.toQuery()
this.crud.notify('提交成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
CancelSubmit() {
const _selectData = this.$refs.table.selection
if (_selectData.length === 0) {
return this.crud.notify('请至少选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
}
const data = {
'data': _selectData
}
crudProcessroute.CancelSubmit(data).then(res => {
this.crud.toQuery()
this.crud.notify('取消成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
}
}
}
</script>
<style scoped>
</style>

View File

@@ -1,58 +0,0 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/processroute',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/processroute/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/processroute',
method: 'put',
data
})
}
export function getWorkList() {
return request({
url: 'api/processroute/getWorkList',
method: 'get'
})
}
export function getDtl(params) {
return request({
url: 'api/processroute/getDtl',
method: 'get',
params
})
}
export function submit(data) {
return request({
url: 'api/processroute/submit',
method: 'put',
data
})
}
export function CancelSubmit(data) {
return request({
url: 'api/processroute/CancelSubmit',
method: 'put',
data
})
}
export default { add, edit, del, getWorkList, getDtl, submit, CancelSubmit }

View File

@@ -1,189 +0,0 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<el-input
v-model="query.search"
clearable
style="width: 300px"
size="mini"
placeholder="输入工序编码或名称"
prefix-icon="el-icon-search"
class="filter-item"
/>
<rrOperation />
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="600px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
<el-form-item v-if="false" label="工序标识" prop="workprocedure_id">
<el-input v-model="form.workprocedure_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="工序编码" prop="workprocedure_code">
<el-input v-model="form.workprocedure_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="工序名称" prop="workprocedure_name">
<el-input v-model="form.workprocedure_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否关键工序" prop="is_keyworkprocedure">
<el-switch
v-model="form.is_keyworkprocedure"
active-value="1"
inactive-value="0"
active-color="#13ce66"
inactive-color="#ff4949"
/>
</el-form-item>
<el-form-item label="是否完工汇报" prop="is_finishback">
<el-switch
v-model="form.is_finishback"
active-value="1"
inactive-value="0"
active-color="#13ce66"
inactive-color="#ff4949"
/>
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-switch
v-model="form.is_used"
active-value="1"
inactive-value="0"
active-color="#13ce66"
inactive-color="#ff4949"
/>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="workprocedure_id" label="工序标识" />
<el-table-column prop="workprocedure_code" sortable label="工序编码" />
<el-table-column prop="workprocedure_name" label="工序名称" />
<el-table-column prop="is_keyworkprocedure" label="是否关键工序" :formatter="format_isOrNot" />
<el-table-column prop="is_finishback" label="是否完工汇报" :formatter="format_isOrNot" />
<el-table-column prop="is_used" label="是否启用" :formatter="format_isOrNot" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="135" />
<el-table-column v-permission="[]" label="操作" width="150px" align="center">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudWorkProcedure from '@/views/wms/pdm/base/workProcedure/workProcedure'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = {
workprocedure_id: null,
workprocedure_code: null,
workprocedure_name: null,
is_keyworkprocedure: '0',
is_finishback: '0',
is_used: '1',
remark: null,
create_id: null,
create_name: null,
create_time: null,
is_delete: null,
ext_id: null,
org_id: null,
org_code: null,
org_name: null
}
export default {
name: 'WorkProcedure',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '工序',
url: 'api/workProcedure',
idField: 'workprocedure_id',
sort: 'workprocedure_id,desc',
crudMethod: { ...crudWorkProcedure },
optShow: {
add: true,
edit: true,
del: true,
download: false,
reset: false
}
})
},
data() {
return {
permission: {},
rules: {
workProcedure_id: [
{ required: true, message: '工序标识不能为空', trigger: 'blur' }
],
workprocedure_code: [
{ required: true, message: '工序编码不能为空', trigger: 'blur' }
],
workprocedure_name: [
{ required: true, message: '工序名称不能为空', trigger: 'blur' }
],
is_keyworkprocedure: [
{ required: true, message: '是否关键工序不能为空', trigger: 'blur' }
],
is_finishback: [
{ required: true, message: '是否完工汇报不能为空', trigger: 'blur' }
],
is_used: [
{ required: true, message: '是否启用不能为空', trigger: 'blur' }
]
}
}
},
methods: {
// 钩子在获取表格数据之前执行false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
format_isOrNot(row, column, value) {
return value === '1' ? '是' : '否'
}
}
}
</script>
<style scoped>
</style>

View File

@@ -1,33 +0,0 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/workProcedure',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/workProcedure/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/workProcedure',
method: 'put',
data
})
}
export function downSelect() {
return request({
url: 'api/workProcedure/downSelect'
})
}
export default { add, edit, del, downSelect }

View File

@@ -458,7 +458,7 @@
<el-table-column prop="is_child_tz_ok" label="子卷套轴完成" width="100px" :formatter="formatChildName"/>
<el-table-column prop="is_child_ps_ok" label="子卷配送完成" width="100px" :formatter="formatChildPsName"/>
<el-table-column prop="is_call" label="是否呼叫" width="100px" :formatter="formatChildCallName"/>
<el-table-column prop="qzzno" label="气涨轴编码" width="100px"/>
<el-table-column prop="qzzno" label="气涨轴编码" width="150px"/>
<el-table-column prop="start_time" label="开始时间" width="150px"/>
<el-table-column prop="end_time" label="结束时间" width="150px"/>
<!-- <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">