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:
zty 2025-01-06 10:28:31 +08:00
parent 7fd709b7a6 0877bd03d3
commit fd770c2562
7 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/model/wpm.js
View File

@ -463,4 +463,10 @@ export default {
return await http.get(`${config.API_URL}/wpm/batchst/`, data);
},
},
wpr:{
name: "动态产品",
req: async function (data) {
return await http.get(`${config.API_URL}/wpmw/wpr/`, data);
},
},
};

11
src/views/em/ecate.vue
View File

@ -31,21 +31,21 @@
<span>{{ typeOptions_[scope.row.type] }}</span>
</template>
</el-table-column>
<el-table-column label="是否用于安全" show-overflow-tooltip>
<el-table-column label="是否用于安全" show-overflow-tooltip v-if="project_code!=='bxerp'">
<template #default="scope">
<el-icon v-if="scope.row.is_for_safe" color="green">
<CircleCheckFilled />
</el-icon>
</template>
</el-table-column>
<el-table-column label="是否用于环保" show-overflow-tooltip>
<el-table-column label="是否用于环保" show-overflow-tooltip v-if="project_code!=='bxerp'">
<template #default="scope">
<el-icon v-if="scope.row.is_for_enp" color="green">
<CircleCheckFilled />
</el-icon>
</template>
</el-table-column>
<el-table-column label="是否为车辆" show-overflow-tooltip>
<el-table-column label="是否为车辆" show-overflow-tooltip v-if="project_code!=='bxerp'">
<template #default="scope">
<el-icon v-if="scope.row.is_car" color="green">
<CircleCheckFilled />
@ -116,8 +116,13 @@ export default {
{ id: 40, name: "监测设备" },
{ id: 50, name: "监控设备" },
],
project_code:''
};
},
mounted() {
this.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code;
console.log(this.project_code);
},
methods: {
//添加
add() {

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

@ -48,7 +48,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="project_code!=='bxerp'">
<el-col :md="12" :sm="24">
<el-form-item label="是否用于安全">
<el-switch v-model="form.is_for_safe" />
@ -109,9 +109,10 @@ export default {
],
visible: false,
isSaveing: false,
project_code: "",
};
},
mounted() {},
mounted() {this.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code;},
methods: {
//显示
open(mode = "add") {

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

@ -152,7 +152,7 @@
</template>
</el-table-column>
</scTable>
<scTable ref="drawer_table" :apiObj="apiObj2" row-key="id" stripe :params="query2" id="myTable"
<scTable ref="drawer_table2" :apiObj="apiObj2" row-key="id" stripe :params="query2" id="myTable"
style="display: none;">
<el-table-column type="index" width="50" />
<el-table-column label="设备名称" prop="equipment_name" show-overflow-tooltip>
@ -350,6 +350,7 @@ export default {
that.$API.em.einspect.delete.req(row.id).then((res) => {
that.$message.success("删除成功");
that.$refs.drawer_table.refresh();
that.$refs.drawer_table2.refresh();
that.$refs.table.refresh();
}).catch((err) => {
return err;
@ -379,6 +380,7 @@ export default {
that.isSaveing = false;
that.$message.success("操作成功");
that.$refs.drawer_table.refresh();
that.$refs.drawer_table2.refresh();
}).catch(() => {
that.isSaveing = false;
})

6
src/views/mtm/route_form.vue
View File

@ -129,7 +129,7 @@
<el-switch v-model="form.is_autotask" />
</el-form-item>
</el-col> -->
<el-col :md="12" :sm="24">
<el-col :md="12" :sm="24" v-if="project_code=='bxerp'">
<el-form-item label="切分数量">
<el-input-number
v-model="form.div_number"
@ -156,7 +156,7 @@
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-col :md="12" :sm="24" v-if="project_code!=='bxerp'">
<el-form-item label="批次校验">
<el-switch v-model="form.batch_bind" />
</el-form-item>
@ -211,6 +211,7 @@ export default {
options: [],
titleMap: { add: "新增", edit: "编辑" },
setFiltersVisible: false,
project_code: "",
};
},
mounted() {
@ -218,6 +219,7 @@ export default {
this.getProcess();
this.getMaterialIn();
this.getMaterialOut();
this.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code;
this.form.routepack = this.routepack;
},
methods: {

4
src/views/mtm/route_show.vue
View File

@ -42,7 +42,7 @@
</el-table-column>
<el-table-column label="工时" prop="hour_work">
</el-table-column>
<el-table-column label="批次校验">
<el-table-column label="批次校验" v-if="project_code!=='bxerp'">
<template #default="scope">
<el-tag v-if="scope.row.batch_bind" type="success">是</el-tag>
</template>
@ -69,9 +69,11 @@ export default {
},
form: {},
tableData: [],
project_code: "",
};
},
mounted() {
this.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code;
this.tableData = [];
},
methods: {

6
src/views/mtm/routepack_form.vue
View File

@ -112,7 +112,9 @@
</el-table-column>
<el-table-column label="工时" prop="hour_work">
</el-table-column>
<el-table-column label="批次校验" prop="batch_bind">
<el-table-column label="切分数量" prop="div_number" v-if="project_code=='bxerp'">
</el-table-column>
<el-table-column label="批次校验" prop="batch_bind" v-else>
</el-table-column>
<el-table-column
label="操作"
@ -208,10 +210,12 @@ export default {
name: [{ required: true, message: "请输入" }],
},
routepack: "",
project_code:''
};
},
mounted() {
this.isSaveing = false;
this.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code;
this.getInit();
this.getMaterials();
},