zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#设备查询

This commit is contained in:
shijing 2023-12-27 13:25:30 +08:00
parent 4bd9b311cf
commit 417a583c7a
5 changed files with 130 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/bigScreen/index_6dept.vue
View File

@ -369,6 +369,8 @@ export default {
let that = this; let that = this;
let obj ={}; let obj ={};
obj.mio__type = 'sale_out'; obj.mio__type = 'sale_out';
obj.mio__inout_date__gte = that.start_date;
obj.mio__inout_date__lte = that.end_date;
obj.page=0; obj.page=0;
that.$API.inm.mioitem.list.req(obj).then((res) => { that.$API.inm.mioitem.list.req(obj).then((res) => {
console.log(res); console.log(res);

55
src/views/em/equipment.vue
View File

@ -3,22 +3,31 @@
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'equipment.create'">新增</el-button> <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'equipment.create'">新增</el-button>
<el-select v-model="query.belong_dept" placeholder="所在车间" clearable style="margin-left: 2px;" <!-- <el-select v-model="query.belong_dept" placeholder="所在车间" clearable style="margin-left: 2px;"
@change="handleQuery"> @change="handleQuery">
<el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select> -->
<el-select v-model="query.state" placeholder="设备状态" clearable style="margin-left: 2px;">
<el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"
@change="handleQuery"></el-option>
</el-select>
</div> </div>
<div class="right-panel"> <div class="right-panel">
<el-input v-model="query.search" placeholder="设备名称/编号" clearable style="margin-right: 5px;"></el-input> <el-cascader
v-model="query.belong_dept"
:options="group"
:props="groupsProps"
clearable
placeholder="所在车间"
:show-all-levels="false"
>
</el-cascader>
<!-- <el-select v-model="query.state" placeholder="设备状态" clearable>
<el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"
@change="handleQuery"></el-option>
</el-select> -->
<el-input v-model="query.search" placeholder="设备名称/编号" clearable style="width:200px"></el-input>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
</div> </div>
</el-header> </el-header>
<el-main class="nopadding"> <el-main class="nopadding">
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="paramsEquipment"> <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query">
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="设备名称" prop="name" show-overflow-tooltip> <el-table-column label="设备名称" prop="name" show-overflow-tooltip>
</el-table-column> </el-table-column>
@ -198,11 +207,12 @@ export default {
}, },
apiObj: this.$API.em.equipment.list, apiObj: this.$API.em.equipment.list,
paramsEquipment:{type: 10}, paramsEquipment:{type: 10},
query: {}, query: {type: 10},
apiObj2: this.$API.em.einspect.list, apiObj2: this.$API.em.einspect.list,
query2: { query2: {
equipment: '' equipment: ''
}, },
group: [],
selection: [], selection: [],
state_: { state_: {
10: '完好', 10: '完好',
@ -210,12 +220,18 @@ export default {
30: '在修', 30: '在修',
40: '禁用', 40: '禁用',
}, },
stateOptions: [ groupsProps: {
{ label: '完好', value: 10 }, // value: "id",
{ label: '限用', value: 20 }, multiple: false,
{ label: '在修', value: 30 }, emitPath: false,
{ label: '禁用', value: 40 }, checkStrictly: true,
], },
// stateOptions: [
// { label: '完好', value: 10 },
// { label: '限用', value: 20 },
// { label: '在修', value: 30 },
// { label: '禁用', value: 40 },
// ],
results_: { results_: {
'pass': '合格', 'pass': '合格',
'fail': '不合格', 'fail': '不合格',
@ -239,9 +255,12 @@ export default {
this.getDept() this.getDept()
}, },
methods: { methods: {
async getDept() { getDept() {
let res = await this.$API.system.dept.list.req({ page: 0, type: "dept" }); let that = this;
this.deptOptions = genTree(res); that.$API.system.dept.list.req({ page: 0 }).then(res=>{
that.group = genTree(res);
});
}, },
getReceptionist(data) { getReceptionist(data) {
this.form.inspect_user = data.id; this.form.inspect_user = data.id;

52
src/views/em/equipment_form.vue
View File

@ -6,13 +6,27 @@
v-if="form.type == 10"> v-if="form.type == 10">
<el-row> <el-row>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="所属部门">
<el-cascader
v-model="form.belong_dept"
:options="group"
:props="groupsProps"
clearable
:show-all-levels="false"
style="width: 100%"
@change="deptChange"
>
</el-cascader>
</el-form-item>
</el-col>
<!-- <el-col :md="12" :sm="24">
<el-form-item label="所属部门"> <el-form-item label="所属部门">
<el-select v-model="form.belong_dept" placeholder="所属部门" clearable style="width: 100%" <el-select v-model="form.belong_dept" placeholder="所属部门" clearable style="width: 100%"
@change="deptChange"> @change="deptChange">
<el-option v-for="item in group" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in group" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="所属工段"> <el-form-item label="所属工段">
<el-select v-model="form.mgroup" placeholder="所属工段" clearable style="width: 100%"> <el-select v-model="form.mgroup" placeholder="所属工段" clearable style="width: 100%">
@ -101,12 +115,25 @@
v-if="form.type == 20"> v-if="form.type == 20">
<el-row> <el-row>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="所属部门">
<el-cascader
v-model="form.belong_dept"
:options="group"
:props="groupsProps"
clearable
:show-all-levels="false"
style="width: 100%"
>
</el-cascader>
</el-form-item>
</el-col>
<!-- <el-col :md="12" :sm="24">
<el-form-item label="所属部门" prop="belong_dept"> <el-form-item label="所属部门" prop="belong_dept">
<el-select v-model="form.belong_dept" placeholder="所属部门" clearable style="width: 100%"> <el-select v-model="form.belong_dept" placeholder="所属部门" clearable style="width: 100%">
<el-option v-for="item in group" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in group" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="计量编号" prop="number"> <el-form-item label="计量编号" prop="number">
<el-input v-model="form.number" placeholder="设备编号" /> <el-input v-model="form.number" placeholder="设备编号" />
@ -188,9 +215,8 @@
</el-container> </el-container>
</el-drawer> </el-drawer>
</template> </template>
<script> <script>
import {genTree} from "@/utils/verificate";
export default { export default {
emits: ["success", "closed"], emits: ["success", "closed"],
data() { data() {
@ -234,7 +260,13 @@ export default {
belong_dept_options: [], belong_dept_options: [],
group: [], group: [],
mgroups: [], mgroups: [],
baseInfo: {} baseInfo: {},
groupsProps: {
// value: "id",
multiple: false,
emitPath: false,
checkStrictly: true,
},
}; };
}, },
mounted() { mounted() {
@ -247,9 +279,15 @@ export default {
console.log(this.baseInfo) console.log(this.baseInfo)
}, },
//部门数据 //部门数据
// getGroup() {
// this.$API.system.dept.list.req({ type: 'dept' }).then(res => {
// this.group = res.results;
// });
// },
getGroup() { getGroup() {
this.$API.system.dept.list.req({ type: 'dept' }).then(res => { let that = this;
this.group = res.results; that.$API.system.dept.list.req({page: 0 , type: 'dept'}).then(res=>{
that.group = genTree(res);
}); });
}, },
getReceptionist(data) { getReceptionist(data) {

29
src/views/mtm/mgroup_form.vue
View File

@ -16,9 +16,19 @@
<el-switch v-model="form.need_enm"></el-switch> <el-switch v-model="form.need_enm"></el-switch>
</el-form-item> --> </el-form-item> -->
<el-form-item label="所属部门"> <el-form-item label="所属部门">
<el-select v-model="form.belong_dept" placeholder="所属部门" clearable style="width: 100%;"> <el-cascader
v-model="form.belong_dept"
:options="group"
:props="groupsProps"
clearable
:show-all-levels="false"
style="width: 100%"
@change="deptChange"
>
</el-cascader>
<!-- <el-select v-model="form.belong_dept" placeholder="所属部门" clearable style="width: 100%;">
<el-option v-for="item in group" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in group" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select> -->
</el-form-item> </el-form-item>
<el-form-item label="排班规则"> <el-form-item label="排班规则">
<el-select v-model="form.shift_rule" style="width: 100%"> <el-select v-model="form.shift_rule" style="width: 100%">
@ -69,6 +79,7 @@
</template> </template>
<script> <script>
import {genTree} from "@/utils/verificate";
const defaultForm = { const defaultForm = {
name: "", name: "",
process: '', process: '',
@ -97,6 +108,12 @@ export default {
// process: [{ required: true, message: "请选择工序", trigger: "blur" }], // process: [{ required: true, message: "请选择工序", trigger: "blur" }],
belong_dept: [{ required: true, message: "请选择所属部门", trigger: "blur" }] belong_dept: [{ required: true, message: "请选择所属部门", trigger: "blur" }]
}, },
groupsProps: {
// value: "id",
multiple: false,
emitPath: false,
checkStrictly: true,
},
visible: false, visible: false,
isSaveing: false, isSaveing: false,
shiftOptions: [], shiftOptions: [],
@ -118,9 +135,13 @@ export default {
methods: { methods: {
//部门数据 //部门数据
getGroup() { getGroup() {
this.$API.system.dept.list.req({ page: 0, type: 'dept' }).then(res => { let that = this;
this.group = res; that.$API.system.dept.list.req({page: 0 , type: 'dept'}).then(res=>{
that.group = genTree(res);
}); });
// this.$API.system.dept.list.req({ page: 0, type: 'dept' }).then(res => {
// this.group = res;
// });
}, },
//获取工序列表 //获取工序列表
getProcess() { getProcess() {

30
src/views/wpm/mlog6_form.vue
View File

@ -51,16 +51,19 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="生产设备"> <el-form-item label="班次" prop="material">
<el-select <el-select
v-model="form.equipment" v-model="form.shift"
style="width: 100%"> placeholder="班次"
clearable
style="width: 100%"
>
<el-option <el-option
v-for="item in equipmentOptions" v-for="item in shiftOptions"
:key="item.id" :key="item.id"
:label="item.full_name" :label="item.name"
:value="item.id" :value="item.id"
/> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -107,19 +110,20 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="班次" prop="material"> <el-form-item label="生产设备">
<el-select <el-select
v-model="form.shift" v-model="form.equipments"
placeholder="班次"
clearable
style="width: 100%" style="width: 100%"
filterable
multiple
clearable
> >
<el-option <el-option
v-for="item in shiftOptions" v-for="item in equipmentOptions"
:key="item.id" :key="item.id"
:label="item.name" :label="item.full_name"
:value="item.id" :value="item.id"
></el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>