root/liaoNingShengHua2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备表去除

Browse Source
This commit is contained in:
ludj
2023-03-07 13:16:50 +08:00
parent b2b54fd9ed
commit ca3784eb76
14 changed files with 48 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
View File

@@ -208,11 +208,11 @@
</el-form-item>
<el-form-item label="生产设备">
<el-input
v-model="form.device_code"
v-model="form.point_code"
style="width: 200px;"
clearable
@focus="deviceShow=true"
@clear="form.device_id='', form.device_code=''"
@clear="form.point_code='',form.point_name=''"
/>
</el-form-item>
<el-form-item label="计划开始时间" prop="planproducestart_date">
@@ -282,7 +282,8 @@
<el-table-column prop="plan_qty" label="计划数量" />
<el-table-column prop="real_qty" label="实际数量" />
<el-table-column v-if="false" prop="material_id" label="物料标识" />
<el-table-column prop="device_name" label="设备" width="100" show-overflow-tooltip />
<el-table-column prop="point_code" label="设备编码" width="100" show-overflow-tooltip />
<el-table-column prop="point_name" label="设备名称" width="100" show-overflow-tooltip />
<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 />
@@ -368,8 +369,8 @@ const defaultForm = {
syscompanyid: null,
is_delete: null,
material_name: null,
device_id: null,
device_code: null,
point_code: null,
point_name: null,
is_canupdate_update: '1',
material_spec: null,
sale_id: null,
@@ -491,8 +492,8 @@ export default {
this.form.material_spec = row.material_spec
},
tableChanged(row) {
this.form.device_id = row.device_id
this.form.device_code = row.device_code
this.form.point_code = row.point_code
this.form.point_name = row.point_name
},
// 下发
submits(row) {

31
lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue
View File

@@ -12,9 +12,9 @@
<el-col :span="22">
<el-form :inline="true" class="demo-form-inline">
<el-form-item :inline="true" label="模糊搜索:">
<el-input v-model="query.search" placeholder="请输入编码、名称" />
<el-input v-model="query.search" placeholder="请输入编码、名称"/>
</el-form-item>
<rrOperation />
<rrOperation/>
</el-form>
</el-col>
</el-row>
@@ -32,21 +32,19 @@
@select-all="onSelectAll"
@current-change="clickChange"
>
<el-table-column v-if="!isSingle" type="selection" width="55" />
<el-table-column v-if="!isSingle" type="selection" width="55"/>
<el-table-column v-if="isSingle" label="选择" width="55">
<template slot-scope="scope">
<el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
<el-radio v-model="tableRadio" :label="scope.row"><i/></el-radio>
</template>
</el-table-column>
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
<el-table-column prop="device_model" label="设备型号" show-overflow-tooltip />
<el-table-column prop="device_model" label="设备型号" show-overflow-tooltip />
<el-table-column prop="extend_code" label="外部编码" show-overflow-tooltip />
<el-table-column prop="point_code" label="设备编码" show-overflow-tooltip/>
<el-table-column prop="point_name" label="设备名称" show-overflow-tooltip/>
<!-- <el-table-column prop="extend_code" label="外部编码" show-overflow-tooltip/>-->
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="submit">确 定</el-button>
@@ -60,13 +58,20 @@
import CRUD, { header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
import crudDevice from '@/api/wms/pdm/device'
import crudPoint from '@/api/wms/sch/point'
export default {
name: 'EndPointDialog',
components: { rrOperation, pagination },
cruds() {
return CRUD({ title: '设备', url: 'api/device', crudMethod: { ...crudDevice }, optShow: {}})
return CRUD({
title: '点位', url: 'api/point', crudMethod: { ...crudPoint },
query: {
is_have_workder: '1'
},
optShow: {}
})
},
mixins: [presenter(), header()],
props: {
@@ -168,7 +173,7 @@ export default {
margin-left: auto;
}
.el-table_body tr.current-row>td {
.el-table_body tr.current-row > td {
background-color: #e9e500;
}
</style>