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

Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

This commit is contained in:
caoqianming 2025-12-03 13:25:09 +08:00
parent d817601437 69c63eea06
commit 33094c8161
3 changed files with 32 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/wpm_bx/mlog_detail.vue
View File

@ -882,7 +882,8 @@ export default {
saveMuserSubmit(row){
let that = this;
that.isSaveing = true;
that.$API.wpm.mloguser.create.req(that.addTemplate).then((res) => {
row.mlog = that.mlogId;
that.$API.wpm.mloguser.create.req(row).then((res) => {
that.isSaveing = false;
that.$message.success("操作成功");
that.getProcessList();
@ -895,7 +896,7 @@ export default {
that.$confirm("确定删除吗？").then(res=>{
that.$API.wpm.mloguser.delete.req(row.id).then((res) => {
that.$message.success("删除成功");
that.$refs.tableMuser.refresh();
that.getProcessList();
})
})
},

19
src/views/wpm_bx/mlogbw_check.vue
View File

@ -36,6 +36,7 @@
:addTemplate="addTemplate"
placeholder="暂无数据"
:hideAdd="hideAdd"
:pushType="pushType"
:canMultiple = "canMultiple"
@selectChange="selectChange"
@selectAllChange="selectAllChange"
@ -46,10 +47,11 @@
<span v-if="mode == 'outs'">{{ scope.row.number }}</span>
<span v-if="mode == 'outs'&&scope.row.wpr_number_out!==null&&scope.row.wpr_number_out!==undefined">——{{ scope.row.wpr_number_out }}</span>
<el-select
v-if="scope.row.isEdit&&mode == 'ins'&&route_code!=='niuzhuan'"
v-if="scope.row.isEdit&&mode == 'ins'"
v-model="scope.row.wpr"
placeholder="动态成品"
clearable
filterable
style="width: 100%"
@change="optionChange(scope.row)"
>
@ -507,6 +509,7 @@ export default {
wprNumber:"",
route_code:"",
wprInputText:"",
pushType:"unshift",
params: {mlogb:'',page:0},
insInput:false,
canMultiple:false,
@ -582,7 +585,9 @@ export default {
}
if(that.mode == 'ins'){
if(that.route_code=='niuzhuan'){
that.getEquipment4();
that.gettestitem();
that.getOptions();
}else{
that.getOptions();
that.getList();
@ -910,9 +915,9 @@ export default {
},
formTableEdit(row) {
let that = this;
if(that.route_code=='niuzhuan'&&that.optionsEq.length==0){
that.getEquipment4();
}
// if(that.route_code=='niuzhuan'&&that.optionsEq.length==0){
// that.getEquipment4();
// }
that.mlogbwlist.forEach((item, index) => {
if (item.id == row.id) {
that.mlogbwlist[index].isEdit = true;
@ -1170,9 +1175,9 @@ export default {
that.mlogbwlist[0].work_start_time = that.$TOOL.dateFormat(date, 'yyyy-MM-dd hh:mm:ss');
that.timeChange(that.mlogbwlist[0]);
}
if(that.optionsEq.length==0){
that.getEquipment4();
}
// if(that.optionsEq.length==0){
// that.getEquipment4();
// }
}
if(that.setForm.cd_req_addr!==null&&!that.insInput){
//执行cd_req_addr,获取检测设备的数据

61
src/views/wpm_gx/inmrecord.vue
View File

@ -2,9 +2,9 @@
<el-container>
<el-header>
<div class="left-panel">
<el-button type="primary" @click="tomio('do_out')" v-auth="'mio.do'"
<!-- <el-button type="primary" @click="tomio('do_out')" v-auth="'mio.do'"
v-if="mgroupName!=='size'&&mgroupName!=='facade'&&project_code=='gx'"
>领料</el-button>
>领料</el-button> -->
<el-button type="primary" @click="tomio('do_in')" v-auth="'mio.do'">入库</el-button>
<el-button
type="primary"
@ -97,49 +97,21 @@
align="center"
width="120px"
>
<template #default="scope">
<el-button
link
type="primary"
@click="table_detail(scope.row)"
>
查看
</el-button>
<el-button
link
type="primary"
@click="table_edit(scope.row)"
v-if="scope.row.state == 10"
>
编辑
</el-button>
<el-button
link
type="primary"
@click="table_submit(scope.row)"
v-auth="'mio.submit'"
v-if="scope.row.state == 10&&scope.row.type!=='do_in'"
>
提交
</el-button>
<el-button
link
type="danger"
@click="table_del(scope.row)"
v-auth="'mio.delete'"
v-if="scope.row.state == 10"
>
删除
</el-button>
<el-button
link
type="warning"
@click="revert(scope.row)"
v-auth="'mio.submit'"
v-if="scope.row.state == 20"
>
撤销
<template #default="scope">
<el-button link type="primary" @click="table_detail(scope.row)">查看</el-button>
<el-button link type="primary" @click="table_edit(scope.row)"
v-if="scope.row.state == 10&&scope.row.create_by==userId"
>编辑</el-button>
<el-button link type="primary" @click="table_submit(scope.row)"
v-auth="'mio.submit'" v-if="scope.row.state == 10&&scope.row.type!=='do_in'"
> <span>{{ scope.row.type=='do_out'?'接收':'提交' }}</span>
</el-button>
<el-button link type="danger" @click="table_del(scope.row)"
v-auth="'mio.delete'" v-if="scope.row.state == 10&&scope.row.create_by==userId"
>删除</el-button>
<el-button link type="warning" @click="revert(scope.row)"
v-auth="'mio.submit'" v-if="scope.row.state == 20"
>撤销</el-button>
</template>
</el-table-column>
</scTable>
@ -234,6 +206,7 @@ export default {
let that = this;
that.params.mgroup = that.mgroupId;
that.apiObj = that.$API.inm.mio.list;
that.userId = this.$TOOL.data.get("USER_INFO").id;
that.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code;
console.log("project_code",that.project_code);
},