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

Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

This commit is contained in:
caoqianming 2024-08-15 15:59:00 +08:00
parent e998dd2f8e 9fa6081434
commit 18c89f01bb
7 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/em/ecate_form.vue
View File

@ -103,6 +103,10 @@ export default {
name: [{ required: true, message: "请输入类型名称" }],
type: [{ required: true, message: "请请选择设备类型" }],
},
type_gx:[
{ text: '生产设备', key: 10 },
{ text: '计量设备', key: 20 },
],
visible: false,
isSaveing: false,
};

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

@ -91,7 +91,7 @@
</scTable>
</el-main>
</el-container>
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess" :eqtype="10"
@closed="dialog.save = false"></save-dialog>
<check-dialog v-if="dialog.check" ref="checkDialog" :eqms="selectiones" @success="handleCheckSuccess"
@closed="dialog.save = false"></check-dialog>
@ -341,10 +341,12 @@ export default {
},
//删除
async table_del(row) {
this.$API.em.equipment.delete
let that = this;
that.$API.em.equipment.delete
.req(row.id)
.then((res) => {
this.$message.success("删除成功");
that.$message.success("删除成功");
that.$refs.table.refresh();
return res;
})
.catch((err) => {
@ -354,11 +356,7 @@ export default {
//本地更新数据
handleSaveSuccess(data, mode) {
if (mode == "add") {
this.$refs.table.refresh();
} else if (mode == "edit") {
this.$refs.table.refresh();
}
this.$refs.table.refresh();
},
handleCheckSuccess() { },
handleQuery() {

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

@ -199,6 +199,12 @@ import { genTree } from "@/utils/verificate";
import { iMEnum } from "@/utils/enum";
export default {
emits: ["success", "closed"],
props:{
eqtype:{
type:String,
default: ''
},
},
data() {
return {
iMEnum,
@ -211,7 +217,7 @@ export default {
show: "查看",
},
form: {
type: 10
type: 10,
},
rules: {
name: [{ required: true, message: "请输入", trigger: "blur" }],
@ -257,11 +263,13 @@ export default {
this.getGroup();
this.getBaseInfo();
this.getCateOptions();
this.form.type = this.eqtype;
},
methods: {
getCateOptions() {
this.$API.em.ecate.list.req({page:0}).then(res => {
this.cateOptions = res
let that = this;
that.$API.em.ecate.list.req({page:0,type:that.eqtype}).then(res => {
that.cateOptions = res;
})
},
getBaseInfo() {

2
src/views/em/equipmentjc.vue
View File

@ -91,7 +91,7 @@
</scTable>
</el-main>
</el-container>
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess" :eqtype='40'
@closed="dialog.save = false"></save-dialog>
<check-dialog v-if="dialog.check" ref="checkDialog" :eqms="selectiones" @success="handleCheckSuccess"
@closed="dialog.save = false"></check-dialog>

2
src/views/em/equipmentjk.vue
View File

@ -91,7 +91,7 @@
</scTable>
</el-main>
</el-container>
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess" :eqtype="50"
@closed="dialog.save = false"></save-dialog>
<check-dialog v-if="dialog.check" ref="checkDialog" :eqms="selectiones" @success="handleCheckSuccess"
@closed="dialog.save = false"></check-dialog>

2
src/views/em/equipmentjl.vue
View File

@ -138,7 +138,7 @@
</el-drawer>
</el-main>
</el-container>
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess" :eqtype="20"
@closed="dialog.save = false"></save-dialog>
</template>
<script>

2
src/views/em/equipmentzl.vue
View File

@ -92,7 +92,7 @@
</scTable>
</el-main>
</el-container>
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess" :eqtype="30"
@closed="dialog.save = false"></save-dialog>
<check-dialog v-if="dialog.check" ref="checkDialog" :eqms="selectiones" @success="handleCheckSuccess"
@closed="dialog.save = false"></check-dialog>