代码更新
This commit is contained in:
ldj_willow
@@ -1,27 +0,0 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
export function add(data) {
|
||||
return request({
|
||||
url: 'api/bigScreenScreen/add',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function del(ids) {
|
||||
return request({
|
||||
url: 'api/bigScreenScreen/del',
|
||||
method: 'delete',
|
||||
data: ids
|
||||
})
|
||||
}
|
||||
|
||||
export function edit(data) {
|
||||
return request({
|
||||
url: 'api/bigScreenScreen/edit',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export default { add, edit, del }
|
||||
@@ -1,67 +0,0 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
export function add(data) {
|
||||
return request({
|
||||
url: 'api/personcorrdevice',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function del(ids) {
|
||||
return request({
|
||||
url: 'api/personcorrdevice/',
|
||||
method: 'delete',
|
||||
data: ids
|
||||
})
|
||||
}
|
||||
|
||||
export function edit(data) {
|
||||
return request({
|
||||
url: 'api/personcorrdevice',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function addPersons(data) {
|
||||
return request({
|
||||
url: 'api/personcorrdevice/addPersons',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function getHeader(data) {
|
||||
return request({
|
||||
url: 'api/personcorrdevice/getHeader',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function getDeviceIdByUserId(data) {
|
||||
return request({
|
||||
url: 'api/personcorrdevice/getDeviceIdByUserId',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function addDevices(data) {
|
||||
return request({
|
||||
url: 'api/personcorrdevice/addDevices',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function deleteRow(data) {
|
||||
return request({
|
||||
url: 'api/personcorrdevice/deleteRow',
|
||||
method: 'delete',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export default { add, edit, del, addPersons, getHeader, getDeviceIdByUserId, deleteRow, addDevices }
|
||||
@@ -1,43 +0,0 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
export function add(data) {
|
||||
return request({
|
||||
url: 'api/teamcorrperson',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function del(ids) {
|
||||
return request({
|
||||
url: 'api/teamcorrperson/',
|
||||
method: 'delete',
|
||||
data: ids
|
||||
})
|
||||
}
|
||||
|
||||
export function edit(data) {
|
||||
return request({
|
||||
url: 'api/teamcorrperson',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function getPersonIdByTeamId(data) {
|
||||
return request({
|
||||
url: 'api/teamcorrperson/getPersonIdByTeamId',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function addPersons(data) {
|
||||
return request({
|
||||
url: 'api/teamcorrperson/addPersons',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export default { add, edit, del, getPersonIdByTeamId, addPersons }
|
||||
@@ -1,42 +0,0 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
export function add(data) {
|
||||
return request({
|
||||
url: 'api/workteam',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function del(ids) {
|
||||
return request({
|
||||
url: 'api/workteam/',
|
||||
method: 'delete',
|
||||
data: ids
|
||||
})
|
||||
}
|
||||
|
||||
export function edit(data) {
|
||||
return request({
|
||||
url: 'api/workteam',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function getClasssystem() {
|
||||
return request({
|
||||
url: 'api/workteam/getClasssystem',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
export function changeActive(data) {
|
||||
return request({
|
||||
url: 'api/workteam/changeActive',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export default { add, edit, del, getClasssystem, changeActive }
|
||||
@@ -1,27 +0,0 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
export function add(data) {
|
||||
return request({
|
||||
url: 'api/deviceitem',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function del(ids) {
|
||||
return request({
|
||||
url: 'api/deviceitem/',
|
||||
method: 'delete',
|
||||
data: ids
|
||||
})
|
||||
}
|
||||
|
||||
export function edit(data) {
|
||||
return request({
|
||||
url: 'api/deviceitem',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export default { add, edit, del }
|
||||
@@ -1,110 +0,0 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
export function add(data) {
|
||||
return request({
|
||||
url: 'api/producetask',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function del(ids) {
|
||||
return request({
|
||||
url: 'api/producetask/',
|
||||
method: 'delete',
|
||||
data: ids
|
||||
})
|
||||
}
|
||||
|
||||
export function edit(data) {
|
||||
return request({
|
||||
url: 'api/producetask',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function getMaterial() {
|
||||
return request({
|
||||
url: 'api/producetask/getMaterial',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
export function getDevice(data) {
|
||||
return request({
|
||||
url: 'api/producetask/getDevice',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function getDevice1() {
|
||||
return request({
|
||||
url: 'api/producetask/getDevice1',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
export function getProduceline() {
|
||||
return request({
|
||||
url: 'api/producetask/getProduceline',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
export function getCust() {
|
||||
return request({
|
||||
url: 'api/producetask/getCust',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
export function getWorkprocedure() {
|
||||
return request({
|
||||
url: 'api/producetask/getWorkprocedure',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
export function excelImport(data) {
|
||||
return request({
|
||||
url: 'api/producetask/excelImport',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function copyAdd(data) {
|
||||
return request({
|
||||
url: 'api/producetask/copyAdd',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function sortUpdate(data) {
|
||||
return request({
|
||||
url: 'api/producetask/sortUpdate',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function mandFinish(data) {
|
||||
return request({
|
||||
url: 'api/producetask/mandFinish',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function issued(data) {
|
||||
return request({
|
||||
url: 'api/producetask/issued',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export default { add, edit, del, getMaterial, getDevice, getProduceline, getCust, getWorkprocedure, excelImport, getDevice1, copyAdd, sortUpdate, mandFinish, issued }
|
||||
@@ -1,49 +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 changeActive(data) {
|
||||
return request({
|
||||
url: 'api/workprocedure/changeActive',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function queryWorkprocedure() {
|
||||
return request({
|
||||
url: '/api/workProcedure/queryWorkprocedure',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
export function queryWorkprocedure2() {
|
||||
return request({
|
||||
url: '/api/workProcedure/queryWorkprocedure2',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
export default { add, edit, del, changeActive, queryWorkprocedure, queryWorkprocedure2 }
|
||||
@@ -23,14 +23,6 @@ export function edit(data) {
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function syncStruct() {
|
||||
return request({
|
||||
url: 'api/point/syncStruct',
|
||||
method: 'put'
|
||||
})
|
||||
}
|
||||
|
||||
export function findPoints(area_type) {
|
||||
return request({
|
||||
url: 'api/point/area_type/' + area_type
|
||||
@@ -60,4 +52,4 @@ export function getRegion() {
|
||||
})
|
||||
}
|
||||
|
||||
export default { add, edit, del, syncStruct, changeActive, findPoints, getPoint, getRegion }
|
||||
export default { add, edit, del, changeActive, findPoints, getPoint, getRegion }
|
||||
|
||||
@@ -101,7 +101,7 @@
|
||||
<el-table-column prop="class_name" label="分类名称" />
|
||||
<el-table-column prop="class_desc" label="分类简要描述" />
|
||||
<el-table-column prop="update_optname" label="修改人" />
|
||||
<el-table-column prop="update_time" label="修改时间" />
|
||||
<el-table-column prop="update_time" label="修改时间" min-width="100" show-overflow-tooltip/>
|
||||
<el-table-column prop="is_modify" :formatter="modifyFormat" label="是否可修改" />
|
||||
<el-table-column
|
||||
v-permission="['admin','Classstandard:edit','Classstandard:del']"
|
||||
|
||||
@@ -1,162 +0,0 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<!--工具栏-->
|
||||
<div class="head-container">
|
||||
<div v-if="crud.props.searchToggle">
|
||||
<!-- 搜索 -->
|
||||
<label class="el-form-item-label">模糊搜索</label>
|
||||
<el-input v-model="query.search" clearable placeholder="项点编码或名称" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
|
||||
<rrOperation :crud="crud" />
|
||||
</div>
|
||||
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
|
||||
<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="475px">
|
||||
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
|
||||
<el-form-item label="项点编码" prop="item_code">
|
||||
<el-input v-model="form.item_code" style="width: 250px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="项点名称" prop="item_name">
|
||||
<el-input v-model="form.item_name" style="width: 250px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="顺序号" prop="order_seq">
|
||||
<el-input-number v-model="form.order_seq" controls-position="center" style="width: 250px;text-align: left" :min="1" />
|
||||
</el-form-item>
|
||||
<el-form-item label="默认值数据类型" prop="data_type">
|
||||
<el-select
|
||||
v-model="form.data_type"
|
||||
placeholder=""
|
||||
style="width: 250px"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.ITEM_VALUE_TYPE"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="默认值">
|
||||
<el-select
|
||||
v-if="form.data_type === '01'"
|
||||
v-model="form.default_value"
|
||||
style="width: 250px;"
|
||||
placeholder="请先选择默认值数据类型"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.IS_OR_NOT"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
<el-input v-else-if="form.data_type === '02'" type="number" v-model="form.default_value" style="width: 250px;" />
|
||||
<el-input v-else v-model="form.default_value" style="width: 250px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注">
|
||||
<el-input v-model="form.remark" :rows="3" type="textarea" style="width: 250px;" />
|
||||
</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 prop="item_code" label="项点编码" />
|
||||
<el-table-column prop="item_name" label="项点名称" />
|
||||
<el-table-column prop="order_seq" label="顺序号" />
|
||||
<el-table-column prop="default_value" label="默认值">
|
||||
<template slot-scope="scope">
|
||||
{{ is_or_no(scope.row.default_value, scope.row.data_type) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="data_type" label="默认值数据类型">
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.ITEM_VALUE_TYPE[scope.row.data_type] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="remark" label="备注" />
|
||||
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<udOperation
|
||||
:data="scope.row"
|
||||
:permission="permission"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import crudDeviceitem from '@/api/wms/pdm/deviceitem'
|
||||
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'
|
||||
|
||||
const defaultForm = { data_type: '01', item_id: null, item_code: null, item_name: null, default_value: null, remark: null, order_seq: null }
|
||||
export default {
|
||||
name: 'Deviceitem',
|
||||
dicts: ['ITEM_VALUE_TYPE', 'IS_OR_NOT'],
|
||||
components: { pagination, crudOperation, rrOperation, udOperation },
|
||||
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||
cruds() {
|
||||
return CRUD({ title: '生产设备扩展项', url: 'api/deviceitem', idField: 'item_id', sort: 'item_id,desc',
|
||||
optShow: {
|
||||
add: true,
|
||||
edit: true,
|
||||
del: true,
|
||||
reset: true,
|
||||
download: false
|
||||
},
|
||||
crudMethod: { ...crudDeviceitem }})
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
permission: {
|
||||
},
|
||||
rules: {
|
||||
item_code: [
|
||||
{ required: true, message: '项点编码不能为空', trigger: 'blur' }
|
||||
],
|
||||
item_name: [
|
||||
{ required: true, message: '项点名称不能为空', trigger: 'blur' }
|
||||
],
|
||||
data_type: [
|
||||
{ required: true, message: '默认值数据类型不能为空', trigger: 'blur' }
|
||||
]
|
||||
},
|
||||
queryTypeOptions: [
|
||||
{ key: 'item_code', display_name: '项点编码' }
|
||||
]
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
is_or_no(val, type) {
|
||||
if (type === '01' && val === '1') {
|
||||
return '是'
|
||||
} else if (type === '01' && val === '0') {
|
||||
return '否'
|
||||
} else {
|
||||
return val
|
||||
}
|
||||
},
|
||||
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
@@ -1,144 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
<div v-if="query.user_name === ''">
|
||||
<div class="my-code">点击查看设备详情</div>
|
||||
</div>
|
||||
<div v-else>
|
||||
<crudOperation :permission="permission">
|
||||
<el-button
|
||||
slot="right"
|
||||
class="filter-item"
|
||||
type="danger"
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="crud.selections.length < 1"
|
||||
@click="deleteRows(crud.selections)"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
</crudOperation>
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
v-loading="crud.loading"
|
||||
:data="crud.data"
|
||||
size="mini"
|
||||
highlight-current-row
|
||||
:cell-style="{'text-align':'center'}"
|
||||
:header-cell-style="{'text-align':'center'}"
|
||||
style="width: 100%;"
|
||||
@selection-change="crud.selectionChangeHandler"
|
||||
>
|
||||
<el-table-column type="selection" width="55"/>
|
||||
<el-table-column prop="device_code" label="设备编码"/>
|
||||
<el-table-column prop="device_name" label="设备名称" :min-width="180" show-overflow-tooltip/>
|
||||
<el-table-column prop="workprocedure_name" label="所属工序" :min-width="180" show-overflow-tooltip/>
|
||||
<template v-for="(item, index) in tableLabel">
|
||||
<el-table-column
|
||||
v-if="item.show"
|
||||
:key="index"
|
||||
:show-overflow-tooltip="true"
|
||||
:prop="item.prop"
|
||||
:width="item.width"
|
||||
:label="item.label"
|
||||
/>
|
||||
</template>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination/>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import crudPersoncorrdevice from '@/api/wms/mps/personcorrdevice'
|
||||
import CRUD, {header, presenter, form} from '@crud/crud'
|
||||
import pagination from '@crud/Pagination'
|
||||
import crudOperation from '@crud/CRUD.operation'
|
||||
|
||||
const defaultForm = {
|
||||
user_id: null,
|
||||
user_name: null,
|
||||
team_person_device_id: null,
|
||||
jockey_id: null,
|
||||
device_id: null
|
||||
}
|
||||
|
||||
export default {
|
||||
name: 'DevicesDialog',
|
||||
components: {pagination, crudOperation},
|
||||
cruds() {
|
||||
return [
|
||||
CRUD({
|
||||
title: '设备详情',
|
||||
url: 'api/personcorrdevice/getDeviceByPerson',
|
||||
idField: 'team_person_device_id',
|
||||
query: {user_id: '', user_name: ''},
|
||||
sort: ['update_time,asc'],
|
||||
crudMethod: {...crudPersoncorrdevice},
|
||||
optShow: {
|
||||
add: false,
|
||||
edit: false,
|
||||
del: false,
|
||||
reset: false
|
||||
},
|
||||
queryOnPresenterCreated: false
|
||||
})
|
||||
]
|
||||
},
|
||||
mixins: [presenter(), header(), form(function() {
|
||||
return Object.assign({ person: { user_id: this.query.user_id }}, defaultForm)
|
||||
})],
|
||||
data() {
|
||||
return {
|
||||
materType: '',
|
||||
openParam: {},
|
||||
tableLabel: [],
|
||||
permission: {},
|
||||
rules: {}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
this.getHeader()
|
||||
return true
|
||||
},
|
||||
deleteRows(data) {
|
||||
this.$confirm('此操作将删除"' + data.length + '"条信息, 是否继续?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
crudPersoncorrdevice.deleteRow({ user_id: this.query.user_id, rows: data }).then(res => {
|
||||
this.crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
|
||||
this.crud.toQuery()
|
||||
})
|
||||
}).catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '已取消删除'
|
||||
})
|
||||
})
|
||||
},
|
||||
getHeader(workprocedure_id) {
|
||||
crudPersoncorrdevice.getHeader({user_id: this.query.user_id}).then(res => {
|
||||
this.tableLabel = res.newArray
|
||||
})
|
||||
},
|
||||
tableChanged3(row) {
|
||||
this.crud.toQuery()
|
||||
},
|
||||
canUd(row) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
::v-deep .el-dialog__body {
|
||||
padding-top: 0px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,187 +0,0 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
title="设备选择"
|
||||
append-to-body
|
||||
:visible.sync="dialogVisible"
|
||||
destroy-on-close
|
||||
width="1000px"
|
||||
@close="close"
|
||||
@open="open"
|
||||
>
|
||||
<!-- 搜索 -->
|
||||
<label class="el-form-item-label">模糊搜索</label>
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
clearable
|
||||
size="small"
|
||||
placeholder="请输入设备编码或名称"
|
||||
style="width: 220px;"
|
||||
class="filter-item"
|
||||
/>
|
||||
<label class="el-form-item-label">所属工序</label>
|
||||
<el-select v-model="query.workprocedure_id" filterable clearable size="small" placeholder="所属工序" class="filter-item" style="width: 220px" @change="changeHeader(query.search, query.workprocedure_id)">
|
||||
<el-option
|
||||
v-for="item in workList"
|
||||
:key="item.workprocedure_id"
|
||||
:label="item.workprocedure_name"
|
||||
:value="item.workprocedure_id"
|
||||
/>
|
||||
</el-select>
|
||||
<rrOperation :crud="crud" />
|
||||
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
v-loading="crud.loading"
|
||||
:data="crud.data"
|
||||
style="width: 100%;margin-top: 15px"
|
||||
size="mini"
|
||||
border
|
||||
:cell-style="{'text-align':'center'}"
|
||||
:header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
|
||||
@selection-change="crud.selectionChangeHandler"
|
||||
>
|
||||
<el-table-column type="selection" width="55" />
|
||||
<el-table-column prop="device_code" label="设备编码" />
|
||||
<el-table-column prop="device_name" label="设备名称" />
|
||||
<template v-for="(item, index) in tableLabel">
|
||||
<el-table-column
|
||||
v-if="item.show"
|
||||
:key="index"
|
||||
:show-overflow-tooltip="true"
|
||||
:prop="item.prop"
|
||||
:width="item.width"
|
||||
:label="item.label"
|
||||
/>
|
||||
</template>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="closeDia">取 消</el-button>
|
||||
<el-button type="primary" @click="submit">确 定</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import CRUD, { header, presenter } from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
||||
import crudTeamcorrperson from '@/api/wms/mps/teamcorrperson'
|
||||
import crudPersoncorrdevice from '@/api/wms/mps/personcorrdevice'
|
||||
import crudDevice from '@/api/wms/pdm/device'
|
||||
|
||||
export default {
|
||||
name: 'SelectDeviceDialog',
|
||||
components: { rrOperation, pagination },
|
||||
cruds() {
|
||||
return CRUD({ title: '设备选择', url: 'api/device', crudMethod: { ...crudTeamcorrperson }, optShow: {}})
|
||||
},
|
||||
mixins: [presenter(), header()],
|
||||
props: {
|
||||
dialogShow: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
materOptCode: {
|
||||
type: String,
|
||||
default: '00'
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialogVisible: false,
|
||||
user_id: '',
|
||||
tableData: [],
|
||||
workList: [],
|
||||
tableLabel: []
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
dialogShow: {
|
||||
handler(newValue) {
|
||||
this.dialogVisible = newValue
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
open() {
|
||||
this.getWorkprocedure()
|
||||
this.getDeviceIdByUserId(this.user_id)
|
||||
},
|
||||
setForm(user_id) {
|
||||
this.user_id = user_id
|
||||
},
|
||||
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
|
||||
[CRUD.HOOK.afterRefresh]() {
|
||||
const that = this
|
||||
that.$nextTick(() => {
|
||||
that.crud.data.forEach(row => {
|
||||
this.tableData.forEach(person => {
|
||||
if (Number(row.device_id) === Number(person.device_id)) {
|
||||
that.$refs.table.toggleRowSelection(row, true)
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
return true
|
||||
},
|
||||
close() {
|
||||
this.crud.resetQuery(false)
|
||||
this.$emit('update:dialogShow', false)
|
||||
},
|
||||
closeDia() {
|
||||
this.crud.resetQuery(true)
|
||||
this.$emit('update:dialogShow', false)
|
||||
},
|
||||
submit() {
|
||||
if (this.crud.selections.length <= 0) {
|
||||
this.$message('至少选择一条设备信息')
|
||||
return
|
||||
}
|
||||
console.log(this.crud.selections)
|
||||
crudPersoncorrdevice.addDevices({ user_id: this.user_id, devices: this.crud.selections }).then(res => {
|
||||
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
|
||||
// 隐藏弹出框
|
||||
this.$emit('update:dialogShow', false)
|
||||
this.crud.toQuery()
|
||||
// 向父组件传值
|
||||
this.$emit('tableChanged3', this.tableRadio)
|
||||
})
|
||||
},
|
||||
changeHeader(search, workprocedure_id) {
|
||||
this.getHeader(search,workprocedure_id)
|
||||
this.crud.toQuery()
|
||||
},
|
||||
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
this.getHeader(this.query.search, this.query.workprocedure_id)
|
||||
return true
|
||||
},
|
||||
getWorkprocedure() {
|
||||
crudDevice.getWorkprocedure().then(res => {
|
||||
this.workList = res
|
||||
})
|
||||
},
|
||||
getHeader(search, workprocedure_id) {
|
||||
crudDevice.getItemByDeviceId({ search: search, workprocedure_id: workprocedure_id }).then(res => {
|
||||
this.tableLabel = res.newArray
|
||||
})
|
||||
},
|
||||
getDeviceIdByUserId(user_id) {
|
||||
crudPersoncorrdevice.getDeviceIdByUserId({ user_id: user_id }).then(res => {
|
||||
this.tableData = res
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
::v-deep .el-dialog__body {
|
||||
padding-top: 0px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,153 +0,0 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
title="人员选择"
|
||||
append-to-body
|
||||
:visible.sync="dialogVisible"
|
||||
destroy-on-close
|
||||
width="1000px"
|
||||
@close="close"
|
||||
@open="open"
|
||||
>
|
||||
<el-form
|
||||
:inline="true"
|
||||
class="demo-form-inline"
|
||||
label-position="right"
|
||||
label-width="80px"
|
||||
label-suffix=":"
|
||||
>
|
||||
<el-form-item label="模糊搜索">
|
||||
<el-input
|
||||
v-model="query.blurry"
|
||||
clearable
|
||||
size="mini"
|
||||
placeholder="名称或邮箱"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<rrOperation />
|
||||
</el-form>
|
||||
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
v-loading="crud.loading"
|
||||
:data="crud.data"
|
||||
style="width: 100%;"
|
||||
size="mini"
|
||||
border
|
||||
:cell-style="{'text-align':'center'}"
|
||||
:header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
|
||||
@selection-change="crud.selectionChangeHandler"
|
||||
>
|
||||
<el-table-column type="selection" width="55" />
|
||||
<el-table-column prop="username" label="用户名" />
|
||||
<el-table-column prop="nickName" label="昵称" />
|
||||
<el-table-column prop="gender" label="性别" />
|
||||
<el-table-column prop="phone" label="手机号码"/>
|
||||
<el-table-column prop="email" label="邮箱" />
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="closeDia">取 消</el-button>
|
||||
<el-button type="primary" @click="submit">确 定</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import CRUD, { header, presenter } from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
||||
import crudTeamcorrperson from '@/api/wms/mps/teamcorrperson'
|
||||
import crudPersoncorrdevice from '@/api/wms/mps/personcorrdevice'
|
||||
|
||||
export default {
|
||||
name: 'SelectPeersonDialog',
|
||||
components: { rrOperation, pagination },
|
||||
cruds() {
|
||||
return CRUD({ title: '人员信息', url: 'api/users', crudMethod: { ...crudTeamcorrperson }, optShow: {}})
|
||||
},
|
||||
mixins: [presenter(), header()],
|
||||
props: {
|
||||
dialogShow: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
materOptCode: {
|
||||
type: String,
|
||||
default: '00'
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialogVisible: false,
|
||||
user_id: '',
|
||||
tableData: []
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
dialogShow: {
|
||||
handler(newValue) {
|
||||
this.dialogVisible = newValue
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
open() {
|
||||
},
|
||||
setForm(user_id) {
|
||||
this.user_id = user_id
|
||||
},
|
||||
setData(data) {
|
||||
this.tableData = data
|
||||
},
|
||||
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
|
||||
[CRUD.HOOK.afterRefresh]() {
|
||||
console.log(this.tableData)
|
||||
const that = this
|
||||
that.$nextTick(() => {
|
||||
that.crud.data.forEach(row => {
|
||||
this.tableData.forEach(person => {
|
||||
if (row.id === Number(person.jockey_id)) {
|
||||
that.$refs.table.toggleRowSelection(row, true)
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
return true
|
||||
},
|
||||
close() {
|
||||
this.crud.resetQuery(false)
|
||||
this.$emit('update:dialogShow', false)
|
||||
},
|
||||
closeDia() {
|
||||
this.crud.resetQuery(true)
|
||||
this.$emit('update:dialogShow', false)
|
||||
},
|
||||
submit() {
|
||||
if (this.crud.selections.length <= 0) {
|
||||
this.$message('至少选择一条人员信息')
|
||||
return
|
||||
}
|
||||
console.log(this.crud.selections)
|
||||
crudPersoncorrdevice.addPersons({ persons: this.crud.selections }).then(res => {
|
||||
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
|
||||
// 隐藏弹出框
|
||||
this.$emit('update:dialogShow', false)
|
||||
this.crud.toQuery()
|
||||
// 向父组件传值
|
||||
this.$emit('tableChanged3', this.tableRadio)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
::v-deep .el-dialog__body {
|
||||
padding-top: 0px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,135 +0,0 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<!-- 班组列表-->
|
||||
<el-row :gutter="10">
|
||||
<el-col :xs="24" :sm="24" :md="13" :lg="13" :xl="13" style="margin-bottom: 10px">
|
||||
<el-card class="box-card">
|
||||
<!--工具栏-->
|
||||
<div class="head-container">
|
||||
<div v-if="crud.props.searchToggle">
|
||||
<!-- 搜索 -->
|
||||
<el-input v-model="query.search" clearable size="small" placeholder="输入人员名称或者电话" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
|
||||
<rrOperation />
|
||||
</div>
|
||||
<crudOperation :permission="permission" />
|
||||
</div>
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
v-loading="crud.loading"
|
||||
:data="crud.data"
|
||||
size="mini"
|
||||
highlight-current-row
|
||||
style="width: 100%;"
|
||||
@selection-change="crud.selectionChangeHandler"
|
||||
@current-change="handleCurrentChange"
|
||||
>
|
||||
<el-table-column type="selection" width="55" />
|
||||
<el-table-column prop="username" label="用户名" />
|
||||
<el-table-column prop="nick_name" label="昵称" />
|
||||
<el-table-column prop="gender" label="性别" />
|
||||
<el-table-column prop="phone" label="手机号码" width="110" />
|
||||
<el-table-column prop="email" label="邮箱" width="140" />
|
||||
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="text" size="small" @click="addDevice(scope.row)">添加设备</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
</el-card>
|
||||
</el-col>
|
||||
<!-- 物料详情列表 -->
|
||||
<el-col :xs="24" :sm="24" :md="11" :lg="11" :xl="11">
|
||||
<el-card class="box-card">
|
||||
<div slot="header" class="clearfix">
|
||||
<span>设备详情</span>
|
||||
</div>
|
||||
<DevicesDialog ref="devicesDialog" :permission="permission" />
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<SelectPeersonDialog ref="selectPeersonDialog" :dialog-show.sync="selectPeersonDialog" @tableChanged3="tableChanged3" />
|
||||
<SelectDeviceDialog ref="selectDeviceDialog" :dialog-show.sync="selectDeviceDialog" @tableChanged3="tableChanged3" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import crudPersoncorrdevice from '@/api/wms/mps/personcorrdevice'
|
||||
import CRUD, { presenter, header, form, crud } from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
import crudOperation from '@crud/CRUD.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
import DevicesDialog from './DevicesDialog'
|
||||
import SelectPeersonDialog from './SelectPeersonDialog'
|
||||
import SelectDeviceDialog from './SelectDeviceDialog'
|
||||
|
||||
const defaultForm = { team_person_device_id: null, jockey_id: null, device_id: null, user_id: null, user_name: null }
|
||||
export default {
|
||||
name: 'Personcorrdevice',
|
||||
components: { pagination, crudOperation, rrOperation, DevicesDialog, SelectPeersonDialog, SelectDeviceDialog },
|
||||
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||
cruds() {
|
||||
return CRUD({ title: '人员设备维护', url: 'api/personcorrdevice', idField: 'jockey_id', sort: 'team_id,desc',
|
||||
optShow: {
|
||||
add: true,
|
||||
edit: false,
|
||||
del: true,
|
||||
download: false,
|
||||
reset: true
|
||||
},
|
||||
crudMethod: { ...crudPersoncorrdevice }})
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
selectPeersonDialog: false,
|
||||
selectDeviceDialog: false,
|
||||
permission: {},
|
||||
rules: {
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
},
|
||||
methods: {
|
||||
addDevice(row) {
|
||||
this.$refs.selectDeviceDialog.setForm(row.user_id)
|
||||
this.selectDeviceDialog = true
|
||||
this.$refs.selectDeviceDialog.crud.toQuery()
|
||||
},
|
||||
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
if (this.$refs.devicesDialog) {
|
||||
this.$refs.devicesDialog.query.user_name = ''
|
||||
}
|
||||
return true
|
||||
},
|
||||
/** 新建 - 之前 */
|
||||
[CRUD.HOOK.beforeToAdd]() {
|
||||
this.$refs.selectPeersonDialog.setData(this.crud.data)
|
||||
this.selectPeersonDialog = true
|
||||
this.$refs.selectPeersonDialog.crud.toQuery()
|
||||
// return true
|
||||
},
|
||||
handleCurrentChange(val) {
|
||||
if (val) {
|
||||
this.$refs.devicesDialog.query.user_name = val.username
|
||||
this.$refs.devicesDialog.query.user_id = val.user_id
|
||||
this.$refs.devicesDialog.crud.toQuery()
|
||||
}
|
||||
},
|
||||
tableChanged3(row) {
|
||||
this.crud.toQuery()
|
||||
this.$refs.devicesDialog.crud.toQuery()
|
||||
},
|
||||
canUd(row) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
@@ -1,312 +0,0 @@
|
||||
<template>
|
||||
<div style="border: 1px solid #938d8d;margin-left: 10px;margin-right: 10px;">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<div class="grid-content bg-purple"><h2 style="margin-left: 30px;padding-top: 10px;">车间加工看板</h2></div>
|
||||
<div class="grid-content bg-purple">
|
||||
  
|
||||
<!-- <el-button type="primary" icon="el-icon-search" @click="queryTask(query.device_code)">搜索</el-button>-->
|
||||
<el-button type="primary" icon="el-icon-thumb" @click="fresh">刷新</el-button>
|
||||
<el-button type="warning" icon="el-icon-position" :disabled="is_openStart" @click="openStart">开工</el-button>
|
||||
<el-button type="success" icon="el-icon-finished" :disabled="is_reportWork" @click="reportWork">报工</el-button>
|
||||
<el-button type="danger" icon="el-icon-finished" :disabled="is_finish" @click="finish">强制完成</el-button>
|
||||
</div>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="12">
|
||||
<div class="grid-content bg-purple-light">
|
||||
<h2 style="text-align:right;margin-right: 140px;">{{ getTime }}</h2>
|
||||
</div>
|
||||
<div class="grid-content bg-purple-light">
|
||||
<p style="text-align:right;margin-right: 110px;"><b>{{ getDate }}</b></p>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<br>
|
||||
<br>
|
||||
<div>
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
:data="tableData"
|
||||
size="small"
|
||||
style="width: 100%;"
|
||||
@current-change="handleCurrentChange"
|
||||
@select="handleSelectionChange"
|
||||
@select-all="onSelectAll"
|
||||
>
|
||||
<el-table-column type="selection" width="55" />
|
||||
<el-table-column v-if="false" prop="produceorder_id" label="生产班次工单标识" />
|
||||
<el-table-column prop="produceorder_code" label="工单编号" width="130px" />
|
||||
<el-table-column prop="order_status" label="工单状态">
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.MPS_BD_ORDERSTATUS[scope.row.order_status] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="shift_type_scode" label="班次类型">
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="false" prop="workprocedure_id" label="工序标识" />
|
||||
<el-table-column prop="produce_date" label="生产日期" width="100px" />
|
||||
<el-table-column prop="plan_qty" label="计划数量" />
|
||||
<el-table-column prop="report_qty" label="完工数量" />
|
||||
<el-table-column v-if="false" prop="material_id" label="物料标识" />
|
||||
<el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="material_name" label="物料名称" width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="realproducestart_date" label="开始时间" width="150" />
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
|
||||
</div>
|
||||
<el-dialog
|
||||
title="请绑定设备"
|
||||
:visible.sync="devicedialogVisible"
|
||||
width="35%"
|
||||
:before-close="handleClose">
|
||||
<el-form :model="deviceForm" status-icon label-width="120px" ref="deviceForm" class="demo-ruleForm">
|
||||
<el-form-item label="选择设备" prop="device_id">
|
||||
<el-select
|
||||
v-model="deviceForm.device_id"
|
||||
clearable
|
||||
size="mini"
|
||||
class="filter-item"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in deviceList"
|
||||
:key="item.device_id"
|
||||
:label="item.device_name"
|
||||
:value="item.device_id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="saveDevice">保存</el-button>
|
||||
<el-button @click="devicedialogVisible = false">取消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog
|
||||
title="报工数量"
|
||||
:visible.sync="reportdialogVisibler"
|
||||
width="35%"
|
||||
:before-close="handleClose">
|
||||
<el-form :model="reportForm" status-icon ref="reportForm" label-width="120px" class="demo-ruleForm">
|
||||
<el-form-item label="生产数量" prop="produce_qty">
|
||||
<el-input disabled v-model="reportForm.produce_qty" />
|
||||
</el-form-item>
|
||||
<el-form-item label="期初数量" prop="init_qty">
|
||||
<el-input disabled v-model="reportForm.init_qty"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="期末数量" prop="report_qty">
|
||||
<el-input disabled v-model="reportForm.finish_qty" />
|
||||
</el-form-item>
|
||||
<el-form-item label="完成数量" prop="report_qty">
|
||||
<el-input disabled v-model="reportForm.finishproduct_qty" />
|
||||
</el-form-item>
|
||||
<el-form-item label="报工数量" prop="report_qty">
|
||||
<el-input clearable oninput="value = value.replace(/[^\d]/g, '')" type="number" :disabled="is_disabled()" v-model="reportForm.report_qty" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="saveReport">保存</el-button>
|
||||
<el-button @click="reportdialogVisibler = false">取消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import crud from '@/mixins/crud'
|
||||
import crudProduceshiftorder from '@/api/wms/mps/produceshiftorder'
|
||||
|
||||
export default {
|
||||
name: 'BigscreenTask',
|
||||
mixins: [crud],
|
||||
dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'is_used', 'PDM_BI_ORDERTYPE'],
|
||||
data() {
|
||||
return {
|
||||
devicedialogVisible: false,
|
||||
reportdialogVisibler: false,
|
||||
deviceForm: { device_id: null },
|
||||
reportForm: { report_qty: null, produce_qty: null, init_qty: null, finish_qty: null, finishproduct_qty: null },
|
||||
currentDate: new Date(),
|
||||
getTime: '',
|
||||
getDate: '',
|
||||
deviceList: [],
|
||||
choice: '',
|
||||
is_openStart: true,
|
||||
is_reportWork: true,
|
||||
is_finish: true,
|
||||
is_report_qty: false,
|
||||
ProduceStatusList: [],
|
||||
materialList: [],
|
||||
tableData: [],
|
||||
rules: {
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getTable()
|
||||
},
|
||||
mounted() {
|
||||
// 定时器
|
||||
const timer = setInterval(() => {
|
||||
this.settime()// 你所加载数据的方法
|
||||
}, 1000)
|
||||
// 销毁定时器
|
||||
this.$once('hook:beforeDestroy', () => {
|
||||
clearInterval(timer)
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
settime() {
|
||||
const _this = this
|
||||
const yy = new Date().getFullYear()
|
||||
const mm = new Date().getMonth() + 1
|
||||
const dd = new Date().getDate()
|
||||
const hh = new Date().getHours()
|
||||
const mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes() : new Date().getMinutes()
|
||||
const ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds() : new Date().getSeconds()
|
||||
_this.getDate = yy + '年' + mm + '月' + dd + '日 ' + '星期' + '日一二三四五六'.charAt(new Date().getDay())
|
||||
_this.getTime = hh + ':' + mf + ':' + ss
|
||||
},
|
||||
is_disabled() {
|
||||
if (this.choice !== null) {
|
||||
if (this.choice.is_canupdate_update === '1') {
|
||||
return false
|
||||
} else {
|
||||
return true
|
||||
}
|
||||
}
|
||||
},
|
||||
isDisabled() {
|
||||
this.is_openStart = true
|
||||
this.is_finish = true
|
||||
this.is_reportWork = true
|
||||
},
|
||||
handleCurrentChange(current) {
|
||||
if (current === null) {
|
||||
this.choice = null
|
||||
this.is_openStart = true
|
||||
this.is_reportWork = true
|
||||
this.is_finish = true
|
||||
}
|
||||
},
|
||||
handleSelectionChange(val, row) {
|
||||
if (val.length > 1) {
|
||||
this.$refs.table.clearSelection()
|
||||
this.$refs.table.toggleRowSelection(val.pop())
|
||||
this.buttonChange(row)
|
||||
} else if (val.length === 1) {
|
||||
this.buttonChange(row)
|
||||
} else {
|
||||
this.handleCurrentChange(null)
|
||||
}
|
||||
},
|
||||
onSelectAll() {
|
||||
this.$refs.table.clearSelection()
|
||||
this.handleCurrentChange(null)
|
||||
},
|
||||
buttonChange(current) {
|
||||
if (current !== null) {
|
||||
this.choice = current
|
||||
if (current.order_status === '01' || current.order_status === '03') {
|
||||
this.is_openStart = false
|
||||
} else {
|
||||
this.is_openStart = true
|
||||
}
|
||||
if (current.order_status === '02') {
|
||||
this.is_reportWork = false
|
||||
} else {
|
||||
this.is_reportWork = true
|
||||
}
|
||||
this.is_finish = false
|
||||
} else {
|
||||
this.is_finish = true
|
||||
}
|
||||
},
|
||||
notify(title, type) {
|
||||
this.$notify({
|
||||
title: title,
|
||||
type: type,
|
||||
duration: 2500
|
||||
})
|
||||
},
|
||||
fresh() {
|
||||
this.handleCurrentChange(null)
|
||||
this.getTable()
|
||||
this.isDisabled()
|
||||
this.notify('刷新成功', 'success')
|
||||
},
|
||||
handleClose() {
|
||||
this.devicedialogVisible = false
|
||||
this.reportdialogVisibler = false
|
||||
},
|
||||
getTable() {
|
||||
crudProduceshiftorder.getTable({ device_id: this.query.device_id }).then(res => {
|
||||
this.tableData = res
|
||||
})
|
||||
},
|
||||
openStart() {
|
||||
crudProduceshiftorder.getDevice({ workprocedure_id: this.choice.workprocedure_id }).then(res => {
|
||||
this.deviceList = res
|
||||
})
|
||||
this.devicedialogVisible = true
|
||||
this.deviceForm.device_id = this.choice.device_id
|
||||
},
|
||||
reportWork() {
|
||||
this.reportdialogVisibler = true
|
||||
this.getReportWork(this.choice.produceorder_id)
|
||||
},
|
||||
getReportWork(produceorder_id) {
|
||||
crudProduceshiftorder.getReportWork({ produceorder_id: produceorder_id }).then(res => {
|
||||
this.reportForm.init_qty = res.init_qty
|
||||
this.reportForm.finish_qty = res.finish_qty
|
||||
this.reportForm.produce_qty = res.produce_qty
|
||||
this.reportForm.finishproduct_qty = res.finishproduct_qty
|
||||
this.reportForm.report_qty = res.finishproduct_qty
|
||||
})
|
||||
},
|
||||
saveReport() {
|
||||
if (this.reportForm.report_qty === '' || this.reportForm.report_qty === null || this.reportForm.report_qty === undefined) {
|
||||
this.notify('请输入报工数量', 'info')
|
||||
return
|
||||
}
|
||||
crudProduceshiftorder.saveReport({ report_qty: this.reportForm.report_qty, row: this.choice }).then(res => {
|
||||
this.notify('操作成功', 'success')
|
||||
this.getTable()
|
||||
this.reportdialogVisibler = false
|
||||
this.isDisabled()
|
||||
})
|
||||
},
|
||||
saveDevice() {
|
||||
if (this.deviceForm.device_id === '' || this.deviceForm.device_id === null || this.deviceForm.device_id === undefined) {
|
||||
this.notify('请选择要绑定的设备', 'info')
|
||||
return
|
||||
}
|
||||
crudProduceshiftorder.openStart({ device_id: this.deviceForm.device_id, row: this.choice }).then(res => {
|
||||
this.notify('操作成功', 'success')
|
||||
this.getTable()
|
||||
this.devicedialogVisible = false
|
||||
this.isDisabled()
|
||||
})
|
||||
},
|
||||
finish() {
|
||||
crudProduceshiftorder.finish({ row: this.choice }).then(res => {
|
||||
this.notify('操作成功', 'success')
|
||||
this.getTable()
|
||||
this.isDisabled()
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
|
||||
</style>
|
||||
@@ -1,111 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
<div v-if="query.team_name === ''">
|
||||
<div class="my-code">点击查看人员详情</div>
|
||||
</div>
|
||||
<div v-else>
|
||||
<crudOperation :permission="permission" />
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
v-loading="crud.loading"
|
||||
:data="crud.data"
|
||||
highlight-current-row
|
||||
:cell-style="{'text-align':'center'}"
|
||||
:header-cell-style="{'text-align':'center'}"
|
||||
style="width: 100%;"
|
||||
@selection-change="crud.selectionChangeHandler"
|
||||
>
|
||||
<el-table-column type="selection" width="55" />
|
||||
<el-table-column v-if="false" label="所属班组id">
|
||||
{{ query.team_id }}
|
||||
</el-table-column>
|
||||
<el-table-column label="所属班组">
|
||||
{{ query.team_name }}
|
||||
</el-table-column>
|
||||
<el-table-column prop="username" label="用户名" />
|
||||
<el-table-column prop="nick_name" label="昵称" />
|
||||
<el-table-column prop="gender" label="性别" />
|
||||
<el-table-column prop="phone" label="手机号码" width="110" />
|
||||
<el-table-column prop="email" label="邮箱" width="140" />
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import CRUD, { header, presenter, form } from '@crud/crud'
|
||||
import crudOperation from '@crud/CRUD.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
import crudTeamcorrperson from '@/api/wms/mps/teamcorrperson'
|
||||
// import crudStructrelamaterial from '@/api/wms/st/basedata/structrelamaterial'
|
||||
|
||||
const defaultForm = {
|
||||
material_id: null,
|
||||
material_name: null,
|
||||
team_id: null,
|
||||
team_code: null,
|
||||
team_name: null
|
||||
}
|
||||
|
||||
export default {
|
||||
name: 'PersonDialog',
|
||||
components: { pagination, crudOperation },
|
||||
cruds() {
|
||||
return [
|
||||
CRUD({
|
||||
title: '人员详情',
|
||||
url: 'api/teamcorrperson',
|
||||
idField: 'team_person_id',
|
||||
query: { team_id: '', team_name: '' },
|
||||
sort: ['update_time,asc'],
|
||||
crudMethod: { ...crudTeamcorrperson },
|
||||
optShow: {
|
||||
add: false,
|
||||
edit: false,
|
||||
del: true,
|
||||
reset: false
|
||||
},
|
||||
queryOnPresenterCreated: false
|
||||
})
|
||||
]
|
||||
},
|
||||
mixins: [presenter(), header(), form(function() {
|
||||
return Object.assign({ team: { team_id: this.query.team_id }}, defaultForm)
|
||||
})],
|
||||
data() {
|
||||
return {
|
||||
materType: '',
|
||||
openParam: {},
|
||||
permission: {
|
||||
},
|
||||
rules: {
|
||||
material_name: [
|
||||
{ required: true, message: '不能为空', trigger: 'change' }
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
return true
|
||||
},
|
||||
[CRUD.HOOK.beforeDelete](row) {
|
||||
return true
|
||||
},
|
||||
tableChanged3(row) {
|
||||
this.crud.toQuery()
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
::v-deep .el-dialog__body {
|
||||
padding-top: 0px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,151 +0,0 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
title="人员选择"
|
||||
append-to-body
|
||||
:visible.sync="dialogVisible"
|
||||
destroy-on-close
|
||||
width="1000px"
|
||||
@close="close"
|
||||
@open="open"
|
||||
>
|
||||
<el-form
|
||||
:inline="true"
|
||||
class="demo-form-inline"
|
||||
label-position="right"
|
||||
label-width="80px"
|
||||
label-suffix=":"
|
||||
>
|
||||
<el-form-item label="模糊搜索">
|
||||
<el-input
|
||||
v-model="query.blurry"
|
||||
clearable
|
||||
size="mini"
|
||||
placeholder="名称或邮箱"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<rrOperation />
|
||||
</el-form>
|
||||
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
v-loading="crud.loading"
|
||||
:data="crud.data"
|
||||
style="width: 100%;"
|
||||
size="mini"
|
||||
border
|
||||
:cell-style="{'text-align':'center'}"
|
||||
:header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
|
||||
@selection-change="crud.selectionChangeHandler"
|
||||
>
|
||||
<el-table-column type="selection" width="55" />
|
||||
<el-table-column prop="username" label="用户名" />
|
||||
<el-table-column prop="nickName" label="昵称" />
|
||||
<el-table-column prop="gender" label="性别" />
|
||||
<el-table-column prop="phone" label="手机号码" width="110" />
|
||||
<el-table-column prop="email" label="邮箱" width="140" />
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="closeDia">取 消</el-button>
|
||||
<el-button type="primary" @click="submit">确 定</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import CRUD, { header, presenter } from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
||||
import crudTeamcorrperson from '@/api/wms/mps/teamcorrperson'
|
||||
|
||||
export default {
|
||||
name: 'SelectPeersonDialog',
|
||||
components: { rrOperation, pagination },
|
||||
cruds() {
|
||||
return CRUD({ title: '人员信息', url: 'api/users', crudMethod: { ...crudTeamcorrperson }, optShow: {}})
|
||||
},
|
||||
mixins: [presenter(), header()],
|
||||
props: {
|
||||
dialogShow: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
materOptCode: {
|
||||
type: String,
|
||||
default: '00'
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialogVisible: false,
|
||||
team_id: '',
|
||||
personIds: []
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
dialogShow: {
|
||||
handler(newValue) {
|
||||
this.dialogVisible = newValue
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
open() {
|
||||
crudTeamcorrperson.getPersonIdByTeamId({ team_id: this.team_id }).then(res => {
|
||||
this.personIds = res
|
||||
})
|
||||
},
|
||||
setForm(team_id) {
|
||||
this.team_id = team_id
|
||||
},
|
||||
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
|
||||
[CRUD.HOOK.afterRefresh]() {
|
||||
const that = this
|
||||
that.$nextTick(() => {
|
||||
that.crud.data.forEach(row => {
|
||||
this.personIds.forEach(person => {
|
||||
if (row.id === Number(person.jockey_id)) {
|
||||
that.$refs.table.toggleRowSelection(row, true)
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
return true
|
||||
},
|
||||
close() {
|
||||
this.crud.resetQuery(false)
|
||||
this.$emit('update:dialogShow', false)
|
||||
},
|
||||
closeDia() {
|
||||
this.crud.resetQuery(true)
|
||||
this.$emit('update:dialogShow', false)
|
||||
},
|
||||
submit() {
|
||||
if (this.crud.selections.length <= 0) {
|
||||
this.$message('至少选择一条人员信息')
|
||||
return
|
||||
}
|
||||
console.log(this.crud.selections)
|
||||
crudTeamcorrperson.addPersons({ team_id: this.team_id, persons: this.crud.selections }).then(res => {
|
||||
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
|
||||
// 隐藏弹出框
|
||||
this.$emit('update:dialogShow', false)
|
||||
this.crud.toQuery()
|
||||
// 向父组件传值
|
||||
this.$emit('tableChanged3', this.tableRadio)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
::v-deep .el-dialog__body {
|
||||
padding-top: 0px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,208 +0,0 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<!-- 班组列表-->
|
||||
<el-row :gutter="10">
|
||||
<el-col :xs="24" :sm="24" :md="13" :lg="13" :xl="13" style="margin-bottom: 10px">
|
||||
<el-card class="box-card">
|
||||
<!--工具栏-->
|
||||
<div class="head-container">
|
||||
<div v-if="crud.props.searchToggle">
|
||||
<!-- 搜索 -->
|
||||
<el-input v-model="query.search" clearable size="small" placeholder="输入编码或者名称" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
|
||||
<rrOperation />
|
||||
</div>
|
||||
<crudOperation :permission="permission" />
|
||||
</div>
|
||||
<!--表单组件-->
|
||||
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
|
||||
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
|
||||
<el-form-item label="班组编码" prop="team_code">
|
||||
<el-input v-model="form.team_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="班组名称" prop="team_name">
|
||||
<el-input v-model="form.team_name" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="所属班制">
|
||||
<el-select v-model="form.classsystem_id" filterable clearable class="filter-item" style="width: 370px">
|
||||
<el-option
|
||||
v-for="item in classList"
|
||||
:key="item.classsystem_id"
|
||||
:label="item.classsystem_name"
|
||||
:value="item.classsystem_id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>-->
|
||||
<el-form-item label="备注">
|
||||
<el-input v-model="form.remark" :rows="3" type="textarea" style="width: 370px;" />
|
||||
</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"
|
||||
highlight-current-row
|
||||
style="width: 100%;"
|
||||
@selection-change="crud.selectionChangeHandler"
|
||||
@current-change="handleCurrentChange"
|
||||
>
|
||||
<el-table-column type="selection" width="55" />
|
||||
<el-table-column prop="team_code" label="班组编码" />
|
||||
<el-table-column prop="team_name" label="班组名称" />
|
||||
<el-table-column prop="is_active" label="是否启用">
|
||||
<template slot-scope="scope">
|
||||
<el-switch
|
||||
:value="format_is_active(scope.row.is_active)"
|
||||
active-color="#409EFF"
|
||||
inactive-color="#F56C6C"
|
||||
@change="changeEnabled(scope.row, scope.row.is_active)"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="create_name" label="创建人姓名" />
|
||||
<el-table-column prop="create_time" label="创建时间" width="150" />
|
||||
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="text" size="small" @click="addPerson(scope.row)">添加人员</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
</el-card>
|
||||
</el-col>
|
||||
<!-- 物料详情列表 -->
|
||||
<el-col :xs="24" :sm="24" :md="11" :lg="11" :xl="11">
|
||||
<el-card class="box-card">
|
||||
<div slot="header" class="clearfix">
|
||||
<span>人员详情</span>
|
||||
</div>
|
||||
<PersonDialog ref="personDialog" :permission="permission" />
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<SelectPeersonDialog ref="selectPeersonDialog" :dialog-show.sync="selectPeersonDialog" @tableChanged3="tableChanged3" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import crudTeamcorrperson from '@/api/wms/mps/teamcorrperson'
|
||||
import CRUD, { presenter, header, form, crud } from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
import crudOperation from '@crud/CRUD.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
import crudWorkteam from "@/api/wms/mps/workteam"
|
||||
import PersonDialog from './PersonDialog'
|
||||
import SelectPeersonDialog from './SelectPeersonDialog'
|
||||
|
||||
const defaultForm = { team_id: null, team_code: null, team_name: null, classsystem_id: null, remark: null, is_active: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, sysdeptid: null, syscompanyid: null, is_delete: null }
|
||||
export default {
|
||||
name: 'Teamcorrperson',
|
||||
components: { pagination, crudOperation, rrOperation, PersonDialog, SelectPeersonDialog },
|
||||
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||
cruds() {
|
||||
return CRUD({ title: '班组', url: 'api/workteam', idField: 'team_id', sort: 'team_id,desc',
|
||||
optShow: {
|
||||
add: true,
|
||||
edit: true,
|
||||
del: true,
|
||||
download: false,
|
||||
reset: true
|
||||
},
|
||||
crudMethod: { ...crudWorkteam }})
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
selectPeersonDialog: false,
|
||||
permission: {},
|
||||
classList: [],
|
||||
personIds: [],
|
||||
rules: {
|
||||
team_code: [
|
||||
{ required: true, message: '班组编码不能为空', trigger: 'blur' }
|
||||
],
|
||||
team_name: [
|
||||
{ required: true, message: '班组名称不能为空', trigger: 'blur' }
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getClasssystem()
|
||||
},
|
||||
methods: {
|
||||
addPerson(row) {
|
||||
this.$refs.selectPeersonDialog.setForm(row.team_id)
|
||||
this.selectPeersonDialog = true
|
||||
this.$refs.selectPeersonDialog.crud.toQuery()
|
||||
},
|
||||
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
if (this.$refs.personDialog) {
|
||||
this.$refs.personDialog.query.team_name = ''
|
||||
}
|
||||
return true
|
||||
},
|
||||
/** 新建 - 之前 */
|
||||
[CRUD.HOOK.beforeToAdd]() {
|
||||
// return true
|
||||
},
|
||||
handleCurrentChange(val) {
|
||||
if (val) {
|
||||
this.$refs.personDialog.query.team_name = val.team_name
|
||||
this.$refs.personDialog.query.team_id = val.team_id
|
||||
this.$refs.personDialog.crud.toQuery()
|
||||
}
|
||||
},
|
||||
tableChanged3(row) {
|
||||
this.crud.toQuery()
|
||||
this.$refs.personDialog.crud.toQuery()
|
||||
},
|
||||
canUd(row) {
|
||||
return true
|
||||
},
|
||||
// 改变状态
|
||||
format_is_active(is_active) {
|
||||
return is_active === '1'
|
||||
},
|
||||
changeEnabled(data, val) {
|
||||
let msg = '此操作将停用，是否继续！'
|
||||
if (val !== '1') {
|
||||
msg = '此操作将启用，是否继续！'
|
||||
}
|
||||
this.$confirm(msg, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
crudWorkteam.changeActive(data).then(res => {
|
||||
this.crud.toQuery()
|
||||
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
|
||||
}).catch(() => {
|
||||
data.is_active = !data.is_active
|
||||
})
|
||||
}).catch(() => {
|
||||
})
|
||||
},
|
||||
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
return true
|
||||
},
|
||||
getClasssystem() {
|
||||
crudWorkteam.getClasssystem().then(res => {
|
||||
this.classList = res
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
@@ -63,7 +63,7 @@
|
||||
|
||||
<script>
|
||||
|
||||
import crudMaterialbase from '@/api/wms/mps/outmaterial'
|
||||
import crudMaterialbase from '@/api/wms/pdm/outmaterial'
|
||||
import CRUD, { header, presenter } from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
@@ -108,22 +108,6 @@
|
||||
style="width: 200px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="班次类型">
|
||||
<el-select
|
||||
v-model="form.shift_type_scode"
|
||||
style="width: 200px"
|
||||
clearable
|
||||
filterable
|
||||
placeholder="请选择"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.PDM_BI_SHIFTTYPE"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="产品系列">
|
||||
<treeselect
|
||||
disabled
|
||||
@@ -199,7 +183,7 @@
|
||||
<script>
|
||||
import { crud } from '@crud/crud'
|
||||
import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
|
||||
import crudProduceshiftorder from '@/api/wms/mps/produceshiftorder'
|
||||
import crudProduceshiftorder from '@/api/wms/pdm/produceshiftorder'
|
||||
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
|
||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
||||
import crudClassstandard from '@/api/wms/basedata/master/classstandard'
|
||||
@@ -81,33 +81,6 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="班次类型">
|
||||
<el-select
|
||||
v-model="query.shift_type_scode"
|
||||
style="width: 200px"
|
||||
clearable
|
||||
filterable
|
||||
placeholder="请选择"
|
||||
@change="crud.toQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.PDM_BI_SHIFTTYPE"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="销售单标识">
|
||||
<el-input
|
||||
v-model="query.sale_id"
|
||||
clearable
|
||||
size="small"
|
||||
placeholder="请输入销售单标识"
|
||||
style="width: 200px;"
|
||||
class="filter-item"
|
||||
/>
|
||||
</el-form-item>
|
||||
<rrOperation :crud="crud" />
|
||||
</el-form>
|
||||
</div>
|
||||
@@ -227,22 +200,6 @@
|
||||
<el-form-item v-if="crud.status.edit" label="报工数量" prop="report_qty">
|
||||
<el-input v-model="form.report_qty" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="班次类型" prop="shift_type_scode">
|
||||
<el-select
|
||||
v-model="form.shift_type_scode"
|
||||
style="width: 200px"
|
||||
clearable
|
||||
filterable
|
||||
placeholder="请选择"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.PDM_BI_SHIFTTYPE"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="销售单标识">
|
||||
<el-input v-model="form.sale_id" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
@@ -293,11 +250,6 @@
|
||||
{{ dict.label.MPS_BD_ORDERSTATUS[scope.row.order_status] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="shift_type_scode" label="班次类型">
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="produce_date" label="生产日期" width="100px" />
|
||||
<el-table-column prop="plan_qty" label="计划数量" />
|
||||
<el-table-column prop="real_qty" label="实际数量" />
|
||||
@@ -351,14 +303,14 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import crudProduceshiftorder from '@/api/wms/mps/produceshiftorder'
|
||||
import crudProduceshiftorder from '@/api/wms/pdm/produceshiftorder'
|
||||
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 MaterDtl from '@/views/wms/pub/MaterDialog'
|
||||
import ViewDialog from '@/views/wms/mps/produce/ViewDialog'
|
||||
import ViewDialog from '@/views/wms/pdm/produce/ViewDialog'
|
||||
import DeviceDialog from '@/views/wms/pub/DeviceDialog'
|
||||
|
||||
const defaultForm = {
|
||||
@@ -435,9 +387,6 @@ export default {
|
||||
producedeviceorder_code: [
|
||||
{ required: true, message: '机台工单号不能为空', trigger: 'blur' }
|
||||
],
|
||||
shift_type_scode: [
|
||||
{ required: true, message: '班次类型不能为空', trigger: 'blur' }
|
||||
],
|
||||
produce_date: [
|
||||
{ required: true, message: '生产日期不能为空', trigger: 'blur' }
|
||||
],
|
||||
@@ -111,17 +111,6 @@
|
||||
</div>
|
||||
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
|
||||
<crudOperation :permission="permission">
|
||||
<el-button
|
||||
slot="right"
|
||||
class="filter-item"
|
||||
type="info"
|
||||
:loading="syncLoading"
|
||||
icon="el-icon-refresh"
|
||||
size="mini"
|
||||
@click="sync()"
|
||||
>
|
||||
仓位同步
|
||||
</el-button>
|
||||
</crudOperation>
|
||||
<!--表单组件-->
|
||||
<el-dialog
|
||||
@@ -361,9 +350,6 @@ export default {
|
||||
}
|
||||
},
|
||||
created() {
|
||||
/* checkoutbill.getInvTypes().then(res => {
|
||||
this.invtypelist = res
|
||||
})*/
|
||||
crudPoint.getRegion().then(res => {
|
||||
this.reginoList = res
|
||||
})
|
||||
@@ -407,16 +393,6 @@ export default {
|
||||
})
|
||||
}).catch(() => {
|
||||
})
|
||||
},
|
||||
sync() {
|
||||
this.syncLoading = true
|
||||
crudPoint.syncStruct().then(() => {
|
||||
this.crud.toQuery()
|
||||
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
|
||||
this.syncLoading = false
|
||||
}).catch(err => {
|
||||
console.log(err.response.data.message)
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -16,19 +16,24 @@
|
||||
<rrOperation :crud="crud" />
|
||||
</div>
|
||||
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
|
||||
<crudOperation :permission="permission"/>
|
||||
<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="500px">
|
||||
<el-dialog
|
||||
:close-on-click-modal="false"
|
||||
:before-close="crud.cancelCU"
|
||||
:visible.sync="crud.status.cu > 0"
|
||||
:title="crud.status.title"
|
||||
width="500px"
|
||||
>
|
||||
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
|
||||
<el-form-item label="区域编码" prop="region_code">
|
||||
<el-input v-model="form.region_code" style="width: 370px;"/>
|
||||
<el-input v-model="form.region_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="区域名称" prop="region_name">
|
||||
<el-input v-model="form.region_name" style="width: 370px;"/>
|
||||
<el-input v-model="form.region_name" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注">
|
||||
<el-input v-model="form.remark" style="width: 370px;"/>
|
||||
<el-input v-model="form.remark" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
@@ -37,27 +42,21 @@
|
||||
</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="region_id" label="区域标识"/>
|
||||
<el-table-column prop="region_code" label="区域编码"/>
|
||||
<el-table-column prop="region_name" label="区域名称"/>
|
||||
<el-table-column prop="remark" label="备注"/>
|
||||
<el-table-column label="是否启用" align="center" prop="is_used">
|
||||
<template slot-scope="scope">
|
||||
<el-switch
|
||||
:value="format_is_used(scope.row.is_used)"
|
||||
active-color="#409EFF"
|
||||
inactive-color="#F56C6C"
|
||||
@change="changeEnabled(scope.row, scope.row.is_used)"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="create_name" label="创建人姓名"/>
|
||||
<el-table-column prop="create_time" label="创建时间"/>
|
||||
<el-table-column prop="update_optname" label="修改人姓名"/>
|
||||
<el-table-column prop="update_time" label="修改时间"/>
|
||||
<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="region_id" label="区域标识" />
|
||||
<el-table-column prop="region_code" label="区域编码" />
|
||||
<el-table-column prop="region_name" label="区域名称" />
|
||||
<el-table-column prop="remark" label="备注" />
|
||||
<el-table-column prop="create_name" label="创建人" />
|
||||
<el-table-column prop="create_time" label="创建时间" min-width="120" show-overflow-tooltip />
|
||||
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<udOperation
|
||||
@@ -68,7 +67,7 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination/>
|
||||
<pagination />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -86,7 +85,6 @@ const defaultForm = {
|
||||
region_code: null,
|
||||
region_name: null,
|
||||
remark: null,
|
||||
is_used: null,
|
||||
create_id: null,
|
||||
create_name: null,
|
||||
create_time: null,
|
||||
@@ -131,28 +129,6 @@ export default {
|
||||
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
return true
|
||||
},
|
||||
format_is_used(is_used) {
|
||||
return is_used === '1'
|
||||
},
|
||||
changeEnabled(data, val) {
|
||||
let msg = '此操作将停用点位，是否继续！'
|
||||
if (val !== '1') {
|
||||
msg = '此操作将启用点位，是否继续！'
|
||||
}
|
||||
this.$confirm(msg, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
changeActive(data).then(res => {
|
||||
this.crud.toQuery()
|
||||
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
|
||||
}).catch(() => {
|
||||
data.is_used = !data.is_used
|
||||
})
|
||||
}).catch(() => {
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user