From 24a64475ee9582f0f09f899b7800a4f7101eaa30 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期二, 09 一月 2024 14:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/em/equipmentArchives/index.vue | 62 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/jcdm-ui/src/views/main/em/equipmentArchives/index.vue b/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
index c3dd8e1..e7977d4 100644
--- a/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
+++ b/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
@@ -18,6 +18,16 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+ <el-form-item label="鐘舵��" prop="status">
+ <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨鐘舵��" clearable>
+ <el-option
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -76,6 +86,12 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="璁惧缂栫爜" align="center" prop="equipmentCode"/>
<el-table-column label="璁惧鍚嶇О" align="center" prop="equipmentName"/>
+ <el-table-column label="鐘舵��" align="center" prop="status" width="80">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+ </template>
+ </el-table-column>
+ <el-table-column label="宸ュ簭缂栧彿" align="center" prop="processesCode"/>
<el-table-column label="鍝佺墝" align="center" prop="equipmentBrand"/>
<el-table-column label="瑙勬牸鍨嬪彿" align="center" prop="equipmentSpec"/>
<el-table-column label="杞﹂棿缂栫爜" align="center" prop="workshopCode"/>
@@ -128,6 +144,25 @@
<el-form-item label="璁惧鍚嶇О" prop="equipmentName">
<el-input v-model="form.equipmentName" placeholder="璇疯緭鍏ヨ澶囧悕绉�" />
</el-form-item>
+ <el-form-item label="鐘舵��" prop="status">
+ <el-radio-group v-model="form.status">
+ <el-radio
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.value"
+ >{{dict.label}}</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="宸ュ簭缂栧彿" prop="processesCode">
+ <el-select style="width: 100%" @change="handleSelectChangeprocessesCode(form.processesCode)" v-model="form.processesCode" placeholder="璇烽�夋嫨宸ュ簭缂栧彿">
+ <el-option
+ v-for="item in processesCodeoptions"
+ :key="item.index"
+ :label="item.processesCode"
+ :value="item.processesCode">
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="鍝佺墝" prop="equipmentBrand">
<el-input v-model="form.equipmentBrand" placeholder="璇疯緭鍏ュ搧鐗�" />
</el-form-item>
@@ -175,9 +210,11 @@
import {listLineInfo} from "@/api/main/bs/lineInfo/lineInfo";
import ItemSelect from "@/components/itemSelect/single.vue";
import {listProductionOrde} from "@/api/main/om/productionOrde/productionOrde";
+import {listProcesses} from "@/api/main/bs/processes/processes";
export default {
name: "EquipmentArchives",
+ dicts: ['sys_normal_disable'],
components: {
ItemSelect ,
},
@@ -185,6 +222,7 @@
return {
// 閬僵灞�
lineOptions: [],
+ processesCodeoptions:[],
options: [],
loading: true,
titleName: "",
@@ -217,7 +255,7 @@
equipmentTypeName: null,
workshopCode: null,
lineCode: null,
- processes: null,
+ processesCode: null,
status: null,
createUser: null,
updateUser: null,
@@ -225,6 +263,11 @@
spareField2: null,
spareField3: null,
spareField4: null
+ },
+ processesCodeQueryParams:{
+ pageNum: 1,
+ pageSize: 10,
+ processesCodes: null,
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -248,6 +291,7 @@
created() {
this.getList();
this.initWorkshop();
+ this.initProcesses();
},
methods: {
@@ -267,8 +311,18 @@
this.lineOptions = response.rows;
});
},
+ handleSelectChangeprocessesCode(selectedOption) {
+ this.processesCodeQueryParams.processesCodes = selectedOption;
+ listProcesses(this.queryParams).then(response => {
+ this.form.processesName = response.rows[0].processesName;
+ });
+ },
+ initProcesses(){
+ listProcesses(this.queryParams).then(response => {
+ this.processesCodeoptions = response.rows;
+ });
+ },
getList() {
- // this.$modal.msgSuccess("淇敼鎴愬姛");
console.log(this.queryParams)
this.loading = true;
listEquipmentArchives(this.queryParams).then(response => {
@@ -295,8 +349,8 @@
equipmentTypeName: null,
workshopCode: null,
lineCode: null,
- processes: null,
- status: null,
+ processesCode: null,
+ status: "0",
remark: null,
createUser: null,
createTime: null,
--
Gitblit v1.9.3